More refactoring

Still working through GeoModel to update handling of Points of Interest