Refactor, normalize feeds a bit and add SocialFeed