Stats rework:
Continuing with previous commit now replacing some of the old static
calculators.
Note: Still not usable!