Updating to use a Pratt based parser implementation