Refactor to include leaflet.