diff --git a/Commands/SendToCommand.swift b/Commands/SendToCommand.swift
index e7e13368f..7b67b3883 100644
--- a/Commands/SendToCommand.swift
+++ b/Commands/SendToCommand.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2018 Ranchero Software. All rights reserved.
 //
 
-import Cocoa
+import AppKit
 
 // Unlike UndoableCommand commands, you instantiate one of each of these and reuse them.
 
diff --git a/Commands/SendToMarsEditCommand.swift b/Commands/SendToMarsEditCommand.swift
index 1b9ec0f6e..364ce6787 100644
--- a/Commands/SendToMarsEditCommand.swift
+++ b/Commands/SendToMarsEditCommand.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2018 Ranchero Software. All rights reserved.
 //
 
-import Cocoa
+import AppKit
 import RSCore
 import Data
 
diff --git a/Commands/SendToMicroBlogCommand.swift b/Commands/SendToMicroBlogCommand.swift
index d3d710448..c3b46e782 100644
--- a/Commands/SendToMicroBlogCommand.swift
+++ b/Commands/SendToMicroBlogCommand.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2018 Ranchero Software. All rights reserved.
 //
 
-import Cocoa
+import AppKit
 import Data
 import RSCore
 
diff --git a/Evergreen-iOS/Evergreen-iOS.xcodeproj/project.pbxproj b/Evergreen-iOS/Evergreen-iOS.xcodeproj/project.pbxproj
new file mode 100644
index 000000000..0f3f9c464
--- /dev/null
+++ b/Evergreen-iOS/Evergreen-iOS.xcodeproj/project.pbxproj
@@ -0,0 +1,453 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 48;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		84E3B1622025877000E03C2F /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84E3B1612025877000E03C2F /* AppDelegate.swift */; };
+		84E3B1642025877000E03C2F /* MasterViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84E3B1632025877000E03C2F /* MasterViewController.swift */; };
+		84E3B1662025877000E03C2F /* DetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84E3B1652025877000E03C2F /* DetailViewController.swift */; };
+		84E3B1692025877000E03C2F /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 84E3B1672025877000E03C2F /* Main.storyboard */; };
+		84E3B16B2025877000E03C2F /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 84E3B16A2025877000E03C2F /* Assets.xcassets */; };
+		84E3B16E2025877000E03C2F /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 84E3B16C2025877000E03C2F /* LaunchScreen.storyboard */; };
+		84E3B1792025877000E03C2F /* Evergreen_iOSTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84E3B1782025877000E03C2F /* Evergreen_iOSTests.swift */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXContainerItemProxy section */
+		84E3B1752025877000E03C2F /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 84E3B1562025877000E03C2F /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 84E3B15D2025877000E03C2F;
+			remoteInfo = "Evergreen-iOS";
+		};
+/* End PBXContainerItemProxy section */
+
+/* Begin PBXFileReference section */
+		84E3B15E2025877000E03C2F /* Evergreen-iOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Evergreen-iOS.app"; sourceTree = BUILT_PRODUCTS_DIR; };
+		84E3B1612025877000E03C2F /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
+		84E3B1632025877000E03C2F /* MasterViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MasterViewController.swift; sourceTree = "<group>"; };
+		84E3B1652025877000E03C2F /* DetailViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DetailViewController.swift; sourceTree = "<group>"; };
+		84E3B1682025877000E03C2F /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
+		84E3B16A2025877000E03C2F /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
+		84E3B16D2025877000E03C2F /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
+		84E3B16F2025877000E03C2F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		84E3B1742025877000E03C2F /* Evergreen-iOSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Evergreen-iOSTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
+		84E3B1782025877000E03C2F /* Evergreen_iOSTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Evergreen_iOSTests.swift; sourceTree = "<group>"; };
+		84E3B17A2025877000E03C2F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		84E3B15B2025877000E03C2F /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		84E3B1712025877000E03C2F /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		84E3B1552025877000E03C2F = {
+			isa = PBXGroup;
+			children = (
+				84E3B1602025877000E03C2F /* Evergreen-iOS */,
+				84E3B1772025877000E03C2F /* Evergreen-iOSTests */,
+				84E3B15F2025877000E03C2F /* Products */,
+			);
+			sourceTree = "<group>";
+		};
+		84E3B15F2025877000E03C2F /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				84E3B15E2025877000E03C2F /* Evergreen-iOS.app */,
+				84E3B1742025877000E03C2F /* Evergreen-iOSTests.xctest */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		84E3B1602025877000E03C2F /* Evergreen-iOS */ = {
+			isa = PBXGroup;
+			children = (
+				84E3B1612025877000E03C2F /* AppDelegate.swift */,
+				84E3B1632025877000E03C2F /* MasterViewController.swift */,
+				84E3B1652025877000E03C2F /* DetailViewController.swift */,
+				84E3B1672025877000E03C2F /* Main.storyboard */,
+				84E3B16A2025877000E03C2F /* Assets.xcassets */,
+				84E3B16C2025877000E03C2F /* LaunchScreen.storyboard */,
+				84E3B16F2025877000E03C2F /* Info.plist */,
+			);
+			path = "Evergreen-iOS";
+			sourceTree = "<group>";
+		};
+		84E3B1772025877000E03C2F /* Evergreen-iOSTests */ = {
+			isa = PBXGroup;
+			children = (
+				84E3B1782025877000E03C2F /* Evergreen_iOSTests.swift */,
+				84E3B17A2025877000E03C2F /* Info.plist */,
+			);
+			path = "Evergreen-iOSTests";
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+		84E3B15D2025877000E03C2F /* Evergreen-iOS */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 84E3B17D2025877000E03C2F /* Build configuration list for PBXNativeTarget "Evergreen-iOS" */;
+			buildPhases = (
+				84E3B15A2025877000E03C2F /* Sources */,
+				84E3B15B2025877000E03C2F /* Frameworks */,
+				84E3B15C2025877000E03C2F /* Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = "Evergreen-iOS";
+			productName = "Evergreen-iOS";
+			productReference = 84E3B15E2025877000E03C2F /* Evergreen-iOS.app */;
+			productType = "com.apple.product-type.application";
+		};
+		84E3B1732025877000E03C2F /* Evergreen-iOSTests */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 84E3B1802025877000E03C2F /* Build configuration list for PBXNativeTarget "Evergreen-iOSTests" */;
+			buildPhases = (
+				84E3B1702025877000E03C2F /* Sources */,
+				84E3B1712025877000E03C2F /* Frameworks */,
+				84E3B1722025877000E03C2F /* Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				84E3B1762025877000E03C2F /* PBXTargetDependency */,
+			);
+			name = "Evergreen-iOSTests";
+			productName = "Evergreen-iOSTests";
+			productReference = 84E3B1742025877000E03C2F /* Evergreen-iOSTests.xctest */;
+			productType = "com.apple.product-type.bundle.unit-test";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		84E3B1562025877000E03C2F /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				LastSwiftUpdateCheck = 0920;
+				LastUpgradeCheck = 0920;
+				ORGANIZATIONNAME = "Ranchero Software, LLC";
+				TargetAttributes = {
+					84E3B15D2025877000E03C2F = {
+						CreatedOnToolsVersion = 9.2;
+						ProvisioningStyle = Automatic;
+					};
+					84E3B1732025877000E03C2F = {
+						CreatedOnToolsVersion = 9.2;
+						ProvisioningStyle = Automatic;
+						TestTargetID = 84E3B15D2025877000E03C2F;
+					};
+				};
+			};
+			buildConfigurationList = 84E3B1592025877000E03C2F /* Build configuration list for PBXProject "Evergreen-iOS" */;
+			compatibilityVersion = "Xcode 8.0";
+			developmentRegion = en;
+			hasScannedForEncodings = 0;
+			knownRegions = (
+				en,
+				Base,
+			);
+			mainGroup = 84E3B1552025877000E03C2F;
+			productRefGroup = 84E3B15F2025877000E03C2F /* Products */;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				84E3B15D2025877000E03C2F /* Evergreen-iOS */,
+				84E3B1732025877000E03C2F /* Evergreen-iOSTests */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXResourcesBuildPhase section */
+		84E3B15C2025877000E03C2F /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				84E3B16E2025877000E03C2F /* LaunchScreen.storyboard in Resources */,
+				84E3B16B2025877000E03C2F /* Assets.xcassets in Resources */,
+				84E3B1692025877000E03C2F /* Main.storyboard in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		84E3B1722025877000E03C2F /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXResourcesBuildPhase section */
+
+/* Begin PBXSourcesBuildPhase section */
+		84E3B15A2025877000E03C2F /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				84E3B1662025877000E03C2F /* DetailViewController.swift in Sources */,
+				84E3B1642025877000E03C2F /* MasterViewController.swift in Sources */,
+				84E3B1622025877000E03C2F /* AppDelegate.swift in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		84E3B1702025877000E03C2F /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				84E3B1792025877000E03C2F /* Evergreen_iOSTests.swift in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin PBXTargetDependency section */
+		84E3B1762025877000E03C2F /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 84E3B15D2025877000E03C2F /* Evergreen-iOS */;
+			targetProxy = 84E3B1752025877000E03C2F /* PBXContainerItemProxy */;
+		};
+/* End PBXTargetDependency section */
+
+/* Begin PBXVariantGroup section */
+		84E3B1672025877000E03C2F /* Main.storyboard */ = {
+			isa = PBXVariantGroup;
+			children = (
+				84E3B1682025877000E03C2F /* Base */,
+			);
+			name = Main.storyboard;
+			sourceTree = "<group>";
+		};
+		84E3B16C2025877000E03C2F /* LaunchScreen.storyboard */ = {
+			isa = PBXVariantGroup;
+			children = (
+				84E3B16D2025877000E03C2F /* Base */,
+			);
+			name = LaunchScreen.storyboard;
+			sourceTree = "<group>";
+		};
+/* End PBXVariantGroup section */
+
+/* Begin XCBuildConfiguration section */
+		84E3B17B2025877000E03C2F /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				CODE_SIGN_IDENTITY = "iPhone Developer";
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = dwarf;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.2;
+				MTL_ENABLE_DEBUG_INFO = YES;
+				ONLY_ACTIVE_ARCH = YES;
+				SDKROOT = iphoneos;
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+			};
+			name = Debug;
+		};
+		84E3B17C2025877000E03C2F /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				CODE_SIGN_IDENTITY = "iPhone Developer";
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				ENABLE_NS_ASSERTIONS = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.2;
+				MTL_ENABLE_DEBUG_INFO = NO;
+				SDKROOT = iphoneos;
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				VALIDATE_PRODUCT = YES;
+			};
+			name = Release;
+		};
+		84E3B17E2025877000E03C2F /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CODE_SIGN_STYLE = Automatic;
+				DEVELOPMENT_TEAM = M8L2WTLA8W;
+				INFOPLIST_FILE = "Evergreen-iOS/Info.plist";
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.ranchero.Evergreen-iOS";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 4.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+			};
+			name = Debug;
+		};
+		84E3B17F2025877000E03C2F /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CODE_SIGN_STYLE = Automatic;
+				DEVELOPMENT_TEAM = M8L2WTLA8W;
+				INFOPLIST_FILE = "Evergreen-iOS/Info.plist";
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.ranchero.Evergreen-iOS";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 4.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+			};
+			name = Release;
+		};
+		84E3B1812025877000E03C2F /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
+				BUNDLE_LOADER = "$(TEST_HOST)";
+				CODE_SIGN_STYLE = Automatic;
+				DEVELOPMENT_TEAM = M8L2WTLA8W;
+				INFOPLIST_FILE = "Evergreen-iOSTests/Info.plist";
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.ranchero.Evergreen-iOSTests";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 4.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Evergreen-iOS.app/Evergreen-iOS";
+			};
+			name = Debug;
+		};
+		84E3B1822025877000E03C2F /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
+				BUNDLE_LOADER = "$(TEST_HOST)";
+				CODE_SIGN_STYLE = Automatic;
+				DEVELOPMENT_TEAM = M8L2WTLA8W;
+				INFOPLIST_FILE = "Evergreen-iOSTests/Info.plist";
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.ranchero.Evergreen-iOSTests";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 4.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Evergreen-iOS.app/Evergreen-iOS";
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		84E3B1592025877000E03C2F /* Build configuration list for PBXProject "Evergreen-iOS" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				84E3B17B2025877000E03C2F /* Debug */,
+				84E3B17C2025877000E03C2F /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		84E3B17D2025877000E03C2F /* Build configuration list for PBXNativeTarget "Evergreen-iOS" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				84E3B17E2025877000E03C2F /* Debug */,
+				84E3B17F2025877000E03C2F /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		84E3B1802025877000E03C2F /* Build configuration list for PBXNativeTarget "Evergreen-iOSTests" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				84E3B1812025877000E03C2F /* Debug */,
+				84E3B1822025877000E03C2F /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = 84E3B1562025877000E03C2F /* Project object */;
+}
diff --git a/Evergreen-iOS/Evergreen-iOS/AppDelegate.swift b/Evergreen-iOS/Evergreen-iOS/AppDelegate.swift
new file mode 100644
index 000000000..dc7e8d2e4
--- /dev/null
+++ b/Evergreen-iOS/Evergreen-iOS/AppDelegate.swift
@@ -0,0 +1,61 @@
+//
+//  AppDelegate.swift
+//  Evergreen-iOS
+//
+//  Created by Brent Simmons on 2/2/18.
+//  Copyright © 2018 Ranchero Software, LLC. All rights reserved.
+//
+
+import UIKit
+
+@UIApplicationMain
+class AppDelegate: UIResponder, UIApplicationDelegate, UISplitViewControllerDelegate {
+
+	var window: UIWindow?
+
+
+	func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
+		// Override point for customization after application launch.
+		let splitViewController = window!.rootViewController as! UISplitViewController
+		let navigationController = splitViewController.viewControllers[splitViewController.viewControllers.count-1] as! UINavigationController
+		navigationController.topViewController!.navigationItem.leftBarButtonItem = splitViewController.displayModeButtonItem
+		splitViewController.delegate = self
+		return true
+	}
+
+	func applicationWillResignActive(_ application: UIApplication) {
+		// Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
+		// Use this method to pause ongoing tasks, disable timers, and invalidate graphics rendering callbacks. Games should use this method to pause the game.
+	}
+
+	func applicationDidEnterBackground(_ application: UIApplication) {
+		// Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
+		// If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
+	}
+
+	func applicationWillEnterForeground(_ application: UIApplication) {
+		// Called as part of the transition from the background to the active state; here you can undo many of the changes made on entering the background.
+	}
+
+	func applicationDidBecomeActive(_ application: UIApplication) {
+		// Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
+	}
+
+	func applicationWillTerminate(_ application: UIApplication) {
+		// Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
+	}
+
+	// MARK: - Split view
+
+	func splitViewController(_ splitViewController: UISplitViewController, collapseSecondary secondaryViewController:UIViewController, onto primaryViewController:UIViewController) -> Bool {
+	    guard let secondaryAsNavController = secondaryViewController as? UINavigationController else { return false }
+	    guard let topAsDetailController = secondaryAsNavController.topViewController as? DetailViewController else { return false }
+	    if topAsDetailController.detailItem == nil {
+	        // Return true to indicate that we have handled the collapse by doing nothing; the secondary controller will be discarded.
+	        return true
+	    }
+	    return false
+	}
+
+}
+
diff --git a/Evergreen-iOS/Evergreen-iOS/Base.lproj/LaunchScreen.storyboard b/Evergreen-iOS/Evergreen-iOS/Base.lproj/LaunchScreen.storyboard
new file mode 100644
index 000000000..f83f6fd58
--- /dev/null
+++ b/Evergreen-iOS/Evergreen-iOS/Base.lproj/LaunchScreen.storyboard
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13122.16" systemVersion="17A277" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13104.12"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <scenes>
+        <!--View Controller-->
+        <scene sceneID="EHf-IW-A2E">
+            <objects>
+                <viewController id="01J-lp-oVM" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
+                    </view>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="53" y="375"/>
+        </scene>
+    </scenes>
+</document>
diff --git a/Evergreen-iOS/Evergreen-iOS/Base.lproj/Main.storyboard b/Evergreen-iOS/Evergreen-iOS/Base.lproj/Main.storyboard
new file mode 100644
index 000000000..d78406541
--- /dev/null
+++ b/Evergreen-iOS/Evergreen-iOS/Base.lproj/Main.storyboard
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13163" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="H1p-Uh-vWS">
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13143"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <scenes>
+        <!--Master-->
+        <scene sceneID="pY4-Hu-kfo">
+            <objects>
+                <navigationController title="Master" id="RMx-3f-FxP" sceneMemberID="viewController">
+                    <navigationBar key="navigationBar" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" id="Pmd-2v-anx">
+                        <autoresizingMask key="autoresizingMask"/>
+                    </navigationBar>
+                    <connections>
+                        <segue destination="7bK-jq-Zjz" kind="relationship" relationship="rootViewController" id="tsl-Nk-0bq"/>
+                    </connections>
+                </navigationController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="8fS-aE-onr" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="-38" y="-630"/>
+        </scene>
+        <!--Detail-->
+        <scene sceneID="yUG-lL-AsK">
+            <objects>
+                <viewController title="Detail" id="JEX-9P-axG" customClass="DetailViewController" customModuleProvider="target" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="svH-Pt-448">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <label clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" text="Detail view content goes here" textAlignment="center" lineBreakMode="tailTruncation" minimumFontSize="10" translatesAutoresizingMaskIntoConstraints="NO" id="0XM-y9-sOw">
+                                <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                        </subviews>
+                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <constraints>
+                            <constraint firstItem="0XM-y9-sOw" firstAttribute="leading" secondItem="svH-Pt-448" secondAttribute="leading" constant="20" symbolic="YES" id="Tsc-yG-G1q"/>
+                            <constraint firstItem="0XM-y9-sOw" firstAttribute="centerY" secondItem="svH-Pt-448" secondAttribute="centerY" id="jWN-iV-94e"/>
+                            <constraint firstAttribute="trailing" secondItem="0XM-y9-sOw" secondAttribute="trailing" constant="20" symbolic="YES" id="tHV-ZD-HQj"/>
+                        </constraints>
+                        <viewLayoutGuide key="safeArea" id="VUw-jc-0yf"/>
+                    </view>
+                    <toolbarItems/>
+                    <navigationItem key="navigationItem" title="Detail" id="mOI-FS-AaM"/>
+                    <connections>
+                        <outlet property="detailDescriptionLabel" destination="0XM-y9-sOw" id="deQ-Na-JPF"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="FJe-Yq-33r" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="709" y="129"/>
+        </scene>
+        <!--Split View Controller-->
+        <scene sceneID="Nki-YV-4Qg">
+            <objects>
+                <splitViewController id="H1p-Uh-vWS" sceneMemberID="viewController">
+                    <toolbarItems/>
+                    <connections>
+                        <segue destination="RMx-3f-FxP" kind="relationship" relationship="masterViewController" id="BlO-5A-QYV"/>
+                        <segue destination="vC3-pB-5Vb" kind="relationship" relationship="detailViewController" id="Tll-UG-LXB"/>
+                    </connections>
+                </splitViewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="cZU-Oi-B1e" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="-856" y="-330"/>
+        </scene>
+        <!--Master-->
+        <scene sceneID="smW-Zh-WAh">
+            <objects>
+                <tableViewController title="Master" clearsSelectionOnViewWillAppear="NO" id="7bK-jq-Zjz" customClass="MasterViewController" customModuleProvider="target" sceneMemberID="viewController">
+                    <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" id="r7i-6Z-zg0">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <prototypes>
+                            <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="Cell" textLabel="Arm-wq-HPj" style="IBUITableViewCellStyleDefault" id="WCw-Qf-5nD">
+                                <rect key="frame" x="0.0" y="86" width="375" height="44"/>
+                                <autoresizingMask key="autoresizingMask"/>
+                                <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="WCw-Qf-5nD" id="37f-cq-3Eg">
+                                    <rect key="frame" x="0.0" y="0.0" width="375" height="43"/>
+                                    <autoresizingMask key="autoresizingMask"/>
+                                    <subviews>
+                                        <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" text="Title" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Arm-wq-HPj">
+                                            <rect key="frame" x="15" y="0.0" width="345" height="43"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <fontDescription key="fontDescription" type="boldSystem" pointSize="20"/>
+                                            <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                            <color key="highlightedColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                        </label>
+                                    </subviews>
+                                </tableViewCellContentView>
+                                <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <connections>
+                                    <segue destination="vC3-pB-5Vb" kind="showDetail" identifier="showDetail" id="6S0-TO-JiA"/>
+                                </connections>
+                            </tableViewCell>
+                        </prototypes>
+                        <sections/>
+                        <connections>
+                            <outlet property="dataSource" destination="7bK-jq-Zjz" id="Gho-Na-rnu"/>
+                            <outlet property="delegate" destination="7bK-jq-Zjz" id="RA6-mI-bju"/>
+                        </connections>
+                    </tableView>
+                    <navigationItem key="navigationItem" title="Master" id="Zdf-7t-Un8"/>
+                </tableViewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="Rux-fX-hf1" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="709" y="-630"/>
+        </scene>
+        <!--Navigation Controller-->
+        <scene sceneID="r7l-gg-dq7">
+            <objects>
+                <navigationController id="vC3-pB-5Vb" sceneMemberID="viewController">
+                    <navigationBar key="navigationBar" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" id="DjV-YW-jjY">
+                        <autoresizingMask key="autoresizingMask"/>
+                    </navigationBar>
+                    <connections>
+                        <segue destination="JEX-9P-axG" kind="relationship" relationship="rootViewController" id="GKi-kA-LjT"/>
+                    </connections>
+                </navigationController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="SLD-UC-DBI" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="-45" y="129"/>
+        </scene>
+    </scenes>
+    <inferredMetricsTieBreakers>
+        <segue reference="6S0-TO-JiA"/>
+    </inferredMetricsTieBreakers>
+</document>
diff --git a/Evergreen-iOS/Evergreen-iOS/DetailViewController.swift b/Evergreen-iOS/Evergreen-iOS/DetailViewController.swift
new file mode 100644
index 000000000..05f0aef19
--- /dev/null
+++ b/Evergreen-iOS/Evergreen-iOS/DetailViewController.swift
@@ -0,0 +1,45 @@
+//
+//  DetailViewController.swift
+//  Evergreen-iOS
+//
+//  Created by Brent Simmons on 2/2/18.
+//  Copyright © 2018 Ranchero Software, LLC. All rights reserved.
+//
+
+import UIKit
+
+class DetailViewController: UIViewController {
+
+	@IBOutlet weak var detailDescriptionLabel: UILabel!
+
+
+	func configureView() {
+		// Update the user interface for the detail item.
+		if let detail = detailItem {
+		    if let label = detailDescriptionLabel {
+		        label.text = detail.description
+		    }
+		}
+	}
+
+	override func viewDidLoad() {
+		super.viewDidLoad()
+		// Do any additional setup after loading the view, typically from a nib.
+		configureView()
+	}
+
+	override func didReceiveMemoryWarning() {
+		super.didReceiveMemoryWarning()
+		// Dispose of any resources that can be recreated.
+	}
+
+	var detailItem: NSDate? {
+		didSet {
+		    // Update the view.
+		    configureView()
+		}
+	}
+
+
+}
+
diff --git a/Evergreen-iOS/Evergreen-iOS/Info.plist b/Evergreen-iOS/Evergreen-iOS/Info.plist
new file mode 100644
index 000000000..6873106a5
--- /dev/null
+++ b/Evergreen-iOS/Evergreen-iOS/Info.plist
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+	<key>LSRequiresIPhoneOS</key>
+	<true/>
+	<key>UILaunchStoryboardName</key>
+	<string>LaunchScreen</string>
+	<key>UIMainStoryboardFile</key>
+	<string>Main</string>
+	<key>UIRequiredDeviceCapabilities</key>
+	<array>
+		<string>armv7</string>
+	</array>
+	<key>UIStatusBarTintParameters</key>
+	<dict>
+		<key>UINavigationBar</key>
+		<dict>
+			<key>Style</key>
+			<string>UIBarStyleDefault</string>
+			<key>Translucent</key>
+			<false/>
+		</dict>
+	</dict>
+	<key>UISupportedInterfaceOrientations</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+	<key>UISupportedInterfaceOrientations~ipad</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationPortraitUpsideDown</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+</dict>
+</plist>
diff --git a/Evergreen-iOS/Evergreen-iOS/MasterViewController.swift b/Evergreen-iOS/Evergreen-iOS/MasterViewController.swift
new file mode 100644
index 000000000..50909abe9
--- /dev/null
+++ b/Evergreen-iOS/Evergreen-iOS/MasterViewController.swift
@@ -0,0 +1,95 @@
+//
+//  MasterViewController.swift
+//  Evergreen-iOS
+//
+//  Created by Brent Simmons on 2/2/18.
+//  Copyright © 2018 Ranchero Software, LLC. All rights reserved.
+//
+
+import UIKit
+
+class MasterViewController: UITableViewController {
+
+	var detailViewController: DetailViewController? = nil
+	var objects = [Any]()
+
+
+	override func viewDidLoad() {
+		super.viewDidLoad()
+		// Do any additional setup after loading the view, typically from a nib.
+		navigationItem.leftBarButtonItem = editButtonItem
+
+		let addButton = UIBarButtonItem(barButtonSystemItem: .add, target: self, action: #selector(insertNewObject(_:)))
+		navigationItem.rightBarButtonItem = addButton
+		if let split = splitViewController {
+		    let controllers = split.viewControllers
+		    detailViewController = (controllers[controllers.count-1] as! UINavigationController).topViewController as? DetailViewController
+		}
+	}
+
+	override func viewWillAppear(_ animated: Bool) {
+		clearsSelectionOnViewWillAppear = splitViewController!.isCollapsed
+		super.viewWillAppear(animated)
+	}
+
+	override func didReceiveMemoryWarning() {
+		super.didReceiveMemoryWarning()
+		// Dispose of any resources that can be recreated.
+	}
+
+	@objc
+	func insertNewObject(_ sender: Any) {
+		objects.insert(NSDate(), at: 0)
+		let indexPath = IndexPath(row: 0, section: 0)
+		tableView.insertRows(at: [indexPath], with: .automatic)
+	}
+
+	// MARK: - Segues
+
+	override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
+		if segue.identifier == "showDetail" {
+		    if let indexPath = tableView.indexPathForSelectedRow {
+		        let object = objects[indexPath.row] as! NSDate
+		        let controller = (segue.destination as! UINavigationController).topViewController as! DetailViewController
+		        controller.detailItem = object
+		        controller.navigationItem.leftBarButtonItem = splitViewController?.displayModeButtonItem
+		        controller.navigationItem.leftItemsSupplementBackButton = true
+		    }
+		}
+	}
+
+	// MARK: - Table View
+
+	override func numberOfSections(in tableView: UITableView) -> Int {
+		return 1
+	}
+
+	override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+		return objects.count
+	}
+
+	override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+		let cell = tableView.dequeueReusableCell(withIdentifier: "Cell", for: indexPath)
+
+		let object = objects[indexPath.row] as! NSDate
+		cell.textLabel!.text = object.description
+		return cell
+	}
+
+	override func tableView(_ tableView: UITableView, canEditRowAt indexPath: IndexPath) -> Bool {
+		// Return false if you do not want the specified item to be editable.
+		return true
+	}
+
+	override func tableView(_ tableView: UITableView, commit editingStyle: UITableViewCellEditingStyle, forRowAt indexPath: IndexPath) {
+		if editingStyle == .delete {
+		    objects.remove(at: indexPath.row)
+		    tableView.deleteRows(at: [indexPath], with: .fade)
+		} else if editingStyle == .insert {
+		    // Create a new instance of the appropriate class, insert it into the array, and add a new row to the table view.
+		}
+	}
+
+
+}
+
diff --git a/Evergreen-iOS/Evergreen-iOSTests/Evergreen_iOSTests.swift b/Evergreen-iOS/Evergreen-iOSTests/Evergreen_iOSTests.swift
new file mode 100644
index 000000000..48c872a6f
--- /dev/null
+++ b/Evergreen-iOS/Evergreen-iOSTests/Evergreen_iOSTests.swift
@@ -0,0 +1,36 @@
+//
+//  Evergreen_iOSTests.swift
+//  Evergreen-iOSTests
+//
+//  Created by Brent Simmons on 2/2/18.
+//  Copyright © 2018 Ranchero Software, LLC. All rights reserved.
+//
+
+import XCTest
+@testable import Evergreen_iOS
+
+class Evergreen_iOSTests: XCTestCase {
+    
+    override func setUp() {
+        super.setUp()
+        // Put setup code here. This method is called before the invocation of each test method in the class.
+    }
+    
+    override func tearDown() {
+        // Put teardown code here. This method is called after the invocation of each test method in the class.
+        super.tearDown()
+    }
+    
+    func testExample() {
+        // This is an example of a functional test case.
+        // Use XCTAssert and related functions to verify your tests produce the correct results.
+    }
+    
+    func testPerformanceExample() {
+        // This is an example of a performance test case.
+        self.measure {
+            // Put the code you want to measure the time of here.
+        }
+    }
+    
+}
diff --git a/Evergreen-iOS/Evergreen-iOSTests/Info.plist b/Evergreen-iOS/Evergreen-iOSTests/Info.plist
new file mode 100644
index 000000000..6c40a6cd0
--- /dev/null
+++ b/Evergreen-iOS/Evergreen-iOSTests/Info.plist
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>BNDL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+</dict>
+</plist>
diff --git a/Evergreen.xcodeproj/project.pbxproj b/Evergreen.xcodeproj/project.pbxproj
index eb330c638..014a66093 100644
--- a/Evergreen.xcodeproj/project.pbxproj
+++ b/Evergreen.xcodeproj/project.pbxproj
@@ -92,6 +92,8 @@
 		84A14FF320048CA70046AD9A /* SendToMicroBlogCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84A14FF220048CA70046AD9A /* SendToMicroBlogCommand.swift */; };
 		84A1500320048D660046AD9A /* SendToCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84A1500220048D660046AD9A /* SendToCommand.swift */; };
 		84A1500520048DDF0046AD9A /* SendToMarsEditCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84A1500420048DDF0046AD9A /* SendToMarsEditCommand.swift */; };
