Fleshed out MatchMaker