WOrking on initial game setup
Merge