Compiled. Implemented/refactored entire class. Significant changes