That's probably a smarter solution, yeah.

I'll throw something together and add to this PR