Feeds

Ok, here's the pull request for all this code. We'll work on Melinda's before merging hers?