Refactored, redesigned, and basically done