diff --git a/lib/tasks/staging_seeds.rake b/lib/tasks/staging_seeds.rake
index 9f2507fa3..134f5325f 100644
--- a/lib/tasks/staging_seeds.rake
+++ b/lib/tasks/staging_seeds.rake
@@ -22,10 +22,10 @@ namespace :comfy do
     def files_for_deletion(list_of_files_1, list_of_files_2, location)
       files = list_of_files_1 - list_of_files_2
 
-      begin
+      if files.empty?
+        puts "No files to delete"
+      else
         delete_files(files, location)
-      rescue TypeError
-        puts 'Nothing to delete locally, moving on to the next set of files'
       end
     end
 
@@ -39,7 +39,7 @@ namespace :comfy do
       { local_path: File.join(LOCAL, relative_path), remote_path: File.join(REMOTE, relative_path) }
     end
 
-    def check_if_newer(parent_folder, local_item, remote_item, remote_path, local_path, session, downloaded = false)
+    def check_if_newer(parent_folder, local_item, remote_item, remote_path, local_path, session, base = LOCAL)
       if parent_folder.include?(local_item)
         yield if block_given?
 
@@ -49,45 +49,52 @@ namespace :comfy do
           if Dir.glob('*', base: LOCAL).include?(local_item)
             download_files(remote_path, local_path, session) 
           # Will be hit if local_item is a file or folder inside a directory
-          elsif Dir.glob('**/*', base: LOCAL).include?(local_item)
-            download_files(remote_path, LOCAL, session)
+          elsif Dir.glob('**/*', base: base).include?(local_item)
+            download_files(remote_path, base, session)
             downloaded = true  
-          end                
+          end              
         end
       else
         # Just download it if it doesn't exist at all
         download_files(remote_path, LOCAL, session)
         downloaded = true
       end
+
+      downloaded
     end
 
-    def compare_folders(wildcard, local, remote, base = LOCAL)
+    def compare_folders(wildcard, local, remote, session, base = LOCAL)
+      puts "Checking to see what files need to be deleted from #{base}" 
+
       remote_list = session.sftp.dir.glob(remote, wildcard).map do |f|  
         f.name.force_encoding('UTF-8')
       end
 
       local_list = Dir.glob(wildcard, base: local)
 
-      files_for_deletion(local_list, remote_list_names, base)
+      files_for_deletion(local_list, remote_list, base)
     end
 
     def check_inside_folder(folder, local_list, session)
       paths = create_paths(folder)
 
-      compare_folders('**/*', paths[:local_path], paths[:remote_path], paths[:local_path])
+      compare_folders('**/*', paths[:local_path], paths[:remote_path], session, paths[:local_path])
+
+      local_folder_content = Dir.glob('**/*', base: paths[:local_path])
+      remote_folder_content = session.sftp.dir.glob(paths[:remote_path], '**/*')
+      
+      # We don't want to download the whole folder again if it's already been re-downloaded once
+
 
       remote_folder_content.each do |file|
         # Go through the various files and folders and check to see if they exist locally
         local_file = file.name
         absolute_path = File.join(paths[:local_path], file.name)
-
-        # We don't want to download the whole folder again if it's already been re-downloaded once
-        downloaded_once = false
         
-        check_if_newer(local_folder_content, local_file, file, paths[:remote_path], absolute_path, session, downloaded_once)
-
+        check = check_if_newer(local_folder_content, local_file, file, paths[:remote_path], absolute_path, session, paths[:local_path])
+        
         # Break out of loop if already downloaded
-        break if downloaded_once == true
+        break if check == true
       end
     end
 
@@ -97,6 +104,7 @@ namespace :comfy do
         name = object.name.force_encoding('UTF-8')
         paths = create_paths(name)
         
+        
         check_if_newer(local_list, name, object, paths[:remote_path], paths[:local_path], session) do 
           check_inside_folder(name, local_list, session) if object.attributes.directory?
         end
@@ -109,33 +117,40 @@ namespace :comfy do
       
       puts "Importing CMS Seed data from Staging Folder to #{LOCAL} ..."
 
+      puts question = "What would you like to import? 'All/Files/Layouts/Pages' or 'Nothing' to quit"
+      valid_answers = ['All', 'Files', 'Layouts', 'Pages', 'Nothing']
+      answer = STDIN.gets.chomp.downcase.capitalize
+      until valid_answers.include?(answer)
+        puts question
+        answer = STDIN.gets.chomp.downcase.capitalize
+      end
+
+      # Fast-tracked unhappy path
+      abort('Goodbye') if answer == 'Nothing'
+
       # SSH into staging server with Net::SSH
       Net::SSH.start(PP_STAGING, PP_USER) do |session|
          # First get rid of any local top-level (i.e. which exist in the main 
         # directory of REMOTE) folders/files that don't exist remotely
-        compare_folders('*', LOCAL, REMOTE)
-
-        puts question = "What would you like to import? 'All/Files/Layouts' or 'Nothing' to quit"
-        valid_answers = ['All', 'Files', 'Layouts', 'Pages', 'Nothing']
-        answer = STDIN.gets.chomp.downcase.capitalise
-        until valid_answers.include?(answer)
-          puts question
-          answer = STDIN.gets.chomp.downcase.capitalise
-        end
+        compare_folders('*', LOCAL, REMOTE, session)
 
         local_list = Dir.glob('*', base: LOCAL)
-        remote_list = session.sftp.dir.glob(LOCAL, '*')
-        
-        case answer
-        when 'All'
-          main_task(local_list, remote_list, session)
-        when 'Nothing'
-          abort('Goodbye')
+        remote_list = session.sftp.dir.glob(REMOTE, '*')
+
+        if answer == 'All'
+          main_task(local_list, remote_list, session) 
         else
-          remote_list.filter! { |f| f == answer.downcase }
+          local_list.filter! { |f| f == answer.downcase } 
+          remote_list.filter! do |f|
+            f.name.force_encoding('UTF-8') == answer.downcase
+          end
+
+          puts "Downloading a new set of #{answer.downcase}..."
+
           main_task(local_list, remote_list, session)
         end
-      end
+   
+      
       # puts "Finished downloads, now replacing your local seed data..."
 
       # Rake::Task["comfy:cms_seeds:import"].invoke('protected-planet', 'protectedplanet')