From cdd8c1d7281e48a103def3d45fbec5fb20e98d90 Mon Sep 17 00:00:00 2001
From: David Russell <drussell@markettrack.com>
Date: Fri, 28 Dec 2018 08:58:35 -0500
Subject: [PATCH 01/10] Added Remove-GSDriveFile, fixed Remove-GSGmailLabel

---
 PSGSuite/Public/Drive/Remove-GSDriveFile.ps1  | 84 +++++++++++++++++++
 PSGSuite/Public/Gmail/Remove-GSGmailLabel.ps1 |  4 +-
 2 files changed, 86 insertions(+), 2 deletions(-)
 create mode 100644 PSGSuite/Public/Drive/Remove-GSDriveFile.ps1

diff --git a/PSGSuite/Public/Drive/Remove-GSDriveFile.ps1 b/PSGSuite/Public/Drive/Remove-GSDriveFile.ps1
new file mode 100644
index 00000000..5f2b43de
--- /dev/null
+++ b/PSGSuite/Public/Drive/Remove-GSDriveFile.ps1
@@ -0,0 +1,84 @@
+function Remove-GSDriveFile {
+    <#
+    .SYNOPSIS
+    Gets information about or downloads a Drive file
+
+    .DESCRIPTION
+    Gets information about or downloads a Drive file
+
+    .PARAMETER FileId
+    The unique Id of the file to get
+
+    .PARAMETER User
+    The email or unique Id of the owner of the Drive file
+
+    Defaults to the AdminEmail user
+
+    .PARAMETER OutFilePath
+    The directory path that you would like to download the Drive file to. If excluded, only the Drive file information will be returned
+
+    .PARAMETER Projection
+    The defined subset of fields to be returned
+
+    Available values are:
+    * "Minimal"
+    * "Standard"
+    * "Full"
+    * "Access"
+
+    .PARAMETER Fields
+    The specific fields to returned
+
+    .EXAMPLE
+    Get-GSDriveFile -FileId '1rhsAYTOB_vrpvfwImPmWy0TcVa2sgmQa_9u976'
+
+    Gets the information for the file
+
+    .EXAMPLE
+    Get-GSDriveFile -FileId '1rhsAYTOB_vrpvfwImPmWy0TcVa2sgmQa_9u976' -OutFilePath (Get-Location).Path
+
+    Gets the information for the file and saves the file in the current working directory
+    #>
+    [cmdletbinding()]
+    Param
+    (
+        [parameter(Mandatory = $true,Position = 0)]
+        [String[]]
+        $FileId,
+        [parameter(Mandatory = $false,ValueFromPipelineByPropertyName = $true)]
+        [Alias('Owner','PrimaryEmail','UserKey','Mail')]
+        [string]
+        $User = $Script:PSGSuite.AdminEmail
+    )
+    Begin {
+        if ($User -ceq 'me') {
+            $User = $Script:PSGSuite.AdminEmail
+        }
+        elseif ($User -notlike "*@*.*") {
+            $User = "$($User)@$($Script:PSGSuite.Domain)"
+        }
+        $serviceParams = @{
+            Scope       = 'https://www.googleapis.com/auth/drive'
+            ServiceType = 'Google.Apis.Drive.v3.DriveService'
+            User        = $User
+        }
+        $service = New-GoogleService @serviceParams
+    }
+    Process {
+        try {
+            foreach ($file in $FileId) {
+                $request = $service.Files.Delete($file)
+                #$request.SupportsTeamDrives = $true
+                $request.Execute()
+            }
+        }
+        catch {
+            if ($ErrorActionPreference -eq 'Stop') {
+                $PSCmdlet.ThrowTerminatingError($_)
+            }
+            else {
+                Write-Error $_
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/PSGSuite/Public/Gmail/Remove-GSGmailLabel.ps1 b/PSGSuite/Public/Gmail/Remove-GSGmailLabel.ps1
index 9f6f10be..ae6bac23 100644
--- a/PSGSuite/Public/Gmail/Remove-GSGmailLabel.ps1
+++ b/PSGSuite/Public/Gmail/Remove-GSGmailLabel.ps1
@@ -25,12 +25,12 @@ function Remove-GSGmailLabel {
         [parameter(Mandatory = $true, Position = 0, ValueFromPipelineByPropertyName = $true)]
         [Alias("Id")]
         [string[]]
-        $LabelId
+        $LabelId,
         [parameter(Mandatory = $false, ValueFromPipelineByPropertyName = $true)]
         [Alias("PrimaryEmail", "UserKey", "Mail")]
         [ValidateNotNullOrEmpty()]
         [string]
-        $User = $Script:PSGSuite.AdminEmail,
+        $User = $Script:PSGSuite.AdminEmail
     )
     Begin {
         if ($User -ceq 'me') {

From cb7f2f99e6ccef7b49829ab08c30cd5023e3a284 Mon Sep 17 00:00:00 2001
From: David Russell <drussell@markettrack.com>
Date: Fri, 28 Dec 2018 09:44:54 -0500
Subject: [PATCH 02/10] Added Get-GSCalendarList

---
 .../Public/Calendar/Get-GSCalendarList.ps1    | 71 +++++++++++++++++++
 1 file changed, 71 insertions(+)
 create mode 100644 PSGSuite/Public/Calendar/Get-GSCalendarList.ps1

diff --git a/PSGSuite/Public/Calendar/Get-GSCalendarList.ps1 b/PSGSuite/Public/Calendar/Get-GSCalendarList.ps1
new file mode 100644
index 00000000..bc735b97
--- /dev/null
+++ b/PSGSuite/Public/Calendar/Get-GSCalendarList.ps1
@@ -0,0 +1,71 @@
+function Get-GSCalendarList {
+    <#
+    .SYNOPSIS
+    Lists all calendars a user has on their calendar list (useful for finding secondary calendars)
+    
+    .DESCRIPTION
+    Lists all calendars a user has on their calendar list (useful for finding secondary calendars)
+    
+    .PARAMETER User
+    The primary email or UserID of the user. You can exclude the '@domain.com' to insert the Domain in the config or use the special 'me' to indicate the AdminEmail in the config.
+    
+    .PARAMETER ShowDeleted
+    Whether to include deleted calendar list entries in the result. Optional. The default is False.
+
+    .PARAMETER ShowHidden
+    Whether to show hidden entries. Optional. The default is False.
+
+    .EXAMPLE
+    Get-GSCalendarList -User me
+
+    Retrieves all calendars on your calendar list
+    #>
+    [cmdletbinding()]
+    Param
+    (
+        [parameter(Mandatory = $true,Position = 0,ValueFromPipeline = $true,ValueFromPipelineByPropertyName = $true)]
+        [Alias("PrimaryEmail","UserKey","Mail")]
+        [ValidateNotNullOrEmpty()]
+        [String]
+        $User,
+        [Parameter(Mandatory = $false, Position = 1)]
+        [bool]
+        $ShowDeleted = $false,
+        [Parameter(Mandatory = $false, Position = 2)]
+        [bool]
+        $ShowHidden = $false
+    )
+    Process {
+        try {
+            if ($User -ceq 'me') {
+                $User = $Script:PSGSuite.AdminEmail
+            }
+            elseif ($User -notlike "*@*.*") {
+                $User = "$($User)@$($Script:PSGSuite.Domain)"
+            }
+            $serviceParams = @{
+                Scope       = 'https://www.googleapis.com/auth/calendar'
+                ServiceType = 'Google.Apis.Calendar.v3.CalendarService'
+                User        = $User
+            }
+            $service = New-GoogleService @serviceParams
+
+            $Raw = $Service.CalendarList.List().Execute()
+            $ItemList = [object[]]($Raw.Items)
+            While ($Null -ne $Raw.NextPageToken){
+                $Service.CalendarList.List().setPageToken($Raw.NextPageToken)
+                $Raw = $service.CalendarList.List().Execute()
+                $ItemList += $Raw.Items
+            }
+            $ItemList
+        }
+        catch {
+            if ($ErrorActionPreference -eq 'Stop') {
+                $PSCmdlet.ThrowTerminatingError($_)
+            }
+            else {
+                Write-Error $_
+            }
+        }
+    }
+}
\ No newline at end of file

From d51d0f2e9cf9a83344fd3bfb9533f0f7c4ba3db6 Mon Sep 17 00:00:00 2001
From: David Russell <drussell@markettrack.com>
Date: Fri, 28 Dec 2018 09:53:39 -0500
Subject: [PATCH 03/10] Fixed comments

---
 PSGSuite/Public/Drive/Remove-GSDriveFile.ps1 | 28 +++-----------------
 1 file changed, 4 insertions(+), 24 deletions(-)

diff --git a/PSGSuite/Public/Drive/Remove-GSDriveFile.ps1 b/PSGSuite/Public/Drive/Remove-GSDriveFile.ps1
index 5f2b43de..5e97e63f 100644
--- a/PSGSuite/Public/Drive/Remove-GSDriveFile.ps1
+++ b/PSGSuite/Public/Drive/Remove-GSDriveFile.ps1
@@ -1,10 +1,10 @@
 function Remove-GSDriveFile {
     <#
     .SYNOPSIS
-    Gets information about or downloads a Drive file
+    Deletes a Drive file
 
     .DESCRIPTION
-    Gets information about or downloads a Drive file
+    Deletes a Drive file
 
     .PARAMETER FileId
     The unique Id of the file to get
@@ -14,30 +14,10 @@ function Remove-GSDriveFile {
 
     Defaults to the AdminEmail user
 
-    .PARAMETER OutFilePath
-    The directory path that you would like to download the Drive file to. If excluded, only the Drive file information will be returned
-
-    .PARAMETER Projection
-    The defined subset of fields to be returned
-
-    Available values are:
-    * "Minimal"
-    * "Standard"
-    * "Full"
-    * "Access"
-
-    .PARAMETER Fields
-    The specific fields to returned
-
-    .EXAMPLE
-    Get-GSDriveFile -FileId '1rhsAYTOB_vrpvfwImPmWy0TcVa2sgmQa_9u976'
-
-    Gets the information for the file
-
     .EXAMPLE
-    Get-GSDriveFile -FileId '1rhsAYTOB_vrpvfwImPmWy0TcVa2sgmQa_9u976' -OutFilePath (Get-Location).Path
+    Remove-GSDriveFile -User user@domain.com -FileId '1rhsAYTOB_vrpvfwImPmWy0TcVa2sgmQa_9u976'
 
-    Gets the information for the file and saves the file in the current working directory
+    Deletes the file with ID 1rhsAYTOB_vrpvfwImPmWy0TcVa2sgmQa_9u976 from the user user@domain.com's Drive
     #>
     [cmdletbinding()]
     Param

From 321f209c09feb4dade7dba74f08ba134c395c1b6 Mon Sep 17 00:00:00 2001
From: David Russell <drussell@markettrack.com>
Date: Fri, 28 Dec 2018 10:04:17 -0500
Subject: [PATCH 04/10] Updated manifest, changelog, and readme for 2.22.1

---
 CHANGELOG.md           | 4 ++++
 PSGSuite/PSGSuite.psd1 | 2 +-
 README.md              | 5 +++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bbc4dfae..69778aa8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -68,6 +68,10 @@
       * [Functions Aliased](#functions-aliased)
 
 ***
+## 2.22.1
+
+* Added Remove-GSDriveFile
+* Added Get-GSCalendarList
 
 ## 2.22.0
 
diff --git a/PSGSuite/PSGSuite.psd1 b/PSGSuite/PSGSuite.psd1
index 2dc1438b..ebd66744 100644
--- a/PSGSuite/PSGSuite.psd1
+++ b/PSGSuite/PSGSuite.psd1
@@ -12,7 +12,7 @@
     RootModule            = 'PSGSuite.psm1'
 
     # Version number of this module.
-    ModuleVersion         = '2.22.0'
+    ModuleVersion         = '2.22.1'
 
     # ID used to uniquely identify this module
     GUID                  = '9d751152-e83e-40bb-a6db-4c329092aaec'
diff --git a/README.md b/README.md
index 6c090a35..03010d14 100644
--- a/README.md
+++ b/README.md
@@ -136,6 +136,11 @@ Update-GSSheetValue               Export-GSSheet
 
 ### Most recent changes
 
+## 2.22.1
+
+* Added Remove-GSDriveFile
+* Added Get-GSCalendarList
+
 #### 2.22.0
 
 * Miscellaneous: _Config management and portability updates_

From 67e99d016b5db961faacdf71da6ddba791db0b58 Mon Sep 17 00:00:00 2001
From: David Russell <drussell@markettrack.com>
Date: Fri, 28 Dec 2018 10:12:43 -0500
Subject: [PATCH 05/10] Added 'ShouldProcess' support

---
 PSGSuite/Public/Drive/Remove-GSDriveFile.ps1 | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/PSGSuite/Public/Drive/Remove-GSDriveFile.ps1 b/PSGSuite/Public/Drive/Remove-GSDriveFile.ps1
index 5e97e63f..fae296f3 100644
--- a/PSGSuite/Public/Drive/Remove-GSDriveFile.ps1
+++ b/PSGSuite/Public/Drive/Remove-GSDriveFile.ps1
@@ -19,14 +19,14 @@ function Remove-GSDriveFile {
 
     Deletes the file with ID 1rhsAYTOB_vrpvfwImPmWy0TcVa2sgmQa_9u976 from the user user@domain.com's Drive
     #>
-    [cmdletbinding()]
+    [cmdletbinding(SupportsShouldProcess = $true, ConfirmImpact = "High")]
     Param
     (
-        [parameter(Mandatory = $true,Position = 0)]
+        [parameter(Mandatory = $true, Position = 0)]
         [String[]]
         $FileId,
-        [parameter(Mandatory = $false,ValueFromPipelineByPropertyName = $true)]
-        [Alias('Owner','PrimaryEmail','UserKey','Mail')]
+        [parameter(Mandatory = $false, ValueFromPipelineByPropertyName = $true)]
+        [Alias('Owner', 'PrimaryEmail', 'UserKey', 'Mail')]
         [string]
         $User = $Script:PSGSuite.AdminEmail
     )
@@ -46,10 +46,12 @@ function Remove-GSDriveFile {
     }
     Process {
         try {
-            foreach ($file in $FileId) {
-                $request = $service.Files.Delete($file)
-                #$request.SupportsTeamDrives = $true
-                $request.Execute()
+            if ($PSCmdlet.ShouldProcess("Deleting File Id(s) '$FileId' from user '$User'")) {
+                foreach ($file in $FileId) {
+                    $request = $service.Files.Delete($file)
+                    #$request.SupportsTeamDrives = $true
+                    $request.Execute()
+                }
             }
         }
         catch {

From 5b76018d5b3a691e840226559f26a02b1a052833 Mon Sep 17 00:00:00 2001
From: David Russell <drussell@markettrack.com>
Date: Fri, 28 Dec 2018 14:46:26 -0500
Subject: [PATCH 06/10] Removed Get-GSCalendarList

---
 .../Public/Calendar/Get-GSCalendarList.ps1    | 71 -------------------
 1 file changed, 71 deletions(-)
 delete mode 100644 PSGSuite/Public/Calendar/Get-GSCalendarList.ps1

diff --git a/PSGSuite/Public/Calendar/Get-GSCalendarList.ps1 b/PSGSuite/Public/Calendar/Get-GSCalendarList.ps1
deleted file mode 100644
index bc735b97..00000000
--- a/PSGSuite/Public/Calendar/Get-GSCalendarList.ps1
+++ /dev/null
@@ -1,71 +0,0 @@
-function Get-GSCalendarList {
-    <#
-    .SYNOPSIS
-    Lists all calendars a user has on their calendar list (useful for finding secondary calendars)
-    
-    .DESCRIPTION
-    Lists all calendars a user has on their calendar list (useful for finding secondary calendars)
-    
-    .PARAMETER User
-    The primary email or UserID of the user. You can exclude the '@domain.com' to insert the Domain in the config or use the special 'me' to indicate the AdminEmail in the config.
-    
-    .PARAMETER ShowDeleted
-    Whether to include deleted calendar list entries in the result. Optional. The default is False.
-
-    .PARAMETER ShowHidden
-    Whether to show hidden entries. Optional. The default is False.
-
-    .EXAMPLE
-    Get-GSCalendarList -User me
-
-    Retrieves all calendars on your calendar list
-    #>
-    [cmdletbinding()]
-    Param
-    (
-        [parameter(Mandatory = $true,Position = 0,ValueFromPipeline = $true,ValueFromPipelineByPropertyName = $true)]
-        [Alias("PrimaryEmail","UserKey","Mail")]
-        [ValidateNotNullOrEmpty()]
-        [String]
-        $User,
-        [Parameter(Mandatory = $false, Position = 1)]
-        [bool]
-        $ShowDeleted = $false,
-        [Parameter(Mandatory = $false, Position = 2)]
-        [bool]
-        $ShowHidden = $false
-    )
-    Process {
-        try {
-            if ($User -ceq 'me') {
-                $User = $Script:PSGSuite.AdminEmail
-            }
-            elseif ($User -notlike "*@*.*") {
-                $User = "$($User)@$($Script:PSGSuite.Domain)"
-            }
-            $serviceParams = @{
-                Scope       = 'https://www.googleapis.com/auth/calendar'
-                ServiceType = 'Google.Apis.Calendar.v3.CalendarService'
-                User        = $User
-            }
-            $service = New-GoogleService @serviceParams
-
-            $Raw = $Service.CalendarList.List().Execute()
-            $ItemList = [object[]]($Raw.Items)
-            While ($Null -ne $Raw.NextPageToken){
-                $Service.CalendarList.List().setPageToken($Raw.NextPageToken)
-                $Raw = $service.CalendarList.List().Execute()
-                $ItemList += $Raw.Items
-            }
-            $ItemList
-        }
-        catch {
-            if ($ErrorActionPreference -eq 'Stop') {
-                $PSCmdlet.ThrowTerminatingError($_)
-            }
-            else {
-                Write-Error $_
-            }
-        }
-    }
-}
\ No newline at end of file

From 3b254fbc970fbf9bf78a45f6caa5de242b3cacec Mon Sep 17 00:00:00 2001
From: David Russell <drussell@markettrack.com>
Date: Fri, 28 Dec 2018 14:50:14 -0500
Subject: [PATCH 07/10] Added support for more than 100 results, ShowHidden and
 ShowDeleted paramers

---
 CHANGELOG.md                                  |  2 +-
 .../Calendar/Get-GSCalendarSubscription.ps1   | 29 +++++++++++++++++--
 README.md                                     |  2 +-
 3 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 69778aa8..d723b7c2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -71,7 +71,7 @@
 ## 2.22.1
 
 * Added Remove-GSDriveFile
-* Added Get-GSCalendarList
+* Get-GSCalendarSubscription: Added support for more than 100 results, ShowHidden & ShowDeleted parameters.
 
 ## 2.22.0
 
diff --git a/PSGSuite/Public/Calendar/Get-GSCalendarSubscription.ps1 b/PSGSuite/Public/Calendar/Get-GSCalendarSubscription.ps1
index c3e7f633..4b66e797 100644
--- a/PSGSuite/Public/Calendar/Get-GSCalendarSubscription.ps1
+++ b/PSGSuite/Public/Calendar/Get-GSCalendarSubscription.ps1
@@ -14,6 +14,12 @@ function Get-GSCalendarSubscription {
     .PARAMETER CalendarID
     The calendar ID of the calendar you would like to get info for. If left blank, returns the list of calendars the user is subscribed to.
 
+    .PARAMETER ShowDeleted
+    Whether to include deleted calendar list entries in the result. Optional. The default is False.
+
+    .PARAMETER ShowHidden
+    Whether to show hidden entries. Optional. The default is False.
+
     .EXAMPLE
     Get-GSCalendarSubscription
 
@@ -30,7 +36,13 @@ function Get-GSCalendarSubscription {
         $User = $Script:PSGSuite.AdminEmail,
         [parameter(Mandatory = $false,Position = 1)]
         [String[]]
-        $CalendarId
+        $CalendarId,
+        [Parameter(Mandatory = $false, Position = 2)]
+        [bool]
+        $ShowDeleted = $false,
+        [Parameter(Mandatory = $false, Position = 3)]
+        [bool]
+        $ShowHidden = $false
     )
     Begin {
         if ($User -ceq 'me') {
@@ -68,7 +80,20 @@ function Get-GSCalendarSubscription {
             try {
                 Write-Verbose "Getting subscribed calendar list for user '$User'"
                 $request = $service.CalendarList.List()
-                $request.Execute() | Select-Object -ExpandProperty Items
+                If ($ShowDeleted -eq $true){
+                    $request.$ShowDeleted = $true
+                }
+                If ($ShowHidden -eq $true){
+                    $request.$ShowHidden = $true
+                }
+                $raw = $request.Execute()
+                $ItemList = [object[]]($raw | Select-Object -ExpandProperty Items)
+                While ($Null -ne $raw.NextPageToken){
+                    $request.SetPageToken($raw.NextPageToken)
+                    $raw = $request.Execute()
+                    $ItemList += $raw | Select-Object -ExpandProperty Items
+                }
+                $ItemList
             }
             catch {
                 if ($ErrorActionPreference -eq 'Stop') {
diff --git a/README.md b/README.md
index 03010d14..52dd3bd5 100644
--- a/README.md
+++ b/README.md
@@ -139,7 +139,7 @@ Update-GSSheetValue               Export-GSSheet
 ## 2.22.1
 
 * Added Remove-GSDriveFile
-* Added Get-GSCalendarList
+* Get-GSCalendarSubscription: Added support for more than 100 results, ShowHidden & ShowDeleted parameters.
 
 #### 2.22.0
 

From 58de0ecbc61449a4f55b84ab2ff6aacb8dad2eb3 Mon Sep 17 00:00:00 2001
From: Nate Ferrell <nate@scrthq.com>
Date: Sat, 29 Dec 2018 16:29:14 -0600
Subject: [PATCH 08/10] updated Get-GSCalendarSubscription and
 Remove-GSDriveFile to match existing patterns

---
 .../Calendar/Get-GSCalendarSubscription.ps1   | 35 +++++++++----------
 PSGSuite/Public/Drive/Remove-GSDriveFile.ps1  | 26 +++++++-------
 2 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/PSGSuite/Public/Calendar/Get-GSCalendarSubscription.ps1 b/PSGSuite/Public/Calendar/Get-GSCalendarSubscription.ps1
index 4b66e797..fb0caaea 100644
--- a/PSGSuite/Public/Calendar/Get-GSCalendarSubscription.ps1
+++ b/PSGSuite/Public/Calendar/Get-GSCalendarSubscription.ps1
@@ -37,12 +37,12 @@ function Get-GSCalendarSubscription {
         [parameter(Mandatory = $false,Position = 1)]
         [String[]]
         $CalendarId,
-        [Parameter(Mandatory = $false, Position = 2)]
-        [bool]
-        $ShowDeleted = $false,
-        [Parameter(Mandatory = $false, Position = 3)]
-        [bool]
-        $ShowHidden = $false
+        [Parameter(Mandatory = $false)]
+        [Switch]
+        $ShowDeleted,
+        [Parameter(Mandatory = $false)]
+        [Switch]
+        $ShowHidden
     )
     Begin {
         if ($User -ceq 'me') {
@@ -80,20 +80,19 @@ function Get-GSCalendarSubscription {
             try {
                 Write-Verbose "Getting subscribed calendar list for user '$User'"
                 $request = $service.CalendarList.List()
-                If ($ShowDeleted -eq $true){
-                    $request.$ShowDeleted = $true
+                foreach ($key in $PSBoundParameters.Keys | Where-Object {$request.PSObject.Properties.Name -contains $_}) {
+                    $request.$key = $PSBoundParameters[$key]
                 }
-                If ($ShowHidden -eq $true){
-                    $request.$ShowHidden = $true
+                [int]$i = 1
+                do {
+                    $result = $request.Execute()
+                    $result.Items | Add-Member -MemberType NoteProperty -Name 'User' -Value $User -PassThru
+                    $request.PageToken = $result.NextPageToken
+                    [int]$retrieved = ($i + $result.Items.Count) - 1
+                    Write-Verbose "Retrieved $retrieved Calendar Subscriptions..."
+                    [int]$i = $i + $result.Items.Count
                 }
-                $raw = $request.Execute()
-                $ItemList = [object[]]($raw | Select-Object -ExpandProperty Items)
-                While ($Null -ne $raw.NextPageToken){
-                    $request.SetPageToken($raw.NextPageToken)
-                    $raw = $request.Execute()
-                    $ItemList += $raw | Select-Object -ExpandProperty Items
-                }
-                $ItemList
+                until (-not $result.NextPageToken)
             }
             catch {
                 if ($ErrorActionPreference -eq 'Stop') {
diff --git a/PSGSuite/Public/Drive/Remove-GSDriveFile.ps1 b/PSGSuite/Public/Drive/Remove-GSDriveFile.ps1
index fae296f3..86ea74ee 100644
--- a/PSGSuite/Public/Drive/Remove-GSDriveFile.ps1
+++ b/PSGSuite/Public/Drive/Remove-GSDriveFile.ps1
@@ -45,22 +45,24 @@ function Remove-GSDriveFile {
         $service = New-GoogleService @serviceParams
     }
     Process {
-        try {
-            if ($PSCmdlet.ShouldProcess("Deleting File Id(s) '$FileId' from user '$User'")) {
-                foreach ($file in $FileId) {
+        foreach ($file in $FileId) {
+            try {
+                if ($PSCmdlet.ShouldProcess("Deleting File Id '$file' from user '$User'")) {
+                    Write-Verbose "Deleting File Id '$file' from user '$User'"
                     $request = $service.Files.Delete($file)
-                    #$request.SupportsTeamDrives = $true
+                    $request.SupportsTeamDrives = $true
                     $request.Execute()
+                    Write-Verbose "File Id '$file' successfully deleted from user '$User'"
                 }
             }
-        }
-        catch {
-            if ($ErrorActionPreference -eq 'Stop') {
-                $PSCmdlet.ThrowTerminatingError($_)
-            }
-            else {
-                Write-Error $_
+            catch {
+                if ($ErrorActionPreference -eq 'Stop') {
+                    $PSCmdlet.ThrowTerminatingError($_)
+                }
+                else {
+                    Write-Error $_
+                }
             }
         }
     }
-}
\ No newline at end of file
+}

From 4c81474c5a7a9c5ccb336eb57af05dddecf7274d Mon Sep 17 00:00:00 2001
From: Nate Ferrell <nate@scrthq.com>
Date: Sat, 29 Dec 2018 16:33:39 -0600
Subject: [PATCH 09/10] updated changelog/readme

---
 CHANGELOG.md | 7 +++++--
 README.md    | 7 ++++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d723b7c2..33d2e739 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # Changelog
 
 * [Changelog](#changelog)
+  * [2.22.1](#2221)
   * [2.22.0](#2220)
   * [2.21.3](#2213)
   * [2.21.2](#2212)
@@ -68,10 +69,12 @@
       * [Functions Aliased](#functions-aliased)
 
 ***
+
 ## 2.22.1
 
-* Added Remove-GSDriveFile
-* Get-GSCalendarSubscription: Added support for more than 100 results, ShowHidden & ShowDeleted parameters.
+* [PR #141](https://github.com/scrthq/PSGSuite/pull/141) - _Thanks, [@dwrusse](https://github.com/dwrusse)!_
+* Added: `Remove-GSDriveFile`
+* Updated: `Get-GSCalendarSubscription` to add support for `List()` requests and added the `ShowHidden` & `ShowDeleted` parameters.
 
 ## 2.22.0
 
diff --git a/README.md b/README.md
index 52dd3bd5..a2abee99 100644
--- a/README.md
+++ b/README.md
@@ -136,10 +136,11 @@ Update-GSSheetValue               Export-GSSheet
 
 ### Most recent changes
 
-## 2.22.1
+#### 2.22.1
 
-* Added Remove-GSDriveFile
-* Get-GSCalendarSubscription: Added support for more than 100 results, ShowHidden & ShowDeleted parameters.
+* [PR #141](https://github.com/scrthq/PSGSuite/pull/141) - _Thanks, [@dwrusse](https://github.com/dwrusse)!_
+* Added: `Remove-GSDriveFile`
+* Updated: `Get-GSCalendarSubscription` to add support for `List()` requests and added the `ShowHidden` & `ShowDeleted` parameters.
 
 #### 2.22.0
 

From 053b9db9b03793081db82f4422d0bebe9a710ccc Mon Sep 17 00:00:00 2001
From: Nate Ferrell <nate@scrthq.com>
Date: Sat, 29 Dec 2018 16:34:01 -0600
Subject: [PATCH 10/10] updated changelog/readme

---
 CHANGELOG.md | 4 ++--
 README.md    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 33d2e739..a07db57c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -73,8 +73,8 @@
 ## 2.22.1
 
 * [PR #141](https://github.com/scrthq/PSGSuite/pull/141) - _Thanks, [@dwrusse](https://github.com/dwrusse)!_
-* Added: `Remove-GSDriveFile`
-* Updated: `Get-GSCalendarSubscription` to add support for `List()` requests and added the `ShowHidden` & `ShowDeleted` parameters.
+  * Added: `Remove-GSDriveFile`
+  * Updated: `Get-GSCalendarSubscription` to add support for `List()` requests and added the `ShowHidden` & `ShowDeleted` parameters.
 
 ## 2.22.0
 
diff --git a/README.md b/README.md
index a2abee99..db6b7c0c 100644
--- a/README.md
+++ b/README.md
@@ -139,8 +139,8 @@ Update-GSSheetValue               Export-GSSheet
 #### 2.22.1
 
 * [PR #141](https://github.com/scrthq/PSGSuite/pull/141) - _Thanks, [@dwrusse](https://github.com/dwrusse)!_
-* Added: `Remove-GSDriveFile`
-* Updated: `Get-GSCalendarSubscription` to add support for `List()` requests and added the `ShowHidden` & `ShowDeleted` parameters.
+  * Added: `Remove-GSDriveFile`
+  * Updated: `Get-GSCalendarSubscription` to add support for `List()` requests and added the `ShowHidden` & `ShowDeleted` parameters.
 
 #### 2.22.0