Add more tpope goodness and argument swapper