And update TODO. Adding more stuff, of course.