Getting headers inline

Long way to go, still