Redid TopicMatcher as TopicMatch.  Tell me if you like it