Swap is working, and a start on the lasso widget
Merge branch 'stack-swap'

* stack-swap:
  Swap is working, and a start on the lasso widget