Broke apart a calculator

Broke apart one of the aggregate calculators.