diff --git a/.gitignore b/.gitignore
index 5dac550..bd1d989 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,4 +19,4 @@ gen-external-apklibs
 .idea
 out
 .DS_Store
-
+classes
diff --git a/README.md b/README.md
index 393dac5..eb5cf27 100644
--- a/README.md
+++ b/README.md
@@ -1,26 +1,60 @@
 # Android Bootstrap App
 
 This repository contains the source code for the [Android Bootstrap](http://www.androidbootstrap.com/)
-Android app available soon from [Google Play](https://play.google.com/store/apps/details?id=com.donnfelker.android.bootstrap).
-
-
+Android app available from [Google Play](https://play.google.com/store/apps/details?id=com.donnfelker.android.bootstrap).
 
 Please see the [issues](https://github.com/donnfelker/android-bootstrap/issues) section
 to report any bugs or feature requests and to see the list of known issues.
 
-<a href="https://play.google.com/store/apps/details?id=com.donnfelker.android.bootstrap" alt="Download from Google Play (soon)">
+Have a questions about Android Bootstrap? Ask away on the [android-bootstrap discussion forum](https://groups.google.com/forum/#!forum/android-bootstrap). 
+
+<a href="https://play.google.com/store/apps/details?id=com.donnfelker.android.bootstrap" alt="Download from Google Play">
   <img src="http://f.cl.ly/items/000s3k2I2J1V281X2A1f/bootstrap-image.png">
 </a>
 
+## HOW TO
+Learn how to develop with IntelliJ and Maven. [Watch the how to video](http://www.youtube.com/watch?v=YbyzRNxcvZw&feature=youtube_gdata)
+
+## Authentication
+Log into this demo app with the following credentials:
+
+user: demo@androidbootstrap.com
+
+password: android
+
+
+## Generating your Bootstrap App
+Why generate? Simple ... renaming files, folders, copy and pasting is SUPER error prone and well... it sucks overall. This can easily take a few days with debugging if you run into issues and perform a lot of typo's. Using the generator on [AndroidBootstrap.com](http://www.androidbootstrap.com) you can generate your application with your application name as well as the package (and folder structure) that you want to work with. 
+
+As an example, you know that you want your app name and package to the following: 
+
+  - *App Name*: Notify
+  - *Package Name*: com.notify.app.mobile
+
+After generating the app on [AndroidBootstrap.com](http://www.androidbootstrap.com) the folder structure of the source code for the app will change:
+
+  - From: __com/donnfelker/android/bootstrap__ 
+  - To: __com/notify/app/mobile__
+
+At that point all the source files that were located in ____com/donnfelker/android/bootstrap__ will be moved to the new folder __com/notify/app/mobile__. 
+
+All import statments that reference the old resources (__R.com.donnfelker.android.bootstrap.R__) will now be renamed to the correct package. The artifact id's in the *pom.xml* (and various other places) will be replaced. The App Name will be replaced in the strings/etc. 
+
+The end result is that you will be given a zip file with the correct structure. Open the zip and then execute *mvn clean package* and your app should be ready for development. 
+
+Enjoy!
+
+The application 
+
 ## License
 
 * [Apache Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.html)
 
 
-Copyright 2012 Donn Felker
+Copyright 2013 Donn Felker
 
 
-Copyright 2012 GitHub Inc.
+Copyright 2013 GitHub Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -70,10 +104,12 @@ and uses many great open-source libraries from the Android dev community:
 * [ActionBarSherlock](https://github.com/JakeWharton/ActionBarSherlock) for a
   consistent, great looking header across all Android platforms,
   [ViewPagerIndicator](https://github.com/JakeWharton/Android-ViewPagerIndicator)
-  for swiping between content, traffic, & referrer pages, and
-  [NineOldAndroids](https://github.com/JakeWharton/NineOldAndroids) for the
-  AirTraffic view animations - all from [Jake Wharton](http://jakewharton.com/).
-* [RoboGuice](http://code.google.com/p/roboguice/) for dependency-injection.
+  for swiping between fragments and
+  [NineOldAndroids](https://github.com/JakeWharton/NineOldAndroids) for 
+  view animations - all from [Jake Wharton](http://jakewharton.com/).
+* [Dagger](https://github.com/square/dagger) for dependency-injection.
+* [ButterKnife](https://github.com/JakeWharton/butterknife) for view injection
+* [Otto](https://github.com/square/otto) as the event bus
 * [Robotium](http://code.google.com/p/robotium/)
   for driving our app during integration tests.
 * [android-maven-plugin](https://github.com/jayway/maven-android-plugin)
diff --git a/app/AndroidManifest.xml b/app/AndroidManifest.xml
index 30e28d0..f26e711 100644
--- a/app/AndroidManifest.xml
+++ b/app/AndroidManifest.xml
@@ -34,6 +34,11 @@
             </intent-filter>
         </activity>
 
+        <activity android:name=".ui.BootstrapTimerActivity"
+                  android:configChanges="orientation|keyboardHidden|screenSize" android:label="@string/app_name"
+                  android:launchMode="singleTop"/>
+
+        <service android:name=".core.TimerService" android:enabled="true" android:exported="false" />
 
         <service
             android:name=".authenticator.AccountAuthenticatorService"
diff --git a/app/pom.xml b/app/pom.xml
index b01296e..bc08cb7 100644
--- a/app/pom.xml
+++ b/app/pom.xml
@@ -10,13 +10,14 @@
     <url>https://github.com/donnfelker/android-bootstrap</url>
 
     <parent>
-        <version>1.4</version>
+        <version>1.0</version>
         <groupId>com.donnfelker.android.bootstrap</groupId>
         <artifactId>android-bootstrap-parent</artifactId>
     </parent>
 
     <properties>
-        <abs.version>4.1.0</abs.version>
+        <abs.version>4.2.0</abs.version>
+        <dagger.version>1.0-SNAPSHOT</dagger.version>
     </properties>
     <dependencies>
         <dependency>
@@ -28,17 +29,23 @@
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.1</version>
+            <version>2.2.2</version>
         </dependency>
         <dependency>
-            <groupId>com.github.rtyley</groupId>
-            <artifactId>roboguice-sherlock</artifactId>
-            <version>1.4</version>
+            <groupId>com.squareup.dagger</groupId>
+            <artifactId>dagger</artifactId>
+            <version>${dagger.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.roboguice</groupId>
-            <artifactId>roboguice</artifactId>
-            <version>2.0</version>
+            <groupId>com.squareup.dagger</groupId>
+            <artifactId>dagger-compiler</artifactId>
+            <version>${dagger.version}</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>com.jakewharton</groupId>
+            <artifactId>butterknife</artifactId>
+            <version>1.3.0</version>
         </dependency>
         <dependency>
             <groupId>com.actionbarsherlock</groupId>
@@ -48,7 +55,7 @@
         </dependency>
         <dependency>
             <groupId>com.actionbarsherlock</groupId>
-            <artifactId>library</artifactId>
+            <artifactId>actionbarsherlock</artifactId>
             <version>${abs.version}</version>
             <type>jar</type>
             <scope>provided</scope>
@@ -56,18 +63,18 @@
         <dependency>
             <groupId>com.github.kevinsawicki</groupId>
             <artifactId>http-request</artifactId>
-            <version>2.1</version>
+            <version>3.0</version>
         </dependency>
         <dependency>
             <groupId>com.viewpagerindicator</groupId>
             <artifactId>library</artifactId>
-            <version>2.3.1</version>
+            <version>2.4.1</version>
             <type>apklib</type>
         </dependency>
         <dependency>
             <groupId>com.nineoldandroids</groupId>
             <artifactId>library</artifactId>
-            <version>2.2.0</version>
+            <version>2.4.0</version>
         </dependency>
         <dependency>
             <groupId>com.github.kevinsawicki</groupId>
@@ -77,25 +84,30 @@
         <dependency>
             <groupId>com.github.kevinsawicki</groupId>
             <artifactId>wishlist</artifactId>
-            <version>0.3</version>
+            <version>0.8</version>
             <type>apklib</type>
         </dependency>
+        <dependency>
+            <groupId>com.squareup</groupId>
+            <artifactId>otto</artifactId>
+            <version>1.3.2</version>
+        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.10</version>
+            <version>4.11</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest-library</artifactId>
-            <version>1.3.RC2</version>
+            <version>1.3</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>1.9.0</version>
+            <version>1.9.5</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -104,6 +116,13 @@
             <plugin>
                 <groupId>com.jayway.maven.plugins.android.generation2</groupId>
                 <artifactId>android-maven-plugin</artifactId>
+                <dependencies>
+                    <dependency>
+                        <groupId>com.squareup.dagger</groupId>
+                        <artifactId>dagger-compiler</artifactId>
+                        <version>${dagger.version}</version>
+                    </dependency>
+                </dependencies>
             </plugin>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
@@ -150,7 +169,7 @@
                                      Also, if you have a ci (Continuous Integration) profile, these values can be
                                      passed in via the build server. -->
                                     <keystore>${bootstrap.sign.keystore}</keystore>
-                                    <alias>${boostrap.sign.alias}</alias>
+                                    <alias>${bootstrap.sign.alias}</alias>
                                     <storepass>${bootstrap.sign.storepass}</storepass>
                                     <keypass>${bootstrap.sign.keypass}</keypass>
                                     <verbose>true</verbose>
diff --git a/app/res/drawable-hdpi-v11/ic_stat_ab_notification.png b/app/res/drawable-hdpi-v11/ic_stat_ab_notification.png
new file mode 100755
index 0000000..3b28155
Binary files /dev/null and b/app/res/drawable-hdpi-v11/ic_stat_ab_notification.png differ
diff --git a/app/res/drawable-hdpi-v9/ic_stat_ab_notification.png b/app/res/drawable-hdpi-v9/ic_stat_ab_notification.png
new file mode 100755
index 0000000..72d24f6
Binary files /dev/null and b/app/res/drawable-hdpi-v9/ic_stat_ab_notification.png differ
diff --git a/app/res/drawable-hdpi/ic_action_timer.png b/app/res/drawable-hdpi/ic_action_timer.png
new file mode 100755
index 0000000..dda32bd
Binary files /dev/null and b/app/res/drawable-hdpi/ic_action_timer.png differ
diff --git a/app/res/drawable-hdpi/ic_stat_ab_notification.png b/app/res/drawable-hdpi/ic_stat_ab_notification.png
new file mode 100755
index 0000000..d3d4d39
Binary files /dev/null and b/app/res/drawable-hdpi/ic_stat_ab_notification.png differ
diff --git a/app/res/drawable-ldpi-v11/ic_stat_ab_notification.png b/app/res/drawable-ldpi-v11/ic_stat_ab_notification.png
new file mode 100755
index 0000000..b8685af
Binary files /dev/null and b/app/res/drawable-ldpi-v11/ic_stat_ab_notification.png differ
diff --git a/app/res/drawable-ldpi-v9/ic_stat_ab_notification.png b/app/res/drawable-ldpi-v9/ic_stat_ab_notification.png
new file mode 100755
index 0000000..944778f
Binary files /dev/null and b/app/res/drawable-ldpi-v9/ic_stat_ab_notification.png differ
diff --git a/app/res/drawable-mdpi-v11/ic_stat_ab_notification.png b/app/res/drawable-mdpi-v11/ic_stat_ab_notification.png
new file mode 100755
index 0000000..d4087e5
Binary files /dev/null and b/app/res/drawable-mdpi-v11/ic_stat_ab_notification.png differ
diff --git a/app/res/drawable-mdpi-v9/ic_stat_ab_notification.png b/app/res/drawable-mdpi-v9/ic_stat_ab_notification.png
new file mode 100755
index 0000000..6011074
Binary files /dev/null and b/app/res/drawable-mdpi-v9/ic_stat_ab_notification.png differ
diff --git a/app/res/drawable-mdpi/ic_action_timer.png b/app/res/drawable-mdpi/ic_action_timer.png
new file mode 100755
index 0000000..475b0c6
Binary files /dev/null and b/app/res/drawable-mdpi/ic_action_timer.png differ
diff --git a/app/res/drawable-mdpi/ic_stat_ab_notification.png b/app/res/drawable-mdpi/ic_stat_ab_notification.png
new file mode 100755
index 0000000..d763f38
Binary files /dev/null and b/app/res/drawable-mdpi/ic_stat_ab_notification.png differ
diff --git a/app/res/drawable-xhdpi-v11/ic_stat_ab_notification.png b/app/res/drawable-xhdpi-v11/ic_stat_ab_notification.png
new file mode 100755
index 0000000..b321d3a
Binary files /dev/null and b/app/res/drawable-xhdpi-v11/ic_stat_ab_notification.png differ
diff --git a/app/res/drawable-xhdpi-v9/ic_stat_ab_notification.png b/app/res/drawable-xhdpi-v9/ic_stat_ab_notification.png
new file mode 100755
index 0000000..1f33587
Binary files /dev/null and b/app/res/drawable-xhdpi-v9/ic_stat_ab_notification.png differ
diff --git a/app/res/drawable-xhdpi/ic_action_timer.png b/app/res/drawable-xhdpi/ic_action_timer.png
new file mode 100755
index 0000000..1c2ca4f
Binary files /dev/null and b/app/res/drawable-xhdpi/ic_action_timer.png differ
diff --git a/app/res/drawable-xhdpi/ic_stat_ab_notification.png b/app/res/drawable-xhdpi/ic_stat_ab_notification.png
new file mode 100755
index 0000000..8d8c0e9
Binary files /dev/null and b/app/res/drawable-xhdpi/ic_stat_ab_notification.png differ
diff --git a/app/res/drawable/button_background_pressed.xml b/app/res/drawable/button_background_pressed.xml
new file mode 100644
index 0000000..6dcb77f
--- /dev/null
+++ b/app/res/drawable/button_background_pressed.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <gradient
+            android:angle="270"
+            android:endColor="@color/button_background_pressed_end"
+            android:startColor="@color/button_background_pressed_start" />
+
+    <corners android:radius="3dp" />
+
+</shape>
\ No newline at end of file
diff --git a/app/res/drawable/button_background_states.xml b/app/res/drawable/button_background_states.xml
index 6aebde7..eafea6f 100644
--- a/app/res/drawable/button_background_states.xml
+++ b/app/res/drawable/button_background_states.xml
@@ -2,7 +2,8 @@
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:drawable="@drawable/button_background_enabled" android:state_enabled="true"/>
+    <item android:drawable="@drawable/button_background_pressed" android:state_pressed="true" />
     <item android:drawable="@drawable/button_background_disabled" android:state_enabled="false"/>
+    <item android:drawable="@drawable/button_background_enabled" />
 
 </selector>
\ No newline at end of file
diff --git a/app/res/layout/bootstrap_timer.xml b/app/res/layout/bootstrap_timer.xml
new file mode 100644
index 0000000..5367a92
--- /dev/null
+++ b/app/res/layout/bootstrap_timer.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="vertical"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent">
+
+    <TextView
+        android:id="@+id/chronometer"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:text="00:00:00"
+        style="@style/TimerChronometer"
+        />
+
+    <Button
+        android:id="@+id/start"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/start"
+        style="@style/BootstrapButton"
+        />
+
+    <Button
+        android:id="@+id/stop"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/stop"
+        android:visibility="gone"
+        style="@style/BootstrapButton"
+        />
+
+    <Button
+        android:id="@+id/pause"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/pause"
+        android:visibility="gone"
+        style="@style/BootstrapButton"
+        />
+
+    <Button
+        android:id="@+id/resume"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/resume"
+        android:visibility="gone"
+        style="@style/BootstrapButton"
+        />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/res/menu/bootstrap.xml b/app/res/menu/bootstrap.xml
index 17f5d88..ae6cf3c 100644
--- a/app/res/menu/bootstrap.xml
+++ b/app/res/menu/bootstrap.xml
@@ -10,6 +10,13 @@
         android:title="@string/refresh_action" >
     </item>
 
+    <item
+        android:id="@+id/timer"
+        android:icon="@drawable/ic_action_timer"
+        android:showAsAction="always"
+        android:title="@string/timer">
+    </item>
+
     <item
         android:id="@+id/logout"
         android:showAsAction="never"
diff --git a/app/res/values/colors.xml b/app/res/values/colors.xml
index ea34552..5403e4d 100644
--- a/app/res/values/colors.xml
+++ b/app/res/values/colors.xml
@@ -27,6 +27,8 @@
     <color name="main_background_end">#2C2C2C</color>
     <color name="button_background_enabled_start">#1fb6ed</color>
     <color name="button_background_enabled_end">#1c9ac8</color>
+    <color name="button_background_pressed_start">#f76500</color>
+    <color name="button_background_pressed_end">#fb812c</color>
     <color name="edit_text_background_start">#EFF6FF</color>
     <color name="edit_text_background_end">#FBFDFF</color>
     <color name="button_background_disabled_start">#7b7b7b</color>
diff --git a/app/res/values/strings.xml b/app/res/values/strings.xml
index b7de1bf..e7a6b51 100644
--- a/app/res/values/strings.xml
+++ b/app/res/values/strings.xml
@@ -32,6 +32,13 @@
     <string name="message_bad_credentials">Email Address or Password is incorrect</string>
     <string name="message_auth_failed">Please enter a valid password</string>
     <string name="message_auth_failed_new_account">Please enter a valid email address &amp; password</string>
+    <string name="timer_running">Timer is running</string>
+    <string name="timer_is_paused">Timer is paused</string>
+    <string name="stop">Stop</string>
+    <string name="start">Start</string>
+    <string name="pause">Pause</string>
+    <string name="resume">Resume</string>
+    <string name="timer">Timer</string>
 
 
 </resources>
\ No newline at end of file
diff --git a/app/res/values/styles.xml b/app/res/values/styles.xml
index 157d00f..a6b885e 100644
--- a/app/res/values/styles.xml
+++ b/app/res/values/styles.xml
@@ -74,4 +74,19 @@
         <item name="android:background">@drawable/list_item_background</item>
     </style>
 
+    <style name="BootstrapButton">
+        <item name="android:background">@drawable/button_background_states</item>
+        <item name="android:layout_marginLeft">10dp</item>
+        <item name="android:layout_marginRight">10dp</item>
+        <item name="android:layout_marginTop">5dp</item>
+        <item name="android:layout_marginBottom">5dp</item>
+        <item name="android:textStyle">bold</item>
+    </style>
+
+    <style name="TimerChronometer">
+        <item name="android:gravity">center_horizontal</item>
+        <item name="android:textSize">75sp</item>
+        <item name="android:textColor">#464646</item>
+    </style>
+
 </resources>
\ No newline at end of file
diff --git a/app/res/values/theme.xml b/app/res/values/theme.xml
index e330dd9..5dc50de 100644
--- a/app/res/values/theme.xml
+++ b/app/res/values/theme.xml
@@ -1,11 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
 
 <resources>
 
     <style name="Theme.Bootstrap.Dark" parent="@style/Theme.Sherlock">
         <item name="android:windowBackground">@color/pager_background</item>
         <item name="actionBarStyle">@style/Widget.Styled.ActionBar</item>
-        <item name="android:actionBarStyle">@style/Widget.Styled.ActionBar</item>
-        <item name="absForceOverflow">true</item>
+        <item name="android:actionBarStyle">@style/Widget.Styled.ActionBar</item>        
     </style>
 
     <style name="Widget.Styled.ActionBar" parent="Widget.Sherlock.ActionBar.Solid">
diff --git a/app/src/main/java/com/donnfelker/android/bootstrap/AndroidModule.java b/app/src/main/java/com/donnfelker/android/bootstrap/AndroidModule.java
new file mode 100644
index 0000000..903e8cd
--- /dev/null
+++ b/app/src/main/java/com/donnfelker/android/bootstrap/AndroidModule.java
@@ -0,0 +1,92 @@
+package com.donnfelker.android.bootstrap;
+
+import android.accounts.AccountManager;
+import android.app.NotificationManager;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.preference.PreferenceManager;
+import android.telephony.TelephonyManager;
+import android.view.inputmethod.InputMethodManager;
+
+import javax.inject.Singleton;
+
+import dagger.Module;
+import dagger.Provides;
+
+/**
+ * Module for all Android related provisions
+ */
+@Module
+(
+        complete = false
+)
+public class AndroidModule {
+
+    @Provides
+    @Singleton
+    Context provideAppContext()
+    {
+        return BootstrapApplication.getInstance().getApplicationContext();
+    }
+
+    @Provides
+    SharedPreferences provideDefaultSharedPreferences(final Context context)
+    {
+        return PreferenceManager.getDefaultSharedPreferences(context);
+    }
+
+    @Provides
+    PackageInfo providePackageInfo(Context context)
+    {
+        try
+        {
+            return context.getPackageManager().getPackageInfo(context.getPackageName(), 0);
+        }
+        catch (PackageManager.NameNotFoundException e)
+        {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Provides
+    TelephonyManager provideTelephonyManager(Context context)
+    {
+        return getSystemService(context, Context.TELEPHONY_SERVICE);
+    }
+
+    @SuppressWarnings("unchecked")
+    public <T> T getSystemService(Context context, String serviceConstant)
+    {
+        return (T) context.getSystemService(serviceConstant);
+    }
+
+    @Provides
+    InputMethodManager provideInputMethodManager(final Context context)
+    {
+        return (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);
+    }
+
+    @Provides
+    ApplicationInfo provideApplicationInfo(final Context context) {
+        return context.getApplicationInfo();
+    }
+
+    @Provides
+    AccountManager provideAccountManager(final Context context) {
+        return AccountManager.get(context);
+    }
+
+    @Provides
+    ClassLoader provideClassLoader(final Context context) {
+        return context.getClassLoader();
+    }
+
+    @Provides
+    NotificationManager provideNotificationManager(final Context context) {
+        return (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
+    }
+
+}
diff --git a/app/src/main/java/com/donnfelker/android/bootstrap/BootstrapApplication.java b/app/src/main/java/com/donnfelker/android/bootstrap/BootstrapApplication.java
index e8c9fd0..e33a85f 100644
--- a/app/src/main/java/com/donnfelker/android/bootstrap/BootstrapApplication.java
+++ b/app/src/main/java/com/donnfelker/android/bootstrap/BootstrapApplication.java
@@ -10,15 +10,21 @@
 
 import com.github.kevinsawicki.http.HttpRequest;
 
+import dagger.ObjectGraph;
+
 /**
  * Android Bootstrap application
  */
 public class BootstrapApplication extends Application {
 
+    private static BootstrapApplication instance;
+    ObjectGraph objectGraph;
+
     /**
      * Create main application
      */
     public BootstrapApplication() {
+
         // Disable http.keepAlive on Froyo and below
         if (SDK_INT <= FROYO)
             HttpRequest.keepAlive(false);
@@ -32,8 +38,26 @@ public BootstrapApplication() {
     public BootstrapApplication(final Context context) {
         this();
         attachBaseContext(context);
+
     }
 
+    @Override
+    public void onCreate() {
+        super.onCreate();
+
+        instance = this;
+        // Perform Injection
+        objectGraph = ObjectGraph.create(getRootModule());
+        objectGraph.inject(this);
+        objectGraph.injectStatics();
+
+    }
+
+    private Object getRootModule() {
+        return new RootModule();
+    }
+
+
     /**
      * Create main application
      *
@@ -43,4 +67,15 @@ public BootstrapApplication(final Instrumentation instrumentation) {
         this();
         attachBaseContext(instrumentation.getTargetContext());
     }
+
+    public void inject(Object object)
+    {
+        objectGraph.inject(object);
+    }
+
+
+
+    public static BootstrapApplication getInstance() {
+        return instance;
+    }
 }
diff --git a/app/src/main/java/com/donnfelker/android/bootstrap/BootstrapModule.java b/app/src/main/java/com/donnfelker/android/bootstrap/BootstrapModule.java
new file mode 100644
index 0000000..8e91be0
--- /dev/null
+++ b/app/src/main/java/com/donnfelker/android/bootstrap/BootstrapModule.java
@@ -0,0 +1,61 @@
+package com.donnfelker.android.bootstrap;
+
+import android.accounts.AccountManager;
+import android.content.Context;
+
+import com.donnfelker.android.bootstrap.authenticator.BootstrapAuthenticatorActivity;
+import com.donnfelker.android.bootstrap.authenticator.LogoutService;
+import com.donnfelker.android.bootstrap.core.CheckIn;
+import com.donnfelker.android.bootstrap.core.TimerService;
+import com.donnfelker.android.bootstrap.ui.BootstrapTimerActivity;
+import com.donnfelker.android.bootstrap.ui.CarouselActivity;
+import com.donnfelker.android.bootstrap.ui.CheckInsListFragment;
+import com.donnfelker.android.bootstrap.ui.ItemListFragment;
+import com.donnfelker.android.bootstrap.ui.NewsActivity;
+import com.donnfelker.android.bootstrap.ui.NewsListFragment;
+import com.donnfelker.android.bootstrap.ui.UserActivity;
+import com.donnfelker.android.bootstrap.ui.UserListFragment;
+import com.squareup.otto.Bus;
+
+import javax.inject.Singleton;
+
+import dagger.Module;
+import dagger.Provides;
+
+/**
+ * Dagger module for setting up provides statements.
+ * Register all of your entry points below.
+ */
+@Module
+(
+        complete = false,
+
+        entryPoints = {
+                BootstrapApplication.class,
+                BootstrapAuthenticatorActivity.class,
+                CarouselActivity.class,
+                BootstrapTimerActivity.class,
+                CheckInsListFragment.class,
+                NewsActivity.class,
+                NewsListFragment.class,
+                UserActivity.class,
+                UserListFragment.class,
+                TimerService.class
+        }
+
+)
+public class BootstrapModule  {
+
+    @Singleton
+    @Provides
+    Bus provideOttoBus() {
+        return new Bus();
+    }
+
+    @Provides
+    @Singleton
+    LogoutService provideLogoutService(final Context context, final AccountManager accountManager) {
+        return new LogoutService(context, accountManager);
+    }
+
+}
diff --git a/app/src/main/java/com/donnfelker/android/bootstrap/BootstrapServiceProvider.java b/app/src/main/java/com/donnfelker/android/bootstrap/BootstrapServiceProvider.java
index 6be04fd..75797ff 100644
--- a/app/src/main/java/com/donnfelker/android/bootstrap/BootstrapServiceProvider.java
+++ b/app/src/main/java/com/donnfelker/android/bootstrap/BootstrapServiceProvider.java
@@ -2,11 +2,12 @@
 package com.donnfelker.android.bootstrap;
 
 import android.accounts.AccountsException;
+import android.app.Activity;
 
 import com.donnfelker.android.bootstrap.authenticator.ApiKeyProvider;
 import com.donnfelker.android.bootstrap.core.BootstrapService;
 import com.donnfelker.android.bootstrap.core.UserAgentProvider;
-import com.google.inject.Inject;
+import javax.inject.Inject;
 
 import java.io.IOException;
 
@@ -15,8 +16,8 @@
  */
 public class BootstrapServiceProvider {
 
-    @Inject private ApiKeyProvider keyProvider;
-    @Inject private UserAgentProvider userAgentProvider;
+    @Inject ApiKeyProvider keyProvider;
+    @Inject UserAgentProvider userAgentProvider;
 
     /**
      * Get service for configured key provider
@@ -27,7 +28,7 @@ public class BootstrapServiceProvider {
      * @throws IOException
      * @throws AccountsException
      */
-    public BootstrapService getService() throws IOException, AccountsException {
-        return new BootstrapService(keyProvider.getAuthKey(), userAgentProvider);
+    public BootstrapService getService(Activity activity) throws IOException, AccountsException {
+        return new BootstrapService(keyProvider.getAuthKey(activity), userAgentProvider);
     }
 }
diff --git a/app/src/main/java/com/donnfelker/android/bootstrap/RootModule.java b/app/src/main/java/com/donnfelker/android/bootstrap/RootModule.java
new file mode 100644
index 0000000..dbc06b6
--- /dev/null
+++ b/app/src/main/java/com/donnfelker/android/bootstrap/RootModule.java
@@ -0,0 +1,16 @@
+package com.donnfelker.android.bootstrap;
+
+import dagger.Module;
+
+/**
+ * Add all the other modules to this one.
+ */
+@Module
+(
+    includes = {
+            AndroidModule.class,
+            BootstrapModule.class
+    }
+)
+public class RootModule {
+}
diff --git a/app/src/main/java/com/donnfelker/android/bootstrap/authenticator/ApiKeyProvider.java b/app/src/main/java/com/donnfelker/android/bootstrap/authenticator/ApiKeyProvider.java
index 500a6f0..d196578 100644
--- a/app/src/main/java/com/donnfelker/android/bootstrap/authenticator/ApiKeyProvider.java
+++ b/app/src/main/java/com/donnfelker/android/bootstrap/authenticator/ApiKeyProvider.java
@@ -11,7 +11,7 @@
 import android.os.Bundle;
 
 import com.donnfelker.android.bootstrap.core.Constants;
-import com.google.inject.Inject;
+import javax.inject.Inject;
 
 import java.io.IOException;
 
@@ -20,8 +20,7 @@
  */
 public class ApiKeyProvider {
 
-    @Inject private Activity activity;
-    @Inject private AccountManager accountManager;
+    @Inject AccountManager accountManager;
 
     /**
      * This call blocks, so shouldn't be called on the UI thread
@@ -30,7 +29,7 @@ public class ApiKeyProvider {
      * @throws AccountsException
      * @throws IOException
      */
-    public String getAuthKey() throws AccountsException, IOException {
+    public String getAuthKey(Activity activity) throws AccountsException, IOException {
         AccountManagerFuture<Bundle> accountManagerFuture = accountManager.getAuthTokenByFeatures(Constants.Auth.BOOTSTRAP_ACCOUNT_TYPE,
                 Constants.Auth.AUTHTOKEN_TYPE, new String[0], activity, null, null, null, null);
 
diff --git a/app/src/main/java/com/donnfelker/android/bootstrap/authenticator/BootstrapAuthenticatorActivity.java b/app/src/main/java/com/donnfelker/android/bootstrap/authenticator/BootstrapAuthenticatorActivity.java
index 84d5627..b88f934 100644
--- a/app/src/main/java/com/donnfelker/android/bootstrap/authenticator/BootstrapAuthenticatorActivity.java
+++ b/app/src/main/java/com/donnfelker/android/bootstrap/authenticator/BootstrapAuthenticatorActivity.java
@@ -40,23 +40,23 @@
 
 import com.donnfelker.android.bootstrap.core.Constants;
 import com.donnfelker.android.bootstrap.core.User;
+import com.donnfelker.android.bootstrap.util.Ln;
+import com.donnfelker.android.bootstrap.util.SafeAsyncTask;
+import com.donnfelker.android.bootstrap.util.Strings;
 import com.github.kevinsawicki.http.HttpRequest;
 import com.github.kevinsawicki.wishlist.Toaster;
 import com.donnfelker.android.bootstrap.R.id;
 import com.donnfelker.android.bootstrap.R.layout;
 import com.donnfelker.android.bootstrap.R.string;
 import com.donnfelker.android.bootstrap.ui.TextWatcherAdapter;
-import com.github.rtyley.android.sherlock.roboguice.activity.RoboSherlockAccountAuthenticatorActivity;
 import com.google.gson.Gson;
 
 import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.List;
 
-import roboguice.inject.InjectView;
-import roboguice.util.Ln;
-import roboguice.util.RoboAsyncTask;
-import roboguice.util.Strings;
+import butterknife.InjectView;
+import butterknife.Views;
 
 import static com.donnfelker.android.bootstrap.core.Constants.Http.USERNAME;
 import static com.donnfelker.android.bootstrap.core.Constants.Http.PASSWORD;
@@ -64,8 +64,7 @@
 /**
  * Activity to authenticate the user against an API (example API on Parse.com)
  */
-public class BootstrapAuthenticatorActivity extends
-        RoboSherlockAccountAuthenticatorActivity {
+public class BootstrapAuthenticatorActivity extends SherlockAccountAuthenticatorActivity {
 
     /**
      * PARAM_CONFIRMCREDENTIALS
@@ -90,18 +89,13 @@ public class BootstrapAuthenticatorActivity extends
 
     private AccountManager accountManager;
 
-    @InjectView(id.et_email)
-    private AutoCompleteTextView emailText;
-
-    @InjectView(id.et_password)
-    private EditText passwordText;
-
-    @InjectView(id.b_signin)
-    private Button signinButton;
+    @InjectView(id.et_email) AutoCompleteTextView emailText;
+    @InjectView(id.et_password) EditText passwordText;
+    @InjectView(id.b_signin) Button signinButton;
 
     private TextWatcher watcher = validationTextWatcher();
 
-    private RoboAsyncTask<Boolean> authenticationTask;
+    private SafeAsyncTask<Boolean> authenticationTask;
     private String authToken;
     private String authTokenType;
 
@@ -142,6 +136,8 @@ public void onCreate(Bundle bundle) {
 
         setContentView(layout.login_activity);
 
+        Views.inject(this);
+
         emailText.setAdapter(new ArrayAdapter<String>(this,
                 simple_dropdown_item_1line, userEmailAccounts()));
 
@@ -241,7 +237,7 @@ public void handleLogin(View view) {
         password = passwordText.getText().toString();
         showProgress();
 
-        authenticationTask = new RoboAsyncTask<Boolean>(this) {
+        authenticationTask = new SafeAsyncTask<Boolean>() {
             public Boolean call() throws Exception {
 
                 final String query = String.format("%s=%s&%s=%s", PARAM_USERNAME, email, PARAM_PASSWORD, password);
diff --git a/app/src/main/java/com/donnfelker/android/bootstrap/authenticator/LogoutService.java b/app/src/main/java/com/donnfelker/android/bootstrap/authenticator/LogoutService.java
index 871a018..4a2d74c 100644
--- a/app/src/main/java/com/donnfelker/android/bootstrap/authenticator/LogoutService.java
+++ b/app/src/main/java/com/donnfelker/android/bootstrap/authenticator/LogoutService.java
@@ -7,33 +7,37 @@
 import android.util.Log;
 
 import com.donnfelker.android.bootstrap.core.Constants;
-import com.google.inject.Inject;
+import com.donnfelker.android.bootstrap.util.SafeAsyncTask;
 
-import java.util.concurrent.Callable;
-import java.util.concurrent.Executor;
+import javax.inject.Inject;
 
-import roboguice.inject.ContextSingleton;
-import roboguice.util.RoboAsyncTask;
 
-@ContextSingleton
+/**
+ * Class used for logging a user out.
+ */
 public class LogoutService {
 
-    @Inject protected Context context;
-    @Inject protected AccountManager accountManager;
-
+    protected Context context;
+    protected AccountManager accountManager;
 
+    @Inject
+    public LogoutService(Context context, AccountManager accountManager) {
+        this.context = context;
+        this.accountManager = accountManager;
+    }
 
     public void logout(final Runnable onSuccess) {
 
         new LogoutTask(context, onSuccess).execute();
     }
 
-    private static class LogoutTask extends RoboAsyncTask<Boolean> {
+    private static class LogoutTask extends SafeAsyncTask<Boolean> {
 
+        private final Context context;
         private Runnable onSuccess;
 
         protected LogoutTask(Context context, Runnable onSuccess) {
-            super(context);
+            this.context = context;
             this.onSuccess = onSuccess;
         }
 
@@ -68,6 +72,5 @@ protected void onException(Exception e) throws RuntimeException {
             super.onException(e);
             Log.e("LOGOUT_SERVICE", "Logout failed.", e.getCause());
         }
-    };
-
+    }
 }
diff --git a/app/src/main/java/com/donnfelker/android/bootstrap/authenticator/SherlockAccountAuthenticatorActivity.java b/app/src/main/java/com/donnfelker/android/bootstrap/authenticator/SherlockAccountAuthenticatorActivity.java
new file mode 100644
index 0000000..9e31db0
--- /dev/null
+++ b/app/src/main/java/com/donnfelker/android/bootstrap/authenticator/SherlockAccountAuthenticatorActivity.java
@@ -0,0 +1,89 @@
+package com.donnfelker.android.bootstrap.authenticator;
+
+/*
+ * Originally from:
+ * https://github.com/rtyley/roboguice-sherlock/blob/master/src/main/java/com/github/rtyley/android/sherlock/android/accounts/SherlockAccountAuthenticatorActivity.java
+ *
+ * Copyright (C) 2009 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import android.accounts.AccountAuthenticatorResponse;
+import android.accounts.AccountManager;
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import com.actionbarsherlock.app.SherlockActivity;
+
+/**
+ * Base class for implementing an Activity that is used to help implement an
+ * AbstractAccountAuthenticator. If the AbstractAccountAuthenticator needs to use an activity
+ * to handle the request then it can have the activity extend SherlockAccountAuthenticatorActivity.
+ * The AbstractAccountAuthenticator passes in the response to the intent using the following:
+ * <pre>
+ *      intent.putExtra({@link android.accounts.AccountManager#KEY_ACCOUNT_AUTHENTICATOR_RESPONSE}, response);
+ * </pre>
+ * The activity then sets the result that is to be handed to the response via
+ * {@link #setAccountAuthenticatorResult(android.os.Bundle)}.
+ * This result will be sent as the result of the request when the activity finishes. If this
+ * is never set or if it is set to null then error {@link android.accounts.AccountManager#ERROR_CODE_CANCELED}
+ * will be called on the response.
+ */
+public class SherlockAccountAuthenticatorActivity extends SherlockActivity {
+    private AccountAuthenticatorResponse mAccountAuthenticatorResponse = null;
+    private Bundle mResultBundle = null;
+
+    /**
+     * Set the result that is to be sent as the result of the request that caused this
+     * Activity to be launched. If result is null or this method is never called then
+     * the request will be canceled.
+     * @param result this is returned as the result of the AbstractAccountAuthenticator request
+     */
+    public final void setAccountAuthenticatorResult(Bundle result) {
+        mResultBundle = result;
+    }
+
+    /**
+     * Retreives the AccountAuthenticatorResponse from either the intent of the icicle, if the
+     * icicle is non-zero.
+     * @param icicle the save instance data of this Activity, may be null
+     */
+    protected void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+
+        mAccountAuthenticatorResponse =
+                getIntent().getParcelableExtra(AccountManager.KEY_ACCOUNT_AUTHENTICATOR_RESPONSE);
+
+        if (mAccountAuthenticatorResponse != null) {
+            mAccountAuthenticatorResponse.onRequestContinued();
+        }
+    }
+
+    /**
+     * Sends the result or a Constants.ERROR_CODE_CANCELED error if a result isn't present.
+     */
+    public void finish() {
+        if (mAccountAuthenticatorResponse != null) {
+            // send the result bundle back if set, otherwise send an error.
+            if (mResultBundle != null) {
+                mAccountAuthenticatorResponse.onResult(mResultBundle);
+            } else {
+                mAccountAuthenticatorResponse.onError(AccountManager.ERROR_CODE_CANCELED,
+                        "canceled");
+            }
+            mAccountAuthenticatorResponse = null;
+        }
+        super.finish();
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/donnfelker/android/bootstrap/core/AvatarLoader.java b/app/src/main/java/com/donnfelker/android/bootstrap/core/AvatarLoader.java
index 2d1a3b2..508e0d4 100644
--- a/app/src/main/java/com/donnfelker/android/bootstrap/core/AvatarLoader.java
+++ b/app/src/main/java/com/donnfelker/android/bootstrap/core/AvatarLoader.java
@@ -14,8 +14,9 @@
 
 import com.actionbarsherlock.app.ActionBar;
 import com.donnfelker.android.bootstrap.R;
+import com.donnfelker.android.bootstrap.util.SafeAsyncTask;
 import com.github.kevinsawicki.http.HttpRequest;
-import com.google.inject.Inject;
+import javax.inject.Inject;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -26,7 +27,6 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.atomic.AtomicReference;
 
-import roboguice.util.RoboAsyncTask;
 
 /**
  * Avatar utilities
@@ -40,13 +40,13 @@ public class AvatarLoader {
     private static final int CACHE_SIZE = 75;
 
     private static abstract class FetchAvatarTask extends
-            RoboAsyncTask<BitmapDrawable> {
+            SafeAsyncTask<BitmapDrawable> {
 
         private static final Executor EXECUTOR = Executors
                 .newFixedThreadPool(1);
 
         private FetchAvatarTask(Context context) {
-            super(context, EXECUTOR);
+            super(EXECUTOR);
         }
 
         @Override
diff --git a/app/src/main/java/com/donnfelker/android/bootstrap/core/Constants.java b/app/src/main/java/com/donnfelker/android/bootstrap/core/Constants.java
index 81954ce..cd5a386 100644
--- a/app/src/main/java/com/donnfelker/android/bootstrap/core/Constants.java
+++ b/app/src/main/java/com/donnfelker/android/bootstrap/core/Constants.java
@@ -97,6 +97,12 @@ private Intent() {}
 
     }
 
+    public static class Notification{
+        private Notification() {}
+
+        public static final int TIMER_NOTIFICATION_ID = 1000; // Why 1000? Why not? :)
+    }
+
 }
 
 
diff --git a/app/src/main/java/com/donnfelker/android/bootstrap/core/PauseTimerEvent.java b/app/src/main/java/com/donnfelker/android/bootstrap/core/PauseTimerEvent.java
new file mode 100644
index 0000000..bd98769
--- /dev/null
+++ b/app/src/main/java/com/donnfelker/android/bootstrap/core/PauseTimerEvent.java
@@ -0,0 +1,7 @@
+package com.donnfelker.android.bootstrap.core;
+
+/**
+ * Marker class for Otto for a pause event for the timer.
+ */
+public class PauseTimerEvent {
+}
diff --git a/app/src/main/java/com/donnfelker/android/bootstrap/core/ResumeTimerEvent.java b/app/src/main/java/com/donnfelker/android/bootstrap/core/ResumeTimerEvent.java
new file mode 100644
index 0000000..c767c71
--- /dev/null
+++ b/app/src/main/java/com/donnfelker/android/bootstrap/core/ResumeTimerEvent.java
@@ -0,0 +1,7 @@
+package com.donnfelker.android.bootstrap.core;
+
+/**
+ * Marker class for resuming a timer through Otto
+ */
+public class ResumeTimerEvent {
+}
diff --git a/app/src/main/java/com/donnfelker/android/bootstrap/core/StopTimerEvent.java b/app/src/main/java/com/donnfelker/android/bootstrap/core/StopTimerEvent.java
new file mode 100644
index 0000000..672e2c4
--- /dev/null
+++ b/app/src/main/java/com/donnfelker/android/bootstrap/core/StopTimerEvent.java
@@ -0,0 +1,7 @@
+package com.donnfelker.android.bootstrap.core;
+
+/**
+ * Marker class for the stop timer event in Otto.
+ */
+public class StopTimerEvent {
+}
diff --git a/app/src/main/java/com/donnfelker/android/bootstrap/core/TimerPausedEvent.java b/app/src/main/java/com/donnfelker/android/bootstrap/core/TimerPausedEvent.java
new file mode 100644
index 0000000..83104c1
--- /dev/null
+++ b/app/src/main/java/com/donnfelker/android/bootstrap/core/TimerPausedEvent.java
@@ -0,0 +1,14 @@
+package com.donnfelker.android.bootstrap.core;
+
+public class TimerPausedEvent {
+
+    private boolean timerIsPaused;
+
+    public TimerPausedEvent(boolean timerIsPaused) {
+        this.timerIsPaused = timerIsPaused;
+    }
+
+    public boolean isTimerIsPaused() {
+        return timerIsPaused;
+    }
+}
diff --git a/app/src/main/java/com/donnfelker/android/bootstrap/core/TimerService.java b/app/src/main/java/com/donnfelker/android/bootstrap/core/TimerService.java
new file mode 100644
index 0000000..c210a12
--- /dev/null
+++ b/app/src/main/java/com/donnfelker/android/bootstrap/core/TimerService.java
@@ -0,0 +1,212 @@
+package com.donnfelker.android.bootstrap.core;
+
+import android.app.Notification;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
+import android.app.Service;
+import android.content.Intent;
+import android.os.Handler;
+import android.os.IBinder;
+import android.os.Message;
+import android.os.SystemClock;
+import android.support.v4.app.NotificationCompat;
+
+import com.donnfelker.android.bootstrap.BootstrapApplication;
+import com.donnfelker.android.bootstrap.R;
+import com.donnfelker.android.bootstrap.ui.BootstrapTimerActivity;
+import javax.inject.Inject;
+
+import com.donnfelker.android.bootstrap.util.Ln;
+import com.squareup.otto.Bus;
+import com.squareup.otto.Produce;
+import com.squareup.otto.Subscribe;
+
+import static com.donnfelker.android.bootstrap.core.Constants.Notification.TIMER_NOTIFICATION_ID;
+
+public class TimerService extends Service {
+
+    @Inject protected Bus BUS;
+    @Inject NotificationManager notificationManager;
+
+    private boolean timerRunning = false;
+    private boolean timerStarted;
+    private long base;
+    private long currentRunningTimeInMillis;
+    private long pausedBaseTime;
+    private boolean isPaused;
+
+    public static final int TICK_WHAT = 2;
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        return null;
+    }
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+
+        BootstrapApplication.getInstance().inject(this);
+
+        // Register the bus so we can send notifications.
+        BUS.register(this);
+
+    }
+
+    @Override
+    public void onDestroy() {
+
+        // Unregister bus, since its not longer needed as the service is shutting down
+        BUS.unregister(this);
+
+        notificationManager.cancel(TIMER_NOTIFICATION_ID);
+
+        Ln.d("Service has been destroyed");
+
+        super.onDestroy();
+    }
+
+    @Override
+    public int onStartCommand(Intent intent, int flags, int startId) {
+
+        if(timerStarted == false) {
+
+            timerStarted = true;
+
+            startTimer();
+
+            // Run as foreground service: http://stackoverflow.com/a/3856940/5210
+            // Another example: https://github.com/commonsguy/cw-android/blob/master/Notifications/FakePlayer/src/com/commonsware/android/fakeplayerfg/PlayerService.java
+            startForeground(TIMER_NOTIFICATION_ID, getNotification(getString(R.string.timer_running)));
+        }
+
+        return START_NOT_STICKY;
+    }
+
+    @Produce
+    public TimerTickEvent produceTickEvent() {
+        return new TimerTickEvent(currentRunningTimeInMillis);
+    }
+
+    @Produce
+    public TimerPausedEvent produceTimerIsPausedEvent() {
+        return new TimerPausedEvent(isPaused);
+    }
+
+    @Subscribe
+    public void onStopEvent(StopTimerEvent stopEvent) {
+
+        timerHandler.removeMessages(TICK_WHAT);
+        stopSelf();
+    }
+
+    @Subscribe
+    public void onPauseEvent(PauseTimerEvent pauseEvent) {
+        pauseTimer();
+    }
+
+    /**
+     * Pauses the active running timer and updates the notification in the status bar.
+     */
+    private void pauseTimer() {
+
+        updateNotification(getString(R.string.timer_is_paused));
+
+        timerHandler.removeMessages(TICK_WHAT);
+        pausedBaseTime = SystemClock.elapsedRealtime() - base;
+        timerRunning = false;
+        isPaused = true;
+
+        produceTimerIsPausedEvent();
+    }
+
+    @Subscribe
+    public void onResumeTimerEvent(ResumeTimerEvent resumeTimerEvent) {
+        startTimer();
+    }
+
+    private void startTimer() {
+        startChronoTimer();
+        notifyTimerRunning();
+    }
+
+    private void startChronoTimer() {
+        base = SystemClock.elapsedRealtime();
+
+        // If coming from a paused state, then find our true base.
+        if(pausedBaseTime > 0)
+            base = base - pausedBaseTime;
+
+        isPaused = false;
+
+        updateRunning();
+    }
+
+    /**
+     * Starts the generic timer.
+     */
+    private void updateRunning() {
+        if (timerStarted != timerRunning) {
+            if (timerStarted) {
+                dispatchTimerUpdate(SystemClock.elapsedRealtime());
+                timerHandler.sendMessageDelayed(Message.obtain(timerHandler, TICK_WHAT), 1000);
+            } else {
+                timerHandler.removeMessages(TICK_WHAT);
+            }
+            timerRunning = timerStarted;
+        }
+    }
+
+    private Handler timerHandler = new Handler() {
+        public void handleMessage(Message m) {
+            if (timerRunning) {
+                dispatchTimerUpdate(SystemClock.elapsedRealtime());
+                sendMessageDelayed(Message.obtain(this, TICK_WHAT), 1000);
+            }
+        }
+    };
+
+    private void dispatchTimerUpdate(long now) {
+
+        currentRunningTimeInMillis = now - base;
+        Ln.d("Elapsed Seconds: " + currentRunningTimeInMillis / 1000);
+
+        BUS.post(produceTickEvent());
+
+    }
+
+
+
+    private void notifyTimerRunning() {
+        updateNotification(getString(R.string.timer_running));
+        produceTimerIsPausedEvent();
+    }
+
+
+    private void updateNotification(String message) {
+        notificationManager.notify(TIMER_NOTIFICATION_ID, getNotification(message));
+
+    }
+
+    /**
+     * Creates a notification to show in the notification bar
+     * @param message the message to display in the notification bar
+     * @return a new {@link Notification}
+     */
+    private Notification getNotification(String message) {
+        final Intent i = new Intent(this, BootstrapTimerActivity.class);
+
+        PendingIntent pendingIntent = PendingIntent.getActivity(this, 0, i, 0);
+
+        return new NotificationCompat.Builder(this)
+                .setContentTitle(getString(R.string.app_name))
+                .setSmallIcon(R.drawable.ic_stat_ab_notification)
+                .setContentText(message)
+                .setAutoCancel(false)
+                .setOnlyAlertOnce(true)
+                .setOngoing(true)
+                .setWhen(System.currentTimeMillis())
+                .setContentIntent(pendingIntent)
+                .getNotification();
+    }
+}
diff --git a/app/src/main/java/com/donnfelker/android/bootstrap/core/TimerTickEvent.java b/app/src/main/java/com/donnfelker/android/bootstrap/core/TimerTickEvent.java
new file mode 100644
index 0000000..056c343
--- /dev/null
+++ b/app/src/main/java/com/donnfelker/android/bootstrap/core/TimerTickEvent.java
@@ -0,0 +1,35 @@
+package com.donnfelker.android.bootstrap.core;
+
+
+/**
+ * Event used to pass tick events around through the message bus.
+ * This is mainly used in the {@link BootstrapTimer} to show the updates on the timer
+ * as the background service runs the timer.
+ */
+public class TimerTickEvent {
+    private final long millis;
+
+    public TimerTickEvent(long millis) {
+        this.millis = millis;
+    }
+
+    public long getMillis() {
+        return millis;
+    }
+
+    public long getSeconds() {
+        return (millis / 1000);
+    }
+
+
+    @Override
+    public String toString() {
+        return new StringBuilder("")
+                .append("Millis: " + getMillis())
+                .append(", ")
+                .append("Seconds: " + getSeconds())
+                .toString();
+    }
+
+}
+
diff --git a/app/src/main/java/com/donnfelker/android/bootstrap/core/UserAgentProvider.java b/app/src/main/java/com/donnfelker/android/bootstrap/core/UserAgentProvider.java
index f6b1fb2..bf82e88 100644
--- a/app/src/main/java/com/donnfelker/android/bootstrap/core/UserAgentProvider.java
+++ b/app/src/main/java/com/donnfelker/android/bootstrap/core/UserAgentProvider.java
@@ -1,25 +1,26 @@
 package com.donnfelker.android.bootstrap.core;
 
-import android.app.Application;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageInfo;
 import android.os.Build;
 import android.telephony.TelephonyManager;
 
-import com.google.inject.Inject;
-import com.google.inject.Provider;
+import com.donnfelker.android.bootstrap.BootstrapApplication;
+import com.donnfelker.android.bootstrap.util.Ln;
+import com.donnfelker.android.bootstrap.util.Strings;
 
+import javax.inject.Inject;
+import javax.inject.Provider;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Locale;
 
-import roboguice.util.Ln;
-import roboguice.util.Strings;
 
 public class UserAgentProvider implements Provider<String> {
-    @Inject protected Application app;
+    @Inject protected ApplicationInfo appInfo;
     @Inject protected PackageInfo info;
     @Inject protected TelephonyManager telephonyManager;
+    @Inject protected ClassLoader classLoader;
 
     protected String userAgent;
 
@@ -42,13 +43,13 @@ public String get() {
                     );
 
                     final ArrayList<String> params = new ArrayList<String>();
-                    params.add( "preload=" + ((app.getApplicationInfo().flags& ApplicationInfo.FLAG_SYSTEM)==1) ); // Determine if this app was a preloaded app
+                    params.add( "preload=" + ((appInfo.flags& ApplicationInfo.FLAG_SYSTEM)==1) ); // Determine if this app was a preloaded app
                     params.add( "locale=" + Locale.getDefault() );
 
 
                     // http://stackoverflow.com/questions/2641111/where-is-android-os-systemproperties
                     try{
-                        final Class SystemProperties = app.getClassLoader().loadClass("android.os.SystemProperties");
+                        final Class SystemProperties = classLoader.loadClass("android.os.SystemProperties");
                         final Method get = SystemProperties.getMethod("get", String.class);
                         params.add( "clientidbase=" + get.invoke(SystemProperties, "ro.com.google.clientidbase"));
                     }catch( Exception ignored ){
diff --git a/app/src/main/java/com/donnfelker/android/bootstrap/ui/AlternatingColorListAdapter.java b/app/src/main/java/com/donnfelker/android/bootstrap/ui/AlternatingColorListAdapter.java
index 3a94b5a..22a5b55 100644
--- a/app/src/main/java/com/donnfelker/android/bootstrap/ui/AlternatingColorListAdapter.java
+++ b/app/src/main/java/com/donnfelker/android/bootstrap/ui/AlternatingColorListAdapter.java
@@ -59,8 +59,8 @@ public AlternatingColorListAdapter(final int layoutId,
     @Override
     protected void update(final int position, final V item) {
         if (position % 2 != 0)
-            view.setBackgroundResource(primaryResource);
+            updater.view.setBackgroundResource(primaryResource);
         else
-            view.setBackgroundResource(secondaryResource);
+            updater.view.setBackgroundResource(secondaryResource);
     }
 }
diff --git a/app/src/main/java/com/donnfelker/android/bootstrap/ui/BootstrapActivity.java b/app/src/main/java/com/donnfelker/android/bootstrap/ui/BootstrapActivity.java
index 52be6dc..7a1651c 100644
--- a/app/src/main/java/com/donnfelker/android/bootstrap/ui/BootstrapActivity.java
+++ b/app/src/main/java/com/donnfelker/android/bootstrap/ui/BootstrapActivity.java
@@ -4,13 +4,27 @@
 import static android.content.Intent.FLAG_ACTIVITY_SINGLE_TOP;
 import android.content.Intent;
 
+import com.actionbarsherlock.app.SherlockActivity;
 import com.actionbarsherlock.view.MenuItem;
-import com.github.rtyley.android.sherlock.roboguice.activity.RoboSherlockActivity;
+import com.donnfelker.android.bootstrap.BootstrapApplication;
+
+import butterknife.Views;
 
 /**
  * Base activity for a Bootstrap activity which does not use fragments.
  */
-public abstract class BootstrapActivity extends RoboSherlockActivity {
+public abstract class BootstrapActivity extends SherlockActivity {
+
+    @Override
+    public void setContentView(int layoutResId) {
+        super.setContentView(layoutResId);
+
+
+        BootstrapApplication.getInstance().inject(this);
+
+        // Used to inject views with the Butterknife library
+        Views.inject(this);
+    }
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
diff --git a/app/src/main/java/com/donnfelker/android/bootstrap/ui/BootstrapFragmentActivity.java b/app/src/main/java/com/donnfelker/android/bootstrap/ui/BootstrapFragmentActivity.java
new file mode 100644
index 0000000..dc23136
--- /dev/null
+++ b/app/src/main/java/com/donnfelker/android/bootstrap/ui/BootstrapFragmentActivity.java
@@ -0,0 +1,28 @@
+package com.donnfelker.android.bootstrap.ui;
+
+import android.os.Bundle;
+
+import com.actionbarsherlock.app.SherlockFragmentActivity;
+import com.donnfelker.android.bootstrap.BootstrapApplication;
+
+import butterknife.Views;
+
+/**
+ * Base class for all Bootstrap Activities that need fragments.
+ */
+public class BootstrapFragmentActivity extends SherlockFragmentActivity {
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        BootstrapApplication.getInstance().inject(this);
+    }
+
+    @Override
+    public void setContentView(int layoutResId) {
+        super.setContentView(layoutResId);
+
+        Views.inject(this);
+    }
+
+}
diff --git a/app/src/main/java/com/donnfelker/android/bootstrap/ui/BootstrapTimerActivity.java b/app/src/main/java/com/donnfelker/android/bootstrap/ui/BootstrapTimerActivity.java
new file mode 100644
index 0000000..567c7b5
--- /dev/null
+++ b/app/src/main/java/com/donnfelker/android/bootstrap/ui/BootstrapTimerActivity.java
@@ -0,0 +1,232 @@
+package com.donnfelker.android.bootstrap.ui;
+
+import android.app.ActivityManager;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+import android.widget.TextView;
+
+import com.donnfelker.android.bootstrap.BootstrapApplication;
+import com.donnfelker.android.bootstrap.R;
+import com.donnfelker.android.bootstrap.core.PauseTimerEvent;
+import com.donnfelker.android.bootstrap.core.ResumeTimerEvent;
+import com.donnfelker.android.bootstrap.core.StopTimerEvent;
+import com.donnfelker.android.bootstrap.core.TimerPausedEvent;
+import com.donnfelker.android.bootstrap.core.TimerService;
+import com.donnfelker.android.bootstrap.core.TimerTickEvent;
+import javax.inject.Inject;
+import com.squareup.otto.Bus;
+import com.squareup.otto.Subscribe;
+
+import butterknife.InjectView;
+import butterknife.Views;
+
+public class BootstrapTimerActivity extends BootstrapFragmentActivity implements View.OnClickListener {
+
+    @Inject Bus BUS;
+
+    @InjectView(R.id.chronometer) protected TextView chronometer;
+    @InjectView(R.id.start) protected Button start;
+    @InjectView(R.id.stop) protected Button stop;
+    @InjectView(R.id.pause) protected Button pause;
+    @InjectView(R.id.resume) protected Button resume;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        setContentView(R.layout.bootstrap_timer);
+
+        setTitle(R.string.timer);
+
+        start.setOnClickListener(this);
+        stop.setOnClickListener(this);
+        pause.setOnClickListener(this);
+        resume.setOnClickListener(this);
+
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+
+        BUS.register(this);
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+
+        BUS.unregister(this);
+    }
+
+    @Override
+    public void onClick(View v) {
+        switch(v.getId()) {
+            case R.id.start:
+                startTimer();
+                break;
+            case R.id.stop:
+                produceStopEvent();
+                break;
+            case R.id.pause:
+                producePauseEvent();
+                break;
+            case R.id.resume:
+                produceResumeEvent();
+                break;
+        }
+    }
+
+    /**
+     * Starts the timer service
+     */
+    private void startTimer() {
+        if(isTimerServiceRunning() == false) {
+            final Intent i = new Intent(this, TimerService.class);
+            startService(i);
+
+            start.setVisibility(View.GONE);
+            stop.setVisibility(View.VISIBLE);
+            pause.setVisibility(View.VISIBLE);
+        }
+    }
+
+    /**
+     * Posts a {@link StopTimerEvent} message to the {@link Bus}
+     */
+    private void produceStopEvent() {
+        BUS.post(new StopTimerEvent());
+    }
+
+    /**
+     * Posts a {@link PauseTimerEvent} message to the {@link Bus}
+     */
+    private void producePauseEvent() {
+        BUS.post(new PauseTimerEvent());
+    }
+
+    /**
+     * Posts a {@link ResumeTimerEvent} message to the {@link Bus}
+     */
+    private void produceResumeEvent() {
+        BUS.post(new ResumeTimerEvent());
+    }
+
+    @Subscribe
+    public void onTimerPausedEvent(TimerPausedEvent event) {
+        if(event.isTimerIsPaused()) {
+            resume.setVisibility(View.VISIBLE);
+            stop.setVisibility(View.VISIBLE);
+            pause.setVisibility(View.GONE);
+            start.setVisibility(View.GONE);
+        } else if(isTimerServiceRunning()) {
+            pause.setVisibility(View.VISIBLE);
+            stop.setVisibility(View.VISIBLE);
+            resume.setVisibility(View.GONE);
+            start.setVisibility(View.GONE);
+        }
+    }
+
+    /**
+     * Called by {@link Bus} when a tick event occurs.
+     * @param event The event
+     */
+    @Subscribe
+    public void onTickEvent(TimerTickEvent event) {
+        setFormattedTime(event.getMillis());
+    }
+
+
+
+    /**
+     * Called by {@link Bus} when a tick event occurs.
+     * @param event The event
+     */
+    @Subscribe
+    public void onPauseEvent(PauseTimerEvent event) {
+        resume.setVisibility(View.VISIBLE);
+        pause.setVisibility(View.GONE);
+    }
+
+    /**
+     * Called by {@link Bus} when a tick event occurs.
+     * @param event The event
+     */
+    @Subscribe
+    public void onResumeEvent(ResumeTimerEvent event) {
+        resume.setVisibility(View.GONE);
+        pause.setVisibility(View.VISIBLE);
+    }
+
+    /**
+     * Called by {@link Bus} when a tick event occurs.
+     * @param event The event
+     */
+    @Subscribe
+    public void onStopEvent(StopTimerEvent event) {
+        resume.setVisibility(View.GONE);
+        pause.setVisibility(View.GONE);
+        start.setVisibility(View.VISIBLE);
+        stop.setVisibility(View.GONE);
+        setFormattedTime(0); // Since its stopped, zero out the timer.
+    }
+
+    /**
+     * Checks to see if the timer service is running or not.
+     * @return true if the service is running otherwise false.
+     */
+    private boolean isTimerServiceRunning() {
+        ActivityManager manager = (ActivityManager) getSystemService(Context.ACTIVITY_SERVICE);
+        for (ActivityManager.RunningServiceInfo service : manager.getRunningServices(Integer.MAX_VALUE)) {
+            if (TimerService.class.getName().equals(service.service.getClassName())) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Sets the formatted time
+     * @param millis the elapsed time
+     */
+    private void setFormattedTime(long millis) {
+        final String formattedTime = formatTime(millis);
+        chronometer.setText(formattedTime);
+    }
+
+    /**
+     * Formats the time to look like "HH:MM:SS"
+     * @param millis The number of elapsed milliseconds
+     * @return A formatted time value
+     */
+    public static String formatTime(long millis) {
+
+        long seconds = millis / 1000;
+        long minutes = seconds / 60;
+        long hours = minutes / 60;
+
+        seconds = seconds % 60;
+        minutes = minutes % 60;
+        hours = hours % 60;
+
+        String secondsD = String.valueOf(seconds);
+        String minutesD = String.valueOf(minutes);
+        String hoursD = String.valueOf(hours);
+
+        if (seconds < 10)
+            secondsD = "0" + seconds;
+        if (minutes < 10)
+            minutesD = "0" + minutes;
+        if (hours < 10)
+            hoursD = "0" + hours;
+
+        // HH:MM:SS
+        return String.format("%1$s:%2$s:%3$s" , hoursD , minutesD , secondsD);
+
+    }
+
+
+}
diff --git a/app/src/main/java/com/donnfelker/android/bootstrap/ui/CarouselActivity.java b/app/src/main/java/com/donnfelker/android/bootstrap/ui/CarouselActivity.java
index a5b6745..6cf6021 100644
--- a/app/src/main/java/com/donnfelker/android/bootstrap/ui/CarouselActivity.java
+++ b/app/src/main/java/com/donnfelker/android/bootstrap/ui/CarouselActivity.java
@@ -8,22 +8,25 @@
 import android.os.Bundle;
 import android.support.v4.view.ViewPager;
 
+import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuItem;
 import com.actionbarsherlock.view.Window;
+import com.donnfelker.android.bootstrap.BootstrapApplication;
 import com.donnfelker.android.bootstrap.R;
 import com.donnfelker.android.bootstrap.R.id;
-import com.github.rtyley.android.sherlock.roboguice.activity.RoboSherlockFragmentActivity;
+
 import com.viewpagerindicator.TitlePageIndicator;
 
-import roboguice.inject.InjectView;
+import butterknife.InjectView;
+import butterknife.Views;
 
 /**
  * Activity to view the carousel and view pager indicator with fragments.
  */
-public class CarouselActivity extends RoboSherlockFragmentActivity {
+public class CarouselActivity extends BootstrapFragmentActivity {
 
-    @InjectView(id.tpi_header) private TitlePageIndicator indicator;
-    @InjectView(id.vp_pages) private ViewPager pager;
+    @InjectView(id.tpi_header) TitlePageIndicator indicator;
+    @InjectView(id.vp_pages) ViewPager pager;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -39,5 +42,15 @@ protected void onCreate(Bundle savedInstanceState) {
         pager.setCurrentItem(1);
     }
 
-
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch(item.getItemId()) {
+            case id.timer:
+                final Intent i = new Intent(this, BootstrapTimerActivity.class);
+                startActivity(i);
+                return true;
+            default:
+                return super.onOptionsItemSelected(item);
+        }
+    }
 }
diff --git a/app/src/main/java/com/donnfelker/android/bootstrap/ui/CheckInsListAdapter.java b/app/src/main/java/com/donnfelker/android/bootstrap/ui/CheckInsListAdapter.java
index 6761c54..2eacfac 100644
--- a/app/src/main/java/com/donnfelker/android/bootstrap/ui/CheckInsListAdapter.java
+++ b/app/src/main/java/com/donnfelker/android/bootstrap/ui/CheckInsListAdapter.java
@@ -1,15 +1,12 @@
 package com.donnfelker.android.bootstrap.ui;
 
-import android.util.Log;
 import android.view.LayoutInflater;
 
 import com.donnfelker.android.bootstrap.R;
 import com.donnfelker.android.bootstrap.core.CheckIn;
-import com.donnfelker.android.bootstrap.core.News;
 
 import java.util.List;
 
-import roboguice.util.Strings;
 
 public class CheckInsListAdapter extends AlternatingColorListAdapter<CheckIn> {
     /**
@@ -39,6 +36,6 @@ protected int[] getChildViewIds() {
     protected void update(int position, CheckIn item) {
         super.update(position, item);
 
-        setText(R.id.tv_name, item.getName());
+        setText(0, item.getName());
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/donnfelker/android/bootstrap/ui/CheckInsListFragment.java b/app/src/main/java/com/donnfelker/android/bootstrap/ui/CheckInsListFragment.java
index 0769ff8..25f98f1 100644
--- a/app/src/main/java/com/donnfelker/android/bootstrap/ui/CheckInsListFragment.java
+++ b/app/src/main/java/com/donnfelker/android/bootstrap/ui/CheckInsListFragment.java
@@ -9,17 +9,35 @@
 import android.view.View;
 import android.widget.ListView;
 
+import com.donnfelker.android.bootstrap.BootstrapApplication;
 import com.donnfelker.android.bootstrap.BootstrapServiceProvider;
 import com.donnfelker.android.bootstrap.R;
+import com.donnfelker.android.bootstrap.authenticator.LogoutService;
 import com.donnfelker.android.bootstrap.core.CheckIn;
 import com.github.kevinsawicki.wishlist.SingleTypeAdapter;
-import com.google.inject.Inject;
+import javax.inject.Inject;
 
+import javax.inject.Inject;
+import java.util.Collections;
 import java.util.List;
 
 public class CheckInsListFragment extends ItemListFragment<CheckIn> {
 
     @Inject protected BootstrapServiceProvider serviceProvider;
+    @Inject protected LogoutService logoutService;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        BootstrapApplication.getInstance().inject(this);
+    }
+
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+
+
+    }
 
     @Override
     protected void configureList(Activity activity, ListView listView) {
@@ -33,6 +51,11 @@ protected void configureList(Activity activity, ListView listView) {
                         .inflate(R.layout.checkins_list_item_labels, null));
     }
 
+    @Override
+    LogoutService getLogoutService() {
+        return logoutService;
+    }
+
     @Override
     public void onDestroyView() {
         setListAdapter(null);
@@ -48,7 +71,12 @@ public Loader<List<CheckIn>> onCreateLoader(int id, Bundle args) {
             @Override
             public List<CheckIn> loadData() throws Exception {
                 try {
-                    return serviceProvider.getService().getCheckIns();
+                    if(getActivity() != null) {
+                        return serviceProvider.getService(getActivity()).getCheckIns();
+                    } else {
+                        return Collections.emptyList();
+                    }
+
                 } catch (OperationCanceledException e) {
                     Activity activity = getActivity();
                     if (activity != null)
diff --git a/app/src/main/java/com/donnfelker/android/bootstrap/ui/ItemListFragment.java b/app/src/main/java/com/donnfelker/android/bootstrap/ui/ItemListFragment.java
index 06370b6..74c359b 100644
--- a/app/src/main/java/com/donnfelker/android/bootstrap/ui/ItemListFragment.java
+++ b/app/src/main/java/com/donnfelker/android/bootstrap/ui/ItemListFragment.java
@@ -1,7 +1,6 @@
 
 package com.donnfelker.android.bootstrap.ui;
 
-import android.accounts.AccountManager;
 import android.app.Activity;
 import android.os.Bundle;
 import android.support.v4.app.LoaderManager.LoaderCallbacks;
@@ -17,25 +16,22 @@
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
+import com.actionbarsherlock.app.SherlockFragment;
 import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuInflater;
 import com.actionbarsherlock.view.MenuItem;
 import com.donnfelker.android.bootstrap.R;
+import com.donnfelker.android.bootstrap.R.id;
+import com.donnfelker.android.bootstrap.R.layout;
 import com.donnfelker.android.bootstrap.authenticator.LogoutService;
 import com.github.kevinsawicki.wishlist.SingleTypeAdapter;
 import com.github.kevinsawicki.wishlist.Toaster;
 import com.github.kevinsawicki.wishlist.ViewUtils;
-import com.donnfelker.android.bootstrap.R.id;
-import com.donnfelker.android.bootstrap.R.layout;
-import com.donnfelker.android.bootstrap.R.menu;
-import com.github.rtyley.android.sherlock.roboguice.fragment.RoboSherlockFragment;
-import com.google.inject.Inject;
 
 import java.util.Collections;
 import java.util.List;
-import java.util.concurrent.Callable;
 
-import roboguice.util.RoboAsyncTask;
+
 
 /**
  * Base fragment for displaying a list of items that loads with a progress bar
@@ -43,11 +39,9 @@
  *
  * @param <E>
  */
-public abstract class ItemListFragment<E> extends RoboSherlockFragment
+public abstract class ItemListFragment<E> extends SherlockFragment
         implements LoaderCallbacks<List<E>> {
 
-    @Inject protected LogoutService logoutService;
-
     private static final String FORCE_REFRESH = "forceRefresh";
 
     /**
@@ -172,8 +166,10 @@ public boolean onOptionsItemSelected(MenuItem item) {
         }
     }
 
+    abstract LogoutService getLogoutService();
+
     private void logout() {
-        logoutService.logout(new Runnable() {
+        getLogoutService().logout(new Runnable() {
             @Override
             public void run() {
                 // Calling a refresh will force the service to look for a logged in user
diff --git a/app/src/main/java/com/donnfelker/android/bootstrap/ui/NewsActivity.java b/app/src/main/java/com/donnfelker/android/bootstrap/ui/NewsActivity.java
index bac4b8c..5580fe1 100644
--- a/app/src/main/java/com/donnfelker/android/bootstrap/ui/NewsActivity.java
+++ b/app/src/main/java/com/donnfelker/android/bootstrap/ui/NewsActivity.java
@@ -1,26 +1,17 @@
 package com.donnfelker.android.bootstrap.ui;
 
-import android.content.Intent;
+import static com.donnfelker.android.bootstrap.core.Constants.Extra.NEWS_ITEM;
 import android.os.Bundle;
 import android.widget.TextView;
 
-import com.actionbarsherlock.R;
-import com.actionbarsherlock.view.MenuItem;
-import com.donnfelker.android.bootstrap.BootstrapServiceProvider;
+import com.donnfelker.android.bootstrap.R;
 import com.donnfelker.android.bootstrap.core.News;
-import com.github.rtyley.android.sherlock.roboguice.activity.RoboSherlockActivity;
-import com.google.inject.Inject;
-
-import roboguice.inject.InjectExtra;
-import roboguice.inject.InjectView;
 
-import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TOP;
-import static android.content.Intent.FLAG_ACTIVITY_SINGLE_TOP;
-import static com.donnfelker.android.bootstrap.core.Constants.Extra.NEWS_ITEM;
+import butterknife.InjectView;
 
 public class NewsActivity extends BootstrapActivity {
 
-    @InjectExtra(NEWS_ITEM) protected News newsItem;
+    protected News newsItem;
 
     @InjectView(R.id.tv_title) protected TextView title;
     @InjectView(R.id.tv_content) protected TextView content;
@@ -31,6 +22,10 @@ protected void onCreate(Bundle savedInstanceState) {
 
         setContentView(R.layout.news);
 
+        if(getIntent() != null && getIntent().getExtras() != null) {
+            newsItem = (News) getIntent().getExtras().getSerializable(NEWS_ITEM);
+        }
+
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
         getSupportActionBar().setHomeButtonEnabled(true);
 
diff --git a/app/src/main/java/com/donnfelker/android/bootstrap/ui/NewsListAdapter.java b/app/src/main/java/com/donnfelker/android/bootstrap/ui/NewsListAdapter.java
index 20f9567..39e3d21 100644
--- a/app/src/main/java/com/donnfelker/android/bootstrap/ui/NewsListAdapter.java
+++ b/app/src/main/java/com/donnfelker/android/bootstrap/ui/NewsListAdapter.java
@@ -37,8 +37,8 @@ protected int[] getChildViewIds() {
     protected void update(int position, News item) {
         super.update(position, item);
 
-        setText(R.id.tv_title, item.getTitle());
-        setText(R.id.tv_summary, item.getContent());
+        setText(0, item.getTitle());
+        setText(1, item.getContent());
         //setNumber(R.id.tv_date, item.getCreatedAt());
     }
 }
diff --git a/app/src/main/java/com/donnfelker/android/bootstrap/ui/NewsListFragment.java b/app/src/main/java/com/donnfelker/android/bootstrap/ui/NewsListFragment.java
index 430fb73..246e94a 100644
--- a/app/src/main/java/com/donnfelker/android/bootstrap/ui/NewsListFragment.java
+++ b/app/src/main/java/com/donnfelker/android/bootstrap/ui/NewsListFragment.java
@@ -9,23 +9,36 @@
 import android.view.View;
 import android.widget.ListView;
 
+import com.donnfelker.android.bootstrap.BootstrapApplication;
 import com.donnfelker.android.bootstrap.BootstrapServiceProvider;
 import com.donnfelker.android.bootstrap.R;
+import com.donnfelker.android.bootstrap.authenticator.LogoutService;
 import com.donnfelker.android.bootstrap.core.News;
 import com.github.kevinsawicki.wishlist.SingleTypeAdapter;
-import com.google.inject.Inject;
+import javax.inject.Inject;
 
+import java.util.Collections;
 import java.util.List;
 
 public class NewsListFragment extends ItemListFragment<News> {
 
     @Inject protected BootstrapServiceProvider serviceProvider;
+    @Inject protected LogoutService logoutService;
+
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        BootstrapApplication.getInstance().inject(this);
+    }
 
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
 
         setEmptyText(R.string.no_news);
+
+
     }
 
     @Override
@@ -40,6 +53,11 @@ protected void configureList(Activity activity, ListView listView) {
                         .inflate(R.layout.news_list_item_labels, null));
     }
 
+    @Override
+    LogoutService getLogoutService() {
+        return logoutService;
+    }
+
     @Override
     public void onDestroyView() {
         setListAdapter(null);
@@ -55,7 +73,12 @@ public Loader<List<News>> onCreateLoader(int id, Bundle args) {
             @Override
             public List<News> loadData() throws Exception {
                 try {
-                    return serviceProvider.getService().getNews();
+                    if(getActivity() != null) {
+                        return serviceProvider.getService(getActivity()).getNews();
+                    } else {
+                        return Collections.emptyList();
+                    }
+
                 } catch (OperationCanceledException e) {
                     Activity activity = getActivity();
                     if (activity != null)
diff --git a/app/src/main/java/com/donnfelker/android/bootstrap/ui/ThrowableLoader.java b/app/src/main/java/com/donnfelker/android/bootstrap/ui/ThrowableLoader.java
index f4a6d61..ecdde3b 100644
--- a/app/src/main/java/com/donnfelker/android/bootstrap/ui/ThrowableLoader.java
+++ b/app/src/main/java/com/donnfelker/android/bootstrap/ui/ThrowableLoader.java
@@ -4,7 +4,8 @@
 import android.content.Context;
 import android.util.Log;
 
-import roboguice.util.Ln;
+import com.donnfelker.android.bootstrap.util.Ln;
+
 
 /**
  * Loader that support throwing an exception when loading in the background
diff --git a/app/src/main/java/com/donnfelker/android/bootstrap/ui/UserActivity.java b/app/src/main/java/com/donnfelker/android/bootstrap/ui/UserActivity.java
index 86e7f37..6a3f964 100644
--- a/app/src/main/java/com/donnfelker/android/bootstrap/ui/UserActivity.java
+++ b/app/src/main/java/com/donnfelker/android/bootstrap/ui/UserActivity.java
@@ -5,29 +5,34 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.donnfelker.android.bootstrap.BootstrapApplication;
 import com.donnfelker.android.bootstrap.R;
 import com.donnfelker.android.bootstrap.core.AvatarLoader;
 import com.donnfelker.android.bootstrap.core.User;
-import com.google.inject.Inject;
+import javax.inject.Inject;
 
-import roboguice.inject.InjectExtra;
-import roboguice.inject.InjectView;
+import butterknife.InjectView;
+import butterknife.Views;
 
 public class UserActivity extends BootstrapActivity {
 
     @InjectView(R.id.iv_avatar) protected ImageView avatar;
     @InjectView(R.id.tv_name) protected TextView name;
 
-    @InjectExtra(USER) protected User user;
-
     @Inject protected AvatarLoader avatarLoader;
 
+    protected User user;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
         setContentView(R.layout.user_view);
 
+        if(getIntent() != null && getIntent().getExtras() != null) {
+            user = (User) getIntent().getExtras().getSerializable(USER);
+        }
+
         getSupportActionBar().setHomeButtonEnabled(true);
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
diff --git a/app/src/main/java/com/donnfelker/android/bootstrap/ui/UserListAdapter.java b/app/src/main/java/com/donnfelker/android/bootstrap/ui/UserListAdapter.java
index 5830f3b..398a186 100644
--- a/app/src/main/java/com/donnfelker/android/bootstrap/ui/UserListAdapter.java
+++ b/app/src/main/java/com/donnfelker/android/bootstrap/ui/UserListAdapter.java
@@ -53,9 +53,9 @@ protected int[] getChildViewIds() {
     @Override
     protected void update(int position, User user) {
 
-        avatars.bind(imageView(R.id.iv_avatar), user);
+        avatars.bind(imageView(0), user);
 
-        setText(R.id.tv_name, String.format("%1$s %2$s", user.getFirstName(), user.getLastName()));
+        setText(1, String.format("%1$s %2$s", user.getFirstName(), user.getLastName()));
 
     }
 
diff --git a/app/src/main/java/com/donnfelker/android/bootstrap/ui/UserListFragment.java b/app/src/main/java/com/donnfelker/android/bootstrap/ui/UserListFragment.java
index ab53827..74ec7cc 100644
--- a/app/src/main/java/com/donnfelker/android/bootstrap/ui/UserListFragment.java
+++ b/app/src/main/java/com/donnfelker/android/bootstrap/ui/UserListFragment.java
@@ -10,27 +10,39 @@
 import android.view.View;
 import android.widget.ListView;
 
+import com.donnfelker.android.bootstrap.BootstrapApplication;
 import com.donnfelker.android.bootstrap.BootstrapServiceProvider;
 import com.donnfelker.android.bootstrap.R;
+import com.donnfelker.android.bootstrap.authenticator.LogoutService;
 import com.donnfelker.android.bootstrap.core.AvatarLoader;
 import com.donnfelker.android.bootstrap.core.News;
 import com.donnfelker.android.bootstrap.core.User;
 import com.github.kevinsawicki.wishlist.SingleTypeAdapter;
-import com.google.inject.Inject;
+import javax.inject.Inject;
 
 import java.util.Collections;
 import java.util.List;
 
 public class UserListFragment  extends ItemListFragment<User> {
 
-    @Inject private BootstrapServiceProvider serviceProvider;
-    @Inject private AvatarLoader avatars;
+    @Inject BootstrapServiceProvider serviceProvider;
+    @Inject AvatarLoader avatars;
+    @Inject LogoutService logoutService;
+
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        BootstrapApplication.getInstance().inject(this);
+    }
 
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
 
         setEmptyText(R.string.no_users);
+
+
     }
 
     @Override
@@ -44,6 +56,10 @@ protected void configureList(Activity activity, ListView listView) {
                         .inflate(R.layout.user_list_item_labels, null));
     }
 
+    @Override
+    LogoutService getLogoutService() {
+        return logoutService;
+    }
 
 
     @Override
@@ -54,7 +70,11 @@ public Loader<List<User>> onCreateLoader(int id, Bundle args) {
             public List<User> loadData() throws Exception {
 
                 try {
-                    List<User> latest = serviceProvider.getService().getUsers();
+                    List<User> latest = null;
+
+                    if(getActivity() != null)
+                        latest = serviceProvider.getService(getActivity()).getUsers();
+
                     if (latest != null)
                         return latest;
                     else
diff --git a/app/src/main/java/com/donnfelker/android/bootstrap/util/Ln.java b/app/src/main/java/com/donnfelker/android/bootstrap/util/Ln.java
new file mode 100644
index 0000000..f32c825
--- /dev/null
+++ b/app/src/main/java/com/donnfelker/android/bootstrap/util/Ln.java
@@ -0,0 +1,284 @@
+package com.donnfelker.android.bootstrap.util;
+
+
+import android.app.Application;
+import android.content.pm.ApplicationInfo;
+import android.util.Log;
+
+import javax.inject.Inject;
+
+
+/**
+ * Originally from RoboGuice: https://github.com/roboguice/roboguice/blob/master/roboguice/src/main/java/roboguice/util/Ln.java
+ *
+ * A more natural android logging facility.
+ *
+ * WARNING: CHECK OUT COMMON PITFALLS BELOW
+ *
+ * Unlike {@link android.util.Log}, Log provides sensible defaults.
+ * Debug and Verbose logging is enabled for applications that
+ * have "android:debuggable=true" in their AndroidManifest.xml.
+ * For apps built using SDK Tools r8 or later, this means any debug
+ * build.  Release builds built with r8 or later will have verbose
+ * and debug log messages turned off.
+ *
+ * The default tag is automatically set to your app's packagename,
+ * and the current context (eg. activity, service, application, etc)
+ * is appended as well.  You can add an additional parameter to the
+ * tag using {@link #Log(String)}.
+ *
+ * Log-levels can be programatically overridden for specific instances
+ * using {@link #Log(String, boolean, boolean)}.
+ *
+ * Log messages may optionally use {@link String#format(String, Object...)}
+ * formatting, which will not be evaluated unless the log statement is output.
+ * Additional parameters to the logging statement are treated as varrgs parameters
+ * to {@link String#format(String, Object...)}
+ *
+ * Also, the current file and line is automatically appended to the tag
+ * (this is only done if debug is enabled for performance reasons).
+ *
+ * COMMON PITFALLS:
+ * * Make sure you put the exception FIRST in the call.  A common
+ *   mistake is to place it last as is the android.util.Log convention,
+ *   but then it will get treated as varargs parameter.
+ * * vararg parameters are not appended to the log message!  You must
+ *   insert them into the log message using %s or another similar
+ *   format parameter
+ *
+ * Usage Examples:
+ *
+ * Ln.v("hello there");
+ * Ln.d("%s %s", "hello", "there");
+ * Ln.e( exception, "Error during some operation");
+ * Ln.w( exception, "Error during %s operation", "some other");
+ *
+ *
+ */
+@SuppressWarnings({"ImplicitArrayToString"})
+public class Ln  {
+    /**
+     * config is initially set to BaseConfig() with sensible defaults, then replaced
+     * by BaseConfig(ContextSingleton) during guice static injection pass.
+     */
+    @Inject protected static BaseConfig config = new BaseConfig();
+
+    /**
+     * print is initially set to Print(), then replaced by guice during
+     * static injection pass.  This allows overriding where the log message is delivered to.
+     */
+    @Inject protected static Print print = new Print();
+
+
+
+    private Ln() {}
+
+
+
+    public static int v(Throwable t) {
+        return config.minimumLogLevel <= Log.VERBOSE ? print.println(Log.VERBOSE, Log.getStackTraceString(t)) : 0;
+    }
+
+    public static int v(Object s1, Object... args) {
+        if( config.minimumLogLevel > Log.VERBOSE )
+            return 0;
+
+        final String s = Strings.toString(s1);
+        final String message = args.length>0 ? String.format(s,args) : s;
+        return print.println(Log.VERBOSE, message);
+    }
+
+    public static int v(Throwable throwable, Object s1, Object... args ) {
+        if( config.minimumLogLevel > Log.VERBOSE )
+            return 0;
+
+        final String s = Strings.toString(s1);
+        final String message = (args.length>0 ? String.format(s,args) : s) + '\n' + Log.getStackTraceString(throwable);
+        return print.println(Log.VERBOSE, message);
+    }
+
+    public static int d(Throwable t) {
+        return config.minimumLogLevel <= Log.DEBUG ? print.println(Log.DEBUG, Log.getStackTraceString(t)) : 0;
+    }
+
+    public static int d(Object s1, Object... args) {
+        if( config.minimumLogLevel > Log.DEBUG )
+            return 0;
+
+        final String s = Strings.toString(s1);
+        final String message = args.length>0 ? String.format(s,args) : s;
+        return print.println(Log.DEBUG, message);
+    }
+
+    public static int d(Throwable throwable, Object s1, Object... args) {
+        if( config.minimumLogLevel > Log.DEBUG )
+            return 0;
+
+        final String s = Strings.toString(s1);
+        final String message = (args.length>0 ? String.format(s,args) : s) + '\n' + Log.getStackTraceString(throwable);
+        return print.println(Log.DEBUG, message);
+    }
+
+    public static int i(Throwable t) {
+        return config.minimumLogLevel <= Log.INFO ? print.println(Log.INFO, Log.getStackTraceString(t)) : 0;
+    }
+
+    public static int i( Object s1, Object... args) {
+        if( config.minimumLogLevel > Log.INFO )
+            return 0;
+
+        final String s = Strings.toString(s1);
+        final String message = args.length>0 ? String.format(s,args) : s;
+        return print.println(Log.INFO, message);
+    }
+
+    public static int i(Throwable throwable, Object s1, Object... args) {
+        if( config.minimumLogLevel > Log.INFO )
+            return 0;
+
+        final String s = Strings.toString(s1);
+        final String message = (args.length > 0 ? String.format(s, args) : s) + '\n' + Log.getStackTraceString(throwable);
+        return print.println(Log.INFO, message);
+    }
+
+    public static int w(Throwable t) {
+        return config.minimumLogLevel <= Log.WARN ? print.println(Log.WARN, Log.getStackTraceString(t)) : 0;
+    }
+
+    public static int w( Object s1, Object... args) {
+        if( config.minimumLogLevel > Log.WARN )
+            return 0;
+
+        final String s = Strings.toString(s1);
+        final String message = args.length>0 ? String.format(s,args) : s;
+        return print.println(Log.WARN, message);
+    }
+
+    public static int w( Throwable throwable, Object s1, Object... args) {
+        if( config.minimumLogLevel > Log.WARN )
+            return 0;
+
+        final String s = Strings.toString(s1);
+        final String message = (args.length>0 ? String.format(s,args) : s) + '\n' + Log.getStackTraceString(throwable);
+        return print.println(Log.WARN, message);
+    }
+
+    public static int e(Throwable t) {
+        return config.minimumLogLevel <= Log.ERROR ? print.println(Log.ERROR, Log.getStackTraceString(t)) : 0;
+    }
+
+    public static int e( Object s1, Object... args) {
+        if( config.minimumLogLevel > Log.ERROR )
+            return 0;
+
+        final String s = Strings.toString(s1);
+        final String message = args.length>0 ? String.format(s,args) : s;
+        return print.println(Log.ERROR, message);
+    }
+
+    public static int e( Throwable throwable, Object s1, Object... args) {
+        if( config.minimumLogLevel > Log.ERROR )
+            return 0;
+
+        final String s = Strings.toString(s1);
+        final String message = (args.length>0 ? String.format(s,args) : s) + '\n' + Log.getStackTraceString(throwable);
+        return print.println(Log.ERROR, message);
+    }
+
+    public static boolean isDebugEnabled() {
+        return config.minimumLogLevel <= Log.DEBUG;
+    }
+
+    public static boolean isVerboseEnabled() {
+        return config.minimumLogLevel <= Log.VERBOSE;
+    }
+
+    public static Config getConfig() {
+        return config;
+    }
+
+
+    public static interface Config {
+        public int getLoggingLevel();
+        public void setLoggingLevel(int level);
+    }
+
+    public static class BaseConfig implements Config {
+        protected int minimumLogLevel = Log.VERBOSE;
+        protected String packageName = "";
+        protected String scope = "";
+
+        protected BaseConfig() {
+        }
+
+        @Inject
+        public BaseConfig(Application context) {
+            try {
+                packageName = context.getPackageName();
+                final int flags = context.getPackageManager().getApplicationInfo(packageName, 0).flags;
+                minimumLogLevel = (flags & ApplicationInfo.FLAG_DEBUGGABLE) != 0 ? Log.VERBOSE : Log.INFO;
+                scope = packageName.toUpperCase();
+
+                Ln.d("Configuring Logging, minimum log level is %s", logLevelToString(minimumLogLevel) );
+
+            } catch( Exception e ) {
+                try {
+                    Log.e(packageName, "Error configuring logger", e);
+                } catch( RuntimeException f ) {
+                    // HACK ignore Stub! errors in mock objects during testing
+                }
+            }
+        }
+
+        public int getLoggingLevel() {
+            return minimumLogLevel;
+        }
+
+        public void setLoggingLevel(int level) {
+            minimumLogLevel = level;
+        }
+    }
+
+    public static String logLevelToString( int loglevel ) {
+        switch( loglevel ) {
+            case Log.VERBOSE:
+                return "VERBOSE";
+            case Log.DEBUG:
+                return "DEBUG";
+            case Log.INFO:
+                return "INFO";
+            case Log.WARN:
+                return "WARN";
+            case Log.ERROR:
+                return "ERROR";
+            case Log.ASSERT:
+                return "ASSERT";
+        }
+
+        return "UNKNOWN";
+    }
+
+
+    /** Default implementation logs to android.util.Log */
+    public static class Print {
+        public int println(int priority, String msg ) {
+            return Log.println(priority,getScope(5), processMessage(msg));
+        }
+
+        protected String processMessage(String msg) {
+            if( config.minimumLogLevel <= Log.DEBUG )
+                msg = String.format("%s %s", Thread.currentThread().getName(), msg);
+            return msg;
+        }
+
+        protected static String getScope(int skipDepth) {
+            if( config.minimumLogLevel <= Log.DEBUG ) {
+                final StackTraceElement trace = Thread.currentThread().getStackTrace()[skipDepth];
+                return config.scope + "/" + trace.getFileName() + ":" + trace.getLineNumber();
+            }
+
+            return config.scope;
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/donnfelker/android/bootstrap/util/SafeAsyncTask.java b/app/src/main/java/com/donnfelker/android/bootstrap/util/SafeAsyncTask.java
new file mode 100644
index 0000000..e96f9f1
--- /dev/null
+++ b/app/src/main/java/com/donnfelker/android/bootstrap/util/SafeAsyncTask.java
@@ -0,0 +1,296 @@
+package com.donnfelker.android.bootstrap.util;
+
+import android.os.Handler;
+import android.os.Looper;
+import android.util.Log;
+
+import java.io.InterruptedIOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.concurrent.*;
+
+/**
+ * Originally from RoboGuice: https://github.com/roboguice/roboguice/blob/master/roboguice/src/main/java/roboguice/util/SafeAsyncTask.java
+ *
+ * A class similar but unrelated to android's {@link android.os.AsyncTask}.
+ *
+ * Unlike AsyncTask, this class properly propagates exceptions.
+ *
+ * If you're familiar with AsyncTask and are looking for {@link android.os.AsyncTask#doInBackground(Object[])},
+ * we've named it {@link #call()} here to conform with java 1.5's {@link java.util.concurrent.Callable} interface.
+ *
+ * Current limitations: does not yet handle progress, although it shouldn't be
+ * hard to add.
+ *
+ * If using your own executor, you must call future() to get a runnable you can execute.
+ *
+ * @param <ResultT>
+ */
+public abstract class SafeAsyncTask<ResultT> implements Callable<ResultT> {
+    public static final int DEFAULT_POOL_SIZE = 25;
+    protected static final Executor DEFAULT_EXECUTOR = Executors.newFixedThreadPool(DEFAULT_POOL_SIZE);
+
+    protected Handler handler;
+    protected Executor executor;
+    protected StackTraceElement[] launchLocation;
+    protected FutureTask<Void> future;
+
+
+    /**
+     * Sets executor to Executors.newFixedThreadPool(DEFAULT_POOL_SIZE) and
+     * Handler to new Handler()
+     */
+    public SafeAsyncTask() {
+        this.executor = DEFAULT_EXECUTOR;
+    }
+
+    /**
+     * Sets executor to Executors.newFixedThreadPool(DEFAULT_POOL_SIZE)
+     */
+    public SafeAsyncTask( Handler handler ) {
+        this.handler = handler;
+        this.executor = DEFAULT_EXECUTOR;
+    }
+
+    /**
+     * Sets Handler to new Handler()
+     */
+    public SafeAsyncTask( Executor executor ) {
+        this.executor = executor;
+    }
+
+    public SafeAsyncTask( Handler handler, Executor executor ) {
+        this.handler = handler;
+        this.executor = executor;
+    }
+
+
+    public FutureTask<Void> future() {
+        future = new FutureTask<Void>( newTask() );
+        return future;
+    }
+
+    public SafeAsyncTask<ResultT> executor( Executor executor ) {
+        this.executor = executor;
+        return this;
+    }
+
+    public Executor executor() {
+        return executor;
+    }
+
+    public SafeAsyncTask<ResultT> handler( Handler handler ) {
+        this.handler = handler;
+        return this;
+    }
+
+    public Handler handler() {
+        return handler;
+    }
+
+    public void execute() {
+        execute(Thread.currentThread().getStackTrace());
+    }
+
+    protected void execute( StackTraceElement[] launchLocation ) {
+        this.launchLocation = launchLocation;
+        executor.execute( future() );
+    }
+
+    public boolean cancel( boolean mayInterruptIfRunning ) {
+        if( future==null )
+            throw new UnsupportedOperationException("You cannot cancel this task before calling future()");
+
+        return future.cancel(mayInterruptIfRunning);
+    }
+
+
+    /**
+     * @throws Exception, captured on passed to onException() if present.
+     */
+    protected void onPreExecute() throws Exception {}
+
+    /**
+     * @param t the result of {@link #call()}
+     * @throws Exception, captured on passed to onException() if present.
+     */
+    @SuppressWarnings({"UnusedDeclaration"})
+    protected void onSuccess( ResultT t ) throws Exception {}
+
+    /**
+     * Called when the thread has been interrupted, likely because
+     * the task was canceled.
+     *
+     * By default, calls {@link #onException(Exception)}, but this method
+     * may be overridden to handle interruptions differently than other
+     * exceptions.
+     *
+     * @param e an InterruptedException or InterruptedIOException
+     */
+    protected void onInterrupted( Exception e ) {
+        onException(e);
+    }
+
+    /**
+     * Logs the exception as an Error by default, but this method may
+     * be overridden by subclasses.
+     *
+     * @param e the exception thrown from {@link #onPreExecute()}, {@link #call()}, or {@link #onSuccess(Object)}
+     * @throws RuntimeException, ignored
+     */
+    protected void onException( Exception e ) throws RuntimeException {
+        onThrowable(e);
+    }
+
+    protected void onThrowable( Throwable t ) throws RuntimeException {
+        Log.e("roboguice", "Throwable caught during background processing", t);
+    }
+
+    /**
+     * @throws RuntimeException, ignored
+     */
+    protected void onFinally() throws RuntimeException {}
+
+
+    protected Task<ResultT> newTask() {
+        return new Task<ResultT>(this);
+    }
+
+
+    public static class Task<ResultT> implements Callable<Void> {
+        protected SafeAsyncTask<ResultT> parent;
+        protected Handler handler;
+
+        public Task(SafeAsyncTask<ResultT> parent) {
+            this.parent = parent;
+            this.handler = parent.handler!=null ? parent.handler : new Handler(Looper.getMainLooper());
+        }
+
+        public Void call() throws Exception {
+            try {
+                doPreExecute();
+                doSuccess(doCall());
+
+            } catch( final Exception e ) {
+                try {
+                    doException(e);
+                } catch( Exception f ) {
+                    // logged but ignored
+                    Ln.e(f);
+                }
+
+            } catch( final Throwable t ) {
+                try {
+                    doThrowable(t);
+                } catch( Exception f ) {
+                    // logged but ignored
+                    Ln.e(f);
+                }
+            } finally {
+                doFinally();
+            }
+
+            return null;
+        }
+
+        protected void doPreExecute() throws Exception {
+            postToUiThreadAndWait( new Callable<Object>() {
+                public Object call() throws Exception {
+                    parent.onPreExecute();
+                    return null;
+                }
+            });
+        }
+
+        protected ResultT doCall() throws Exception {
+            return parent.call();
+        }
+
+        protected void doSuccess( final ResultT r ) throws Exception {
+            postToUiThreadAndWait( new Callable<Object>() {
+                public Object call() throws Exception {
+                    parent.onSuccess(r);
+                    return null;
+                }
+            });
+        }
+
+        protected void doException( final Exception e ) throws Exception {
+            if( parent.launchLocation!=null ) {
+                final ArrayList<StackTraceElement> stack = new ArrayList<StackTraceElement>(Arrays.asList(e.getStackTrace()));
+                stack.addAll(Arrays.asList(parent.launchLocation));
+                e.setStackTrace(stack.toArray(new StackTraceElement[stack.size()]));
+            }
+            postToUiThreadAndWait( new Callable<Object>() {
+                public Object call() throws Exception {
+                    if( e instanceof InterruptedException || e instanceof InterruptedIOException )
+                        parent.onInterrupted(e);
+                    else
+                        parent.onException(e);
+                    return null;
+                }
+            });
+        }
+
+        protected void doThrowable( final Throwable e ) throws Exception {
+            if( parent.launchLocation!=null ) {
+                final ArrayList<StackTraceElement> stack = new ArrayList<StackTraceElement>(Arrays.asList(e.getStackTrace()));
+                stack.addAll(Arrays.asList(parent.launchLocation));
+                e.setStackTrace(stack.toArray(new StackTraceElement[stack.size()]));
+            }
+            postToUiThreadAndWait( new Callable<Object>() {
+                public Object call() throws Exception {
+                    parent.onThrowable(e);
+                    return null;
+                }
+            });
+        }
+
+        protected void doFinally() throws Exception {
+            postToUiThreadAndWait( new Callable<Object>() {
+                public Object call() throws Exception {
+                    parent.onFinally();
+                    return null;
+                }
+            });
+        }
+
+
+        /**
+         * Posts the specified runnable to the UI thread using a handler,
+         * and waits for operation to finish.  If there's an exception,
+         * it captures it and rethrows it.
+         * @param c the callable to post
+         * @throws Exception on error
+         */
+        protected void postToUiThreadAndWait( final Callable c ) throws Exception {
+            final CountDownLatch latch = new CountDownLatch(1);
+            final Exception[] exceptions = new Exception[1];
+
+            // Execute onSuccess in the UI thread, but wait
+            // for it to complete.
+            // If it throws an exception, capture that exception
+            // and rethrow it later.
+            handler.post( new Runnable() {
+                public void run() {
+                    try {
+                        c.call();
+                    } catch( Exception e ) {
+                        exceptions[0] = e;
+                    } finally {
+                        latch.countDown();
+                    }
+                }
+            });
+
+            // Wait for onSuccess to finish
+            latch.await();
+
+            if( exceptions[0] != null )
+                throw exceptions[0];
+
+        }
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/donnfelker/android/bootstrap/util/Strings.java b/app/src/main/java/com/donnfelker/android/bootstrap/util/Strings.java
new file mode 100644
index 0000000..72a242b
--- /dev/null
+++ b/app/src/main/java/com/donnfelker/android/bootstrap/util/Strings.java
@@ -0,0 +1,181 @@
+package com.donnfelker.android.bootstrap.util;
+
+
+import java.io.*;
+import java.security.InvalidParameterException;
+import java.security.MessageDigest;
+import java.util.*;
+
+public class Strings {
+    private static final int DEFAULT_BUFFER_SIZE = 1024 * 4;
+
+    /**
+     * Originally from RoboGuice: https://github.com/roboguice/roboguice/blob/master/roboguice/src/main/java/roboguice/util/Strings.java
+     * Like join, but allows for a distinct final delimiter.  For english sentences such
+     * as "Alice, Bob and Charlie" use ", " and " and " as the delimiters.
+     *
+     * @param delimiter usually ", "
+     * @param lastDelimiter usually " and "
+     * @param objs the objects
+     * @param <T> the type
+     * @return a string
+     */
+    public static <T> String joinAnd( final String delimiter, final String lastDelimiter, final Collection<T> objs ) {
+        if (objs == null || objs.isEmpty())
+            return "";
+
+        final Iterator<T> iter = objs.iterator();
+        final StringBuilder buffer = new StringBuilder(Strings.toString(iter.next()));
+        int i=1;
+        while (iter.hasNext()) {
+            final T obj = iter.next();
+            if(notEmpty(obj)) buffer.append( ++i == objs.size() ? lastDelimiter : delimiter).append(Strings.toString(obj));
+        }
+        return buffer.toString();
+    }
+
+    public static <T> String joinAnd( final String delimiter, final String lastDelimiter, final T... objs ) {
+        return joinAnd(delimiter, lastDelimiter, Arrays.asList(objs));
+    }
+
+    public static <T> String join( final String delimiter, final Collection<T> objs) {
+        if (objs == null || objs.isEmpty())
+            return "";
+
+        final Iterator<T> iter = objs.iterator();
+        final StringBuilder buffer = new StringBuilder(Strings.toString(iter.next()));
+
+        while (iter.hasNext()) {
+            final T obj = iter.next();
+            if(notEmpty(obj)) buffer.append(delimiter).append(Strings.toString(obj));
+        }
+        return buffer.toString();
+    }
+
+    public static <T> String join(final String delimiter, final T... objects ) {
+        return join(delimiter, Arrays.asList(objects));
+    }
+
+    public static String toString(InputStream input) {
+        StringWriter sw = new StringWriter();
+        copy( new InputStreamReader(input), sw);
+        return sw.toString();
+    }
+
+    public static String toString(Reader input) {
+        StringWriter sw = new StringWriter();
+        copy(input, sw);
+        return sw.toString();
+    }
+
+    public static int copy(Reader input, Writer output) {
+        long count = copyLarge(input, output);
+        return count > Integer.MAX_VALUE ? -1 : (int)count;
+    }
+
+    public static long copyLarge(Reader input, Writer output) throws RuntimeException {
+        try {
+            char[] buffer = new char[DEFAULT_BUFFER_SIZE];
+            long count = 0;
+            int n;
+            while (-1 != (n = input.read(buffer))) {
+                output.write(buffer, 0, n);
+                count += n;
+            }
+            return count;
+        } catch( IOException e ) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public static String toString( final Object o ) {
+        return toString(o,"");
+    }
+
+    public static String toString( final Object o, final String def ) {
+        return o==null ? def :
+                o instanceof InputStream ? toString((InputStream)o) :
+                        o instanceof Reader ? toString((Reader)o) :
+                                o instanceof Object[] ? Strings.join(", ",(Object[])o) :
+                                        o instanceof Collection ? Strings.join(", ", (Collection<?>)o) : o.toString();
+    }
+
+    public static boolean isEmpty( final Object o ) {
+        return toString(o).trim().length()==0;
+    }
+
+    public static boolean notEmpty( final Object o ) {
+        return toString(o).trim().length()!=0;
+    }
+
+    public static String md5(String s) {
+        // http://stackoverflow.com/questions/1057041/difference-between-java-and-php5-md5-hash
+        // http://code.google.com/p/roboguice/issues/detail?id=89
+        try {
+
+            final byte[] hash = MessageDigest.getInstance( "MD5" ).digest(s.getBytes("UTF-8"));
+            final StringBuilder hashString = new StringBuilder();
+
+            for (byte aHash : hash) {
+                String hex = Integer.toHexString(aHash);
+
+                if (hex.length() == 1) {
+                    hashString.append('0');
+                    hashString.append(hex.charAt(hex.length() - 1));
+                } else {
+                    hashString.append(hex.substring(hex.length() - 2));
+                }
+            }
+
+            return hashString.toString();
+
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public static String capitalize( String s ) {
+        final String c = Strings.toString(s);
+        return c.length()>=2 ? c.substring(0,1).toUpperCase() + c.substring(1) : c.length()>=1 ? c.toUpperCase() : c;
+    }
+
+    public static boolean equals( Object a, Object b ) {
+        return Strings.toString(a).equals(Strings.toString(b));
+    }
+
+    public static boolean equalsIgnoreCase( Object a, Object b ) {
+        return Strings.toString(a).toLowerCase().equals(Strings.toString(b).toLowerCase());
+    }
+
+    public static String[] chunk( String str, int chunkSize ) {
+        if( isEmpty(str) || chunkSize==0 )
+            return new String[0];
+
+        final int len = str.length();
+        final int arrayLen = ((len-1)/chunkSize)+1;
+        final String[] array = new String[arrayLen];
+        for( int i=0; i<arrayLen; ++i )
+            array[i] = str.substring(i*chunkSize,(i*chunkSize)+chunkSize<len ? (i*chunkSize)+chunkSize : len);
+
+        return array;
+    }
+
+    public static String namedFormat(String str, Map<String, String> substitutions) {
+        for( String key : substitutions.keySet() )
+            str = str.replace('$'+key,substitutions.get(key));
+
+        return str;
+    }
+
+    public static String namedFormat( String str, Object... nameValuePairs ) {
+        if( nameValuePairs.length%2 != 0 )
+            throw new InvalidParameterException("You must include one value for each parameter");
+
+        final HashMap<String,String> map = new HashMap<String, String>(nameValuePairs.length/2);
+        for( int i=0; i<nameValuePairs.length; i+=2 )
+            map.put( Strings.toString(nameValuePairs[i]), Strings.toString(nameValuePairs[i+1]));
+
+        return namedFormat(str,map);
+    }
+
+}
\ No newline at end of file
diff --git a/default.properties b/default.properties
index a923a3f..37b6a1a 100644
--- a/default.properties
+++ b/default.properties
@@ -1,4 +1,4 @@
 # A dummy file to force the Android Emulator Plugin to install SDK 15
 # which we need for compiling against ABS 4.
 
-target=android-15
+target=android-16
diff --git a/integration-tests/default.properties b/integration-tests/default.properties
index 31ff39a..ad4ae37 100644
--- a/integration-tests/default.properties
+++ b/integration-tests/default.properties
@@ -1,4 +1,4 @@
 
 
 # Project target.
-target=android-15
+target=android-16
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index 518cb4e..183072f 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -9,7 +9,7 @@
     <packaging>apk</packaging>
 
     <parent>
-        <version>1.4</version>
+        <version>1.0</version>
         <groupId>com.donnfelker.android.bootstrap</groupId>
         <artifactId>android-bootstrap-parent</artifactId>
     </parent>
diff --git a/integration-tests/src/main/java/com/donnfelker/android/bootstrap/test/TestUserAccountUtil.java b/integration-tests/src/main/java/com/donnfelker/android/bootstrap/test/TestUserAccountUtil.java
index f3c6c12..9c034b4 100644
--- a/integration-tests/src/main/java/com/donnfelker/android/bootstrap/test/TestUserAccountUtil.java
+++ b/integration-tests/src/main/java/com/donnfelker/android/bootstrap/test/TestUserAccountUtil.java
@@ -10,8 +10,8 @@
 import static com.donnfelker.android.bootstrap.core.Constants.Auth.*;
 
 import com.donnfelker.android.bootstrap.tests.R;
+import com.donnfelker.android.bootstrap.util.Ln;
 
-import roboguice.util.Ln;
 
 /**
  * Utilities for verifying an account
diff --git a/pom.xml b/pom.xml
index 6bdaf11..0c48910 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0%20http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <version>1.4</version>
+    <version>1.0</version>
     <groupId>com.donnfelker.android.bootstrap</groupId>
     <artifactId>android-bootstrap-parent</artifactId>
     <name>Android Bootstrap parent</name>
@@ -53,7 +53,7 @@
                 <plugin>
                     <groupId>com.jayway.maven.plugins.android.generation2</groupId>
                     <artifactId>android-maven-plugin</artifactId>
-                    <version>3.3.0</version>
+                    <version>3.4.0</version>
                     <extensions>true</extensions>
                     <configuration>
                         <sdk>
@@ -69,4 +69,18 @@
             </plugins>
         </pluginManagement>
     </build>
+
+    <repositories>
+        <repository>
+            <id>sonatype-nexus-snapshots</id>
+            <name>Sonatype Nexus Snapshots</name>
+            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
 </project>
diff --git a/proguard.cfg b/proguard.cfg
index cd5c825..06c61f0 100644
--- a/proguard.cfg
+++ b/proguard.cfg
@@ -36,7 +36,6 @@
 
 -keepclassmembers class * { @com.google.inject.Provides *; @android.test.suitebuilder.annotation.* *; void test*(...); }
 
--keep public class roboguice.**
 -keep class com.google.inject.Binder
 -keep class com.google.inject.Key
 -keep class com.google.inject.Provider
@@ -57,3 +56,25 @@
 }
 
 -keepclassmembers class * extends com.actionbarsherlock.ActionBarSherlock { public <init>(...); }
+
+-keepnames class * implements java.io.Serializable
+
+-keepclassmembers class * implements java.io.Serializable {
+    static final long serialVersionUID;
+    private static final java.io.ObjectStreamField[] serialPersistentFields;
+    !static !transient <fields>;
+    !private <fields>;
+    !private <methods>;
+    private void writeObject(java.io.ObjectOutputStream);
+    private void readObject(java.io.ObjectInputStream);
+    java.lang.Object writeReplace();
+    java.lang.Object readResolve();
+}
+
+-keepclassmembers class ** {
+    @com.squareup.otto.Subscribe public *;
+    @com.squareup.otto.Produce public *;
+}
+
+-dontwarn butterknife.Views$InjectViewProcessor
+-keepclassmembers class **$$ViewInjector
\ No newline at end of file