diff --git a/src/main.c b/src/main.c
index 0ff32d9..31dfd29 100644
--- a/src/main.c
+++ b/src/main.c
@@ -770,19 +770,22 @@ run_game_update(void)
 	map_set_current_room(gMap, &gPlayer->sprite->pos);
 	map_update(&updateData);
 
+	bool turnSwitch = false;
 	if (currentTurn == PLAYER) {
 		if (player_turn_over(gPlayer)) {
 			currentTurn = MONSTER;
 			player_reset_steps(gPlayer);
 			map_on_new_turn(gMap);
+			turnSwitch = true;
 		}
 	} else if (currentTurn == MONSTER) {
 		if (map_move_monsters(gMap, gRoomMatrix)) {
 			currentTurn = PLAYER;
+
 		}
 	}
 
-	if (map_clear_expired_entities(gMap, gPlayer))
+	if (map_clear_expired_entities(gMap, gPlayer) || turnSwitch)
 		repopulate_roommatrix();
 }
 
diff --git a/src/monster.c b/src/monster.c
index 7926613..eb6bb0b 100644
--- a/src/monster.c
+++ b/src/monster.c
@@ -298,7 +298,7 @@ has_collided(Monster *monster, RoomMatrix *matrix, Vector2d direction)
 		monster_behaviour_check_post_attack(monster);
 	}
 
-	return space->occupied;
+	return space->occupied || space->monster;
 }
 
 static bool
diff --git a/src/player.c b/src/player.c
index 6f84023..a719d97 100644
--- a/src/player.c
+++ b/src/player.c
@@ -148,78 +148,89 @@ on_monster_collision(Player *player,
 
 }
 
+static void
+player_pickup_artifacts(Player *player, RoomSpace *space)
+{
+	LinkedList *artifacts = space->artifacts;
+	while (artifacts) {
+		player_add_artifact(player, artifacts->data);
+		artifacts = artifacts->next;
+	}
+}
+
+static void
+player_interact_objects(Player *player, RoomSpace *space)
+{
+	LinkedList *objects = space->objects;
+	while (objects) {
+		object_damage(objects->data, player);
+		objects = objects->next;
+	}
+}
+
+static void
+player_collect_items(Player *player, RoomSpace *space)
+{
+	LinkedList *items = space->items;
+	while (items != NULL) {
+		Item *item = items->data;
+		items = items->next;
+		item_collected(item, player);
+	}
+}
+
+static void
+player_interact_traps_and_pits(Player *player, RoomSpace *space)
+{
+	if (space->lethal) {
+		player_set_falling(player);
+	}
+
+	if (space->trap) {
+		trap_activate(space->trap, player);
+	}
+}
+
+static bool
+player_has_collided(RoomSpace *space)
+{
+	if (space->occupied)
+		return true;
+
+	return space->monster && space->monster->sprite->state != SPRITE_STATE_FALLING;
+}
+
 static bool 
 has_collided(Player *player, RoomMatrix *matrix, Vector2d direction)
 {
-	bool collided = false;
-
 	Position roomCoord = position_to_room_coords(&player->sprite->pos);
-	if (roomCoord.x != matrix->roomPos.x
-	    || roomCoord.y != matrix->roomPos.y) {
-		return collided;
+	if (roomCoord.x != matrix->roomPos.x || roomCoord.y != matrix->roomPos.y) {
+		return false;
 	}
 
 	Position matrixPos = position_to_matrix_coords(&player->sprite->pos);
 	RoomSpace *space = &matrix->spaces[matrixPos.x][matrixPos.y];
-	collided = space->occupied;
 
-	if (space->monster != NULL
-	    && (space->monster->sprite->state == SPRITE_STATE_FALLING
-		|| space->monster->stats.hp <= 0))
-	{
-		collided = false;
-	}
-
-	if (collided) {
+	if (player_has_collided(space)) {
 		player->sprite->pos.x -= TILE_DIMENSION * (int)direction.x;
 		player->sprite->pos.y -= TILE_DIMENSION * (int)direction.y;
-	}
 
-	if (space->monster != NULL
-	    && space->monster->stats.hp > 0
-	    && space->monster->sprite->state != SPRITE_STATE_FALLING)
-	{
-		on_monster_collision(player, space->monster, matrix, direction);
-	} else if (collided) {
-		mixer_play_effect(BONK);
-		camera_shake(direction, 100);
-		gui_log("Ouch! There is something in the way");
-	}
-
-	if (space->items != NULL && !collided) {
-		LinkedList *items = space->items;
-		while (items != NULL) {
-			Item *item = items->data;
-			items = items->next;
-			item_collected(item, player);
+		if (space->monster) {
+			on_monster_collision(player, space->monster, matrix, direction);
+		} else {
+			mixer_play_effect(BONK);
+			camera_shake(direction, 100);
+			gui_log("Ouch! There is something in the way");
 		}
+		return true;
 	}
-
-	if (space->artifacts != NULL && !collided) {
-		LinkedList *artifacts = space->artifacts;
-		while (artifacts) {
-			player_add_artifact(player, artifacts->data);
-			artifacts = artifacts->next;
-		}
+	else {
+		player_collect_items(player, space);
+		player_pickup_artifacts(player, space);
+		player_interact_objects(player, space);
+		player_interact_traps_and_pits(player, space);
+		return false;
 	}
-
-	if (space->objects && !collided) {
-		LinkedList *objects = space->objects;
-		while (objects) {
-			object_damage(objects->data, player);
-			objects = objects->next;
-		}
-	}
-
-	if (space->lethal && !collided) {
-		player_set_falling(player);
-	}
-
-	if (space->trap && !collided) {
-		trap_activate(space->trap, player);
-	}
-
-	return collided;
 }
 
 static void
diff --git a/src/roommatrix.c b/src/roommatrix.c
index af56296..5ba2621 100644
--- a/src/roommatrix.c
+++ b/src/roommatrix.c
@@ -144,8 +144,6 @@ void roommatrix_populate_from_map(RoomMatrix *rm, Map *m)
 		position =
 			position_to_matrix_coords(&monster->sprite->pos);
 
-		rm->spaces[position.x][position.y]
-			.occupied = true;
 		rm->spaces[position.x][position.y]
 			.monster = monster;
 	}