Large commit for preliminary work on loading data