add some todos in commennts