Work in progress on aggregates (having needs fixing)