factored duplicate structure/code from data into import, and made import work again...