+		84A37CB5201ECD610087C5AF /* RenameWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84A37CB4201ECD610087C5AF /* RenameWindowController.swift */; };
+		84A37CBB201ECE590087C5AF /* RenameSheet.xib in Resources */ = {isa = PBXBuildFile; fileRef = 84A37CB9201ECE590087C5AF /* RenameSheet.xib */; };
 		84B06FAE1ED37DBD00F0B54B /* RSCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84B06FA91ED37DAD00F0B54B /* RSCore.framework */; };
 		84B06FAF1ED37DBD00F0B54B /* RSCore.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 84B06FA91ED37DAD00F0B54B /* RSCore.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		84B06FB21ED37DBD00F0B54B /* RSDatabase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84B06F9D1ED37DA000F0B54B /* RSDatabase.framework */; };
@@ -165,6 +167,20 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
+		84659B8920259341008DB8F8 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 84659B8020259341008DB8F8 /* Evergreen-iOS.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 84E3B15E2025877000E03C2F;
+			remoteInfo = "Evergreen-iOS";
+		};
+		84659B8B20259341008DB8F8 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 84659B8020259341008DB8F8 /* Evergreen-iOS.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 84E3B1742025877000E03C2F;
+			remoteInfo = "Evergreen-iOSTests";
+		};
 		846E77201F6EF5D100A165E2 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 846E77161F6EF5D000A165E2 /* Database.xcodeproj */;
