Refactor, add spawn_game