diff --git a/.cirrus.yml b/.cirrus.yml
index 9e417e12..bae88b48 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -1,187 +1,49 @@
-env:
-  PACT_BROKER_FEATURES: publish_pacts_using_old_api
 
-BUILD_TEST_TASK_TEMPLATE: &BUILD_TEST_TASK_TEMPLATE
-  arch_check_script:
-    - uname -am
-  prebuild_script:
-    - node --version
-    - chmod +x script/**/* && chmod +x script/**
-    - script/download-libs.sh
-    - npm ci --ignore-scripts
-    - npx prebuildify --napi
-    - tar -czf prebuilds.tar.gz prebuilds
-    - ls
-    - rm -rf ffi build
-  test_20_script:
-    - ls
-    - node --version
-    - script/ci/build-and-test.sh
-    - ls
-    - npm run clean
-    - rm -rf node_modules
-    - ls
-  test_18_script:
-    - . $NVM_DIR/nvm.sh
-    - nvm install 18
-    - nvm use 18
-    - node --version
-    - script/ci/build-and-test.sh
-    - ls
-    - npm run clean
-    - rm -rf node_modules
-    - ls
-  test_16_script:
-    - . $NVM_DIR/nvm.sh
-    - nvm install 18
-    - nvm use 18
-    - node --version
-    - script/ci/build-and-test.sh
-    - ls
-    - npm run clean
-    - rm -rf node_modules
-    - ls
+INSTALL_GH_CLI: &INSTALL_GH_CLI
+  install_gh_cli_script: |
+    curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg \
+    && chmod go+r /usr/share/keyrings/githubcli-archive-keyring.gpg \
+    && echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | tee /etc/apt/sources.list.d/github-cli.list > /dev/null \
+    && apt update \
+    && apt install gh -y
 
-linux_arm64_task:
+RELEASE: &RELEASE
+  release_script: ./script/ci/release.sh
   env:
-    NVM_DIR: /usr/local/nvm
-  arm_container:
-    image: node:20-slim
-  install_script:
-    - apt update --yes && apt install --yes curl python3 make build-essential g++ unzip zip
-    - curl --silent -o- https://raw.githubusercontent.com/creationix/nvm/v0.31.2/install.sh | bash
-  << : *BUILD_TEST_TASK_TEMPLATE
-  artifacts:
-    path: "prebuilds.tar.gz"
+    GITHUB_TOKEN: ENCRYPTED[636f316600928de28b5c36027cc39d9796bc0d0eca2a181368f255ad61540f13bb38cdce09b6428774f315bbf45e0ada]
+    GH_PRE_RELEASE_UPLOAD: true 
 
-linux_amd64_task:
-  env:
-    NVM_DIR: /usr/local/nvm
-  container:
-    image: node:20-slim
-  install_script:
-    - apt update --yes && apt install --yes curl python3 make build-essential g++ unzip zip 
-    - curl --silent -o- https://raw.githubusercontent.com/creationix/nvm/v0.31.2/install.sh | bash
-  << : *BUILD_TEST_TASK_TEMPLATE
-  artifacts:
-    path: "prebuilds.tar.gz"
+PREBUILD_AND_TEST: &PREBUILD_AND_TEST
+  prebuild_script: NODE_VERSION=20 script/ci/prebuild.sh
+  <<: *RELEASE
+  test_20_script:  NODE_VERSION=20 script/ci/build-and-test.sh && script/ci/clean.sh
+  test_18_script:  NODE_VERSION=18 script/ci/build-and-test.sh && script/ci/clean.sh
+  test_16_script:  NODE_VERSION=16 script/ci/build-and-test.sh && script/ci/clean.sh
 
-macos_arm_prebuilder_task:
-  macos_instance:
-    image: ghcr.io/cirruslabs/macos-ventura-base:latest
+linux_arm_task:
   env:
-    PACT_BROKER_FEATURES: publish_pacts_using_old_api
-    NVM_DIR: ${HOME}/.nvm
-    PATH: ${NVM_DIR}:${PATH}
-  install_node_script:
-    - brew install nvm
-    - . $(brew --prefix nvm)/nvm.sh
-    - nvm install 20
-    - nvm install 18
-    - nvm install 16
-  prebuild_script:
-    - . $(brew --prefix nvm)/nvm.sh
-    - nvm use 20
-    - node --version
-    - chmod +x script/**/* && chmod +x script/**
-    - script/download-libs.sh
-    - npm ci --ignore-scripts
-    - npx prebuildify --napi
-    - tar -czf prebuilds.tar.gz prebuilds
-    - ls
-    - rm -rf ffi build 
-  test_20_script:
-    - . $(brew --prefix nvm)/nvm.sh
-    - nvm use 20
-    - node --version
-    - script/ci/build-and-test.sh
-    - ls
-    - npm run clean
-    - rm -rf node_modules
-    - ls
-  test_18_script:
-    - . $(brew --prefix nvm)/nvm.sh
-    - nvm use 18
-    - node --version
-    - script/ci/build-and-test.sh
-    - ls
-    - npm run clean
-    - rm -rf node_modules
-    - ls
-  test_16_script:
-    - . $(brew --prefix nvm)/nvm.sh
-    - nvm use 16
-    - node --version
-    - script/ci/build-and-test.sh
-    - ls
-    - npm run clean
-    - rm -rf node_modules
-    - ls
+    SET_NVM: "true"
+  arm_container:
+  # container:
+    image: node:20-slim
+  cirrus_setup_script: chmod +x script/**/* && chmod +x script/**
+  setup_script: apt update --yes && apt install --yes curl python3 make build-essential g++ unzip zip libyaml-dev git
+  dry_run_check_script: npx --yes commit-and-tag-version --dry-run && git remote -v
+  pre_req_script: curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.39.3/install.sh | bash
+  <<: *INSTALL_GH_CLI
+  <<: *PREBUILD_AND_TEST
   artifacts:
-    path: "prebuilds.tar.gz"
+    path: prebuilds/*.tar.gz
 
-macos_x64_prebuilder_task:
+macos_arm_task:
   macos_instance:
     image: ghcr.io/cirruslabs/macos-ventura-base:latest
   env:
-    PACT_BROKER_FEATURES: publish_pacts_using_old_api
-    NVS_HOME: ${HOME}/.nvs
-    PATH: ${NVS_HOME}:${PATH}
-  install_nvs_script: |
-    git clone https://github.com/jasongin/nvs "$NVS_HOME"
-    . "$NVS_HOME/nvs.sh" install
-  install_rosetta_script: softwareupdate --install-rosetta --agree-to-license
-  install_node_x64_script: | 
-    . "$NVS_HOME/nvs.sh"
-    nvs add 20/x64
-    nvs add 18/x64
-    nvs add 16/x64
-    nvs use 20/x64
-    file $(which node) | grep -e 'x64'
-    node --version
-  prebuild_script:
-    - ls
-    - . "$NVS_HOME/nvs.sh"
-    - nvs use 20/x64
-    - file $(which node) | grep -e 'x64'
-    - node --version
-    - chmod +x script/**/* && chmod +x script/**
-    - script/download-libs.sh
-    - npm ci --ignore-scripts
-    - npx prebuildify --napi
-    - tar -czf prebuilds.tar.gz prebuilds
-    - ls
-    - rm -rf ffi build 
-  test_20_script:
-    - . "$NVS_HOME/nvs.sh"
-    - nvs use 20/x64
-    - file $(which node) | grep -e 'x64'
-    - node --version
-    - ls
-    - script/ci/build-and-test.sh
-    - ls
-    - npm run clean
-    - rm -rf node_modules
-    - ls
-  test_18_script:
-    - . "$NVS_HOME/nvs.sh"
-    - nvs use 18/x64
-    - file $(which node) | grep -e 'x64'
-    - node --version
-    - script/ci/build-and-test.sh
-    - ls
-    - npm run clean
-    - rm -rf node_modules
-    - ls
-  test_16_script:
-    - . "$NVS_HOME/nvs.sh"
-    - nvs use 16/x64
-    - file $(which node) | grep -e 'x64'
-    - node --version
-    - script/ci/build-and-test.sh
-    - ls
-    - npm run clean
-    - rm -rf node_modules
-    - ls
+    SET_NVM: "true"
+  cirrus_setup_script: chmod +x script/**/* && chmod +x script/**
+  dry_run_check_script: |
+    npx --yes commit-and-tag-version --dry-run && git remote -v
+  pre_req_script: brew install nvm
+  <<: *PREBUILD_AND_TEST
   artifacts:
-    path: "prebuilds.tar.gz"
\ No newline at end of file
+    path: prebuilds/*.tar.gz
\ No newline at end of file
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 2ca05a68..d06713ce 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -7,7 +7,18 @@ on:
   workflow_dispatch:
 
 jobs:
-  build:
+
+  create_pre_release:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - run: GH_CREATE_PRE_RELEASE=true ./script/ci/release.sh
+        if: github.ref == 'refs/heads/master' && env.ACT != 'true' && runner.os == 'Linux'
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+   
+  prebuild:
+    needs: [ create_pre_release ]
     runs-on: ${{ matrix.os }}
     defaults:
       run:
@@ -18,34 +29,36 @@ jobs:
         node-version: [20]
         os: [macos-latest,ubuntu-latest,windows-latest]
 
+    env:
+      NODE_VERSION: ${{ matrix.node-version }}
+
     steps:
       - uses: actions/checkout@v3
-      - name: Use Node.js ${{ matrix.node-version }}
+
+      
+      - name: Use Node.js ${{ env.NODE_VERSION }}
         uses: actions/setup-node@v3
         with:
-          node-version: ${{ matrix.node-version }}
-      - name: download-libs
-        if: runner.os != 'Windows'
-        run: script/download-libs.sh
-      - name: download-libs
-        if: runner.os == 'Windows'
-        run: script/download-libs.sh
-        env:
-          ONLY_DOWNLOAD_PACT_FOR_WINDOWS: true
-      - name: generate prebuild
-        run: |
-          npm ci --ignore-scripts
-          npx prebuildify --napi
-          tar -czf prebuilds-${{ runner.os }}.tar.gz prebuilds
-          ls
-      - name: Upload standalone packages
+          node-version: ${{ env.NODE_VERSION }}
+
+      - if: runner.os == 'Windows'
+        run: echo "ONLY_DOWNLOAD_PACT_FOR_WINDOWS=true" >> $GITHUB_ENV
+
+      - run: ./script/ci/prebuild.sh
+
+      - name: Upload prebuild for ${{ runner.os }}-${{ runner.arch }}
         uses: actions/upload-artifact@v3
         with:
-          name: prebuilds-${{ runner.os }}.tar.gz
-          path: prebuilds-${{ runner.os }}.tar.gz
+          path: prebuilds/*.tar.gz
+          
+      - run: GH_PRE_RELEASE_UPLOAD=true ./script/ci/release.sh
+        if: github.ref == 'refs/heads/master' && env.ACT != 'true'
+        env:
+            GITHUB_TOKEN: ${{ github.token }}
+
   test:
     runs-on: ${{ matrix.os }}
-    needs: [build]
+    needs: [prebuild]
     defaults:
       run:
         shell: bash
@@ -55,34 +68,46 @@ jobs:
         node-version: [16,18,20]
         os: [macos-latest,ubuntu-latest,windows-latest]
 
+    env:
+      NODE_VERSION: ${{ matrix.node-version }}
+
     steps:
       - uses: actions/checkout@v3
-      - name: Download all workflow run artifacts
+
+      - name: Download prebuilds
         uses: actions/download-artifact@v3
+
+      - name: Use Node.js ${{ env.NODE_VERSION }}
+        uses: actions/setup-node@v3
         with:
-          name: prebuilds-${{ runner.os }}.tar.gz
-      - name: process packaged artifact
-        run: tar xvf prebuilds-${{ runner.os }}.tar.gz
-      - name: Use Node.js ${{ matrix.node-version }}
+          node-version: ${{ env.NODE_VERSION }}
+
+      - if: runner.os == 'Windows'
+        run: echo "ONLY_DOWNLOAD_PACT_FOR_WINDOWS=true" >> $GITHUB_ENV
+      - run: ./script/ci/unpack-and-test.sh
+
+  release_dry_run:
+    runs-on: ubuntu-latest
+    needs: [ create_pre_release, prebuild ]
+    if: github.ref == 'refs/heads/master'
+
+    env:
+      NODE_VERSION: 20
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Use Node.js ${{ env.NODE_VERSION }}
         uses: actions/setup-node@v3
         with:
-          node-version: ${{ matrix.node-version }}
-      - name: download-libs
-        if: runner.os != 'Windows'
-        run: script/download-libs.sh
-      - name: download-libs
-        if: runner.os == 'Windows'
-        run: script/download-libs.sh
-        env:
-          ONLY_DOWNLOAD_PACT_FOR_WINDOWS: true
-      - run: script/ci/build-and-test.sh
-        if: runner.os != 'Windows'
-        env:
-          NODE_VERSION: ${{ matrix.node-version }}
-          PACT_BROKER_FEATURES: publish_pacts_using_old_api
-      - run: script/ci/build-and-test.sh
-        if: runner.os == 'Windows'
+          node-version: ${{ env.NODE_VERSION }}
+          registry-url: 'https://registry.npmjs.org'
+
+      - name: "release - dry run: ${{ env.DRY_RUN }}"
+        id: publish
+        run: script/ci/release.sh
         env:
-          NODE_VERSION: ${{ matrix.node-version }}
-          PACT_BROKER_FEATURES: publish_pacts_using_old_api
-          ONLY_DOWNLOAD_PACT_FOR_WINDOWS: true
+          GITHUB_TOKEN: ${{ github.token }}
+          DRY_RUN: true
+
+      - run: echo "New Release will be v${{ steps.publish.outputs.version }}"
\ No newline at end of file
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 4566cb2a..a471d862 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -9,26 +9,22 @@ on:
 jobs:
   release:
     runs-on: ubuntu-latest
+
+    env:
+      NODE_VERSION: 20
+
     steps:
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-      - uses: actions/setup-node@v1
+      - uses: actions/checkout@v3
+
+      - name: Use Node.js ${{ env.NODE_VERSION }}
+        uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: ${{ env.NODE_VERSION }}
           registry-url: 'https://registry.npmjs.org'
-      - id: publish
-        run: script/ci/release.sh
         env:
           NODE_AUTH_TOKEN: ${{secrets.NPM_AUTOMATION_TOKEN}}
-      - name: Create Release
-        id: create_release
-        uses: actions/create-release@v1
+      - name: "release"
+        id: publish
+        run: script/ci/release.sh
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
-        with:
-          tag_name: v${{ steps.publish.outputs.version }}
-          release_name: Release v${{ steps.publish.outputs.version }}
-          body: ${{steps.publish.outputs.notes}}
-          draft: false
-          prerelease: false
+          GITHUB_TOKEN: ${{ github.token }}
diff --git a/.gitignore b/.gitignore
index a3f4e552..599c0516 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,8 +19,7 @@ coverage
 # node-waf configuration
 .lock-wscript
 
-# Compiled binary addons (http://nodejs.org/api/addons.html)
-build
+
 
 # Redis database dump
 dump.rdb
@@ -44,8 +43,11 @@ src/**/**.d.ts
 test/**/**.d.ts
 bin/**/**.d.ts
 **/*.d.ts
-*.js
-!test.js
+src/**/**.js
+test/**/**.js
+bin/**/**.js
+# *.js
+# !test.js
 
 *.js.map
 
