diff --git a/Evergreen.xcodeproj/project.pbxproj b/Evergreen.xcodeproj/project.pbxproj
index 06bb6a43e..d2c0ac582 100644
--- a/Evergreen.xcodeproj/project.pbxproj
+++ b/Evergreen.xcodeproj/project.pbxproj
@@ -76,6 +76,8 @@
 		84B06FFE1ED3818D00F0B54B /* RSTree.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 84B06FFA1ED3818000F0B54B /* RSTree.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		84B0700A1ED3822600F0B54B /* RSTextDrawing.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84B070071ED3821900F0B54B /* RSTextDrawing.framework */; };
 		84B0700B1ED3822600F0B54B /* RSTextDrawing.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 84B070071ED3821900F0B54B /* RSTextDrawing.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		84BB4B771F11753300858766 /* Data.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84BB4B681F1174D400858766 /* Data.framework */; };
+		84BB4B781F11753300858766 /* Data.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 84BB4B681F1174D400858766 /* Data.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		84FB9A2F1EDCD6C4003D53B9 /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84FB9A2D1EDCD6B8003D53B9 /* Sparkle.framework */; };
 		84FB9A301EDCD6C4003D53B9 /* Sparkle.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 84FB9A2D1EDCD6B8003D53B9 /* Sparkle.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 /* End PBXBuildFile section */
@@ -312,6 +314,13 @@
 			remoteGlobalIDString = 844BEE641F0AB3C9004AB7CD;
 			remoteInfo = DataTests;
 		};
+		84BB4B791F11753300858766 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 84BB4B611F1174D400858766 /* Data.xcodeproj */;
+			proxyType = 1;
+			remoteGlobalIDString = 844BEE5A1F0AB3C8004AB7CD;
+			remoteInfo = Data;
+		};
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -321,6 +330,7 @@
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
+				84BB4B781F11753300858766 /* Data.framework in Embed Frameworks */,
 				84FB9A301EDCD6C4003D53B9 /* Sparkle.framework in Embed Frameworks */,
 				849B897D1F0349D000578A8D /* RSParser.framework in Embed Frameworks */,
 				84B06FB31ED37DBD00F0B54B /* RSDatabase.framework in Embed Frameworks */,
@@ -411,6 +421,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				84BB4B771F11753300858766 /* Data.framework in Frameworks */,
 				84B06FB21ED37DBD00F0B54B /* RSDatabase.framework in Frameworks */,
 				849B897C1F0349D000578A8D /* RSParser.framework in Frameworks */,
 				84B0700A1ED3822600F0B54B /* RSTextDrawing.framework in Frameworks */,
@@ -777,6 +788,7 @@
 				84B0700D1ED3822600F0B54B /* PBXTargetDependency */,
 				8471A2F81ED4D062008F099E /* PBXTargetDependency */,
 				849B897F1F0349D000578A8D /* PBXTargetDependency */,
+				84BB4B7A1F11753300858766 /* PBXTargetDependency */,
 			);
 			name = Evergreen;
 			productName = Evergreen;
@@ -1185,6 +1197,11 @@
 			name = RSTextDrawing;
 			targetProxy = 84B0700C1ED3822600F0B54B /* PBXContainerItemProxy */;
 		};
+		84BB4B7A1F11753300858766 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = Data;
+			targetProxy = 84BB4B791F11753300858766 /* PBXContainerItemProxy */;
+		};
 /* End PBXTargetDependency section */
 
 /* Begin PBXVariantGroup section */
@@ -1294,6 +1311,8 @@
 				SDKROOT = macosx;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -1335,6 +1354,8 @@
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = macosx;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};
@@ -1355,7 +1376,6 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.Evergreen;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				SWIFT_VERSION = 3.0;
 			};
 			name = Debug;
 		};
@@ -1376,7 +1396,6 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.Evergreen;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				SWIFT_VERSION = 3.0;
 			};
 			name = Release;
 		};
@@ -1391,7 +1410,6 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.EvergreenTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Evergreen.app/Contents/MacOS/Evergreen";
 			};
 			name = Debug;
@@ -1407,7 +1425,6 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.EvergreenTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Evergreen.app/Contents/MacOS/Evergreen";
 			};
 			name = Release;
