Xml builder

Commit now