Add swap option
Lint fix
Merge pull request #11776 from Nibbler999/swap

Add swap option