@@ -499,6 +515,7 @@
 		845EE7B01FC2366500854A1F /* StarredFeedDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StarredFeedDelegate.swift; sourceTree = "<group>"; };
 		845EE7C01FC2488C00854A1F /* SmartFeed.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SmartFeed.swift; sourceTree = "<group>"; };
 		845F52EC1FB2B9FC00C10BF0 /* FeedPasteboardWriter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeedPasteboardWriter.swift; sourceTree = "<group>"; };
+		84659B8020259341008DB8F8 /* Evergreen-iOS.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "Evergreen-iOS.xcodeproj"; path = "Evergreen-iOS/Evergreen-iOS.xcodeproj"; sourceTree = "<group>"; };
 		846E77161F6EF5D000A165E2 /* Database.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Database.xcodeproj; path = Frameworks/Database/Database.xcodeproj; sourceTree = "<group>"; };
 		846E77301F6EF5D600A165E2 /* Account.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Account.xcodeproj; path = Frameworks/Account/Account.xcodeproj; sourceTree = "<group>"; };
 		84702AA31FA27AC0006B8943 /* MarkReadOrUnreadCommand.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MarkReadOrUnreadCommand.swift; sourceTree = "<group>"; };
@@ -556,6 +573,8 @@
 		84A14FF220048CA70046AD9A /* SendToMicroBlogCommand.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SendToMicroBlogCommand.swift; sourceTree = "<group>"; };
 		84A1500220048D660046AD9A /* SendToCommand.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SendToCommand.swift; sourceTree = "<group>"; };
 		84A1500420048DDF0046AD9A /* SendToMarsEditCommand.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SendToMarsEditCommand.swift; sourceTree = "<group>"; };
+		84A37CB4201ECD610087C5AF /* RenameWindowController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RenameWindowController.swift; sourceTree = "<group>"; };
+		84A37CBA201ECE590087C5AF /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Evergreen/Base.lproj/RenameSheet.xib; sourceTree = SOURCE_ROOT; };
 		84A6B6931FB8D43C006754AC /* DinosaursWindow.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = DinosaursWindow.xib; sourceTree = "<group>"; };
 		84A6B6951FB8DBD2006754AC /* DinosaursWindowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DinosaursWindowController.swift; sourceTree = "<group>"; };
 		84B06F961ED37DA000F0B54B /* RSDatabase.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RSDatabase.xcodeproj; path = Frameworks/RSDatabase/RSDatabase.xcodeproj; sourceTree = "<group>"; };
@@ -680,6 +699,7 @@
 				849A977C1ED9EC42007D329B /* Detail */,
 				849A97551ED9EAC3007D329B /* Add Feed */,
 				849A97411ED9EAA9007D329B /* Add Folder */,
