Omar Sood

I think this can be closed with the new header implementation, but I haven't tested all use cases yet.