reorg'd/expanded the TODOs