Simplified size, added ++ and joined, reorg.
Threw out a big chunk of the code, improved the remainder.

There are still some bits to reconcile.