Moved the header checking to its own method. Also stopped passing variables all over the place when they were part of the object to begin with.
Authored by: justinwray 2011-05-30
Parent: [r23]
Child: [r25]
