Refactoring for single-player.  Highly dubious.