First try at configured headers and fixing a derp