Final stuff for new header, then merging.