Gh 952

tests pass on this branch.