I'm an idiot and I just made more work for myself...