Refactor
Towards stat system rewrite (again)