diff --git a/.gitmodules b/.gitmodules
index d5c3847fd..a5b5bfe30 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,6 @@
 [submodule "submodules/RSParser"]
 	path = submodules/RSParser
 	url = https://github.com/brentsimmons/RSParser
-[submodule "submodules/RSDatabase"]
-	path = submodules/RSDatabase
-	url = https://github.com/brentsimmons/RSDatabase
 [submodule "submodules/Sparkle"]
 	path = submodules/Sparkle
 	url = https://github.com/brentsimmons/Sparkle
diff --git a/Frameworks/Account/Account.xcodeproj/project.pbxproj b/Frameworks/Account/Account.xcodeproj/project.pbxproj
index e91cd0747..cfa92c426 100644
--- a/Frameworks/Account/Account.xcodeproj/project.pbxproj
+++ b/Frameworks/Account/Account.xcodeproj/project.pbxproj
@@ -80,6 +80,8 @@
 		519E84A62433D49000D238B0 /* OPMLNormalizer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 519E84A52433D49000D238B0 /* OPMLNormalizer.swift */; };
 		519E84A82434C5EF00D238B0 /* CloudKitArticlesZone.swift in Sources */ = {isa = PBXBuildFile; fileRef = 519E84A72434C5EF00D238B0 /* CloudKitArticlesZone.swift */; };
 		519E84AC2435019100D238B0 /* CloudKitArticlesZoneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 519E84AB2435019100D238B0 /* CloudKitArticlesZoneDelegate.swift */; };
+		51B0DF1B24D24F12000AD99E /* RSDatabase in Frameworks */ = {isa = PBXBuildFile; productRef = 51B0DF1A24D24F12000AD99E /* RSDatabase */; };
+		51B0DF1C24D24F12000AD99E /* RSDatabase in Embed Frameworks */ = {isa = PBXBuildFile; productRef = 51B0DF1A24D24F12000AD99E /* RSDatabase */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
 		51B36305244B6135000DEF2A /* TwitterEntities.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51B36304244B6135000DEF2A /* TwitterEntities.swift */; };
 		51B36307244B6234000DEF2A /* TwitterHashtag.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51B36306244B6234000DEF2A /* TwitterHashtag.swift */; };
 		51B36309244B62A5000DEF2A /* TwitterURL.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51B36308244B62A5000DEF2A /* TwitterURL.swift */; };
@@ -137,7 +139,6 @@
 		84C8B3F41F89DE430053CCA6 /* DataExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84C8B3F31F89DE430053CCA6 /* DataExtensions.swift */; };
 		84CAD7161FDF2E22000F0755 /* FeedbinEntry.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84CAD7151FDF2E22000F0755 /* FeedbinEntry.swift */; };
 		84D09623217418DC00D77525 /* FeedbinTagging.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84D09622217418DC00D77525 /* FeedbinTagging.swift */; };
-		84EAC4822148CC6300F154AB /* RSDatabase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84EAC4812148CC6300F154AB /* RSDatabase.framework */; };
 		84F1F06E2243524700DA0616 /* AccountMetadata.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84AF4EA3222CFDD100F6A800 /* AccountMetadata.swift */; };
 		84F73CF1202788D90000BCEF /* ArticleFetcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84F73CF0202788D80000BCEF /* ArticleFetcher.swift */; };
 		9E03C11C235D921400FB6D9E /* FeedlyOperationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9E03C11B235D921400FB6D9E /* FeedlyOperationTests.swift */; };
@@ -280,6 +281,7 @@
 			files = (
 				51383A4724D1FF160027E272 /* RSWeb in Embed Frameworks */,
 				51383A4424D1FF030027E272 /* RSCore in Embed Frameworks */,
+				51B0DF1C24D24F12000AD99E /* RSDatabase in Embed Frameworks */,
 			);
 			name = "Embed Frameworks";
 			runOnlyForDeploymentPostprocessing = 0;
@@ -533,10 +535,10 @@
 			buildActionMask = 2147483647;
 			files = (
 				51383A4624D1FF160027E272 /* RSWeb in Frameworks */,
-				84EAC4822148CC6300F154AB /* RSDatabase.framework in Frameworks */,
 				841D4D722106B40A00DD04E6 /* Articles.framework in Frameworks */,
 				841D4D702106B40400DD04E6 /* ArticlesDatabase.framework in Frameworks */,
 				51383A4324D1FF030027E272 /* RSCore in Frameworks */,
+				51B0DF1B24D24F12000AD99E /* RSDatabase in Frameworks */,
 				51E148EC234B8FFC0004F7A5 /* SyncDatabase.framework in Frameworks */,
 				841973FF1F6DD1C5006346C4 /* RSParser.framework in Frameworks */,
 				5102FD80244009E000534F17 /* Secrets.framework in Frameworks */,
@@ -1034,6 +1036,7 @@
 			packageProductDependencies = (
 				51383A4224D1FF030027E272 /* RSCore */,
 				51383A4524D1FF160027E272 /* RSWeb */,
+				51B0DF1A24D24F12000AD99E /* RSDatabase */,
 			);
 			productName = Account;
 			productReference = 848934F61F62484F00CEBD24 /* Account.framework */;
@@ -1089,6 +1092,7 @@
 			packageReferences = (
 				5102AE8024D180A80050839C /* XCRemoteSwiftPackageReference "RSCore" */,
 				51383A3E24D1FE9A0027E272 /* XCRemoteSwiftPackageReference "RSWeb" */,
+				51B0DF1924D24F12000AD99E /* XCRemoteSwiftPackageReference "RSDatabase" */,
 			);
 			productRefGroup = 848934F71F62484F00CEBD24 /* Products */;
 			projectDirPath = "";
@@ -1509,6 +1513,14 @@
 				minimumVersion = "1.0.0-beta2";
 			};
 		};
+		51B0DF1924D24F12000AD99E /* XCRemoteSwiftPackageReference "RSDatabase" */ = {
+			isa = XCRemoteSwiftPackageReference;
+			repositoryURL = "https://github.com/Ranchero-Software/RSDatabase.git";
+			requirement = {
+				kind = upToNextMajorVersion;
+				minimumVersion = "1.0.0-beta1";
+			};
+		};
 /* End XCRemoteSwiftPackageReference section */
 
 /* Begin XCSwiftPackageProductDependency section */
@@ -1522,6 +1534,11 @@
 			package = 51383A3E24D1FE9A0027E272 /* XCRemoteSwiftPackageReference "RSWeb" */;
 			productName = RSWeb;
 		};
+		51B0DF1A24D24F12000AD99E /* RSDatabase */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 51B0DF1924D24F12000AD99E /* XCRemoteSwiftPackageReference "RSDatabase" */;
+			productName = RSDatabase;
+		};
 /* End XCSwiftPackageProductDependency section */
 	};
 	rootObject = 848934ED1F62484F00CEBD24 /* Project object */;
diff --git a/Frameworks/ArticlesDatabase/ArticlesDatabase.xcodeproj/project.pbxproj b/Frameworks/ArticlesDatabase/ArticlesDatabase.xcodeproj/project.pbxproj
index 4c06e2dbb..7990ef0a5 100644
--- a/Frameworks/ArticlesDatabase/ArticlesDatabase.xcodeproj/project.pbxproj
+++ b/Frameworks/ArticlesDatabase/ArticlesDatabase.xcodeproj/project.pbxproj
@@ -9,6 +9,8 @@
 /* Begin PBXBuildFile section */
 		5102AE8C24D181080050839C /* RSCore in Frameworks */ = {isa = PBXBuildFile; productRef = 5102AE8B24D181080050839C /* RSCore */; };
 		5102AE8D24D181080050839C /* RSCore in Embed Frameworks */ = {isa = PBXBuildFile; productRef = 5102AE8B24D181080050839C /* RSCore */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
+		51B0DF1724D24EC4000AD99E /* RSDatabase in Frameworks */ = {isa = PBXBuildFile; productRef = 51B0DF1624D24EC4000AD99E /* RSDatabase */; };
+		51B0DF1824D24EC4000AD99E /* RSDatabase in Embed Frameworks */ = {isa = PBXBuildFile; productRef = 51B0DF1624D24EC4000AD99E /* RSDatabase */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
 		51C451FF2264CF2100C03939 /* RSParser.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 51C451FE2264CF2100C03939 /* RSParser.framework */; };
 		84116B8923E01E86000B2E98 /* FetchFeedUnreadCountOperation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84116B8823E01E86000B2E98 /* FetchFeedUnreadCountOperation.swift */; };
 		841D4D742106B59F00DD04E6 /* Articles.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 841D4D732106B59F00DD04E6 /* Articles.framework */; };
