Working on heatmaps. Close to working