Work so far on fixing XML for new interfaces