starting the XML doc refactoring gh-68