Second commit.  Applied additional changes and tested successfully.