Final header changes

Extended working model to better loop handle for headers, rebuilt key
list for later use, verified no regressions