late night thoughts on fixing aggregation locking