Major Code Pulling

Took code out of game.cpp