WIP prepare for stateful refactor of group headers