Further reorg.
Further cleanup.
Bring back logging of values.
0.1.0