implement more detail in the base matcher

Signed-off-by: Chris Boertien <chris@aktionlab.com>
update file contains matcher to use new base

Signed-off-by: Chris Boertien <chris@aktionlab.com>