Initial work

You can also add both headers without side effects