(wip): initial outline for es-feed refactor