Swuird rebase due to change to master

There was a change to master; this is intended to be a rebase of the swuird branch off of the new masters commit.
@lmcglohon