Reordered TODO again to better reflect upcoming work.