More Work-in-progress. Still depends on local geoserver