A little more work on the parser