Added comments and TODO list