Patch attached, tests tbd. Thoughts?