From 158ca44f07e97225498f2338d960f96f16035014 Mon Sep 17 00:00:00 2001
From: ktind <klee24@gmail.com>
Date: Sun, 14 Sep 2014 08:32:31 -0500
Subject: [PATCH] -Android notification is now mandatory and displays messages
 from other monitors e.g. user Receives alerts that MQTT is down or Mongo
 credentials are incorrect. -Detailed exception handling around G4 IO errors
 -Added a new condition to handle mongo not connected

---
 .idea/gradle.xml                              |   2 +-
 .idea/modules.xml                             |   2 +-
 mobile/build.gradle                           |   8 +-
 mobile/mobile.iml                             |   9 +-
 mobile/src/main/AndroidManifest.xml           |  41 +-
 .../com/ktind/cgm/bgscout/AbstractDevice.java |  27 +-
 .../ktind/cgm/bgscout/AbstractMonitor.java    |   2 +-
 .../bgscout/AndroidNotificationMonitor.java   | 250 ++++++-
 .../cgm/bgscout/CGMDownloadAnalyzer.java      |   7 +
 .../com/ktind/cgm/bgscout/Conditions.java     |   3 +-
 .../com/ktind/cgm/bgscout/DeviceActivity.java | 685 ------------------
 .../cgm/bgscout/DeviceDownloadService.java    |  17 +-
 .../com/ktind/cgm/bgscout/DexcomG4/G4.java    |   6 +-
 .../com/ktind/cgm/bgscout/MainActivity.java   |   1 +
 .../ktind/cgm/bgscout/MongoUploadMonitor.java |  46 +-
 .../cgm/bgscout/StaticAlertMessages.java      |  54 ++
 .../com/ktind/cgm/bgscout/WearMonitor.java    | 110 +++
 .../com/ktind/cgm/bgscout/mqtt/MQTTMgr.java   |  14 +-
 mobile/src/main/res/values/strings.xml        |  40 +-
 mobile/src/main/res/xml/pref_general.xml      | 120 +--
 settings.gradle                               |   3 +-
 wear/build.gradle                             |   3 +-
 wear/src/main/AndroidManifest.xml             |  30 +-
 .../ktind/cgm/bgscout/ListenerService.java    |  57 ++
 .../com/ktind/cgm/bgscout/MyActivity.java     |  76 ++
 wear/src/main/res/layout/activity_display.xml |  40 +
 wear/src/main/res/layout/activity_my.xml      |  39 +
 wear/src/main/res/layout/rect_activity_my.xml |  41 ++
 .../src/main/res/layout/round_activity_my.xml |  42 ++
 wear/src/main/res/values/strings.xml          |   9 +
 wear/wear.iml                                 |   8 +-
 31 files changed, 908 insertions(+), 884 deletions(-)
 delete mode 100644 mobile/src/main/java/com/ktind/cgm/bgscout/DeviceActivity.java
 create mode 100644 mobile/src/main/java/com/ktind/cgm/bgscout/StaticAlertMessages.java
 create mode 100644 mobile/src/main/java/com/ktind/cgm/bgscout/WearMonitor.java
 create mode 100644 wear/src/main/java/com/ktind/cgm/bgscout/ListenerService.java
 create mode 100644 wear/src/main/java/com/ktind/cgm/bgscout/MyActivity.java
 create mode 100644 wear/src/main/res/layout/activity_display.xml
 create mode 100644 wear/src/main/res/layout/activity_my.xml
 create mode 100644 wear/src/main/res/layout/rect_activity_my.xml
 create mode 100644 wear/src/main/res/layout/round_activity_my.xml

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index f100aa7..8eab26b 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -8,8 +8,8 @@
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
+            <option value="$PROJECT_DIR$/PEBBLE_KIT" />
             <option value="$PROJECT_DIR$/mobile" />
-            <option value="$PROJECT_DIR$/pEBBLE_KIT" />
             <option value="$PROJECT_DIR$/wear" />
           </set>
         </option>
diff --git a/.idea/modules.xml b/.idea/modules.xml
index f46ce42..83ad06f 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -3,8 +3,8 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/BGScout.iml" filepath="$PROJECT_DIR$/BGScout.iml" />
+      <module fileurl="file://$PROJECT_DIR$/PEBBLE_KIT/PEBBLE_KIT.iml" filepath="$PROJECT_DIR$/PEBBLE_KIT/PEBBLE_KIT.iml" />
       <module fileurl="file://$PROJECT_DIR$/mobile/mobile.iml" filepath="$PROJECT_DIR$/mobile/mobile.iml" />
-      <module fileurl="file://$PROJECT_DIR$/pEBBLE_KIT/pEBBLE_KIT.iml" filepath="$PROJECT_DIR$/pEBBLE_KIT/pEBBLE_KIT.iml" />
       <module fileurl="file://$PROJECT_DIR$/wear/wear.iml" filepath="$PROJECT_DIR$/wear/wear.iml" />
     </modules>
   </component>
diff --git a/mobile/build.gradle b/mobile/build.gradle
index 2222d40..3172acb 100644
--- a/mobile/build.gradle
+++ b/mobile/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "com.ktind.cgm.bgscout"
         minSdkVersion 16
         targetSdkVersion 20
