finished major refactor and added some feeds