@@ -53,13 +55,24 @@ bin/**/**.d.ts
 ts-node-*
 
 # pact standalone binaries
-standalone/*
-!standalone/__fixtures__/.keep
-!standalone/*.ts
+# standalone/*
+standalone/darwin*
+standalone/linux*
+standalone/windows*
 standalone/*.d.ts
-ffi/*
-!src/ffi
-!ffi/README.md
+standalone/*.js
+standalone/*.checksum
+standalone/*.gz
+standalone/README.md
+# FFI native bindings
+*.so
+*.dll*
+pact.h
+pact-cpp.h
+*.dylib
+# Compiled binary addons (http://nodejs.org/api/addons.html)
+build
+# Precompiled binary addons
 prebuilds
 
 # Folders created during testing
@@ -68,13 +81,3 @@ reports
 tmp
 .tmp
 test/__testoutput__
-
-# jest config
-!jest.config.js
-
-# mocha config
-!.mocharc.js
-!ts-node.js
-
-# jest mocks
-!__mocks__
diff --git a/.npmignore b/.npmignore
index a6eb2a54..aad98a81 100644
--- a/.npmignore
+++ b/.npmignore
@@ -82,4 +82,12 @@ script
 
 # FFI binaries
 ffi
-!prebuilds
\ No newline at end of file
+!prebuilds
+
+.cirrus
+.gitattributes
+DEVELOPER.md
+RELEASING.md
+test.js
+tsconfig.build.json
+tsconfig.json
\ No newline at end of file
diff --git a/DEVELOPER.md b/DEVELOPER.md
index 280479e7..3a147f45 100644
--- a/DEVELOPER.md
+++ b/DEVELOPER.md
@@ -11,4 +11,93 @@ npm test
 
 _notes_ - As a developer, you need to run `bash script/download-libs.sh` to download the FFI libraries prior to running `npm install` / `npm ci` as the libraries will be expected to be there, and you won't have any `node_modules` installed yet.
 
-For end users, the `ffi` folder is populated, as part of the npm publishing step.
\ No newline at end of file
+For end users, the `ffi` folder is populated, as part of the npm publishing step.
+
+### Linux x86_64 Task
+
+#### Pre Reqs
+
+1. x86_64 Machine
+   1. ARM64 Mac - If you have Rosetta (MacOS) 
+
+### CI Locally
+
+1. Docker/Podman
+2. Act
+
+```sh
+act --container-architecture linux/amd64 -W .github/workflows/build-and-test.yml --artifact-server-path tmp
+```
+
+### MacOS x86_64 Task
+
+#### Pre Reqs
+
+1. Arm64 Mac with Rosetta
+   1. install notes for rosetta
+   2. prefix commands with `arch -x86_64`
+2. x86_64 Mac
+
+### CI Locally
+
+1. Arm64 Mac with Rosetta
+2. x86_64 Mac
+3. Cirrus-Cli
+4. Parallels
+
+```sh
+to be added
+```
+
+### MacOS ARM64 Task
+
+#### Pre Reqs
+
+1. Arm64 Mac
+
+### CI Locally
+
+1. Arm64 Mac
+2. Cirrus-Cli
+3. Tart.run
+
+
+```sh
+cirrus run --output github-actions macos_arm --artifacts-dir tmp
+```
+
+#### Notes
+
+Change `arm_container` to container
+
+### Linux ARM64 Task
+
+#### Pre Reqs
+
+1. Arm64 Machine
+
+### CI Locally
+
+1. Arm64 Machine
+2. Docker / Podman
+3. Cirrus-Cli
+   1. Fork that supports running `container` tasks as `aarch64`
+
+
+```sh
+saffus run --output github-actions linux_arm --artifacts-dir tmp
+```
+
+#### Notes
+
+Change `arm_container` to container
+
+
+
+#### Publishing Assets
+
+`cirrus run --output github-actions macos_arm --artifacts-dir tmp --environment GITHUB_TOKEN=$GITHUB_TOKEN --environment CIRRUS_RELEASE=test --environment CIRRUS_REPO_FULL_NAME=you54f/pact-js-core;`
+
+Change `arm_container` to container
+
+`saffus run --output github-actions linux_arm --artifacts-dir tmp --environment GITHUB_TOKEN=$GITHUB_TOKEN --environment CIRRUS_RELEASE=test --environment CIRRUS_REPO_FULL_NAME=you54f/pact-js-core;`
\ No newline at end of file
diff --git a/README.md b/README.md
index 80ce41ad..db7cf649 100644
--- a/README.md
+++ b/README.md
@@ -6,11 +6,34 @@
 
 ![Build and test](https://github.com/pact-foundation/pact-js-core/workflows/Build%20and%20test/badge.svg)
 [![Known Vulnerabilities](https://snyk.io/test/github/pact-foundation/pact-js-core/badge.svg?targetFile=package.json)](https://snyk.io/test/github/pact-foundation/pact-js-core?targetFile=package.json)
+[![GitHub release](https://img.shields.io/github/release/pact-foundation/pact-js-core)](https://github.com/pact-foundation/pact-js-core)
 [![npm](https://img.shields.io/npm/v/@pact-foundation/pact-core.svg)](https://www.npmjs.com/package/@pact-foundation/pact-core)
 [![license](https://img.shields.io/github/license/pact-foundation/pact-js-core.svg)](https://github.com/pact-foundation/pact-js-core/blob/master/LICENSE)
-[![dependencies](https://img.shields.io/david/pact-foundation/pact-js-core.svg)](https://www.npmjs.com/package/@pact-foundation/pact-core)
 [![slack](http://slack.pact.io/badge.svg)](http://slack.pact.io)
 
+
+[![Npm package license](https://badgen.net/npm/license/@pact-foundation/pact-core)](https://npmjs.com/package/@pact-foundation/pact-core)
+[![Npm package version](https://badgen.net/npm/v/@pact-foundation/pact-core)](https://npmjs.com/package/@pact-foundation/pact-core)
+[![Minimum node.js version](https://badgen.net/npm/node/@pact-foundation/pact-core)](https://npmjs.com/package/@pact-foundation/pact-core)
+
+[![Npm package total downloads](https://badgen.net/npm/dt/@pact-foundation/pact-core)](https://npmjs.com/package/@pact-foundation/pact-core)
+
+[![Npm package yearly downloads](https://badgen.net/npm/dy/@pact-foundation/pact-core)](https://npmjs.com/package/@pact-foundation/pact-core)
+[![Npm package monthly downloads](https://badgen.net/npm/dm/@pact-foundation/pact-core)](https://npmjs.com/package/@pact-foundation/pact-core)
+[![Npm package daily downloads](https://badgen.net/npm/dd/@pact-foundation/pact-core)](https://npmjs.com/package/@pact-foundation/pact-core)
+
+[![Npm package dependents](https://badgen.net/npm/dependents/@pact-foundation/pact-core)](https://npmjs.com/package/@pact-foundation/pact-core)
+
+[![Maintenance](https://img.shields.io/badge/Maintained%3F-yes-green.svg)](https://GitHub.com/pact-foundation/pact-js-core/graphs/commit-activity)
+
+[![Build and test](https://github.com/pact-foundation/pact-js-core/actions/workflows/build-and-test.yml/badge.svg)](https://github.com/pact-foundation/pact-js-core/actions/workflows/build-and-test.yml)
+[![Publish and release](https://github.com/pact-foundation/pact-js-core/actions/workflows/publish.yml/badge.svg)](https://github.com/pact-foundation/pact-js-core/actions/workflows/publish.yml)
+
+[![Linux](https://svgshare.com/i/Zhy.svg)](https://svgshare.com/i/Zhy.svg)
+[![macOS](https://svgshare.com/i/ZjP.svg)](https://svgshare.com/i/ZjP.svg)
+[![Windows](https://svgshare.com/i/ZhY.svg)](https://svgshare.com/i/ZhY.svg)
+
+
 # Pact-JS Core
 
 A wrapper for the [Pact](http://pact.io) [CLI Tools](https://github.com/pact-foundation/pact-ruby-standalone).
@@ -42,6 +65,11 @@ A wrapper for the [Pact](http://pact.io) [CLI Tools](https://github.com/pact-fou
       - [Create Message Pacts](#create-message-pacts)
         - [Example](#example)
   - [CLI Tools](#cli-tools)
+  - [Windows Issues](#windows-issues)
+    - [Enable Long Paths](#enable-long-paths)
+  - [Contributing](#contributing)
+  - [Testing](#testing)
+  - [Questions?](#questions)
 
 <!-- /TOC -->
 
diff --git a/download-checksums.js b/download-checksums.js
deleted file mode 100644
index 8a7e98c0..00000000
--- a/download-checksums.js
+++ /dev/null
@@ -1 +0,0 @@
-require('./standalone/install').downloadChecksums();
diff --git a/ffi/README.md b/ffi/README.md
deleted file mode 100644
index f1ec21b9..00000000
--- a/ffi/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# FFI binaries
-
-This folder is automatically populated during build by /script/download-ffi.sh
diff --git a/package-lock.json b/package-lock.json
index 11a70423..14c6daab 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
-  "name": "@pact-foundation/pact-core",
-  "version": "13.13.8",
+  "name": "@you54f/pact-core",
+  "version": "13.17.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
-      "name": "@pact-foundation/pact-core",
-      "version": "13.13.8",
+      "name": "@you54f/pact-core",
+      "version": "13.17.0",
       "cpu": [
         "x64",
         "ia32",
@@ -26,8 +26,6 @@
         "cross-spawn": "7.0.3",
         "mkdirp": "1.0.0",
         "needle": "^3.2.0",
-        "node-addon-api": "^6.1.0",
-        "node-gyp-build": "^4.6.0",
         "pino": "^8.7.0",
         "pino-pretty": "^9.1.1",
         "promise-timeout": "1.3.0",
@@ -49,7 +47,7 @@
         "@grpc/proto-loader": "^0.7.3",
         "@pact-foundation/pact-js-prettier-config": "^1.0.0",
         "@snyk/protect": "^1.1118.0",
-        "@tsconfig/node14": "^1.0.3",
+        "@tsconfig/node18": "^2.0.1",
         "@types/basic-auth": "^1.1.2",
         "@types/bindings": "^1.5.1",
         "@types/chai": "4.1.2",
@@ -93,6 +91,7 @@
         "form-data": "^4.0.0",
         "grpc-promise": "^1.4.0",
         "mocha": "^9.1.3",
+        "node-addon-api": "^6.1.0",
         "nodemon": "^2.0.4",
         "prettier": "^2.3.0",
         "protobufjs": "^6.11.2",
@@ -601,6 +600,12 @@
       "integrity": "sha512-eZxlbI8GZscaGS7kkc/trHTT5xgrjH3/1n2JDwusC9iahPKWMRvRjJSAN5mCXviuTGQ/lHnhvv8Q1YTpnfz9gA==",
       "dev": true
     },
+    "node_modules/@tsconfig/node18": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@tsconfig/node18/-/node18-2.0.1.tgz",
+      "integrity": "sha512-UqdfvuJK0SArA2CxhKWwwAWfnVSXiYe63bVpMutc27vpngCntGUZQETO24pEJ46zU6XM+7SpqYoMgcO3bM11Ew==",
+      "dev": true
+    },
     "node_modules/@types/basic-auth": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/@types/basic-auth/-/basic-auth-1.1.3.tgz",
@@ -5619,17 +5624,8 @@
     "node_modules/node-addon-api": {
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-6.1.0.tgz",
-      "integrity": "sha512-+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA=="
-    },
-    "node_modules/node-gyp-build": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.6.0.tgz",
-      "integrity": "sha512-NTZVKn9IylLwUzaKjkas1e4u2DLNcV4rdYagA4PWdPwW87Bi7z+BznyKSRwS/761tV/lzCGXplWsiaMjLqP2zQ==",
-      "bin": {
-        "node-gyp-build": "bin.js",
-        "node-gyp-build-optional": "optional.js",
-        "node-gyp-build-test": "build-test.js"
-      }
+      "integrity": "sha512-+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA==",
+      "dev": true
     },
     "node_modules/nodemon": {
       "version": "2.0.20",
@@ -8084,6 +8080,12 @@
       "integrity": "sha512-eZxlbI8GZscaGS7kkc/trHTT5xgrjH3/1n2JDwusC9iahPKWMRvRjJSAN5mCXviuTGQ/lHnhvv8Q1YTpnfz9gA==",
       "dev": true
     },
+    "@tsconfig/node18": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@tsconfig/node18/-/node18-2.0.1.tgz",
+      "integrity": "sha512-UqdfvuJK0SArA2CxhKWwwAWfnVSXiYe63bVpMutc27vpngCntGUZQETO24pEJ46zU6XM+7SpqYoMgcO3bM11Ew==",
+      "dev": true
+    },
     "@types/basic-auth": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/@types/basic-auth/-/basic-auth-1.1.3.tgz",
@@ -11879,12 +11881,8 @@
     "node-addon-api": {
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-6.1.0.tgz",
-      "integrity": "sha512-+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA=="
-    },
-    "node-gyp-build": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.6.0.tgz",
-      "integrity": "sha512-NTZVKn9IylLwUzaKjkas1e4u2DLNcV4rdYagA4PWdPwW87Bi7z+BznyKSRwS/761tV/lzCGXplWsiaMjLqP2zQ=="
+      "integrity": "sha512-+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA==",
+      "dev": true
     },
     "nodemon": {
       "version": "2.0.20",
diff --git a/package.json b/package.json
index d5f59e64..045861e1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
-  "name": "@pact-foundation/pact-core",
-  "version": "13.13.8",
+  "name": "@you54f/pact-core",
+  "version": "13.17.0",
   "description": "Core of @pact-foundation/pact. You almost certainly don't want to depend on this directly.",
   "main": "src/index.js",
   "homepage": "https://github.com/pact-foundation/pact-js-core#readme",
@@ -52,14 +52,11 @@
     "access": "public"
   },
   "dependencies": {
-    "bindings": "^1.5.0",
     "chalk": "4.1.2",
     "check-types": "7.3.0",
     "cross-spawn": "7.0.3",
     "mkdirp": "1.0.0",
     "needle": "^3.2.0",
-    "node-addon-api": "^6.1.0",
-    "node-gyp-build": "^4.6.0",
     "pino": "^8.7.0",
     "pino-pretty": "^9.1.1",
     "promise-timeout": "1.3.0",
@@ -74,7 +71,6 @@
     "@snyk/protect": "^1.1118.0",
     "@tsconfig/node14": "^1.0.3",
     "@types/basic-auth": "^1.1.2",
-    "@types/bindings": "^1.5.1",
     "@types/chai": "4.1.2",
     "@types/chai-as-promised": "7.1.0",
     "@types/check-types": "^7.3.2",
@@ -117,6 +113,7 @@
     "grpc-promise": "^1.4.0",
     "mocha": "^9.1.3",
     "nodemon": "^2.0.4",
+    "node-addon-api": "^6.1.0",
     "prettier": "^2.3.0",
     "protobufjs": "^6.11.2",
     "sinon": "9.2.4",
@@ -128,7 +125,8 @@
     "lint": "eslint . --ext .ts --config .eslintrc",
     "lint:fix": "npm run lint -- --fix",
     "prebuild": "npm run clean",
-    "download:libs": "npm run clean && bash script/download-libs.sh",
+    "download-libs": "npm run clean && bash script/download-libs.sh",
+    "clean-libs": "rimraf standalone/*.{js,map,d.ts} standalone/{windows**,linux**,darwin**} 'ffi'",
     "build": "tsc --project tsconfig.build.json",
     "prerelease": "npm run snyk-protect",
     "release": "commit-and-tag-version",
@@ -137,7 +135,7 @@
     "format:base": "prettier --parser typescript",
     "format:check": "npm run format:base -- --list-different \"{src,standalone,bin,test}/**/*.{ts,tsx}\"",
     "format:fix": "npm run format:base -- --write \"{src,standalone,bin,test}/**/*.{ts,tsx}\"",
