More progress on to Haggai XML export