First commit of non-statechart treatment for new diagrammer app. Will redo with statecharts.