Classed up and moved to storage instead of window
Summed vs global data is in.