diff --git a/appinfo.json b/appinfo.json
index c5e4326..0ed8185 100644
--- a/appinfo.json
+++ b/appinfo.json
@@ -19,6 +19,16 @@
     "projectType": "native",
     "resources": {
         "media": [
+            {
+                "file": "images/Pebble_Star.png",
+                "name": "IMAGE_ICON_STAR",
+                "type": "png"
+            },
+            {
+                "file": "images/Pebble_Bin.png",
+                "name": "IMAGE_ICON_TRASH",
+                "type": "png"
+            },
             {
                 "file": "images/auth_icon.png",
                 "menuIcon": true,
@@ -57,16 +67,6 @@
                 "name": "FONT_UNISPACE_20",
                 "type": "font"
             },
-            {
-                "file": "images/Yes.png",
-                "name": "IMAGE_ICON_YES",
-                "type": "png"
-            },
-            {
-                "file": "images/No.png",
-                "name": "IMAGE_ICON_NO",
-                "type": "png"
-            },
             {
                 "compatibility": "2.7",
                 "file": "fonts/ORBITRON_28.ttf",
@@ -81,6 +81,7 @@
             }
         ]
     },
+    "sdkVersion": "2",
     "shortName": "PebbleAuth",
     "uuid": "1f4d9835-3b9a-4ddd-907e-41a25d06f19c",
     "versionCode": 5,
diff --git a/resources/images/No.png b/resources/images/No.png
deleted file mode 100644
index 79b6304..0000000
Binary files a/resources/images/No.png and /dev/null differ
diff --git a/resources/images/Pebble_Bin.png b/resources/images/Pebble_Bin.png
new file mode 100644
index 0000000..7ee4960
Binary files /dev/null and b/resources/images/Pebble_Bin.png differ
diff --git a/resources/images/Pebble_Star.png b/resources/images/Pebble_Star.png
new file mode 100644
index 0000000..079d018
Binary files /dev/null and b/resources/images/Pebble_Star.png differ
diff --git a/resources/images/Yes.png b/resources/images/Yes.png
deleted file mode 100644
index 3b60188..0000000
Binary files a/resources/images/Yes.png and /dev/null differ
diff --git a/src/google-authenticator.c b/src/google-authenticator.c
index af56fb9..a186ae5 100644
--- a/src/google-authenticator.c
+++ b/src/google-authenticator.c
@@ -24,15 +24,9 @@
 #include "base32.h"
 #include "hmac.h"
 #include "sha1.h"
+#include "google-authenticator.h"
 
