More work on heatmap, build still working (woo!)