Major Game refactor.

Things to do with restoring a previous state all put into one file.