Unfortunately, had to revert the code de-deplication solution we made due to it costing us closure via a match wildcard :(