 		container.addWebFeed(webFeed)
 	}
 	
-	func addUnclaimedWebFeed(url: URL, name: String?, editedName: String?, homePageURL: String?, webFeedExternalID: String, containerExternalID: String) {
-		if var unclaimedWebFeeds = self.unclaimedWebFeeds[containerExternalID] {
+	func addNewUnclaimedWebFeed(url: URL, name: String?, editedName: String?, homePageURL: String?, webFeedExternalID: String, containerExternalID: String) {
+		if var unclaimedWebFeeds = self.newUnclaimedWebFeeds[containerExternalID] {
 			unclaimedWebFeeds.append(UnclaimedWebFeed(url: url, name: name, editedName: editedName, homePageURL: homePageURL, webFeedExternalID: webFeedExternalID))
-			self.unclaimedWebFeeds[containerExternalID] = unclaimedWebFeeds
+			self.newUnclaimedWebFeeds[containerExternalID] = unclaimedWebFeeds
 		} else {
 			var unclaimedWebFeeds = [UnclaimedWebFeed]()
 			unclaimedWebFeeds.append(UnclaimedWebFeed(url: url, name: name, editedName: editedName, homePageURL: homePageURL, webFeedExternalID: webFeedExternalID))
-			self.unclaimedWebFeeds[containerExternalID] = unclaimedWebFeeds
+			self.newUnclaimedWebFeeds[containerExternalID] = unclaimedWebFeeds
+		}
+	}
+	
+	func addExistingUnclaimedWebFeed(_ webFeed: WebFeed, containerExternalID: String) {
+		if var unclaimedWebFeeds = self.existingUnclaimedWebFeeds[containerExternalID] {
+			unclaimedWebFeeds.append(webFeed)
+			self.existingUnclaimedWebFeeds[containerExternalID] = unclaimedWebFeeds
+		} else {
+			var unclaimedWebFeeds = [WebFeed]()
+			unclaimedWebFeeds.append(webFeed)
+			self.existingUnclaimedWebFeeds[containerExternalID] = unclaimedWebFeeds
 		}
 	}
 	

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

class CloudKitAcountZoneDelegate: CloudKitZoneDelegate {
	
	private typealias UnclaimedWebFeed = (url: URL, name: String?, editedName: String?, homePageURL: String?, webFeedExternalID: String)
	private var newUnclaimedWebFeeds = [String: [UnclaimedWebFeed]]()
	private var existingUnclaimedWebFeeds = [String: [WebFeed]]()

	private var log = OSLog(subsystem: Bundle.main.bundleIdentifier!, category: "CloudKit")

	weak var account: Account?
