Statistics refactor

*Requires Migration*  Tested this locally and I am now seeing the expected count updates.  Prior to the last 2 changes I ran all the selenium tests and they all passed, so I'm recommending that we merge this to staging, and just do a last quick visual check on there.