Major refactor to remove all reference to the gameID