working on creating a new game
merge conflicts