Started adding the map builder portion