End to end complete for now after reorg; still
needed is a logging and testing overhaul.