More work on the header.