diff --git a/F-Droid/res/layout/swap_app_list_item.xml b/F-Droid/res/layout/swap_app_list_item.xml
index ef5f612e3..2478bef43 100644
--- a/F-Droid/res/layout/swap_app_list_item.xml
+++ b/F-Droid/res/layout/swap_app_list_item.xml
@@ -33,7 +33,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:backgroundTint="@color/swap_light_blue"
-            backgroundTint="@color/swap_light_blue"
+            app:backgroundTint="@color/swap_light_blue"
             android:textColor="@android:color/white"
             android:text="@string/menu_install"/>
 
diff --git a/F-Droid/res/layout/swap_connecting.xml b/F-Droid/res/layout/swap_connecting.xml
index 2bfcb8878..62671c0c5 100644
--- a/F-Droid/res/layout/swap_connecting.xml
+++ b/F-Droid/res/layout/swap_connecting.xml
@@ -16,7 +16,7 @@
             android:textSize="20sp"
             android:padding="30dp"
             android:textAlignment="center"
-            tools:text="@string/swap_connecting" />
+            tools:text="Connecting with Nexus 4" />
 
         <ProgressBar
             android:layout_width="wrap_content"
diff --git a/F-Droid/src/org/fdroid/fdroid/installer/Installer.java b/F-Droid/src/org/fdroid/fdroid/installer/Installer.java
index f20c07279..140b873ef 100644
--- a/F-Droid/src/org/fdroid/fdroid/installer/Installer.java
+++ b/F-Droid/src/org/fdroid/fdroid/installer/Installer.java
@@ -92,6 +92,10 @@ abstract public class Installer {
         this.mCallback = callback;
     }
 
