diff --git a/.idea/dictionaries/user.xml b/.idea/dictionaries/user.xml
deleted file mode 100644
index a14b263b982d2aacd04c680da5345d7aa949906a..0000000000000000000000000000000000000000
--- a/.idea/dictionaries/user.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<component name="ProjectDictionaryState">
-  <dictionary name="user" />
-</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 04c63e41f3771e1aeccd983a1512d164af3ddf22..5d19981032aa01b060f5a568641d7a8840cc90dc 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -27,22 +27,6 @@
       </value>
     </option>
   </component>
-  <component name="ProjectInspectionProfilesVisibleTreeState">
-    <entry key="Project Default">
-      <profile-state>
-        <expanded-state>
-          <State>
-            <id />
-          </State>
-        </expanded-state>
-        <selected-state>
-          <State>
-            <id>Android</id>
-          </State>
-        </selected-state>
-      </profile-state>
-    </entry>
-  </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="false">
     <OptionsSetting value="true" id="Add" />
     <OptionsSetting value="true" id="Remove" />
@@ -59,19 +43,4 @@
   <component name="ProjectType">
     <option name="id" value="Android" />
   </component>
-  <component name="masterDetails">
-    <states>
-      <state key="ScopeChooserConfigurable.UI">
-        <settings>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-    </states>
-  </component>
 </project>
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index fd807553666bfd08ced8ff36e00acefb6404edb3..8000385d0053366a2f81d702a331787c07e4a171 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -4,13 +4,17 @@
 
     <uses-permission android:name="android.permission.SEND_SMS" />
     <uses-permission android:name="android.permission.READ_CONTACTS" />
-    <uses-permission android:name="android.permission.RECEIVE_SMS">
-        <uses-permission android:name="android.permission.READ_SMS" />
-    </uses-permission>
+    <uses-permission android:name="android.permission.RECEIVE_SMS" />
+    <uses-permission android:name="android.permission.READ_SMS" />
+    <uses-permission android:name="com.google.android.providers.gsf.permission.READ_GSERVICES"/>
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+
 
     <application
         android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
+        android:icon="@mipmap/kms"
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
diff --git a/app/src/main/java/com/speedyapps/keepyousafe/MainActivity.java b/app/src/main/java/com/speedyapps/keepyousafe/MainActivity.java
index b520fe88bde843d746e35643caee6c328e5293da..a48e940f833185d5c082e229cd53a3ce47e7255e 100644
--- a/app/src/main/java/com/speedyapps/keepyousafe/MainActivity.java
+++ b/app/src/main/java/com/speedyapps/keepyousafe/MainActivity.java
@@ -6,6 +6,7 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
+import android.location.Location;
 import android.os.Build;
 import android.support.annotation.MainThread;
 import android.support.annotation.RequiresApi;
@@ -17,6 +18,7 @@ import android.telephony.SmsManager;
 import android.util.Log;
 import android.view.View;
 import android.widget.ImageButton;
+import android.widget.TextView;
 import android.widget.Toast;
 
 import java.util.ArrayList;
@@ -25,6 +27,8 @@ import java.util.List;
 public class MainActivity extends AppCompatActivity {
     Intent intent;
     int choice;
+    private TextView textView;
+    private GpsTool gpsTool;
     SharedPreferences firsttime;
     private static final int REQUEST_CODE_ASK_MULTIPLE_PERMISSIONS = 291;
     int backCount=0;
@@ -66,6 +70,17 @@ public class MainActivity extends AppCompatActivity {
 
         });
 
+        textView = (TextView) this.findViewById(R.id.loc);
+        if (gpsTool == null) {
+            gpsTool = new GpsTool(this) {
+                @Override
+                public void onGpsLocationChanged(Location location) {
+                    super.onGpsLocationChanged(location);
+                    refreshLocation(location);
+                }
+            };
+        }
+
     }
 
 
@@ -138,4 +153,26 @@ public class MainActivity extends AppCompatActivity {
                 .create()
                 .show();
     }
+    private void refreshLocation(Location location) {
+        Double longitude = location.getLongitude();
+        Double latitude = location.getLatitude();
+        Double altitude = location.getAltitude();
+        StringBuilder sb = new StringBuilder();
+        sb.append("Longitude:").append(longitude).append("\n");
+        sb.append("Latitude:").append(latitude).append("\n");
+        sb.append("Altitude:").append(altitude);
+        textView.setText(sb.toString());
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+        gpsTool.stopGpsUpdate();
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        gpsTool.startGpsUpdate();
+    }
 }
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index d27e1ae7d99aa486880d708d58c41d2a33bf0b7f..3c709a1b3cfbbf7129f6cbff5258514a56a103f7 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -12,6 +12,17 @@
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
     tools:context="com.speedyapps.keepyousafe.MainActivity">
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Location"
+        android:id="@+id/loc"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentTop="true" />
 
     <TextView
         android:text="Keep Me Safe!"