Overlapping header redo.

Let me know if this one is somehow evil again.