Heatmap now working (with bugs)