V2.0 swift feature branch for merge into v2.0

Boldly opening a pull request without any tests!  Mwahahah!