finished preliminary mapbox
Fixed merge conflicts