Adding more statistics.
Shifting away from sorting up front to a heap.