Refactored how stats work