diff --git a/GameEngine/2048GameOverState.cpp b/GameEngine/2048GameOverState.cpp
index 0b540e915df2cce0e5c96d2df768735e0f229d6a..40ea5afe9b8a5267ea525fbf29066e591c259676 100644
--- a/GameEngine/2048GameOverState.cpp
+++ b/GameEngine/2048GameOverState.cpp
@@ -25,7 +25,7 @@ void C2048GameOverState::Init()
         stateName = "2048gameover";
         
         // Read in score data
-        highscores.LoadContainers();
+        highscores.LoadContainers("../SaveLoad/2048Data.txt");
         
         isInit = true;
     }
@@ -99,7 +99,7 @@ void C2048GameOverState::Draw(CGameEngine* game)
     
     highscores.displayScores();
     
-    highscores.updateFile();
+    highscores.updateFile("../SaveLoad/2048Data.txt");
     
     system("stty raw");
 }
diff --git a/GameEngine/2048GameOverState.h b/GameEngine/2048GameOverState.h
index a38e04fdc11fb7d2df14d06dda45941114b95648..80509223f6e8694b7ccf2d35378ea00314db617c 100644
--- a/GameEngine/2048GameOverState.h
+++ b/GameEngine/2048GameOverState.h
@@ -2,7 +2,7 @@
 #define C2048GAMEOVERSTATE_H
 
 #include "GameState.h"
-#include "../Testings/SaveLoad/SL2048.h"
+#include "../SaveLoad/SL2048.h"
 #include <iostream>
 #include <string>
 
diff --git a/GameEngine/2048ScoreState.cpp b/GameEngine/2048ScoreState.cpp
index 9cb691112b030ccb31439cefab5777e2e07e25fb..059b23c0fc105ea304a39425584f92bca05b5c20 100644
--- a/GameEngine/2048ScoreState.cpp
+++ b/GameEngine/2048ScoreState.cpp
@@ -25,7 +25,7 @@ void C2048ScoreState::Init()
         stateName = "2048score";
         
         // Read in score data
-        highscores.LoadContainers();
+        highscores.LoadContainers("../SaveLoad/2048Data.txt");
         
         isInit = true;
     }
