Did some more work on parser.