finished versions of map-0 and map-1 for milestone 1