WIP XML conformity
more XML WIP