Moved Header Check

I still need to refactor it though