Separated creation and population of heatmap. Can now replace heatmaps easily.