OldAggregation renamed to GeneralAggregation and made working, no tests yet