Update data model to better connect kitah, grade fields, grades and students: NEEDS IMPLEMENTATION