comment code and do some todos