implement warlord-scumbag swap
Merge branch 'swap'