-    "install": "node-gyp-build"
+    "install": "echo welcome to Pact-JS - This post install script supresses node-gyp rebuild as it is not required for this package"
   },
   "prettier": "@pact-foundation/pact-js-prettier-config",
   "commit-and-tag-version": {
diff --git a/script/ci/build-and-test.sh b/script/ci/build-and-test.sh
index 704c0b7f..abc3c01b 100755
--- a/script/ci/build-and-test.sh
+++ b/script/ci/build-and-test.sh
@@ -5,9 +5,25 @@ set -u
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")"; pwd)" # Figure out where the script is running
 . "$SCRIPT_DIR"/../lib/robust-bash.sh
 
+if [[ ${SET_NVM:-} == 'true' && "$(uname -s)" == 'Darwin' ]]; then
+  NVM_DIR=${NVM_DIR:-"$HOME/.nvm"}
+  . $(brew --prefix nvm)/nvm.sh # Load nvm
+  nvm install $NODE_VERSION
+  nvm use $NODE_VERSION
+elif [[ ${SET_NVM:-} == 'true' && "$(uname -s)" == 'Linux' ]]; then
+  NVM_DIR=${NVM_DIR:-"$HOME/.nvm"}
+  . $NVM_DIR/nvm.sh # Load nvm
+  nvm install $NODE_VERSION
+  nvm use $NODE_VERSION
+fi
+
+node --version
+npm --version
+
 npm ci --ignore-scripts
 
 npm run format:check
 npm run lint
 npm run build
