Move make_team statements into new_match()