Partial commit. Working on XmlGenerator.