Ok, thanks for testing that theory @isratrade.  In short, this PR looks good.  I'll give it a test and merge soon.