Match maker

Matchmaker tests are now working and all passing. Testing needs to be extended more though.