added matchups and started implementing matchup functionality