rewrite to add hours and heatmaps