added todo stuff