Finally done!
And the XML as well