Now with relationship columns,

and a mostly working model-from-xmi test.