xml seems to work, ready to merge back into master