diff --git a/phoneClients/android/.idea/workspace.xml b/phoneClients/android/.idea/workspace.xml
index 462194b..d11a341 100644
--- a/phoneClients/android/.idea/workspace.xml
+++ b/phoneClients/android/.idea/workspace.xml
@@ -41,7 +41,10 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="9fe415d5-9929-47d9-9a7a-de7d3ea04176" name="Default" comment="">
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" afterPath="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/java/com/websmithing/gpstracker/GpsTrackerActivity.java" afterPath="$PROJECT_DIR$/app/src/main/java/com/websmithing/gpstracker/GpsTrackerActivity.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/java/com/websmithing/gpstracker/LocationService.java" afterPath="$PROJECT_DIR$/app/src/main/java/com/websmithing/gpstracker/LocationService.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     </list>
     <ignored path="GpsTracker.iws" />
     <ignored path=".idea/workspace.xml" />
@@ -104,53 +107,30 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file leaf-file-name="GpsTrackerActivity.java" pinned="false" current="false" current-in-tab="false">
+      <file leaf-file-name="GpsTrackerActivity.java" pinned="false" current="true" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/app/src/main/java/com/websmithing/gpstracker/GpsTrackerActivity.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="-0.65384614" vertical-offset="1054" max-vertical-offset="5032">
-              <caret line="63" column="29" selection-start-line="63" selection-start-column="29" selection-end-line="63" selection-end-column="29" />
+            <state vertical-scroll-proportion="0.87268996" vertical-offset="2074" max-vertical-offset="4709">
+              <caret line="168" column="9" selection-start-line="168" selection-start-column="9" selection-end-line="168" selection-end-column="9" />
               <folding>
-                <element signature="imports" expanded="true" />
                 <element signature="e#1667#1709#0" expanded="true" />
+                <element signature="e#2339#2572#0" expanded="true" />
                 <element signature="e#2553#2554#0" expanded="true" />
                 <element signature="e#2618#2752#0" expanded="true" />
                 <element signature="e#2741#2742#0" expanded="true" />
                 <element signature="e#2881#2920#0" expanded="true" />
                 <element signature="e#5119#5152#0" expanded="true" />
                 <element signature="e#5431#5464#0" expanded="true" />
-                <element signature="e#7317#7352#0" expanded="true" />
-                <element signature="e#8827#8868#0" expanded="true" />
-                <element signature="e#9511#9538#0" expanded="true" />
-                <element signature="e#9943#9966#0" expanded="true" />
-                <element signature="e#10157#10181#0" expanded="true" />
+                <element signature="e#7440#7475#0" expanded="true" />
+                <element signature="e#8950#8991#0" expanded="true" />
+                <element signature="e#9634#9661#0" expanded="true" />
+                <element signature="e#10066#10089#0" expanded="true" />
+                <element signature="e#10280#10304#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="LocationService.java" pinned="false" current="true" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/app/src/main/java/com/websmithing/gpstracker/LocationService.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.65665233" vertical-offset="1938" max-vertical-offset="3094">
-              <caret line="166" column="73" selection-start-line="166" selection-start-column="73" selection-end-line="166" selection-end-column="73" />
-              <folding>
-                <element signature="e#7547#7548#0" expanded="true" />
-                <element signature="e#7591#7592#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="strings.xml" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/src/main/res/values/strings.xml">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="493">
-              <caret line="9" column="56" selection-start-line="9" selection-start-column="56" selection-end-line="9" selection-end-column="56" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FindManager">
@@ -579,7 +559,7 @@
     </option>
     <option name="modificationStamps">
       <map>
-        <entry key="$PROJECT_DIR$" value="4189316872000" />
+        <entry key="$PROJECT_DIR$" value="4190375454000" />
         <entry key="$PROJECT_DIR$/gradle" value="1387345486000" />
         <entry key="$USER_HOME$/Downloads/GpsTracker/phoneClients/android" value="1387345487000" />
       </map>
