[WIP] Universal Header

https://www.pivotaltracker.com/story/show/82755500