More work in progress on preserving raw header form

But it might be easier to just scrub this branch and try again