Add feeds support back in

Will need to push to github to be sure it actually works.