Starting to move game logic to a separate class and fixing GameScreen, which cannot have the map on the constructor as it starts out as null