diff --git a/GameEngine/GameEngine.cpp b/GameEngine/GameEngine.cpp
index 39e09dc0bef112f0d5e321ddbf8f414b882ae758..11a0eddb060f9b0457006b773dbd54886a7387ae 100644
--- a/GameEngine/GameEngine.cpp
+++ b/GameEngine/GameEngine.cpp
@@ -5,13 +5,13 @@
 
 void CGameEngine::Init()
 {
-  cout << "Game Engine: Initializing" << endl;
+  // cout << "Game Engine: Initializing" << endl;
   m_running = true;
 }
 
 void CGameEngine::Cleanup()
 {
-  cout << "Game Engine: Cleanup" << endl;
+  // cout << "Game Engine: Cleanup" << endl;
   
   // Cleanup the states
   while (!states.empty())
@@ -25,7 +25,7 @@ void CGameEngine::Cleanup()
 // Operations with the gamestate stack
 void CGameEngine::ChangeState(CGameState* state)
 {
-  cout << "Game Engine: Changing to state " << state->GetName() << endl;
+  // cout << "Game Engine: Changing to state " << state->GetName() << endl;
   
   // Pop and cleanup the current state
   if (!states.empty())
@@ -41,7 +41,7 @@ void CGameEngine::ChangeState(CGameState* state)
 
 void CGameEngine::PushState(CGameState* state)
 {
-  cout << "Game Engine: Pausing " << states.back()->GetName() << endl;
+  // cout << "Game Engine: Pausing " << states.back()->GetName() << endl;
   
   // Pause the current state
   if (!states.empty())
@@ -49,7 +49,7 @@ void CGameEngine::PushState(CGameState* state)
     states.back()->Pause();
   }
   
-  cout << "Game Engine: Pushing " << state->GetName() << endl;
+  // cout << "Game Engine: Pushing " << state->GetName() << endl;
 
   // Push new state to stack and initialize it
   states.push_back(state);
@@ -58,7 +58,7 @@ void CGameEngine::PushState(CGameState* state)
 
 void CGameEngine::PopState()
 {
-  cout << "Game Engine: Popping " << states.back()->GetName() << endl;
+  // cout << "Game Engine: Popping " << states.back()->GetName() << endl;
   
   // Pause the current state
   if (!states.empty())
@@ -70,7 +70,7 @@ void CGameEngine::PopState()
   // Check if there was a paused state and if so, resume
   if (!states.empty())
   {
-    cout << "Game Engine: Resuming " << states.back()->GetName() << endl;
+    // cout << "Game Engine: Resuming " << states.back()->GetName() << endl;
     states.back()->Resume();
   }
 }
diff --git a/GameEngine/RunGame.sh b/GameEngine/RunGame.sh
index f8f2504b782d5d93ad1973d95e3c522da8a8ed31..4e0972a20db785359274876d1d716f5727009f1c 100644
--- a/GameEngine/RunGame.sh
+++ b/GameEngine/RunGame.sh
@@ -1 +1 @@
-g++ -std=c++11 -pthread *.cpp ../2048/*.cpp ../Testings/Snake/ReadInput.cpp ../Testings/SaveLoad/SaveLoad.cpp ../Testings/SaveLoad/SL2048.cpp && ./a.out
\ No newline at end of file
+g++ -std=c++11 -pthread *.cpp ../2048/*.cpp ../Snake/Threads.cpp ../Snake/Snake.cpp ../Snake/ReadInput.cpp ../SaveLoad/SaveLoad.cpp ../SaveLoad/SL2048.cpp && ./a.out
\ No newline at end of file
diff --git a/GameEngine/SnakeGameState.cpp b/GameEngine/SnakeGameState.cpp
index 51bfc1b31e0f53d0af40a1b8a0215b0c39060fb1..5fb1f6cebe07268865c7e91ea6e75e45d706d644 100644
--- a/GameEngine/SnakeGameState.cpp
+++ b/GameEngine/SnakeGameState.cpp
@@ -1,13 +1,14 @@
 #include <iostream>
 #include "SnakeGameState.h"
-#include "2048GameState.h"
 
 CSnakeGameState CSnakeGameState::m_SnakeGameState;
 
 void CSnakeGameState::Init()
 {
-    // cout << "  SnakeState Init" << endl;
-    // stateName = "SnakeState";
+    srand(time(NULL));
+    BrdSet = new Snake;
+    BrdSet->newBody();
+    input = 0;
 }
 
 void CSnakeGameState::Pause()
@@ -27,18 +28,27 @@ void CSnakeGameState::Cleanup()
 
 void CSnakeGameState::HandleEvents(CGameEngine* game)
 {
-    // cout << "  SnakeState Handle Events" << endl;
+    waitTime.Sleep(1);
 }
 
 void CSnakeGameState::Update(CGameEngine* game)
 {
-    // cout << "  SnakeState Update" << endl;
-    while (game->input != 'd') {}
-    game->PopState();
+    if (game->newInput)
+    {
+        input = game->input;
+    }
+    BrdSet->movement(input);
+    
 }
 
 void CSnakeGameState::Draw(CGameEngine* game)
 {
-    // cout << "  SnakeState Draw" << endl;
+    system("stty cooked");
+    if (!(BrdSet->draw()))
+    {
+        game->PopState();
+    }
+    system("stty raw");
+    
 }
 
diff --git a/GameEngine/SnakeGameState.h b/GameEngine/SnakeGameState.h
index 255b18a1adb38f9a22ea60488711632b38df3ebc..710a45eb32846ab29fba248357704c003d838e9e 100644
--- a/GameEngine/SnakeGameState.h
+++ b/GameEngine/SnakeGameState.h
@@ -2,6 +2,8 @@
 #define SNAKEGAMESTATE_H
 
 #include "GameState.h"
+#include "../Snake/Threads.h"
+#include "../Snake/Snake.h"
 #include <iostream>
 
 class CSnakeGameState : public CGameState
@@ -24,6 +26,9 @@ class CSnakeGameState : public CGameState
     
     private:
         static CSnakeGameState m_SnakeGameState;
+        Snake* BrdSet;
+        Thread waitTime;
+        char input;
 };
 
 #endif
\ No newline at end of file
diff --git a/GameEngine/SnakeMenuState.cpp b/GameEngine/SnakeMenuState.cpp
index 34df2eeb2b6b996bf0d98827271f137dd027b523..bfa590ef34b37d2491448ac8fa3a01af62b92cd7 100644
--- a/GameEngine/SnakeMenuState.cpp
+++ b/GameEngine/SnakeMenuState.cpp
@@ -81,7 +81,7 @@ void CSnakeMenuState::Update(CGameEngine* game)
                 switch (menuPos)
                 {
                     case 0: //Play Game
-                        //game->PushState(CSnakeGameState::Instance());
+                        game->PushState(CSnakeGameState::Instance());
                         break;
                     
                     case 1: //Snake
diff --git a/GameEngine/enginetest.cpp b/GameEngine/enginetest.cpp
index 40e9d9b8132b6d4ca0c850451aa0c59b6237585f..a41547387e8f6ea0ee4b67e0d2a144a0471f546b 100644
--- a/GameEngine/enginetest.cpp
+++ b/GameEngine/enginetest.cpp
@@ -1,6 +1,6 @@
 #include "GameEngine.h"
 #include "MainMenuState.h"
-#include "../Testings/Snake/ReadInput.h"
+#include "../Snake/ReadInput.h"
 #include <thread>
 #include <iostream>
 
diff --git a/SaveLoad/2048Data.txt b/SaveLoad/2048Data.txt
index 918853fbada5f43393185742e7603d68328af1b9..b6f87d3a5b7af19ac9e44f9626618e9074c34632 100644
--- a/SaveLoad/2048Data.txt
+++ b/SaveLoad/2048Data.txt
@@ -11,3 +11,5 @@ BND	6564
 CDS	6544
 NKV	5453
 KAL	2434
+KOM	1404
+POP	636