-npm run test
\ No newline at end of file
+npm run test
+ls -1
\ No newline at end of file
diff --git a/script/ci/check-release-libs.sh b/script/ci/check-release-libs.sh
new file mode 100755
index 00000000..35294922
--- /dev/null
+++ b/script/ci/check-release-libs.sh
@@ -0,0 +1,110 @@
+#!/bin/bash -eu
+
+# Usage: ./check-release-libs.sh [OPTIONS]
+# 
+# This script checks the release assets of a GitHub repository.
+# 
+# Options:
+#   -r, --repo <REPO>        The GitHub repository to check (default: you54f/pact-js-core)
+#   -t, --tag <TAG>          The release tag to check (default: TAG)
+#   -l, --list-assets        List the remote release assets
+#   -f, --fetch-assets       Fetch the remote release assets (will clean local assets)
+#   -c, --clean-assets       Clean the local release assets
+#
+# Example:
+#   ./check-release-libs.sh -r myorg/myrepo -t v1.0.0 -l
+#
+# This will list the remote release assets of the myorg/myrepo repository for the v1.0.0 tag.
+
+# Parse command line arguments
+while [[ $# -gt 0 ]]
+do
+key="$1"
+
+case $key in
+    -r|--repo)
+    REPO="$2"
+    shift # past argument
+    shift # past value
+    ;;
+    -t|--tag)
+    TAG="$2"
+    shift # past argument
+    shift # past value
+    ;;
+    -l|--list-assets)
+    LIST_ASSETS=true
+    shift # past argument
+    ;;
+    -f|--fetch-assets)
+    FETCH_ASSETS=true
+    shift # past argument
+    ;;
+    -c|--clean-assets)
+    CLEAN_ASSETS=true
+    shift # past argument
+    ;;
+    *)    # unknown option
+    echo "Unknown option: $1"
+    exit 1
+    ;;
+esac
+done
+
+# Set default values for REPO and TAG if not provided
+REPO=${REPO:-you54f/pact-js-core}
+TAG=${NEXT_TAG:-${TAG:-latest}}
+
+echo "Checking release assets"
+
+if [[ "${CLEAN_ASSETS:-}" = true || "${FETCH_ASSETS:-}" = true ]]; then
+    echo "Cleaning local release assets"
+    rm -rf *.tar.gz
+    rm -rf prebuilds
+fi
+
+if [[ "$TAG" == "" ]]; then
+    echo "Please provide a release TAG to check"
+    exit 1
+else
+    GH_TAG_OPTION="$TAG"
+    if [[ "$TAG" == "latest" ]]; then
+        GH_TAG_OPTION=''
+    fi
+
+    if [[ "${LIST_ASSETS:-}" = true || "${FETCH_ASSETS:-}" = true ]]; then
+        echo "Listing remote release assets for ${REPO} ${GH_TAG_OPTION}"
+        gh release view --repo "${REPO}" $GH_TAG_OPTION --json assets | jq '.assets[].name'
+    fi
+
+    if [ "${FETCH_ASSETS:-}" = true ]; then
+        echo "Fetching release assets"
+        gh release download --repo "${REPO}" $GH_TAG_OPTION
+    fi
+
+fi
+
+ERRORS=()
+ls *.gz
+ls *.gz | xargs -n1 tar -xzf
+rm *.tar.gz
+ls -1 prebuilds/**
+
+[[ -f prebuilds/darwin-arm64/libpact_ffi.dylib ]] || ERRORS='prebuilds/darwin-arm64/libpact_ffi.dylib'
+[[ -f prebuilds/darwin-arm64/node.napi.node ]] || ERRORS='prebuilds/darwin-arm64/node.napi.node'
+[[ -f prebuilds/darwin-x64/libpact_ffi.dylib ]] || ERRORS='prebuilds/darwin-x64/libpact_ffi.dylib'
+[[ -f prebuilds/darwin-x64/node.napi.node ]] || ERRORS='prebuilds/darwin-x64/node.napi.node'
+[[ -f prebuilds/linux-arm64/libpact_ffi.so ]] || ERRORS='prebuilds/linux-arm64/libpact_ffi.so'
+[[ -f prebuilds/linux-arm64/node.napi.node ]] || ERRORS='prebuilds/linux-arm64/node.napi.node'
+[[ -f prebuilds/linux-x64/libpact_ffi.so ]] || ERRORS='prebuilds/linux-x64/libpact_ffi.so'
+[[ -f prebuilds/linux-x64/node.napi.node ]] || ERRORS='prebuilds/linux-x64/node.napi.node'
+[[ -f prebuilds/win32-x64/pact_ffi.dll ]] || ERRORS='prebuilds/win32-x64/pact_ffi.dll'
+[[ -f prebuilds/win32-x64/node.napi.node ]] || ERRORS='prebuilds/win32-x64/node.napi.node'
+
+if [ ! -z "${ERRORS:-}" ]; then
+    echo "The following files are missing from the release:"
+    echo $ERRORS
+    exit 1
+else
+    echo "All release files are present"
+fi
\ No newline at end of file
diff --git a/script/ci/clean.sh b/script/ci/clean.sh
new file mode 100755
index 00000000..e14d1c1a
--- /dev/null
+++ b/script/ci/clean.sh
@@ -0,0 +1,10 @@
+#!/bin/bash -eu
+set -e # This needs to be here for windows bash, which doesn't read the #! line above
+set -u
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")"; pwd)" # Figure out where the script is running
+. "$SCRIPT_DIR"/../lib/robust-bash.sh
+
+npm run clean
+rm -rf node_modules
+ls
\ No newline at end of file
diff --git a/script/ci/download-standalone-and-test.sh b/script/ci/download-standalone-and-test.sh
new file mode 100755
index 00000000..65639d43
--- /dev/null
+++ b/script/ci/download-standalone-and-test.sh
@@ -0,0 +1,9 @@
+#!/bin/bash -eu
+set -e # This needs to be here for windows bash, which doesn't read the #! line above
+set -u
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")"; pwd)" # Figure out where the script is running
+. "$SCRIPT_DIR"/../lib/robust-bash.sh
+
+./script/download-standalone.sh
+./script/ci/build-and-test.sh
\ No newline at end of file
diff --git a/script/ci/lib/publish.sh b/script/ci/lib/publish.sh
index 83ae513b..28a3b687 100755
--- a/script/ci/lib/publish.sh
+++ b/script/ci/lib/publish.sh
@@ -8,12 +8,16 @@ require_binary npm
 
 VERSION="$("$SCRIPT_DIR/get-version.sh")"
 
-echo "--> Preparing npmrc file"
-"$SCRIPT_DIR"/create_npmrc_file.sh
-
 echo "--> Releasing version ${VERSION}"
 
 echo "--> Releasing artifacts"
 echo "    Publishing pact-core@${VERSION}..."
-npm publish --access public --tag latest
+if [[ ${DRY_RUN:-} == 'true' ]]; then
+  echo "publishing in dry run mode"
+  npm publish --access-public --dry-run
+  else
+  echo "--> Preparing npmrc file"
+  "$SCRIPT_DIR"/create_npmrc_file.sh
+  npm publish --access public --tag latest
+fi
 echo "    done!"
diff --git a/script/ci/prebuild.sh b/script/ci/prebuild.sh
new file mode 100755
index 00000000..21b354f4
--- /dev/null
+++ b/script/ci/prebuild.sh
@@ -0,0 +1,89 @@
+# !/bin/bash -eu
+set -e # This needs to be here for windows bash, which doesn't read the #! line above
+set -u
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")"; pwd)" # Figure out where the script is running
+. "$SCRIPT_DIR"/../lib/robust-bash.sh
+
+if [[ ${SET_NVM:-} == 'true' && "$(uname -s)" == 'Darwin' ]]; then
+  NVM_DIR=${NVM_DIR:-"$HOME/.nvm"}
+  . $(brew --prefix nvm)/nvm.sh # Load nvm
+  nvm install $NODE_VERSION
+  nvm use $NODE_VERSION
+elif [[ ${SET_NVM:-} == 'true' && "$(uname -s)" == 'Linux' ]]; then
+  NVM_DIR=${NVM_DIR:-"$HOME/.nvm"}
+  . $NVM_DIR/nvm.sh # Load nvm
+  nvm install $NODE_VERSION
+  nvm use $NODE_VERSION
+fi
+
+## normalise OS and ARCH names
+OS=$(uname -s | tr '[:upper:]' '[:lower:]')
+ARCH=$(uname -m | tr '[:upper:]' '[:lower:]')
+case $OS in
+  "windows"* | "mingw64"*)
+    OS=win32
+    ;;
+esac
+node --version
+npm --version
+echo "OS: $OS"
+echo "ARCH: $ARCH"
+PREBUILDIFY_VERSION=5.0.1
+
+./script/download-libs.sh
+npm ci --ignore-scripts
+npx --yes prebuildify@${PREBUILDIFY_VERSION} --napi
+ls prebuilds/**/*
+case $OS in
+  darwin)
+    case $ARCH in
+      arm64)
+        tar -czf prebuilds/darwin-arm64.tar.gz prebuilds/darwin-arm64
+        ;;
+      x86_64)
+        tar -czf prebuilds/darwin-x64.tar.gz prebuilds/darwin-x64
+        ;;
+      *)
+        echo "Unsupported architecture: $ARCH"
+        exit 1
+        ;;
+    esac
+    ;;
+  linux)
+    echo "Linux"
+    case $ARCH in
+      aarch64)
+        echo "aarch64"
+        tar -czf prebuilds/linux-arm64.tar.gz prebuilds/linux-arm64
+        ;;
+      x86_64)
+        tar -czf prebuilds/linux-x64.tar.gz prebuilds/linux-x64
+        ;;
+      *)
+        echo "Unsupported architecture: $ARCH"
+        exit 1
+        ;;
+    esac
+    ;;
+  win32)
+    case $ARCH in
+      arm64)
+        tar -czf prebuilds/win32-arm64.tar.gz prebuilds/win32-arm64
+        ;;
+      x86_64)
+        tar -czf prebuilds/win32-x64.tar.gz prebuilds/win32-x64
+        ;;
+      *)
+        echo "Unsupported architecture: $ARCH"
+        exit 1
+        ;;
+    esac
+    ;;
+  *)
+    echo "Unsupported OS: $OS"
+    exit 1
+    ;;
+esac
+ls
+rm -rf ffi build 
\ No newline at end of file
diff --git a/script/ci/release.sh b/script/ci/release.sh
index 51a8c281..00a3d62b 100755
--- a/script/ci/release.sh
+++ b/script/ci/release.sh
@@ -1,48 +1,118 @@
 #!/bin/bash -eu
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")"; pwd)" # Figure out where the script is running
+SCRIPT_DIR="$(
+  cd "$(dirname "${BASH_SOURCE[0]}")"
+  pwd
+)" # Figure out where the script is running
 . "$SCRIPT_DIR"/../lib/robust-bash.sh
 
