Added full grade selection and concept functionality