Added more matchers. Started working on decoupling matchers to easily combine them (and write less).