Further hacking on todos, wip.