Added more gamestate stuff. I probably need to add to this, but it's enough to close this issue and work on the XML parsing. Fixes #2