Parsing headers correct. More need to be shifted to the grammar file.