Added some TODOS (Commit from Eclipse)