Initial check-in still working on documentation, tests and matchers