With some areas commented out, game is working again