Debugged the ClassDialog, probably not done yet