Add more things to the TODO.