Moved most of the Window code to GameController