The new map is done - Is it Okay? Fixes#6