merge in zoomable map stuff