[wip] header redesign