diff --git a/androidgcs/AndroidManifest.xml b/androidgcs/AndroidManifest.xml
index 6c89f2632..9a3d1dd25 100644
--- a/androidgcs/AndroidManifest.xml
+++ b/androidgcs/AndroidManifest.xml
@@ -1,23 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="org.openpilot.androidgcs"
-      android:versionCode="1"
-      android:versionName="1.0">
-    <uses-sdk android:minSdkVersion="7" />
+	package="org.openpilot.androidgcs" android:versionCode="1"
+	android:versionName="1.0">
+	<uses-sdk android:minSdkVersion="7" />
 
 	<uses-permission android:name="android.permission.BLUETOOTH" />
 	<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
-	
-    <application android:icon="@drawable/icon" android:label="@string/app_name" >
 
-        <activity android:name="ObjectBrowser"
-                  android:label="@string/app_name">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
+	<application android:icon="@drawable/icon" android:label="@string/app_name">
+
+		<!-- Object browser - main activity at the moment -->
+		<activity android:name="ObjectBrowser" android:label="@string/app_name">
+			<intent-filter>
+				<action android:name="android.intent.action.MAIN" />
+				<category android:name="android.intent.category.LAUNCHER" />
+			</intent-filter>
+			<intent-filter>
+				<action android:name="org.openpilot.intent.action.CONNECTED" />
+				<action android:name="org.openpilot.intent.action.DISCONNECTED" />
+			</intent-filter>
+		</activity>
+
+		<receiver android:name="TelemetryWidget">
+			<intent-filter>
+				<action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+			</intent-filter>
+			<intent-filter>
+				<action android:name="org.openpilot.intent.action.CONNECTED" />
+				<action android:name="org.openpilot.intent.action.DISCONNECTED" />
+			</intent-filter>
+			<meta-data android:name="android.appwidget.provider"
+				android:resource="@xml/telemetry_widget_info" />
+		</receiver>
 
 		<service android:name=".OPTelemetryService"></service>
-    </application>
+	</application>
 </manifest>
\ No newline at end of file
diff --git a/androidgcs/res/layout/telemetry_widget.xml b/androidgcs/res/layout/telemetry_widget.xml
new file mode 100644
index 000000000..6af378104
--- /dev/null
+++ b/androidgcs/res/layout/telemetry_widget.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent">
+    <TextView android:text="TextView" android:layout_width="wrap_content" android:id="@+id/telemetryWidgetStatus" android:layout_height="wrap_content"></TextView>
+</LinearLayout>
diff --git a/androidgcs/src/org/openpilot/androidgcs/TelemetryWidget.java b/androidgcs/src/org/openpilot/androidgcs/TelemetryWidget.java
new file mode 100644
index 000000000..90ab80899
--- /dev/null
+++ b/androidgcs/src/org/openpilot/androidgcs/TelemetryWidget.java
@@ -0,0 +1,31 @@
+package org.openpilot.androidgcs;
+
+import android.appwidget.AppWidgetManager;
+import android.appwidget.AppWidgetProvider;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.widget.RemoteViews;
+
+public class TelemetryWidget extends AppWidgetProvider {
+	
+	private static boolean connected = false;
+
+	public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
+        final int N = appWidgetIds.length;
+
+        // Perform this loop procedure for each App Widget that belongs to this provider
+        for (int i=0; i<N; i++) {
+            int appWidgetId = appWidgetIds[i];
+
+            // Get the layout for the App Widget and attach an on-click listener to the button
+            RemoteViews views = new RemoteViews(context.getPackageName(), R.layout.telemetry_widget);
+            //views.setOnClickPendingIntent(R.id.button, pendingIntent);
+
+            // Tell the AppWidgetManager to perform an update on the current App Widget
+            appWidgetManager.updateAppWidget(appWidgetId, views);
+        }
+    }
+    
+
+}