basic heatmap almost working
Merge origin/master