Try to keep the todo stuff more up to date