Added in gamestates and menu