Almost done

Just one more part of GeoModel to change