Work on the parser