Lots of changes.  Commit before going to a meeting.