+				84B7178A201E66580091657D /* ContextualMenus */,
 			);
 			name = MainWindow;
 			path = Evergreen/MainWindow;
@@ -743,6 +763,15 @@
 			path = Cell;
 			sourceTree = "<group>";
 		};
+		84659B8120259341008DB8F8 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				84659B8A20259341008DB8F8 /* Evergreen-iOS.app */,
+				84659B8C20259341008DB8F8 /* Evergreen-iOSTests.xctest */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
 		846E77171F6EF5D000A165E2 /* Products */ = {
 			isa = PBXGroup;
 			children = (
@@ -828,6 +857,7 @@
 				84D5BA1F201E8FB6009092BD /* SidebarGearMenuDelegate.swift */,
 				844B5B6A1FEA224000C7C76A /* Keyboard */,
 				845A29251FC928C7007B49E3 /* Cell */,
+				84A37CB3201ECD610087C5AF /* Renaming */,
 			);
 			path = Sidebar;
 			sourceTree = "<group>";
@@ -954,7 +984,6 @@
 				842E45DC1ED8C54B000A8B52 /* Browser.swift */,
 				84702AB31FA27AE8006B8943 /* Commands */,
 				842E45E11ED8C681000A8B52 /* MainWindow */,
-				84B7178A201E66580091657D /* ContextualMenus */,
 				84BBB12A20142A4700F054F5 /* Inspector */,
 				842E45E01ED8C587000A8B52 /* Preferences */,
 				849A97861ED9ECEF007D329B /* Article Styles */,
@@ -976,6 +1005,7 @@
 				849C64741ED37A5D003D8FC0 /* EvergreenTests */,
 				D5907CDA2002F084005947E5 /* xcconfig */,
 				849C64611ED37A5D003D8FC0 /* Products */,
+				84659B8020259341008DB8F8 /* Evergreen-iOS.xcodeproj */,
 				846E77301F6EF5D600A165E2 /* Account.xcodeproj */,
 				846E77161F6EF5D000A165E2 /* Database.xcodeproj */,
 				84BB4B611F1174D400858766 /* Data.xcodeproj */,
@@ -1009,6 +1039,15 @@
 			path = EvergreenTests;
 			sourceTree = "<group>";
 		};
+		84A37CB3201ECD610087C5AF /* Renaming */ = {
+			isa = PBXGroup;
+			children = (
+				84A37CB9201ECE590087C5AF /* RenameSheet.xib */,
+				84A37CB4201ECD610087C5AF /* RenameWindowController.swift */,
+			);
+			path = Renaming;
+			sourceTree = "<group>";
+		};
 		84A6B6921FB8D43C006754AC /* Dinosaurs */ = {
 			isa = PBXGroup;
 			children = (
@@ -1090,8 +1129,7 @@
 			children = (
 				84B7178B201E66580091657D /* MainWindowController+ContextualMenus.swift */,
 			);
-			name = ContextualMenus;
-			path = Evergreen/ContextualMenus;
+			path = ContextualMenus;
 			sourceTree = "<group>";
 		};
 		84BB4B621F1174D400858766 /* Products */ = {
@@ -1323,6 +1361,10 @@
 					ProductGroup = 84B06FC71ED37F7200F0B54B /* Products */;
 					ProjectRef = 84B06FC61ED37F7200F0B54B /* DB5.xcodeproj */;
 				},
+				{
+					ProductGroup = 84659B8120259341008DB8F8 /* Products */;
+					ProjectRef = 84659B8020259341008DB8F8 /* Evergreen-iOS.xcodeproj */;
+				},
 				{
 					ProductGroup = 84B06FA31ED37DAC00F0B54B /* Products */;
 					ProjectRef = 84B06FA21ED37DAC00F0B54B /* RSCore.xcodeproj */;
@@ -1361,6 +1403,20 @@
 /* End PBXProject section */
 
 /* Begin PBXReferenceProxy section */
+		84659B8A20259341008DB8F8 /* Evergreen-iOS.app */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.application;
+			path = "Evergreen-iOS.app";
+			remoteRef = 84659B8920259341008DB8F8 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		84659B8C20259341008DB8F8 /* Evergreen-iOSTests.xctest */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.cfbundle;
+			path = "Evergreen-iOSTests.xctest";
+			remoteRef = 84659B8B20259341008DB8F8 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
 		846E77211F6EF5D100A165E2 /* Database.framework */ = {
 			isa = PBXReferenceProxy;
 			fileType = wrapper.framework;
@@ -1560,6 +1616,7 @@
 				849A97B21ED9FA69007D329B /* MainWindow.storyboard in Resources */,
 				849A979C1ED9EFEB007D329B /* styleSheet.css in Resources */,
 				849A97A61ED9F94D007D329B /* Preferences.storyboard in Resources */,
+				84A37CBB201ECE590087C5AF /* RenameSheet.xib in Resources */,
 				84BBB12D20142A4700F054F5 /* Inspector.storyboard in Resources */,
 				D5D1751220020B980047B29D /* Evergreen.sdef in Resources */,
 			);
@@ -1632,6 +1689,7 @@
 				849A975B1ED9EB0D007D329B /* ArticleUtilities.swift in Sources */,
 				84DAEE301F86CAFE0058304B /* OPMLImporter.swift in Sources */,
 				849A975C1ED9EB0D007D329B /* DefaultFeedsImporter.swift in Sources */,
+				84A37CB5201ECD610087C5AF /* RenameWindowController.swift in Sources */,
 				84A14FF320048CA70046AD9A /* SendToMicroBlogCommand.swift in Sources */,
 				849A97891ED9ECEF007D329B /* ArticleStyle.swift in Sources */,
 				84FF69B11FC3793300DC198E /* FaviconURLFinder.swift in Sources */,
@@ -1825,6 +1883,14 @@
 			path = Evergreen;
 			sourceTree = "<group>";
 		};
+		84A37CB9201ECE590087C5AF /* RenameSheet.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				84A37CBA201ECE590087C5AF /* Base */,
+			);
+			name = RenameSheet.xib;
+			sourceTree = "<group>";
+		};
 /* End PBXVariantGroup section */
 
 /* Begin XCBuildConfiguration section */
diff --git a/Evergreen/AppDelegate.swift b/Evergreen/AppDelegate.swift
index 0b4f9b52a..36f04da16 100644
--- a/Evergreen/AppDelegate.swift
+++ b/Evergreen/AppDelegate.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2015 Ranchero Software, LLC. All rights reserved.
 //
 
-import Cocoa
+import AppKit
 import DB5
 import Data
 import RSTextDrawing
diff --git a/Evergreen/AppNotifications.swift b/Evergreen/AppNotifications.swift
index da9285a5d..b2e419cab 100644
--- a/Evergreen/AppNotifications.swift
+++ b/Evergreen/AppNotifications.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2015 Ranchero Software, LLC. All rights reserved.
 //
 
