Made a lot of changes but mostly Matching
One more thing I changed
Merge pull request #12 from CorbinFoucart/matchingEtc

Matching etc