Code restructuring, added ability to add feeds.