Progress on Leaflet.  Commit before any more refactoring.