Catkinized version of geomatry-experimental