GuiClassRefactor phase 1 complete!