Class List done, addNewClass done,