@@ -24,7 +26,6 @@
 		8455807A1F0AF67D003CCFA1 /* ArticleStatus+Database.swift in Sources */ = {isa = PBXBuildFile; fileRef = 845580791F0AF67D003CCFA1 /* ArticleStatus+Database.swift */; };
 		84611DCC23E62FE200BC630C /* FetchUnreadCountsForFeedsOperation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84611DCB23E62FE200BC630C /* FetchUnreadCountsForFeedsOperation.swift */; };
 		8477ACBC2221E76F00DF7F37 /* SearchTable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8477ACBB2221E76F00DF7F37 /* SearchTable.swift */; };
-		848E3EBD20FBCFDE0004B7ED /* RSDatabase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 848E3EBC20FBCFDE0004B7ED /* RSDatabase.framework */; };
 		84C242C923DEB45C00C50516 /* FetchAllUnreadCountsOperation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84C242C823DEB45C00C50516 /* FetchAllUnreadCountsOperation.swift */; };
 		84E156EA1F0AB80500F8CC05 /* ArticlesDatabase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84E156E91F0AB80500F8CC05 /* ArticlesDatabase.swift */; };
 		84E156EC1F0AB80E00F8CC05 /* ArticlesTable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84E156EB1F0AB80E00F8CC05 /* ArticlesTable.swift */; };
@@ -119,6 +120,7 @@
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
+				51B0DF1824D24EC4000AD99E /* RSDatabase in Embed Frameworks */,
 				5102AE8D24D181080050839C /* RSCore in Embed Frameworks */,
 			);
 			name = "Embed Frameworks";
@@ -169,10 +171,10 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				51B0DF1724D24EC4000AD99E /* RSDatabase in Frameworks */,
 				5102AE8C24D181080050839C /* RSCore in Frameworks */,
 				51C451FF2264CF2100C03939 /* RSParser.framework in Frameworks */,
 				841D4D742106B59F00DD04E6 /* Articles.framework in Frameworks */,
-				848E3EBD20FBCFDE0004B7ED /* RSDatabase.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -346,6 +348,7 @@
 			name = ArticlesDatabase;
 			packageProductDependencies = (
 				5102AE8B24D181080050839C /* RSCore */,
+				51B0DF1624D24EC4000AD99E /* RSDatabase */,
 			);
 			productName = Database;
 			productReference = 844BEE371F0AB3AA004AB7CD /* ArticlesDatabase.framework */;
@@ -403,6 +406,7 @@
 			mainGroup = 844BEE2D1F0AB3AA004AB7CD;
 			packageReferences = (
 				5102AE8A24D181080050839C /* XCRemoteSwiftPackageReference "RSCore" */,
+				51B0DF1524D24EC4000AD99E /* XCRemoteSwiftPackageReference "RSDatabase" */,
 			);
 			productRefGroup = 844BEE381F0AB3AA004AB7CD /* Products */;
 			projectDirPath = "";
@@ -669,6 +673,14 @@
 				minimumVersion = "1.0.0-beta1";
 			};
 		};
+		51B0DF1524D24EC4000AD99E /* XCRemoteSwiftPackageReference "RSDatabase" */ = {
+			isa = XCRemoteSwiftPackageReference;
+			repositoryURL = "https://github.com/Ranchero-Software/RSDatabase.git";
+			requirement = {
+				kind = upToNextMajorVersion;
+				minimumVersion = "1.0.0-beta1";
+			};
+		};
 /* End XCRemoteSwiftPackageReference section */
 
 /* Begin XCSwiftPackageProductDependency section */
@@ -677,6 +689,11 @@
 			package = 5102AE8A24D181080050839C /* XCRemoteSwiftPackageReference "RSCore" */;
 			productName = RSCore;
 		};
+		51B0DF1624D24EC4000AD99E /* RSDatabase */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 51B0DF1524D24EC4000AD99E /* XCRemoteSwiftPackageReference "RSDatabase" */;
+			productName = RSDatabase;
+		};
 /* End XCSwiftPackageProductDependency section */
 	};
 	rootObject = 844BEE2E1F0AB3AA004AB7CD /* Project object */;
diff --git a/Frameworks/ArticlesDatabase/ArticlesTable.swift b/Frameworks/ArticlesDatabase/ArticlesTable.swift
index 65fea954e..e5c134ea8 100644
--- a/Frameworks/ArticlesDatabase/ArticlesTable.swift
+++ b/Frameworks/ArticlesDatabase/ArticlesTable.swift
@@ -9,6 +9,7 @@
 import Foundation
 import RSCore
 import RSDatabase
+import RSDatabaseObjC
 import RSParser
 import Articles
 
diff --git a/Frameworks/ArticlesDatabase/AuthorsTable.swift b/Frameworks/ArticlesDatabase/AuthorsTable.swift
index 543e83af4..ad447ddaa 100644
--- a/Frameworks/ArticlesDatabase/AuthorsTable.swift
+++ b/Frameworks/ArticlesDatabase/AuthorsTable.swift
@@ -8,6 +8,7 @@
 
 import Foundation
 import RSDatabase
+import RSDatabaseObjC
 import Articles
 
 // article->authors is a many-to-many relationship.
diff --git a/Frameworks/ArticlesDatabase/Extensions/Article+Database.swift b/Frameworks/ArticlesDatabase/Extensions/Article+Database.swift
index d3e78c687..31c2d3608 100644
--- a/Frameworks/ArticlesDatabase/Extensions/Article+Database.swift
+++ b/Frameworks/ArticlesDatabase/Extensions/Article+Database.swift
@@ -8,6 +8,7 @@
 
 import Foundation
 import RSDatabase
+import RSDatabaseObjC
 import Articles
 import RSParser
 
diff --git a/Frameworks/ArticlesDatabase/Extensions/ArticleStatus+Database.swift b/Frameworks/ArticlesDatabase/Extensions/ArticleStatus+Database.swift
index 143a19536..574ef5032 100644
--- a/Frameworks/ArticlesDatabase/Extensions/ArticleStatus+Database.swift
+++ b/Frameworks/ArticlesDatabase/Extensions/ArticleStatus+Database.swift
@@ -8,6 +8,7 @@
 
 import Foundation
 import RSDatabase