@@ -924,8 +904,6 @@
         <option value="$PROJECT_DIR$/GpsTracker/src/main/java/com/websmithing/gpstracker/GpsTrackerActivity.java" />
         <option value="$PROJECT_DIR$/GpsTracker/build.gradle" />
         <option value="$PROJECT_DIR$/gradle/wrapper/gradle-wrapper.properties" />
-        <option value="$PROJECT_DIR$/app/build.gradle" />
-        <option value="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" />
         <option value="$PROJECT_DIR$/app/src/main/res/drawable-hdpi/custom_tracking_button.xml" />
         <option value="$PROJECT_DIR$/app/src/main/res/drawable/green_tracking_button.xml" />
         <option value="$PROJECT_DIR$/app/src/main/res/drawable/red_tracking_button.xml" />
@@ -933,6 +911,8 @@
         <option value="$PROJECT_DIR$/app/src/main/res/values/strings.xml" />
         <option value="$PROJECT_DIR$/app/src/main/java/com/websmithing/gpstracker/GpsTrackerActivity.java" />
         <option value="$PROJECT_DIR$/app/src/main/java/com/websmithing/gpstracker/LocationService.java" />
+        <option value="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" />
+        <option value="$PROJECT_DIR$/app/build.gradle" />
       </list>
     </option>
   </component>
@@ -1387,13 +1367,12 @@
     <servers />
   </component>
   <component name="ToolWindowManager">
-    <frame x="1680" y="22" width="1680" height="1024" extended-state="0" />
+    <frame x="1680" y="22" width="1680" height="1024" extended-state="6" />
     <editor active="true" />
     <layout>
       <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2847352" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@@ -1403,7 +1382,7 @@
       <window_info id="Gradle Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="true" content_ui="tabs" />
       <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
       <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32777777" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Android" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.18502203" sideWeight="0.49968886" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Android" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.4328194" sideWeight="0.49968886" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Gradle" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2495333" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
@@ -1415,6 +1394,7 @@
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2847352" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32921347" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.39955106" sideWeight="0.49968848" order="5" side_tool="false" content_ui="tabs" />
@@ -1473,22 +1453,90 @@
   <component name="editorHistoryManager">
     <entry file="file://$PROJECT_DIR$/app/src/main/java/com/websmithing/gpstracker/GpsTrackerActivity.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="4420" max-vertical-offset="4726">
-          <caret line="260" column="6" selection-start-line="260" selection-start-column="6" selection-end-line="260" selection-end-column="6" />
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="4641">
+          <caret line="143" column="0" selection-start-line="143" selection-start-column="0" selection-end-line="143" selection-end-column="0" />
           <folding>
-            <element signature="imports" expanded="true" />
             <element signature="e#1667#1709#0" expanded="true" />
+            <element signature="e#2339#2572#0" expanded="true" />
             <element signature="e#2553#2554#0" expanded="true" />
             <element signature="e#2618#2752#0" expanded="true" />
             <element signature="e#2741#2742#0" expanded="true" />
             <element signature="e#2881#2920#0" expanded="true" />
             <element signature="e#5119#5152#0" expanded="true" />
             <element signature="e#5431#5464#0" expanded="true" />
