Fixed header implementation

[mherchel]

@kredon take a look at this. I did most of this last night, but finished up some details today