header refactoring--MASSIVE POSITIVE RAMIFICATIONS