Agree with everything. This was just a necessary evil to keep separation of `stats` going. Not meant to stay.