Moves some todos to my pr.