working version, for what is added.  Still more to come.