I reworked #178 to work with the newly merged repository and other
changes we have made since. Big thanks to Peter (@peterbitfly ) the
original author of the PR

---------
Co-authored-by: peter <1674920+peterbitfly@users.noreply.github.com>