WIP on header merging