Move all calculations to Calculate

Also clean up the reporting.