Almost there with the TODOs