Expand TODO list.
new upstream