Feature now works as expected.  Clean up.