Another reorg of the to-do list.  More work is needed...