Adding a fudge builder for swap nodes
Merge branch 'develop' into ui/dev