More heatmap work.