Add more new tpope stuff