Thanks, @gabebw ... I still want to refactor it, but it feels a lot better.