-require_env_var CI "This script must be run from CI. If you are running locally, note that it stamps your repo git settings."
-require_env_var GITHUB_ACTOR
-require_env_var NODE_AUTH_TOKEN
+if [[ ${DRY_RUN:-} == 'true' && ${CI:-"false"} == "false" ]]; then
+  echo "running in dry run mode and not in CI"
+else
+  require_env_var CI "This script must be run from CI. If you are running locally, note that it stamps your repo git settings."
+  if [[ ${GITHUB_ACTIONS:-} == 'true' ]]; then
+    require_env_var GITHUB_ACTOR
+    # Setup git for github actions
+    git config user.email "${GITHUB_ACTOR}@users.noreply.github.com"
+    git config user.name "${GITHUB_ACTOR}"
+  fi
+fi
+REPO=${REPO:-you54f/pact-js-core}
 
+# It's easier to read the release notes
+# from the standard version tool before it runs
+npx -y commit-and-tag-version --dry-run
+RELEASE_NOTES="$(npx -y commit-and-tag-version --dry-run | awk 'BEGIN { flag=0 } /^---$/ { if (flag == 0) { flag=1 } else { flag=2 }; next } flag == 1')"
+echo "$RELEASE_NOTES"
+NEXT_VERSION=$(npx -y commit-and-tag-version --dry-run | grep 'tagging release' | grep -E -o "([0-9\.]+(-[a-z\.0-9]+)?)")
+NEXT_TAG="v${NEXT_VERSION}"
+GIT_SHA=$(git rev-parse HEAD)
+GIT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
 
