Beginning to update code to work with new histogram data structure.