Compiling but integration test failing
Commit before reducing complexity of matching
Improved atching algorithm