start work on heatmap
merge with remote