moving over new game handling code
merging