initial work to add saga support;