pull request to merge halfway changes

builds and passes a test...