Moved some code back into Game.js