diff --git a/01_text_adventure/game.h b/01_text_adventure/game.h
index bf390a5..8c9a908 100644
--- a/01_text_adventure/game.h
+++ b/01_text_adventure/game.h
@@ -2,9 +2,12 @@
 #define _FD_GAME_
 
 #include <stdbool.h>
+typedef struct GameState GameState;
+#include "input.h"
 
-typedef struct GameState {
+struct GameState {
   bool *should_close;
-} GameState;
+  Input *input;
+};
 
 #endif
diff --git a/01_text_adventure/input.h b/01_text_adventure/input.h
index 0b14c14..a6ce9eb 100644
--- a/01_text_adventure/input.h
+++ b/01_text_adventure/input.h
@@ -1,17 +1,20 @@
 #ifndef _FD_INPUT_
 #define _FD_INPUT_
 
+typedef struct Input Input;
+
+#include <raylib.h>
 #include "game.h"
 #include "log.h"
 #define INPUT_BUFFER_MAX_LENGTH 80
 
-typedef struct Input {
+struct Input {
   char input_buffer[INPUT_BUFFER_MAX_LENGTH];
   int input_length;
   Vector2 position;
   Log *log;
   GameState *gs;
-} Input;
+};
 
 void handle_pressed_keys(Input*);
 void draw_text(Input*);
diff --git a/01_text_adventure/main.c b/01_text_adventure/main.c
index be79a4b..c1eb9df 100644
--- a/01_text_adventure/main.c
+++ b/01_text_adventure/main.c
@@ -13,17 +13,18 @@ int main(void)
     InitWindow(800, 450, "Text Adventure");
     SetTargetFPS(TARGET_FPS);
 
-    GameState gs;
-    gs.should_close = malloc(1);
-    *(gs.should_close) = false;
+    GameState *gs = malloc(sizeof(GameState));
+    gs->should_close = malloc(1);
+    *(gs->should_close) = false;
 
     Log *log = create_log();
     Vector2 input_position = { 190, 200 };
     Input *input = create_input(input_position);
     input->log = log;
-    input->gs = &gs;
+    input->gs = gs;
+    gs->input = input;
 
-    while (!WindowShouldClose() && !*(gs.should_close))
+    while (!WindowShouldClose() && !*(gs->should_close))
       {
 	BeginDrawing();
 	ClearBackground(BLACK);