Move this down and use course_id