WIP of Importer implementation