-import Cocoa
+import AppKit
 import Data
 
 extension Notification.Name {
diff --git a/Evergreen/Base.lproj/RenameSheet.xib b/Evergreen/Base.lproj/RenameSheet.xib
new file mode 100644
index 000000000..6722eaaeb
--- /dev/null
+++ b/Evergreen/Base.lproj/RenameSheet.xib
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14087.3" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14087.3"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <customObject id="-2" userLabel="File's Owner" customClass="RenameWindowController" customModule="Evergreen" customModuleProvider="target">
+            <connections>
+                <outlet property="newTitleTextField" destination="OYZ-cW-H2x" id="QBo-lj-NGi"/>
+                <outlet property="renameButton" destination="RI3-Rg-htY" id="PMM-jS-psV"/>
+                <outlet property="renamePrompt" destination="Sh3-Yd-lqa" id="wd5-4I-pYl"/>
+            </connections>
+        </customObject>
+        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
+        <window title="Rename" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" releasedWhenClosed="NO" animationBehavior="default" id="QvC-M9-y7g">
+            <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
+            <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
+            <rect key="contentRect" x="196" y="240" width="424" height="116"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1417"/>
+            <view key="contentView" wantsLayer="YES" id="EiT-Mj-1SZ">
+                <rect key="frame" x="0.0" y="0.0" width="424" height="116"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="Sh3-Yd-lqa">
+                        <rect key="frame" x="18" y="79" width="388" height="17"/>
+                        <textFieldCell key="cell" sendsActionOnEndEditing="YES" title="&lt;&lt;Rename prompt&gt;&gt;" id="7Os-lV-Jer">
+                            <font key="font" metaFont="system"/>
+                            <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                        </textFieldCell>
+                    </textField>
+                    <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="OYZ-cW-H2x">
+                        <rect key="frame" x="20" y="49" width="384" height="22"/>
+                        <constraints>
+                            <constraint firstAttribute="width" constant="384" id="l0l-MT-cWi"/>
+                        </constraints>
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" usesSingleLineMode="YES" id="hYk-R8-qWE">
+                            <font key="font" metaFont="system"/>
+                            <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                        </textFieldCell>
+                    </textField>
+                    <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="RI3-Rg-htY">
+                        <rect key="frame" x="321" y="13" width="89" height="32"/>
+                        <buttonCell key="cell" type="push" title="Rename" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="gcS-uM-zjx">
+                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                            <font key="font" metaFont="system"/>
+                        </buttonCell>
+                    </button>
+                    <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="vuB-kU-1EJ">
+                        <rect key="frame" x="232" y="13" width="89" height="32"/>
+                        <buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="oe4-cJ-2V8">
+                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                            <font key="font" metaFont="system"/>
+                            <string key="keyEquivalent" base64-UTF8="YES">
+Gw
+</string>
+                        </buttonCell>
+                    </button>
+                </subviews>
+                <constraints>
+                    <constraint firstAttribute="trailing" secondItem="RI3-Rg-htY" secondAttribute="trailing" constant="20" symbolic="YES" id="0z1-e4-z5o"/>
+                    <constraint firstItem="RI3-Rg-htY" firstAttribute="leading" secondItem="vuB-kU-1EJ" secondAttribute="trailing" constant="12" symbolic="YES" id="1wa-oD-ZUk"/>
+                    <constraint firstItem="RI3-Rg-htY" firstAttribute="baseline" secondItem="vuB-kU-1EJ" secondAttribute="baseline" id="7aJ-9f-ZiB"/>
+                    <constraint firstItem="Sh3-Yd-lqa" firstAttribute="leading" secondItem="EiT-Mj-1SZ" secondAttribute="leading" constant="20" symbolic="YES" id="7iI-p5-afU"/>
+                    <constraint firstItem="OYZ-cW-H2x" firstAttribute="top" secondItem="Sh3-Yd-lqa" secondAttribute="bottom" constant="8" symbolic="YES" id="7mb-Wa-D2t"/>
+                    <constraint firstItem="RI3-Rg-htY" firstAttribute="width" secondItem="vuB-kU-1EJ" secondAttribute="width" id="7wx-8m-oci"/>
+                    <constraint firstAttribute="bottom" secondItem="RI3-Rg-htY" secondAttribute="bottom" constant="20" symbolic="YES" id="B87-a6-FfJ"/>
+                    <constraint firstItem="vuB-kU-1EJ" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="EiT-Mj-1SZ" secondAttribute="leading" constant="20" id="La1-cg-bkz"/>
+                    <constraint firstItem="Sh3-Yd-lqa" firstAttribute="top" secondItem="EiT-Mj-1SZ" secondAttribute="top" constant="20" symbolic="YES" id="Nea-H1-95X"/>
+                    <constraint firstItem="OYZ-cW-H2x" firstAttribute="leading" secondItem="EiT-Mj-1SZ" secondAttribute="leading" constant="20" symbolic="YES" id="UZp-Dj-pmE"/>
+                    <constraint firstAttribute="trailing" secondItem="OYZ-cW-H2x" secondAttribute="trailing" constant="20" symbolic="YES" id="m0F-xh-d9a"/>
+                    <constraint firstItem="RI3-Rg-htY" firstAttribute="top" secondItem="OYZ-cW-H2x" secondAttribute="bottom" constant="8" symbolic="YES" id="m3G-Ks-EL3"/>
+                    <constraint firstAttribute="trailing" secondItem="Sh3-Yd-lqa" secondAttribute="trailing" constant="20" symbolic="YES" id="xsO-co-H9V"/>
+                </constraints>
+            </view>
+            <point key="canvasLocation" x="90" y="-409"/>
+        </window>
+    </objects>
+</document>
diff --git a/Evergreen/Data/SmallIconProvider.swift b/Evergreen/Data/SmallIconProvider.swift
index bdd3c4659..b62fd2688 100644
--- a/Evergreen/Data/SmallIconProvider.swift
+++ b/Evergreen/Data/SmallIconProvider.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2017 Ranchero Software. All rights reserved.
 //
 
-import Cocoa
+import AppKit
 
 protocol SmallIconProvider {
 
diff --git a/Evergreen/Dinosaurs/DinosaursWindowController.swift b/Evergreen/Dinosaurs/DinosaursWindowController.swift
index 1af4ab749..ffc09e849 100644
--- a/Evergreen/Dinosaurs/DinosaursWindowController.swift
+++ b/Evergreen/Dinosaurs/DinosaursWindowController.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2017 Ranchero Software. All rights reserved.
 //
 
-import Cocoa
+import AppKit
 
 class DinosaursWindowController: NSWindowController {
 
diff --git a/Evergreen/FeedList/FeedListControlsView.swift b/Evergreen/FeedList/FeedListControlsView.swift
index 9c0688b27..0943bfe3b 100644
--- a/Evergreen/FeedList/FeedListControlsView.swift
+++ b/Evergreen/FeedList/FeedListControlsView.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2017 Ranchero Software. All rights reserved.
 //
 
-import Cocoa
+import AppKit
 
 @objc final class FeedListControlsView: NSView {
 
diff --git a/Evergreen/FeedList/FeedListSplitViewController.swift b/Evergreen/FeedList/FeedListSplitViewController.swift
index 9e1691147..9a82f1f40 100644
--- a/Evergreen/FeedList/FeedListSplitViewController.swift
+++ b/Evergreen/FeedList/FeedListSplitViewController.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2017 Ranchero Software. All rights reserved.
 //
 
-import Cocoa
+import AppKit
 
 class FeedListSplitViewController: NSSplitViewController {
 
diff --git a/Evergreen/FeedList/FeedListViewController.swift b/Evergreen/FeedList/FeedListViewController.swift
index ef1c0abda..b885478ab 100644
--- a/Evergreen/FeedList/FeedListViewController.swift
+++ b/Evergreen/FeedList/FeedListViewController.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2017 Ranchero Software. All rights reserved.
 //
 
-import Cocoa
+import AppKit
 import RSTree
 import RSCore
 
diff --git a/Evergreen/FeedList/FeedListWindowController.swift b/Evergreen/FeedList/FeedListWindowController.swift
index 934a1aa43..e4e2f215c 100644
--- a/Evergreen/FeedList/FeedListWindowController.swift
+++ b/Evergreen/FeedList/FeedListWindowController.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2015 Ranchero Software, LLC. All rights reserved.
 //
 
-import Cocoa
+import AppKit
 
 class FeedListWindowController : NSWindowController {
     
diff --git a/Evergreen/Images/AuthorAvatarDownloader.swift b/Evergreen/Images/AuthorAvatarDownloader.swift
index 8965a0457..d3d5f5c4c 100644
--- a/Evergreen/Images/AuthorAvatarDownloader.swift
+++ b/Evergreen/Images/AuthorAvatarDownloader.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2017 Ranchero Software. All rights reserved.
 //
 
-import Cocoa
+import AppKit
 import Data
 
 extension Notification.Name {
diff --git a/Evergreen/Images/FeaturedImageDownloader.swift b/Evergreen/Images/FeaturedImageDownloader.swift
index 3b429c3fb..f81b5c654 100644
--- a/Evergreen/Images/FeaturedImageDownloader.swift
+++ b/Evergreen/Images/FeaturedImageDownloader.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2017 Ranchero Software. All rights reserved.
 //
 
-import Cocoa
+import AppKit
 import Data
 import RSParser
 
diff --git a/Evergreen/Images/FeedIconDownloader.swift b/Evergreen/Images/FeedIconDownloader.swift
index 560d563dd..ccf6fee46 100644
--- a/Evergreen/Images/FeedIconDownloader.swift
+++ b/Evergreen/Images/FeedIconDownloader.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2017 Ranchero Software. All rights reserved.
 //
 
-import Cocoa
+import AppKit
 import Data
 import RSWeb
 import RSParser
diff --git a/Evergreen/MainWindow/AddFeed/AddFeedController.swift b/Evergreen/MainWindow/AddFeed/AddFeedController.swift
index 816d7149b..d177f9030 100644
--- a/Evergreen/MainWindow/AddFeed/AddFeedController.swift
+++ b/Evergreen/MainWindow/AddFeed/AddFeedController.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2016 Ranchero Software, LLC. All rights reserved.
 //
 
-import Cocoa
+import AppKit
 import RSCore
 import RSTree
 import Data
diff --git a/Evergreen/MainWindow/AddFeed/AddFeedWindowController.swift b/Evergreen/MainWindow/AddFeed/AddFeedWindowController.swift
index 706ed151f..44e8000ef 100644
--- a/Evergreen/MainWindow/AddFeed/AddFeedWindowController.swift
+++ b/Evergreen/MainWindow/AddFeed/AddFeedWindowController.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2015 Ranchero Software, LLC. All rights reserved.
 //
 
-import Cocoa
+import AppKit
 import RSCore
 import RSTree
 import Data
diff --git a/Evergreen/MainWindow/AddFolder/AddFolderWindowController.swift b/Evergreen/MainWindow/AddFolder/AddFolderWindowController.swift
index 03a78ee9a..15cbdeda8 100644
--- a/Evergreen/MainWindow/AddFolder/AddFolderWindowController.swift
+++ b/Evergreen/MainWindow/AddFolder/AddFolderWindowController.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2015 Ranchero Software, LLC. All rights reserved.
 //
 
-import Cocoa
+import AppKit
 import Data
 import Account
 
diff --git a/Evergreen/ContextualMenus/MainWindowController+ContextualMenus.swift b/Evergreen/MainWindow/ContextualMenus/MainWindowController+ContextualMenus.swift
similarity index 100%
rename from Evergreen/ContextualMenus/MainWindowController+ContextualMenus.swift
rename to Evergreen/MainWindow/ContextualMenus/MainWindowController+ContextualMenus.swift
diff --git a/Evergreen/MainWindow/Detail/DetailStatusBarView.swift b/Evergreen/MainWindow/Detail/DetailStatusBarView.swift
index 464a189d8..9b13a2ac3 100644
--- a/Evergreen/MainWindow/Detail/DetailStatusBarView.swift
+++ b/Evergreen/MainWindow/Detail/DetailStatusBarView.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2017 Ranchero Software. All rights reserved.
 //
 
-import Cocoa
+import AppKit
 import DB5
 import Data
 
diff --git a/Evergreen/MainWindow/Keyboard/MainWIndowKeyboardHandler.swift b/Evergreen/MainWindow/Keyboard/MainWIndowKeyboardHandler.swift
index e2a9ba3d1..f2f0cd038 100644
--- a/Evergreen/MainWindow/Keyboard/MainWIndowKeyboardHandler.swift
+++ b/Evergreen/MainWindow/Keyboard/MainWIndowKeyboardHandler.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2017 Ranchero Software. All rights reserved.
 //
 
-import Cocoa
+import AppKit
 import RSCore
 
 final class MainWindowKeyboardHandler: KeyboardDelegate {
diff --git a/Evergreen/MainWindow/KeyboardDelegateProtocol.swift b/Evergreen/MainWindow/KeyboardDelegateProtocol.swift
index 2c288e42b..b0cfcc54a 100644
--- a/Evergreen/MainWindow/KeyboardDelegateProtocol.swift
+++ b/Evergreen/MainWindow/KeyboardDelegateProtocol.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2016 Ranchero Software, LLC. All rights reserved.
 //
 
-import Cocoa
+import AppKit
 
 let keypadEnter: unichar = 3
 
diff --git a/Evergreen/MainWindow/MainWindowController.swift b/Evergreen/MainWindow/MainWindowController.swift
index fbbbfdcdb..c31e811d2 100644
--- a/Evergreen/MainWindow/MainWindowController.swift
+++ b/Evergreen/MainWindow/MainWindowController.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2015 Ranchero Software, LLC. All rights reserved.
 //
 
-import Cocoa
+import AppKit
 import Data
 import Account
 
diff --git a/Evergreen/MainWindow/MainWindowSplitView.swift b/Evergreen/MainWindow/MainWindowSplitView.swift
index e0b381fa3..e7e21ca97 100644
--- a/Evergreen/MainWindow/MainWindowSplitView.swift
+++ b/Evergreen/MainWindow/MainWindowSplitView.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2016 Ranchero Software, LLC. All rights reserved.
 //
 
-import Cocoa
+import AppKit
 
 class MainWindowSplitView: NSSplitView {
 
diff --git a/Evergreen/MainWindow/Sidebar/Cell/SidebarCellAppearance.swift b/Evergreen/MainWindow/Sidebar/Cell/SidebarCellAppearance.swift
index 3ed976985..dfd5326c8 100644
--- a/Evergreen/MainWindow/Sidebar/Cell/SidebarCellAppearance.swift
+++ b/Evergreen/MainWindow/Sidebar/Cell/SidebarCellAppearance.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2017 Ranchero Software. All rights reserved.
 //
 
-import Cocoa
+import AppKit
 import DB5
 
 struct SidebarCellAppearance: Equatable {
diff --git a/Evergreen/MainWindow/Sidebar/Cell/SidebarCellLayout.swift b/Evergreen/MainWindow/Sidebar/Cell/SidebarCellLayout.swift
index e36e71f2f..a05f59c8e 100644
--- a/Evergreen/MainWindow/Sidebar/Cell/SidebarCellLayout.swift
+++ b/Evergreen/MainWindow/Sidebar/Cell/SidebarCellLayout.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2017 Ranchero Software. All rights reserved.
 //
 
-import Cocoa
+import AppKit
 import RSCore
 
 // image - title - unreadCount
diff --git a/Evergreen/MainWindow/Sidebar/FeedPasteboardWriter.swift b/Evergreen/MainWindow/Sidebar/FeedPasteboardWriter.swift
index 780719a87..bfeba3f1f 100644
--- a/Evergreen/MainWindow/Sidebar/FeedPasteboardWriter.swift
+++ b/Evergreen/MainWindow/Sidebar/FeedPasteboardWriter.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2017 Ranchero Software. All rights reserved.
 //
 
-import Cocoa
+import AppKit
 import Data
 
 @objc final class FeedPasteboardWriter: NSObject, NSPasteboardWriting {
diff --git a/Evergreen/MainWindow/Sidebar/Keyboard/SidebarKeyboardDelegate.swift b/Evergreen/MainWindow/Sidebar/Keyboard/SidebarKeyboardDelegate.swift
index 0e993314a..1f1f6986b 100644
--- a/Evergreen/MainWindow/Sidebar/Keyboard/SidebarKeyboardDelegate.swift
+++ b/Evergreen/MainWindow/Sidebar/Keyboard/SidebarKeyboardDelegate.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2017 Ranchero Software. All rights reserved.
 //
 
-import Cocoa
+import AppKit
 import RSCore
 
 @objc final class SidebarKeyboardDelegate: NSObject, KeyboardDelegate {
diff --git a/Evergreen/MainWindow/Sidebar/Renaming/RenameWindowController.swift b/Evergreen/MainWindow/Sidebar/Renaming/RenameWindowController.swift
new file mode 100644
index 000000000..12bc8fd1f
--- /dev/null
+++ b/Evergreen/MainWindow/Sidebar/Renaming/RenameWindowController.swift
@@ -0,0 +1,24 @@
+//
+//  RenameWindowController.swift
+//  Evergreen
+//
+//  Created by Brent Simmons on 1/28/18.
+//  Copyright © 2018 Ranchero Software. All rights reserved.
+//
+
+import AppKit
+
+final class RenameWindowController: NSWindowController {
+
+	@IBOutlet var renamePrompt: NSTextField!
+	@IBOutlet var newTitleTextField: NSTextField!
+	@IBOutlet var renameButton: NSButton!
+	
+	private var originalTitle: String!
+
+	public convenience init(originalTitle: String) {
+
+		self.init(windowNibName: NSNib.Name(rawValue: "RenameSheet"))
+		self.originalTitle = originalTitle
+	}
+}
diff --git a/Evergreen/MainWindow/Sidebar/SidebarStatusBarView.swift b/Evergreen/MainWindow/Sidebar/SidebarStatusBarView.swift
index c33bc67c5..0da539ef1 100644
--- a/Evergreen/MainWindow/Sidebar/SidebarStatusBarView.swift
+++ b/Evergreen/MainWindow/Sidebar/SidebarStatusBarView.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2016 Ranchero Software, LLC. All rights reserved.
 //
 
-import Cocoa
+import AppKit
 import RSCore
 import Data
 import RSWeb
diff --git a/Evergreen/MainWindow/Sidebar/UnreadCountView.swift b/Evergreen/MainWindow/Sidebar/UnreadCountView.swift
index d8ce75859..eec7f7f73 100644
--- a/Evergreen/MainWindow/Sidebar/UnreadCountView.swift
+++ b/Evergreen/MainWindow/Sidebar/UnreadCountView.swift
@@ -7,7 +7,7 @@
 //
 
 import Foundation
-import Cocoa
+import AppKit
 
 private let padding = appDelegate.currentTheme.edgeInsets(forKey: "MainWindow.SourceList.unreadCount.padding")
 private let cornerRadius = appDelegate.currentTheme.float(forKey: "MainWindow.SourceList.unreadCount.cornerRadius")
diff --git a/Evergreen/MainWindow/Timeline/ArticlePasteboardWriter.swift b/Evergreen/MainWindow/Timeline/ArticlePasteboardWriter.swift
index faf5b41fe..a3f904b05 100644
--- a/Evergreen/MainWindow/Timeline/ArticlePasteboardWriter.swift
+++ b/Evergreen/MainWindow/Timeline/ArticlePasteboardWriter.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2017 Ranchero Software. All rights reserved.
 //
 
-import Cocoa
+import AppKit
 import Data
 
 @objc final class ArticlePasteboardWriter: NSObject, NSPasteboardWriting {
diff --git a/Evergreen/MainWindow/Timeline/Cell/TimelineCellAppearance.swift b/Evergreen/MainWindow/Timeline/Cell/TimelineCellAppearance.swift
index f360bb35e..875ff7c10 100644
--- a/Evergreen/MainWindow/Timeline/Cell/TimelineCellAppearance.swift
+++ b/Evergreen/MainWindow/Timeline/Cell/TimelineCellAppearance.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2016 Ranchero Software, LLC. All rights reserved.
 //
 
-import Cocoa
+import AppKit
 import DB5
 
 struct TimelineCellAppearance: Equatable {
diff --git a/Evergreen/MainWindow/Timeline/Cell/TimelineCellData.swift b/Evergreen/MainWindow/Timeline/Cell/TimelineCellData.swift
index 30586f67b..314a52d4f 100644
--- a/Evergreen/MainWindow/Timeline/Cell/TimelineCellData.swift
+++ b/Evergreen/MainWindow/Timeline/Cell/TimelineCellData.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2016 Ranchero Software, LLC. All rights reserved.
 //
 
-import Cocoa
+import AppKit
 import Data
 
 var attributedTitleCache = [String: NSAttributedString]()
diff --git a/Evergreen/MainWindow/Timeline/Cell/TimelineCellLayout.swift b/Evergreen/MainWindow/Timeline/Cell/TimelineCellLayout.swift
index b59a9bbb4..decf3dffc 100644
--- a/Evergreen/MainWindow/Timeline/Cell/TimelineCellLayout.swift
+++ b/Evergreen/MainWindow/Timeline/Cell/TimelineCellLayout.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2016 Ranchero Software, LLC. All rights reserved.
 //
 
-import Cocoa
+import AppKit
 import RSTextDrawing
 import RSCore
 
diff --git a/Evergreen/MainWindow/Timeline/Cell/UnreadIndicatorView.swift b/Evergreen/MainWindow/Timeline/Cell/UnreadIndicatorView.swift
index d6b446af6..55aa123f1 100644
--- a/Evergreen/MainWindow/Timeline/Cell/UnreadIndicatorView.swift
+++ b/Evergreen/MainWindow/Timeline/Cell/UnreadIndicatorView.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2016 Ranchero Software, LLC. All rights reserved.
 //
 
-import Cocoa
+import AppKit
 
 class UnreadIndicatorView: NSView {
 
diff --git a/Evergreen/MainWindow/Timeline/Keyboard/TimelineKeyboardDelegate.swift b/Evergreen/MainWindow/Timeline/Keyboard/TimelineKeyboardDelegate.swift
index d15d0be50..3a4a0242f 100644
--- a/Evergreen/MainWindow/Timeline/Keyboard/TimelineKeyboardDelegate.swift
+++ b/Evergreen/MainWindow/Timeline/Keyboard/TimelineKeyboardDelegate.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2017 Ranchero Software. All rights reserved.
 //
 
-import Cocoa
+import AppKit
 import RSCore
 
 // Doesn’t have any shortcuts of its own — they’re all in MainWindowKeyboardHandler.
diff --git a/Evergreen/MainWindow/Timeline/TimelineHeaderView.swift b/Evergreen/MainWindow/Timeline/TimelineHeaderView.swift
index d5a2d09b6..80d0a7539 100644
--- a/Evergreen/MainWindow/Timeline/TimelineHeaderView.swift
+++ b/Evergreen/MainWindow/Timeline/TimelineHeaderView.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2017 Ranchero Software. All rights reserved.
 //
 
-import Cocoa
+import AppKit
 
 final class TimelineHeaderView: NSView {
 
diff --git a/Evergreen/MainWindow/Timeline/TimelineTableRowView.swift b/Evergreen/MainWindow/Timeline/TimelineTableRowView.swift
index 6307a65d7..772396041 100644
--- a/Evergreen/MainWindow/Timeline/TimelineTableRowView.swift
+++ b/Evergreen/MainWindow/Timeline/TimelineTableRowView.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2015 Ranchero Software, LLC. All rights reserved.
 //
 
-import Cocoa
+import AppKit
 
 class TimelineTableRowView : NSTableRowView {
 
diff --git a/Evergreen/MainWindow/Timeline/TimelineTableView.swift b/Evergreen/MainWindow/Timeline/TimelineTableView.swift
index 386541047..03fa75fd2 100644
--- a/Evergreen/MainWindow/Timeline/TimelineTableView.swift
+++ b/Evergreen/MainWindow/Timeline/TimelineTableView.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2016 Ranchero Software, LLC. All rights reserved.
 //
 
-import Cocoa
+import AppKit
 
 class TimelineTableView: NSTableView {
 	
diff --git a/Evergreen/Preferences/PreferencesWindowController.swift b/Evergreen/Preferences/PreferencesWindowController.swift
index b64ac3116..ee4b83d94 100644
--- a/Evergreen/Preferences/PreferencesWindowController.swift
+++ b/Evergreen/Preferences/PreferencesWindowController.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2015 Ranchero Software, LLC. All rights reserved.
 //
 
-import Cocoa
+import AppKit
 
 private struct PreferencesToolbarItemSpec {
 
diff --git a/Evergreen/ProgressWindow/IndeterminateProgressWindowController.swift b/Evergreen/ProgressWindow/IndeterminateProgressWindowController.swift
index b09b28894..40d0cef57 100644
--- a/Evergreen/ProgressWindow/IndeterminateProgressWindowController.swift
+++ b/Evergreen/ProgressWindow/IndeterminateProgressWindowController.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2016 Ranchero Software, LLC. All rights reserved.
 //
 
-import Cocoa
+import AppKit
 
 func runIndeterminateProgressWithMessage(_ message: String) {
 
diff --git a/Evergreen/Scriptability/Account+Scriptability.swift b/Evergreen/Scriptability/Account+Scriptability.swift
index bd2c7cbf0..5bc8ac248 100644
--- a/Evergreen/Scriptability/Account+Scriptability.swift
+++ b/Evergreen/Scriptability/Account+Scriptability.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2018 Olof Hellman. All rights reserved.
 //
 
-import Cocoa
+import AppKit
 import Account
 import Data
 
diff --git a/Evergreen/Scriptability/NSApplication+Scriptability.swift b/Evergreen/Scriptability/NSApplication+Scriptability.swift
index 1fc26d668..61903af5f 100644
--- a/Evergreen/Scriptability/NSApplication+Scriptability.swift
+++ b/Evergreen/Scriptability/NSApplication+Scriptability.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2018 Olof Hellman. All rights reserved.
 //
 
-import Cocoa
+import AppKit
 import Account
 import Data
 
diff --git a/Evergreen/Scriptability/ScriptingObjectContainer.swift b/Evergreen/Scriptability/ScriptingObjectContainer.swift
index fbe11adde..d03ca88cf 100644
--- a/Evergreen/Scriptability/ScriptingObjectContainer.swift
+++ b/Evergreen/Scriptability/ScriptingObjectContainer.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2018 Olof Hellman. All rights reserved.
 //
 
-import Cocoa
+import AppKit
 
 protocol ScriptingObjectContainer: ScriptingObject {
     var scriptingClassDescription:NSScriptClassDescription { get }
diff --git a/Frameworks/DB5/DB5/DB5.h b/Frameworks/DB5/DB5/DB5.h
index ae3d237e1..15243eb88 100644
--- a/Frameworks/DB5/DB5/DB5.h
+++ b/Frameworks/DB5/DB5/DB5.h
@@ -6,7 +6,7 @@
 //  Copyright © 2015 Ranchero Software, LLC. All rights reserved.
 //
 
-#import <Cocoa/Cocoa.h>
+@import AppKit;
 
 //! Project version number for DB5.
 FOUNDATION_EXPORT double DB5VersionNumber;
diff --git a/Frameworks/DB5/DB5/VSTheme.h b/Frameworks/DB5/DB5/VSTheme.h
index 78fefaecd..89347021f 100644
--- a/Frameworks/DB5/DB5/VSTheme.h
+++ b/Frameworks/DB5/DB5/VSTheme.h
@@ -6,7 +6,7 @@
 //  Copyright (c) 2012 Q Branch LLC. All rights reserved.
 //
 
-@import Cocoa;
+@import AppKit;
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Frameworks/RSCore/RSCore/AppKit/LogWindowController.swift b/Frameworks/RSCore/RSCore/AppKit/LogWindowController.swift
index 0dcfee270..2412270de 100644
--- a/Frameworks/RSCore/RSCore/AppKit/LogWindowController.swift
+++ b/Frameworks/RSCore/RSCore/AppKit/LogWindowController.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2017 Ranchero Software, LLC. All rights reserved.
 //
 
-import Cocoa
+import AppKit
 
 public class LogWindowController: NSWindowController {
 
diff --git a/Frameworks/RSCore/RSCore/AppKit/NSAppleEventDescriptor+RSCore.h b/Frameworks/RSCore/RSCore/AppKit/NSAppleEventDescriptor+RSCore.h
index 6bd02b28e..34acf0036 100644
--- a/Frameworks/RSCore/RSCore/AppKit/NSAppleEventDescriptor+RSCore.h
+++ b/Frameworks/RSCore/RSCore/AppKit/NSAppleEventDescriptor+RSCore.h
@@ -6,7 +6,7 @@
 //  Copyright © 2018 Ranchero Software, LLC. All rights reserved.
 //
 
-@import Cocoa;
+@import AppKit;
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Frameworks/RSCore/RSCore/AppKit/SendToBlogEditorApp.h b/Frameworks/RSCore/RSCore/AppKit/SendToBlogEditorApp.h
index 535ad2a21..7de4bd282 100644
--- a/Frameworks/RSCore/RSCore/AppKit/SendToBlogEditorApp.h
+++ b/Frameworks/RSCore/RSCore/AppKit/SendToBlogEditorApp.h
@@ -6,7 +6,7 @@
 //  Copyright © 2018 Ranchero Software, LLC. All rights reserved.
 //
 
-@import Cocoa;
+@import AppKit;
 
 // This is for sending articles to MarsEdit and other apps that implement the send-to-blog-editor Apple events API:
 // http://ranchero.com/netnewswire/developers/externalinterface
diff --git a/Frameworks/RSCore/RSCore/AppKit/UserApp.swift b/Frameworks/RSCore/RSCore/AppKit/UserApp.swift
index 164192ad8..4103e3eea 100644
--- a/Frameworks/RSCore/RSCore/AppKit/UserApp.swift
+++ b/Frameworks/RSCore/RSCore/AppKit/UserApp.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2018 Ranchero Software, LLC. All rights reserved.
 //
 
-import Cocoa
+import AppKit
 
 // Represents an app (the type of app mostly found in /Applications.)
 // The app may or may not be running. It may or may not exist.
diff --git a/Frameworks/RSCore/RSCore/AppKit/WebViewWindowController.swift b/Frameworks/RSCore/RSCore/AppKit/WebViewWindowController.swift
index fde7250e4..9d70a0030 100644
--- a/Frameworks/RSCore/RSCore/AppKit/WebViewWindowController.swift
+++ b/Frameworks/RSCore/RSCore/AppKit/WebViewWindowController.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2017 Ranchero Software, LLC. All rights reserved.
 //
 
-import Cocoa
+import AppKit
 import WebKit
 
 public final class WebViewWindowController: NSWindowController {
diff --git a/Frameworks/RSCore/RSCore/Images/NSImage+RSCore.swift b/Frameworks/RSCore/RSCore/Images/NSImage+RSCore.swift
index 4b24f6dbc..d537975c2 100644
--- a/Frameworks/RSCore/RSCore/Images/NSImage+RSCore.swift
+++ b/Frameworks/RSCore/RSCore/Images/NSImage+RSCore.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2017 Ranchero Software, LLC. All rights reserved.
 //
 
-import Cocoa
+import AppKit
 
 public extension NSImage {
 
diff --git a/Frameworks/RSCore/RSCore/Keyboard.swift b/Frameworks/RSCore/RSCore/Keyboard.swift
index 81b64b114..2eb5c57ef 100644
--- a/Frameworks/RSCore/RSCore/Keyboard.swift
+++ b/Frameworks/RSCore/RSCore/Keyboard.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2017 Ranchero Software, LLC. All rights reserved.
 //
 
-import Cocoa
+import AppKit
 
 // To get, for instance, the keyboard integer value for "\r": "\r".keyboardIntegerValue (returns 13)
 
diff --git a/Frameworks/RSCore/RSCore/NSCalendar+RSCore.m b/Frameworks/RSCore/RSCore/NSCalendar+RSCore.m
index 400e6066c..7c76bb8d0 100755
--- a/Frameworks/RSCore/RSCore/NSCalendar+RSCore.m
+++ b/Frameworks/RSCore/RSCore/NSCalendar+RSCore.m
@@ -11,7 +11,7 @@
 #if TARGET_OS_IPHONE
 @import UIKit;
 #else
-@import Cocoa;
+@import AppKit;
 #endif
 
 @implementation NSCalendar (RSCore)
diff --git a/Frameworks/RSCore/RSCore/NSColor+RSCore.h b/Frameworks/RSCore/RSCore/NSColor+RSCore.h
index b342e2ec4..35493c9bc 100755
--- a/Frameworks/RSCore/RSCore/NSColor+RSCore.h
+++ b/Frameworks/RSCore/RSCore/NSColor+RSCore.h
@@ -6,7 +6,7 @@
 //  Copyright (c) 2015 Ranchero Software, LLC. All rights reserved.
 //
 
-@import Cocoa;
+@import AppKit;
 
 
 @interface NSColor (RSCore)
diff --git a/Frameworks/RSCore/RSCore/NSImage+RSCore.h b/Frameworks/RSCore/RSCore/NSImage+RSCore.h
index ce4d7d2e1..3d6d3957b 100755
--- a/Frameworks/RSCore/RSCore/NSImage+RSCore.h
+++ b/Frameworks/RSCore/RSCore/NSImage+RSCore.h
@@ -6,7 +6,7 @@
 //  Copyright (c) 2015 Ranchero Software, LLC. All rights reserved.
 //
 
-@import Cocoa;
+@import AppKit;
 #import "RSBlocks.h"
 
 
diff --git a/Frameworks/RSCore/RSCore/NSOutlineView+Extensions.swift b/Frameworks/RSCore/RSCore/NSOutlineView+Extensions.swift
index 3150606fc..4590e702f 100755
--- a/Frameworks/RSCore/RSCore/NSOutlineView+Extensions.swift
+++ b/Frameworks/RSCore/RSCore/NSOutlineView+Extensions.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2016 Ranchero Software, LLC. All rights reserved.
 //
 
-import Cocoa
+import AppKit
 
 public extension NSOutlineView {
 
diff --git a/Frameworks/RSCore/RSCore/NSResponder-Extensions.swift b/Frameworks/RSCore/RSCore/NSResponder-Extensions.swift
index 5a8516c00..199f98b25 100755
--- a/Frameworks/RSCore/RSCore/NSResponder-Extensions.swift
+++ b/Frameworks/RSCore/RSCore/NSResponder-Extensions.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2016 Ranchero Software, LLC. All rights reserved.
 //
 
-import Cocoa
+import AppKit
 
 public extension NSResponder {
 	
diff --git a/Frameworks/RSCore/RSCore/NSStoryboard+RSCore.h b/Frameworks/RSCore/RSCore/NSStoryboard+RSCore.h
index 9bce9166c..2aa4c64de 100755
--- a/Frameworks/RSCore/RSCore/NSStoryboard+RSCore.h
+++ b/Frameworks/RSCore/RSCore/NSStoryboard+RSCore.h
@@ -6,7 +6,7 @@
 //  Copyright © 2015 Ranchero Software, LLC. All rights reserved.
 //
 
-@import Cocoa;
+@import AppKit;
 
 @interface NSStoryboard (RSCore)
 
diff --git a/Frameworks/RSCore/RSCore/NSTableView+Extensions.swift b/Frameworks/RSCore/RSCore/NSTableView+Extensions.swift
index dd79b419f..61eb4c3b6 100755
--- a/Frameworks/RSCore/RSCore/NSTableView+Extensions.swift
+++ b/Frameworks/RSCore/RSCore/NSTableView+Extensions.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2016 Ranchero Software, LLC. All rights reserved.
 //
 
-import Cocoa
+import AppKit
 
 public extension NSTableView {
 
diff --git a/Frameworks/RSCore/RSCore/NSTableView+RSCore.h b/Frameworks/RSCore/RSCore/NSTableView+RSCore.h
index 81c9af1c6..aacc03df8 100755
--- a/Frameworks/RSCore/RSCore/NSTableView+RSCore.h
+++ b/Frameworks/RSCore/RSCore/NSTableView+RSCore.h
@@ -6,7 +6,7 @@
 //  Copyright (c) 2015 Ranchero Software, LLC. All rights reserved.
 //
 
-@import Cocoa;
+@import AppKit;
 
 
 @interface NSTableView (RSCore)
diff --git a/Frameworks/RSCore/RSCore/NSView+RSCore.h b/Frameworks/RSCore/RSCore/NSView+RSCore.h
index 953aedd77..8545f561d 100755
--- a/Frameworks/RSCore/RSCore/NSView+RSCore.h
+++ b/Frameworks/RSCore/RSCore/NSView+RSCore.h
@@ -6,7 +6,7 @@
 //  Copyright (c) 2015 Ranchero Software, LLC. All rights reserved.
 //
 
-@import Cocoa;
+@import AppKit;
 
 
 @interface NSView (RSCore)
diff --git a/Frameworks/RSCore/RSCore/NSWindow-Extensions.swift b/Frameworks/RSCore/RSCore/NSWindow-Extensions.swift
index 2a5dc898f..0b878fc7f 100755
--- a/Frameworks/RSCore/RSCore/NSWindow-Extensions.swift
+++ b/Frameworks/RSCore/RSCore/NSWindow-Extensions.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2016 Ranchero Software, LLC. All rights reserved.
 //
 
-import Cocoa
+import AppKit
 
 public extension NSWindow {
 	
diff --git a/Frameworks/RSCore/RSCore/RSBackgroundColorView.h b/Frameworks/RSCore/RSCore/RSBackgroundColorView.h
index bd1a4cc74..5be19f0ea 100755
--- a/Frameworks/RSCore/RSCore/RSBackgroundColorView.h
+++ b/Frameworks/RSCore/RSCore/RSBackgroundColorView.h
@@ -6,7 +6,7 @@
 //  Copyright (c) 2015 Ranchero Software, LLC. All rights reserved.
 //
 
-@import Cocoa;
+@import AppKit;
 
 
 IB_DESIGNABLE
diff --git a/Frameworks/RSCore/RSCore/RSOpaqueContainerView.h b/Frameworks/RSCore/RSCore/RSOpaqueContainerView.h
index eaaf51972..0c892c749 100755
--- a/Frameworks/RSCore/RSCore/RSOpaqueContainerView.h
+++ b/Frameworks/RSCore/RSCore/RSOpaqueContainerView.h
@@ -6,7 +6,7 @@
 //  Copyright (c) 2015 Ranchero Software, LLC. All rights reserved.
 //
 
-@import Cocoa;
+@import AppKit;
 #import <RSCore/RSBackgroundColorView.h>
 
 
diff --git a/Frameworks/RSCore/RSCore/RSToolbarItem.swift b/Frameworks/RSCore/RSCore/RSToolbarItem.swift
index d9c866db7..205acbf60 100755
--- a/Frameworks/RSCore/RSCore/RSToolbarItem.swift
+++ b/Frameworks/RSCore/RSCore/RSToolbarItem.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2016 Ranchero Software, LLC. All rights reserved.
 //
 
-import Cocoa
+import AppKit
 
 public class RSToolbarItem: NSToolbarItem {
 
diff --git a/Frameworks/RSCore/RSCore/RSTransparentContainerView.h b/Frameworks/RSCore/RSCore/RSTransparentContainerView.h
index 98e5f0ff8..2dd194d09 100755
--- a/Frameworks/RSCore/RSCore/RSTransparentContainerView.h
+++ b/Frameworks/RSCore/RSCore/RSTransparentContainerView.h
@@ -6,7 +6,7 @@
 //  Copyright © 2016 Ranchero Software, LLC. All rights reserved.
 //
 
-@import Cocoa;
+@import AppKit;
 
 /*This view has one subview, which it resizes to fit the bounds of this view.*/
 
diff --git a/Frameworks/RSCore/RSCoreTests/RSCoreTests.m b/Frameworks/RSCore/RSCoreTests/RSCoreTests.m
index 4d2e193e1..c6fd2aa49 100755
--- a/Frameworks/RSCore/RSCoreTests/RSCoreTests.m
+++ b/Frameworks/RSCore/RSCoreTests/RSCoreTests.m
@@ -6,7 +6,7 @@
 //  Copyright (c) 2015 Ranchero Software, LLC. All rights reserved.
 //
 
-#import <Cocoa/Cocoa.h>
+#import <AppKit/AppKit.h>
 #import <XCTest/XCTest.h>
 
 @interface RSCoreTests : XCTestCase
diff --git a/Frameworks/RSFeedFinder/RSFeedFinder/RSFeedFinder.h b/Frameworks/RSFeedFinder/RSFeedFinder/RSFeedFinder.h
index aca2c158d..bea1e4af0 100644
--- a/Frameworks/RSFeedFinder/RSFeedFinder/RSFeedFinder.h
+++ b/Frameworks/RSFeedFinder/RSFeedFinder/RSFeedFinder.h
@@ -6,7 +6,7 @@
 //  Copyright © 2016 Ranchero Software, LLC. All rights reserved.
 //
 
-#import <Cocoa/Cocoa.h>
+#import <AppKit/AppKit.h>
 
 //! Project version number for RSFeedFinder.
 FOUNDATION_EXPORT double RSFeedFinderVersionNumber;
diff --git a/Frameworks/RSTextDrawing/RSTextDrawing/RSMultiLineRenderer.h b/Frameworks/RSTextDrawing/RSTextDrawing/RSMultiLineRenderer.h
index b409e329e..83f01d8db 100644
--- a/Frameworks/RSTextDrawing/RSTextDrawing/RSMultiLineRenderer.h
+++ b/Frameworks/RSTextDrawing/RSTextDrawing/RSMultiLineRenderer.h
@@ -6,7 +6,7 @@
 //  Copyright © 2016 Ranchero Software, LLC. All rights reserved.
 //
 
-@import Cocoa;
+@import AppKit;
 #import <RSTextDrawing/RSTextRendererProtocol.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/Frameworks/RSTextDrawing/RSTextDrawing/RSMultiLineView.h b/Frameworks/RSTextDrawing/RSTextDrawing/RSMultiLineView.h
index 244de3392..8a1a39996 100644
--- a/Frameworks/RSTextDrawing/RSTextDrawing/RSMultiLineView.h
+++ b/Frameworks/RSTextDrawing/RSTextDrawing/RSMultiLineView.h
@@ -6,7 +6,7 @@
 //  Copyright © 2016 Ranchero Software, LLC. All rights reserved.
 //
 
-@import Cocoa;
+@import AppKit;
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Frameworks/RSTextDrawing/RSTextDrawing/RSSingleLineRenderer.h b/Frameworks/RSTextDrawing/RSTextDrawing/RSSingleLineRenderer.h
index 1cb26611a..323d64d9a 100644
--- a/Frameworks/RSTextDrawing/RSTextDrawing/RSSingleLineRenderer.h
+++ b/Frameworks/RSTextDrawing/RSTextDrawing/RSSingleLineRenderer.h
@@ -6,7 +6,7 @@
 //  Copyright © 2016 Ranchero Software, LLC. All rights reserved.
 //
 
-@import Cocoa;
+@import AppKit;
 #import <RSTextDrawing/RSTextRendererProtocol.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/Frameworks/RSTextDrawing/RSTextDrawing/RSSingleLineView.h b/Frameworks/RSTextDrawing/RSTextDrawing/RSSingleLineView.h
index 49a156f27..18b468fc3 100644
--- a/Frameworks/RSTextDrawing/RSTextDrawing/RSSingleLineView.h
+++ b/Frameworks/RSTextDrawing/RSTextDrawing/RSSingleLineView.h
@@ -6,7 +6,7 @@
 //  Copyright © 2016 Ranchero Software, LLC. All rights reserved.
 //
 
-@import Cocoa;
+@import AppKit;
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Frameworks/RSTextDrawing/RSTextDrawing/RSTextDrawing.h b/Frameworks/RSTextDrawing/RSTextDrawing/RSTextDrawing.h
index 76e4d80d6..3b32fae67 100644
--- a/Frameworks/RSTextDrawing/RSTextDrawing/RSTextDrawing.h
+++ b/Frameworks/RSTextDrawing/RSTextDrawing/RSTextDrawing.h
@@ -6,7 +6,7 @@
 //  Copyright © 2016 Ranchero Software, LLC. All rights reserved.
 //
 
-@import Cocoa;
+@import AppKit;
 
 #import <RSTextDrawing/RSSingleLineView.h>
 #import <RSTextDrawing/RSMultiLineView.h>
diff --git a/Frameworks/RSTextDrawing/RSTextDrawing/RSTextRendererProtocol.h b/Frameworks/RSTextDrawing/RSTextDrawing/RSTextRendererProtocol.h
index e5dab0582..2b3d66246 100644
--- a/Frameworks/RSTextDrawing/RSTextDrawing/RSTextRendererProtocol.h
+++ b/Frameworks/RSTextDrawing/RSTextDrawing/RSTextRendererProtocol.h
@@ -6,7 +6,7 @@
 //  Copyright © 2016 Ranchero Software, LLC. All rights reserved.
 //
 
-@import Cocoa;
+@import AppKit;
 
 @protocol RSTextRenderer <NSObject>
 
diff --git a/Frameworks/RSTree/RSTree/NSOutlineView+RSTree.swift b/Frameworks/RSTree/RSTree/NSOutlineView+RSTree.swift
index 0ac4c64b9..522e30716 100644
--- a/Frameworks/RSTree/RSTree/NSOutlineView+RSTree.swift
+++ b/Frameworks/RSTree/RSTree/NSOutlineView+RSTree.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2016 Ranchero Software, LLC. All rights reserved.
 //
 
-import Cocoa
+import AppKit
 
 public extension NSOutlineView {
 
diff --git a/Frameworks/RSTree/RSTree/RSTree.h b/Frameworks/RSTree/RSTree/RSTree.h
index c49255a53..ac696986b 100644
--- a/Frameworks/RSTree/RSTree/RSTree.h
+++ b/Frameworks/RSTree/RSTree/RSTree.h
@@ -6,7 +6,7 @@
 //  Copyright © 2016 Ranchero Software, LLC. All rights reserved.
 //
 
-#import <Cocoa/Cocoa.h>
+#import <AppKit/AppKit.h>
 
 //! Project version number for RSTree.
 FOUNDATION_EXPORT double RSTreeVersionNumber;
diff --git a/Frameworks/RSWeb/RSWeb/MacWebBrowser.swift b/Frameworks/RSWeb/RSWeb/MacWebBrowser.swift
index e061f4117..092e021d1 100755
--- a/Frameworks/RSWeb/RSWeb/MacWebBrowser.swift
+++ b/Frameworks/RSWeb/RSWeb/MacWebBrowser.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2016 Ranchero Software, LLC. All rights reserved.
 //
 
-import Cocoa
+import AppKit
 
 public class MacWebBrowser {