WIP refactor consumer