diff --git a/FreeOTP.xcodeproj/project.pbxproj b/FreeOTP.xcodeproj/project.pbxproj
index 8864cad..395c409 100644
--- a/FreeOTP.xcodeproj/project.pbxproj
+++ b/FreeOTP.xcodeproj/project.pbxproj
@@ -7,6 +7,15 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		42016F04200EA48D0041F6F4 /* WatchSessionDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 42016F03200EA48D0041F6F4 /* WatchSessionDelegate.swift */; };
+		42817D33200D4403008A80A2 /* Interface.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 42817D31200D4403008A80A2 /* Interface.storyboard */; };
+		42817D35200D4403008A80A2 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 42817D34200D4403008A80A2 /* Assets.xcassets */; };
+		42817D3C200D4403008A80A2 /* FreeOTPWatch Extension.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 42817D3B200D4403008A80A2 /* FreeOTPWatch Extension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
+		42817D43200D4403008A80A2 /* ExtensionDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 42817D42200D4403008A80A2 /* ExtensionDelegate.swift */; };
+		42817D47200D4403008A80A2 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 42817D46200D4403008A80A2 /* Assets.xcassets */; };
+		42817D4B200D4403008A80A2 /* FreeOTPWatch.app in Embed Watch Content */ = {isa = PBXBuildFile; fileRef = 42817D2F200D4403008A80A2 /* FreeOTPWatch.app */; };
+		42817D54200D4530008A80A2 /* Interface.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 42817D31200D4403008A80A2 /* Interface.storyboard */; };
+		42B27CE1200D46D700510BBE /* InterfaceController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 42B27CE0200D46D700510BBE /* InterfaceController.swift */; };
 		F10D88C41B56A3C400482D15 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = F10D88C31B56A3C400482D15 /* AppDelegate.swift */; };
 		F10D88C91B56A3C400482D15 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F10D88C71B56A3C400482D15 /* Main.storyboard */; };
 		F10D88CB1B56A3C400482D15 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = F10D88CA1B56A3C400482D15 /* Assets.xcassets */; };
@@ -31,8 +40,8 @@
 		F18FA53E1B571E5D00B1CEAD /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F18FA53D1B571E5D00B1CEAD /* Foundation.framework */; };
 		F18FA5401B57339F00B1CEAD /* Storage.swift in Sources */ = {isa = PBXBuildFile; fileRef = F18FA53F1B57339F00B1CEAD /* Storage.swift */; };
 		F18FA5441B58D30800B1CEAD /* KeychainStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = F18FA5431B58D30800B1CEAD /* KeychainStore.swift */; };
-		F19DA5701B5EE73E00A54DDC /* lock.png in Resources */ = {isa = PBXBuildFile; fileRef = F19DA56F1B5EE73E00A54DDC /* lock.png */; };
 		F19DA56E1B5C832600A54DDC /* Launch.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F19DA56D1B5C832600A54DDC /* Launch.storyboard */; };
+		F19DA5701B5EE73E00A54DDC /* lock.png in Resources */ = {isa = PBXBuildFile; fileRef = F19DA56F1B5EE73E00A54DDC /* lock.png */; };
 		F1CA93C91B56AA0000828B8B /* HOTP.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1CA93C61B56AA0000828B8B /* HOTP.swift */; };
 		F1CA93CA1B56AA0000828B8B /* TOTP.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1CA93C71B56AA0000828B8B /* TOTP.swift */; };
 		F1CA93CB1B56AA0000828B8B /* URI.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1CA93C81B56AA0000828B8B /* URI.swift */; };
@@ -43,6 +52,20 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
+		42817D3D200D4403008A80A2 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = F10D88B81B56A3C400482D15 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 42817D3A200D4403008A80A2;
+			remoteInfo = "FreeOTPWatch Extension";
+		};
+		42817D49200D4403008A80A2 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = F10D88B81B56A3C400482D15 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 42817D2E200D4403008A80A2;
+			remoteInfo = FreeOTPWatch;
+		};
 		F10D88D51B56A3C400482D15 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = F10D88B81B56A3C400482D15 /* Project object */;
@@ -52,8 +75,43 @@
 		};
 /* End PBXContainerItemProxy section */
 
+/* Begin PBXCopyFilesBuildPhase section */
+		42817D51200D4403008A80A2 /* Embed App Extensions */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "";
+			dstSubfolderSpec = 13;
+			files = (
+				42817D3C200D4403008A80A2 /* FreeOTPWatch Extension.appex in Embed App Extensions */,
+			);
+			name = "Embed App Extensions";
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		42817D53200D4403008A80A2 /* Embed Watch Content */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "$(CONTENTS_FOLDER_PATH)/Watch";
+			dstSubfolderSpec = 16;
+			files = (
+				42817D4B200D4403008A80A2 /* FreeOTPWatch.app in Embed Watch Content */,
+			);
+			name = "Embed Watch Content";
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXCopyFilesBuildPhase section */
+
 /* Begin PBXFileReference section */
