Gh 1015

tested locally and on demo.  ready for merge.