Work to date on refactoring data import