Refactoring the executors to allow embedded flows. Partial checkin.