Just going to re-vote consolidating this logic in a utility with the aggregator version