Map commit

Working on heatmaps, not working yet