Yeah, in hindsight that method would have a better home in another class. I will create a ticket for that