@asmith-mdsol  interested in an updated version of this change?