working on integrating gamestate
still merging