Oops, still had funky header. I'll put these back when I know what they do.