-		F10D88C01B56A3C400482D15 /* FreeOTP.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "FreeOTP.app"; sourceTree = BUILT_PRODUCTS_DIR; };
+		42016F03200EA48D0041F6F4 /* WatchSessionDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WatchSessionDelegate.swift; sourceTree = "<group>"; };
+		42817D2F200D4403008A80A2 /* FreeOTPWatch.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = FreeOTPWatch.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		42817D32200D4403008A80A2 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Interface.storyboard; sourceTree = "<group>"; };
+		42817D34200D4403008A80A2 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
+		42817D36200D4403008A80A2 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		42817D3B200D4403008A80A2 /* FreeOTPWatch Extension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = "FreeOTPWatch Extension.appex"; sourceTree = BUILT_PRODUCTS_DIR; };
+		42817D42200D4403008A80A2 /* ExtensionDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExtensionDelegate.swift; sourceTree = "<group>"; };
+		42817D46200D4403008A80A2 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
+		42817D48200D4403008A80A2 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		42B27CE0200D46D700510BBE /* InterfaceController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = InterfaceController.swift; path = "freeotpwatch Extension/InterfaceController.swift"; sourceTree = SOURCE_ROOT; };
+		F10D88C01B56A3C400482D15 /* FreeOTP.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = FreeOTP.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		F10D88C31B56A3C400482D15 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		F10D88C81B56A3C400482D15 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
 		F10D88CA1B56A3C400482D15 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
@@ -82,8 +140,8 @@
 		F18FA53D1B571E5D00B1CEAD /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
 		F18FA53F1B57339F00B1CEAD /* Storage.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Storage.swift; sourceTree = "<group>"; };
 		F18FA5431B58D30800B1CEAD /* KeychainStore.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KeychainStore.swift; sourceTree = "<group>"; };
-		F19DA56F1B5EE73E00A54DDC /* lock.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = lock.png; sourceTree = "<group>"; };
 		F19DA56D1B5C832600A54DDC /* Launch.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Launch.storyboard; sourceTree = "<group>"; };
+		F19DA56F1B5EE73E00A54DDC /* lock.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = lock.png; sourceTree = "<group>"; };
 		F1CA93C51B56AA0000828B8B /* FreeOTPTests-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "FreeOTPTests-Bridging-Header.h"; sourceTree = "<group>"; };
 		F1CA93C61B56AA0000828B8B /* HOTP.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HOTP.swift; sourceTree = "<group>"; };
 		F1CA93C71B56AA0000828B8B /* TOTP.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TOTP.swift; sourceTree = "<group>"; };
@@ -98,6 +156,13 @@
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
+		42817D38200D4403008A80A2 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		F10D88BD1B56A3C400482D15 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
@@ -120,6 +185,27 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		42817D30200D4403008A80A2 /* FreeOTPWatch */ = {
+			isa = PBXGroup;
+			children = (
+				42817D31200D4403008A80A2 /* Interface.storyboard */,
+				42817D34200D4403008A80A2 /* Assets.xcassets */,
+				42817D36200D4403008A80A2 /* Info.plist */,
+			);
+			path = FreeOTPWatch;
+			sourceTree = "<group>";
+		};
+		42817D3F200D4403008A80A2 /* FreeOTPWatch Extension */ = {
+			isa = PBXGroup;
+			children = (
+				42B27CE0200D46D700510BBE /* InterfaceController.swift */,
+				42817D42200D4403008A80A2 /* ExtensionDelegate.swift */,
+				42817D46200D4403008A80A2 /* Assets.xcassets */,
+				42817D48200D4403008A80A2 /* Info.plist */,
+			);
+			path = "FreeOTPWatch Extension";
+			sourceTree = "<group>";
+		};
 		F10D88B71B56A3C400482D15 = {
 			isa = PBXGroup;
 			children = (
@@ -133,6 +219,8 @@
 				F10D88C21B56A3C400482D15 /* FreeOTP */,
 				F10D88D71B56A3C400482D15 /* FreeOTPTests */,
 				F10D88E21B56A3C500482D15 /* FreeOTPUITests */,
+				42817D30200D4403008A80A2 /* FreeOTPWatch */,
+				42817D3F200D4403008A80A2 /* FreeOTPWatch Extension */,
 				F10D88C11B56A3C400482D15 /* Products */,
 			);
 			sourceTree = "<group>";
@@ -142,6 +230,8 @@
 			children = (
 				F10D88C01B56A3C400482D15 /* FreeOTP.app */,
 				F10D88D41B56A3C400482D15 /* FreeOTPTests.xctest */,
+				42817D2F200D4403008A80A2 /* FreeOTPWatch.app */,
+				42817D3B200D4403008A80A2 /* FreeOTPWatch Extension.appex */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -165,6 +255,7 @@
 				F10D88C71B56A3C400482D15 /* Main.storyboard */,
 				F10D88CA1B56A3C400482D15 /* Assets.xcassets */,
 				F10D88CF1B56A3C400482D15 /* Info.plist */,
+				42016F03200EA48D0041F6F4 /* WatchSessionDelegate.swift */,
 			);
 			path = FreeOTP;
 			sourceTree = "<group>";
@@ -227,6 +318,40 @@
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
+		42817D2E200D4403008A80A2 /* FreeOTPWatch */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 42817D52200D4403008A80A2 /* Build configuration list for PBXNativeTarget "FreeOTPWatch" */;
+			buildPhases = (
+				42817D2D200D4403008A80A2 /* Resources */,
+				42817D51200D4403008A80A2 /* Embed App Extensions */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				42817D3E200D4403008A80A2 /* PBXTargetDependency */,
+			);
+			name = FreeOTPWatch;
+			productName = FreeOTPWatch;
+			productReference = 42817D2F200D4403008A80A2 /* FreeOTPWatch.app */;
+			productType = "com.apple.product-type.application.watchapp2";
+		};
+		42817D3A200D4403008A80A2 /* FreeOTPWatch Extension */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 42817D50200D4403008A80A2 /* Build configuration list for PBXNativeTarget "FreeOTPWatch Extension" */;
+			buildPhases = (
+				42817D37200D4403008A80A2 /* Sources */,
+				42817D38200D4403008A80A2 /* Frameworks */,
+				42817D39200D4403008A80A2 /* Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = "FreeOTPWatch Extension";
+			productName = "FreeOTPWatch Extension";
+			productReference = 42817D3B200D4403008A80A2 /* FreeOTPWatch Extension.appex */;
+			productType = "com.apple.product-type.watchkit2-extension";
+		};
 		F10D88BF1B56A3C400482D15 /* FreeOTP */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = F10D88E81B56A3C500482D15 /* Build configuration list for PBXNativeTarget "FreeOTP" */;
@@ -235,10 +360,12 @@
 				F10D88BD1B56A3C400482D15 /* Frameworks */,
 				F10D88BE1B56A3C400482D15 /* Resources */,
 				FF1CDE331F915AAD002A8E06 /* ShellScript */,
+				42817D53200D4403008A80A2 /* Embed Watch Content */,
 			);
 			buildRules = (
 			);
 			dependencies = (
+				42817D4A200D4403008A80A2 /* PBXTargetDependency */,
 			);
 			name = FreeOTP;
 			productName = FreeOTP;
@@ -269,10 +396,18 @@
 		F10D88B81B56A3C400482D15 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastSwiftUpdateCheck = 0700;
+				LastSwiftUpdateCheck = 0920;
 				LastUpgradeCheck = 0900;
 				ORGANIZATIONNAME = "Fedora Project";
 				TargetAttributes = {
+					42817D2E200D4403008A80A2 = {
+						CreatedOnToolsVersion = 9.2;
+						ProvisioningStyle = Automatic;
+					};
+					42817D3A200D4403008A80A2 = {
+						CreatedOnToolsVersion = 9.2;
+						ProvisioningStyle = Automatic;
+					};
 					F10D88BF1B56A3C400482D15 = {
 						CreatedOnToolsVersion = 7.0;
 						LastSwiftMigration = 0900;
@@ -301,11 +436,31 @@
 			targets = (
 				F10D88BF1B56A3C400482D15 /* FreeOTP */,
 				F10D88D31B56A3C400482D15 /* FreeOTPTests */,
+				42817D2E200D4403008A80A2 /* FreeOTPWatch */,
+				42817D3A200D4403008A80A2 /* FreeOTPWatch Extension */,
 			);
 		};
 /* End PBXProject section */
 
 /* Begin PBXResourcesBuildPhase section */
+		42817D2D200D4403008A80A2 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				42817D35200D4403008A80A2 /* Assets.xcassets in Resources */,
+				42817D33200D4403008A80A2 /* Interface.storyboard in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		42817D39200D4403008A80A2 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				42817D54200D4530008A80A2 /* Interface.storyboard in Resources */,
+				42817D47200D4403008A80A2 /* Assets.xcassets in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		F10D88BE1B56A3C400482D15 /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -351,10 +506,20 @@
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
+		42817D37200D4403008A80A2 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				42B27CE1200D46D700510BBE /* InterfaceController.swift in Sources */,
+				42817D43200D4403008A80A2 /* ExtensionDelegate.swift in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		F10D88BC1B56A3C400482D15 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				42016F04200EA48D0041F6F4 /* WatchSessionDelegate.swift in Sources */,
 				F10D890D1B56A54B00482D15 /* TokenCell.swift in Sources */,
 				F10D89031B56A54B00482D15 /* EditViewController.swift in Sources */,
 				F10D89011B56A54B00482D15 /* AddTokenViewController.swift in Sources */,
@@ -388,6 +553,16 @@
 /* End PBXSourcesBuildPhase section */
 
 /* Begin PBXTargetDependency section */
+		42817D3E200D4403008A80A2 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 42817D3A200D4403008A80A2 /* FreeOTPWatch Extension */;
+			targetProxy = 42817D3D200D4403008A80A2 /* PBXContainerItemProxy */;
+		};
+		42817D4A200D4403008A80A2 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 42817D2E200D4403008A80A2 /* FreeOTPWatch */;
+			targetProxy = 42817D49200D4403008A80A2 /* PBXContainerItemProxy */;
+		};
 		F10D88D61B56A3C400482D15 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = F10D88BF1B56A3C400482D15 /* FreeOTP */;
