Added some TODOS