Added some TODOS and notes