@matthew-andrews that's *way* better, thanks! My solution is definitely overkill, closing this PR.