-            <element signature="e#7317#7352#0" expanded="true" />
-            <element signature="e#8827#8868#0" expanded="true" />
-            <element signature="e#9511#9538#0" expanded="true" />
-            <element signature="e#9943#9966#0" expanded="true" />
-            <element signature="e#10157#10181#0" expanded="true" />
+            <element signature="e#7440#7475#0" expanded="true" />
+            <element signature="e#8950#8991#0" expanded="true" />
+            <element signature="e#9634#9661#0" expanded="true" />
+            <element signature="e#10066#10089#0" expanded="true" />
+            <element signature="e#10280#10304#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/websmithing/gpstracker/LocationService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="1751" max-vertical-offset="3587">
+          <caret line="103" column="0" selection-start-line="103" selection-start-column="0" selection-end-line="103" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/websmithing/gpstracker/GpsTrackerActivity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="2652" max-vertical-offset="5083">
+          <caret line="156" column="57" selection-start-line="156" selection-start-column="11" selection-end-line="156" selection-end-column="57" />
+          <folding>
+            <element signature="e#1667#1709#0" expanded="true" />
+            <element signature="e#2339#2572#0" expanded="true" />
+            <element signature="e#2553#2554#0" expanded="true" />
+            <element signature="e#2618#2752#0" expanded="true" />
+            <element signature="e#2741#2742#0" expanded="true" />
+            <element signature="e#2881#2920#0" expanded="true" />
+            <element signature="e#5119#5152#0" expanded="true" />
+            <element signature="e#5431#5464#0" expanded="true" />
+            <element signature="e#7440#7475#0" expanded="true" />
+            <element signature="e#8950#8991#0" expanded="true" />
+            <element signature="e#9634#9661#0" expanded="true" />
+            <element signature="e#10066#10089#0" expanded="true" />
+            <element signature="e#10280#10304#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/websmithing/gpstracker/LocationService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="918" max-vertical-offset="3281">
+          <caret line="86" column="0" selection-start-line="86" selection-start-column="0" selection-end-line="86" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/res/values/strings.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="153" max-vertical-offset="493">
+          <caret line="9" column="56" selection-start-line="9" selection-start-column="56" selection-end-line="9" selection-end-column="56" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/websmithing/gpstracker/GpsTrackerActivity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="4420" max-vertical-offset="4726">
+          <caret line="260" column="6" selection-start-line="260" selection-start-column="6" selection-end-line="260" selection-end-column="6" />
+          <folding>
+            <element signature="e#1667#1709#0" expanded="true" />
+            <element signature="e#2339#2572#0" expanded="true" />
+            <element signature="e#2553#2554#0" expanded="true" />
+            <element signature="e#2618#2752#0" expanded="true" />
+            <element signature="e#2741#2742#0" expanded="true" />
+            <element signature="e#2881#2920#0" expanded="true" />
+            <element signature="e#5119#5152#0" expanded="true" />
+            <element signature="e#5431#5464#0" expanded="true" />
+            <element signature="e#7440#7475#0" expanded="true" />
+            <element signature="e#8950#8991#0" expanded="true" />
+            <element signature="e#9634#9661#0" expanded="true" />
+            <element signature="e#10066#10089#0" expanded="true" />
+            <element signature="e#10280#10304#0" expanded="true" />
           </folding>
         </state>
       </provider>
@@ -1513,7 +1561,9 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="1178" max-vertical-offset="1802">
           <caret line="94" column="8" selection-start-line="94" selection-start-column="8" selection-end-line="94" selection-end-column="8" />
-          <folding />
+          <folding>
+            <element signature="e#3890#3915#0" expanded="false" />
+          </folding>
         </state>
       </provider>
       <provider editor-type-id="android-designer">
@@ -1549,19 +1599,19 @@
         <state vertical-scroll-proportion="0.0" vertical-offset="2635" max-vertical-offset="4233">
           <caret line="172" column="27" selection-start-line="172" selection-start-column="27" selection-end-line="172" selection-end-column="27" />
           <folding>
-            <element signature="imports" expanded="true" />
             <element signature="e#1667#1709#0" expanded="true" />
+            <element signature="e#2339#2572#0" expanded="true" />
             <element signature="e#2553#2554#0" expanded="true" />
             <element signature="e#2618#2752#0" expanded="true" />
             <element signature="e#2741#2742#0" expanded="true" />
             <element signature="e#2881#2920#0" expanded="true" />
             <element signature="e#5119#5152#0" expanded="true" />
             <element signature="e#5431#5464#0" expanded="true" />
