trying to fix/generalize aggregations...