Bundle header

@triblondon Comments?

I've tested and this looks good.