SurfaceGeometry revised again

Almost looks good now