Moved some logic back into game/player.