refactor, wip for rich listings