Did some more work on plan_executor