Interim commit with some of the histogram issues worked out.