Doing pretty good.  Need to merge the front bits of 1.1.

Normally I can't work this late