Larch + XDI in Athena