Gh 929

passes tests and looks good to merge.