started work on refactored data import