not a huge fan of doing the feature check every single time this is called, but I also dont know what it takes to test for this feature outside of this

If there's a sane way I would definitely appreciate a followup pull request that improves on this ,but otherwise this looks good