Merge pull request #1581 from TheBlueMatt/2022-05-107-bindings-scratch