Added several todos.