@@ -396,6 +571,14 @@
 /* End PBXTargetDependency section */
 
 /* Begin PBXVariantGroup section */
+		42817D31200D4403008A80A2 /* Interface.storyboard */ = {
+			isa = PBXVariantGroup;
+			children = (
+				42817D32200D4403008A80A2 /* Base */,
+			);
+			name = Interface.storyboard;
+			sourceTree = "<group>";
+		};
 		F10D88C71B56A3C400482D15 /* Main.storyboard */ = {
 			isa = PBXVariantGroup;
 			children = (
@@ -407,6 +590,102 @@
 /* End PBXVariantGroup section */
 
 /* Begin XCBuildConfiguration section */
+		42817D4C200D4403008A80A2 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CODE_SIGN_STYLE = Automatic;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
+				IBSC_MODULE = FreeOTPWatch_Extension;
+				INFOPLIST_FILE = FreeOTPWatch/Info.plist;
+				PRODUCT_BUNDLE_IDENTIFIER = org.fedorahosted.freeotp.watchkitapp;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = watchos;
+				SKIP_INSTALL = YES;
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
+				SWIFT_VERSION = 4.0;
+				TARGETED_DEVICE_FAMILY = 4;
+				WATCHOS_DEPLOYMENT_TARGET = 4.2;
+			};
+			name = Debug;
+		};
+		42817D4D200D4403008A80A2 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CODE_SIGN_STYLE = Automatic;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
+				IBSC_MODULE = FreeOTPWatch_Extension;
+				INFOPLIST_FILE = FreeOTPWatch/Info.plist;
+				PRODUCT_BUNDLE_IDENTIFIER = org.fedorahosted.freeotp.watchkitapp;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = watchos;
+				SKIP_INSTALL = YES;
+				SWIFT_VERSION = 4.0;
+				TARGETED_DEVICE_FAMILY = 4;
+				WATCHOS_DEPLOYMENT_TARGET = 4.2;
+			};
+			name = Release;
+		};
+		42817D4E200D4403008A80A2 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ASSETCATALOG_COMPILER_COMPLICATION_NAME = Complication;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CODE_SIGN_STYLE = Automatic;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
+				INFOPLIST_FILE = "FreeOTPWatch Extension/Info.plist";
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = org.fedorahosted.freeotp.watchkitapp.watchkitextension;
+				PRODUCT_NAME = "${TARGET_NAME}";
+				SDKROOT = watchos;
+				SKIP_INSTALL = YES;
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
+				SWIFT_VERSION = 4.0;
+				TARGETED_DEVICE_FAMILY = 4;
+				WATCHOS_DEPLOYMENT_TARGET = 4.2;
+			};
+			name = Debug;
+		};
+		42817D4F200D4403008A80A2 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ASSETCATALOG_COMPILER_COMPLICATION_NAME = Complication;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CODE_SIGN_STYLE = Automatic;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
+				INFOPLIST_FILE = "FreeOTPWatch Extension/Info.plist";
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = org.fedorahosted.freeotp.watchkitapp.watchkitextension;
+				PRODUCT_NAME = "${TARGET_NAME}";
+				SDKROOT = watchos;
+				SKIP_INSTALL = YES;
+				SWIFT_VERSION = 4.0;
+				TARGETED_DEVICE_FAMILY = 4;
+				WATCHOS_DEPLOYMENT_TARGET = 4.2;
+			};
+			name = Release;
+		};
 		F10D88E61B56A3C500482D15 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
