Think I got rid of all the TODOs.