Headers largely working