WIP: Header parser refactor in progress