More work on aggregates - still broken though