More work on parser and game state management. Some looking at features too.