diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f8b2fc1a..50dae3d0 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -10,6 +10,7 @@
         android:targetSdkVersion="26"/>
 
     <application
+        android:name=".Backup"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
         android:icon="@mipmap/ic_launcher"
diff --git a/app/src/main/java/com/stevesoltys/backup/Backup.java b/app/src/main/java/com/stevesoltys/backup/Backup.java
new file mode 100644
index 00000000..b79f96d3
--- /dev/null
+++ b/app/src/main/java/com/stevesoltys/backup/Backup.java
@@ -0,0 +1,21 @@
+package com.stevesoltys.backup;
+
+import android.app.Application;
+import android.content.Intent;
+import com.stevesoltys.backup.transport.ConfigurableBackupTransportService;
+
+/**
+ * @author Steve Soltys
+ */
+public class Backup extends Application {
+
+    @Override
+    public void onCreate() {
+        startService(new Intent(this, ConfigurableBackupTransportService.class));
+    }
+
+    @Override
+    public void onTerminate() {
+        stopService(new Intent(this, ConfigurableBackupTransportService.class));
+    }
+}
diff --git a/app/src/main/java/com/stevesoltys/backup/transport/ConfigurableBackupTransportService.java b/app/src/main/java/com/stevesoltys/backup/transport/ConfigurableBackupTransportService.java
index 1e42b012..aff9f1fb 100644
--- a/app/src/main/java/com/stevesoltys/backup/transport/ConfigurableBackupTransportService.java
+++ b/app/src/main/java/com/stevesoltys/backup/transport/ConfigurableBackupTransportService.java
@@ -9,19 +9,20 @@ import android.os.IBinder;
  */
 public class ConfigurableBackupTransportService extends Service {
 
-    // TODO: Make this field non-static and communicate with this service correctly.
-    private static ConfigurableBackupTransport backupTransport;
+    private static ConfigurableBackupTransport backupTransport = null;
 
-    public ConfigurableBackupTransportService() {
-        backupTransport  = new ConfigurableBackupTransport();
+    public static ConfigurableBackupTransport getBackupTransport() {
+        return backupTransport;
+    }
+
+    public void onCreate() {
+        if (backupTransport == null) {
+            backupTransport = new ConfigurableBackupTransport();
+        }
     }
 
     @Override
     public IBinder onBind(Intent intent) {
         return backupTransport.getBinder();
     }
-
-    public static ConfigurableBackupTransport getBackupTransport() {
-        return backupTransport;
-    }
 }