Heatmaps Redux

Works now, I think.  Now for testing!
Bug fix

Pass by reference problem...