debugging new refactored diagram generation
refactoring compiles and runs, now trying to ensure SVG generated is consistent with old architecture