Committing night's work just to make sure it's out there.  More stuff will come later.