Started working on XML export/import again, basic test passes now.