Merge "Quick prototype of new header"