Made some useful changes, but it doesn't compile
Added AdjacentFeaturesMatcher