-            <element signature="e#7317#7352#0" expanded="true" />
-            <element signature="e#8827#8868#0" expanded="true" />
-            <element signature="e#9511#9538#0" expanded="true" />
-            <element signature="e#9943#9966#0" expanded="true" />
-            <element signature="e#10157#10181#0" expanded="true" />
+            <element signature="e#7440#7475#0" expanded="true" />
+            <element signature="e#8950#8991#0" expanded="true" />
+            <element signature="e#9634#9661#0" expanded="true" />
+            <element signature="e#10066#10089#0" expanded="true" />
+            <element signature="e#10280#10304#0" expanded="true" />
           </folding>
         </state>
       </provider>
@@ -1579,19 +1629,19 @@
         <state vertical-scroll-proportion="0.0" vertical-offset="17" max-vertical-offset="4165">
           <caret line="34" column="0" selection-start-line="34" selection-start-column="0" selection-end-line="34" selection-end-column="0" />
           <folding>
-            <element signature="imports" expanded="true" />
             <element signature="e#1667#1709#0" expanded="true" />
+            <element signature="e#2339#2572#0" expanded="true" />
             <element signature="e#2553#2554#0" expanded="true" />
             <element signature="e#2618#2752#0" expanded="true" />
             <element signature="e#2741#2742#0" expanded="true" />
             <element signature="e#2881#2920#0" expanded="true" />
             <element signature="e#5119#5152#0" expanded="true" />
             <element signature="e#5431#5464#0" expanded="true" />
-            <element signature="e#7317#7352#0" expanded="true" />
-            <element signature="e#8827#8868#0" expanded="true" />
-            <element signature="e#9511#9538#0" expanded="true" />
-            <element signature="e#9943#9966#0" expanded="true" />
-            <element signature="e#10157#10181#0" expanded="true" />
+            <element signature="e#7440#7475#0" expanded="true" />
+            <element signature="e#8950#8991#0" expanded="true" />
+            <element signature="e#9634#9661#0" expanded="true" />
+            <element signature="e#10066#10089#0" expanded="true" />
+            <element signature="e#10280#10304#0" expanded="true" />
           </folding>
         </state>
       </provider>
@@ -1609,19 +1659,19 @@
         <state vertical-scroll-proportion="0.0" vertical-offset="425" max-vertical-offset="4165">
           <caret line="31" column="6" selection-start-line="31" selection-start-column="6" selection-end-line="31" selection-end-column="6" />
           <folding>
-            <element signature="imports" expanded="true" />
             <element signature="e#1667#1709#0" expanded="true" />
+            <element signature="e#2339#2572#0" expanded="true" />
             <element signature="e#2553#2554#0" expanded="true" />
             <element signature="e#2618#2752#0" expanded="true" />
             <element signature="e#2741#2742#0" expanded="true" />
             <element signature="e#2881#2920#0" expanded="true" />
             <element signature="e#5119#5152#0" expanded="true" />
             <element signature="e#5431#5464#0" expanded="true" />
-            <element signature="e#7317#7352#0" expanded="true" />
-            <element signature="e#8827#8868#0" expanded="true" />
-            <element signature="e#9511#9538#0" expanded="true" />
-            <element signature="e#9943#9966#0" expanded="true" />
-            <element signature="e#10157#10181#0" expanded="true" />
+            <element signature="e#7440#7475#0" expanded="true" />
+            <element signature="e#8950#8991#0" expanded="true" />
+            <element signature="e#9634#9661#0" expanded="true" />
+            <element signature="e#10066#10089#0" expanded="true" />
+            <element signature="e#10280#10304#0" expanded="true" />
           </folding>
         </state>
       </provider>
@@ -1639,19 +1689,19 @@
         <state vertical-scroll-proportion="0.0" vertical-offset="136" max-vertical-offset="4165">
           <caret line="31" column="6" selection-start-line="31" selection-start-column="6" selection-end-line="31" selection-end-column="6" />
           <folding>
-            <element signature="imports" expanded="true" />
             <element signature="e#1667#1709#0" expanded="true" />
