updated Shaun's todo stuff