Ready to make the big change to XML format now