@orta => Header fields

Rearranged a few things while I was in there.