Much of the plumbing done.
Mostly working.
More fixes.