Matchmaking overhaul