This will be where things likely break, just a heads up, if they do. I'll stay on this and attempt to submit PRs at the same time to try and prevent this, but will stay posted on issues once added.