wip
wip: before redesign bundle headers
wip