Map

Merge this version of the map because it's stable and the UI can be constructed on it