diff --git a/components.h b/components.h
index 63961c2..64d6aa8 100644
--- a/components.h
+++ b/components.h
@@ -67,8 +67,8 @@ typedef enum PlayerState
 typedef struct _CPlayerState_t
 {
     Vector2 player_dir;
-    uint8_t jump_pressed: 1;
-    uint8_t is_crouch: 1;
+    uint8_t jump_pressed;
+    uint8_t is_crouch;
 }CPlayerState_t;
 
 typedef enum ContainerItem
diff --git a/constants.h b/constants.h
index ac619ee..354b548 100644
--- a/constants.h
+++ b/constants.h
@@ -10,10 +10,10 @@
 #define PLAYER_WIDTH 30
 #define PLAYER_HEIGHT 55
 
-#define PLAYER_C_WIDTH 48
+#define PLAYER_C_WIDTH 30
 #define PLAYER_C_HEIGHT 30
 #define PLAYER_C_YOFFSET 25
-#define PLAYER_C_XOFFSET 9
+#define PLAYER_C_XOFFSET 0
 
 #define PLAYER_MAX_SPEED 1000
 #define Y_FRICTION 0.98
diff --git a/scene_impl.c b/scene_impl.c
index 36472ec..de0f20a 100644
--- a/scene_impl.c
+++ b/scene_impl.c
@@ -203,24 +203,6 @@ static void level_scene_render_func(Scene_t* scene)
     TileGrid_t tilemap = data->tilemap;
 
     Entity_t *p_ent;
-    sc_map_foreach_value(&scene->ent_manager.entities, p_ent)
-    {
-        CTransform_t* p_ct = get_component(&scene->ent_manager, p_ent, CTRANSFORM_COMP_T);
-        CBBox_t* p_bbox = get_component(&scene->ent_manager, p_ent, CBBOX_COMP_T);
-        Color colour;
-        switch(p_ent->m_tag)
-        {
-            case PLAYER_ENT_TAG:
-                colour = RED;
-            break;
-            case CRATES_ENT_TAG:
-                colour = BROWN;
-            break;
-            default:
-                colour = BLACK;
-        }
-        DrawRectangle(p_ct->position.x, p_ct->position.y, p_bbox->size.x, p_bbox->size.y, colour);
-    }
 
     for (size_t i=0; i<tilemap.n_tiles;++i)
     {
@@ -245,6 +227,25 @@ static void level_scene_render_func(Scene_t* scene)
         }
     }
 
+    sc_map_foreach_value(&scene->ent_manager.entities, p_ent)
+    {
+        CTransform_t* p_ct = get_component(&scene->ent_manager, p_ent, CTRANSFORM_COMP_T);
+        CBBox_t* p_bbox = get_component(&scene->ent_manager, p_ent, CBBOX_COMP_T);
+        Color colour;
+        switch(p_ent->m_tag)
+        {
+            case PLAYER_ENT_TAG:
+                colour = RED;
+            break;
+            case CRATES_ENT_TAG:
+                colour = BROWN;
+            break;
+            default:
+                colour = BLACK;
+        }
+        DrawRectangle(p_ct->position.x, p_ct->position.y, p_bbox->size.x, p_bbox->size.y, colour);
+    }
+
     // Draw tile grid
     for (size_t i=0; i<tilemap.width;++i)
     {
@@ -271,7 +272,7 @@ static void level_scene_render_func(Scene_t* scene)
         DrawText(buffer, tilemap.width * TILE_SIZE + 1, 60, 12, BLACK);
         sprintf(buffer, "Cooldown: %u", p_cjump->cooldown_timer);
         DrawText(buffer, (tilemap.width + 3) * TILE_SIZE + 1, 60, 12, BLACK);
-        sprintf(buffer, "Crouch: %s", p_pstate->is_crouch? "YES":"NO");
+        sprintf(buffer, "Crouch: %u", p_pstate->is_crouch);
         DrawText(buffer, tilemap.width * TILE_SIZE + 1, 90, 12, BLACK);
         sprintf(buffer, "Water: %s", p_mstate->water_state & 1? "YES":"NO");
         DrawText(buffer, tilemap.width * TILE_SIZE + 1, 120, 12, BLACK);
@@ -325,6 +326,22 @@ static void player_movement_input_system(Scene_t* scene)
 
         //else
         {
+            if (p_pstate->is_crouch == 0b01)
+            {
+                Vector2 test_pos = p_ctransform->position;
+                Vector2 test_bbox = {PLAYER_WIDTH, PLAYER_HEIGHT};
+                Vector2 top = {0, 0};
+                test_pos.x += PLAYER_C_XOFFSET;
+                test_pos.y -= PLAYER_C_YOFFSET;
+                if (!check_collision_at(test_pos, test_bbox, &tilemap, top))
+                {
+                    p_pstate->is_crouch >>= 1;
+                }
+            }
+            else
+            {
+                p_pstate->is_crouch >>= 1;
+            }
             if (p_cjump->cooldown_timer > 0) p_cjump->cooldown_timer--;
             // Jumps is possible as long as you have a jump
 
@@ -334,7 +351,7 @@ static void player_movement_input_system(Scene_t* scene)
                 bool jump_valid = true;
 
                 // Check Jump from crouch
-                if(p_pstate->is_crouch)
+                if(p_pstate->is_crouch & 1)
                 {
                     Vector2 test_pos = p_ctransform->position;
                     Vector2 test_bbox = {PLAYER_WIDTH, PLAYER_HEIGHT};
@@ -422,7 +439,7 @@ static void player_bbox_update_system(Scene_t *scene)
                 }
             }
             Vector2 new_bbox;
-            if(p_pstate->is_crouch)
+            if(p_pstate->is_crouch & 1)
             {
                 new_bbox.x = PLAYER_C_WIDTH;
                 new_bbox.y = PLAYER_C_HEIGHT;
@@ -881,7 +898,7 @@ void level_do_action(Scene_t *scene, ActionType_t action, bool pressed)
             break;
             case ACTION_DOWN:
                 p_playerstate->player_dir.y = (pressed)? 1 : 0;
-                p_playerstate->is_crouch = pressed;
+                p_playerstate->is_crouch |= (pressed)? 0b10 : 0;
             break;
             case ACTION_LEFT:
                 p_playerstate->player_dir.x = (pressed)? -1 : 0;