Aggregation

Closes #181