ongoing work on new XDI syntax