+import RSDatabaseObjC
 import Articles
 
 extension ArticleStatus {
diff --git a/Frameworks/ArticlesDatabase/Extensions/Author+Database.swift b/Frameworks/ArticlesDatabase/Extensions/Author+Database.swift
index d1d69b715..d40f96fba 100644
--- a/Frameworks/ArticlesDatabase/Extensions/Author+Database.swift
+++ b/Frameworks/ArticlesDatabase/Extensions/Author+Database.swift
@@ -9,6 +9,7 @@
 import Foundation
 import Articles
 import RSDatabase
+import RSDatabaseObjC
 import RSParser
 
 // MARK: - DatabaseObject
diff --git a/Frameworks/ArticlesDatabase/Operations/FetchAllUnreadCountsOperation.swift b/Frameworks/ArticlesDatabase/Operations/FetchAllUnreadCountsOperation.swift
index 04c77d955..bad3e2e1f 100644
--- a/Frameworks/ArticlesDatabase/Operations/FetchAllUnreadCountsOperation.swift
+++ b/Frameworks/ArticlesDatabase/Operations/FetchAllUnreadCountsOperation.swift
@@ -9,6 +9,7 @@
 import Foundation
 import RSCore
 import RSDatabase
+import RSDatabaseObjC
 
 public final class FetchAllUnreadCountsOperation: MainThreadOperation {
 
diff --git a/Frameworks/ArticlesDatabase/Operations/FetchFeedUnreadCountOperation.swift b/Frameworks/ArticlesDatabase/Operations/FetchFeedUnreadCountOperation.swift
index 289bb73e6..03c6cf793 100644
--- a/Frameworks/ArticlesDatabase/Operations/FetchFeedUnreadCountOperation.swift
+++ b/Frameworks/ArticlesDatabase/Operations/FetchFeedUnreadCountOperation.swift
@@ -9,6 +9,7 @@
 import Foundation
 import RSCore
 import RSDatabase
+import RSDatabaseObjC
 
 /// Fetch the unread count for a single feed.
 public final class FetchFeedUnreadCountOperation: MainThreadOperation {
diff --git a/Frameworks/ArticlesDatabase/Operations/FetchUnreadCountsForFeedsOperation.swift b/Frameworks/ArticlesDatabase/Operations/FetchUnreadCountsForFeedsOperation.swift
index 7f7533b77..3a560a94d 100644
--- a/Frameworks/ArticlesDatabase/Operations/FetchUnreadCountsForFeedsOperation.swift
+++ b/Frameworks/ArticlesDatabase/Operations/FetchUnreadCountsForFeedsOperation.swift
@@ -9,6 +9,7 @@
 import Foundation
 import RSCore
 import RSDatabase
+import RSDatabaseObjC
 
 /// Fetch the unread counts for a number of feeds.
 public final class FetchUnreadCountsForFeedsOperation: MainThreadOperation {
diff --git a/Frameworks/ArticlesDatabase/SearchTable.swift b/Frameworks/ArticlesDatabase/SearchTable.swift
index 0733611a6..9f97a6d69 100644
--- a/Frameworks/ArticlesDatabase/SearchTable.swift
+++ b/Frameworks/ArticlesDatabase/SearchTable.swift
@@ -9,6 +9,7 @@
 import Foundation
 import RSCore
 import RSDatabase
+import RSDatabaseObjC
 import Articles
 import RSParser
 
diff --git a/Frameworks/ArticlesDatabase/StatusesTable.swift b/Frameworks/ArticlesDatabase/StatusesTable.swift
index de71c73b6..5d8529a1e 100644
--- a/Frameworks/ArticlesDatabase/StatusesTable.swift
+++ b/Frameworks/ArticlesDatabase/StatusesTable.swift
@@ -9,6 +9,7 @@
 import Foundation
 import RSCore
 import RSDatabase
+import RSDatabaseObjC
 import Articles
 
 // Article->ArticleStatus is a to-one relationship.
diff --git a/Frameworks/SyncDatabase/SyncDatabase.xcodeproj/project.pbxproj b/Frameworks/SyncDatabase/SyncDatabase.xcodeproj/project.pbxproj
index 113fc6111..cdc6be2b2 100644
--- a/Frameworks/SyncDatabase/SyncDatabase.xcodeproj/project.pbxproj
+++ b/Frameworks/SyncDatabase/SyncDatabase.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 50;
+	objectVersion = 52;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -14,11 +14,26 @@
 		51554C1F228B701F0055115A /* SyncDatabase_project_debug.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 51554C1A228B701F0055115A /* SyncDatabase_project_debug.xcconfig */; };
 		51554C21228B701F0055115A /* SyncDatabase_project_release.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 51554C1C228B701F0055115A /* SyncDatabase_project_release.xcconfig */; };
 		51554C22228B701F0055115A /* SyncDatabase_target.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 51554C1D228B701F0055115A /* SyncDatabase_target.xcconfig */; };
-		51554C36228B72F40055115A /* RSDatabase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 51554C35228B72F40055115A /* RSDatabase.framework */; };
 		51554C38228B7DAC0055115A /* Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51554C37228B7DAC0055115A /* Constants.swift */; };
 		51554C3A228B83380055115A /* Articles.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 51554C39228B83380055115A /* Articles.framework */; };
+		51B0DF1324D24EA6000AD99E /* RSDatabase in Frameworks */ = {isa = PBXBuildFile; productRef = 51B0DF1224D24EA6000AD99E /* RSDatabase */; };
+		51B0DF1424D24EA6000AD99E /* RSDatabase in Embed Frameworks */ = {isa = PBXBuildFile; productRef = 51B0DF1224D24EA6000AD99E /* RSDatabase */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
 /* End PBXBuildFile section */
 
+/* Begin PBXCopyFilesBuildPhase section */
+		51B0DEC524D245A2000AD99E /* Embed Frameworks */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "";
+			dstSubfolderSpec = 10;
+			files = (
+				51B0DF1424D24EA6000AD99E /* RSDatabase in Embed Frameworks */,
+			);
+			name = "Embed Frameworks";
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXCopyFilesBuildPhase section */
+
 /* Begin PBXFileReference section */
 		51554BEB228B6E8F0055115A /* SyncDatabase.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SyncDatabase.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		51554BEF228B6E8F0055115A /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -39,8 +54,8 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				51B0DF1324D24EA6000AD99E /* RSDatabase in Frameworks */,
 				51554C3A228B83380055115A /* Articles.framework in Frameworks */,
-				51554C36228B72F40055115A /* RSDatabase.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -111,12 +126,16 @@
 				51554BE8228B6E8F0055115A /* Frameworks */,
 				51554BE9228B6E8F0055115A /* Resources */,
 				51C8F349234FB0C40048ED95 /* Run Script: Verfiy No Build Settings */,
+				51B0DEC524D245A2000AD99E /* Embed Frameworks */,
 			);
 			buildRules = (
 			);
 			dependencies = (
 			);
 			name = SyncDatabase;
+			packageProductDependencies = (
+				51B0DF1224D24EA6000AD99E /* RSDatabase */,
+			);
 			productName = SyncDatabase;
 			productReference = 51554BEB228B6E8F0055115A /* SyncDatabase.framework */;
 			productType = "com.apple.product-type.framework";
@@ -143,6 +162,9 @@
 				en,
 			);
 			mainGroup = 51554BE1228B6E8F0055115A;
+			packageReferences = (
+				51B0DF1124D24EA6000AD99E /* XCRemoteSwiftPackageReference "RSDatabase" */,
+			);
 			productRefGroup = 51554BEC228B6E8F0055115A /* Products */;
 			projectDirPath = "";
 			projectRoot = "";
@@ -252,6 +274,25 @@
 			defaultConfigurationName = Release;
 		};
 /* End XCConfigurationList section */
+
+/* Begin XCRemoteSwiftPackageReference section */
+		51B0DF1124D24EA6000AD99E /* XCRemoteSwiftPackageReference "RSDatabase" */ = {
+			isa = XCRemoteSwiftPackageReference;
+			repositoryURL = "https://github.com/Ranchero-Software/RSDatabase.git";
+			requirement = {
+				kind = upToNextMajorVersion;
+				minimumVersion = "1.0.0-beta1";
+			};
+		};
+/* End XCRemoteSwiftPackageReference section */
+
+/* Begin XCSwiftPackageProductDependency section */
+		51B0DF1224D24EA6000AD99E /* RSDatabase */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 51B0DF1124D24EA6000AD99E /* XCRemoteSwiftPackageReference "RSDatabase" */;
+			productName = RSDatabase;
+		};
+/* End XCSwiftPackageProductDependency section */
 	};
 	rootObject = 51554BE2228B6E8F0055115A /* Project object */;
 }
diff --git a/Frameworks/SyncDatabase/SyncStatusTable.swift b/Frameworks/SyncDatabase/SyncStatusTable.swift
index 9661becf7..ac5a510eb 100644
--- a/Frameworks/SyncDatabase/SyncStatusTable.swift
+++ b/Frameworks/SyncDatabase/SyncStatusTable.swift
@@ -10,6 +10,7 @@ import Foundation
 import RSCore
 import Articles
 import RSDatabase
