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