Hope this helps

My first pull was from the wrong pull of terr1.  This incorporates all those changes.  3rd tries the charm