Fix game-over?
Re-organizing around game ending