diff --git a/ScreenSaver/ScreenSaverForm.cs b/ScreenSaver/ScreenSaverForm.cs
index 2f63d3a..b82869a 100644
--- a/ScreenSaver/ScreenSaverForm.cs
+++ b/ScreenSaver/ScreenSaverForm.cs
@@ -21,6 +21,7 @@ public partial class ScreenSaverForm : Form
         private bool shouldCache = false;
         int currentVideoIndex = 0;
         List<Asset> Movies;
+        Timer NextVideoTimer = new Timer();
         DateTime lastInteraction = DateTime.Now;
         
         public ScreenSaverForm()
@@ -36,7 +37,7 @@ public ScreenSaverForm(bool WindowMode = false) : this()
             SetStyle(ControlStyles.Opaque, true);
             this.BackColor = Color.Transparent;
             
-            windowMode = true;
+            windowMode = WindowMode;
             MaximizeVideo();
             
             this.MouseDown += ScreenSaverForm_MouseDown;
@@ -75,24 +76,28 @@ private void ScreenSaverForm_Load(object sender, EventArgs e)
             
             this.BackgroundImageLayout = ImageLayout.None;
 
-            Task.Run(() =>
+            if (ShowVideo && !previewMode)
             {
-                if (ShowVideo && !previewMode)
-                {
-                    Movies = new AerialContext().GetMovies();
-
-                    var nextVideoTimer = new System.Windows.Forms.Timer();
-                    nextVideoTimer.Tick += NextVideoTimer_Tick;
-                    nextVideoTimer.Interval = 1000;
-                    nextVideoTimer.Enabled = true;
+                Movies = new AerialContext().GetMovies();
 
-                    SetNextVideo();
-                } else
+#if DEBUG
+                Movies = new List<Asset>
                 {
-                    // on preview - hide player.
-                    this.player.Visible = false;
-                }
-            });
+                    new Asset { url = @"http://18292-presscdn-0-89.pagely.netdna-cdn.com/wp-content/uploads/2015/07/stripe-checkout.mp4?_=1" },
+                    new Asset {url = @"http://18292-presscdn-0-89.pagely.netdna-cdn.com/wp-content/uploads/2015/07/stripe-shake.mp4?_=3" },
+                };
+#endif
+
+                NextVideoTimer.Tick += NextVideoTimer_Tick;
+                NextVideoTimer.Interval = 1000;
+                NextVideoTimer.Enabled = true;
+                    
+                SetNextVideo();
+            } else
+            {
+                // on preview - hide player.
+                this.player.Visible = false;
+            }
         }
         
         private void MaximizeVideo()
diff --git a/install/AerialScreenSaverV3.exe b/install/AerialScreenSaverV3.exe
index b947d95..6d1854d 100644
Binary files a/install/AerialScreenSaverV3.exe and b/install/AerialScreenSaverV3.exe differ
diff --git a/install/AerialScreenSaverV3.scr b/install/AerialScreenSaverV3.scr
index b947d95..6d1854d 100644
Binary files a/install/AerialScreenSaverV3.scr and b/install/AerialScreenSaverV3.scr differ