continued header work
recommitting this stuff i lost. git for windows is awful.