WIP latest changes to importer