[Parser][Refactor] Stubbed out a refactor of the parser.