Aggregate

@mozkeeler Ready for review