added some todos...