Save Point. Going to Rework Mapbox-controller code