-#define SECRET_BITS               80          // Must be divisible by eight
-#define VERIFICATION_CODE_MODULUS (1000*1000) // Six digits
-#define SCRATCHCODES              5           // Number of initial scratchcodes
-#define SCRATCHCODE_LENGTH        8           // Eight digits per scratchcode
-#define BYTES_PER_SCRATCHCODE     4           // 32bit of randomness is enough
-#define BITS_PER_BASE32_CHAR      5           // Base32 expands space by 8/5
-
-static char *generateCode(const char *key, int timezone_offset) {
+char *generateCode(const char *key, int timezone_offset) {
 	//long tm = time(NULL)/30;
 	long tm = (time(NULL) + (timezone_offset*60))/30;
 	uint8_t challenge[8];
@@ -47,7 +41,7 @@ static char *generateCode(const char *key, int timezone_offset) {
 	
 	// Sanity check, that our secret will fixed into a reasonably-sized static
 	// array.
-	if (secretLen <= 0 || secretLen > 100) {
+	if (secretLen < 0 || secretLen > 100) {
 		return "FAILED";
 	}
 	
@@ -55,10 +49,9 @@ static char *generateCode(const char *key, int timezone_offset) {
 	// have at least one byte's worth of secret data.
 	uint8_t secret[100];
 	if ((secretLen = base32_decode((const uint8_t *)key, secret, secretLen))<1) {
-		//return -1;
 		return "FAILED";
 	}
-	
+
 	// Compute the HMAC_SHA1 of the secrete and the challenge.
 	uint8_t hash[SHA1_DIGEST_LENGTH];
 	hmac_sha1(secret, secretLen, challenge, 8, hash, SHA1_DIGEST_LENGTH);
diff --git a/src/google-authenticator.h b/src/google-authenticator.h
new file mode 100644
index 0000000..b309823
--- /dev/null
+++ b/src/google-authenticator.h
@@ -0,0 +1,34 @@
+// Helper program to generate a new secret for use in two-factor
+// authentication.
+//
+// Copyright 2010 Google Inc.
+// Author: Markus Gutschke
+//
+// Adapted for the Pebble Smartwatch
+// Author: Kevin Cooper
+// https://github.com/JumpMaster/PebbleAuth
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef _GOOGLEAUTHENTICATOR_H_
+#define _GOOGLEAUTHENTICATOR_H_
+
+#include <stdint.h>
+
+#define VERIFICATION_CODE_MODULUS (1000*1000) // Six digits
+#define BITS_PER_BASE32_CHAR      5           // Base32 expands space by 8/5
+	
+char *generateCode(const char *key, int timezone_offset)
+	__attribute__((visibility("hidden")));
+
+#endif /* _GOOGLEAUTHENTICATOR_H_ */
\ No newline at end of file
diff --git a/src/js/pebble-js-app.js b/src/js/pebble-js-app.js
index 471aa6d..236e37d 100644
--- a/src/js/pebble-js-app.js
+++ b/src/js/pebble-js-app.js
@@ -9,23 +9,49 @@ var timezoneOffset = 0;
 var idle_timeout = 0;
 var message_send_retries = 0;
 var message_send_max_retries = 5;
-var app_version = 6;
-var debug = true;
+var app_version = 7;
 
-function loadLocalVariables() {
+var debug = false;
 
+function checkKeyStringIsValid(key) {
+	if (debug)
+		console.log("INFO: Key="+key);
+	if (key === null) {
+		if (debug)
+			console.log("INFO: Key failed null test");
+		return false;
+	}
+	
+	var colonPosition = key.indexOf(":");
+	
+	if (colonPosition <= 0) {
+		if (debug)
+			console.log("INFO: Key failed colonPosition <= 0 test");
+		return false;
+	}
+	
+	if (colonPosition >= key.length-1) {
+		if (debug)
+			console.log("INFO: Key failed colonPosition >= key.length-1 test");
+		return false;
+	}
+	
+	return true;
+}
+
+function loadLocalVariables() {
 	for (var i=0; i<MAX_OTP; i++)
 	{
-		var tempKey = localStorage.getItem("secret_pair"+i);
-		if (tempKey !== null)
+		var tempKey = getItem("secret_pair"+i);
+		if (checkKeyStringIsValid(tempKey))
 			otp_count++;
 		else
 			break;
 	}
 	
-	theme = parseInt(localStorage.getItem("theme"));
-	font_style = parseInt(localStorage.getItem("font_style"));
-	idle_timeout = localStorage.getItem("idle_timeout");
+	theme = parseInt(getItem("theme"));
+	font_style = parseInt(getItem("font_style"));
+	idle_timeout = getItem("idle_timeout");
 	timezoneOffset = new Date().getTimezoneOffset();
 	
 	theme = !theme ? 0 : theme;
@@ -33,6 +59,22 @@ function loadLocalVariables() {
 	idle_timeout = idle_timeout === null ? 300 : parseInt(idle_timeout);
 }
 
+function getItem(reference) {
+	var item = localStorage.getItem(reference);
+	
+	if (debug)
+		console.log("INFO: Loading item. REF:" + reference + " ITEM:" + item);
+		
+	return item;
+}
+
+function setItem(reference, item) {
+	if (debug)
+		console.log("INFO: Saving item. REF:" + reference + " ITEM:" + item);
+		
+	localStorage.setItem(reference ,item);
+}
+
 function sendAppMessage(data) {
 	Pebble.sendAppMessage(data,
 						function(e) { // SUCCESS
@@ -79,16 +121,16 @@ Pebble.addEventListener("ready",
 									console.log("INFO: font_style="+font_style);
 									console.log("INFO: idle_timeout="+idle_timeout);
 								}
-								
-								// ####### CLEAN APP ##############
-//								for (var i=0; i<MAX_OTP; i++)
-//								{
-//									localStorage.removeItem('secret_pair'+i);
-//								}
-//								localStorage.removeItem("theme");
-//								localStorage.removeItem("font_style");
-//								localStorage.removeItem("idle_timeout");
-								// ####### /CLEAN APP ##############
+
+								/*// ####### CLEAN APP ##############
+								for (var i=0; i<MAX_OTP; i++)
+								{
+									localStorage.removeItem('secret_pair'+i);
+								}
+								localStorage.removeItem("theme");
+								localStorage.removeItem("font_style");
+								localStorage.removeItem("idle_timeout");
+								// ####### /CLEAN APP ##############*/
 							}
 						);
 
@@ -99,15 +141,15 @@ function sendKeyToWatch(secret) {
 function confirmDelete(secret) {
 	var blnFound = false;
 	for (var i = 0; i < MAX_OTP;i++) {
-		var savedSecret = localStorage.getItem('secret_pair'+i);
+		var savedSecret = getItem('secret_pair'+i);
 		
 		if (savedSecret !== null && savedSecret.indexOf(secret) != -1)
 			blnFound = true;
 		
 		if (blnFound) {
-			var nextSecret = localStorage.getItem('secret_pair'+(i+1));
+			var nextSecret = getItem('secret_pair'+(i+1));
 			if (nextSecret)
-				localStorage.setItem('secret_pair'+i,nextSecret);
+				setItem('secret_pair'+i,nextSecret);
 			else
 				localStorage.removeItem('secret_pair'+i);
 		}
@@ -123,7 +165,7 @@ Pebble.addEventListener("appmessage",
 								if (e.payload.request_key) {
 									if (debug)
 										console.log("INFO: Requested key: "+e.payload.request_key);
-									sendKeyToWatch(localStorage.getItem("secret_pair"+(e.payload.request_key-1)));
+									sendKeyToWatch(getItem("secret_pair"+(e.payload.request_key-1)));
 								}
 								else if (e.payload.delete_key) {
 									if (debug)
@@ -176,7 +218,7 @@ Pebble.addEventListener("webviewclosed",
 										console.log("INFO: Theme changed");
 									
 									theme = configuration.theme;
-									localStorage.setItem("theme",theme);
+									setItem("theme",theme);
 									config.theme = theme;
 								}
 								
@@ -185,7 +227,7 @@ Pebble.addEventListener("webviewclosed",
 										console.log("INFO: Font style changed:"+configuration.font_style);
 
 									font_style = configuration.font_style;
-									localStorage.setItem("font_style",font_style);
+									setItem("font_style",font_style);
 									config.font_style = font_style;
 								}
 								
@@ -194,7 +236,7 @@ Pebble.addEventListener("webviewclosed",
 										console.log("INFO: Idle timeout changed");
 									
 									idle_timeout = configuration.idle_timeout;
-									localStorage.setItem("idle_timeout",idle_timeout);
+									setItem("idle_timeout",idle_timeout);
 								}
 								// Always send idle_timeout to reset it after
 								// it was disabled while configuring
@@ -214,15 +256,18 @@ Pebble.addEventListener("webviewclosed",
 										.substring(0, MAX_LABEL_LENGTH);
 									var secretPair = label + ":" + secret;
 									
+									if (!checkKeyStringIsValid(secretPair))
+										return;
+									
 									var blnKeyExists = false;
 									for (i=0;i<otp_count;i++) {
-										var savedSecret = localStorage.getItem('secret_pair'+i);
+										var savedSecret = getItem('secret_pair'+i);
 										if (savedSecret !== null && savedSecret.indexOf(secret) != -1) {
 											if (debug)
 												console.log("INFO: Relabled code");
 											
 											blnKeyExists = true;
-											localStorage.setItem('secret_pair'+i,secretPair);
+											setItem('secret_pair'+i,secretPair);
 											config.transmit_key = secretPair;
 										}
 									}
@@ -230,7 +275,7 @@ Pebble.addEventListener("webviewclosed",
 										if (debug)
 											console.log("INFO: Uploading new key:"+secretPair);
 										
-										localStorage.setItem('secret_pair'+otp_count,secretPair);
+										setItem('secret_pair'+otp_count,secretPair);
 										otp_count++;
 										config.transmit_key = secretPair;
 									}
diff --git a/src/main.c b/src/main.c
index c7f51f4..1f32347 100644
--- a/src/main.c
+++ b/src/main.c
@@ -7,13 +7,7 @@
 
 #include "pebble.h"
 #include "main.h"
-#include "google-authenticator.c"
-
-#define MAX_OTP 16
-#define MAX_LABEL_LENGTH 21 // 20 + termination
-#define MAX_KEY_LENGTH 65 // 64 + termination
-#define MAX_COMBINED_LENGTH MAX_LABEL_LENGTH+MAX_KEY_LENGTH
-#define DEBUG true
+#include "google-authenticator.h"
 
 // Main Window
 Window *main_window;
@@ -95,6 +89,12 @@ void update_screen_fonts() {
 }
 
 void expand_key(char *inputString, bool new_code) {
+	if (strstr(inputString, ":") == NULL) {
+		if (DEBUG)
+			APP_LOG(APP_LOG_LEVEL_DEBUG, "INFO: SUPER NULL input string, ignoring");
+		return;
+	}
+	
 	bool colonFound = false;
 	int outputChar = 0;
 	
@@ -118,7 +118,7 @@ void expand_key(char *inputString, bool new_code) {
 	otp_key[outputChar] = '\0';
 	
 	// If the label or key are null ignore them
-	if (otp_label == '\0' || otp_key == '\0') {
+	if (strlen(otp_label) <= 0 || strlen(otp_key) <= 2) {
 		APP_LOG(APP_LOG_LEVEL_DEBUG, "INFO: NULL key or label, ignoring");
 		return;
 	}
@@ -392,7 +392,7 @@ void request_delete(char *delete_key) {
 	if (DEBUG)
 		APP_LOG(APP_LOG_LEVEL_DEBUG, "INFO: Pebble Requesting delete: %s", delete_key);
 
-	sendJSMessage(TupletCString(JS_DELETE_KEY, delete_key));
+	sendJSMessage(MyTupletCString(JS_DELETE_KEY, delete_key));
 }
 
 void request_key(int code_id) {
@@ -402,6 +402,24 @@ void request_key(int code_id) {
 	sendJSMessage(TupletInteger(JS_REQUEST_KEY, code_id));
 }
 
+void send_key(int requested_key) {
+	if (DEBUG)
+		APP_LOG(APP_LOG_LEVEL_DEBUG, "INFO: Phone Requesting key: %d", requested_key);
+
+	char keylabelpair[MAX_COMBINED_LENGTH];
+	
+	if (persist_exists(PS_SECRET+requested_key)) {
+		if (DEBUG)
+			APP_LOG(APP_LOG_LEVEL_DEBUG, "INFO: SENDING CODE FROM LOCATION %d", PS_SECRET+requested_key);
+
+		persist_read_string(PS_SECRET+requested_key, keylabelpair, MAX_COMBINED_LENGTH);
+	}
+	else
+		strcat(keylabelpair,"NULL");
+
+	sendJSMessage(MyTupletCString(JS_TRANSMIT_KEY, keylabelpair));
+}
+
 void details_actionbar_up_click_handler(ClickRecognizerRef recognizer, void *context) {
 	resetIdleTime();
 	otp_default = details_selected_key;
@@ -463,8 +481,8 @@ static void details_window_load(Window *window) {
 	
 	text_layer_set_text(details_title_layer, otp_labels[details_selected_key]);
 	
-	image_icon_yes = gbitmap_create_with_resource(RESOURCE_ID_IMAGE_ICON_YES);
-	image_icon_no = gbitmap_create_with_resource(RESOURCE_ID_IMAGE_ICON_NO);
+	image_icon_yes = gbitmap_create_with_resource(RESOURCE_ID_IMAGE_ICON_STAR);
+	image_icon_no = gbitmap_create_with_resource(RESOURCE_ID_IMAGE_ICON_TRASH);
 	
 	// Initialize the action bar:
 	details_action_bar_layer = action_bar_layer_create();
@@ -664,6 +682,7 @@ static void in_received_handler(DictionaryIterator *iter, void *context) {
 	Tuple *font_style_tuple = dict_find(iter, JS_FONT_STYLE);
 	Tuple *delete_all_tuple = dict_find(iter, JS_DELETE_ALL);
 	Tuple *idle_timeout_tuple = dict_find(iter, JS_IDLE_TIMEOUT);
+	Tuple *key_request_tuple = dict_find(iter, JS_REQUEST_KEY);
 	
 	// Act on the found fields received
 	if (delete_all_tuple) {
@@ -684,12 +703,11 @@ static void in_received_handler(DictionaryIterator *iter, void *context) {
 	} // delete_all_tuple
 	
 	if (key_count_tuple) {
-		if (DEBUG) {
-			APP_LOG(APP_LOG_LEVEL_DEBUG, "INFO: Key count from watch: %d", watch_otp_count);
-			APP_LOG(APP_LOG_LEVEL_DEBUG, "INFO: Key count from phone: %d", key_count_tuple->value->int16);
-		}
 		phone_otp_count = key_count_tuple->value->int16;
 		
+		APP_LOG(APP_LOG_LEVEL_DEBUG, "INFO: Key count from watch: %d", watch_otp_count);
+		APP_LOG(APP_LOG_LEVEL_DEBUG, "INFO: Key count from phone: %d", phone_otp_count);
+		
 		if (watch_otp_count < phone_otp_count) {
 			if (DEBUG)
 				APP_LOG(APP_LOG_LEVEL_DEBUG, "INFO: REQUESTING CODES");
@@ -789,6 +807,11 @@ static void in_received_handler(DictionaryIterator *iter, void *context) {
 				APP_LOG(APP_LOG_LEVEL_DEBUG, "INFO: Idle Timeout: %d", idle_timeout);
 		}
 	} // idle_timeout_tuple
+	
+	if (key_request_tuple) {
+		int requested_key_value = key_request_tuple->value->int16;
+		send_key(requested_key_value);
+	} // key_request_tuple
 }
 
 void in_dropped_handler(AppMessageResult reason, void *context) {
@@ -809,8 +832,13 @@ void load_persistent_data() {
 			if (persist_exists(PS_SECRET+i)) {
 				if (DEBUG)
 					APP_LOG(APP_LOG_LEVEL_DEBUG, "INFO: LOADING CODE FROM LOCATION %d", PS_SECRET+i);
+				
 				char keylabelpair[MAX_COMBINED_LENGTH];
 				persist_read_string(PS_SECRET+i, keylabelpair, MAX_COMBINED_LENGTH);
+				
+				if (DEBUG)
+					APP_LOG(APP_LOG_LEVEL_DEBUG, "'%s'", keylabelpair);
+				
 				expand_key(keylabelpair, false);
 			}
 			else
diff --git a/src/main.h b/src/main.h
index ee055a7..89f7d2c 100644
--- a/src/main.h
+++ b/src/main.h
@@ -18,11 +18,22 @@
 #ifndef _MAIN_H_
 #define _MAIN_H_
 
+#include "pebble.h"
+	
 typedef struct {
 	GFont font;
 	bool isCustom;
 } AppFont;
 
+#define MAX_OTP 16
+#define MAX_LABEL_LENGTH 21 // 20 + termination
+#define MAX_KEY_LENGTH 65 // 64 + termination
+#define MAX_COMBINED_LENGTH MAX_LABEL_LENGTH+MAX_KEY_LENGTH
+#define APP_VERSION 7
+#define DEBUG false
+
+#define MyTupletCString(_key, _cstring) \
+((const Tuplet) { .type = TUPLE_CSTRING, .key = _key, .cstring = { .data = _cstring, .length = strlen(_cstring) + 1 }})
 
 // Persistant Storage Keys
 enum {
diff --git a/src/sha1.h b/src/sha1.h
index d90c9d6..7efeec9 100644
--- a/src/sha1.h
+++ b/src/sha1.h
@@ -30,7 +30,8 @@ typedef struct {
   int      local;
 } SHA1_INFO;
 
-void sha1_init(SHA1_INFO *sha1_info) __attribute__((visibility("hidden")));
+void sha1_init(SHA1_INFO *sha1_info)
+	__attribute__((visibility("hidden")));
 void sha1_update(SHA1_INFO *sha1_info, const uint8_t *buffer, int count)
   __attribute__((visibility("hidden")));
 void sha1_final(SHA1_INFO *sha1_info, uint8_t digest[20])