Aggregate Class Calculations

Todo

Discussion to follow.