Further WIP on data import