Progress on parser
More progress on parser.