To Do's for some classes in the comment