much more header work for 1.5 template