more work on the Parser class