Added some ToDo points