-if [ ! -z "${ONLY_DOWNLOAD_PACT_FOR_WINDOWS:-}" ]; then 
-    error "The environment variable ONLY_DOWNLOAD_PACT_FOR_WINDOWS is set"
-    echo "   - you cannot run a release with this variable set"
-    echo "     as only the windows binaries would be included"
-    echo "*** STOPPING RELEASE PROCESS ***"
-    exit 1
+if [ "${GH_CREATE_PRE_RELEASE:-}" = true ]; then
+  echo "Creating pre-release ${NEXT_TAG}"
+  if gh release view ${NEXT_TAG} --repo ${REPO}; then
+    echo "${NEXT_TAG} exists, checking if pre-release"
+    if gh release view ${NEXT_TAG} --repo ${REPO} --json isPrerelease | jq -e '.isPrerelease == false' >/dev/null; then
+      echo "${NEXT_TAG} exists, and is not a pre-release, exiting"
+      exit 1
+    elif gh release view ${NEXT_TAG} --repo ${REPO} --json isPrerelease | jq -e '.isPrerelease == true' >/dev/null; then
+      echo "${NEXT_TAG} exists, and is a pre-release, updating"
+      gh release edit ${NEXT_TAG} --prerelease --draft --repo ${REPO} --title "Release ${NEXT_TAG}" --notes "${RELEASE_NOTES}" --target ${GIT_SHA}
+      exit 0
+    fi
+  else
+    echo "doesnt exist, lets create"
+    gh release create ${NEXT_TAG} --prerelease --draft --repo ${REPO} --title "Release ${NEXT_TAG}" --notes "${RELEASE_NOTES}" --target ${GIT_SHA}
+    exit 0
+  fi
+  echo "echo shouldnt get here"
+  exit 0
+elif [ "${GH_PRE_RELEASE_UPLOAD:-}" = true ]; then
+
+  echo "Uploading pre-release ${NEXT_TAG}"
+  echo "get latest Draft pre-release"
+  if [[ ${CIRRUS_CI:-} == 'true' && ${CIRRUS_BRANCH:-} != 'master' ]]; then
+    echo "Not on master in CIRRUS_CI, skipping pre-release upload"
+    exit 0
+  fi
+  if [[ ${CIRRUS_CI:-} == 'true' ]]; then
+    LATEST_DRAFT_PRERELEASE=$(gh release list --limit 1 --repo $REPO | grep Draft | awk '{print $2}')
+    NEXT_TAG=${LATEST_DRAFT_PRERELEASE}
+  fi
+  gh release upload ${NEXT_TAG} prebuilds/*.tar.gz --repo ${REPO} --clobber
+  exit 0
 fi
 
-# Setup git for github actions
-git config user.email "${GITHUB_ACTOR}@users.noreply.github.com"
-git config user.name "${GITHUB_ACTOR}"
+if [[ ${CI:-} == 'true' ]]; then
+  require_env_var NODE_AUTH_TOKEN
+fi
 
-# It's easier to read the release notes 
-# from the standard version tool before it runs
-RELEASE_NOTES="$(npx standard-version --dry-run | awk 'BEGIN { flag=0 } /^---$/ { if (flag == 0) { flag=1 } else { flag=2 }; next } flag == 1')"
-# Don't release if there are no changes
-if [ "$(echo "$RELEASE_NOTES" | wc -l)" -eq 1 ] ; then
+if [[ ${RUNNER_OS:-} == 'Windows' ]]; then
+  ONLY_DOWNLOAD_PACT_FOR_WINDOWS=true
+fi
+
+if [ ! -z "${ONLY_DOWNLOAD_PACT_FOR_WINDOWS:-}" ]; then
+  error "The environment variable ONLY_DOWNLOAD_PACT_FOR_WINDOWS is set"
+  echo "   - you cannot run a release with this variable set"
+  echo "     as only the windows binaries would be included"
+  echo "*** STOPPING RELEASE PROCESS ***"
+  exit 1
+fi
+
+FETCH_ASSETS=true ./script/ci/check-release-libs.sh --fetch-assets -t "${NEXT_TAG}"
+"$SCRIPT_DIR"/download-standalone-and-test.sh
+
+if [[ ${DRY_RUN:-} == 'true' ]]; then
+  VERSION=$NEXT_VERSION
+  TAG=$NEXT_TAG
+  echo "version=$VERSION" >> $GITHUB_OUTPUT
+else
+  # Don't release if there are no changes
+  if [ "$(echo "$RELEASE_NOTES" | wc -l)" -eq 1 ]; then
     error "This release would have no release notes. Does it include changes?"
     echo "   - You must have at least one fix / feat commit to generate release notes"
     echo "*** STOPPING RELEASE PROCESS ***"
     exit 1
+  fi
+  # This is github actions' method for emitting multi-line values
+  RELEASE_NOTES="${RELEASE_NOTES//'%'/'%25'}"
+  RELEASE_NOTES="${RELEASE_NOTES//$'\n'/'%0A'}"
+  RELEASE_NOTES="${RELEASE_NOTES//$'\r'/'%0D'}"
+  echo "notes=$RELEASE_NOTES" >> $GITHUB_OUTPUT
+  npm run release
+  # Emit version to next step
+  VERSION="$("$SCRIPT_DIR/lib/get-version.sh")"
+  TAG="v${VERSION}"
+  echo "version=$VERSION" >> $GITHUB_OUTPUT
 fi
-# This is github actions' method for emitting multi-line values
-RELEASE_NOTES="${RELEASE_NOTES//'%'/'%25'}"
-RELEASE_NOTES="${RELEASE_NOTES//$'\n'/'%0A'}"
-RELEASE_NOTES="${RELEASE_NOTES//$'\r'/'%0D'}"
-echo "::set-output name=notes::$RELEASE_NOTES"
-
-"$SCRIPT_DIR"/build-and-test.sh
-npm run release
-
-# Emit version to next step
-VERSION="$("$SCRIPT_DIR/lib/get-version.sh")"
-echo "::set-output name=version::$VERSION"
 
 "$SCRIPT_DIR"/lib/publish.sh
 
 # Push the new commit back to the repo.
-git push --follow-tags
+# and update GH pre-release to released
+if [[ ${DRY_RUN:-} == 'true' ]]; then
+  echo "not pushing tags as in dry run mode"
+else
+  git push --follow-tags
+  gh release edit ${TAG} --title "Release ${TAG}" --notes ${RELEASE_NOTES} --draft=false --prerelease=false --target ${GIT_SHA}
+fi
diff --git a/script/ci/unpack-and-test.sh b/script/ci/unpack-and-test.sh
new file mode 100755
index 00000000..1f7fdd1b
--- /dev/null
+++ b/script/ci/unpack-and-test.sh
@@ -0,0 +1,13 @@
+#!/bin/bash -eu
+set -e # This needs to be here for windows bash, which doesn't read the #! line above
+set -u
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")"; pwd)" # Figure out where the script is running
+. "$SCRIPT_DIR"/../lib/robust-bash.sh
+
+ls -1
+ls -1 artifact
+mkdir -p prebuilds
+mv artifact*/*.tar.gz . || echo "no mac prebuilds"
+ls *.gz |xargs -n1 tar -xzf
+./script/ci/download-standalone-and-test.sh
\ No newline at end of file
diff --git a/script/download-standalone.sh b/script/download-standalone.sh
new file mode 100755
index 00000000..44dff19b
--- /dev/null
+++ b/script/download-standalone.sh
@@ -0,0 +1,5 @@
+#!/bin/bash -eu
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")"; pwd)" # Figure out where the script is running
+
+. "${SCRIPT_DIR}/lib/export-binary-versions.sh"
+"${SCRIPT_DIR}/lib/download-standalone.sh"
\ No newline at end of file
diff --git a/script/lib/download-ffi.sh b/script/lib/download-ffi.sh
index b0b37461..c5559acf 100755
--- a/script/lib/download-ffi.sh
+++ b/script/lib/download-ffi.sh
@@ -55,6 +55,10 @@ function download_ffi {
   gunzip "$DOWNLOAD_LOCATION"
 }
 