+            <element signature="e#2339#2572#0" expanded="true" />
             <element signature="e#2553#2554#0" expanded="true" />
             <element signature="e#2618#2752#0" expanded="true" />
             <element signature="e#2741#2742#0" expanded="true" />
             <element signature="e#2881#2920#0" expanded="true" />
             <element signature="e#5119#5152#0" expanded="true" />
             <element signature="e#5431#5464#0" expanded="true" />
-            <element signature="e#7317#7352#0" expanded="true" />
-            <element signature="e#8827#8868#0" expanded="true" />
-            <element signature="e#9511#9538#0" expanded="true" />
-            <element signature="e#9943#9966#0" expanded="true" />
-            <element signature="e#10157#10181#0" expanded="true" />
+            <element signature="e#7440#7475#0" expanded="true" />
+            <element signature="e#8950#8991#0" expanded="true" />
+            <element signature="e#9634#9661#0" expanded="true" />
+            <element signature="e#10066#10089#0" expanded="true" />
+            <element signature="e#10280#10304#0" expanded="true" />
           </folding>
         </state>
       </provider>
@@ -1781,13 +1831,6 @@
         <state />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/build.gradle">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.24132492" vertical-offset="0" max-vertical-offset="634">
-          <caret line="9" column="21" selection-start-line="9" selection-start-column="21" selection-end-line="9" selection-end-column="21" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/app/src/main/res/drawable/green_tracking_button.xml">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.3258786" vertical-offset="0" max-vertical-offset="626">
@@ -1796,14 +1839,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.2172524" vertical-offset="136" max-vertical-offset="782">
-          <caret line="16" column="0" selection-start-line="16" selection-start-column="0" selection-end-line="16" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/app/src/main/res/drawable/red_tracking_button.xml">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.2802198" vertical-offset="0" max-vertical-offset="728">
@@ -1812,14 +1847,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/res/values/strings.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="493">
-          <caret line="9" column="56" selection-start-line="9" selection-start-column="56" selection-end-line="9" selection-end-column="56" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_gpstracker.xml">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.110939905" vertical-offset="642" max-vertical-offset="1802">
@@ -1833,35 +1860,63 @@
         <state />
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/res/values/strings.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.21888413" vertical-offset="0" max-vertical-offset="699">
+          <caret line="9" column="56" selection-start-line="9" selection-start-column="56" selection-end-line="9" selection-end-column="56" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/websmithing/gpstracker/GpsTrackerBootReceiver.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.09728183" vertical-offset="0" max-vertical-offset="699">
+          <caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/websmithing/gpstracker/LocationService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="918" max-vertical-offset="3094">
+          <caret line="103" column="0" selection-start-line="103" selection-start-column="0" selection-end-line="103" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/build.gradle">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="561">
+          <caret line="7" column="24" selection-start-line="7" selection-start-column="24" selection-end-line="7" selection-end-column="24" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.086440675" vertical-offset="119" max-vertical-offset="765">
+          <caret line="10" column="16" selection-start-line="10" selection-start-column="16" selection-end-line="10" selection-end-column="16" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/app/src/main/java/com/websmithing/gpstracker/GpsTrackerActivity.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.65384614" vertical-offset="1054" max-vertical-offset="5032">
-          <caret line="63" column="29" selection-start-line="63" selection-start-column="29" selection-end-line="63" selection-end-column="29" />
+        <state vertical-scroll-proportion="0.87268996" vertical-offset="2074" max-vertical-offset="4709">
+          <caret line="168" column="9" selection-start-line="168" selection-start-column="9" selection-end-line="168" selection-end-column="9" />
           <folding>
-            <element signature="imports" expanded="true" />
             <element signature="e#1667#1709#0" expanded="true" />
