Added non-hierachical visitor

More tests, comments, scenario.