starting to refactor feed handling