First working version of GeometryMatcher