Added rubric to the TODO