Mostly done with game state changes

The json files also need to work with this