Heatmaps now take number of milliseconds from start rather than date
Merge changes