+import RSDatabaseObjC
 
 struct SyncStatusTable: DatabaseTable {
 
diff --git a/Multiplatform/macOS/AppDelegate.swift b/Multiplatform/macOS/AppDelegate.swift
index 52b051073..e67db4a78 100644
--- a/Multiplatform/macOS/AppDelegate.swift
+++ b/Multiplatform/macOS/AppDelegate.swift
@@ -10,7 +10,6 @@ import AppKit
 import os.log
 import UserNotifications
 import Articles
-import RSTree
 import RSWeb
 import Account
 import RSCore
diff --git a/NetNewsWire.xcodeproj/project.pbxproj b/NetNewsWire.xcodeproj/project.pbxproj
index be282fcd3..a673e40ec 100644
--- a/NetNewsWire.xcodeproj/project.pbxproj
+++ b/NetNewsWire.xcodeproj/project.pbxproj
@@ -71,10 +71,6 @@
 		5102AE6C24D17F7C0050839C /* RSCoreResources in Frameworks */ = {isa = PBXBuildFile; productRef = 5102AE6B24D17F7C0050839C /* RSCoreResources */; };
 		5102AE6E24D17F9C0050839C /* RSCore in Frameworks */ = {isa = PBXBuildFile; productRef = 5102AE6D24D17F9C0050839C /* RSCore */; };
 		5102AE6F24D17F9C0050839C /* RSCore in Embed Frameworks */ = {isa = PBXBuildFile; productRef = 5102AE6D24D17F9C0050839C /* RSCore */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
-		5102AE7124D17FAA0050839C /* RSCore in Frameworks */ = {isa = PBXBuildFile; productRef = 5102AE7024D17FAA0050839C /* RSCore */; };
-		5102AE7224D17FAA0050839C /* RSCore in Embed Frameworks */ = {isa = PBXBuildFile; productRef = 5102AE7024D17FAA0050839C /* RSCore */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
-		5102AE7524D17FB50050839C /* RSCore in Frameworks */ = {isa = PBXBuildFile; productRef = 5102AE7424D17FB50050839C /* RSCore */; };
-		5102AE7624D17FB50050839C /* RSCore in Embed Frameworks */ = {isa = PBXBuildFile; productRef = 5102AE7424D17FB50050839C /* RSCore */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
 		5102AE7924D17FF20050839C /* RSCore in Frameworks */ = {isa = PBXBuildFile; productRef = 5102AE7824D17FF20050839C /* RSCore */; };
 		5102AE7A24D17FF20050839C /* RSCore in Embed Frameworks */ = {isa = PBXBuildFile; productRef = 5102AE7824D17FF20050839C /* RSCore */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
 		5102AE7C24D17FFB0050839C /* RSCore in Frameworks */ = {isa = PBXBuildFile; productRef = 5102AE7B24D17FFB0050839C /* RSCore */; };
@@ -86,7 +82,6 @@
 		5102FD9C244009FA00534F17 /* Secrets.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 5102FD7B244008A700534F17 /* Secrets.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		5102FD9D24400A0500534F17 /* Secrets.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5102FD7B244008A700534F17 /* Secrets.framework */; };
 		5102FD9E24400A0500534F17 /* Secrets.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 5102FD7B244008A700534F17 /* Secrets.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
-		5102FD9F24400A1400534F17 /* Secrets.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5102FD7B244008A700534F17 /* Secrets.framework */; };
 		5102FDA224400A2000534F17 /* Secrets.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5102FD7B244008A700534F17 /* Secrets.framework */; };
 		5103A9982421643300410853 /* blank.html in Resources */ = {isa = PBXBuildFile; fileRef = 5103A9972421643300410853 /* blank.html */; };
 		5103A9992421643300410853 /* blank.html in Resources */ = {isa = PBXBuildFile; fileRef = 5103A9972421643300410853 /* blank.html */; };
@@ -112,8 +107,6 @@
 		510ECA4324D1DCD0001C31A6 /* RSTree in Embed Frameworks */ = {isa = PBXBuildFile; productRef = 510ECA4124D1DCD0001C31A6 /* RSTree */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
 		510ECA4524D1E010001C31A6 /* RSTree in Frameworks */ = {isa = PBXBuildFile; productRef = 510ECA4424D1E010001C31A6 /* RSTree */; };
 		510ECA4624D1E010001C31A6 /* RSTree in Embed Frameworks */ = {isa = PBXBuildFile; productRef = 510ECA4424D1E010001C31A6 /* RSTree */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
-		510ECA4824D1E062001C31A6 /* RSTree in Frameworks */ = {isa = PBXBuildFile; productRef = 510ECA4724D1E062001C31A6 /* RSTree */; };
-		510ECA4924D1E062001C31A6 /* RSTree in Embed Frameworks */ = {isa = PBXBuildFile; productRef = 510ECA4724D1E062001C31A6 /* RSTree */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
 		51102165233A7D6C0007A5F7 /* ArticleExtractorButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51102164233A7D6C0007A5F7 /* ArticleExtractorButton.swift */; };
 		51107746243BEE2500D97C8C /* ExtensionPointPreferencesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51107745243BEE2500D97C8C /* ExtensionPointPreferencesViewController.swift */; };
 		51107747243BEE2500D97C8C /* ExtensionPointPreferencesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51107745243BEE2500D97C8C /* ExtensionPointPreferencesViewController.swift */; };
@@ -145,7 +138,6 @@
 		51314668235A7E4600387FDC /* IntentHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51314666235A7E4600387FDC /* IntentHandler.swift */; };
 		513146B2235A81A400387FDC /* AddWebFeedIntentHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 513146B1235A81A400387FDC /* AddWebFeedIntentHandler.swift */; };
 		513146B3235A81A400387FDC /* AddWebFeedIntentHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 513146B1235A81A400387FDC /* AddWebFeedIntentHandler.swift */; };
-		513146B6235A8FD000387FDC /* RSDatabase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84C37FC420DD8E0C00CA8CF5 /* RSDatabase.framework */; };
 		513146B8235A8FD000387FDC /* RSParser.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84C37F8C20DD8CF800CA8CF5 /* RSParser.framework */; };
 		513146BF235A8FDB00387FDC /* Account.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8407166A2262A60D00344432 /* Account.framework */; };
 		513146C1235A8FDB00387FDC /* Articles.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 840716732262A60F00344432 /* Articles.framework */; };
@@ -172,12 +164,6 @@
 		513C5CE9232571C2003D4054 /* ShareViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 513C5CE8232571C2003D4054 /* ShareViewController.swift */; };
 		513C5CEC232571C2003D4054 /* MainInterface.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 513C5CEA232571C2003D4054 /* MainInterface.storyboard */; };
 		513C5CF0232571C2003D4054 /* NetNewsWire iOS Share Extension.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 513C5CE6232571C2003D4054 /* NetNewsWire iOS Share Extension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
-		513C5CFD2325749A003D4054 /* Account.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8407166A2262A60D00344432 /* Account.framework */; };
-		513C5D00232574AF003D4054 /* Articles.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 840716732262A60F00344432 /* Articles.framework */; };
-		513C5D02232574B4003D4054 /* ArticlesDatabase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8407167F2262A61100344432 /* ArticlesDatabase.framework */; };
-		513C5D06232574C0003D4054 /* RSDatabase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84C37FC420DD8E0C00CA8CF5 /* RSDatabase.framework */; };
-		513C5D08232574C6003D4054 /* RSParser.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84C37F8C20DD8CF800CA8CF5 /* RSParser.framework */; };
-		513C5D0E232574E4003D4054 /* SyncDatabase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 51554C01228B6EB50055115A /* SyncDatabase.framework */; };
 		513CCF2524880C1500C55709 /* MasterFeedTableViewIdentifier.swift in Sources */ = {isa = PBXBuildFile; fileRef = 513CCF08248808BA00C55709 /* MasterFeedTableViewIdentifier.swift */; };
 		51408B7E24A9EC6F0073CF4E /* SidebarItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51408B7D24A9EC6F0073CF4E /* SidebarItem.swift */; };
 		51408B7F24A9EC6F0073CF4E /* SidebarItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51408B7D24A9EC6F0073CF4E /* SidebarItem.swift */; };
@@ -234,7 +220,6 @@
 		515A517C243E90260089E588 /* ExtensionPointManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 515A50E5243D07A90089E588 /* ExtensionPointManager.swift */; };
 		515A5180243E90260089E588 /* TwitterFeedProvider-Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 515A5106243D0CCD0089E588 /* TwitterFeedProvider-Extensions.swift */; };
 		515A5181243E90260089E588 /* ExtensionPointIdentifer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 515A5176243E90200089E588 /* ExtensionPointIdentifer.swift */; };
-		515D4FC123257A3200EE1167 /* FolderTreeControllerDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 849A97A11ED9F180007D329B /* FolderTreeControllerDelegate.swift */; };
 		515D4FCA23257CB500EE1167 /* Node-Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 849A97971ED9EFAA007D329B /* Node-Extensions.swift */; };
 		515D4FCC2325815A00EE1167 /* SafariExt.js in Resources */ = {isa = PBXBuildFile; fileRef = 515D4FCB2325815A00EE1167 /* SafariExt.js */; };
 		516244E3241E19F000B61C47 /* ColorPaletteTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 516244E2241E19F000B61C47 /* ColorPaletteTableViewController.swift */; };
@@ -377,6 +362,18 @@
 		51A9A5F52380F6A60033AADF /* ModalNavigationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51A9A5F42380F6A60033AADF /* ModalNavigationController.swift */; };
 		51A9A60A2382FD240033AADF /* PoppableGestureRecognizerDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51A9A6092382FD240033AADF /* PoppableGestureRecognizerDelegate.swift */; };
 		51AB8AB323B7F4C6008F147D /* WebViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51AB8AB223B7F4C6008F147D /* WebViewController.swift */; };
