Mostly complete.  Checkin before tweaking begins.