Refactored...like completely!