implementing some todos