some more todo stuff