Added @type matchers + relater comparator stuff.  Extending regression tests for ideas.