Xml import draft

Pls pull, I've merged in current master.