More work on header.