overhaul of matchup and livedata classes and how they interact