MASSIVE refactoring