Initial checkin, mess and all.

This isn't intended to be even a point checkin.  In the direct middle of
a design reorg.