added some todos