Some more works, the Template machinery starts to work...
the data model is almost there,  the diagram editor too... They need to converge.