diff --git a/2015/android/Geofence/headunitservicemock/src/main/AndroidManifest.xml b/2015/android/Geofence/headunitservicemock/src/main/AndroidManifest.xml
index ca8576c..a35541e 100644
--- a/2015/android/Geofence/headunitservicemock/src/main/AndroidManifest.xml
+++ b/2015/android/Geofence/headunitservicemock/src/main/AndroidManifest.xml
@@ -1,9 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.esrlabs.headunitservicemock">
-
-    <application android:allowBackup="true" android:label="@string/app_name"
-        android:icon="@mipmap/ic_launcher" android:theme="@style/AppTheme">
+    package="com.esrlabs.headunitservicemock" >
 
+    <application
+        android:allowBackup="true"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:theme="@style/AppTheme" >
+        <service
+            android:name=".HeadUnitService"
+            android:enabled="true"
+            android:exported="true" >
+        </service>
     </application>
 
 </manifest>
diff --git a/2015/android/Geofence/headunitservicemock/src/main/java/com/esrlabs/headunitservicemock/HeadUnitService.java b/2015/android/Geofence/headunitservicemock/src/main/java/com/esrlabs/headunitservicemock/HeadUnitService.java
new file mode 100644
index 0000000..3013b2f
--- /dev/null
+++ b/2015/android/Geofence/headunitservicemock/src/main/java/com/esrlabs/headunitservicemock/HeadUnitService.java
@@ -0,0 +1,45 @@
+package com.esrlabs.headunitservicemock;
+
+import android.app.Notification;
+import android.app.NotificationManager;
+import android.app.Service;
+import android.content.Context;
+import android.content.Intent;
+import android.os.IBinder;
+import android.os.RemoteException;
+
+import com.esrlabs.headunitinterface.HeadUnit;
+
+/**
+ * A test implementation of the HeadUnit interface
+ *
+ * Provides a way to run against the interface without the presence of a real headunit
+ *
+ * Will use the Android UI instead
+ */
+public class HeadUnitService extends Service {
+    public HeadUnitService() {
+    }
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        return binder;
+    }
+
+    private final HeadUnit.Stub binder = new HeadUnit.Stub() {
+        @Override
+        public void showNotification(String text) throws RemoteException {
+            Notification.Builder builder = new Notification.Builder(getBaseContext()).setContentText(text).setSmallIcon(R.drawable.tum_logo);
+            notificationService().notify(0,builder.build());
+        }
+
+        @Override
+        public void hideAllNotifications() throws RemoteException {
+            notificationService().cancelAll();
+        }
+    };
+
+    private NotificationManager notificationService() {
+        return (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
+    }
+}
diff --git a/2015/android/Geofence/headunitservicemock/src/main/res/drawable/tum_logo.gif b/2015/android/Geofence/headunitservicemock/src/main/res/drawable/tum_logo.gif
new file mode 100644
index 0000000..6e628f7
Binary files /dev/null and b/2015/android/Geofence/headunitservicemock/src/main/res/drawable/tum_logo.gif differ