diff --git a/Jumpy.Shared/IWindow.cs b/Jumpy.Shared/IWindow.cs
index 4a9211d..b4423c2 100644
--- a/Jumpy.Shared/IWindow.cs
+++ b/Jumpy.Shared/IWindow.cs
@@ -2,6 +2,7 @@
 
 namespace Jumpy {
   public interface IWindow {
-    void SetFullScreen(bool fullScreen, Game game, GraphicsDeviceManager graphics);
+    void Initialize(GameWindow window, GraphicsDeviceManager graphics);
+    void SetFullScreen(bool fullScreen);
   }
 }
diff --git a/Jumpy.Shared/JumpyGame.cs b/Jumpy.Shared/JumpyGame.cs
index f9ae188..fd39dcc 100644
--- a/Jumpy.Shared/JumpyGame.cs
+++ b/Jumpy.Shared/JumpyGame.cs
@@ -11,7 +11,7 @@ namespace Jumpy {
     SpriteFont font;
     KeyboardInput keyboardInput = new KeyboardInput();
     bool fullScreen = false;
-    IWindow window;
+    IWindow display;
 
     public JumpyGame() {
       graphics = new GraphicsDeviceManager(this);
@@ -21,9 +21,9 @@ namespace Jumpy {
 
     // Performs initialization that's needed before starting to run.
     protected override void Initialize() {
-      window = (IWindow) Services.GetService(typeof(IWindow));
-      window.SetFullScreen(fullScreen, this, graphics);
-
+      display = (IWindow) Services.GetService(typeof(IWindow));
+      display.Initialize(Window, graphics);
+      display.SetFullScreen(fullScreen);
       base.Initialize();
     }
 
@@ -45,7 +45,7 @@ namespace Jumpy {
 
       if (keysDown.Contains(Keys.F12)) {
         fullScreen = !fullScreen;
-        window.SetFullScreen(fullScreen, this, graphics);
+        display.SetFullScreen(fullScreen);
       }
 
       if (GamePad.GetState(PlayerIndex.One).Buttons.Back == ButtonState.Pressed ||