+if [[ ${RUNNER_OS:-} == 'Windows' ]]; then
+  ONLY_DOWNLOAD_PACT_FOR_WINDOWS=true
+fi
+
 if [ -z "${ONLY_DOWNLOAD_PACT_FOR_WINDOWS:-}" ]; then
   download_ffi "linux-x86_64.so.gz" "lib" "libpact_ffi.so.gz"
   download_ffi "linux-aarch64.so.gz" "lib" "linuxaarch64/libpact_ffi.so.gz"
diff --git a/script/lib/download-standalone.sh b/script/lib/download-standalone.sh
index 0c8ee251..00daf45b 100755
--- a/script/lib/download-standalone.sh
+++ b/script/lib/download-standalone.sh
@@ -9,7 +9,7 @@ require_binary curl
 require_binary unzip
 require_env_var STANDALONE_VERSION
 
-BASEURL=https://github.com/you54f/pact-ruby-standalone/releases/download
+BASEURL=https://github.com/pact-foundation/pact-ruby-standalone/releases/download
 STANDALONE_DIR="${LIB_DIR}/../../standalone"
 
 function download_standalone {
@@ -49,6 +49,10 @@ fi
 
 download_standalone "pact-${STANDALONE_VERSION}-windows-x86_64.zip"            "windows-x64-${STANDALONE_VERSION}.zip"
 
+if [[ ${RUNNER_OS:-} == 'Windows' ]]; then
+  ONLY_DOWNLOAD_PACT_FOR_WINDOWS=true
+fi
+
 if [ -z "${ONLY_DOWNLOAD_PACT_FOR_WINDOWS:-}" ]; then
   download_standalone "pact-${STANDALONE_VERSION}-osx-x86_64.tar.gz"           "darwin-x64-${STANDALONE_VERSION}.tar.gz"
   download_standalone "pact-${STANDALONE_VERSION}-osx-arm64.tar.gz"           "darwin-arm64-${STANDALONE_VERSION}.tar.gz"
diff --git a/src/ffi/index.ts b/src/ffi/index.ts
index 8c629ae6..419c8fa3 100644
--- a/src/ffi/index.ts
+++ b/src/ffi/index.ts
@@ -1,13 +1,62 @@
-import path from 'path';
+import path from 'node:path';
 import logger, { DEFAULT_LOG_LEVEL } from '../logger';
 import { LogLevel } from '../logger/types';
 import { Ffi } from './types';
 
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const ffiLib: Ffi = require('node-gyp-build')(path.join(__dirname, '..', '..'));
-
 export const PACT_FFI_VERSION = '0.4.0';
 
+// supported prebuilds
+// darwin-arm64
+// darwin-x64
+// linux-arm64
+// linux-x64
+// win32-x64
+
+const supportedPlatforms = [
+  'darwin-arm64',
+  'darwin-x64',
+  'linux-arm64',
+  'linux-x64',
+  'win32-x64',
+];
+const platform = `${process.platform}-${process.arch}`;
+const supportedPlatformsMessage = `Supported platforms are: \n\n - ${supportedPlatforms.join(
+  '\n - '
+)}\n`;
+const detectedMessage = `We detected your platform as: \n\n - ${platform}\n`;
+
+if (!supportedPlatforms.includes(platform)) {
+  console.log(supportedPlatformsMessage);
+  console.log(detectedMessage);
+  console.error(`Unsupported platform: ${platform}`);
+  process.exit(1);
+}
+
+const loadPath =
+  process.env['PACT_NAPI_NODE_LOCATION'] ||
+  path.join(__dirname, '..', '..', 'prebuilds', platform, 'node.napi.node');
+const loadPathMessage = `: loading native module from: \n\n - ${path.resolve(
+  loadPath
+)} ${
+  process.env['PACT_NAPI_NODE_LOCATION']
+    ? '\n - source: PACT_NAPI_NODE_LOCATION\n'
+    : '\n   source: prebuilds \n\n - You can override via PACT_NAPI_NODE_LOCATION\n'
+}`;
+let ffiLib: Ffi;
+const importedLib = import(loadPath);
+importedLib
+  .then((lib) => {
+    ffiLib = lib.default;
+    console.log(`Success ${loadPathMessage}`);
+  })
+  .catch((error) => {
+    console.log(supportedPlatformsMessage);
+    console.log(detectedMessage);
+    console.log(`Failed ${loadPathMessage}`);
+    console.error(`Failed to load native module: ${error}`);
+    process.exit(1);
+  });
+
 let ffi: typeof ffiLib;
 let ffiLogLevel: LogLevel;
 
diff --git a/standalone/install.ts b/standalone/install.ts
index 5f13eb88..a7712640 100644
--- a/standalone/install.ts
+++ b/standalone/install.ts
@@ -1,7 +1,7 @@
 import chalk = require('chalk');
 
 // Get latest version from https://github.com/pact-foundation/pact-ruby-standalone/releases
-export const PACT_STANDALONE_VERSION = '2.2.1';
+export const PACT_STANDALONE_VERSION = '2.0.1';
 
 function makeError(msg: string): Error {
   return new Error(chalk.red(`Error while locating pact binary: ${msg}`));
diff --git a/test/consumer.integration.spec.ts b/test/consumer.integration.spec.ts
index f41dedb3..3edc3fff 100644
--- a/test/consumer.integration.spec.ts
+++ b/test/consumer.integration.spec.ts
@@ -23,10 +23,15 @@ const HOST = '127.0.0.1';
 const isWin = process.platform === 'win32';
 const isLinux = process.platform === 'linux';
 const isDarwinArm64 = process.platform === 'darwin' && process.arch === 'arm64';
+const isDarwinX64 = process.platform === 'darwin' && process.arch === 'x64';
 const isLinuxArm64 = process.platform === 'linux' && process.arch === 'arm64';
 const isCirrusCi = process.env['CIRRUS_CI'] === 'true';
 const usesOctetStream =
-  isLinuxArm64 || isWin || isDarwinArm64 || (isCirrusCi && isLinux);
+  isLinuxArm64 ||
+  isWin ||
+  isDarwinArm64 ||
+  (isCirrusCi && isLinux) ||
+  (isCirrusCi && isDarwinX64);
 
 describe('FFI integration test for the HTTP Consumer API', () => {
   setLogLevel('trace');
@@ -39,7 +44,7 @@ describe('FFI integration test for the HTTP Consumer API', () => {
     value,
   });
 
-  describe('with JSON data', () => {
+  describe.skip('with JSON data', () => {
     beforeEach(() => {
       pact = makeConsumerPact(
         'foo-consumer',