Added statemanager and more gamestate features