Added Matchup classes from TILT1. Not integrated yet.