Fully Refactored