Switched swap command to return (like xmonad)