diff --git a/Kiseki.Launcher.Windows/MainWindow.cs b/Kiseki.Launcher.Windows/MainWindow.cs
index 0981797..b8ea5ad 100644
--- a/Kiseki.Launcher.Windows/MainWindow.cs
+++ b/Kiseki.Launcher.Windows/MainWindow.cs
@@ -3,7 +3,7 @@
 namespace Kiseki.Launcher.Windows
 {
     [System.ComponentModel.DesignerCategory("")]
-    public class MainWindow : Form
+    public class MainWindow : Form, IMainWindow
     {
         private readonly TaskDialogButton CloseButton;
         private readonly TaskDialogPage Page;
@@ -83,5 +83,20 @@ namespace Kiseki.Launcher.Windows
 
             TaskDialog.ShowDialog(Page);
         }
+
+        public void Register()
+        {
+            throw new NotImplementedException();
+        }
+
+        public void Unregister()
+        {
+            throw new NotImplementedException();
+        }
+
+        public void CreateShortcuts()
+        {
+            throw new NotImplementedException();
+        }
     }
 }
diff --git a/Kiseki.Launcher.Windows/ProtocolHandler.cs b/Kiseki.Launcher.Windows/ProtocolHandler.cs
new file mode 100644
index 0000000..638f8ab
--- /dev/null
+++ b/Kiseki.Launcher.Windows/ProtocolHandler.cs
@@ -0,0 +1,15 @@
+namespace Kiseki.Launcher.Windows
+{
+    public class ProtocolHandler : IProtocolHandler
+    {
+        public void Register()
+        {
+            throw new NotImplementedException();
+        }
+
+        public void Unregister()
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
\ No newline at end of file
diff --git a/Kiseki.Launcher/Controller.cs b/Kiseki.Launcher/Controller.cs
index e129e65..85a72cb 100644
--- a/Kiseki.Launcher/Controller.cs
+++ b/Kiseki.Launcher/Controller.cs
@@ -24,19 +24,19 @@ namespace Kiseki.Launcher
         
         public async void Start()
         {
-            this.OnPageHeadingChange("Connecting to Kiseki...");
+            OnPageHeadingChange("Connecting to Kiseki...");
 
             bool marquee = true;
             await foreach (int progressValue in StreamBackgroundOperationProgressAsync())
             {
                 if (marquee)
                 {
-                    this.OnPageHeadingChange("Downloading Kiseki...");
-                    this.OnProgressBarStateChanged(ProgressBarState.Normal);
+                    OnPageHeadingChange("Downloading Kiseki...");
+                    OnProgressBarStateChanged(ProgressBarState.Normal);
                     marquee = false;
                 }
 
-                this.OnProgressBarChange(progressValue);
+                OnProgressBarChange(progressValue);
             }
 
             static async IAsyncEnumerable<int> StreamBackgroundOperationProgressAsync()
@@ -50,22 +50,22 @@ namespace Kiseki.Launcher
                 }
             }
 
-            this.OnPageHeadingChange("Installing Kiseki...");
-            this.OnProgressBarStateChanged(ProgressBarState.Marquee);
+            OnPageHeadingChange("Installing Kiseki...");
+            OnProgressBarStateChanged(ProgressBarState.Marquee);
 
             await Task.Delay(2200);
-            this.OnPageHeadingChange("Configuring Kiseki...");
+            OnPageHeadingChange("Configuring Kiseki...");
 
             await Task.Delay(1200);
-            this.OnPageHeadingChange("Launching Kiseki...");
+            OnPageHeadingChange("Launching Kiseki...");
 
             await Task.Delay(3000);
-            this.OnLaunched();
+            OnLaunched();
         }
 
         public async void Dispose()
         {
-            //
+            // TODO: This will only be called when the user closes the window OR we're done (i.e. the Launched event is called.)
         }
 
         protected virtual void OnPageHeadingChange(string Heading)
diff --git a/Kiseki.Launcher/Interfaces.cs b/Kiseki.Launcher/Interfaces.cs
new file mode 100644
index 0000000..6ff6695
--- /dev/null
+++ b/Kiseki.Launcher/Interfaces.cs
@@ -0,0 +1,15 @@
+namespace Kiseki.Launcher
+{
+    interface IProtocolHandler
+    {
+        void Register();
+        void Unregister();
+    }
+
+    interface IMainWindow
+    {
+        void Register();
+        void Unregister();
+        void CreateShortcuts();
+    }
+}
\ No newline at end of file