[REFACTOR] Status refactoring. In progress...