In retrospect that seems much simpler than what I proposed in my edit, thanks.