Started work on new parser.