more work on the header stuff