Gh 731

Testing for this look good.  Tested both locally and on gh-731 demo.  We should get this merged.