Mods to data-loader, prep to remove
Removing data-loader, moving to its own repo