GeoTrace/GeoShape stuff
merge