Update game to new class approach