Connor new GeoJSON code

Integrating in Connor's new GeoJSON code