If this approach makes sense to you, I will refine it as I update the
tests. Thanks for your patience with this, I really appreciate it!

-- 
Alex.