Refactored EVERYTHING!