@@ -520,6 +799,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
 				INFOPLIST_FILE = FreeOTP/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = org.fedorahosted.freeotp;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -535,6 +815,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
 				INFOPLIST_FILE = FreeOTP/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = org.fedorahosted.freeotp;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -579,6 +860,24 @@
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
+		42817D50200D4403008A80A2 /* Build configuration list for PBXNativeTarget "FreeOTPWatch Extension" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				42817D4E200D4403008A80A2 /* Debug */,
+				42817D4F200D4403008A80A2 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		42817D52200D4403008A80A2 /* Build configuration list for PBXNativeTarget "FreeOTPWatch" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				42817D4C200D4403008A80A2 /* Debug */,
+				42817D4D200D4403008A80A2 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
 		F10D88BB1B56A3C400482D15 /* Build configuration list for PBXProject "FreeOTP" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
diff --git a/FreeOTP/AppDelegate.swift b/FreeOTP/AppDelegate.swift
index b33e9ef..2e9403e 100644
--- a/FreeOTP/AppDelegate.swift
+++ b/FreeOTP/AppDelegate.swift
@@ -23,8 +23,11 @@ import UIKit
 
 @UIApplicationMain
 class AppDelegate : UIResponder, UIApplicationDelegate {
+    
     var window: UIWindow?
-
+    
+    let watchSessionDelegate = WatchSessionDelegate()
+    
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
         return true
     }
diff --git a/FreeOTP/Assets.xcassets/AppIcon.appiconset/Contents.json b/FreeOTP/Assets.xcassets/AppIcon.appiconset/Contents.json
index 9803b73..390335d 100644
--- a/FreeOTP/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/FreeOTP/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -104,3 +104,4 @@
     "author" : "xcode"
   }
 }
+
diff --git a/FreeOTP/Base.lproj/Main.storyboard b/FreeOTP/Base.lproj/Main.storyboard
index 5207219..5d7e035 100644
--- a/FreeOTP/Base.lproj/Main.storyboard
+++ b/FreeOTP/Base.lproj/Main.storyboard
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13196" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="1u3-cr-3fz">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="1u3-cr-3fz">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13173"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
         <capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
         <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
         <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
@@ -40,8 +40,8 @@
         <!--FreeOTP-->
         <scene sceneID="Yiw-Ee-UQh">
             <objects>
-                <collectionViewController autoresizesArchivedViewToFullSize="NO" title="FreeOTP" id="mGg-KB-Kzc" customClass="TokensViewController" customModule="FreeOTP__dev_" customModuleProvider="target" sceneMemberID="viewController">
-                    <collectionView key="view" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" misplaced="YES" minimumZoomScale="0.0" maximumZoomScale="0.0" dataMode="prototypes" id="OKL-u6-vWf">
+                <collectionViewController autoresizesArchivedViewToFullSize="NO" title="FreeOTP" id="mGg-KB-Kzc" customClass="TokensViewController" customModule="FreeOTP" customModuleProvider="target" sceneMemberID="viewController">
+                    <collectionView key="view" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" minimumZoomScale="0.0" maximumZoomScale="0.0" dataMode="prototypes" id="OKL-u6-vWf">
                         <rect key="frame" x="0.0" y="0.0" width="375" height="603"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <color key="backgroundColor" red="0.66666666666666663" green="0.66666666666666663" blue="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -52,7 +52,7 @@
                             <inset key="sectionInset" minX="10" minY="10" maxX="10" maxY="10"/>
                         </collectionViewFlowLayout>
                         <cells>
-                            <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="token" id="rrC-uH-aWK" customClass="TokenCell" customModule="FreeOTP__dev_" customModuleProvider="target">
+                            <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" misplaced="YES" reuseIdentifier="token" id="rrC-uH-aWK" customClass="TokenCell" customModule="FreeOTP" customModuleProvider="target">
                                 <rect key="frame" x="23.5" y="10" width="328" height="96"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
@@ -65,14 +65,14 @@
                                                 <constraint firstAttribute="width" secondItem="s09-9o-0kG" secondAttribute="height" multiplier="1:1" id="p1f-Y5-ie9"/>
                                             </constraints>
                                         </imageView>
-                                        <view alpha="0.0" contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Dum-l3-Jph" customClass="CircleProgressView" customModule="FreeOTP__dev_" customModuleProvider="target">
+                                        <view alpha="0.0" contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Dum-l3-Jph" customClass="CircleProgressView" customModule="FreeOTP" customModuleProvider="target">
                                             <rect key="frame" x="256" y="24" width="48" height="48"/>
                                             <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                             <constraints>
                                                 <constraint firstAttribute="width" secondItem="Dum-l3-Jph" secondAttribute="height" multiplier="1:1" id="lVV-OX-E8r"/>
                                             </constraints>
                                         </view>
-                                        <view alpha="0.0" contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="1f3-Wo-TWe" customClass="CircleProgressView" customModule="FreeOTP__dev_" customModuleProvider="target">
+                                        <view alpha="0.0" contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="1f3-Wo-TWe" customClass="CircleProgressView" customModule="FreeOTP" customModuleProvider="target">
                                             <rect key="frame" x="260" y="28" width="40" height="40"/>
                                             <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                             <constraints>
@@ -102,7 +102,7 @@
                                             <color key="textColor" red="0.33333333333333331" green="0.33333333333333331" blue="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                             <nil key="highlightedColor"/>
                                         </label>
-                                        <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="PBw-M9-jNR" customClass="TokenButton" customModule="FreeOTP__dev_" customModuleProvider="target">
+                                        <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="PBw-M9-jNR" customClass="TokenButton" customModule="FreeOTP" customModuleProvider="target">
                                             <rect key="frame" x="8" y="63" width="30" height="29"/>
                                             <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                             <state key="normal" title="Edit"/>
@@ -110,7 +110,7 @@
                                                 <action selector="editClicked:" destination="mGg-KB-Kzc" eventType="touchUpInside" id="DK2-vu-4Rn"/>
                                             </connections>
                                         </button>
-                                        <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Tgf-5Q-RhV" customClass="TokenButton" customModule="FreeOTP__dev_" customModuleProvider="target">
+                                        <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Tgf-5Q-RhV" customClass="TokenButton" customModule="FreeOTP" customModuleProvider="target">
                                             <rect key="frame" x="46" y="63" width="38" height="29"/>
                                             <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                             <state key="normal" title="Share"/>
@@ -230,7 +230,7 @@
         <!--Share Code-->
         <scene sceneID="PTS-3e-qXg">
             <objects>
-                <tableViewController storyboardIdentifier="share" title="Share Code" id="kIc-US-32O" customClass="ShareViewController" customModule="FreeOTP__dev_" customModuleProvider="target" sceneMemberID="viewController">
+                <tableViewController storyboardIdentifier="share" title="Share Code" id="kIc-US-32O" customClass="ShareViewController" customModule="FreeOTP" customModuleProvider="target" sceneMemberID="viewController">
                     <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" id="8gO-Ml-R9v">
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -244,13 +244,13 @@
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" userInteractionEnabled="NO" tag="1" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" enabled="NO" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bb2-Yx-gnX">
-                                            <rect key="frame" x="8" y="8" width="331" height="27.5"/>
+                                            <rect key="frame" x="16" y="11" width="315" height="22"/>
                                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                             <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                             <nil key="highlightedColor"/>
                                         </label>
                                         <activityIndicatorView opaque="NO" alpha="0.0" tag="2" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" animating="YES" style="gray" translatesAutoresizingMaskIntoConstraints="NO" id="nv8-Ba-fyL">
-                                            <rect key="frame" x="347" y="8" width="20" height="27.5"/>
+                                            <rect key="frame" x="339" y="11" width="20" height="22"/>
                                         </activityIndicatorView>
                                     </subviews>
                                     <constraints>
@@ -285,7 +285,7 @@
         <!--Select Image-->
         <scene sceneID="jAB-BM-mZQ">
             <objects>
-                <collectionViewController storyboardIdentifier="image" title="Select Image" id="Mi7-1d-G1i" customClass="ImageViewController" customModule="FreeOTP__dev_" customModuleProvider="target" sceneMemberID="viewController">
+                <collectionViewController storyboardIdentifier="image" title="Select Image" id="Mi7-1d-G1i" customClass="ImageViewController" customModule="FreeOTP" customModuleProvider="target" sceneMemberID="viewController">
                     <collectionView key="view" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" id="q9y-D8-rwh">
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -304,7 +304,7 @@
                                     <rect key="frame" x="0.0" y="0.0" width="128" height="128"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
-                                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" tag="1" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="default.png" translatesAutoresizingMaskIntoConstraints="NO" id="gOR-Ls-3R4">
+                                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" tag="1" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="default.png" translatesAutoresizingMaskIntoConstraints="NO" id="gOR-Ls-3R4">
                                             <rect key="frame" x="0.0" y="0.0" width="128" height="128"/>
                                         </imageView>
                                     </subviews>
@@ -332,7 +332,7 @@
         <!--Add Token-->
         <scene sceneID="Svl-gA-DKm">
             <objects>
-                <tableViewController storyboardIdentifier="add" id="gth-fI-j10" customClass="AddTokenViewController" customModule="FreeOTP__dev_" customModuleProvider="target" sceneMemberID="viewController">
+                <tableViewController storyboardIdentifier="add" id="gth-fI-j10" customClass="AddTokenViewController" customModule="FreeOTP" customModuleProvider="target" sceneMemberID="viewController">
                     <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="grouped" separatorStyle="default" allowsSelection="NO" rowHeight="46" sectionHeaderHeight="1" sectionFooterHeight="20" id="ZzG-r4-rGn">
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -348,7 +348,7 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Type" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gbH-wj-SXm">
-                                                    <rect key="frame" x="8" y="8" width="37.5" height="29.5"/>
+                                                    <rect key="frame" x="16" y="11" width="37.5" height="24"/>
                                                     <constraints>
                                                         <constraint firstAttribute="width" constant="80" id="dqN-iD-Slb"/>
                                                     </constraints>
@@ -361,7 +361,7 @@
                                                     </variation>
                                                 </label>
                                                 <segmentedControl opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="plain" selectedSegmentIndex="0" translatesAutoresizingMaskIntoConstraints="NO" id="bUW-4K-PiY">
-                                                    <rect key="frame" x="238" y="8" width="129" height="30.5"/>
+                                                    <rect key="frame" x="230" y="11" width="129" height="25"/>
                                                     <segments>
                                                         <segment title="Counter" width="64"/>
                                                         <segment title="Time" width="64"/>
@@ -400,7 +400,7 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Digits" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ARP-g1-tip">
-                                                    <rect key="frame" x="8" y="8" width="44" height="29.5"/>
+                                                    <rect key="frame" x="16" y="11" width="44" height="24"/>
                                                     <constraints>
                                                         <constraint firstAttribute="width" constant="80" id="fwB-lZ-mzE"/>
                                                     </constraints>
@@ -413,7 +413,7 @@
                                                     </variation>
                                                 </label>
                                                 <segmentedControl opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="plain" selectedSegmentIndex="0" translatesAutoresizingMaskIntoConstraints="NO" id="JpZ-zA-8jL">
-                                                    <rect key="frame" x="238" y="8" width="129" height="30.5"/>
+                                                    <rect key="frame" x="230" y="11" width="129" height="25"/>
                                                     <segments>
                                                         <segment title="6" width="64"/>
                                                         <segment title="8" width="64"/>
@@ -445,7 +445,7 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Issuer" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="CDu-eU-5DT">
-                                                    <rect key="frame" x="8" y="8" width="46" height="29.5"/>
+                                                    <rect key="frame" x="16" y="11" width="46" height="24"/>
                                                     <constraints>
                                                         <constraint firstAttribute="width" constant="80" id="E16-Yu-G7b"/>
                                                     </constraints>
@@ -458,7 +458,7 @@
                                                     </variation>
                                                 </label>
                                                 <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="jdoe@example.com" textAlignment="right" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="oWv-K5-WAM">
-                                                    <rect key="frame" x="62" y="8" width="305" height="29.5"/>
+                                                    <rect key="frame" x="70" y="11" width="289" height="24"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                                     <textInputTraits key="textInputTraits"/>
                                                     <connections>
@@ -485,7 +485,7 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Identifier" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wio-wG-5kE">
-                                                    <rect key="frame" x="8" y="8" width="68" height="29.5"/>
+                                                    <rect key="frame" x="16" y="11" width="68" height="24"/>
                                                     <constraints>
                                                         <constraint firstAttribute="width" constant="80" id="ism-Oe-EVr"/>
                                                     </constraints>
@@ -498,7 +498,7 @@
                                                     </variation>
                                                 </label>
                                                 <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="18c5d06cfcbd4927" textAlignment="right" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="M6b-ul-1sY">
-                                                    <rect key="frame" x="84" y="8" width="283" height="29.5"/>
+                                                    <rect key="frame" x="92" y="11" width="267" height="24"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                                     <textInputTraits key="textInputTraits"/>
                                                     <connections>
@@ -525,7 +525,7 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Secret" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="aY2-bq-aPD">
-                                                    <rect key="frame" x="8" y="8" width="50" height="29.5"/>
+                                                    <rect key="frame" x="16" y="11" width="50" height="24"/>
                                                     <constraints>
                                                         <constraint firstAttribute="width" constant="80" id="fZS-Wy-Yws"/>
                                                     </constraints>
@@ -538,7 +538,7 @@
                                                     </variation>
                                                 </label>
                                                 <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" horizontalHuggingPriority="249" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Base32 (ex. 'GEZDGNBV')" textAlignment="right" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="2QW-x1-Goj">
-                                                    <rect key="frame" x="66" y="8" width="301" height="29.5"/>
+                                                    <rect key="frame" x="74" y="11" width="285" height="24"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                                     <textInputTraits key="textInputTraits"/>
                                                     <connections>
@@ -579,7 +579,7 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Locked" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" enabled="NO" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2yM-4P-ZLP">
-                                                    <rect key="frame" x="8" y="8" width="302" height="29.5"/>
+                                                    <rect key="frame" x="16" y="11" width="286" height="24"/>
                                                     <constraints>
                                                         <constraint firstAttribute="width" constant="80" id="FH2-LE-buD"/>
                                                     </constraints>
@@ -592,7 +592,7 @@
                                                     </variation>
                                                 </label>
                                                 <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" enabled="NO" contentHorizontalAlignment="center" contentVerticalAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="Mvi-jY-cdw">
-                                                    <rect key="frame" x="318" y="8" width="51" height="31"/>
+                                                    <rect key="frame" x="310" y="8.5" width="51" height="31"/>
                                                 </switch>
                                             </subviews>
                                             <constraints>
@@ -621,13 +621,13 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="30" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="SCs-sp-SYD">
-                                                    <rect key="frame" x="81" y="8" width="184" height="29.5"/>
+                                                    <rect key="frame" x="89" y="11" width="168" height="24"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Lifespan" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mYo-wX-qJn">
-                                                    <rect key="frame" x="8" y="8" width="65" height="29.5"/>
+                                                    <rect key="frame" x="16" y="11" width="65" height="24"/>
                                                     <constraints>
                                                         <constraint firstAttribute="width" constant="80" id="iFZ-A4-yVV"/>
                                                     </constraints>
@@ -640,7 +640,7 @@
                                                     </variation>
                                                 </label>
                                                 <stepper opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="30" minimumValue="5" maximumValue="300" stepValue="5" translatesAutoresizingMaskIntoConstraints="NO" id="Nf1-Wq-1FR">
-                                                    <rect key="frame" x="273" y="8" width="94" height="29"/>
+                                                    <rect key="frame" x="265" y="11" width="94" height="29"/>
                                                     <connections>
                                                         <action selector="intervalChanged:" destination="gth-fI-j10" eventType="valueChanged" id="aNQ-cf-zE3"/>
                                                     </connections>
@@ -688,13 +688,13 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="0" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3Ck-AR-s7u">
-                                                    <rect key="frame" x="78" y="8" width="186.5" height="29.5"/>
+                                                    <rect key="frame" x="86" y="11" width="170.5" height="24"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Counter" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8U9-6y-F9B">
-                                                    <rect key="frame" x="8" y="8" width="62" height="29.5"/>
+                                                    <rect key="frame" x="16" y="11" width="62" height="24"/>
                                                     <constraints>
                                                         <constraint firstAttribute="width" constant="80" id="hJJ-T0-rgQ"/>
                                                     </constraints>
@@ -707,7 +707,7 @@
                                                     </variation>
                                                 </label>
                                                 <stepper opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" maximumValue="99999" translatesAutoresizingMaskIntoConstraints="NO" id="h7w-or-J7b">
-                                                    <rect key="frame" x="273" y="8" width="94" height="29"/>
+                                                    <rect key="frame" x="265" y="11" width="94" height="29"/>
                                                     <connections>
                                                         <action selector="counterChanged:" destination="gth-fI-j10" eventType="valueChanged" id="E0X-Lk-y20"/>
                                                     </connections>
@@ -755,7 +755,7 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="SHA" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ISl-Az-YHw">
-                                                    <rect key="frame" x="8" y="8" width="34" height="29.5"/>
+                                                    <rect key="frame" x="16" y="11" width="34" height="24"/>
                                                     <constraints>
                                                         <constraint firstAttribute="width" constant="80" id="g3C-gK-rle"/>
                                                     </constraints>
@@ -768,7 +768,7 @@
                                                     </variation>
                                                 </label>
                                                 <segmentedControl opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="right" contentVerticalAlignment="top" segmentControlStyle="plain" selectedSegmentIndex="0" translatesAutoresizingMaskIntoConstraints="NO" id="Wg0-RB-Fzu">
-                                                    <rect key="frame" x="168" y="8" width="199" height="30.5"/>
+                                                    <rect key="frame" x="160" y="11" width="199" height="25"/>
                                                     <constraints>
                                                         <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="256" id="2Mo-dl-q4C"/>
                                                         <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="384" id="xDY-mj-8wV"/>
@@ -845,7 +845,7 @@
         <!--Scan QR Code-->
         <scene sceneID="Pdh-Uw-n9X">
             <objects>
-                <viewController storyboardIdentifier="scan" id="00Q-un-TmX" customClass="ScanViewController" customModule="FreeOTP__dev_" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="scan" id="00Q-un-TmX" customClass="ScanViewController" customModule="FreeOTP" customModuleProvider="target" sceneMemberID="viewController">
                     <layoutGuides>
                         <viewControllerLayoutGuide type="top" id="BMJ-WB-uuq"/>
                         <viewControllerLayoutGuide type="bottom" id="P05-jw-m8a"/>
@@ -968,7 +968,7 @@
         <!--Edit Token-->
         <scene sceneID="nOl-Nl-OE5">
             <objects>
-                <viewController storyboardIdentifier="edit" title="Edit Token" id="Kag-Fb-gnf" customClass="EditViewController" customModule="FreeOTP__dev_" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="edit" title="Edit Token" id="Kag-Fb-gnf" customClass="EditViewController" customModule="FreeOTP" customModuleProvider="target" sceneMemberID="viewController">
                     <layoutGuides>
                         <viewControllerLayoutGuide type="top" id="pXP-X3-k10"/>
                         <viewControllerLayoutGuide type="bottom" id="5jL-vs-v7N"/>
diff --git a/FreeOTP/WatchSessionDelegate.swift b/FreeOTP/WatchSessionDelegate.swift
new file mode 100644
index 0000000..bf76fa9
--- /dev/null
+++ b/FreeOTP/WatchSessionDelegate.swift
@@ -0,0 +1,43 @@
+//
+//  WatchSessionDelegate.swift
+//  FreeOTP
+//
+//  Created by Jeff Bornemann on 1/16/18.
+//  Copyright © 2018 Fedora Project. All rights reserved.
+//
+
+import Foundation
+import WatchConnectivity
+
+class WatchSessionDelegate : NSObject, WCSessionDelegate {
+
+    override init() {
+        super.init()
+        if WCSession.isSupported() {
+            let session = WCSession.default
+            session.delegate = self
+            session.activate()
+        }
+    }
+    
+    func session(_ session: WCSession,
+                 didReceiveMessage message: [String : Any],
+                 replyHandler: @escaping ([String : Any]) -> Void) {
+        let store: Int = message["store"] as! Int
+        let nextToken: Token? = TokenStore().load(store)
+        if nextToken != nil {
+            replyHandler(["token": nextToken?.codes[0].value as Any,
+                          "account": nextToken?.account as Any,
+                          "to": nextToken?.codes[0].to as Any])
+        }
+        else {
+            replyHandler(["token": "",
+                          "account": "",
+                          "to": Date(timeIntervalSinceNow: 5)])
+        }
+    }
+    
+    func session(_ session: WCSession, activationDidCompleteWith activationState: WCSessionActivationState, error: Error?) {}
+    func sessionDidBecomeInactive(_ session: WCSession) {}
+    func sessionDidDeactivate(_ session: WCSession) {}
+}
diff --git a/freeotpwatch Extension/Assets.xcassets/Complication.complicationset/Circular.imageset/Contents.json b/freeotpwatch Extension/Assets.xcassets/Complication.complicationset/Circular.imageset/Contents.json
new file mode 100644
index 0000000..bae4517
--- /dev/null
+++ b/freeotpwatch Extension/Assets.xcassets/Complication.complicationset/Circular.imageset/Contents.json	
@@ -0,0 +1,19 @@
+{
+  "images" : [
+    {
+      "idiom" : "watch",
+      "screenWidth" : "{130,145}",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "watch",
+      "screenWidth" : "{146,165}",
+      "scale" : "2x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
+
diff --git a/freeotpwatch Extension/Assets.xcassets/Complication.complicationset/Contents.json b/freeotpwatch Extension/Assets.xcassets/Complication.complicationset/Contents.json
new file mode 100644
index 0000000..2eca9a1
--- /dev/null
+++ b/freeotpwatch Extension/Assets.xcassets/Complication.complicationset/Contents.json	
@@ -0,0 +1,28 @@
+{
+  "assets" : [
+    {
+      "idiom" : "watch",
+      "filename" : "Circular.imageset",
+      "role" : "circular"
+    },
+    {
+      "idiom" : "watch",
+      "filename" : "Extra Large.imageset",
+      "role" : "extra-large"
+    },
+    {
+      "idiom" : "watch",
+      "filename" : "Modular.imageset",
+      "role" : "modular"
+    },
+    {
+      "idiom" : "watch",
+      "filename" : "Utilitarian.imageset",
+      "role" : "utilitarian"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/freeotpwatch Extension/Assets.xcassets/Complication.complicationset/Extra Large.imageset/Contents.json b/freeotpwatch Extension/Assets.xcassets/Complication.complicationset/Extra Large.imageset/Contents.json
new file mode 100644
index 0000000..bae4517
--- /dev/null
+++ b/freeotpwatch Extension/Assets.xcassets/Complication.complicationset/Extra Large.imageset/Contents.json	
@@ -0,0 +1,19 @@
+{
+  "images" : [
+    {
+      "idiom" : "watch",
+      "screenWidth" : "{130,145}",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "watch",
+      "screenWidth" : "{146,165}",
+      "scale" : "2x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
+
diff --git a/freeotpwatch Extension/Assets.xcassets/Complication.complicationset/Modular.imageset/Contents.json b/freeotpwatch Extension/Assets.xcassets/Complication.complicationset/Modular.imageset/Contents.json
new file mode 100644
index 0000000..bae4517
--- /dev/null
+++ b/freeotpwatch Extension/Assets.xcassets/Complication.complicationset/Modular.imageset/Contents.json	
@@ -0,0 +1,19 @@
+{
+  "images" : [
+    {
+      "idiom" : "watch",
+      "screenWidth" : "{130,145}",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "watch",
+      "screenWidth" : "{146,165}",
+      "scale" : "2x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
+
diff --git a/freeotpwatch Extension/Assets.xcassets/Complication.complicationset/Utilitarian.imageset/Contents.json b/freeotpwatch Extension/Assets.xcassets/Complication.complicationset/Utilitarian.imageset/Contents.json
new file mode 100644
index 0000000..bae4517
--- /dev/null
+++ b/freeotpwatch Extension/Assets.xcassets/Complication.complicationset/Utilitarian.imageset/Contents.json	
@@ -0,0 +1,19 @@
+{
+  "images" : [
+    {
+      "idiom" : "watch",
+      "screenWidth" : "{130,145}",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "watch",
+      "screenWidth" : "{146,165}",
+      "scale" : "2x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
+
diff --git a/freeotpwatch Extension/ExtensionDelegate.swift b/freeotpwatch Extension/ExtensionDelegate.swift
new file mode 100644
index 0000000..757654d
--- /dev/null
+++ b/freeotpwatch Extension/ExtensionDelegate.swift	
@@ -0,0 +1,71 @@
+//
+//  ExtensionDelegate.swift
+//  FreeOTPWatch Extension
+//
+//  Created by Jeff Bornemann on 1/15/18.
+//  Copyright © 2018 Fedora Project. All rights reserved.
+//
+
+import WatchKit
+import WatchConnectivity
+
+class ExtensionDelegate: NSObject, WKExtensionDelegate, WCSessionDelegate {
+    
+    var currentToken: String = ""
+    var account: String = ""
+    
+    var to: Date = Date(timeIntervalSinceNow: 5)
+    
+    func session(_ session: WCSession, activationDidCompleteWith activationState: WCSessionActivationState, error: Error?) {}
+    
+    func applicationDidFinishLaunching() {
+        if WCSession.isSupported() {
+            let session = WCSession.default
+            session.delegate = self
+            session.activate()
+        }
+    }
+    
+    func updateToken() {
+        if WCSession.isSupported() {
+            let session = WCSession.default
+            if session.isReachable {
+                session.sendMessage(["store": 0], replyHandler: { (replyMessage) -> Void in
+                    self.currentToken = replyMessage["token"] as! String
+                    self.account = replyMessage["account"] as! String
+                    self.to = replyMessage["to"] as! Date
+                })
+            }
+            else {
+                self.currentToken = ""
+                self.account = ""
+                self.to = Date(timeIntervalSinceNow: 5)
+            }
+        }
+    }
+
+    func handle(_ backgroundTasks: Set<WKRefreshBackgroundTask>) {
+        // Sent when the system needs to launch the application in the background to process tasks. Tasks arrive in a set, so loop through and process each one.
+        for task in backgroundTasks {
+            // Use a switch statement to check the task type
+            switch task {
+            case let backgroundTask as WKApplicationRefreshBackgroundTask:
+                // Be sure to complete the background task once you’re done.
+                backgroundTask.setTaskCompletedWithSnapshot(false)
+            case let snapshotTask as WKSnapshotRefreshBackgroundTask:
+                // Snapshot tasks have a unique completion call, make sure to set your expiration date
+                snapshotTask.setTaskCompleted(restoredDefaultState: true, estimatedSnapshotExpiration: Date.distantFuture, userInfo: nil)
+            case let connectivityTask as WKWatchConnectivityRefreshBackgroundTask:
+                // Be sure to complete the connectivity task once you’re done.
+                connectivityTask.setTaskCompletedWithSnapshot(false)
+            case let urlSessionTask as WKURLSessionRefreshBackgroundTask:
+                // Be sure to complete the URL session task once you’re done.
+                urlSessionTask.setTaskCompletedWithSnapshot(false)
+            default:
+                // make sure to complete unhandled task types
+                task.setTaskCompletedWithSnapshot(false)
+            }
+        }
+    }
+
+}
diff --git a/freeotpwatch Extension/Info.plist b/freeotpwatch Extension/Info.plist
new file mode 100644
index 0000000..874a7e3
--- /dev/null
+++ b/freeotpwatch Extension/Info.plist	
@@ -0,0 +1,48 @@
+<?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>CFBundleDisplayName</key>
+	<string>FreeOTPWatch Extension</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>XPC!</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+	<key>CLKComplicationPrincipalClass</key>
+	<string>$(PRODUCT_MODULE_NAME).ComplicationController</string>
+	<key>CLKComplicationSupportedFamilies</key>
+	<array>
+		<string>CLKComplicationFamilyModularSmall</string>
+		<string>CLKComplicationFamilyModularLarge</string>
+		<string>CLKComplicationFamilyUtilitarianSmall</string>
+		<string>CLKComplicationFamilyUtilitarianSmallFlat</string>
+		<string>CLKComplicationFamilyUtilitarianLarge</string>
+		<string>CLKComplicationFamilyCircularSmall</string>
+		<string>CLKComplicationFamilyExtraLarge</string>
+	</array>
+	<key>NSExtension</key>
+	<dict>
+		<key>NSExtensionAttributes</key>
+		<dict>
+			<key>WKAppBundleIdentifier</key>
+			<string>org.fedorahosted.freeotp.watchkitapp</string>
+		</dict>
+		<key>NSExtensionPointIdentifier</key>
+		<string>com.apple.watchkit</string>
+	</dict>
+	<key>WKExtensionDelegateClassName</key>
+	<string>$(PRODUCT_MODULE_NAME).ExtensionDelegate</string>
+</dict>
+</plist>
diff --git a/freeotpwatch Extension/InterfaceController.swift b/freeotpwatch Extension/InterfaceController.swift
new file mode 100644
index 0000000..cf263c1
--- /dev/null
+++ b/freeotpwatch Extension/InterfaceController.swift	
@@ -0,0 +1,68 @@
+//
+//  InterfaceController.swift
+//  FreeOTPWatch Extension
+//
+//  Created by Jeff Bornemann on 1/15/18.
+//  Copyright © 2018 Fedora Project. All rights reserved.
+//
+
+import WatchKit
+import WatchConnectivity
+import Foundation
+
+
+class InterfaceController: WKInterfaceController {
+    
+    @IBOutlet var token: WKInterfaceLabel!
+    @IBOutlet var account: WKInterfaceLabel!
+
+    var timer: Timer?
+
+    let delegate: ExtensionDelegate = WKExtension.shared().delegate as! ExtensionDelegate
+    
+    @IBAction func update() {
+        delegate.updateToken()
+        updateText()
+        setTimer()
+    }
+    
+    func updateText() {
+        if !delegate.currentToken.isEmpty {
+            account.setText(delegate.account)
+            token.setText(delegate.currentToken)
+        }
+        else {
+            account.setText("")
+            token.setText("Connecting..")
+        }
+    }
+    
+    func setTimer() {
+        unsetTimer()
+        let timeToRun = delegate.to.timeIntervalSinceNow > 10 ? delegate.to.timeIntervalSinceNow : TimeInterval(10)
+        timer = Timer.scheduledTimer(timeInterval: timeToRun, target: self, selector: #selector(update), userInfo: nil, repeats: false)
+    }
+    
+    func unsetTimer() {
+        timer?.invalidate()
+        timer = nil
+    }
+    
+    override func willActivate() {
+        super.willActivate()
+        // This method is called when watch view controller is about to be visible to user
+        update()
+    }
+    
+    override func awake(withContext context: Any?) {
+        super.awake(withContext: context)
+    }
+    
+    override func didDeactivate() {
+        // This method is called when watch view controller is no longer visible
+        super.didDeactivate()
+        unsetTimer()
+    }
+    
+}
+
diff --git a/freeotpwatch/Assets.xcassets/AppIcon.appiconset/Contents.json b/freeotpwatch/Assets.xcassets/AppIcon.appiconset/Contents.json
new file mode 100644
index 0000000..f27debe
--- /dev/null
+++ b/freeotpwatch/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -0,0 +1,70 @@
+{
+  "images" : [
+    {
+      "size" : "24x24",
+      "idiom" : "watch",
+      "scale" : "2x",
+      "role" : "notificationCenter",
+      "subtype" : "38mm"
+    },
+    {
+      "size" : "27.5x27.5",
+      "idiom" : "watch",
+      "scale" : "2x",
+      "role" : "notificationCenter",
+      "subtype" : "42mm"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "watch",
+      "role" : "companionSettings",
+      "scale" : "2x"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "watch",
+      "role" : "companionSettings",
+      "scale" : "3x"
+    },
+    {
+      "size" : "40x40",
+      "idiom" : "watch",
+      "filename" : "icon80.png",
+      "scale" : "2x",
+      "role" : "appLauncher",
+      "subtype" : "38mm"
+    },
+    {
+      "size" : "44x44",
+      "idiom" : "watch",
+      "scale" : "2x",
+      "role" : "longLook",
+      "subtype" : "42mm"
+    },
+    {
+      "size" : "86x86",
+      "idiom" : "watch",
+      "scale" : "2x",
+      "role" : "quickLook",
+      "subtype" : "38mm"
+    },
+    {
+      "size" : "98x98",
+      "idiom" : "watch",
+      "scale" : "2x",
+      "role" : "quickLook",
+      "subtype" : "42mm"
+    },
+    {
+      "size" : "1024x1024",
+      "idiom" : "watch-marketing",
+      "filename" : "store.png",
+      "scale" : "1x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
+
diff --git a/freeotpwatch/Assets.xcassets/AppIcon.appiconset/icon80.png b/freeotpwatch/Assets.xcassets/AppIcon.appiconset/icon80.png
new file mode 100644
index 0000000..cfd4a71
Binary files /dev/null and b/freeotpwatch/Assets.xcassets/AppIcon.appiconset/icon80.png differ
diff --git a/freeotpwatch/Assets.xcassets/AppIcon.appiconset/store.png b/freeotpwatch/Assets.xcassets/AppIcon.appiconset/store.png
new file mode 100644
index 0000000..a6096fc
Binary files /dev/null and b/freeotpwatch/Assets.xcassets/AppIcon.appiconset/store.png differ
diff --git a/freeotpwatch/Assets.xcassets/Contents.json b/freeotpwatch/Assets.xcassets/Contents.json
new file mode 100644
index 0000000..7afcdfa
--- /dev/null
+++ b/freeotpwatch/Assets.xcassets/Contents.json
@@ -0,0 +1,7 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
+
diff --git a/freeotpwatch/Base.lproj/Interface.storyboard b/freeotpwatch/Base.lproj/Interface.storyboard
new file mode 100644
index 0000000..b8da6ea
--- /dev/null
+++ b/freeotpwatch/Base.lproj/Interface.storyboard
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder.WatchKit.Storyboard" version="3.0" toolsVersion="13771" targetRuntime="watchKit" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="AgC-eL-Hgc">
+    <device id="watch38" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <deployment identifier="watchOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBWatchKitPlugin" version="13756"/>
+    </dependencies>
+    <scenes>
+        <!--Interface Controller-->
+        <scene sceneID="aou-V4-d1y">
+            <objects>
+                <controller id="AgC-eL-Hgc" customClass="InterfaceController" customModule="FreeOTPWatch" customModuleProvider="target">
+                    <items>
+                        <group width="132" height="150" alignment="center" verticalAlignment="center" animationDuration="1" layout="vertical" id="2XK-Zg-lK8">
+                            <items>
+                                <label height="26" alignment="left" accessibilityLabel="account" id="6Hs-eT-5FA" userLabel="account">
+                                    <accessibilityTraits key="accessibilityTraits" staticText="YES" notEnabled="YES"/>
+                                    <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                    <fontDescription key="font" style="UICTFontTextStyleCaption1"/>
+                                </label>
+                                <label alignment="center" verticalAlignment="center" text="Connecting.." id="N9G-lW-Mfq" userLabel="token">
+                                    <accessibilityTraits key="accessibilityTraits" staticText="YES" notEnabled="YES" updatesFrequently="YES"/>
+                                </label>
+                            </items>
+                            <gestureRecognizers>
+                                <tapGestureRecognizer id="90e-DD-n7f">
+                                    <connections>
+                                        <action selector="update" destination="AgC-eL-Hgc" id="iLb-Xt-bd9"/>
+                                    </connections>
+                                </tapGestureRecognizer>
+                            </gestureRecognizers>
+                        </group>
+                    </items>
+                    <connections>
+                        <outlet property="account" destination="6Hs-eT-5FA" id="L8J-SB-Jdq"/>
+                        <outlet property="token" destination="N9G-lW-Mfq" id="GcZ-d3-S1n"/>
+                    </connections>
+                </controller>
+            </objects>
+            <point key="canvasLocation" x="34" y="35"/>
+        </scene>
+    </scenes>
+</document>
diff --git a/freeotpwatch/Info.plist b/freeotpwatch/Info.plist
new file mode 100644
index 0000000..2928835
--- /dev/null
+++ b/freeotpwatch/Info.plist
@@ -0,0 +1,33 @@
+<?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>CFBundleDisplayName</key>
+	<string>FreeOTP</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>UISupportedInterfaceOrientations</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationPortraitUpsideDown</string>
+	</array>
+	<key>WKCompanionAppBundleIdentifier</key>
+	<string>org.fedorahosted.freeotp</string>
+	<key>WKWatchKitApp</key>
+	<true/>
+</dict>
+</plist>