Hacking away at the TODO list