Abstract importer logic--first refactor
Merge branch 'importer'