Added some comments and TODO list