Starting fixing up the parser.