Refactored...everything