Sanchez/create rubric properly

@wedaly