Rewrite the Dot Generator, prepare full graph
Merge branch 'dot-generator' into next