second iteration of heatmap, added datasource
fixed conflicts