almost completed ac-map

The map is pretty much there now. Some tweaks required but all very minor. Would be a good time to sync up to master.