Almost finished Current Courses feature