+            <element signature="e#2339#2572#0" expanded="true" />
             <element signature="e#2553#2554#0" expanded="true" />
             <element signature="e#2618#2752#0" expanded="true" />
             <element signature="e#2741#2742#0" expanded="true" />
             <element signature="e#2881#2920#0" expanded="true" />
             <element signature="e#5119#5152#0" expanded="true" />
             <element signature="e#5431#5464#0" expanded="true" />
-            <element signature="e#7317#7352#0" expanded="true" />
-            <element signature="e#8827#8868#0" expanded="true" />
-            <element signature="e#9511#9538#0" expanded="true" />
-            <element signature="e#9943#9966#0" expanded="true" />
-            <element signature="e#10157#10181#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/websmithing/gpstracker/LocationService.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.65665233" vertical-offset="1938" max-vertical-offset="3094">
-          <caret line="166" column="73" selection-start-line="166" selection-start-column="73" selection-end-line="166" selection-end-column="73" />
-          <folding>
-            <element signature="e#7547#7548#0" expanded="true" />
-            <element signature="e#7591#7592#0" expanded="true" />
+            <element signature="e#7440#7475#0" expanded="true" />
+            <element signature="e#8950#8991#0" expanded="true" />
+            <element signature="e#9634#9661#0" expanded="true" />
+            <element signature="e#10066#10089#0" expanded="true" />
+            <element signature="e#10280#10304#0" expanded="true" />
           </folding>
         </state>
       </provider>
diff --git a/phoneClients/android/app/src/main/AndroidManifest.xml b/phoneClients/android/app/src/main/AndroidManifest.xml
index 4fb95b0..3895fff 100644
--- a/phoneClients/android/app/src/main/AndroidManifest.xml
+++ b/phoneClients/android/app/src/main/AndroidManifest.xml
@@ -9,7 +9,6 @@
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
 
     <application
-        android:debuggable="false"
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
diff --git a/phoneClients/android/app/src/main/java/com/websmithing/gpstracker/GpsTrackerActivity.java b/phoneClients/android/app/src/main/java/com/websmithing/gpstracker/GpsTrackerActivity.java
index 4985ab7..4d0d6ad 100644
--- a/phoneClients/android/app/src/main/java/com/websmithing/gpstracker/GpsTrackerActivity.java
+++ b/phoneClients/android/app/src/main/java/com/websmithing/gpstracker/GpsTrackerActivity.java
@@ -154,6 +154,8 @@
 
             currentlyTracking = true;
             editor.putBoolean("currentlyTracking", true);
+            editor.putFloat("totalDistanceInMeters", 0f);
+            editor.putBoolean("firstTimeGettingPosition", true);
             editor.putString("sessionID",  UUID.randomUUID().toString());
         }
 
diff --git a/phoneClients/android/app/src/main/java/com/websmithing/gpstracker/LocationService.java b/phoneClients/android/app/src/main/java/com/websmithing/gpstracker/LocationService.java
index 12a85d2..f10a0c1 100644
--- a/phoneClients/android/app/src/main/java/com/websmithing/gpstracker/LocationService.java
+++ b/phoneClients/android/app/src/main/java/com/websmithing/gpstracker/LocationService.java
@@ -39,9 +39,6 @@
     private boolean currentlyProcessingLocation = false;
     private LocationRequest locationRequest;
     private LocationClient locationClient;
