Refactor the relationship matcher into it's own file; test it like a testman.