+		51B0DEF224D24A19000AD99E /* RSCore in Frameworks */ = {isa = PBXBuildFile; productRef = 51B0DEF124D24A19000AD99E /* RSCore */; };
+		51B0DEF324D24A19000AD99E /* RSCore in Embed Frameworks */ = {isa = PBXBuildFile; productRef = 51B0DEF124D24A19000AD99E /* RSCore */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
+		51B0DEF424D24A2E000AD99E /* Articles.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 840716732262A60F00344432 /* Articles.framework */; };
+		51B0DEF524D24A2E000AD99E /* Articles.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 840716732262A60F00344432 /* Articles.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		51B0DEF624D24A9D000AD99E /* Account.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8407166A2262A60D00344432 /* Account.framework */; };
+		51B0DEF724D24A9D000AD99E /* Account.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 8407166A2262A60D00344432 /* Account.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		51B0DF0F24D24E3B000AD99E /* RSDatabase in Frameworks */ = {isa = PBXBuildFile; productRef = 51B0DF0E24D24E3B000AD99E /* RSDatabase */; };
+		51B0DF1024D24E3B000AD99E /* RSDatabase in Embed Frameworks */ = {isa = PBXBuildFile; productRef = 51B0DF0E24D24E3B000AD99E /* RSDatabase */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
+		51B0DF1E24D24F53000AD99E /* RSDatabase in Frameworks */ = {isa = PBXBuildFile; productRef = 51B0DF1D24D24F53000AD99E /* RSDatabase */; };
+		51B0DF1F24D24F53000AD99E /* RSDatabase in Embed Frameworks */ = {isa = PBXBuildFile; productRef = 51B0DF1D24D24F53000AD99E /* RSDatabase */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
+		51B0DF2124D24F66000AD99E /* RSDatabase in Frameworks */ = {isa = PBXBuildFile; productRef = 51B0DF2024D24F66000AD99E /* RSDatabase */; };
+		51B0DF2224D24F66000AD99E /* RSDatabase in Embed Frameworks */ = {isa = PBXBuildFile; productRef = 51B0DF2024D24F66000AD99E /* RSDatabase */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
 		51B54A4324B5499B0014348B /* WebViewProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5177471924B3863000EB0F74 /* WebViewProvider.swift */; };
 		51B54A6524B549B20014348B /* WrapperScriptMessageHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 517B2EBB24B3E62A001AC46C /* WrapperScriptMessageHandler.swift */; };
 		51B54A6624B549CB0014348B /* PreloadedWebView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5177471324B37D4000EB0F74 /* PreloadedWebView.swift */; };
@@ -434,8 +431,6 @@
 		51C451BE226377D000C03939 /* Account.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 8407166A2262A60D00344432 /* Account.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		51C451E42264C80600C03939 /* RSParser.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84C37F8C20DD8CF800CA8CF5 /* RSParser.framework */; };
 		51C451E52264C80600C03939 /* RSParser.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 84C37F8C20DD8CF800CA8CF5 /* RSParser.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
-		51C451E82264C81000C03939 /* RSDatabase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84C37FC420DD8E0C00CA8CF5 /* RSDatabase.framework */; };
-		51C451E92264C81000C03939 /* RSDatabase.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 84C37FC420DD8E0C00CA8CF5 /* RSDatabase.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		51C451F02264C83100C03939 /* ArticlesDatabase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8407167F2262A61100344432 /* ArticlesDatabase.framework */; };
 		51C451F12264C83100C03939 /* ArticlesDatabase.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 8407167F2262A61100344432 /* ArticlesDatabase.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		51C451F42264C83900C03939 /* Articles.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 840716732262A60F00344432 /* Articles.framework */; };
@@ -514,8 +509,6 @@
 		51E4988224A8061400B667CB /* Articles.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 840716732262A60F00344432 /* Articles.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		51E4988324A8061400B667CB /* ArticlesDatabase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8407167F2262A61100344432 /* ArticlesDatabase.framework */; };
 		51E4988424A8061400B667CB /* ArticlesDatabase.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 8407167F2262A61100344432 /* ArticlesDatabase.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
-		51E4988924A8061400B667CB /* RSDatabase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84C37FC420DD8E0C00CA8CF5 /* RSDatabase.framework */; };
-		51E4988A24A8061400B667CB /* RSDatabase.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 84C37FC420DD8E0C00CA8CF5 /* RSDatabase.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		51E4988B24A8061400B667CB /* RSParser.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84C37F8C20DD8CF800CA8CF5 /* RSParser.framework */; };
 		51E4988C24A8061400B667CB /* RSParser.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 84C37F8C20DD8CF800CA8CF5 /* RSParser.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		51E4989124A8061400B667CB /* Secrets.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5102FD7B244008A700534F17 /* Secrets.framework */; };
@@ -530,8 +523,6 @@
 		51E4989D24A8069300B667CB /* Articles.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 840716732262A60F00344432 /* Articles.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		51E4989E24A8069300B667CB /* ArticlesDatabase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8407167F2262A61100344432 /* ArticlesDatabase.framework */; };
 		51E4989F24A8069300B667CB /* ArticlesDatabase.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 8407167F2262A61100344432 /* ArticlesDatabase.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
-		51E498A424A8069300B667CB /* RSDatabase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84C37FC020DD8E0C00CA8CF5 /* RSDatabase.framework */; };
-		51E498A524A8069300B667CB /* RSDatabase.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 84C37FC020DD8E0C00CA8CF5 /* RSDatabase.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		51E498A624A8069300B667CB /* RSParser.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84C37F8C20DD8CF800CA8CF5 /* RSParser.framework */; };
 		51E498A724A8069300B667CB /* RSParser.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 84C37F8C20DD8CF800CA8CF5 /* RSParser.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		51E498AC24A8069300B667CB /* Secrets.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5102FD7B244008A700534F17 /* Secrets.framework */; };
@@ -873,7 +864,6 @@
 		65ED403E235DEF6C0081F399 /* TimelineCellAppearance.swift in Sources */ = {isa = PBXBuildFile; fileRef = 849A97701ED9EC04007D329B /* TimelineCellAppearance.swift */; };
 		65ED403F235DEF6C0081F399 /* ArticleRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 849A977D1ED9EC42007D329B /* ArticleRenderer.swift */; };
 		65ED4040235DEF6C0081F399 /* GeneralPrefencesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84C9FC6D22629E1200D921D6 /* GeneralPrefencesViewController.swift */; };
-		65ED4044235DEF6C0081F399 /* RSDatabase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84C37FC020DD8E0C00CA8CF5 /* RSDatabase.framework */; };
 		65ED4046235DEF6C0081F399 /* ArticlesDatabase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8407167F2262A61100344432 /* ArticlesDatabase.framework */; };
 		65ED4047235DEF6C0081F399 /* RSParser.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84C37F8C20DD8CF800CA8CF5 /* RSParser.framework */; };
 		65ED4048235DEF6C0081F399 /* Account.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8407166A2262A60D00344432 /* Account.framework */; };
@@ -910,7 +900,6 @@
 		65ED406C235DEF6C0081F399 /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 84C9FC8922629E8F00D921D6 /* Credits.rtf */; };
 		65ED406D235DEF6C0081F399 /* Inspector.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 84BBB12B20142A4700F054F5 /* Inspector.storyboard */; };
 		65ED406E235DEF6C0081F399 /* AddWebFeedSheet.xib in Resources */ = {isa = PBXBuildFile; fileRef = 848363002262A3BC00DA1D35 /* AddWebFeedSheet.xib */; };
-		65ED4072235DEF6C0081F399 /* RSDatabase.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 84C37FC020DD8E0C00CA8CF5 /* RSDatabase.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		65ED4074235DEF6C0081F399 /* ArticlesDatabase.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 8407167F2262A61100344432 /* ArticlesDatabase.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		65ED4076235DEF6C0081F399 /* Account.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 8407166A2262A60D00344432 /* Account.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		65ED4077235DEF6C0081F399 /* Articles.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 840716732262A60F00344432 /* Articles.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
@@ -1029,8 +1018,6 @@
 		84BBB12E20142A4700F054F5 /* InspectorWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84BBB12C20142A4700F054F5 /* InspectorWindowController.swift */; };
 		84C37FB520DD8DBB00CA8CF5 /* RSParser.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84C37F8C20DD8CF800CA8CF5 /* RSParser.framework */; };
 		84C37FB620DD8DBB00CA8CF5 /* RSParser.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 84C37F8C20DD8CF800CA8CF5 /* RSParser.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
-		84C37FC520DD8E1D00CA8CF5 /* RSDatabase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84C37FC020DD8E0C00CA8CF5 /* RSDatabase.framework */; };
-		84C37FC620DD8E1D00CA8CF5 /* RSDatabase.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 84C37FC020DD8E0C00CA8CF5 /* RSDatabase.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		84C9FC6722629B9000D921D6 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84C9FC6622629B3900D921D6 /* AppDelegate.swift */; };
 		84C9FC7722629E1200D921D6 /* AdvancedPreferencesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84C9FC6B22629E1200D921D6 /* AdvancedPreferencesViewController.swift */; };
 		84C9FC7822629E1200D921D6 /* GeneralPrefencesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84C9FC6D22629E1200D921D6 /* GeneralPrefencesViewController.swift */; };
