Done with pie and stacked and heatmap partly completed
Conflict resolved