Added basic abstract maps
Trying to get commits working with the old files that have been changed
Merge remote-tracking branch 'origin/map_generation'