Start adding Matcher functionality