Course controller

Pull from course controller,  got rid of merge conflicts.