Stats rework:
Continuing with previous commit now cleaning up old used methods.
Note: Still not usable!