extracted Course object and fixed code that used that object.