Updated to include new game class