PB-595 #comment Added some ToDos