diff --git a/rabi_splitter_WPF/RabiRibiDisplay.cs b/rabi_splitter_WPF/RabiRibiDisplay.cs
index 5a7289f..cfbcaaf 100644
--- a/rabi_splitter_WPF/RabiRibiDisplay.cs
+++ b/rabi_splitter_WPF/RabiRibiDisplay.cs
@@ -6,19 +6,13 @@ using System.Text;
 
 namespace rabi_splitter_WPF
 {
-    enum GameStatus
-    {
-        INGAME,
-        MENU
-    }
-
     class RabiRibiDisplay
     {
         private MainContext mainContext;
         private DebugContext debugContext;
         private MainWindow mainWindow;
-
-        private GameStatus gameStatus = GameStatus.MENU;
+        
+        private RabiRibiState rabiRibiState;
         private InGameState inGameState;
         private MemorySnapshot prevSnapshot;
         private MemorySnapshot snapshot;
@@ -32,6 +26,7 @@ namespace rabi_splitter_WPF
         public RabiRibiDisplay(MainContext mainContext, DebugContext debugContext, MainWindow mainWindow)
         {
             this.datastrings = new string[StaticData.EnenyEntitySize[mainContext.veridx]];
+            this.rabiRibiState = new RabiRibiState();
             this.mainContext = mainContext;
             this.debugContext = debugContext;
             this.mainWindow = mainWindow;
@@ -202,18 +197,18 @@ namespace rabi_splitter_WPF
         private void StartNewGame()
         {
             inGameState = new InGameState();
-            gameStatus = GameStatus.INGAME;
+            rabiRibiState.gameStatus = GameStatus.INGAME;
         }
 
         private void ReturnToMenu()
         {
-            gameStatus = GameStatus.MENU;
+            rabiRibiState.gameStatus = GameStatus.MENU;
             inGameState = null;
         }
 
         private bool InGame()
         {
-            return gameStatus == GameStatus.INGAME;
+            return rabiRibiState.gameStatus == GameStatus.INGAME;
         }
 
         private bool MusicChanged()
diff --git a/rabi_splitter_WPF/RabiRibiState.cs b/rabi_splitter_WPF/RabiRibiState.cs
new file mode 100644
index 0000000..5cff3a4
--- /dev/null
+++ b/rabi_splitter_WPF/RabiRibiState.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace rabi_splitter_WPF
+{
+    enum GameStatus
+    {
+        INGAME,
+        MENU
+    }
+
+    class RabiRibiState
+    {
+        public GameStatus gameStatus = GameStatus.MENU;
+    }
+}
diff --git a/rabi_splitter_WPF/rabi_display.csproj b/rabi_splitter_WPF/rabi_display.csproj
index f7a5a3c..8d15352 100644
--- a/rabi_splitter_WPF/rabi_display.csproj
+++ b/rabi_splitter_WPF/rabi_display.csproj
@@ -55,10 +55,11 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
+    <Compile Include="InGameState.cs" />
     <Compile Include="RabiEnums.cs" />
     <Compile Include="MemorySnapshot.cs" />
-    <Compile Include="RabiGameState.cs" />
     <Compile Include="RabiRibiDisplay.cs" />
+    <Compile Include="RabiRibiState.cs" />
     <Compile Include="StaticData.cs" />
     <Page Include="MainWindow.xaml">
       <Generator>MSBuild:Compile</Generator>