Updated TODO list again. I'm OCD about this aren't I?