Minor changes to logic
Added Matches controller