Continued work on game setup