More work on the TODO.