Getting there with first version of importer