Reorder stuff
Refactor Match Matrix
Get matches from match matrix when it's the only possible match for a player