[Modified][Func] 85% of Add Class Questionnaire

Database must be re-design to match questionnaire.