Added MatcherControl innards, closes #58