inclusive end swashed and to merge into master

mainly so we can make sure the tests run before merging it