Lots of changes.  Mainly checking in because this is a good breaking
point before I try to break it for updating by column selection.