 		updateFeedIDDictionary()
 	}
 
-	func objects(with diskObjects: [[String: Any]]) -> [AnyObject] {
-
-		return diskObjects.flatMap { object(with: $0) }
-	}
-
-	func object(with diskObject: [String: Any]) -> AnyObject? {
-
-		if Feed.isFeedDictionary(diskObject) {
-			return Feed(accountID: accountID, dictionary: diskObject)
-		}
-		return Folder(account: self, dictionary: diskObject)
-	}
-
-	func saveToDiskIfNeeded() {
-
-		if dirty {
-			saveToDisk()
-		}
-	}
-
-	private func diskDictionary() -> NSDictionary {
+	func diskDictionary() -> NSDictionary {
 
 		let diskObjects = topLevelObjects.flatMap { (object) -> [String: Any]? in
 

		catch let error as NSError {
			NSApplication.shared.presentError(error)
		}

		dirty = false
	}
}


}


// MARK: - Disk (Public)

extension Account {

	func objects(with diskObjects: [[String: Any]]) -> [AnyObject] {

		return diskObjects.flatMap { object(with: $0) }
	}
}

// MARK: - Disk (Private)

private extension Account {
	
	struct Key {
		static let children = "children"
	}

	func object(with diskObject: [String: Any]) -> AnyObject? {

		if Feed.isFeedDictionary(diskObject) {
			return Feed(accountID: accountID, dictionary: diskObject)
		}
		return Folder(account: self, dictionary: diskObject)
	}

	func pullObjectsFromDisk() {
