Add and reorganize TODO items.