Changing to use GameState Interface
Getting there. Again