We can definitely do that. Let's pick it up in another refactor PR, though. I actually just took a lot of the original vendor code here and this is from that.