diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ffea1a9..368a323 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -6,6 +6,7 @@
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java b/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java
index a24a0b0..2eef22e 100644
--- a/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java
+++ b/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java
@@ -17,6 +17,7 @@
 import android.location.LocationManager;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
+import android.net.wifi.WifiManager;
 import android.os.AsyncTask;
 import android.provider.Settings;
 import android.support.design.widget.FloatingActionButton;
@@ -84,6 +85,7 @@
     private static final String API_KEY = "fd4034defae557fd5f2fdaaf73c3402c";
     private static ConnectivityManager cm;
     private static TelephonyManager tm;
+    private static WifiManager wm;
     private static NetworkInfo activeNetwork;
     private static int networkStrength;
 
@@ -135,10 +137,11 @@
         res = getResources();
 
         cm = (ConnectivityManager) getSystemService(CONNECTIVITY_SERVICE);
-        tm = (TelephonyManager) getSystemService(TELEPHONY_SERVICE);
-        tm.listen(new MyPhoneStateListener(), PhoneStateListener.LISTEN_SIGNAL_STRENGTHS);
         activeNetwork = cm.getActiveNetworkInfo();
         networkStrength = 0;
+        tm = (TelephonyManager) getSystemService(TELEPHONY_SERVICE);
+        tm.listen(new MyPhoneStateListener(), PhoneStateListener.LISTEN_SIGNAL_STRENGTHS);
+        wm = (WifiManager) getSystemService(WIFI_SERVICE);
 
         df_hm = new SimpleDateFormat(res.getString(R.string.date_format_hm));
         df_full = new SimpleDateFormat(res.getString(R.string.date_format_full));
@@ -847,6 +850,20 @@
         }
     }
 
+    private void addWifiPoi(){
+        //TODO
+        setActiveNetwork();
+        if(activeNetwork != null && activeNetwork.isConnected()){
+            if(activeNetwork.getType() == ConnectivityManager.TYPE_WIFI){
+                String ssid = wm.getConnectionInfo().getSSID();
+            } else {
+                Log.d(TAG, "Wifi network not available/connected");
+            }
+        } else {
+            Log.d(TAG, "You are not connected to any network");
+        }
+    }
+
     private long addPoi(int _type){
         double _lat = mLocation.getLatitude();
         double _lon = mLocation.getLongitude();