Added notes to TODO for upserting calculated average for corresponding aggregates.