Added most of tpope's stuff