-    private Location previousLocation;
-    private float totalDistanceInMeters = 0.0f;
-    private boolean firstTimeGettingPosition = true;
 
     @Override
     public void onCreate() {
@@ -66,13 +63,6 @@
 
         currentlyProcessingLocation = true;
 
-        // totalDistanceInMeters = 0.0f;
-
-        locationRequest = LocationRequest.create();
-        locationRequest.setInterval(1000); // milliseconds
-        locationRequest.setFastestInterval(1000); // the fastest rate in milliseconds at which your app can handle location updates
-        locationRequest.setPriority(LocationRequest.PRIORITY_HIGH_ACCURACY);
-
         if (GooglePlayServicesUtil.isGooglePlayServicesAvailable(this) == ConnectionResult.SUCCESS) {
             locationClient = new LocationClient(this,this,this);
 
@@ -90,15 +80,28 @@
         dateFormat.setTimeZone(TimeZone.getDefault());
         Date date = new Date(location.getTime());
 
+        SharedPreferences sharedPreferences = this.getSharedPreferences("com.websmithing.gpstracker.prefs", Context.MODE_PRIVATE);
+        SharedPreferences.Editor editor = sharedPreferences.edit();
+
+        float totalDistanceInMeters = sharedPreferences.getFloat("totalDistanceInMeters", 0f);
+        boolean firstTimeGettingPosition = sharedPreferences.getBoolean("firstTimeGettingPosition", true);
+
         if (firstTimeGettingPosition) {
-            firstTimeGettingPosition = false;
+            editor.putBoolean("firstTimeGettingPosition", false);
+            editor.putFloat("previousLatitude", (float)location.getLatitude());
+            editor.putFloat("previousLongitude", (float)location.getLongitude());
+            editor.commit();
         } else {
+            Location previousLocation = new Location("");
+            previousLocation.setLatitude(sharedPreferences.getFloat("previousLatitude", 0f));
+            previousLocation.setLongitude(sharedPreferences.getFloat("previousLongitude", 0f));
+
             float distance = location.distanceTo(previousLocation);
             totalDistanceInMeters += distance;
+            editor.putFloat("totalDistanceInMeters", totalDistanceInMeters);
+            editor.commit();
         }
 
-        previousLocation = location;
-
         RequestParams requestParams = new RequestParams();
         requestParams.put("latitude", Double.toString(location.getLatitude()));
         requestParams.put("longitude", Double.toString(location.getLongitude()));
@@ -116,8 +119,6 @@
             requestParams.put("distance", 0); // in miles
         }
 
-        SharedPreferences sharedPreferences = this.getSharedPreferences("com.websmithing.gpstracker.prefs", Context.MODE_PRIVATE);
-
         // phoneNumber is just an identifying string in the database, can be any identifier.
         requestParams.put("phonenumber", sharedPreferences.getString("userName", ""));
         requestParams.put("sessionid", sharedPreferences.getString("sessionID", "")); // uuid
@@ -143,11 +144,6 @@
     @Override
     public void onDestroy() {
         super.onDestroy();
-
-        if (locationClient != null && locationClient.isConnected()) {
-            locationClient.removeLocationUpdates(this);
-            locationClient.disconnect();
-        }
     }
 
     @Override
@@ -163,16 +159,19 @@
             // we have our desired accuracy of 100 meters so lets quit this service,
             // onDestroy will be called and stop our location uodates
             if (location.getAccuracy() < 100.0f) {
-                SharedPreferences sharedPreferences = this.getSharedPreferences("com.websmithing.gpstracker.prefs", Context.MODE_PRIVATE);
-                String sessionID = sharedPreferences.getString("sessionID", "");
-
-                if (sessionID.trim().length() != 0) {
-                    sendLocationDataToWebsite(location);
-                }
+                stopLocationUpdates();
+                sendLocationDataToWebsite(location);
             }
         }
     }
 
+    private void stopLocationUpdates() {
+        if (locationClient != null && locationClient.isConnected()) {
+            locationClient.removeLocationUpdates(this);
+            locationClient.disconnect();
+        }
+    }
+
     /**
      * Called by Location Services when the request to connect the
      * client finishes successfully. At this point, you can
@@ -182,6 +181,11 @@
     public void onConnected(Bundle bundle) {
         Log.d(TAG, "onConnected");
 
+        locationRequest = LocationRequest.create();
+        locationRequest.setInterval(1000); // milliseconds
+        locationRequest.setFastestInterval(1000); // the fastest rate in milliseconds at which your app can handle location updates
+        locationRequest.setPriority(LocationRequest.PRIORITY_HIGH_ACCURACY);
+
         locationClient.requestLocationUpdates(locationRequest, this);
     }