-        versionCode 9
-        versionName "0.0.9"
+        versionCode 10
+        versionName "0.1.1"
     }
     buildTypes {
         release {
@@ -27,8 +27,8 @@ dependencies {
     compile files('libs/protobuf-java-2.5.0.jar')
     compile files('libs/acra-4.5.0.jar')
     compile 'com.google.android.gms:play-services-wearable:5.0.77'
-    compile 'com.android.support:support-v4:20.0.0'
+    compile 'com.android.support:support-v4:20.0.+'
     compile 'com.google.code.gson:gson:2.3'
     compile 'com.android.support:support-v13:20.0.0'
-    compile project(':pEBBLE_KIT')
+    compile project(':PEBBLE_KIT')
 }
diff --git a/mobile/mobile.iml b/mobile/mobile.iml
index 1cfd26d..9362bea 100644
--- a/mobile/mobile.iml
+++ b/mobile/mobile.iml
@@ -13,6 +13,7 @@
         <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugJava" />
         <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
         <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
+        <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugTestSources" />
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
         <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
@@ -42,22 +43,22 @@
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/test/debug" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/assets" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
@@ -94,7 +95,7 @@
     <orderEntry type="library" exported="" name="mongo-java-driver-2.12.3" level="project" />
     <orderEntry type="library" exported="" name="acra-4.5.0" level="project" />
     <orderEntry type="library" exported="" name="gson-2.3" level="project" />
-    <orderEntry type="module" module-name="pEBBLE_KIT" exported="" />
+    <orderEntry type="module" module-name="PEBBLE_KIT" exported="" />
   </component>
 </module>
 
diff --git a/mobile/src/main/AndroidManifest.xml b/mobile/src/main/AndroidManifest.xml
index aad285c..215fe5d 100644
--- a/mobile/src/main/AndroidManifest.xml
+++ b/mobile/src/main/AndroidManifest.xml
@@ -19,10 +19,10 @@
 
     <application
         android:name=".BGScout"
-        android:allowBackup="true"
         android:icon="@drawable/icon"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme" >
+        android:theme="@style/AppTheme"
+        android:allowBackup="true" >
         <meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version" />
         <meta-data
             android:name="com.google.android.gms.analytics.globalConfigResource"
@@ -34,42 +34,19 @@
         </service>
         <activity
             android:name=".MainActivity"
-            android:label="@string/app_name"
-            android:launchMode="singleTop" >
-            <intent-filter>
-                <action android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED" />
-            </intent-filter>
-
-            <meta-data
-                android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED"
-                android:resource="@xml/device_filter" />
-
-
+            android:launchMode="singleInstance" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
+                <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <intent-filter>
-                <action android:name="com.ktind.cgm.DEVICE_POLL" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="com.ktind.cgm.MQTT_KEEPALIVE" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="com.ktind.cgm.MQTT_RECONNECT" />
+                <action android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED" />
             </intent-filter>
+            <meta-data
+                android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED"
+                android:resource="@xml/device_filter" />
         </activity>
-        <!--<activity-->
-            <!--android:name=".DeviceActivity"-->
-            <!--android:label="@string/title_activity_device"-->
-            <!--android:launchMode="singleTop">-->
-            <!--<intent-filter>-->
-                <!--<action android:name="android.intent.action.MAIN" />-->
-
-                <!--<category android:name="android.intent.category.LAUNCHER" />-->
-            <!--</intent-filter>-->
-        <!--</activity>-->
         <activity
             android:name=".SettingsActivity"
             android:label="@string/title_activity_settings"
@@ -78,7 +55,5 @@
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="com.ktind.cgm.bgscout.MainActivity" />
         </activity>
-
     </application>
-
 </manifest>
diff --git a/mobile/src/main/java/com/ktind/cgm/bgscout/AbstractDevice.java b/mobile/src/main/java/com/ktind/cgm/bgscout/AbstractDevice.java
index 8607c55..5cb9bb3 100644
--- a/mobile/src/main/java/com/ktind/cgm/bgscout/AbstractDevice.java
+++ b/mobile/src/main/java/com/ktind/cgm/bgscout/AbstractDevice.java
@@ -109,14 +109,14 @@ public void start(){
             monitors.add(new PebbleMonitor(getName(),deviceID, getContext()));
         }
 
-        if (sharedPref.getBoolean(deviceIDStr + "_android_monitor", false)) {
-            Log.i(TAG, "Adding a local android monitor");
-            mon = new AndroidNotificationMonitor(getName(), deviceID, getContext());
-            if (phoneNum!=null) {
-                ((AndroidNotificationMonitor) mon).setPhoneNum(phoneNum);
-            }
-            monitors.add(mon);
-        }
+//        if (sharedPref.getBoolean(deviceIDStr + "_android_monitor", false)) {
+//            Log.i(TAG, "Adding a local android monitor");
+//            mon = new AndroidNotificationMonitor(getName(), deviceID, getContext());
+//            if (phoneNum!=null) {
+//                ((AndroidNotificationMonitor) mon).setPhoneNum(phoneNum);
+//            }
+//            monitors.add(mon);
+//        }
         if (!isRemote()) {
             if (sharedPref.getBoolean(deviceIDStr + "_mongo_upload", false)) {
                 Log.i(TAG, "Adding a mongo upload monitor");
@@ -136,6 +136,16 @@ public void start(){
         } else {
             Log.i(TAG, "Ignoring monitors that do not allow remote devices");
         }
+//        mon=new WearMonitor(getName(),deviceID,getContext());
+//        monitors.add(mon);
+
+        // TODO Remove option since it longer does anything
+        Log.i(TAG, "Adding a local android monitor");
+        mon = new AndroidNotificationMonitor(getName(), deviceID, getContext());
+        if (phoneNum!=null) {
+            ((AndroidNotificationMonitor) mon).setPhoneNum(phoneNum);
+        }
+        monitors.add(mon);
         Log.d(TAG, "Number of monitors created: " + monitors.size());
         started=true;
         IntentFilter intentFilter=new IntentFilter(Constants.UIDO_QUERY);
@@ -198,7 +208,6 @@ public void setUnit(GlucoseUnit unit) {
     public void fireMonitors(DownloadObject dl) {
         stats.startMonitorTimer();
         Log.d(TAG,"Firing monitors");
-        // FIXME why is monitors set to null here sometimes?
         if (monitors==null)
             return;
         for (AbstractMonitor monitor:monitors)
diff --git a/mobile/src/main/java/com/ktind/cgm/bgscout/AbstractMonitor.java b/mobile/src/main/java/com/ktind/cgm/bgscout/AbstractMonitor.java
index 3903868..92af47a 100644
--- a/mobile/src/main/java/com/ktind/cgm/bgscout/AbstractMonitor.java
+++ b/mobile/src/main/java/com/ktind/cgm/bgscout/AbstractMonitor.java
@@ -107,7 +107,7 @@ final public void process(DownloadObject d) {
         if (isAllowVirtual() || ! d.isRemoteDevice()){
             lastSuccessDate=sharedPref.getLong("last_"+deviceIDStr+"_"+monitorType,new Date().getTime()-900000L);
             Log.d(TAG, "Trimming data for monitor "+name+"/"+monitorType);
-            final DownloadObject dl=new DownloadObject(d);
+            final AnalyzedDownload dl=new AnalyzedDownload(d);
             dl.setEgvRecords(trimReadingsAfter(getlastSuccessDate(), d.getEgvArrayListRecords()));
             Log.d(TAG, "Processing monitor "+name+" for "+monitorType);
             new Thread(new Runnable() {
diff --git a/mobile/src/main/java/com/ktind/cgm/bgscout/AndroidNotificationMonitor.java b/mobile/src/main/java/com/ktind/cgm/bgscout/AndroidNotificationMonitor.java
index 7abff3e..6acb47c 100644
--- a/mobile/src/main/java/com/ktind/cgm/bgscout/AndroidNotificationMonitor.java
+++ b/mobile/src/main/java/com/ktind/cgm/bgscout/AndroidNotificationMonitor.java
@@ -1,7 +1,6 @@
 package com.ktind.cgm.bgscout;
 
 import android.app.Notification;
-import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.content.BroadcastReceiver;
 import android.content.ContentUris;
@@ -17,6 +16,9 @@
 import android.preference.PreferenceManager;
 import android.provider.ContactsContract;
 import android.provider.Settings;
+import android.support.v4.app.NotificationCompat;
+import android.support.v4.app.NotificationCompat.WearableExtender;
+import android.support.v4.app.NotificationManagerCompat;
 import android.util.Log;
 
 import com.google.android.gms.analytics.HitBuilders;
@@ -56,8 +58,8 @@
  */
 public class AndroidNotificationMonitor extends AbstractMonitor {
     private static final String TAG = AndroidNotificationMonitor.class.getSimpleName();
-    protected Notification.Builder notifBuilder;
-    protected NotificationManager mNotifyMgr;
+    protected NotificationCompat.Builder notifBuilder;
+    protected NotificationManagerCompat mNotifyMgr;
     final protected String monitorType="android notification";
     protected boolean isSilenced=false;
     protected Date timeSilenced;
@@ -79,18 +81,21 @@ public class AndroidNotificationMonitor extends AbstractMonitor {
     protected int tickCounter=0;
     protected boolean isTickCounterSyncd=false;
     protected boolean isScreenOn=true;
+    protected WearableExtender wearableExtender;
+//    protected NotificationCompat.WearableExtender wearableExtender;
 
 
-    public void setNotifBuilder(Notification.Builder notifBuilder) {
+    public void setNotifBuilder(NotificationCompat.Builder notifBuilder) {
         this.notifBuilder = notifBuilder;
     }
 
     AndroidNotificationMonitor(String name,int devID,Context contxt){
         super(name, devID, contxt, "android_notification");
-        init();
-
+        wearableExtender =
+                new WearableExtender();
 
         Uri uri=Uri.parse(sharedPref.getString(deviceIDStr+Constants.CONTACTDATAURISUFFIX,Uri.EMPTY.toString()));
+
         if (! uri.equals(Uri.EMPTY)) {
             InputStream inputStream = openDisplayPhoto(uri);
             bm = Bitmap.createScaledBitmap(BitmapFactory.decodeStream(inputStream),200,200,true);
@@ -98,19 +103,24 @@ public void setNotifBuilder(Notification.Builder notifBuilder) {
         else {
             bm = BitmapFactory.decodeResource(context.getResources(), R.drawable.icon);
         }
+        wearableExtender.setBackground(bm)
+                .setHintHideIcon(true);
+        init();
     }
 
     public void init(){
         Log.d(TAG,"Android notification monitor init called");
-        mNotifyMgr = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
+//        mNotifyMgr = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
+        mNotifyMgr = NotificationManagerCompat.from(context);
         PendingIntent contentIntent = PendingIntent.getActivity(context, 0, new Intent(context, MainActivity.class), 0);
         Bitmap bm = BitmapFactory.decodeResource(context.getResources(), R.drawable.icon);
-        this.setNotifBuilder(new Notification.Builder(context)
+        this.setNotifBuilder(new NotificationCompat.Builder(context)
                 .setContentTitle(name)
                 .setContentText("Monitor started. No data yet")
                 .setContentIntent(contentIntent)
                 .setOngoing(true)
                 .setSmallIcon(R.drawable.sandclock)
+                .extend(wearableExtender)
                 .setLargeIcon(bm));
         Notification notification = notifBuilder.build();
         mNotifyMgr.notify(deviceID, notification);
@@ -151,7 +161,7 @@ public void doProcess(DownloadObject dl) {
         }
         if (dl.getEgvArrayListRecords().size()>0)
             lastKnownGood = dl;
-        // FIXME violates the open/closed principle... have to change this class if any new devices are added. Look into DI
+        // FIXME think this violates the open/closed principle... have to change this class if any new devices are added. Look into DI
         if (dl.getDriver().equals(G4Constants.DRIVER)) {
             AbstractDownloadAnalyzer downloadAnalyzer = new G4DownloadAnalyzer(dl, context);
             analyzedDownload = downloadAnalyzer.analyze();
@@ -205,6 +215,7 @@ private Notification buildNotification(AnalyzedDownload dl){
         setActions(dl);
         setContent(dl);
         setIcon(dl);
+//        notifBuilder.extend(wearableExtender);
 
         return notifBuilder.build();
     }
@@ -355,11 +366,12 @@ public void setTicker(AnalyzedDownload dl){
     }
 
     private void setDefaults(){
-        this.notifBuilder=new Notification.Builder(context)
+        this.notifBuilder=new NotificationCompat.Builder(context)
                 .setContentTitle(name)
                 .setContentText("Default text")
                 .setContentIntent(contentIntent)
-                .setOngoing(true)
+//                .setOngoing(true)
+                .extend(wearableExtender)
                 .setSmallIcon(R.drawable.sandclock)
                 .setLargeIcon(bm);
     }
@@ -404,7 +416,7 @@ protected void setContent(AnalyzedDownload dl){
                 msg+="\n";
             msg+=message.getMessage();
         }
-        notifBuilder.setStyle(new Notification.BigTextStyle().bigText(msg))
+        notifBuilder.setStyle(new NotificationCompat.BigTextStyle().bigText(msg))
                 .setContentText(msg);
     }
 
@@ -414,24 +426,17 @@ protected void setIcon(AnalyzedDownload dl){
         int range=0;
 
         ArrayList<Conditions> conditions=dl.getConditions();
-        if (conditions.contains(Conditions.DEVICELOW) ||
-                conditions.contains(Conditions.DEVICECRITICALLOW) ||
-                conditions.contains(Conditions.UPLOADERLOW) ||
-                conditions.contains(Conditions.UPLOADERCRITICALLOW) ||
-                conditions.contains(Conditions.DOWNLOADFAILED) ||
-                conditions.contains(Conditions.DEVICEDISCONNECTED) ||
-                conditions.contains(Conditions.NODATA) ||
-                conditions.contains(Conditions.STALEDATA) ||
-                conditions.contains(Conditions.UNKNOWN) ||
-                conditions.contains(Conditions.REMOTEDISCONNECTED)){
+        if (conditions.contains(Conditions.DEVICELOW) || conditions.contains(Conditions.DEVICECRITICALLOW) ||
+                conditions.contains(Conditions.UPLOADERLOW) || conditions.contains(Conditions.UPLOADERCRITICALLOW) ||
+                conditions.contains(Conditions.DOWNLOADFAILED) || conditions.contains(Conditions.DEVICEDISCONNECTED) ||
+                conditions.contains(Conditions.NODATA) || conditions.contains(Conditions.STALEDATA) ||
+                conditions.contains(Conditions.UNKNOWN) || conditions.contains(Conditions.REMOTEDISCONNECTED)){
             state=1;
         }
-        if (conditions.contains(Conditions.CRITICALHIGH) ||
-                conditions.contains(Conditions.WARNHIGH)){
+        if (conditions.contains(Conditions.CRITICALHIGH) || conditions.contains(Conditions.WARNHIGH)){
             range=1;
         }
-        if (conditions.contains(Conditions.CRITICALLOW) ||
-                conditions.contains(Conditions.WARNLOW)){
+        if (conditions.contains(Conditions.CRITICALLOW) || conditions.contains(Conditions.WARNLOW)){
             range=2;
         }
         try {
@@ -440,7 +445,198 @@ protected void setIcon(AnalyzedDownload dl){
         } catch (NoDataException e) {
             iconLevel=60;
         }
-        notifBuilder.setSmallIcon(R.drawable.smicons, iconLevel);
+        int icon;
+        switch (iconLevel){
+            case (0):
+                icon=R.drawable.smnoneinrange;
+                break;
+            case (1):
+                icon=R.drawable.smdoubleupinrange;
+                break;
+            case (2):
+                icon=R.drawable.smnoneinrange;
+                break;
+            case (3):
+                icon=R.drawable.smfortyfiveupinrange;
+                break;
+            case (4):
+                icon=R.drawable.smflatinrange;
+                break;
+            case (5):
+                icon=R.drawable.smfortyfivedowninrange;
+                break;
+            case (6):
+                icon=R.drawable.smdowninrange;
+                break;
+            case (7):
+                icon=R.drawable.smdoubledowninrange;
+                break;
+            case (8):
+                icon=R.drawable.smnoneinrange;
+                break;
+            case (9):
+                icon=R.drawable.smnoneinrange;
+                break;
+            case (10):
+                icon=R.drawable.smnoneerrorinrange;
+                break;
+            case (11):
+                icon=R.drawable.smdoubleuperrorinrange;
+                break;
+            case (12):
+                icon=R.drawable.smuperrorinrange;
+                break;
+            case (13):
+                icon=R.drawable.smfortyfiveuperrorinrange;
+                break;
+            case (14):
+                icon=R.drawable.smflaterrorinrange;
+                break;
+            case (15):
+                icon=R.drawable.smfortyfivedownerrorinrange;
+                break;
+            case (16):
+                icon=R.drawable.smdownerrorinrange;
+                break;
+            case (17):
+                icon=R.drawable.smdoubledownerrorinrange;
+                break;
+            case (18):
+                icon=R.drawable.smnoneerrorinrange;
+                break;
+            case (19):
+                icon=R.drawable.smnoneerrorinrange;
+                break;
+            case (20):
+                icon=R.drawable.smnonehigh;
+                break;
+            case (21):
+                icon=R.drawable.smdoubleuphigh;
+                break;
+            case (22):
+                icon=R.drawable.smuphigh;
+                break;
+            case (23):
+                icon=R.drawable.smfortyfiveuphigh;
+                break;
+            case (24):
+                icon=R.drawable.smflathigh;
+                break;
+            case (25):
+                icon=R.drawable.smfortyfivedownhigh;
+                break;
+            case (26):
+                icon=R.drawable.smdownhigh;
+                break;
+            case (27):
+                icon=R.drawable.smdoubledownhigh;
+                break;
+            case (28):
+                icon=R.drawable.smnonehigh;
+                break;
+            case (29):
+                icon=R.drawable.smnonehigh;
+                break;
+            case (30):
+                icon=R.drawable.smnoneerrorhigh;
+                break;
+            case (31):
+                icon=R.drawable.smdoubleuperrorhigh;
+                break;
+            case (32):
+                icon=R.drawable.smuperrorhigh;
+                break;
+            case (33):
+                icon=R.drawable.smfortyfiveuperrorhigh;
+                break;
+            case (34):
+                icon=R.drawable.smflaterrorhigh;
+                break;
+            case (35):
+                icon=R.drawable.smfortyfivedownerrorhigh;
+                break;
+            case (36):
+                icon=R.drawable.smdownerrorhigh;
+                break;
+            case (37):
+                icon=R.drawable.smdoubledownerrorhigh;
+                break;
+            case (38):
+                icon=R.drawable.smnoneerrorhigh;
+                break;
+            case (39):
+                icon=R.drawable.smnoneerrorhigh;
+                break;
+            case (40):
+                icon=R.drawable.smnonelow;
+                break;
+            case (41):
+                icon=R.drawable.smdoubleuplow;
+                break;
+            case (42):
+                icon=R.drawable.smuplow;
+                break;
+            case (43):
+                icon=R.drawable.smfortyfiveuplow;
+                break;
+            case (44):
+                icon=R.drawable.smflatlow;
+                break;
+            case (45):
+                icon=R.drawable.smfortyfivedownlow;
+                break;
+            case (46):
+                icon=R.drawable.smdownlow;
+                break;
+            case (47):
+                icon=R.drawable.smdoubledownlow;
+                break;
+            case (48):
+                icon=R.drawable.smnonelow;
+                break;
+            case (49):
+                icon=R.drawable.smnonelow;
+                break;
+            case (50):
+                icon=R.drawable.smnoneerrorlow;
+                break;
+            case (51):
+                icon=R.drawable.smdoubleuperrorlow;
+                break;
+            case (52):
+                icon=R.drawable.smuperrorlow;
+                break;
+            case (53):
+                icon=R.drawable.smfortyfiveuperrorlow;
+                break;
+            case (54):
+                icon=R.drawable.smflaterrorlow;
+                break;
+            case (55):
+                icon=R.drawable.smfortyfivedownerrorlow;
+                break;
+            case (56):
+                icon=R.drawable.smdownerrorlow;
+                break;
+            case (57):
+                icon=R.drawable.smdoubledownerrorlow;
+                break;
+            case (58):
+                icon=R.drawable.smnoneerrorlow;
+                break;
+            case (59):
+                icon=R.drawable.smnoneerrorlow;
+                break;
+            default:
+                icon=R.drawable.questionmarkicon;
+                break;
+        }
+        wearableExtender.setBackground(bm)
+                .setContentIcon(icon)
+                .setHintHideIcon(true);
+        notifBuilder.extend(wearableExtender);
+        notifBuilder.setSmallIcon(icon);
+//        notifBuilder.setSmallIcon(R.drawable.smicons, iconLevel);
     }
 
     @Override
diff --git a/mobile/src/main/java/com/ktind/cgm/bgscout/CGMDownloadAnalyzer.java b/mobile/src/main/java/com/ktind/cgm/bgscout/CGMDownloadAnalyzer.java
index 01e72c3..062f0df 100644
--- a/mobile/src/main/java/com/ktind/cgm/bgscout/CGMDownloadAnalyzer.java
+++ b/mobile/src/main/java/com/ktind/cgm/bgscout/CGMDownloadAnalyzer.java
@@ -74,11 +74,18 @@ public AnalyzedDownload analyze() {
         checkCGMBattery();
         checkThresholdholds();
         checkLastRecordTime();
+        checkGlobalAlerts();
         correlateMessages();
 //        downloadObject.deDup();
         return this.downloadObject;
     }
 
+    protected void checkGlobalAlerts(){
+        for (AlertMessage alertMessage:StaticAlertMessages.getAlertMessages()){
+            downloadObject.addMessage(alertMessage);
+        }
+    }
+
     protected void checkUploaderBattery(){
         // FIXME this breaks i18n possibilties
         String verb=(downloadObject.getConditions().contains(Conditions.STALEDATA))?"was":"is";
diff --git a/mobile/src/main/java/com/ktind/cgm/bgscout/Conditions.java b/mobile/src/main/java/com/ktind/cgm/bgscout/Conditions.java
index 975777c..dbba46e 100644
--- a/mobile/src/main/java/com/ktind/cgm/bgscout/Conditions.java
+++ b/mobile/src/main/java/com/ktind/cgm/bgscout/Conditions.java
@@ -49,5 +49,6 @@ public enum Conditions {
     REMOTEDISCONNECTED,
     MISSEDREADING,
     SPECIALVALUE,
-    READINGTIME
+    READINGTIME,
+    MONGONOTCONNECTED
 }
diff --git a/mobile/src/main/java/com/ktind/cgm/bgscout/DeviceActivity.java b/mobile/src/main/java/com/ktind/cgm/bgscout/DeviceActivity.java
deleted file mode 100644
index 7280cdd..0000000
--- a/mobile/src/main/java/com/ktind/cgm/bgscout/DeviceActivity.java
+++ /dev/null
@@ -1,685 +0,0 @@
-package com.ktind.cgm.bgscout;
-
-import android.annotation.TargetApi;
-import android.app.Activity;
-import android.app.Fragment;
-import android.app.FragmentManager;
-import android.content.BroadcastReceiver;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.content.ServiceConnection;
-import android.content.SharedPreferences;
-import android.content.res.Configuration;
-import android.content.res.Resources;
-import android.graphics.Color;
-import android.os.Build;
-import android.os.Bundle;
-import android.os.IBinder;
-import android.preference.PreferenceManager;
-import android.support.v13.app.FragmentPagerAdapter;
-import android.support.v4.app.ActionBarDrawerToggle;
-import android.support.v4.view.ViewPager;
-import android.support.v4.widget.DrawerLayout;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
-import android.widget.ImageView;
-import android.widget.ListView;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import com.ktind.cgm.bgscout.model.Battery;
-import com.ktind.cgm.bgscout.model.DownloadDataSource;
-import com.ktind.cgm.bgscout.model.EGV;
-
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Locale;
-
-
-public class DeviceActivity extends Activity {
-    private static final String TAG = DeviceActivity.class.getSimpleName();
-    private DrawerLayout mDrawerLayout;
-    private ListView mDrawerList;
-    private String[] mDrawerMenuItems;
-    private ActionBarDrawerToggle mDrawerToggle;
-    private int numItemsInMenu;
-    private boolean mBounded=false;
-    private DeviceDownloadService mServer;
-    private UIReceiver uiReceiver;
-    // FIXME might need to make this hashmap otherwise we won't be able retrieve the lastdown for the different devices - it would only be a single lastDownload
-    static private DownloadObject ld;
-    static private HashMap<String,UIDevice> ui=new HashMap<String, UIDevice>();
-
-
-    /**
-     * The {@link android.support.v4.view.PagerAdapter} that will provide
-     * fragments for each of the sections. We use a
-     * {@link FragmentPagerAdapter} derivative, which will keep every
-     * loaded fragment in memory. If this becomes too memory intensive, it
-     * may be best to switch to a
-     * {@link android.support.v13.app.FragmentStatePagerAdapter}.
-     */
-    SectionsPagerAdapter mSectionsPagerAdapter;
-
-    /**
-     * The {@link ViewPager} that will host the section contents.
-     */
-    ViewPager mViewPager;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_device);
-        mDrawerLayout= (DrawerLayout) findViewById(R.id.drawer_layout2);
-        mDrawerList=(ListView) findViewById(R.id.left_drawer2);
-        SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
-//        String[] devices={"device_1","device_2","device_3","device_4"};
-        ArrayList<String> mDrawerMenuItemsArrList=new ArrayList<String>();
-        for (String device:Constants.DEVICES) {
-            if (sharedPref.getBoolean(device+"_enable",false)){
-                Log.d(TAG,device+" is enabled");
-                mDrawerMenuItemsArrList.add(sharedPref.getString(device+"_name",device));
-            }
-        }
-        mDrawerMenuItemsArrList.add("Start");
-        mDrawerMenuItemsArrList.add("Stop");
-        mDrawerMenuItemsArrList.add("Dump stats to log");
-        mDrawerMenuItemsArrList.add("Settings");
-        mDrawerMenuItemsArrList.add("Dump EGV");
-        numItemsInMenu=mDrawerMenuItemsArrList.size();
-
-        mDrawerMenuItems=mDrawerMenuItemsArrList.toArray(new String[mDrawerMenuItemsArrList.size()]);
-        mDrawerList.setAdapter(new ArrayAdapter<String>(this,R.layout.drawer_list_item,mDrawerMenuItems));
-        mDrawerList.setOnItemClickListener(new DrawerItemClickListener());
-
-        getActionBar().setDisplayHomeAsUpEnabled(true);
-        getActionBar().setHomeButtonEnabled(true);
-
-        mDrawerToggle = new ActionBarDrawerToggle(
-                this,                  /* host Activity */
-                mDrawerLayout,         /* DrawerLayout object */
-                R.drawable.ic_drawer,  /* nav drawer icon to replace 'Up' caret */
-                R.string.drawer_open,  /* "open drawer" description */
-                R.string.drawer_close  /* "close drawer" description */
-        ) {
-
-            public void onDrawerClosed(View view) {
-                super.onDrawerClosed(view);
-                invalidateOptionsMenu();
-            }
-
-            public void onDrawerOpened(View drawerView) {
-                super.onDrawerOpened(drawerView);
-                invalidateOptionsMenu();
-            }
-        };
-        mDrawerLayout.setDrawerListener(mDrawerToggle);
-
-        mSectionsPagerAdapter = new SectionsPagerAdapter(getFragmentManager());
-
-
-        // Set up the ViewPager with the sections adapter.
-        mViewPager = (ViewPager) findViewById(R.id.pager);
-        mViewPager.setAdapter(mSectionsPagerAdapter);
-        mViewPager.setPageTransformer(true, new ZoomOutPageTransformer());
-
-        uiReceiver=new UIReceiver();
-        IntentFilter intentFilter=new IntentFilter(Constants.UI_UPDATE);
-        getApplicationContext().registerReceiver(uiReceiver,intentFilter);
-        if (savedInstanceState!=null){
-            ld=savedInstanceState.getParcelable("lastDownload");
-            if (ld==null){
-                Log.d(TAG,"Its null...");
-            } else {
-                if (ui.containsKey(ld.getDeviceID())){
-                    ui.get(ld.getDeviceID()).update(ld);
-                } else {
-//                    Log.w("XXX","UI does not contain "+ld.getDeviceID());
-                }
-            }
-//            UIDeviceList.get(0).update((DownloadObject) savedInstanceState.getSerializable("lastDownload"));
-        } else {
-//            Log.w("XXX", "Saved instance does not contain anything");
-        }
-
-    }
-
-    private class DrawerItemClickListener implements ListView.OnItemClickListener {
-        @Override
-        public void onItemClick(AdapterView parent, View view, int position, long id) {
-            selectItem(position);
-            mDrawerLayout.closeDrawers();
-        }
-    }
-
-    public void buildUI(){
-        // Build the UI objects
-//        Log.d("XXX","Number of fragments here: "+PlaceholderFragment.fragments.size());
-        for (String key:PlaceholderFragment.fragments.keySet()) {
-            TextView egvValue = (TextView) PlaceholderFragment.fragments.get(key).getView().findViewById(R.id.reading_text);
-            TextView uploaderBatteryLabel = (TextView) PlaceholderFragment.fragments.get(key).getView().findViewById(R.id.uploader_battery_label);
-            TextView deviceBatteryLabel = (TextView) PlaceholderFragment.fragments.get(key).getView().findViewById(R.id.device_battery_label);
-            TextView name = (TextView) PlaceholderFragment.fragments.get(key).getView().findViewById(R.id.app_name);
-            ImageView main = (ImageView) PlaceholderFragment.fragments.get(key).getView().findViewById(R.id.main_display);
-            ImageView direction = (ImageView) PlaceholderFragment.fragments.get(key).getView().findViewById(R.id.direction_image);
-            ImageView uploaderBat = (ImageView) PlaceholderFragment.fragments.get(key).getView().findViewById(R.id.uploader_battery_indicator);
-            ImageView deviceBat = (ImageView) PlaceholderFragment.fragments.get(key).getView().findViewById(R.id.device_battery_indicator);
-            UIDevice uid=new UIDevice(main,direction,egvValue,name,uploaderBat,uploaderBatteryLabel,deviceBat,deviceBatteryLabel);
-//            Log.d("XXX", "Adding "+key+" to ui elements map");
-            ui.put(key, uid);
-        }
-
-    }
-
-    // FIXME breaks the rules - order here is must match the order the items were put into the string array(list)
-    private void selectItem(int position){
-        Log.d(TAG,"Position: "+position+ " number of items in menu: "+numItemsInMenu);
-        if (position==(numItemsInMenu-2)) {
-            Log.d(TAG,"Starting settings");
-            Intent intent = new Intent(this, SettingsActivity.class);
-            startActivity(intent);
-        }
-        if (position==(numItemsInMenu-3)) {
-            Log.d(TAG,"Dumping stats");
-            BGScout.statsMgr.logStats();
-        }
-        if (position==(numItemsInMenu-4)) {
-            Log.d(TAG,"Stopping service");
-            Intent intent=new Intent(Constants.STOP_DOWNLOAD_SVC);
-            getApplicationContext().sendBroadcast(intent);
-//            Intent mIntent = new Intent(MainActivity.this, DeviceDownloadService.class);
-//            bindSvc();
-//            stopService(mIntent);
-        }
-        if (position==(numItemsInMenu-5)) {
-            Log.d(TAG,"Starting service");
-            Intent mIntent = new Intent(DeviceActivity.this, DeviceDownloadService.class);
-            startService(mIntent);
-            bindSvc();
-            buildUI();
-        }
-        if (position==(numItemsInMenu-1)) {
-            DownloadDataSource downloadDataSource=new DownloadDataSource(this);
-            try {
-                downloadDataSource.open();
-                for (EGV egv:downloadDataSource.getEGVHistory("device_1"))
-                    Log.d(TAG,"Date: "+new Date(egv.getEpoch())+" EGV: "+egv.getEgv()+" Trend: "+Trend.values()[egv.getTrend()].toString()+" Unit: "+GlucoseUnit.values()[egv.getUnit()]);
-                for (Battery battery:downloadDataSource.getBatteryHistory("device_1"))
-                    Log.d(TAG,"Date: "+new Date(battery.getEpoch())+" Battery Level:"+battery.getBatterylevel()+" Device: "+downloadDataSource.getDevice(battery.getDeviceid()).getName()+" Role: "+downloadDataSource.getRole(battery.getRoleid()).getRole());
-                downloadDataSource.close();
-            } catch (SQLException e) {
-                Log.e(TAG,"Caught exception: ",e);
-            }
-
-            Intent mIntent = new Intent(DeviceActivity.this, DeviceDownloadService.class);
-            startService(mIntent);
-            bindSvc();
-        }
-    }
-
-    public void bindSvc(){
-        Intent mIntent = new Intent(DeviceActivity.this, DeviceDownloadService.class);
-        bindService(mIntent, mConnection, BIND_AUTO_CREATE);
-    }
-
-    ServiceConnection mConnection = new ServiceConnection() {
-
-        public void onServiceDisconnected(ComponentName name) {
-            Toast.makeText(DeviceActivity.this, "Service is disconnected", Toast.LENGTH_LONG).show();
-            mBounded = false;
-            mServer = null;
-        }
-
-        public void onServiceConnected(ComponentName name, IBinder service) {
-            Toast.makeText(DeviceActivity.this, "Service is connected", Toast.LENGTH_LONG).show();
-            mBounded = true;
-            DeviceDownloadService.LocalBinder mLocalBinder = (DeviceDownloadService.LocalBinder)service;
-            mServer = mLocalBinder.getServerInstance();
-        }
-    };
-
-
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        // Inflate the menu; this adds items to the action bar if it is present.
-        getMenuInflater().inflate(R.menu.device, menu);
-        return true;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        // Handle action bar item clicks here. The action bar will
-        // automatically handle clicks on the Home/Up button, so long
-        // as you specify a parent activity in AndroidManifest.xml.
-        if (mDrawerToggle.onOptionsItemSelected(item)) {
-            return true;
-        }
-
-        int id = item.getItemId();
-        if (id == R.id.action_settings) {
-            Intent intent = new Intent(this, SettingsActivity.class);
-            startActivity(intent);
-            return true;
-        }
-        return super.onOptionsItemSelected(item);
-    }
-
-    
-
-    /**
-     * A {@link FragmentPagerAdapter} that returns a fragment corresponding to
-     * one of the sections/tabs/pages.
-     */
-    public class SectionsPagerAdapter extends FragmentPagerAdapter {
-
-        public SectionsPagerAdapter(FragmentManager fm) {
-            super(fm);
-        }
-
-        @Override
-        public Fragment getItem(int position) {
-            // getItem is called to instantiate the fragment for the given page.
-            // Return a PlaceholderFragment (defined as a static inner class below).
-            int devNum=position+1;
-            String devID="device_"+devNum;
-            Log.d("Main","adding "+devID);
-            return PlaceholderFragment.newInstance(position + 1,devID);
-        }
-
-        @Override
-        public int getCount() {
-            // Show 3 total pages.
-//            Log.d("main","getCount called");
-//            return numItemsInMenu-5;
-            return 3;
-        }
-
-        @Override
-        public CharSequence getPageTitle(int position) {
-            Locale l = Locale.getDefault();
-            switch (position) {
-                case 0:
-                    return getString(R.string.title_section1).toUpperCase(l);
-                case 1:
-                    return getString(R.string.title_section2).toUpperCase(l);
-                case 2:
-                    return getString(R.string.title_section3).toUpperCase(l);
-            }
-            return null;
-        }
-    }
-
-    /**
-     * A placeholder fragment containing a simple view.
-     */
-    public static class PlaceholderFragment extends Fragment {
-        /**
-         * The fragment argument representing the section number for this
-         * fragment.
-         */
-        private static final String ARG_SECTION_NUMBER = "section_number";
-//        static public ArrayList <PlaceholderFragment> fragments= new ArrayList<PlaceholderFragment>();
-        static public HashMap<String,PlaceholderFragment> fragments=new HashMap<String, PlaceholderFragment>();
-
-        /**
-         * Returns a new instance of this fragment for the given section
-         * number.
-         */
-        public static PlaceholderFragment newInstance(int sectionNumber,String deviceID) {
-            PlaceholderFragment fragment = new PlaceholderFragment();
-            Bundle args = new Bundle();
-            args.putInt(ARG_SECTION_NUMBER, sectionNumber);
-            fragment.setArguments(args);
-
-
-            fragments.put(deviceID,fragment);
-//            fragments.add(fragment);
-            return fragment;
-        }
-
-        public PlaceholderFragment() {
-        }
-
-        public void updateView(DownloadObject dl){
-            TextView egvValue=(TextView) this.getView().findViewById(R.id.reading_text);
-            TextView uploaderBattery=(TextView) this.getView().findViewById(R.id.uploader_battery_label);
-            TextView deviceBattery=(TextView) this.getView().findViewById(R.id.device_battery_label);
-            TextView name=(TextView) this.getView().findViewById(R.id.app_name);
-
-            try {
-                egvValue.setText(String.valueOf(dl.getLastReading()));
-                uploaderBattery.setText(String.valueOf(dl.getUploaderBattery()));
-                deviceBattery.setText(String.valueOf(dl.getDeviceBattery()));
-                name.setText(dl.getDeviceName());
-            } catch (NoDataException e) {
-                e.printStackTrace();
-            }
-        }
-
-        @Override
-        public void onDestroyView() {
-//            Log.d("XXX","onDestoryView called");
-            super.onDestroyView();
-        }
-
-        @Override
-        public void onDestroy() {
-//            Log.d("XXX","onDestory called");
-            super.onDestroy();
-        }
-
-        @Override
-        public void onSaveInstanceState(Bundle outState) {
-            Log.d("XXX","saving instance state");
-            outState.putParcelable("lastDownload", ld);
-            super.onSaveInstanceState(outState);
-        }
-
-        @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1)
-        @Override
-        public void onViewStateRestored(Bundle savedInstanceState) {
-            super.onViewStateRestored(savedInstanceState);
-        }
-
-        @Override
-        public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                Bundle savedInstanceState) {
-//            Log.d("XXX","onCreateView called");
-            if (savedInstanceState!=null){
-                ld=savedInstanceState.getParcelable("lastDownload");
-                if (ld==null){
-                    Log.d(TAG,"Its null...");
-                } else {
-                    if (ui.containsKey(ld.getDeviceID())){
-                        ui.get(ld.getDeviceID()).update(ld);
-                    } else {
-//                        Log.w("XXX","UI does not contain "+ld.getDeviceID());
-                    }
-                }
-//            UIDeviceList.get(0).update((DownloadObject) savedInstanceState.getSerializable("lastDownload"));
-            } else {
-//                Log.w("XXX", "Saved instance does not contain anything");
-            }
-            View rootView = inflater.inflate(R.layout.fragment_device, container, false);
-            return rootView;
-        }
-    }
-
-    @Override
-    protected void onPostCreate(Bundle savedInstanceState) {
-        super.onPostCreate(savedInstanceState);
-        // Sync the toggle state after onRestoreInstanceState has occurred.
-        mDrawerToggle.syncState();
-    }
-
-    @Override
-    public void onConfigurationChanged(Configuration newConfig) {
-        super.onConfigurationChanged(newConfig);
-        mDrawerToggle.onConfigurationChanged(newConfig);
-    }
-
-    @Override
-    public boolean onPrepareOptionsMenu(Menu menu) {
-        // If the nav drawer is open, hide action items related to the content view
-        boolean drawerOpen = mDrawerLayout.isDrawerOpen(mDrawerList);
-//        menu.findItem(R.id.action_websearch).setVisible(!drawerOpen);
-        return super.onPrepareOptionsMenu(menu);
-    }
-
-    public class DepthPageTransformer implements ViewPager.PageTransformer {
-        private static final float MIN_SCALE = 0.75f;
-
-        public void transformPage(View view, float position) {
-            int pageWidth = view.getWidth();
-
-            if (position < -1) { // [-Infinity,-1)
-                // This page is way off-screen to the left.
-                view.setAlpha(0);
-
-            } else if (position <= 0) { // [-1,0]
-                // Use the default slide transition when moving to the left page
-                view.setAlpha(1);
-                view.setTranslationX(0);
-                view.setScaleX(1);
-                view.setScaleY(1);
-
-            } else if (position <= 1) { // (0,1]
-                // Fade the page out.
-                view.setAlpha(1 - position);
-
-                // Counteract the default slide transition
-                view.setTranslationX(pageWidth * -position);
-
-                // Scale the page down (between MIN_SCALE and 1)
-                float scaleFactor = MIN_SCALE
-                        + (1 - MIN_SCALE) * (1 - Math.abs(position));
-                view.setScaleX(scaleFactor);
-                view.setScaleY(scaleFactor);
-
-            } else { // (1,+Infinity]
-                // This page is way off-screen to the right.
-                view.setAlpha(0);
-            }
-        }
-    }
-
-    public class ZoomOutPageTransformer implements ViewPager.PageTransformer {
-        private static final float MIN_SCALE = 0.85f;
-        private static final float MIN_ALPHA = 0.5f;
-
-        public void transformPage(View view, float position) {
-            int pageWidth = view.getWidth();
-            int pageHeight = view.getHeight();
-
-            if (position < -1) { // [-Infinity,-1)
-                // This page is way off-screen to the left.
-                view.setAlpha(0);
-
-            } else if (position <= 1) { // [-1,1]
-                // Modify the default slide transition to shrink the page as well
-                float scaleFactor = Math.max(MIN_SCALE, 1 - Math.abs(position));
-                float vertMargin = pageHeight * (1 - scaleFactor) / 2;
-                float horzMargin = pageWidth * (1 - scaleFactor) / 2;
-                if (position < 0) {
-                    view.setTranslationX(horzMargin - vertMargin / 2);
-                } else {
-                    view.setTranslationX(-horzMargin + vertMargin / 2);
-                }
-
-                // Scale the page down (between MIN_SCALE and 1)
-                view.setScaleX(scaleFactor);
-                view.setScaleY(scaleFactor);
-
-                // Fade the page relative to its size.
-                view.setAlpha(MIN_ALPHA +
-                        (scaleFactor - MIN_SCALE) /
-                                (1 - MIN_SCALE) * (1 - MIN_ALPHA));
-
-            } else { // (1,+Infinity]
-                // This page is way off-screen to the right.
-                view.setAlpha(0);
-            }
-        }
-    }
-
-    protected class UIDevice{
-        protected TextView name;
-        protected ImageView main_display;
-        protected ImageView direction;
-        protected TextView bg;
-        protected DownloadObject lastDownload;
-        protected ImageView uploaderBattery;
-        protected TextView uploaderBatteryLabel;
-        protected ImageView deviceBattery;
-        protected TextView deviceBatteryLabel;
-        int mainBGColor;
-        int currentBGColor;
-
-        public UIDevice(ImageView main, ImageView dir, TextView reading, TextView n, ImageView ubat, TextView ubatl, ImageView dbat, TextView dbatl){
-            setMain_display(main);
-//            main_display.setBackgroundColor(mainBGColor);
-            setDirection(dir);
-            setBg(reading);
-            setName(n);
-            setUploaderBattery(ubat);
-            setDeviceBattery(dbat);
-            setUploaderBatteryLabel(ubatl);
-            setDeviceBatteryLabel(dbatl);
-            deviceBattery.setImageResource(R.drawable.battery);
-            uploaderBattery.setImageResource(R.drawable.battery);
-        }
-
-        public TextView getUploaderBatteryLabel() {
-            return uploaderBatteryLabel;
-        }
-
-        public void setUploaderBatteryLabel(TextView uploaderBatteryLabel) {
-            this.uploaderBatteryLabel = uploaderBatteryLabel;
-        }
-
-        public TextView getDeviceBatteryLabel() {
-            return deviceBatteryLabel;
-        }
-
-        public void setDeviceBatteryLabel(TextView deviceBatteryLabel) {
-            this.deviceBatteryLabel = deviceBatteryLabel;
-        }
-
-        public ImageView getUploaderBattery() {
-            return uploaderBattery;
-        }
-
-        public void setUploaderBattery(ImageView uploaderBattery) {
-            this.uploaderBattery = uploaderBattery;
-        }
-
-        public ImageView getDeviceBattery() {
-            return deviceBattery;
-        }
-
-        public void setDeviceBattery(ImageView deviceBattery) {
-            this.deviceBattery = deviceBattery;
-        }
-
-        public void update(DownloadObject dl){
-            lastDownload=dl;
-            name.setText(dl.getDeviceName());
-            direction.setImageResource(R.drawable.trendarrows);
-
-            try {
-                direction.setImageLevel(dl.getLastTrend().getVal());
-                int r=dl.getLastReading();
-                SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
-                Resources res=getApplicationContext().getResources();
-                int lowThreshold=Integer.valueOf(sharedPref.getString(dl.getDeviceID() + "_low_threshold", String.valueOf(res.getInteger(R.integer.pref_default_device_low))));
-                int highThreshold=Integer.valueOf(sharedPref.getString(dl.getDeviceID() + "_high_threshold", String.valueOf(res.getInteger(R.integer.pref_default_device_high))));
-
-//                int newColor=Color.WHITE;
-                if (r>highThreshold) {
-                    currentBGColor= Color.rgb(255, 199, 0);
-                }else if (r<lowThreshold){
-                    currentBGColor=Color.RED;
-                } else {
-                    currentBGColor=Color.rgb(0,170,0);
-                }
-                mainBGColor=currentBGColor;
-                main_display.setBackgroundColor(mainBGColor);
-                bg.setText(String.valueOf(r));
-
-                int dbat=dl.getDeviceBattery();
-                deviceBatteryLabel.setText(String.valueOf(dbat));
-
-                deviceBattery.setImageLevel(dbat);
-
-                float ubat=dl.getUploaderBattery();
-                uploaderBatteryLabel.setText(String.valueOf((int) ubat));
-                uploaderBattery.setImageLevel((int) ubat);
-
-
-            } catch (NoDataException e) {
-                Log.d(TAG,"No data in previous download",e);
-            }
-        }
-
-        public TextView getName() {
-            return name;
-        }
-
-        public void setName(TextView name) {
-            this.name = name;
-        }
-
-        public ImageView getMain_display() {
-            return main_display;
-        }
-
-        public void setMain_display(ImageView main_display) {
-            this.main_display = main_display;
-        }
-
-        public ImageView getDirection() {
-            return direction;
-        }
-
-        public void setDirection(ImageView direction) {
-            this.direction = direction;
-        }
-
-        public TextView getBg() {
-            return bg;
-        }
-
-        public void setBg(TextView bg) {
-            this.bg = bg;
-        }
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        if (mBounded)
-            unbindService(mConnection);
-        if (uiReceiver!=null)
-            getApplicationContext().unregisterReceiver(uiReceiver);
-    }
-
-    public class UIReceiver extends BroadcastReceiver {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            if (intent.getAction().equals(Constants.UI_UPDATE)){
-                Log.d(TAG,"Received a UI update");
-                DownloadObject downloadObject=new DownloadObject();
-                downloadObject=intent.getParcelableExtra("download");
-                String bgReading= null;
-                bgReading = String.valueOf(downloadObject.getLastReadingString());
-                float uploaderBat=downloadObject.getUploaderBattery();
-                int devBattery=downloadObject.getDeviceBattery();
-                String devID=downloadObject.getDeviceID();
-                Log.i(TAG,"Uploader battery: "+uploaderBat);
-                Log.i(TAG,"Device battery: "+devBattery);
-                Log.i(TAG,"deviceID: "+devID);
-                Log.i(TAG,"Reading: "+bgReading);
-                Log.i(TAG,"Name: "+downloadObject.getDeviceName());
-                ui.get(devID).update(downloadObject);
-                ld=downloadObject;
-            }
-        }
-    }
-
-    @Override
-    public void onSaveInstanceState(Bundle savedInstanceState) {
-        savedInstanceState.putParcelable("lastDownload", ld);
-        super.onSaveInstanceState(savedInstanceState);
-    }
-}
diff --git a/mobile/src/main/java/com/ktind/cgm/bgscout/DeviceDownloadService.java b/mobile/src/main/java/com/ktind/cgm/bgscout/DeviceDownloadService.java
index fd8c518..83e7a16 100644
--- a/mobile/src/main/java/com/ktind/cgm/bgscout/DeviceDownloadService.java
+++ b/mobile/src/main/java/com/ktind/cgm/bgscout/DeviceDownloadService.java
@@ -13,6 +13,8 @@
 import android.os.Binder;
 import android.os.IBinder;
 import android.preference.PreferenceManager;
+import android.support.v4.app.NotificationCompat;
+import android.support.v4.app.NotificationCompat.WearableExtender;
 import android.util.Log;
 
 import java.util.ArrayList;
@@ -45,7 +47,7 @@
 public class DeviceDownloadService extends Service {
     private static final String TAG = DeviceDownloadService.class.getSimpleName();
     private ArrayList<AbstractDevice> cgms=new ArrayList<AbstractDevice>();
-    private Notification.Builder notificationBuilder;
+    private NotificationCompat.Builder notificationBuilder;
     IBinder mBinder=new LocalBinder();
     private commandReceiver cr;
     private ServiceState state=ServiceState.STOPPED;
@@ -54,12 +56,6 @@ public class DeviceDownloadService extends Service {
     @Override
     public void onCreate() {
         super.onCreate();
-
-        // autostart
-//        Intent mIntent = new Intent(DeviceDownloadService.this, DeviceDownloadService.class);
-//        startService(mIntent);
-//        Intent uiIntent = new Intent("com.ktind.cgm.SERVICE_READY");
-//        sendBroadcast(uiIntent);
     }
 
     public AbstractDevice findDevice(String deviceID){
@@ -144,17 +140,20 @@ public int onStartCommand(Intent intent, int flags, int startId) {
             cr=new commandReceiver();
             IntentFilter intentFilter=new IntentFilter(Constants.STOP_DOWNLOAD_SVC);
             registerReceiver(cr,intentFilter);
-            notificationBuilder = new Notification.Builder(getApplicationContext())
+            WearableExtender wearableExtender =
+                    new WearableExtender();
+            notificationBuilder = new NotificationCompat.Builder(getApplicationContext())
                     .setContentTitle(getText(R.string.cgm_service_title))
                     .setContentIntent(contentIntent)
                     .setSmallIcon(R.drawable.sandclock)
+                    .extend(wearableExtender)
                     .setLargeIcon(bm);
             Notification notification = notificationBuilder.build();
             threads=new ArrayList<Thread>();
             for (final AbstractDevice cgm : cgms) {
                 cgm.start();
             }
-            startForeground(0, notification);
+            startForeground(24, notification);
             super.onStartCommand(intent, flags, startId);
             state = ServiceState.STARTED;
         }
diff --git a/mobile/src/main/java/com/ktind/cgm/bgscout/DexcomG4/G4.java b/mobile/src/main/java/com/ktind/cgm/bgscout/DexcomG4/G4.java
index 5a02ca8..fa015da 100644
--- a/mobile/src/main/java/com/ktind/cgm/bgscout/DexcomG4/G4.java
+++ b/mobile/src/main/java/com/ktind/cgm/bgscout/DexcomG4/G4.java
@@ -171,8 +171,10 @@ public G4Partition getDBPageRange(G4RecType recordType) throws DeviceIOException
         G4Partition response=new G4Partition();
         writeCmd(G4RcvrCmd.READDATABASEPAGERANGE,recordType.getValue());
         byte[] responseBuff = readResponse();
-        if (responseBuff==null || responseBuff.length!=8)
-            throw new DeviceIOException("Problem reading response while trying to read record type "+recordType.toString());
+        if (responseBuff==null)
+            throw new DeviceIOException("Null response while trying to read record type: "+recordType.toString());
+        if ( responseBuff.length!=8)
+            throw new DeviceIOException("Problem reading response while trying to read record type "+recordType.toString()+" response size="+responseBuff.length+" response: "+String.valueOf(responseBuff));
         byte[] firstPage = {responseBuff[0],responseBuff[1],responseBuff[2],responseBuff[3]};
         byte[] lastPage = {responseBuff[4],responseBuff[5],responseBuff[6],responseBuff[7]};
         response.Partition=recordType;
diff --git a/mobile/src/main/java/com/ktind/cgm/bgscout/MainActivity.java b/mobile/src/main/java/com/ktind/cgm/bgscout/MainActivity.java
index bb6a442..085921d 100644
--- a/mobile/src/main/java/com/ktind/cgm/bgscout/MainActivity.java
+++ b/mobile/src/main/java/com/ktind/cgm/bgscout/MainActivity.java
@@ -647,6 +647,7 @@ private Bitmap getThumbnailByPhoneDataUri(Uri phoneDataUri){
                 thumbnail= BitmapFactory.decodeByteArray(thumbnailBytes,0,thumbnailBytes.length);
             }
         }
+        cursor.close();
 //        InputStream photoDataStream = ContactsContract.Contacts.openContactPhotoInputStream(getContentResolver(),uri);
 //        Bitmap photo=BitmapFactory.decodeStream(photoDataStream);
         return thumbnail;
diff --git a/mobile/src/main/java/com/ktind/cgm/bgscout/MongoUploadMonitor.java b/mobile/src/main/java/com/ktind/cgm/bgscout/MongoUploadMonitor.java
index 8ff67dd..f54d32c 100644
--- a/mobile/src/main/java/com/ktind/cgm/bgscout/MongoUploadMonitor.java
+++ b/mobile/src/main/java/com/ktind/cgm/bgscout/MongoUploadMonitor.java
@@ -12,6 +12,8 @@
 import com.mongodb.MongoTimeoutException;
 import com.mongodb.WriteConcern;
 
+import org.acra.ACRA;
+
 import java.net.UnknownHostException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -44,13 +46,16 @@
  */
 public class MongoUploadMonitor extends AbstractMonitor {
     private static final String TAG = MongoUploadMonitor.class.getSimpleName();
-//    Context context;
+    final private AlertMessage URINOTSET=new AlertMessage(AlertLevels.CRITICAL, "Mongo URI not set", Conditions.MONGONOTCONNECTED);
+    final private AlertMessage BADURI=new AlertMessage(AlertLevels.CRITICAL,"Check mongo URI",Conditions.MONGONOTCONNECTED);
+    final private AlertMessage BADHOSTNAME=new AlertMessage(AlertLevels.CRITICAL,"Unable to resolve Mongo URI hostname",Conditions.MONGONOTCONNECTED);
+    final private AlertMessage MONGOTIMEOUT=new AlertMessage(AlertLevels.CRITICAL,"Timeout occurred while trying to upload to MongoDB",Conditions.MONGONOTCONNECTED);
+    final private AlertMessage UNHANDLEDEXCEPTION=new AlertMessage(AlertLevels.CRITICAL, "Unhandled mongo exception. Exception reported", Conditions.MONGONOTCONNECTED);
 
 
     MongoUploadMonitor(String name,int devID,Context c) {
         super(name,devID,c,"mongo_uploader");
         this.setAllowVirtual(false);
-//        this.setMonitorType("mongo uploader");
     }
 
     @Override
@@ -65,16 +70,19 @@ protected void doProcess(DownloadObject d) {
         MongoClientURI uri=null;
         if (mongoURI!=null && ! mongoURI.equals("")) {
             uri = new MongoClientURI(mongoURI);
+            StaticAlertMessages.removeMessage(URINOTSET);
         } else {
             Log.w(TAG,"Mongo URI not set");
-            NotifHelper.clearMessage(context,"Mongo URI not set");
+            StaticAlertMessages.addMessage(URINOTSET);
+//            NotifHelper.clearMessage(context,"Mongo URI not set");
         }
 
         if (uri==null){
-            NotifHelper.notify(context,"Bad mongo URI");
+//            NotifHelper.notify(context,"Bad mongo URI");
+            StaticAlertMessages.addMessage(BADURI);
             return;
         } else {
-            NotifHelper.clearMessage(context,"Bad mongo URI");
+            StaticAlertMessages.removeMessage(BADURI);
         }
 
         DB db;
@@ -87,7 +95,7 @@ protected void doProcess(DownloadObject d) {
             int uploadCount=0;
             for (EGVRecord sr:r) {
                 BasicDBObject data = new BasicDBObject();
-                data.put("name", d.getDeviceName());
+//                data.put("name", d.getDeviceName());
                 data.put("trend", sr.getTrend().getVal());
 
                 // NightScout comptability
@@ -103,20 +111,22 @@ protected void doProcess(DownloadObject d) {
             }
             Log.i(TAG,"Records processed: "+r.size()+" Records Uploaded: "+uploadCount);
             if (!d.isRemoteDevice()) {
+                DBCollection deviceStatus = db.getCollection("devicestatus");
                 BasicDBObject data = new BasicDBObject();
-                data.put("name", d.getDeviceName());
-                data.put("deviceCheckinDate", new Date().getTime());
+//                data.put("name", d.getDeviceName());
+//                data.put("deviceCheckinDate", new Date().getTime());
+                data.put("created_at", new Date());
                 data.put("uploaderBattery", d.getUploaderBattery());
                 data.put("cgmbattery", d.getDeviceBattery());
-                data.put("units", d.getUnit().getValue());
+//                data.put("units", d.getUnit().getValue());
                 data.put("downloadStatus", d.getStatus().toString());
-                deviceData.update(data, data, true, false, WriteConcern.UNACKNOWLEDGED);
+                deviceStatus.update(data, data, true, false, WriteConcern.UNACKNOWLEDGED);
             }
             mongoClient.close();
             // Feels like a hack - need to figure out a better way to handle monitor error messages for the user
-            NotifHelper.clearMessage(context,"Unable to upload to mongoDB");
-            NotifHelper.clearMessage(context,"Mongo timeout");
-            NotifHelper.clearMessage(context,"Mongo error");
+//            NotifHelper.clearMessage(context,"Unable to upload to mongoDB");
+//            NotifHelper.clearMessage(context,"Mongo timeout");
+//            NotifHelper.clearMessage(context,"Mongo error");
             try {
                 savelastSuccessDate(d.getLastRecordReadingDate().getTime());
             } catch (NoDataException e) {
@@ -125,13 +135,15 @@ protected void doProcess(DownloadObject d) {
             //TODO Alert user when connection to mongo is unsuccessful
         } catch (UnknownHostException e) {
             Log.e(TAG,"Unable to upload to mongoDB",e);
-            NotifHelper.notify(context,"Unable to upload to mongoDB");
+            StaticAlertMessages.addMessage(BADHOSTNAME);
+//            NotifHelper.notify(context,"Unable to upload to mongoDB");
         } catch (MongoTimeoutException e){
             Log.w(TAG,"Mongo timeout");
-            NotifHelper.notify(context,"Mongo timeout");
+            StaticAlertMessages.addMessage(MONGOTIMEOUT);
         } catch (MongoException e){
-            Log.w(TAG, "Mongo catch all exception: ",e);
-            NotifHelper.notify(context,"Mongo error");
+            StaticAlertMessages.addMessage(UNHANDLEDEXCEPTION);
+            ACRA.getErrorReporter().handleException(e);
+//            NotifHelper.notify(context,"Mongo error");
         }
     }
 
diff --git a/mobile/src/main/java/com/ktind/cgm/bgscout/StaticAlertMessages.java b/mobile/src/main/java/com/ktind/cgm/bgscout/StaticAlertMessages.java
new file mode 100644
index 0000000..7b34115
--- /dev/null
+++ b/mobile/src/main/java/com/ktind/cgm/bgscout/StaticAlertMessages.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2014. , Kevin Lee (klee24@gmail.com)
+ * All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification,
+ *  are permitted provided that the following conditions are met:
+ *
+ *  1. Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  2. Redistributions in binary form must reproduce the above copyright notice, this
+ *  list of conditions and the following disclaimer in the documentation and/or
+ *  other materials provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package com.ktind.cgm.bgscout;
+
+import java.util.ArrayList;
+
+/**
+ * Created by klee24 on 9/13/14.
+ */
+public class StaticAlertMessages {
+    static protected ArrayList<AlertMessage> alertMessages=new ArrayList<AlertMessage>();
+
+    synchronized static public void addMessage(AlertMessage msg){
+        if (! alertMessages.contains(msg))
+            alertMessages.add(msg);
+    }
+
+    synchronized static public void clearMessages(){
+        alertMessages=new ArrayList<AlertMessage>();
+    }
+
+    synchronized static public void removeMessage(AlertMessage msg){
+        if (alertMessages.contains(msg))
+            alertMessages.remove(msg);
+    }
+
+    static public ArrayList<AlertMessage> getAlertMessages(){
+        return alertMessages;
+    }
+}
diff --git a/mobile/src/main/java/com/ktind/cgm/bgscout/WearMonitor.java b/mobile/src/main/java/com/ktind/cgm/bgscout/WearMonitor.java
new file mode 100644
index 0000000..5219c94
--- /dev/null
+++ b/mobile/src/main/java/com/ktind/cgm/bgscout/WearMonitor.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright (c) 2014. , Kevin Lee (klee24@gmail.com)
+ * All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification,
+ *  are permitted provided that the following conditions are met:
+ *
+ *  1. Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  2. Redistributions in binary form must reproduce the above copyright notice, this
+ *  list of conditions and the following disclaimer in the documentation and/or
+ *  other materials provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package com.ktind.cgm.bgscout;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.util.Log;
+
+import com.google.android.gms.common.ConnectionResult;
+import com.google.android.gms.common.api.GoogleApiClient;
+import com.google.android.gms.wearable.MessageApi;
+import com.google.android.gms.wearable.Node;
+import com.google.android.gms.wearable.NodeApi;
+import com.google.android.gms.wearable.Wearable;
+
+/**
+ * Created by klee24 on 9/13/14.
+ */
+public class WearMonitor extends AbstractMonitor implements GoogleApiClient.ConnectionCallbacks,GoogleApiClient.OnConnectionFailedListener {
+    private static final String TAG = WearMonitor.class.getSimpleName();
+    protected GoogleApiClient googleClient;
+    private static final String MESSAGE_RECEIVED_PATH = "/entries/sgv";
+    private static final String MESSAGE = "Hello wearable\n Via the data layer";
+    private Context context;
+
+    WearMonitor(String n,int id,Context cxt){
+        super(n,id,cxt,"wearMonitor");
+        googleClient = new GoogleApiClient.Builder(cxt)
+                .addApi(Wearable.API)
+                .addConnectionCallbacks(this)
+                .addOnConnectionFailedListener(this)
+                .build();
+    }
+
+    @Override
+    public void onConnected(Bundle bundle) {
+        sendDataLayerMessage();
+    }
+
+    @Override
+    public void onConnectionSuspended(int i) {
+
+    }
+
+    @Override
+    public void onConnectionFailed(ConnectionResult connectionResult) {
+
+    }
+
+    @Override
+    protected void doProcess(DownloadObject d) {
+        googleClient.connect();
+    }
+
+    @Override
+    public void stop() {
+        super.stop();
+        if (null != googleClient && googleClient.isConnected()) {
+            googleClient.disconnect();
+        }
+        super.stop();
+    }
+
+    private void sendDataLayerMessage() {
+        new Thread(new Runnable() {
+            @Override
+            public void run() {
+                // Get the connected nodes and wait for results
+                NodeApi.GetConnectedNodesResult nodes = Wearable.NodeApi.getConnectedNodes(googleClient).await();
+                for (Node node : nodes.getNodes()) {
+                    // Send a message and wait for result
+                    MessageApi.SendMessageResult result =
+                            Wearable.MessageApi.sendMessage(googleClient, node.getId(),
+                                    MESSAGE_RECEIVED_PATH, MESSAGE.getBytes()).await();
+                    if (result.getStatus().isSuccess()) {
+                        Log.v(TAG, "Message sent to : " + node.getDisplayName());
+                    }
+                    else {
+                        // Log an error
+                        Log.v(TAG, "MESSAGE ERROR: failed to send Message");
+                    }
+                }
+            }
+        }).start();
+    }
+}
diff --git a/mobile/src/main/java/com/ktind/cgm/bgscout/mqtt/MQTTMgr.java b/mobile/src/main/java/com/ktind/cgm/bgscout/mqtt/MQTTMgr.java
index 157f408..2cb1aef 100644
--- a/mobile/src/main/java/com/ktind/cgm/bgscout/mqtt/MQTTMgr.java
+++ b/mobile/src/main/java/com/ktind/cgm/bgscout/mqtt/MQTTMgr.java
@@ -12,8 +12,11 @@
 import android.provider.Settings;
 import android.util.Log;
 
+import com.ktind.cgm.bgscout.AlertLevels;
+import com.ktind.cgm.bgscout.AlertMessage;
 import com.ktind.cgm.bgscout.BGScout;
-import com.ktind.cgm.bgscout.NotifHelper;
+import com.ktind.cgm.bgscout.Conditions;
+import com.ktind.cgm.bgscout.StaticAlertMessages;
 
 import org.eclipse.paho.client.mqttv3.IMqttDeliveryToken;
 import org.eclipse.paho.client.mqttv3.MqttCallback;
@@ -27,6 +30,8 @@
 import java.util.Date;
 import java.util.Locale;
 
+//import com.ktind.cgm.bgscout.NotifHelper;
+
 /**
  Copyright (c) 2014, Kevin Lee (klee24@gmail.com)
  All rights reserved.
@@ -94,6 +99,7 @@ public class MQTTMgr implements MqttCallback,MQTTMgrObservable {
 //    protected boolean connected=false;
     protected boolean initialCallbackSetup=false;
     protected State state;
+    protected final AlertMessage MQTTDISCONNECT=new AlertMessage(AlertLevels.CRITICAL, "Disconnected from MQTT", Conditions.MONGONOTCONNECTED);
 
 
     public MQTTMgr(Context context, String user, String pass, String deviceIDStr) {
@@ -142,7 +148,8 @@ public void connect(String url, String lwt) {
             Log.d(TAG, "Connecting to URL: " + url);
             mClient = new MqttClient(url, mDeviceId, mDataStore);
             mClient.connect(mOpts);
-            NotifHelper.clearMessage(context,"Disconnected from MQTT");
+            StaticAlertMessages.removeMessage(MQTTDISCONNECT);
+//            NotifHelper.clearMessage(context,"Disconnected from MQTT");
 //            connected=true;
             setNextKeepAlive();
             state=State.CONNECTED;
@@ -262,7 +269,8 @@ public void notifyObservers(String topic, MqttMessage message) {
     public void notifyDisconnect() {
         Log.d(TAG,"In notifyDisconnect()");
         if (state!=State.DISCONNECTED && state!=State.DISCONNECTING)
-            NotifHelper.notify(context,"Disconnected from MQTT");
+            StaticAlertMessages.addMessage(MQTTDISCONNECT);
+//            NotifHelper.notify(context,"Disconnected from MQTT");
 //        for (MQTTMgrObserverInterface observer:observers){
 //            Log.v(TAG,"Calling back to registered users");
 //            try {
diff --git a/mobile/src/main/res/values/strings.xml b/mobile/src/main/res/values/strings.xml
index 6aa4b12..2a70a82 100644
--- a/mobile/src/main/res/values/strings.xml
+++ b/mobile/src/main/res/values/strings.xml
@@ -1,33 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
     <string name="app_name">Sugarcast</string>
-    <string name="title_activity_main">MainActivity</string>
+    <string name="title_activity_main">Sugarcast</string>
     <string name="welcome_message">BG Scout!\n</string>
     <string name="action_settings">Settings</string>
     <string name="manage_service">Start service</string>
     <string name="cgm_service_title">CGM Monitoring service</string>
-    <!-- TODO possible to dynamically rename these devices? -->
     <string name="device_1">Device 1</string>
     <string name="device_2">Device 2</string>
     <string name="device_3">Device 3</string>
     <string name="device_4">Device 4</string>
     <string name="pref_device_type_title">Type of device</string>
     <string name="pref_device_mongo_upload_title">Upload to Mongo DB</string>
-    <string name="pref_default_device_mongo_uri">mongodb://{user}:{password}@{host}.mongolab.com:{11111}/{database}</string>
-    <string name="pref_remote_mongo_uri_default">mongodb://{user}:{password}@{host}.mongolab.com:{11111}/{database}</string>
-    <string name="pref_device_mongo_uri_title">MongoDB URI</string>
+    <string name="pref_remote_mongo_uri_default" formatted="false">mongodb://{user}:{password}@{host}.mongolab.com:{11111}/{database}</string>
     <string name="pref_remote_mongo_uri_dialog_title">Enter MongoDB URI</string>
-    <string name="pref_remote_mongo_uri_dialog_msg">Replace example values in {}\'s with your correct values</string>
-    <string name="pref_device_remote_mongo_uri_title">Mongo DB for Remote devices</string>
+    <string name="pref_remote_mongo_uri_dialog_msg" formatted="false">Replace example values in {}\'s with your correct values</string>
+    <string name="pref_device_remote_mongo_uri_title">MongoDB URI</string>
     <string name="pref_device_high_title">High Threshold</string>
-
     <integer name="pref_default_device_high">180</integer>
-
     <string name="pref_device_low_title">Low Threshold</string>
-
     <integer name="pref_default_device_low">60</integer>
-
     <string name="high_ring_tone_title">High ringtone</string>
     <string name="low_ring_tone_title">Low ringtone</string>
     <string name="pref_device_remote_mongo_col_title">Collection Name</string>
@@ -47,8 +39,8 @@
     <string name="device_ns">Nightscout API settings</string>
     <string name="prefs_cat_threshold">Thresholds</string>
     <string name="last_g4_download">lastG4Download</string>
-    <string name="uploader_battery_default">%</string>
-    <string name="device_battery_default">%</string>
+    <string name="uploader_battery_default" formatted="false">%</string>
+    <string name="device_battery_default" formatted="false">%</string>
     <string name="default_bg_text">---</string>
     <string name="default_name_text">---</string>
     <string name="device_g4">G4 Options</string>
@@ -63,10 +55,9 @@
     <string name="title_section1">Section 1</string>
     <string name="title_section2">Section 2</string>
     <string name="title_section3">Section 3</string>
-    <string name="hello_world">Hello world!</string>
     <string name="privacy_title">Privacy</string>
     <string name="pref_disable_acra">Crash Collection</string>
-    <string name="pref_acra_disabled">Enable crash reporting.</string>
+    <string name="pref_acra_disabled">Enable crash reporting</string>
     <string name="pref_acra_enabled">Disable crash reporting</string>
     <string name="pref_acra_syslog">Include logs</string>
     <string name="pref_acra_syslog_enabled">Include logs in the crash reports</string>
@@ -81,5 +72,20 @@
     <string name="pref_device_critical_low_title">Critical Low</string>
     <string name="critical_low_ringtone_title">Critical low ringtone</string>
     <string name="Call">Call PWD</string>
-
+    <string name="battery_balance_summary" formatted="false">If the Dexcom G4 drops below 40% battery and the uploader has more than 40% battery, the uploader will charge the CGM.</string>
+    <string name="pref_time_sync_summary">Synchronizes the Dexcom G4 clock with the phone clock</string>
+    <string name="prefs_enable_device">Enable this device</string>
+    <string name="prefs_batt_balance_title">Battery balancing</string>
+    <string name="device_enable_summary">Enable collection of data from this device</string>
+    <string name="pref_enable_push_notifications">Enable Push Notifications</string>
+    <string name="prefs_enable_pebble">Enable Pebble notification</string>
+    <string name="prefs_nightscout_title">Nightscout API Upload</string>
+    <string name="rest_api_summary">The REST API is an alternative to direct mongodb upload</string>
+    <string name="prefs_api_title">API Base URL</string>
+    <string name="prefs_api_diaglog_title">Enter Base API URL</string>
+    <string name="prefs_default_api_value" formatted="false">http://{YOUR-API-SERVER}/api</string>
+    <string name="prefs_api_dialog_message" formatted="false">This only the base URL, the uploader will automatically append /entries for the POST</string>
+    <string name="prefs_api_secret_title">API Secret key</string>
+    <string name="prefs_api_dialog_title">Enter your API key</string>
+    <string name="prefs_category_privacy_summary">Privacy settings. No private information will be collected</string>
 </resources>
diff --git a/mobile/src/main/res/xml/pref_general.xml b/mobile/src/main/res/xml/pref_general.xml
index fe8c6d0..add9df2 100644
--- a/mobile/src/main/res/xml/pref_general.xml
+++ b/mobile/src/main/res/xml/pref_general.xml
@@ -4,7 +4,7 @@
         android:title="@string/device_1"
         android:persistent="false">
         <SwitchPreference
-            android:title="Enable this device"
+            android:title="@string/prefs_enable_device"
             android:key="device_1_enable"
             android:disableDependentsState="false"
             android:summary="Enable collection of data from this device">
@@ -36,18 +36,18 @@
             android:title="@string/device_g4"
             android:persistent="false">
             <CheckBoxPreference
-                android:title="Battery balancing"
+                android:title="@string/prefs_batt_balance_title"
                 android:dependency="device_1_enable"
                 android:key="device_1_bat_bal"
                 android:defaultValue="true"
-                android:summary="If the Dexcom G4 drops below 40% battery and the uploader has more than 40% batter it will charge the CGM.">
+                android:summary="@string/battery_balance_summary">
             </CheckBoxPreference>
             <CheckBoxPreference
                 android:title="Time sync"
                 android:dependency="device_1_enable"
                 android:key="device_1_time_sync"
                 android:defaultValue="true"
-                android:summary="Synchronizes the Dexcom G4 clock with the phone clock">
+                android:summary="@string/pref_time_sync_summary">
             </CheckBoxPreference>
             <ListPreference
                 android:key="device_1_units"
@@ -125,32 +125,32 @@
             <CheckBoxPreference
                 android:key="device_1_pebble_monitor"
                 android:dependency="device_1_enable"
-                android:title="Enable Pebble notification"
+                android:title="@string/prefs_enable_pebble"
                 android:checked="true"/>
             <PreferenceScreen
                 android:key="device_1_ns"
                 android:title="@string/device_ns"
                 android:persistent="false">
                 <CheckBoxPreference
-                    android:title="Nightscout API Upload"
+                    android:title="@string/prefs_nightscout_title"
                     android:dependency="device_1_enable"
                     android:key="device_1_nsapi_enable"
                     android:defaultValue="false"
-                    android:summary="The REST API is an alternative to direct mongodb upload">
+                    android:summary="@string/rest_api_summary">
                 </CheckBoxPreference>
                 <EditTextPreference
-                    android:title="API Base URL"
+                    android:title="@string/prefs_api_title"
                     android:dependency="device_1_nsapi_enable"
                     android:key="device_1_nsapi"
-                    android:dialogTitle="Enter Base API URL"
-                    android:defaultValue="http://{YOUR-API-SERVER}/api"
-                    android:dialogMessage="This only the base URL, the uploader will automatically append /entries for the POST">
+                    android:dialogTitle="@string/prefs_api_diaglog_title"
+                    android:defaultValue="@string/prefs_default_api_value"
+                    android:dialogMessage="@string/prefs_api_dialog_message">
                 </EditTextPreference>
                 <EditTextPreference
-                    android:title="API Secret key"
+                    android:title="@string/prefs_api_secret_title"
                     android:dependency="device_1_nsapi_enable"
                     android:key="device_1_nskey"
-                    android:dialogTitle="Enter your API key"
+                    android:dialogTitle="@string/prefs_api_dialog_title"
                     android:password="true">
                 </EditTextPreference>
             </PreferenceScreen>
@@ -161,7 +161,7 @@
                 <CheckBoxPreference
                     android:key="device_1_push_upload"
                     android:dependency="device_1_enable"
-                    android:title="Enable Push upload"
+                    android:title="@string/pref_enable_push_notifications"
                     android:checked="false"/>
                 <EditTextPreference
                     android:key="device_1_mqtt_endpoint"
@@ -217,10 +217,10 @@
         android:title="@string/device_2"
         android:persistent="false">
         <SwitchPreference
-            android:title="Enable this device"
+            android:title="@string/prefs_enable_device"
             android:key="device_2_enable"
             android:disableDependentsState="false"
-            android:summary="Enable collection of data from this device">
+            android:summary="@string/device_enable_summary">
         </SwitchPreference>
         <EditTextPreference
             android:key="device_2_name"
@@ -247,18 +247,18 @@
             android:title="@string/device_g4"
             android:persistent="false">
             <CheckBoxPreference
-                android:title="Battery balancing"
+                android:title="@string/prefs_batt_balance_title"
                 android:dependency="device_2_enable"
                 android:key="device_2_bat_bal"
                 android:defaultValue="true"
-                android:summary="If the Dexcom G4 drops below 40% battery and the uploader has more than 40% batter it will charge the CGM.">
+                android:summary="@string/battery_balance_summary">
             </CheckBoxPreference>
             <CheckBoxPreference
                 android:title="Time sync"
                 android:dependency="device_2_enable"
                 android:key="device_2_time_sync"
                 android:defaultValue="true"
-                android:summary="Synchronizes the Dexcom G4 clock with the phone clock">
+                android:summary="@string/pref_time_sync_summary">
             </CheckBoxPreference>
             <ListPreference
                 android:key="device_2_units"
@@ -336,32 +336,32 @@
             <CheckBoxPreference
                 android:key="device_2_pebble_monitor"
                 android:dependency="device_2_enable"
-                android:title="Enable Pebble notification"
+                android:title="@string/prefs_enable_pebble"
                 android:checked="true"/>
             <PreferenceScreen
                 android:key="device_2_ns"
                 android:title="@string/device_ns"
                 android:persistent="false">
                 <CheckBoxPreference
-                    android:title="Nightscout API Upload"
+                    android:title="@string/prefs_nightscout_title"
                     android:dependency="device_2_enable"
                     android:key="device_2_nsapi_enable"
                     android:defaultValue="false"
-                    android:summary="The REST API is an alternative to direct mongodb upload">
+                    android:summary="@string/rest_api_summary">
                 </CheckBoxPreference>
                 <EditTextPreference
-                    android:title="API Base URL"
+                    android:title="@string/prefs_api_title"
                     android:dependency="device_2_nsapi_enable"
                     android:key="device_2_nsapi"
-                    android:dialogTitle="Enter Base API URL"
-                    android:defaultValue="http://{YOUR-API-SERVER}/api"
-                    android:dialogMessage="This only the base URL, the uploader will automatically append /entries for the POST">
+                    android:dialogTitle="@string/prefs_api_diaglog_title"
+                    android:defaultValue="@string/prefs_default_api_value"
+                    android:dialogMessage="@string/prefs_api_dialog_message">
                 </EditTextPreference>
                 <EditTextPreference
-                    android:title="API Secret key"
+                    android:title="@string/prefs_api_secret_title"
                     android:dependency="device_2_nsapi_enable"
                     android:key="device_2_nskey"
-                    android:dialogTitle="Enter your API key"
+                    android:dialogTitle="@string/prefs_api_dialog_title"
                     android:password="true"/>
             </PreferenceScreen>
             <PreferenceScreen
@@ -371,7 +371,7 @@
                 <CheckBoxPreference
                     android:key="device_2_push_upload"
                     android:dependency="device_2_enable"
-                    android:title="Enable Push upload"
+                    android:title="@string/pref_enable_push_notifications"
                     android:checked="false"/>
                 <EditTextPreference
                     android:key="device_2_mqtt_endpoint"
@@ -426,10 +426,10 @@
         android:title="@string/device_3"
         android:persistent="false">
         <SwitchPreference
-            android:title="Enable this device"
+            android:title="@string/prefs_enable_device"
             android:key="device_3_enable"
             android:disableDependentsState="false"
-            android:summary="Enable collection of data from this device">
+            android:summary="@string/device_enable_summary">
         </SwitchPreference>
         <EditTextPreference
             android:key="device_3_name"
@@ -456,18 +456,18 @@
             android:title="@string/device_g4"
             android:persistent="false">
             <CheckBoxPreference
-                android:title="Battery balancing"
+                android:title="@string/prefs_batt_balance_title"
                 android:dependency="device_3_enable"
                 android:key="device_3_bat_bal"
                 android:defaultValue="true"
-                android:summary="If the Dexcom G4 drops below 40% battery and the uploader has more than 40% batter it will charge the CGM.">
+                android:summary="@string/battery_balance_summary">
             </CheckBoxPreference>
             <CheckBoxPreference
                 android:title="Time sync"
                 android:dependency="device_3_enable"
                 android:key="device_3_time_sync"
                 android:defaultValue="true"
-                android:summary="Synchronizes the Dexcom G4 clock with the phone clock">
+                android:summary="@string/pref_time_sync_summary">
             </CheckBoxPreference>
             <ListPreference
                 android:key="device_3_units"
@@ -545,32 +545,32 @@
             <CheckBoxPreference
                 android:key="device_3_pebble_monitor"
                 android:dependency="device_3_enable"
-                android:title="Enable Pebble notification"
+                android:title="@string/prefs_enable_pebble"
                 android:checked="true"/>
             <PreferenceScreen
                 android:key="device_3_ns"
                 android:title="@string/device_ns"
                 android:persistent="false">
                 <CheckBoxPreference
-                    android:title="Nightscout API Upload"
+                    android:title="@string/prefs_nightscout_title"
                     android:dependency="device_3_enable"
                     android:key="device_3_nsapi_enable"
                     android:defaultValue="false"
-                    android:summary="The REST API is an alternative to direct mongodb upload">
+                    android:summary="@string/rest_api_summary">
                 </CheckBoxPreference>
                 <EditTextPreference
-                    android:title="API Base URL"
+                    android:title="@string/prefs_api_title"
                     android:dependency="device_3_nsapi_enable"
                     android:key="device_3_nsapi"
-                    android:dialogTitle="Enter Base API URL"
-                    android:defaultValue="http://{YOUR-API-SERVER}/api"
-                    android:dialogMessage="This only the base URL, the uploader will automatically append /entries for the POST">
+                    android:dialogTitle="@string/prefs_api_diaglog_title"
+                    android:defaultValue="@string/prefs_default_api_value"
+                    android:dialogMessage="@string/prefs_api_dialog_message">
                 </EditTextPreference>
                 <EditTextPreference
-                    android:title="API Secret key"
+                    android:title="@string/prefs_api_secret_title"
                     android:dependency="device_3_nsapi_enable"
                     android:key="device_3_nskey"
-                    android:dialogTitle="Enter your API key"
+                    android:dialogTitle="@string/prefs_api_dialog_title"
                     android:password="true"/>
             </PreferenceScreen>
             <PreferenceScreen
@@ -580,7 +580,7 @@
                 <CheckBoxPreference
                     android:key="device_3_push_upload"
                     android:dependency="device_3_enable"
-                    android:title="Enable Push upload"
+                    android:title="@string/pref_enable_push_notifications"
                     android:checked="false"/>
                 <EditTextPreference
                     android:key="device_3_mqtt_endpoint"
@@ -635,10 +635,10 @@
         android:title="@string/device_4"
         android:persistent="false">
         <SwitchPreference
-            android:title="Enable this device"
+            android:title="@string/prefs_enable_device"
             android:key="device_4_enable"
             android:disableDependentsState="false"
-            android:summary="Enable collection of data from this device">
+            android:summary="@string/device_enable_summary">
         </SwitchPreference>
         <EditTextPreference
             android:key="device_4_name"
@@ -665,18 +665,18 @@
             android:title="@string/device_g4"
             android:persistent="false">
             <CheckBoxPreference
-                android:title="Battery balancing"
+                android:title="@string/prefs_batt_balance_title"
                 android:dependency="device_4_enable"
                 android:key="device_4_bat_bal"
                 android:defaultValue="false"
-                android:summary="If the Dexcom G4 drops below 40% battery and the uploader has more than 40% batter it will charge the CGM.">
+                android:summary="@string/battery_balance_summary">
             </CheckBoxPreference>
             <CheckBoxPreference
                 android:title="Time sync"
                 android:dependency="device_4_enable"
                 android:key="device_4_time_sync"
                 android:defaultValue="true"
-                android:summary="Synchronizes the Dexcom G4 clock with the phone clock">
+                android:summary="@string/pref_time_sync_summary">
             </CheckBoxPreference>
             <ListPreference
                 android:key="device_4_units"
@@ -754,32 +754,32 @@
             <CheckBoxPreference
                 android:key="device_4_pebble_monitor"
                 android:dependency="device_4_enable"
-                android:title="Enable Pebble notification"
+                android:title="@string/prefs_enable_pebble"
                 android:checked="true"/>
             <PreferenceScreen
                 android:key="device_4_ns"
                 android:title="@string/device_ns"
                 android:persistent="false">
                 <CheckBoxPreference
-                    android:title="Nightscout API Upload"
+                    android:title="@string/prefs_nightscout_title"
                     android:dependency="device_4_enable"
                     android:key="device_4_nsapi_enable"
                     android:defaultValue="false"
-                    android:summary="The REST API is an alternative to direct mongodb upload">
+                    android:summary="@string/rest_api_summary">
                 </CheckBoxPreference>
                 <EditTextPreference
-                    android:title="API Base URL"
+                    android:title="@string/prefs_api_title"
                     android:dependency="device_4_nsapi_enable"
                     android:key="device_4_nsapi"
-                    android:dialogTitle="Enter Base API URL"
-                    android:defaultValue="http://{YOUR-API-SERVER}/api"
-                    android:dialogMessage="This only the base URL, the uploader will automatically append /entries for the POST">
+                    android:dialogTitle="@string/prefs_api_diaglog_title"
+                    android:defaultValue="@string/prefs_default_api_value"
+                    android:dialogMessage="@string/prefs_api_dialog_message">
                 </EditTextPreference>
                 <EditTextPreference
-                    android:title="API Secret key"
+                    android:title="@string/prefs_api_secret_title"
                     android:dependency="device_4_nsapi"
                     android:key="device_4_nskey"
-                    android:dialogTitle="Enter your API key"
+                    android:dialogTitle="@string/prefs_api_dialog_title"
                     android:password="true"/>
             </PreferenceScreen>
             <PreferenceScreen
@@ -789,7 +789,7 @@
                 <CheckBoxPreference
                     android:key="device_4_push_upload"
                     android:dependency="device_4_enable"
-                    android:title="Enable Push upload"
+                    android:title="@string/pref_enable_push_notifications"
                     android:checked="false"/>
                 <EditTextPreference
                     android:key="device_4_mqtt_endpoint"
@@ -841,7 +841,7 @@
     <PreferenceCategory
         android:title="@string/privacy_title"
         android:key="privacy_prefs"
-        android:summary="Privacy settings. No private information will be collected">
+        android:summary="@string/prefs_category_privacy_summary">
         <CheckBoxPreference android:key="acra.enable"
             android:title="@string/pref_disable_acra"
             android:summaryOn="@string/pref_acra_disabled"
diff --git a/settings.gradle b/settings.gradle
index 758475e..5072e7a 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,2 +1 @@
-include ':mobile', ':wear'
-include ':pEBBLE_KIT'
+include ':mobile', ':wear', 'PEBBLE_KIT'
diff --git a/wear/build.gradle b/wear/build.gradle
index 99f2102..41ee191 100644
--- a/wear/build.gradle
+++ b/wear/build.gradle
@@ -10,7 +10,7 @@ android {
         minSdkVersion 20
         targetSdkVersion 20
         versionCode 1
-        versionName "1.0"
+        versionName "0.2"
     }
     buildTypes {
         release {
@@ -22,5 +22,6 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
+    compile 'com.google.android.gms:play-services-wearable:5.0.77'
     compile 'com.google.android.support:wearable:+'
 }
diff --git a/wear/src/main/AndroidManifest.xml b/wear/src/main/AndroidManifest.xml
index 69d5ae3..7e1d96c 100644
--- a/wear/src/main/AndroidManifest.xml
+++ b/wear/src/main/AndroidManifest.xml
@@ -1,11 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.ktind.cgm.bgscout">
+    package="com.ktind.cgm.bgscout" >
+
     <uses-feature android:name="android.hardware.type.watch" />
-    <application android:allowBackup="true"
-        android:label="@string/app_name"
+
+    <application
+        android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
-        android:theme="@android:style/Theme.DeviceDefault">
+        android:label="@string/app_name"
+        android:theme="@android:style/Theme.DeviceDefault" >
+        <meta-data
+            android:name="com.google.android.gms.version"
+            android:value="@integer/google_play_services_version" />
+
+        <service android:name=".ListenerService" >
+            <intent-filter>
+                <action android:name="com.google.android.gms.wearable.BIND_LISTENER" />
+            </intent-filter>
+        </service>
+
+        <activity
+            android:name=".MyActivity"
+            android:label="@string/title_activity_my" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
 
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
     </application>
 
 </manifest>
diff --git a/wear/src/main/java/com/ktind/cgm/bgscout/ListenerService.java b/wear/src/main/java/com/ktind/cgm/bgscout/ListenerService.java
new file mode 100644
index 0000000..892c7c9
--- /dev/null
+++ b/wear/src/main/java/com/ktind/cgm/bgscout/ListenerService.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2014. , Kevin Lee (klee24@gmail.com)
+ * All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification,
+ *  are permitted provided that the following conditions are met:
+ *
+ *  1. Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  2. Redistributions in binary form must reproduce the above copyright notice, this
+ *  list of conditions and the following disclaimer in the documentation and/or
+ *  other materials provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package com.ktind.cgm.bgscout;
+
+import android.content.Intent;
+import android.support.v4.content.LocalBroadcastManager;
+import android.util.Log;
+
+import com.google.android.gms.wearable.MessageEvent;
+import com.google.android.gms.wearable.WearableListenerService;
+
+/**
+ * Created by klee24 on 9/13/14.
+ */
+public class ListenerService extends WearableListenerService {
+    private static final String TAG = ListenerService.class.getSimpleName();
+    private static final String MESSAGE_RECEIVED_PATH = "/entries/sgv";
+
+    @Override
+    public void onMessageReceived(MessageEvent messageEvent) {
+
+        if (messageEvent.getPath().equals(MESSAGE_RECEIVED_PATH)) {
+            final String message = new String(messageEvent.getData());
+            Log.v("myTag", "Message received on watch is: " + message);
+            Intent intent = new Intent("com.ktind.cgm.SHOW_MSG");
+            intent.putExtra("msg",message);
+            LocalBroadcastManager.getInstance(this).sendBroadcast(intent);
+        }
+        else {
+            super.onMessageReceived(messageEvent);
+        }
+    }
+}
diff --git a/wear/src/main/java/com/ktind/cgm/bgscout/MyActivity.java b/wear/src/main/java/com/ktind/cgm/bgscout/MyActivity.java
new file mode 100644
index 0000000..8cd7989
--- /dev/null
+++ b/wear/src/main/java/com/ktind/cgm/bgscout/MyActivity.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2014. , Kevin Lee (klee24@gmail.com)
+ * All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification,
+ *  are permitted provided that the following conditions are met:
+ *
+ *  1. Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  2. Redistributions in binary form must reproduce the above copyright notice, this
+ *  list of conditions and the following disclaimer in the documentation and/or
+ *  other materials provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package com.ktind.cgm.bgscout;
+
+import android.app.Activity;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.os.Bundle;
+import android.support.v4.content.LocalBroadcastManager;
+import android.support.wearable.view.WatchViewStub;
+import android.widget.TextView;
+
+public class MyActivity extends Activity {
+
+    private TextView mTextView;
+    private MessageReceiver messageReceiver;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_my);
+        final WatchViewStub stub = (WatchViewStub) findViewById(R.id.watch_view_stub);
+        stub.setOnLayoutInflatedListener(new WatchViewStub.OnLayoutInflatedListener() {
+            @Override
+            public void onLayoutInflated(WatchViewStub stub) {
+                mTextView = (TextView) stub.findViewById(R.id.text);
+            }
+        });
+        IntentFilter messageFilter=new IntentFilter("com.ktind.cgm.SHOW_MSG");
+        messageReceiver=new MessageReceiver();
+        LocalBroadcastManager.getInstance(this).registerReceiver(messageReceiver,messageFilter);
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        LocalBroadcastManager.getInstance(this).unregisterReceiver(messageReceiver);
+    }
+
+    public class MessageReceiver extends BroadcastReceiver {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            String message = intent.getStringExtra("msg");
+            // Display message in UI
+//            Intent mIntent=new Intent(context,MyActivity.class);
+//            startActivity(mIntent);
+            mTextView.setText(message);
+        }
+    }
+}
diff --git a/wear/src/main/res/layout/activity_display.xml b/wear/src/main/res/layout/activity_display.xml
new file mode 100644
index 0000000..a8a11cc
--- /dev/null
+++ b/wear/src/main/res/layout/activity_display.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) 2014. , Kevin Lee (klee24@gmail.com)
+  ~ All rights reserved.
+  ~
+  ~  Redistribution and use in source and binary forms, with or without modification,
+  ~  are permitted provided that the following conditions are met:
+  ~
+  ~  1. Redistributions of source code must retain the above copyright notice, this
+  ~  list of conditions and the following disclaimer.
+  ~
+  ~  2. Redistributions in binary form must reproduce the above copyright notice, this
+  ~  list of conditions and the following disclaimer in the documentation and/or
+  ~  other materials provided with the distribution.
+  ~
+  ~  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ~  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  ~  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  ~  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+  ~  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  ~  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  ~  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+  ~  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  ~  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  ~  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:tools="http://schemas.android.com/tools"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical"
+              tools:context="com.ktind.cgm.bgscout.SugarcastActivity"
+              tools:deviceIds="wear">
+<TextView
+    android:id="@+id/text"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:text="@string/hello" />
+</LinearLayout>
\ No newline at end of file
diff --git a/wear/src/main/res/layout/activity_my.xml b/wear/src/main/res/layout/activity_my.xml
new file mode 100644
index 0000000..b46bf00
--- /dev/null
+++ b/wear/src/main/res/layout/activity_my.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) 2014. , Kevin Lee (klee24@gmail.com)
+  ~ All rights reserved.
+  ~
+  ~  Redistribution and use in source and binary forms, with or without modification,
+  ~  are permitted provided that the following conditions are met:
+  ~
+  ~  1. Redistributions of source code must retain the above copyright notice, this
+  ~  list of conditions and the following disclaimer.
+  ~
+  ~  2. Redistributions in binary form must reproduce the above copyright notice, this
+  ~  list of conditions and the following disclaimer in the documentation and/or
+  ~  other materials provided with the distribution.
+  ~
+  ~  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ~  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  ~  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  ~  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+  ~  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  ~  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  ~  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+  ~  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  ~  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  ~  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  -->
+
+<android.support.wearable.view.WatchViewStub
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/watch_view_stub"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    app:rectLayout="@layout/rect_activity_my"
+    app:roundLayout="@layout/round_activity_my"
+    tools:context="com.ktind.cgm.bgscout.MyActivity"
+    tools:deviceIds="wear">
+</android.support.wearable.view.WatchViewStub>
diff --git a/wear/src/main/res/layout/rect_activity_my.xml b/wear/src/main/res/layout/rect_activity_my.xml
new file mode 100644
index 0000000..9f9f53f
--- /dev/null
+++ b/wear/src/main/res/layout/rect_activity_my.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) 2014. , Kevin Lee (klee24@gmail.com)
+  ~ All rights reserved.
+  ~
+  ~  Redistribution and use in source and binary forms, with or without modification,
+  ~  are permitted provided that the following conditions are met:
+  ~
+  ~  1. Redistributions of source code must retain the above copyright notice, this
+  ~  list of conditions and the following disclaimer.
+  ~
+  ~  2. Redistributions in binary form must reproduce the above copyright notice, this
+  ~  list of conditions and the following disclaimer in the documentation and/or
+  ~  other materials provided with the distribution.
+  ~
+  ~  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ~  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  ~  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  ~  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+  ~  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  ~  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  ~  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+  ~  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  ~  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  ~  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    tools:context="com.ktind.cgm.bgscout.MyActivity"
+    tools:deviceIds="wear_square">
+
+    <TextView
+        android:id="@+id/text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/hello_square" />
+</LinearLayout>
diff --git a/wear/src/main/res/layout/round_activity_my.xml b/wear/src/main/res/layout/round_activity_my.xml
new file mode 100644
index 0000000..2af15a3
--- /dev/null
+++ b/wear/src/main/res/layout/round_activity_my.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) 2014. , Kevin Lee (klee24@gmail.com)
+  ~ All rights reserved.
+  ~
+  ~  Redistribution and use in source and binary forms, with or without modification,
+  ~  are permitted provided that the following conditions are met:
+  ~
+  ~  1. Redistributions of source code must retain the above copyright notice, this
+  ~  list of conditions and the following disclaimer.
+  ~
+  ~  2. Redistributions in binary form must reproduce the above copyright notice, this
+  ~  list of conditions and the following disclaimer in the documentation and/or
+  ~  other materials provided with the distribution.
+  ~
+  ~  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ~  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  ~  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  ~  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+  ~  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  ~  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  ~  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+  ~  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  ~  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  ~  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  -->
+
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="com.ktind.cgm.bgscout.MyActivity"
+    tools:deviceIds="wear_round">
+
+    <TextView
+        android:id="@+id/text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerHorizontal="true"
+        android:layout_centerVertical="true"
+        android:text="@string/hello_round" />
+</RelativeLayout>
diff --git a/wear/src/main/res/values/strings.xml b/wear/src/main/res/values/strings.xml
index 1f3c202..0da8433 100644
--- a/wear/src/main/res/values/strings.xml
+++ b/wear/src/main/res/values/strings.xml
@@ -1,3 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
+
     <string name="app_name">BG Scout</string>
+    <string name="hello">Hello World!</string>
+    <string name="title">Hello Notification!</string>
+    <string name="notification_posted">Notification posted</string>
+    <string name="title_activity_my">MyActivity</string>
+    <string name="hello_round">Hello Round World!</string>
+    <string name="hello_square">Hello Square World!</string>
+
 </resources>
diff --git a/wear/wear.iml b/wear/wear.iml
index 8233b25..7f6409c 100644
--- a/wear/wear.iml
+++ b/wear/wear.iml
@@ -13,6 +13,7 @@
         <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugJava" />
         <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
         <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
+        <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugTestSources" />
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
         <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
@@ -37,22 +38,22 @@
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/test/debug" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/assets" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
@@ -80,6 +81,7 @@
     <orderEntry type="jdk" jdkName="Android API 20 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" exported="" name="support-v13-20.0.0" level="project" />
+    <orderEntry type="library" exported="" name="play-services-wearable-5.0.77" level="project" />
     <orderEntry type="library" exported="" name="support-annotations-20.0.0" level="project" />
     <orderEntry type="library" exported="" name="support-v4-20.0.0" level="project" />
     <orderEntry type="library" exported="" name="wearable-1.0.0" level="project" />