Working on getting the new dataset preparation code working.