begin rewrite, stub for new parser