Moved more logic into MatchView, but tests are broken right now.