Adding heatmaps, what is hopefully final polish