WIP for 'advanced' export/import