Header has reached parity with much better abstractions