More header changes. Structure is clumsy.