Gh 951

Tests are all passing now.