Continuing work on the data loading functions.