WIP: multi-headers

Change-Id: Ia56d048c73732999e2b13be0309c55053f1d39b3
WIP: ripping out multiheaders

Change-Id: I9130b7388e4c7a2312c9272b3c45a5e9df1305fc