stage one of converting to new parser