Matcher refit

Matcher so far (with API)