New heatmap and misc changes to support it.