Aggregate-level ht stuff mostly done