started refactoring importer