MASSIVE Refactor