@@ -1186,13 +1173,6 @@
 			remoteGlobalIDString = 84FF5F831EFA285800C15A01;
 			remoteInfo = RSParser;
 		};
-		65ED3FAC235DEF6C0081F399 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 84C37FB920DD8E0C00CA8CF5 /* RSDatabase.xcodeproj */;
-			proxyType = 1;
-			remoteGlobalIDString = 84F22C541B52E0D9000060CE;
-			remoteInfo = RSDatabase;
-		};
 		65ED3FAE235DEF6C0081F399 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 841D4D5E2106B3E100DD04E6 /* ArticlesDatabase.xcodeproj */;
@@ -1452,34 +1432,6 @@
 			remoteGlobalIDString = 84FF5F831EFA285800C15A01;
 			remoteInfo = RSParser;
 		};
-		84C37FBF20DD8E0C00CA8CF5 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 84C37FB920DD8E0C00CA8CF5 /* RSDatabase.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 84F22C551B52E0D9000060CE;
-			remoteInfo = RSDatabase;
-		};
-		84C37FC120DD8E0C00CA8CF5 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 84C37FB920DD8E0C00CA8CF5 /* RSDatabase.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 84F22C5F1B52E0D9000060CE;
-			remoteInfo = RSDatabaseTests;
-		};
-		84C37FC320DD8E0C00CA8CF5 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 84C37FB920DD8E0C00CA8CF5 /* RSDatabase.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 8400ABF71E0CFBD800AA7C57;
-			remoteInfo = RSDatabaseiOS;
-		};
-		84C37FC720DD8E1D00CA8CF5 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 84C37FB920DD8E0C00CA8CF5 /* RSDatabase.xcodeproj */;
-			proxyType = 1;
-			remoteGlobalIDString = 84F22C541B52E0D9000060CE;
-			remoteInfo = RSDatabase;
-		};
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -1489,8 +1441,9 @@
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
-				5102AE7224D17FAA0050839C /* RSCore in Embed Frameworks */,
-				510ECA4924D1E062001C31A6 /* RSTree in Embed Frameworks */,
+				51B0DEF324D24A19000AD99E /* RSCore in Embed Frameworks */,
+				51B0DEF524D24A2E000AD99E /* Articles.framework in Embed Frameworks */,
+				51B0DEF724D24A9D000AD99E /* Account.framework in Embed Frameworks */,
 			);
 			name = "Embed Frameworks";
 			runOnlyForDeploymentPostprocessing = 0;
@@ -1501,7 +1454,6 @@
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
-				5102AE7624D17FB50050839C /* RSCore in Embed Frameworks */,
 			);
 			name = "Embed Frameworks";
 			runOnlyForDeploymentPostprocessing = 0;
@@ -1529,7 +1481,6 @@
 				51383A3624D1F91F0027E272 /* RSWeb in Embed Frameworks */,
 				51C451F12264C83100C03939 /* ArticlesDatabase.framework in Embed Frameworks */,
 				51C451F52264C83900C03939 /* Articles.framework in Embed Frameworks */,
-				51C451E92264C81000C03939 /* RSDatabase.framework in Embed Frameworks */,
 				51554C31228B71A10055115A /* SyncDatabase.framework in Embed Frameworks */,
 				5102AE6F24D17F9C0050839C /* RSCore in Embed Frameworks */,
 				5102FD9E24400A0500534F17 /* Secrets.framework in Embed Frameworks */,
@@ -1544,7 +1495,6 @@
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
-				51E4988A24A8061400B667CB /* RSDatabase.framework in Embed Frameworks */,
 				51E4988024A8061400B667CB /* Account.framework in Embed Frameworks */,
 				51E4988224A8061400B667CB /* Articles.framework in Embed Frameworks */,
 				51383A3924D1F9470027E272 /* RSWeb in Embed Frameworks */,
@@ -1553,6 +1503,7 @@
 				5102AE7A24D17FF20050839C /* RSCore in Embed Frameworks */,
 				51E4989224A8061400B667CB /* Secrets.framework in Embed Frameworks */,
 				51E4988424A8061400B667CB /* ArticlesDatabase.framework in Embed Frameworks */,
+				51B0DF1F24D24F53000AD99E /* RSDatabase in Embed Frameworks */,
 			);
 			name = "Embed Frameworks";
 			runOnlyForDeploymentPostprocessing = 0;
@@ -1563,7 +1514,7 @@
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
-				51E498A524A8069300B667CB /* RSDatabase.framework in Embed Frameworks */,
+				51B0DF2224D24F66000AD99E /* RSDatabase in Embed Frameworks */,
 				51E4989B24A8069300B667CB /* Account.framework in Embed Frameworks */,
 				51383A3C24D1F9510027E272 /* RSWeb in Embed Frameworks */,
 				5102AE7D24D17FFB0050839C /* RSCore in Embed Frameworks */,
@@ -1608,7 +1559,6 @@
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
-				65ED4072235DEF6C0081F399 /* RSDatabase.framework in Embed Frameworks */,
 				65ED4074235DEF6C0081F399 /* ArticlesDatabase.framework in Embed Frameworks */,
 				65ED4076235DEF6C0081F399 /* Account.framework in Embed Frameworks */,
 				65ED4077235DEF6C0081F399 /* Articles.framework in Embed Frameworks */,
@@ -1651,9 +1601,9 @@
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
+				51B0DF1024D24E3B000AD99E /* RSDatabase in Embed Frameworks */,
 				51383A3324D1F90E0027E272 /* RSWeb in Embed Frameworks */,
 				5102FD84244009F000534F17 /* Secrets.framework in Embed Frameworks */,
-				84C37FC620DD8E1D00CA8CF5 /* RSDatabase.framework in Embed Frameworks */,
 				5102AE6524D17F640050839C /* RSCore in Embed Frameworks */,
 				51C451AA226377C200C03939 /* ArticlesDatabase.framework in Embed Frameworks */,
 				51C451BE226377D000C03939 /* Account.framework in Embed Frameworks */,
@@ -2158,7 +2108,6 @@
 		84BBB12B20142A4700F054F5 /* Inspector.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Inspector.storyboard; sourceTree = "<group>"; };
 		84BBB12C20142A4700F054F5 /* InspectorWindowController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InspectorWindowController.swift; sourceTree = "<group>"; };
 		84C37F8620DD8CF800CA8CF5 /* RSParser.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RSParser.xcodeproj; path = submodules/RSParser/RSParser.xcodeproj; sourceTree = "<group>"; };
-		84C37FB920DD8E0C00CA8CF5 /* RSDatabase.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RSDatabase.xcodeproj; path = submodules/RSDatabase/RSDatabase.xcodeproj; sourceTree = "<group>"; };
 		84C9FC6622629B3900D921D6 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		84C9FC6B22629E1200D921D6 /* AdvancedPreferencesViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AdvancedPreferencesViewController.swift; sourceTree = "<group>"; };
 		84C9FC6D22629E1200D921D6 /* GeneralPrefencesViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneralPrefencesViewController.swift; sourceTree = "<group>"; };
@@ -2256,8 +2205,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				5102AE7524D17FB50050839C /* RSCore in Frameworks */,
-				513146B6235A8FD000387FDC /* RSDatabase.framework in Frameworks */,
 				513146C3235A8FDB00387FDC /* ArticlesDatabase.framework in Frameworks */,
 				513146BF235A8FDB00387FDC /* Account.framework in Frameworks */,
 				513146C1235A8FDB00387FDC /* Articles.framework in Frameworks */,
