Updating the TODO list. I have actually scratched one