diff --git a/Frameworks/LocalAccount/LocalAccount.swift b/Frameworks/LocalAccount/LocalAccount.swift
index 44f655989..55631ae9c 100644
--- a/Frameworks/LocalAccount/LocalAccount.swift
+++ b/Frameworks/LocalAccount/LocalAccount.swift
@@ -10,7 +10,7 @@ import Foundation
 import RSCore
 import RSParser
 import RSWeb
-import DataModel
+import Data
 
 private let localAccountType = "OnMyMac"
 
diff --git a/Frameworks/LocalAccount/LocalArticle.swift b/Frameworks/LocalAccount/LocalArticle.swift
index 1520220b7..658978e8d 100644
--- a/Frameworks/LocalAccount/LocalArticle.swift
+++ b/Frameworks/LocalAccount/LocalArticle.swift
@@ -7,7 +7,7 @@
 //
 
 import Foundation
-import DataModel
+import Data
 import RSParser
 
 public final class LocalArticle: Article, Hashable {
diff --git a/Frameworks/LocalAccount/LocalArticleStatus.swift b/Frameworks/LocalAccount/LocalArticleStatus.swift
index 4aa07ae2f..4b4d7db48 100644
--- a/Frameworks/LocalAccount/LocalArticleStatus.swift
+++ b/Frameworks/LocalAccount/LocalArticleStatus.swift
@@ -8,7 +8,7 @@
 
 import Foundation
 import RSDatabase
-import DataModel
+import Data
 
 public final class LocalArticleStatus: ArticleStatus, Hashable {
 
diff --git a/Frameworks/LocalAccount/LocalAuthor.swift b/Frameworks/LocalAccount/LocalAuthor.swift
index 1799538bb..9cc6a9589 100644
--- a/Frameworks/LocalAccount/LocalAuthor.swift
+++ b/Frameworks/LocalAccount/LocalAuthor.swift
@@ -8,7 +8,7 @@
 
 import Foundation
 import RSParser
-import DataModel
+import Data
 
 extension ParsedAuthor: Author {
 }
diff --git a/Frameworks/LocalAccount/LocalDatabase.swift b/Frameworks/LocalAccount/LocalDatabase.swift
index 575e53d5f..bfbd5a48b 100644
--- a/Frameworks/LocalAccount/LocalDatabase.swift
+++ b/Frameworks/LocalAccount/LocalDatabase.swift
@@ -10,7 +10,7 @@ import Foundation
 import RSCore
 import RSParser
 import RSDatabase
-import DataModel
+import Data
 
 let sqlLogging = false
 
diff --git a/Frameworks/LocalAccount/LocalFeed.swift b/Frameworks/LocalAccount/LocalFeed.swift
index c71472d7c..993cb2340 100644
--- a/Frameworks/LocalAccount/LocalFeed.swift
+++ b/Frameworks/LocalAccount/LocalFeed.swift
@@ -8,7 +8,7 @@
 
 import Foundation
 import RSWeb
-import DataModel
+import Data
 import RSCore
 
 public final class LocalFeed: Feed, PlistProvider, Hashable {
diff --git a/Frameworks/LocalAccount/LocalFolder.swift b/Frameworks/LocalAccount/LocalFolder.swift
index 9f4f548d4..f71d59bb4 100644
--- a/Frameworks/LocalAccount/LocalFolder.swift
+++ b/Frameworks/LocalAccount/LocalFolder.swift
@@ -8,7 +8,7 @@
 
 import Foundation
 import RSCore
-import DataModel
+import Data
 
 let folderIDKey = "folderID"
 private let folderNameKey = "name"
diff --git a/Frameworks/LocalAccount/LocalStatusesManager.swift b/Frameworks/LocalAccount/LocalStatusesManager.swift
index 7bcac071c..db6f5c790 100644
--- a/Frameworks/LocalAccount/LocalStatusesManager.swift
+++ b/Frameworks/LocalAccount/LocalStatusesManager.swift
@@ -10,7 +10,7 @@ import Foundation
 import RSCore
 import RSDatabase
 import RSParser
-import DataModel
+import Data
 
 final class LocalStatusesManager {