WIP:  Better hit detection.
WIP:  Allow graph in graph

Signed-off-by: Gordon Smith <gordon.smith@lexisnexis.com>