diff --git a/CMakeLists.txt b/CMakeLists.txt
index eed02b88..86fcff67 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,7 +12,7 @@ set(DAWN_CACHE_TARGET "dawn-target")
 set(DAWN_TARGET_NAME "Dawn")
 
 if(NOT DEFINED DAWN_TARGET)
-  set(DAWN_TARGET linux-x64-glfw CACHE INTERNAL ${DAWN_CACHE_TARGET})
+  set(DAWN_TARGET linux-x64-terminal CACHE INTERNAL ${DAWN_CACHE_TARGET})
 endif()
 
 # Set Common Build Variables
diff --git a/src/dawn/CMakeLists.txt b/src/dawn/CMakeLists.txt
index 1568a204..e991ac36 100644
--- a/src/dawn/CMakeLists.txt
+++ b/src/dawn/CMakeLists.txt
@@ -17,6 +17,7 @@ target_include_directories(${DAWN_TARGET_NAME}
 # Subdirs
 add_subdirectory(assert)
 add_subdirectory(display)
+add_subdirectory(game)
 add_subdirectory(rpg)
 add_subdirectory(ui)
 
@@ -24,6 +25,4 @@ add_subdirectory(ui)
 target_sources(${DAWN_TARGET_NAME}
   PRIVATE
     input.c
-    time.c
-    game.c
 )
\ No newline at end of file
diff --git a/src/dawn/display/frame.c b/src/dawn/display/frame.c
index 129bafb0..6cecf89a 100644
--- a/src/dawn/display/frame.c
+++ b/src/dawn/display/frame.c
@@ -8,7 +8,7 @@
 #include "frame.h"
 #include "display/symbol.h"
 #include "rpg/world/map.h"
-#include "game.h"
+#include "game/game.h"
 #include "ui/textbox.h"
 
 #include "display/draw/drawshape.h"
@@ -24,6 +24,11 @@ void frameInit() {
 }
 
 void frameUpdate() {
+  switch(GAME.state) {
+    case GAME_STATE_PAUSED:
+
+  }
+
   map_t *map = GAME.currentMap;
   if(map == NULL) return;
 
diff --git a/src/dawn/display/symbol.c b/src/dawn/display/symbol.c
index caef0d4b..159147ad 100644
--- a/src/dawn/display/symbol.c
+++ b/src/dawn/display/symbol.c
@@ -8,7 +8,7 @@
 #include "assert/assert.h"
 #include "rpg/entity/entitydirection.h"
 #include "symbol.h"
-#include "time.h"
+#include "game/time.h"
 
 char_t symbolGetCharByEntity(const entity_t *ent) {
   assertNotNull(ent, "Entity cannot be NULL.");
diff --git a/src/dawn/game/CMakeLists.txt b/src/dawn/game/CMakeLists.txt
new file mode 100644
index 00000000..3726ed9e
--- /dev/null
+++ b/src/dawn/game/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Copyright (c) 2024 Dominic Masters
+# 
+# This software is released under the MIT License.
+# https://opensource.org/licenses/MIT
+
+# Subdirs
+
+# Sources
+target_sources(${DAWN_TARGET_NAME}
+  PRIVATE
+    time.c
+    game.c
+)
\ No newline at end of file
diff --git a/src/dawn/game.c b/src/dawn/game/game.c
similarity index 86%
rename from src/dawn/game.c
rename to src/dawn/game/game.c
index 2ae358f2..05c1d441 100644
--- a/src/dawn/game.c
+++ b/src/dawn/game/game.c
@@ -5,8 +5,8 @@
  * https://opensource.org/licenses/MIT
  */
 
-#include "game.h"
-#include "time.h"
+#include "game/game.h"
+#include "game/time.h"
 #include "input.h"
 #include "display/display.h"
 #include "rpg/world/maps/testmap.h"
@@ -32,14 +32,18 @@ uint8_t gameUpdate(const float_t delta) {
   inputUpdate();
 
   switch(GAME.state) {
-    case GAME_STATE_RUNNING:
+    case GAME_STATE_INITIAL:
+      GAME.state = GAME_STATE_OVERWORLD;
+      break;
+
+    case GAME_STATE_OVERWORLD:
       textboxUpdate();
       if(GAME.currentMap) mapUpdate(GAME.currentMap);
       if(inputWasPressed(INPUT_BIND_PAUSE)) GAME.state = GAME_STATE_PAUSED;
       break;
     
     case GAME_STATE_PAUSED:
-      if(inputWasPressed(INPUT_BIND_PAUSE)) GAME.state = GAME_STATE_RUNNING;
+      if(inputWasPressed(INPUT_BIND_PAUSE)) GAME.state = GAME_STATE_OVERWORLD;
       break;
 
     default:
diff --git a/src/dawn/game.h b/src/dawn/game/game.h
similarity index 90%
rename from src/dawn/game.h
rename to src/dawn/game/game.h
index 9db5912f..e814cf38 100644
--- a/src/dawn/game.h
+++ b/src/dawn/game/game.h
@@ -11,8 +11,9 @@
 #define GAME_UPDATE_RESULT_CONTINUE 0
 #define GAME_UPDATE_RESULT_EXIT 1
 
-#define GAME_STATE_RUNNING 0
-#define GAME_STATE_PAUSED 1
+#define GAME_STATE_INITIAL 0
+#define GAME_STATE_OVERWORLD 1
+#define GAME_STATE_PAUSED 2
 
 typedef struct {
   map_t *currentMap;
diff --git a/src/dawn/time.c b/src/dawn/game/time.c
similarity index 94%
rename from src/dawn/time.c
rename to src/dawn/game/time.c
index 5e4ac00a..91889a25 100644
--- a/src/dawn/time.c
+++ b/src/dawn/game/time.c
@@ -5,7 +5,7 @@
  * https://opensource.org/licenses/MIT
  */
 
-#include "time.h"
+#include "game/time.h"
 #include "assert/assert.h"
 
 dawntime_t TIME;
diff --git a/src/dawn/time.h b/src/dawn/game/time.h
similarity index 100%
rename from src/dawn/time.h
rename to src/dawn/game/time.h
diff --git a/src/dawn/rpg/entity/entity.c b/src/dawn/rpg/entity/entity.c
index acf248c1..4377ff98 100644
--- a/src/dawn/rpg/entity/entity.c
+++ b/src/dawn/rpg/entity/entity.c
@@ -9,7 +9,7 @@
 #include "entitydirection.h"
 #include "rpg/world/map.h"
 #include "assert/assert.h"
-#include "time.h"
+#include "game/time.h"
 #include "ui/textbox.h"
 
 void entityInit(
diff --git a/src/dawn/rpg/entity/player.c b/src/dawn/rpg/entity/player.c
index 75fae9bb..282ba81f 100644
--- a/src/dawn/rpg/entity/player.c
+++ b/src/dawn/rpg/entity/player.c
@@ -12,7 +12,7 @@
 #include "input.h"
 #include "assert/assert.h"
 #include "ui/textbox.h"
-#include "game.h"
+#include "game/game.h"
 
 void playerInit(entity_t *entity) {
   assertTrue(entity->type == ENTITY_TYPE_PLAYER, "Entity is not a player.");
diff --git a/src/dawn/ui/textbox.c b/src/dawn/ui/textbox.c
index d5b94966..d4023d7c 100644
--- a/src/dawn/ui/textbox.c
+++ b/src/dawn/ui/textbox.c
@@ -8,7 +8,7 @@
 #include "textbox.h"
 #include "assert/assert.h"
 #include "input.h"
-#include "time.h"
+#include "game/time.h"
 
 textbox_t TEXTBOX;
 
diff --git a/src/dawnglfw/dawnglfw.c b/src/dawnglfw/dawnglfw.c
index 26d49abe..a4fa6239 100644
--- a/src/dawnglfw/dawnglfw.c
+++ b/src/dawnglfw/dawnglfw.c
@@ -6,7 +6,7 @@
  */
 
 #include "dawnglfw.h"
-#include "game.h"
+#include "game/game.h"
 #include "assert/assert.h"
 #include "assert/assertgl.h"
 #include "display/backbuffer.h"
diff --git a/src/dawnopengl/display/display.c b/src/dawnopengl/display/display.c
index a92de5f6..5dc3a5f5 100644
--- a/src/dawnopengl/display/display.c
+++ b/src/dawnopengl/display/display.c
@@ -13,7 +13,7 @@
 #include "display/mesh.h"
 #include "display/frame.h"
 #include "display/primitives/quad.h"
-#include "time.h"
+#include "game/time.h"
 
 mesh_t FRAMEBUFFER_MESH;
 
diff --git a/src/dawntermlinux/linuxhost.c b/src/dawntermlinux/linuxhost.c
index 2090d76f..6a22a5c1 100644
--- a/src/dawntermlinux/linuxhost.c
+++ b/src/dawntermlinux/linuxhost.c
@@ -6,9 +6,10 @@
  */
 
 #include "linuxhost.h"
-#include "game.h"
+#include "game/game.h"
 #include <unistd.h>
 #include <termios.h>
+#include <time.h>
 
 int32_t LINUX_TERM_HOST_KEY_PRESS;
 struct termios origionalTermios;
@@ -50,12 +51,22 @@ int32_t keyboardCharacterRead() {
 
 int32_t linuxHostHandoff() {
   gameInit();
-  
+
+  struct timespec spec;
+  uint64_t lastTime;
+  clock_gettime(CLOCK_REALTIME, &spec);
+  lastTime = spec.tv_sec * 1000000000 + spec.tv_nsec;
+
   while(true) {
     terminalModeSetCONIO();
 
     while(!keyboardCharacterAvailable()) {
-      uint8_t result = gameUpdate(0.1f);
+      clock_gettime(CLOCK_REALTIME, &spec);
+      uint64_t currentTime = spec.tv_sec * 1000000000 + spec.tv_nsec;
+      float_t delta = (currentTime - lastTime) / 1000000000.0f;
+      lastTime = currentTime;
+
+      uint8_t result = gameUpdate(delta);
       if(result == GAME_UPDATE_RESULT_EXIT) return 0;
       if(result != GAME_UPDATE_RESULT_CONTINUE) return -1;
 
@@ -64,7 +75,11 @@ int32_t linuxHostHandoff() {
 
       // Clear console and return to left top
       printf("\033[2J\033[1;1H");
-      usleep(100000);
+
+      // if tick was less than 16ms, sleep for the remaining time
+      if(delta < 0.016f) {
+        usleep((0.016f - delta) * 1000000);
+      }
     }
 
     LINUX_TERM_HOST_KEY_PRESS = keyboardCharacterRead();