diff --git a/.github/workflows/parsemsg.yml b/.github/workflows/parsemsg.yml
deleted file mode 100644
index 7e7b538d..00000000
--- a/.github/workflows/parsemsg.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-name: GitHub Actions Demo
-run-name: ${{ github.actor }} is testing out GitHub Actions 🚀
-on: [push]
-jobs:
-  Explore-GitHub-Actions:
-    runs-on: ubuntu-latest
-    steps:
-
-      - name: Set tags env variables.
-        run: |
-          # Set "checking" variable to false by default.
-          echo "has_tags=false" >> $GITHUB_ENV
-          # Get your last commit message, not the merge commit.
-          text=$(git log -1 --no-merges --pretty=%B)
-          # Read the commit message into an array split by "#".
-          readarray -d "#" -t commit_message <<< "$text"
-          # Sanity check.
-          echo "the tags are: ${commit_message[1]}"
-          # Add tags and overwrite "checking" variable to true if there are tags.
-          if [[ "${commit_message[1]}" == *"@"*  ]]; then
-            echo "has_tags=true" >> $GITHUB_ENV
-            echo "spec_tags=${commit_message[1]}" >> $GITHUB_ENV
-          fi
-
diff --git a/.github/workflows/wheeltest.yml b/.github/workflows/wheeltest.yml
index 6fb55d64..76f36eb3 100644
--- a/.github/workflows/wheeltest.yml
+++ b/.github/workflows/wheeltest.yml
@@ -3,54 +3,55 @@ name: Test wheel file build
 on: [push, pull_request]
 
 jobs:
-  build_wheels:
-    name: Build wheels on ${{ matrix.os }} for Python ${{ matrix.pyver }}
- #   if: github.event_name == 'pull_request'
+
+  build_wheels_pypy:
+    name: Build PyPy wheels on ${{ matrix.os }} 
+#    if: github.event_name == 'pull_request'
+    needs: run-all-tests
     runs-on: ${{ matrix.os }}
     continue-on-error: true
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-13, macos-14] 
-        pyver: [cp311]
+        os: [ubuntu-latest, macos-13, macos-14] 
 
     steps:
-      - name: Checks out repo
-        uses: actions/checkout@v4
-
-      - name: Symlink gfortran for x86 macOS
-        if: matrix.os == 'macos-13'
+      - name: Set tags env variables.
         run: |
-          # make sure gfortran is available
-          ln -s /usr/local/bin/gfortran-13 /usr/local/bin/gfortran
-          gfortran --version
+          # Set "checking" variable to false by default.
+          echo "has_tags=false" >> $GITHUB_ENV
+          # Get your last commit message, not the merge commit.
+          text=$(git log -1 --no-merges --pretty=%B)
+          # Read the commit message into an array split by "#".
+          readarray -d "#" -t commit_message <<< "$text"
+          # Sanity check.
+          echo "the tags are: ${commit_message[1]}"
+          # Add tags and overwrite "checking" variable to true if there are tags.
+          if [[ "${commit_message[1]}" == *"@"*  ]]; then
+            echo "has_tags=true" >> $GITHUB_ENV
+            echo "spec_tags=${commit_message[1]}" >> $GITHUB_ENV
+          fi
 
-      - name: Symlink gfortran for ARM macOS
-        if: matrix.os == 'macos-14'
-        run: |
-          # make sure gfortran is available
-          ln -s /opt/homebrew/bin/gfortran-13 /opt/homebrew/bin/gfortran
-          gfortran --version
 
-      - name: Install libomp using brew
+      - name: Checks out repo
+        uses: actions/checkout@v4
+
+      - name: Set up macOS-specific paths and libraries
+        if: (matrix.os == 'macos-13') || (matrix.os == 'macos-14')
         run: |
-            echo $HOMEBREW_PREFIX
+            # Symlink the correct gfortran compiler 
+            ln -s $(brew --prefix)/bin/gfortran-13 $(brew --prefix)/bin/gfortran
+            # Install OMP libraries
             brew install libomp
+            # Link environments to env for later us with cibuildwheel
             echo "LIBOMPPATH=$(brew --prefix libomp)" >> $GITHUB_ENV
-            env
-
-      - name: Store clang location as environment variable
-        run: |
             echo "LLVMCLANG=$(brew --prefix llvm@15)" >> $GITHUB_ENV
 
-    
       - name: Build wheels
-        if: ${{ !(matrix.os == 'macos-14' && matrix.pyver == 'cp37') }}
         uses: pypa/cibuildwheel@v2.17.0
         env:
-            CIBW_BUILD: ${{matrix.pyver}}-*
+            CIBW_BUILD: pp*
             CIBW_SKIP: "pp37-* cp37-* *-win32 *-manylinux_i686"
-            CIBW_ARCHS_LINUX: auto
             CIBW_BEFORE_BUILD: pip install numpy 'forthon>=0.10.7' 'build<0.10.0'
             CC: ${{ env.LLVMCLANG }}/bin/clang
             LDFLAGS: "-L${{env.LIBOMPPATH }}/lib"
@@ -58,5 +59,9 @@ jobs:
       - name: Upload Artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: cibw-wheels-${{ matrix.os }}-${{ matrix.pyver }}-${{ strategy.job-index }}
+          name: cibw-wheels-pyp-${{ matrix.os }}-${{ strategy.job-index }}
           path: ./wheelhouse/*.whl
+
+
+
+