First changes to make heatmaps retrievable through analysis tab.