added some todos ...