Added a few todos.