Gh 919

tested on the demo.  ready to merge.