Initial commit for new Match classes