Experiment to see how if Agg Max/InternalMax could be reused
Agg Max variable does not need to be protected
Add headers
Re-use existing Avg classes