Working commit before changing importer structure.
Working intermediate commit.
Working intermediate commit, halfway done with cleanup
Working intermediate commit
Working import with some log output still missing.