Added comments and TODO's