Added some comments and TODO to code