I wasn’t able to get to this earlier, but I’m glad you figure it out! this looks like a reasonable solution.