Thanks for the opinions. I'm thinking about a major refactor here to simplify and hopefully this issue will just go away naturally.