Added some TODOS
Added some TODOS