made MapMaker class
merged conflicts