Completed basic matching for user to teams

Need data to test