Refactoring. New arch. New methods. Just studying.