Save point for the stat system... I should branch this