 class CloudKitAcountZoneDelegate: CloudKitZoneDelegate {
 	
 	private typealias UnclaimedWebFeed = (url: URL, name: String?, editedName: String?, homePageURL: String?, webFeedExternalID: String)
-	private var unclaimedWebFeeds = [String: [UnclaimedWebFeed]]()
-	
+	private var newUnclaimedWebFeeds = [String: [UnclaimedWebFeed]]()
+	private var existingUnclaimedWebFeeds = [String: [WebFeed]]()
+
 	private var log = OSLog(subsystem: Bundle.main.bundleIdentifier!, category: "CloudKit")
 
 	weak var account: Account?

			folder?.externalID = record.externalID
		}
		
		if let folder = folder, let containerExternalID = folder.externalID, let unclaimedWebFeeds = unclaimedWebFeeds[containerExternalID] {
			for unclaimedWebFeed in unclaimedWebFeeds {
				createWebFeedIfNecessary(url: unclaimedWebFeed.url,
										 name: unclaimedWebFeed.name,
										 editedName: unclaimedWebFeed.editedName,
										 homePageURL: unclaimedWebFeed.homePageURL,
										 webFeedExternalID: unclaimedWebFeed.webFeedExternalID,
										 container: folder)
			}

			self.unclaimedWebFeeds.removeValue(forKey: containerExternalID)
		}
		
	}
	
	func removeContainer(_ externalID: String) {

				if let container = account.existingContainer(withExternalID: containerExternalID) {
					createWebFeedIfNecessary(url: url, name: name, editedName: editedName, homePageURL: homePageURL, webFeedExternalID: record.externalID, container: container)
				} else {
					addNewUnclaimedWebFeed(url: url, name: name, editedName: editedName, homePageURL: homePageURL, webFeedExternalID: record.externalID, containerExternalID: containerExternalID)
				}
			}
		}
