Basic Heatmap, tooltip implemented
Refactored heatmap
resolving merge conflicts