@@ -2271,15 +2218,9 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				5102AE7124D17FAA0050839C /* RSCore in Frameworks */,
-				513C5CFD2325749A003D4054 /* Account.framework in Frameworks */,
-				513C5D00232574AF003D4054 /* Articles.framework in Frameworks */,
-				513C5D08232574C6003D4054 /* RSParser.framework in Frameworks */,
-				510ECA4824D1E062001C31A6 /* RSTree in Frameworks */,
-				513C5D06232574C0003D4054 /* RSDatabase.framework in Frameworks */,
-				513C5D0E232574E4003D4054 /* SyncDatabase.framework in Frameworks */,
-				5102FD9F24400A1400534F17 /* Secrets.framework in Frameworks */,
-				513C5D02232574B4003D4054 /* ArticlesDatabase.framework in Frameworks */,
+				51B0DEF224D24A19000AD99E /* RSCore in Frameworks */,
+				51B0DEF424D24A2E000AD99E /* Articles.framework in Frameworks */,
+				51B0DEF624D24A9D000AD99E /* Account.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2294,9 +2235,9 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				51B0DF1E24D24F53000AD99E /* RSDatabase in Frameworks */,
 				51383A3824D1F9470027E272 /* RSWeb in Frameworks */,
 				5102AE7924D17FF20050839C /* RSCore in Frameworks */,
-				51E4988924A8061400B667CB /* RSDatabase.framework in Frameworks */,
 				51E4987F24A8061400B667CB /* Account.framework in Frameworks */,
 				51E4988124A8061400B667CB /* Articles.framework in Frameworks */,
 				51E4989324A8061400B667CB /* SyncDatabase.framework in Frameworks */,
@@ -2313,7 +2254,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				5102AE7F24D17FFB0050839C /* RSCoreResources in Frameworks */,
-				51E498A424A8069300B667CB /* RSDatabase.framework in Frameworks */,
 				51E4997624A87FFC00B667CB /* Sparkle.framework in Frameworks */,
 				51E4989A24A8069300B667CB /* Account.framework in Frameworks */,
 				51E4989C24A8069300B667CB /* Articles.framework in Frameworks */,
@@ -2322,6 +2262,7 @@
 				51E498A624A8069300B667CB /* RSParser.framework in Frameworks */,
 				51E498B124A806A400B667CB /* CloudKit.framework in Frameworks */,
 				5102AE7C24D17FFB0050839C /* RSCore in Frameworks */,
+				51B0DF2124D24F66000AD99E /* RSDatabase in Frameworks */,
 				51E498AC24A8069300B667CB /* Secrets.framework in Frameworks */,
 				51E498B324A806AA00B667CB /* WebKit.framework in Frameworks */,
 				51E4989E24A8069300B667CB /* ArticlesDatabase.framework in Frameworks */,
@@ -2339,7 +2280,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				65ED4044235DEF6C0081F399 /* RSDatabase.framework in Frameworks */,
 				5102AE6C24D17F7C0050839C /* RSCoreResources in Frameworks */,
 				65ED4046235DEF6C0081F399 /* ArticlesDatabase.framework in Frameworks */,
 				65ED4047235DEF6C0081F399 /* RSParser.framework in Frameworks */,
@@ -2370,7 +2310,6 @@
 				51C451F82264C83E00C03939 /* Account.framework in Frameworks */,
 				51C451F02264C83100C03939 /* ArticlesDatabase.framework in Frameworks */,
 				51C451F42264C83900C03939 /* Articles.framework in Frameworks */,
-				51C451E82264C81000C03939 /* RSDatabase.framework in Frameworks */,
 				51E4DB082425F9EB0091EB5B /* CloudKit.framework in Frameworks */,
 				51554C30228B71A10055115A /* SyncDatabase.framework in Frameworks */,
 				51C451E42264C80600C03939 /* RSParser.framework in Frameworks */,
@@ -2384,8 +2323,8 @@
 				65ED42DE235E74230081F399 /* Sparkle.framework in Frameworks */,
 				5102AE6724D17F640050839C /* RSCoreResources in Frameworks */,
 				65ED42D9235E740D0081F399 /* Sparkle.framework in Frameworks */,
-				84C37FC520DD8E1D00CA8CF5 /* RSDatabase.framework in Frameworks */,
 				510ECA4224D1DCD0001C31A6 /* RSTree in Frameworks */,
+				51B0DF0F24D24E3B000AD99E /* RSDatabase in Frameworks */,
 				51C451A9226377C200C03939 /* ArticlesDatabase.framework in Frameworks */,
 				84C37FB520DD8DBB00CA8CF5 /* RSParser.framework in Frameworks */,
 				51C451BD226377D000C03939 /* Account.framework in Frameworks */,
@@ -3506,7 +3445,6 @@
 				D5907CDA2002F084005947E5 /* xcconfig */,
 				849C64611ED37A5D003D8FC0 /* Products */,
 				51C452B22265141B00C03939 /* Frameworks */,
-				84C37FB920DD8E0C00CA8CF5 /* RSDatabase.xcodeproj */,
 				84C37F8620DD8CF800CA8CF5 /* RSParser.xcodeproj */,
 			);
 			sourceTree = "<group>";
@@ -3561,16 +3499,6 @@
 			name = Products;
 			sourceTree = "<group>";
 		};
-		84C37FBA20DD8E0C00CA8CF5 /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				84C37FC020DD8E0C00CA8CF5 /* RSDatabase.framework */,
-				84C37FC220DD8E0C00CA8CF5 /* RSDatabaseTests.xctest */,
-				84C37FC420DD8E0C00CA8CF5 /* RSDatabase.framework */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
 		84C9FC6522629B3900D921D6 /* Mac */ = {
 			isa = PBXGroup;
 			children = (
@@ -3906,7 +3834,6 @@
 			);
 			name = "NetNewsWire iOS Intents Extension";
 			packageProductDependencies = (
-				5102AE7424D17FB50050839C /* RSCore */,
 			);
 			productName = "NetNewsWire iOS Intents Extension";
 			productReference = 51314637235A7BBE00387FDC /* NetNewsWire iOS Intents Extension.appex */;
@@ -3927,8 +3854,7 @@
 			);
 			name = "NetNewsWire iOS Share Extension";
 			packageProductDependencies = (
-				5102AE7024D17FAA0050839C /* RSCore */,
-				510ECA4724D1E062001C31A6 /* RSTree */,
+				51B0DEF124D24A19000AD99E /* RSCore */,
 			);
 			productName = "NetNewsWire iOS Share Extension";
 			productReference = 513C5CE6232571C2003D4054 /* NetNewsWire iOS Share Extension.appex */;
@@ -3969,6 +3895,7 @@
 			packageProductDependencies = (
 				5102AE7824D17FF20050839C /* RSCore */,
 				51383A3724D1F9470027E272 /* RSWeb */,
+				51B0DF1D24D24F53000AD99E /* RSDatabase */,
 			);
 			productName = iOS;
 			productReference = 51C0513D24A77DF800194D5E /* NetNewsWire.app */;
@@ -3993,6 +3920,7 @@
 				5102AE7B24D17FFB0050839C /* RSCore */,
 				5102AE7E24D17FFB0050839C /* RSCoreResources */,
 				51383A3A24D1F9510027E272 /* RSWeb */,
+				51B0DF2024D24F66000AD99E /* RSDatabase */,
 			);
 			productName = macOS;
 			productReference = 51C0514424A77DF800194D5E /* NetNewsWire.app */;
@@ -4032,7 +3960,6 @@
 			dependencies = (
 				65ED41C7235E615E0081F399 /* PBXTargetDependency */,
 				65ED3FA9235DEF6C0081F399 /* PBXTargetDependency */,
-				65ED3FAB235DEF6C0081F399 /* PBXTargetDependency */,
 				65ED3FAD235DEF6C0081F399 /* PBXTargetDependency */,
 				65ED3FAF235DEF6C0081F399 /* PBXTargetDependency */,
 				65ED3FB1235DEF6C0081F399 /* PBXTargetDependency */,
@@ -4109,7 +4036,6 @@
 			dependencies = (
 				65ED41C5235E61550081F399 /* PBXTargetDependency */,
 				84C37FB820DD8DBB00CA8CF5 /* PBXTargetDependency */,
-				84C37FC820DD8E1D00CA8CF5 /* PBXTargetDependency */,
 				51C451AC226377C300C03939 /* PBXTargetDependency */,
 				51C451BC226377C900C03939 /* PBXTargetDependency */,
 				51C451C0226377D000C03939 /* PBXTargetDependency */,
@@ -4126,6 +4052,7 @@
 				5102AE6624D17F640050839C /* RSCoreResources */,
 				510ECA4124D1DCD0001C31A6 /* RSTree */,
 				51383A3124D1F90E0027E272 /* RSWeb */,
+				51B0DF0E24D24E3B000AD99E /* RSDatabase */,
 			);
 			productName = NetNewsWire;
 			productReference = 849C64601ED37A5D003D8FC0 /* NetNewsWire.app */;
@@ -4241,6 +4168,7 @@
 				5102AE4324D17E820050839C /* XCRemoteSwiftPackageReference "RSCore" */,
 				510ECA4024D1DCD0001C31A6 /* XCRemoteSwiftPackageReference "RSTree" */,
 				51383A3024D1F90E0027E272 /* XCRemoteSwiftPackageReference "RSWeb" */,
+				51B0DF0D24D24E3B000AD99E /* XCRemoteSwiftPackageReference "RSDatabase" */,
 			);
 			productRefGroup = 849C64611ED37A5D003D8FC0 /* Products */;
 			projectDirPath = "";
