Continued work on parser.