replace assignment/candidate nomenclature w 'Matchup'....combines entity Candidate and Assignment into Matchup