Change map to id
Add incomplete/untested heatmap