added some more todos