Separated map stuff from the PlayState class
Merge