Aggregation

This is a work-in-progress. Please see the pending PRs.