Started refactoring logic in PAH to MatchView.