Added To Do's for comments