Added some todos.