some more todos