Simplified matchmaking a bit