Initial commit of new data-reading code