diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a95046f..7bd52a9 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -3,6 +3,8 @@
     package="de.apps4ics.mountainnavigation" >
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
 
     <application
         android:allowBackup="true"
diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java b/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java
index 8fde660..7a410b6 100644
--- a/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java
+++ b/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java
@@ -5,9 +5,15 @@
 import android.app.Dialog;
 import android.app.DialogFragment;
 import android.content.DialogInterface;
+import android.content.Intent;
 import android.graphics.Color;
 import android.graphics.Typeface;
+import android.location.Criteria;
+import android.location.Location;
+import android.location.LocationListener;
+import android.location.LocationManager;
 import android.os.Environment;
+import android.provider.Settings;
 import android.support.design.widget.FloatingActionButton;
 import android.support.v4.view.GravityCompat;
 import android.support.v7.app.ActionBarActivity;
@@ -50,7 +56,7 @@
 
 import static android.app.PendingIntent.getActivity;
 
-public class MainActivity extends AppCompatActivity {
+public class MainActivity extends AppCompatActivity implements LocationListener {
 
     private static final String TAG = "MountainNavigation";
     /**
@@ -64,6 +70,8 @@
     private CharSequence mDrawerTitle;
     // name of the map file in the external storage
     private static final String MAPFILE = "greece.map";
+    private static final int GPS_MIN_TIME = 5000;
+    private static final int GPS_MIN_DIST = 5;
 
     private FloatingActionButton fab;
 
@@ -79,6 +87,10 @@
     private DrawerLayout drawerLayout;
     private ListView listView;
 
+    private String provider;
+    private Location mLocation;
+    private LocationManager locationManager;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -104,6 +116,8 @@
 
         mTitle = mDrawerTitle = getTitle();
 
+        initGps();
+
         fountainSizes = getResources().getStringArray(R.array.fountain_size_dialog_options);
         fountainImgs = new Integer[]{
                 R.drawable.fountain_size_small,
@@ -174,6 +188,40 @@
                 drawerLayout.setDrawerListener(drawerToggle);
     }
 
+    private void initGps(){
+        locationManager = (LocationManager) getSystemService(LOCATION_SERVICE);
+        boolean isLocationEnabled = locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER);
+        if(!isLocationEnabled){
+            Intent intent = new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS);
+            startActivity(intent);
+        }
+        Criteria criteria = new Criteria();
+        provider = locationManager.getBestProvider(criteria, false);
+        mLocation = locationManager.getLastKnownLocation(provider);
+    }
+
+    @Override
+    public void onLocationChanged(Location location) {
+        mLocation = location;
+        if(mLocation == null) return;
+        Toast.makeText(getApplicationContext(), "New Location: " + mLocation, Toast.LENGTH_LONG).show();
+    }
+
+    @Override
+    public void onStatusChanged(String provider, int status, Bundle extras) {
+
+    }
+
+    @Override
+    public void onProviderEnabled(String provider) {
+
+    }
+
+    @Override
+    public void onProviderDisabled(String provider) {
+
+    }
+
     public class AddPoiDialog extends DialogFragment {
         @Override
         public Dialog onCreateDialog(Bundle savedInstanceState) {
@@ -263,6 +311,18 @@
     }
 
     @Override
+    protected void onResume() {
+        super.onResume();
+        locationManager.requestLocationUpdates(provider, GPS_MIN_TIME, GPS_MIN_DIST, this);
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+        locationManager.removeUpdates(this);
+    }
+
+    @Override
     protected void onDestroy() {
         super.onDestroy();
         this.mapView.destroyAll();