Moved MatchesPanel to extra Class