+    public static Installer getActivityInstaller(Activity activity, InstallerCallback callback) {
+        return getActivityInstaller(activity, activity.getPackageManager(), callback);
+    }
+
     /**
      * Creates a new Installer for installing/deleting processes starting from
      * an Activity
diff --git a/F-Droid/src/org/fdroid/fdroid/localrepo/SwapService.java b/F-Droid/src/org/fdroid/fdroid/localrepo/SwapService.java
index ea917a218..09f8bd673 100644
--- a/F-Droid/src/org/fdroid/fdroid/localrepo/SwapService.java
+++ b/F-Droid/src/org/fdroid/fdroid/localrepo/SwapService.java
@@ -260,10 +260,6 @@ public class SwapService extends Service {
         return peerRepo;
     }
 
-    public void install(@NonNull final App app) {
-
-    }
-
     /**
      * Ensure that we don't get put into an incorrect state, by forcing people to pass valid
      * states to setStep. Ideally this would be done by requiring an enum or something to
diff --git a/F-Droid/src/org/fdroid/fdroid/views/swap/SwapAppsView.java b/F-Droid/src/org/fdroid/fdroid/views/swap/SwapAppsView.java
index 45d25ea16..56302a00e 100644
--- a/F-Droid/src/org/fdroid/fdroid/views/swap/SwapAppsView.java
+++ b/F-Droid/src/org/fdroid/fdroid/views/swap/SwapAppsView.java
@@ -77,10 +77,6 @@ public class SwapAppsView extends ListView implements
         return (SwapWorkflowActivity)getContext();
     }
 
-    private SwapService getState() {
-        return getActivity().getState();
-    }
-
     private static final int LOADER_SWAPABLE_APPS = 759283741;
     private static final String TAG = "SwapAppsView";
 
@@ -127,7 +123,7 @@ public class SwapAppsView extends ListView implements
         }
 
         Log.d(TAG, "Polling swap repo to see if it has any updates.");
-        getState().refreshSwap();
+        getActivity().getService().refreshSwap();
         if (pollForUpdatesReceiver != null) {
             pollForUpdatesReceiver = new BroadcastReceiver() {
                 @Override
@@ -200,7 +196,7 @@ public class SwapAppsView extends ListView implements
 
     @ColorRes
     public int getToolbarColour() {
-        return getResources().getColor(R.color.swap_bright_blue);
+        return R.color.swap_bright_blue;
     }
 
     @Override
@@ -327,7 +323,7 @@ public class SwapAppsView extends ListView implements
                 @Override
                 public void onClick(View v) {
                     if (app.hasUpdates() || app.compatible) {
-                        getState().install(app);
+                        getActivity().install(app);
                     }
                 }
             };
diff --git a/F-Droid/src/org/fdroid/fdroid/views/swap/SwapConnecting.java b/F-Droid/src/org/fdroid/fdroid/views/swap/SwapConnecting.java
index 27a638276..05c4a0a4d 100644
--- a/F-Droid/src/org/fdroid/fdroid/views/swap/SwapConnecting.java
+++ b/F-Droid/src/org/fdroid/fdroid/views/swap/SwapConnecting.java
@@ -23,6 +23,7 @@ import org.fdroid.fdroid.UpdateService;
 import org.fdroid.fdroid.localrepo.SwapService;
 import org.fdroid.fdroid.localrepo.peers.Peer;
 
+// TODO: Use this for the "Preparing local repo" dialog also.
 public class SwapConnecting extends LinearLayout implements SwapWorkflowActivity.InnerView {
 
     private final static String TAG = "SwapConnecting";
diff --git a/F-Droid/src/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java b/F-Droid/src/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java
index 1f142dce9..51b4b08a3 100644
--- a/F-Droid/src/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java
+++ b/F-Droid/src/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java
@@ -33,18 +33,26 @@ import org.fdroid.fdroid.AppDetails;
 import org.fdroid.fdroid.FDroidApp;
 import org.fdroid.fdroid.NfcHelper;
 import org.fdroid.fdroid.Preferences;
+import org.fdroid.fdroid.ProgressListener;
 import org.fdroid.fdroid.R;
 import org.fdroid.fdroid.Utils;
+import org.fdroid.fdroid.data.Apk;
+import org.fdroid.fdroid.data.ApkProvider;
+import org.fdroid.fdroid.data.App;
 import org.fdroid.fdroid.data.NewRepoConfig;
+import org.fdroid.fdroid.installer.Installer;
 import org.fdroid.fdroid.localrepo.LocalRepoManager;
 import org.fdroid.fdroid.localrepo.SwapService;
 import org.fdroid.fdroid.localrepo.peers.Peer;
+import org.fdroid.fdroid.net.ApkDownloader;
 
+import java.io.File;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.Timer;
 import java.util.TimerTask;
@@ -200,6 +208,10 @@ public class SwapWorkflowActivity extends AppCompatActivity {
     }
 
     private void showRelevantView() {
+        showRelevantView(false);
+    }
+
+    private void showRelevantView(boolean forceReload) {
 
         if (service == null) {
             showInitialLoading();
@@ -215,9 +227,11 @@ public class SwapWorkflowActivity extends AppCompatActivity {
             return;
         }
 
-        if (container.getVisibility() == View.GONE || currentView != null && currentView.getStep() == service.getStep()) {
-            // Already showing the correct step, so don't bother changing anything.
-            return;
+        if (!forceReload) {
+            if (container.getVisibility() == View.GONE || currentView != null && currentView.getStep() == service.getStep()) {
+                // Already showing the correct step, so don't bother changing anything.
+                return;
+            }
         }
 
         switch(service.getStep()) {
@@ -697,4 +711,43 @@ public class SwapWorkflowActivity extends AppCompatActivity {
         }
     }
 
+    public void install(@NonNull final App app) {
+        final Apk apkToInstall = ApkProvider.Helper.find(this, app.id, app.suggestedVercode);
+        final ApkDownloader downloader = new ApkDownloader(this, apkToInstall, apkToInstall.repoAddress);
+        downloader.setProgressListener(new ProgressListener() {
+            @Override
+            public void onProgress(Event event) {
+                switch (event.type) {
+                    case ApkDownloader.EVENT_APK_DOWNLOAD_COMPLETE:
+                        handleDownloadComplete(downloader.localFile());
+                        break;
+                    case ApkDownloader.EVENT_ERROR:
+                        break;
+                }
+            }
+        });
+        downloader.download();
+    }
+
+    private void handleDownloadComplete(File apkFile) {
+
+        try {
+            Installer.getActivityInstaller(SwapWorkflowActivity.this, new Installer.InstallerCallback() {
+                @Override
+                public void onSuccess(int operation) {
+                    // TODO: Don't reload the view weely-neely, but rather get the view to listen
+                    // for broadcasts that say the install was complete.
+                    showRelevantView(true);
+                }
+
+                @Override
+                public void onError(int operation, int errorCode) {
+                    // TODO: Boo!
+                }
+            }).installPackage(apkFile);
+        } catch (Installer.AndroidNotCompatibleException e) {
+            // TODO: Handle exception properly
+        }
+    }
+
 }