For testing out geoserver

Also includes some half-baked persistance code