Maybe I should commit now...
Single run heatmap working