CFY-505 added some todos