@@ -4257,10 +4185,6 @@
 					ProductGroup = 8407167A2262A61100344432 /* Products */;
 					ProjectRef = 841D4D5E2106B3E100DD04E6 /* ArticlesDatabase.xcodeproj */;
 				},
-				{
-					ProductGroup = 84C37FBA20DD8E0C00CA8CF5 /* Products */;
-					ProjectRef = 84C37FB920DD8E0C00CA8CF5 /* RSDatabase.xcodeproj */;
-				},
 				{
 					ProductGroup = 84C37F8720DD8CF800CA8CF5 /* Products */;
 					ProjectRef = 84C37F8620DD8CF800CA8CF5 /* RSParser.xcodeproj */;
@@ -4478,27 +4402,6 @@
 			remoteRef = 84C37F8D20DD8CF800CA8CF5 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		84C37FC020DD8E0C00CA8CF5 /* RSDatabase.framework */ = {
-			isa = PBXReferenceProxy;
-			fileType = wrapper.framework;
-			path = RSDatabase.framework;
-			remoteRef = 84C37FBF20DD8E0C00CA8CF5 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-		84C37FC220DD8E0C00CA8CF5 /* RSDatabaseTests.xctest */ = {
-			isa = PBXReferenceProxy;
-			fileType = wrapper.cfbundle;
-			path = RSDatabaseTests.xctest;
-			remoteRef = 84C37FC120DD8E0C00CA8CF5 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-		84C37FC420DD8E0C00CA8CF5 /* RSDatabase.framework */ = {
-			isa = PBXReferenceProxy;
-			fileType = wrapper.framework;
-			path = RSDatabase.framework;
-			remoteRef = 84C37FC320DD8E0C00CA8CF5 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
 /* End PBXReferenceProxy section */
 
 /* Begin PBXResourcesBuildPhase section */
@@ -4855,7 +4758,6 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				515D4FC123257A3200EE1167 /* FolderTreeControllerDelegate.swift in Sources */,
 				51B5C8B923F368D000032075 /* ExtensionContainers.swift in Sources */,
 				515D4FCA23257CB500EE1167 /* Node-Extensions.swift in Sources */,
 				513C5CE9232571C2003D4054 /* ShareViewController.swift in Sources */,
@@ -5775,11 +5677,6 @@
 			name = RSParser;
 			targetProxy = 65ED3FAA235DEF6C0081F399 /* PBXContainerItemProxy */;
 		};
-		65ED3FAB235DEF6C0081F399 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			name = RSDatabase;
-			targetProxy = 65ED3FAC235DEF6C0081F399 /* PBXContainerItemProxy */;
-		};
 		65ED3FAD235DEF6C0081F399 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			name = ArticlesDatabase;
@@ -5845,11 +5742,6 @@
 			name = RSParser;
 			targetProxy = 84C37FB720DD8DBB00CA8CF5 /* PBXContainerItemProxy */;
 		};
-		84C37FC820DD8E1D00CA8CF5 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			name = RSDatabase;
-			targetProxy = 84C37FC720DD8E1D00CA8CF5 /* PBXContainerItemProxy */;
-		};
 /* End PBXTargetDependency section */
 
 /* Begin PBXVariantGroup section */
@@ -6281,6 +6173,14 @@
 				minimumVersion = "1.0.0-beta1";
 			};
 		};
+		51B0DF0D24D24E3B000AD99E /* XCRemoteSwiftPackageReference "RSDatabase" */ = {
+			isa = XCRemoteSwiftPackageReference;
+			repositoryURL = "https://github.com/Ranchero-Software/RSDatabase.git";
+			requirement = {
+				kind = upToNextMajorVersion;
+				minimumVersion = "1.0.0-beta1";
+			};
+		};
 /* End XCRemoteSwiftPackageReference section */
 
 /* Begin XCSwiftPackageProductDependency section */
@@ -6309,16 +6209,6 @@
 			package = 5102AE4324D17E820050839C /* XCRemoteSwiftPackageReference "RSCore" */;
 			productName = RSCore;
 		};
-		5102AE7024D17FAA0050839C /* RSCore */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = 5102AE4324D17E820050839C /* XCRemoteSwiftPackageReference "RSCore" */;
-			productName = RSCore;
-		};
-		5102AE7424D17FB50050839C /* RSCore */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = 5102AE4324D17E820050839C /* XCRemoteSwiftPackageReference "RSCore" */;
-			productName = RSCore;
-		};
 		5102AE7824D17FF20050839C /* RSCore */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = 5102AE4324D17E820050839C /* XCRemoteSwiftPackageReference "RSCore" */;
@@ -6344,11 +6234,6 @@
 			package = 510ECA4024D1DCD0001C31A6 /* XCRemoteSwiftPackageReference "RSTree" */;
 			productName = RSTree;
 		};
-		510ECA4724D1E062001C31A6 /* RSTree */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = 510ECA4024D1DCD0001C31A6 /* XCRemoteSwiftPackageReference "RSTree" */;
-			productName = RSTree;
-		};
 		51383A3124D1F90E0027E272 /* RSWeb */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = 51383A3024D1F90E0027E272 /* XCRemoteSwiftPackageReference "RSWeb" */;
@@ -6369,6 +6254,26 @@
 			package = 51383A3024D1F90E0027E272 /* XCRemoteSwiftPackageReference "RSWeb" */;
 			productName = RSWeb;
 		};
+		51B0DEF124D24A19000AD99E /* RSCore */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 5102AE4324D17E820050839C /* XCRemoteSwiftPackageReference "RSCore" */;
+			productName = RSCore;
+		};
+		51B0DF0E24D24E3B000AD99E /* RSDatabase */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 51B0DF0D24D24E3B000AD99E /* XCRemoteSwiftPackageReference "RSDatabase" */;
+			productName = RSDatabase;
+		};
+		51B0DF1D24D24F53000AD99E /* RSDatabase */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 51B0DF0D24D24E3B000AD99E /* XCRemoteSwiftPackageReference "RSDatabase" */;
+			productName = RSDatabase;
+		};
+		51B0DF2024D24F66000AD99E /* RSDatabase */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 51B0DF0D24D24E3B000AD99E /* XCRemoteSwiftPackageReference "RSDatabase" */;
+			productName = RSDatabase;
+		};
 /* End XCSwiftPackageProductDependency section */
 	};
 	rootObject = 849C64581ED37A5D003D8FC0 /* Project object */;
diff --git a/NetNewsWire.xcworkspace/xcshareddata/swiftpm/Package.resolved b/NetNewsWire.xcworkspace/xcshareddata/swiftpm/Package.resolved
index a6826cf59..4056b7b30 100644
--- a/NetNewsWire.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/NetNewsWire.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -55,6 +55,15 @@
           "version": "1.0.0-beta2"
         }
       },
+      {
+        "package": "RSDatabase",
+        "repositoryURL": "https://github.com/Ranchero-Software/RSDatabase.git",
+        "state": {
+          "branch": null,
+          "revision": "3aa706f3adfc0b798a2b69cf536461c39db4d269",
+          "version": "1.0.0-beta1"
+        }
+      },
       {
         "package": "RSTree",
         "repositoryURL": "https://github.com/Ranchero-Software/RSTree.git",
diff --git a/submodules/RSDatabase b/submodules/RSDatabase
deleted file mode 160000
index 73b827736..000000000
--- a/submodules/RSDatabase
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 73b8277369c4d2d3729b7bb33c11bdd7350d81cb