Changed holder variable names to containing, and aggregation variable names
for Aggregating to aggregating.