Mis-centered and under-tested map implementation

(Needs to be centered correctly -- don't merge yet)