refactoring import tasks, work in progress