Added comments and TODO statements