Started work on an agg rewrite