diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 5edd5ac1c..ccc88ff82 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -146,6 +146,31 @@ jobs:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_PUBLISH_TOKEN }}
         run: npm publish --access public
 
+  sdk-dotnet:
+    runs-on: ubuntu-latest
+    needs:
+      - publish-docker
+      - prepare
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Setup Dotnet
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: '6'
+      - name: Bump version
+        env:
+          TAG: ${{ needs.prepare.outputs.tag }}
+        run: sed -i "s/<PackageVersion>.*<\/PackageVersion>/<PackageVersion>${TAG}<\/PackageVersion>/g" sdk-dotnet/LittleHorse.Sdk/LittleHorse.Sdk.csproj
+      - name: Build Project
+        run: dotnet build sdk-dotnet/LittleHorse.Sdk/LittleHorse.Sdk.csproj
+      - name: Create Package
+        run: dotnet pack --configuration Release sdk-dotnet/LittleHorse.Sdk/LittleHorse.Sdk.csproj
+      - name: Publish Package to nuget.org
+        run: dotnet nuget push sdk-dotnet/LittleHorse.Sdk/bin/Release/*.nupkg -k $NUGET_AUTH_TOKEN -s https://api.nuget.org/v3/index.json
+        env:
+          NUGET_AUTH_TOKEN: ${{ secrets.NUGET_TOKEN }}
+
   lhctl:
     runs-on: ubuntu-latest
     steps:
@@ -174,6 +199,7 @@ jobs:
       - sdk-java
       - sdk-python
       - sdk-js
+      - sdk-dotnet
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index e523db727..7e834f9dd 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -133,3 +133,18 @@ jobs:
         run: |
           npm ci
           npm run test
+
+  tests-sdk-dotnet:
+    if: ${{ !contains(github.event.head_commit.message, '[skip main]') }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Setup Dotnet
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: '6'
+      - name: Build Project
+        run: dotnet build sdk-dotnet/LittleHorse.Sdk/LittleHorse.Sdk.csproj
+      - name: Test Dotnet
+        run: dotnet test sdk-dotnet/LittleHorse.Sdk.Tests
\ No newline at end of file
diff --git a/dashboard/package-lock.json b/dashboard/package-lock.json
index c0685758c..89739f61e 100644
--- a/dashboard/package-lock.json
+++ b/dashboard/package-lock.json
@@ -19,11 +19,11 @@
         "@radix-ui/react-separator": "^1.1.0",
         "@radix-ui/react-slot": "^1.1.0",
         "@radix-ui/react-switch": "^1.1.1",
-        "@radix-ui/react-tooltip": "^1.1.6",
         "@tanstack/react-query": "^5.37.1",
         "class-variance-authority": "^0.7.0",
         "clsx": "^2.1.1",
         "cmdk": "^1.0.0",
+        "cron-parser": "^4.9.0",
         "dagre": "^0.8.5",
         "littlehorse-client": "file://../sdk-js",
         "lucide-react": "^0.379.0",
@@ -3663,255 +3663,6 @@
         }
       }
     },
-    "node_modules/@radix-ui/react-tooltip": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-tooltip/-/react-tooltip-1.1.6.tgz",
-      "integrity": "sha512-TLB5D8QLExS1uDn7+wH/bjEmRurNMTzNrtq7IjaS4kjion9NtzsTGkvR5+i7yc9q01Pi2KMM2cN3f8UG4IvvXA==",
-      "license": "MIT",
-      "dependencies": {
-        "@radix-ui/primitive": "1.1.1",
-        "@radix-ui/react-compose-refs": "1.1.1",
-        "@radix-ui/react-context": "1.1.1",
-        "@radix-ui/react-dismissable-layer": "1.1.3",
-        "@radix-ui/react-id": "1.1.0",
-        "@radix-ui/react-popper": "1.2.1",
-        "@radix-ui/react-portal": "1.1.3",
-        "@radix-ui/react-presence": "1.1.2",
-        "@radix-ui/react-primitive": "2.0.1",
-        "@radix-ui/react-slot": "1.1.1",
-        "@radix-ui/react-use-controllable-state": "1.1.0",
-        "@radix-ui/react-visually-hidden": "1.1.1"
-      },
-      "peerDependencies": {
-        "@types/react": "*",
-        "@types/react-dom": "*",
-        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
-        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
-      },
-      "peerDependenciesMeta": {
-        "@types/react": {
-          "optional": true
-        },
-        "@types/react-dom": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@radix-ui/react-tooltip/node_modules/@radix-ui/primitive": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@radix-ui/primitive/-/primitive-1.1.1.tgz",
-      "integrity": "sha512-SJ31y+Q/zAyShtXJc8x83i9TYdbAfHZ++tUZnvjJJqFjzsdUnKsxPL6IEtBlxKkU7yzer//GQtZSV4GbldL3YA==",
-      "license": "MIT"
-    },
-    "node_modules/@radix-ui/react-tooltip/node_modules/@radix-ui/react-arrow": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-arrow/-/react-arrow-1.1.1.tgz",
-      "integrity": "sha512-NaVpZfmv8SKeZbn4ijN2V3jlHA9ngBG16VnIIm22nUR0Yk8KUALyBxT3KYEUnNuch9sTE8UTsS3whzBgKOL30w==",
-      "license": "MIT",
-      "dependencies": {
-        "@radix-ui/react-primitive": "2.0.1"
-      },
-      "peerDependencies": {
-        "@types/react": "*",
-        "@types/react-dom": "*",
-        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
-        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
-      },
-      "peerDependenciesMeta": {
-        "@types/react": {
-          "optional": true
-        },
-        "@types/react-dom": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@radix-ui/react-tooltip/node_modules/@radix-ui/react-compose-refs": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-compose-refs/-/react-compose-refs-1.1.1.tgz",
-      "integrity": "sha512-Y9VzoRDSJtgFMUCoiZBDVo084VQ5hfpXxVE+NgkdNsjiDBByiImMZKKhxMwCbdHvhlENG6a833CbFkOQvTricw==",
-      "license": "MIT",
-      "peerDependencies": {
-        "@types/react": "*",
-        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
-      },
-      "peerDependenciesMeta": {
-        "@types/react": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@radix-ui/react-tooltip/node_modules/@radix-ui/react-dismissable-layer": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-dismissable-layer/-/react-dismissable-layer-1.1.3.tgz",
-      "integrity": "sha512-onrWn/72lQoEucDmJnr8uczSNTujT0vJnA/X5+3AkChVPowr8n1yvIKIabhWyMQeMvvmdpsvcyDqx3X1LEXCPg==",
-      "license": "MIT",
-      "dependencies": {
-        "@radix-ui/primitive": "1.1.1",
-        "@radix-ui/react-compose-refs": "1.1.1",
-        "@radix-ui/react-primitive": "2.0.1",
-        "@radix-ui/react-use-callback-ref": "1.1.0",
-        "@radix-ui/react-use-escape-keydown": "1.1.0"
-      },
-      "peerDependencies": {
-        "@types/react": "*",
-        "@types/react-dom": "*",
-        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
-        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
-      },
-      "peerDependenciesMeta": {
-        "@types/react": {
-          "optional": true
-        },
-        "@types/react-dom": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@radix-ui/react-tooltip/node_modules/@radix-ui/react-popper": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-popper/-/react-popper-1.2.1.tgz",
-      "integrity": "sha512-3kn5Me69L+jv82EKRuQCXdYyf1DqHwD2U/sxoNgBGCB7K9TRc3bQamQ+5EPM9EvyPdli0W41sROd+ZU1dTCztw==",
-      "license": "MIT",
-      "dependencies": {
-        "@floating-ui/react-dom": "^2.0.0",
-        "@radix-ui/react-arrow": "1.1.1",
-        "@radix-ui/react-compose-refs": "1.1.1",
-        "@radix-ui/react-context": "1.1.1",
-        "@radix-ui/react-primitive": "2.0.1",
-        "@radix-ui/react-use-callback-ref": "1.1.0",
-        "@radix-ui/react-use-layout-effect": "1.1.0",
-        "@radix-ui/react-use-rect": "1.1.0",
-        "@radix-ui/react-use-size": "1.1.0",
-        "@radix-ui/rect": "1.1.0"
-      },
-      "peerDependencies": {
-        "@types/react": "*",
-        "@types/react-dom": "*",
-        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
-        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
-      },
-      "peerDependenciesMeta": {
-        "@types/react": {
-          "optional": true
-        },
-        "@types/react-dom": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@radix-ui/react-tooltip/node_modules/@radix-ui/react-portal": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-portal/-/react-portal-1.1.3.tgz",
-      "integrity": "sha512-NciRqhXnGojhT93RPyDaMPfLH3ZSl4jjIFbZQ1b/vxvZEdHsBZ49wP9w8L3HzUQwep01LcWtkUvm0OVB5JAHTw==",
-      "license": "MIT",
-      "dependencies": {
-        "@radix-ui/react-primitive": "2.0.1",
-        "@radix-ui/react-use-layout-effect": "1.1.0"
-      },
-      "peerDependencies": {
-        "@types/react": "*",
-        "@types/react-dom": "*",
-        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
-        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
-      },
-      "peerDependenciesMeta": {
-        "@types/react": {
-          "optional": true
-        },
-        "@types/react-dom": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@radix-ui/react-tooltip/node_modules/@radix-ui/react-presence": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-presence/-/react-presence-1.1.2.tgz",
-      "integrity": "sha512-18TFr80t5EVgL9x1SwF/YGtfG+l0BS0PRAlCWBDoBEiDQjeKgnNZRVJp/oVBl24sr3Gbfwc/Qpj4OcWTQMsAEg==",
-      "license": "MIT",
-      "dependencies": {
-        "@radix-ui/react-compose-refs": "1.1.1",
-        "@radix-ui/react-use-layout-effect": "1.1.0"
-      },
-      "peerDependencies": {
-        "@types/react": "*",
-        "@types/react-dom": "*",
-        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
-        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
-      },
-      "peerDependenciesMeta": {
-        "@types/react": {
-          "optional": true
-        },
-        "@types/react-dom": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@radix-ui/react-tooltip/node_modules/@radix-ui/react-primitive": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.0.1.tgz",
-      "integrity": "sha512-sHCWTtxwNn3L3fH8qAfnF3WbUZycW93SM1j3NFDzXBiz8D6F5UTTy8G1+WFEaiCdvCVRJWj6N2R4Xq6HdiHmDg==",
-      "license": "MIT",
-      "dependencies": {
-        "@radix-ui/react-slot": "1.1.1"
-      },
-      "peerDependencies": {
-        "@types/react": "*",
-        "@types/react-dom": "*",
-        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
-        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
-      },
-      "peerDependenciesMeta": {
-        "@types/react": {
-          "optional": true
-        },
-        "@types/react-dom": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@radix-ui/react-tooltip/node_modules/@radix-ui/react-slot": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.1.1.tgz",
-      "integrity": "sha512-RApLLOcINYJA+dMVbOju7MYv1Mb2EBp2nH4HdDzXTSyaR5optlm6Otrz1euW3HbdOR8UmmFK06TD+A9frYWv+g==",
-      "license": "MIT",
-      "dependencies": {
-        "@radix-ui/react-compose-refs": "1.1.1"
-      },
-      "peerDependencies": {
-        "@types/react": "*",
-        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
-      },
-      "peerDependenciesMeta": {
-        "@types/react": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@radix-ui/react-tooltip/node_modules/@radix-ui/react-visually-hidden": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-visually-hidden/-/react-visually-hidden-1.1.1.tgz",
-      "integrity": "sha512-vVfA2IZ9q/J+gEamvj761Oq1FpWgCDaNOOIfbPVp2MVPLEomUr5+Vf7kJGwQ24YxZSlQVar7Bes8kyTo5Dshpg==",
-      "license": "MIT",
-      "dependencies": {
-        "@radix-ui/react-primitive": "2.0.1"
-      },
-      "peerDependencies": {
-        "@types/react": "*",
-        "@types/react-dom": "*",
-        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
-        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
-      },
-      "peerDependenciesMeta": {
-        "@types/react": {
-          "optional": true
-        },
-        "@types/react-dom": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/@radix-ui/react-use-callback-ref": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@radix-ui/react-use-callback-ref/-/react-use-callback-ref-1.1.0.tgz",
@@ -9853,6 +9604,18 @@
       "devOptional": true,
       "license": "MIT"
     },
+    "node_modules/cron-parser": {
+      "version": "4.9.0",
+      "resolved": "https://registry.npmjs.org/cron-parser/-/cron-parser-4.9.0.tgz",
+      "integrity": "sha512-p0SaNjrHOnQeR8/VnfGbmg9te2kfyYSQ7Sc/j/6DtPL3JQvKxmjO9TSjNFpujqV3vEYYBvNNvXSxzyksBWAx1Q==",
+      "license": "MIT",
+      "dependencies": {
+        "luxon": "^3.2.1"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
     "node_modules/cross-spawn": {
       "version": "7.0.6",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
@@ -17691,6 +17454,15 @@
         "react": "^16.5.1 || ^17.0.0 || ^18.0.0"
       }
     },
+    "node_modules/luxon": {
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.5.0.tgz",
+      "integrity": "sha512-rh+Zjr6DNfUYR3bPwJEnuwDdqMbxZW7LOQfUN4B54+Cl+0o5zaU9RJ6bcidfDtC1cWCZXQ+nvX8bf6bAji37QQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      }
+    },
     "node_modules/make-dir": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz",
diff --git a/dashboard/package.json b/dashboard/package.json
index ad84da305..0a989b96b 100644
--- a/dashboard/package.json
+++ b/dashboard/package.json
@@ -17,16 +17,16 @@
     "@radix-ui/react-dialog": "^1.1.2",
     "@radix-ui/react-dropdown-menu": "^2.1.2",
     "@radix-ui/react-label": "^2.1.0",
-    "@radix-ui/react-scroll-area": "^1.2.2",
     "@radix-ui/react-select": "^2.0.0",
     "@radix-ui/react-separator": "^1.1.0",
     "@radix-ui/react-slot": "^1.1.0",
     "@radix-ui/react-switch": "^1.1.1",
-    "@radix-ui/react-tooltip": "^1.1.6",
+    "@radix-ui/react-tabs": "^1.1.1",
     "@tanstack/react-query": "^5.37.1",
     "class-variance-authority": "^0.7.0",
     "clsx": "^2.1.1",
     "cmdk": "^1.0.0",
+    "cron-parser": "^4.9.0",
     "dagre": "^0.8.5",
     "littlehorse-client": "file://../sdk-js",
     "lucide-react": "^0.379.0",
diff --git a/dashboard/src/app/[tenantId]/(diagram)/wfSpec/[...props]/actions/ScheduleWfRun.ts b/dashboard/src/app/[tenantId]/(diagram)/wfSpec/[...props]/actions/ScheduleWfRun.ts
deleted file mode 100644
index cd2def909..000000000
--- a/dashboard/src/app/[tenantId]/(diagram)/wfSpec/[...props]/actions/ScheduleWfRun.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-'use server'
-import { lhClient } from '@/app/lhClient'
-import { WithTenant } from '@/types'
-import { ScheduleWfRequest } from 'littlehorse-client/proto'
-import { ScheduledWfRun } from '../../../../../../../../sdk-js/dist/proto/scheduled_wf_run'
-
-export const ScheduleWfRun = async ({
-  wfSpecName,
-  tenantId,
-  majorVersion,
-  revision,
-  parentWfRunId,
-  id,
-  variables,
-  cronExpression,
-}: ScheduleWfRequest & WithTenant): Promise<ScheduledWfRun> => {
-  const client = await lhClient({ tenantId })
-  return client.scheduleWf({ wfSpecName, majorVersion, revision, parentWfRunId, id, variables, cronExpression })
-}
diff --git a/dashboard/src/app/[tenantId]/(diagram)/wfSpec/[...props]/actions/getScheduleWfSpec.ts b/dashboard/src/app/[tenantId]/(diagram)/wfSpec/[...props]/actions/getScheduleWfSpec.ts
index 347204681..aaceb50f3 100644
--- a/dashboard/src/app/[tenantId]/(diagram)/wfSpec/[...props]/actions/getScheduleWfSpec.ts
+++ b/dashboard/src/app/[tenantId]/(diagram)/wfSpec/[...props]/actions/getScheduleWfSpec.ts
@@ -1,20 +1,30 @@
 'use server'
+
 import { lhClient } from '@/app/lhClient'
 import { WithTenant } from '@/types'
-import { ScheduledWfRunIdList } from 'littlehorse-client/proto'
+import { ScheduledWfRun } from 'littlehorse-client/proto'
 
 type GetWfSpecProps = {
   name: string
   version: string
 } & WithTenant
 
-export const getScheduleWfSpec = async ({ name, version, tenantId }: GetWfSpecProps): Promise<ScheduledWfRunIdList> => {
+export const getScheduleWfSpec = async ({ name, version, tenantId }: GetWfSpecProps): Promise<ScheduledWfRun[]> => {
   const client = await lhClient({ tenantId })
 
   const [majorVersion, revision] = version.split('.')
-  return client.searchScheduledWfRun({
-    wfSpecName: name,
-    majorVersion: parseInt(majorVersion) || 0,
-    revision: parseInt(revision) | 0,
-  })
+
+  return Promise.all(
+    (
+      await client.searchScheduledWfRun({
+        wfSpecName: name,
+        majorVersion: parseInt(majorVersion) || 0,
+        revision: parseInt(revision) || 0,
+      })
+    ).results.map(async scheduledWfRun => {
+      return await client.getScheduledWfRun({
+        id: scheduledWfRun.id,
+      })
+    })
+  )
 }
diff --git a/dashboard/src/app/[tenantId]/(diagram)/wfSpec/[...props]/components/ScheduledWfRuns.tsx b/dashboard/src/app/[tenantId]/(diagram)/wfSpec/[...props]/components/ScheduledWfRuns.tsx
new file mode 100644
index 000000000..17c3355d4
--- /dev/null
+++ b/dashboard/src/app/[tenantId]/(diagram)/wfSpec/[...props]/components/ScheduledWfRuns.tsx
@@ -0,0 +1,124 @@
+'use client'
+
+import { ScheduledWfRunIdList, WfSpec } from 'littlehorse-client/proto'
+import { getScheduleWfSpec } from '../actions/getScheduleWfSpec'
+import { SelectionLink } from '@/app/[tenantId]/components/SelectionLink'
+import { ScheduledWfRun } from 'littlehorse-client/proto'
+import { FUTURE_TIME_RANGES, SEARCH_DEFAULT_LIMIT, TimeRange } from '@/app/constants'
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select'
+import { ClockIcon } from 'lucide-react'
+import { useEffect, useState, useMemo } from 'react'
+import { getCronTimeWindow } from '@/app/utils/getCronTimeWindow'
+import { parseExpression } from 'cron-parser'
+import { utcToLocalDateTime } from '@/app/utils'
+import { SearchVariableDialog } from './SearchVariableDialog'
+import { SearchFooter } from '@/app/[tenantId]/components/SearchFooter'
+import { useParams, useSearchParams } from 'next/navigation'
+import { RefreshCwIcon } from 'lucide-react'
+
+export const ScheduledWfRuns = (spec: WfSpec) => {
+  const [currentWindow, setWindow] = useState<TimeRange>(-1)
+  const [isLoading, setIsLoading] = useState(true)
+  const [error, setError] = useState<Error | null>(null)
+  const [scheduledWfRuns, setScheduledWfRuns] = useState<ScheduledWfRun[]>([])
+  const tenantId = useParams().tenantId as string
+
+  useEffect(() => {
+    let isMounted = true
+
+    const fetchScheduledWfRuns = async () => {
+      try {
+        setIsLoading(true)
+        setError(null)
+        const runs = await getScheduleWfSpec({
+          name: spec.id!.name,
+          version: spec.id!.majorVersion + '.' + spec.id!.revision,
+          tenantId: tenantId,
+        })
+        if (isMounted) {
+          setScheduledWfRuns(runs)
+        }
+      } catch (err) {
+        if (isMounted) {
+          setError(err instanceof Error ? err : new Error('Failed to fetch scheduled runs'))
+        }
+      } finally {
+        if (isMounted) {
+          setIsLoading(false)
+        }
+      }
+    }
+
+    fetchScheduledWfRuns()
+
+    return () => {
+      isMounted = false
+    }
+  }, [spec.id, tenantId])
+
+  const filteredScheduledWfRuns = useMemo(
+    () =>
+      scheduledWfRuns
+        .filter(scheduledWfRun => {
+          if (currentWindow === -1) return true
+          const timeWindow = getCronTimeWindow(scheduledWfRun.cronExpression)
+          return timeWindow && timeWindow <= currentWindow
+        })
+        .sort((a, b) => {
+          const timeA = parseExpression(a.cronExpression).next().toDate().getTime()
+          const timeB = parseExpression(b.cronExpression).next().toDate().getTime()
+          return timeA - timeB
+        }),
+    [currentWindow, scheduledWfRuns]
+  )
+
+  if (isLoading) {
+    return (
+      <div className="flex min-h-[500px] items-center justify-center">
+        <RefreshCwIcon className="h-8 w-8 animate-spin text-blue-500" />
+      </div>
+    )
+  }
+
+  if (error) {
+    return (
+      <div className="flex min-h-[500px] flex-col items-center justify-center text-red-500">
+        <p>Error loading scheduled runs</p>
+        <p className="text-sm">{error.message}</p>
+      </div>
+    )
+  }
+
+  return (
+    <div className="flex min-h-[500px] flex-col">
+      <div className="flex gap-4">
+        <Select value={currentWindow.toString()} onValueChange={value => setWindow(parseInt(value) as TimeRange)}>
+          <SelectTrigger className="w-[150px] min-w-fit">
+            <div className="flex items-center gap-2">
+              <ClockIcon className="h-5 w-5 fill-none stroke-black" />
+              <SelectValue>{FUTURE_TIME_RANGES.find(time => time.value === currentWindow)?.label}</SelectValue>
+            </div>
+          </SelectTrigger>
+          <SelectContent>
+            {FUTURE_TIME_RANGES.map(time => (
+              <SelectItem key={time.value} value={time.value.toString()}>
+                {time.label}
+              </SelectItem>
+            ))}
+          </SelectContent>
+        </Select>
+      </div>
+      <div className="mt-4 flex flex-col">
+        {filteredScheduledWfRuns.map(scheduledWfRun => (
+          <SelectionLink aria-disabled key={scheduledWfRun.id?.id} href={undefined}>
+            <p>{scheduledWfRun.id?.id}</p>
+            <div className="flex items-center gap-2 rounded-md bg-gray-200 p-1 text-sm">
+              <ClockIcon className="h-5 w-5 fill-none stroke-black" />
+              <p>{utcToLocalDateTime(parseExpression(scheduledWfRun.cronExpression).next().toDate().toISOString())}</p>
+            </div>
+          </SelectionLink>
+        ))}
+      </div>
+    </div>
+  )
+}
diff --git a/dashboard/src/app/[tenantId]/(diagram)/wfSpec/[...props]/components/WfRuns.tsx b/dashboard/src/app/[tenantId]/(diagram)/wfSpec/[...props]/components/WfRuns.tsx
index 2099bd7b0..b20605f55 100644
--- a/dashboard/src/app/[tenantId]/(diagram)/wfSpec/[...props]/components/WfRuns.tsx
+++ b/dashboard/src/app/[tenantId]/(diagram)/wfSpec/[...props]/components/WfRuns.tsx
@@ -1,5 +1,4 @@
 'use client'
-import LinkWithTenant from '@/app/[tenantId]/components/LinkWithTenant'
 import { SearchFooter } from '@/app/[tenantId]/components/SearchFooter'
 import { SEARCH_DEFAULT_LIMIT, TIME_RANGES, TimeRange } from '@/app/constants'
 import { concatWfRunIds } from '@/app/utils'
@@ -10,6 +9,7 @@ import { useParams, useSearchParams } from 'next/navigation'
 import { FC, Fragment, useMemo, useState } from 'react'
 import { PaginatedWfRunIdList, searchWfRun } from '../actions/searchWfRun'
 import { WfRunsHeader } from './WfRunsHeader'
+import { SelectionLink } from '@/app/[tenantId]/components/SelectionLink'
 
 export const WfRuns: FC<WfSpec> = spec => {
   const searchParams = useSearchParams()
@@ -57,18 +57,13 @@ export const WfRuns: FC<WfSpec> = spec => {
           <RefreshCwIcon className="h-8 w-8 animate-spin text-blue-500" />
         </div>
       ) : (
-        <div className="flex min-h-[360px] flex-col gap-4">
+        <div className="flex min-h-[360px] flex-col">
           {data?.pages.map((page, i) => (
             <Fragment key={i}>
               {page.results.map(wfRunId => (
-                <div key={wfRunId.id}>
-                  <LinkWithTenant
-                    className="py-2 text-blue-500 hover:underline"
-                    href={`/wfRun/${concatWfRunIds(wfRunId)}`}
-                  >
-                    {wfRunId.id}
-                  </LinkWithTenant>
-                </div>
+                <SelectionLink key={wfRunId.id} href={`/wfRun/${concatWfRunIds(wfRunId)}`}>
+                  <p>{wfRunId.id}</p>
+                </SelectionLink>
               ))}
             </Fragment>
           ))}
diff --git a/dashboard/src/app/[tenantId]/(diagram)/wfSpec/[...props]/components/WfRunsHeader.tsx b/dashboard/src/app/[tenantId]/(diagram)/wfSpec/[...props]/components/WfRunsHeader.tsx
index 465f2e752..51f791acc 100644
--- a/dashboard/src/app/[tenantId]/(diagram)/wfSpec/[...props]/components/WfRunsHeader.tsx
+++ b/dashboard/src/app/[tenantId]/(diagram)/wfSpec/[...props]/components/WfRunsHeader.tsx
@@ -20,8 +20,6 @@ export const WfRunsHeader: FC<Props> = ({ spec, currentStatus, currentWindow, se
 
   return (
     <div className="mb-4 flex items-center justify-between">
-      <h2 className="text-2xl font-bold">WfRun Search</h2>
-
       <div className="flex items-center justify-between gap-4">
         <Select value={currentWindow.toString()} onValueChange={value => setWindow(parseInt(value) as TimeRange)}>
           <SelectTrigger className="w-[150px] min-w-fit">
diff --git a/dashboard/src/app/[tenantId]/(diagram)/wfSpec/[...props]/components/WfSpec.tsx b/dashboard/src/app/[tenantId]/(diagram)/wfSpec/[...props]/components/WfSpec.tsx
index 96c492d86..aecbd5ebe 100644
--- a/dashboard/src/app/[tenantId]/(diagram)/wfSpec/[...props]/components/WfSpec.tsx
+++ b/dashboard/src/app/[tenantId]/(diagram)/wfSpec/[...props]/components/WfSpec.tsx
@@ -2,16 +2,18 @@
 import { Navigation } from '@/app/[tenantId]/components/Navigation'
 import { ScheduledWfRunIdList, WfSpec as Spec } from 'littlehorse-client/proto'
 import { LucidePlayCircle } from 'lucide-react'
-import { FC, useCallback } from 'react'
+import { FC, useCallback, useState } from 'react'
 import { Diagram } from '../../../components/Diagram'
 import { useModal } from '../../../hooks/useModal'
 import { Details } from './Details'
 import { Thread } from './Thread'
 import { WfRuns } from './WfRuns'
+import { Tabs, TabsContent, TabsList, TabsTrigger } from '@/components/ui/tabs'
+import { ScheduledWfRuns } from './ScheduledWfRuns'
+import { ScheduledWfRun } from 'littlehorse-client/proto'
 
 type WfSpecProps = {
   spec: Spec
-  ScheduleWfSpec: ScheduledWfRunIdList
 }
 export const WfSpec: FC<WfSpecProps> = ({ spec }) => {
   const { setModal, setShowModal } = useModal()
@@ -37,7 +39,19 @@ export const WfSpec: FC<WfSpecProps> = ({ spec }) => {
         .map(name => (
           <Thread key={name} name={name} spec={spec.threadSpecs[name]} />
         ))}
-      <WfRuns {...spec} />
+
+      <Tabs defaultValue="runs">
+        <TabsList>
+          <TabsTrigger value="runs">WfRuns</TabsTrigger>
+          <TabsTrigger value="schedule">ScheduledWfRuns</TabsTrigger>
+        </TabsList>
+        <TabsContent value="runs">
+          <WfRuns {...spec} />
+        </TabsContent>
+        <TabsContent value="schedule">
+          <ScheduledWfRuns {...spec} />
+        </TabsContent>
+      </Tabs>
     </>
   )
 }
diff --git a/dashboard/src/app/[tenantId]/(diagram)/wfSpec/[...props]/page.tsx b/dashboard/src/app/[tenantId]/(diagram)/wfSpec/[...props]/page.tsx
index b37d2bde8..08855bfab 100644
--- a/dashboard/src/app/[tenantId]/(diagram)/wfSpec/[...props]/page.tsx
+++ b/dashboard/src/app/[tenantId]/(diagram)/wfSpec/[...props]/page.tsx
@@ -15,8 +15,7 @@ export default async function Page({ params: { props, tenantId } }: Props) {
 
   try {
     const wfSpec = await getWfSpec({ tenantId, name, version })
-    const scheduleWfSpec = await getScheduleWfSpec({ tenantId, name, version })
-    return <WfSpec spec={wfSpec} ScheduleWfSpec={scheduleWfSpec} />
+    return <WfSpec spec={wfSpec} />
   } catch (error) {
     if (error instanceof ClientError && error.code === Status.NOT_FOUND) return notFound()
     throw error
diff --git a/dashboard/src/app/[tenantId]/components/LinkWithTenant.tsx b/dashboard/src/app/[tenantId]/components/LinkWithTenant.tsx
index f0b0ca947..3411b2d34 100644
--- a/dashboard/src/app/[tenantId]/components/LinkWithTenant.tsx
+++ b/dashboard/src/app/[tenantId]/components/LinkWithTenant.tsx
@@ -4,13 +4,16 @@ import NextLink from 'next/link'
 import { useParams } from 'next/navigation'
 import { ComponentProps } from 'react'
 
-const LinkWithTenant = ({ linkStyle, ...props }: ComponentProps<typeof NextLink> & { linkStyle?: boolean }) => {
+const LinkWithTenant = ({ linkStyle, href, ...props }: ComponentProps<typeof NextLink> & { linkStyle?: boolean }) => {
   const { tenantId } = useParams()
+
   return (
     <NextLink
       {...props}
-      href={`/${tenantId}${props.href}`}
-      className={cn(props.className, { 'text-blue-500 underline': linkStyle })}
+      href={`/${tenantId}${href}`}
+      className={cn(props.className, {
+        '[&>*:first-child]:text-blue-500 [&>*:first-child]:hover:underline': linkStyle,
+      })}
     />
   )
 }
diff --git a/dashboard/src/app/[tenantId]/components/SelectionLink.tsx b/dashboard/src/app/[tenantId]/components/SelectionLink.tsx
new file mode 100644
index 000000000..811c761a6
--- /dev/null
+++ b/dashboard/src/app/[tenantId]/components/SelectionLink.tsx
@@ -0,0 +1,32 @@
+import { WfSpecData } from '@/types'
+import LinkWithTenant from './LinkWithTenant'
+
+import { Fragment } from 'react'
+import { TagIcon } from 'lucide-react'
+import { Separator } from '@/components/ui/separator'
+
+export const SelectionLink = ({
+  href,
+  key,
+  children,
+  ...props
+}: { href: string | undefined } & Omit<React.ComponentProps<typeof LinkWithTenant>, 'href'>) => {
+  return href !== undefined ? (
+    <Fragment key={key}>
+      <LinkWithTenant
+        className="flex items-center gap-3 rounded-md px-2 py-2 hover:bg-gray-100"
+        href={href}
+        linkStyle={href !== undefined}
+        {...props}
+      >
+        {children}
+      </LinkWithTenant>
+      <Separator />
+    </Fragment>
+  ) : (
+    <Fragment key={key}>
+      <div className="flex items-center gap-3 rounded-md px-2 py-2 hover:bg-gray-100">{children}</div>
+      <Separator />
+    </Fragment>
+  )
+}
diff --git a/dashboard/src/app/[tenantId]/components/tables/WfSpecTable.tsx b/dashboard/src/app/[tenantId]/components/tables/WfSpecTable.tsx
index 10201e16c..f417546dc 100644
--- a/dashboard/src/app/[tenantId]/components/tables/WfSpecTable.tsx
+++ b/dashboard/src/app/[tenantId]/components/tables/WfSpecTable.tsx
@@ -5,7 +5,7 @@ import { TagIcon } from 'lucide-react'
 import { useParams, useRouter } from 'next/navigation'
 import { FC, Fragment, useEffect, useState } from 'react'
 import { SearchResultProps } from '.'
-import LinkWithTenant from '../LinkWithTenant'
+import { SelectionLink } from '../SelectionLink'
 
 export const WfSpecTable: FC<SearchResultProps> = ({ pages = [] }) => {
   const router = useRouter()
@@ -26,16 +26,13 @@ export const WfSpecTable: FC<SearchResultProps> = ({ pages = [] }) => {
       <div className="flex max-h-[600px] flex-col overflow-auto">
         {wfSpecs.map(wfSpec => (
           <Fragment key={wfSpec.name}>
-            <LinkWithTenant
-              className="flex items-center gap-3 rounded-md px-2 py-2 hover:bg-gray-100"
-              href={`/wfSpec/${wfSpec.name}/${wfSpec.latestVersion}`}
-            >
-              <p>{wfSpec.name}</p>
+            <SelectionLink href={`/wfSpec/${wfSpec.name}/${wfSpec.latestVersion}`}>
+              <p className="group">{wfSpec.name}</p>
               <div className="flex items-center gap-2 rounded bg-blue-200 px-2 font-mono text-sm text-gray-500">
                 <TagIcon className="h-4 w-4 fill-none stroke-gray-500 stroke-1" />
                 Latest: v{wfSpec.latestVersion}
               </div>
-            </LinkWithTenant>
+            </SelectionLink>
             <Separator />
           </Fragment>
         ))}
diff --git a/dashboard/src/app/constants.ts b/dashboard/src/app/constants.ts
index e726bac53..1e6855095 100644
--- a/dashboard/src/app/constants.ts
+++ b/dashboard/src/app/constants.ts
@@ -38,3 +38,17 @@ export const TIME_RANGES_NAMES: { [key in TimeRange]: string } = {
   1440: '1 day',
   4320: '3 days',
 }
+
+export const FUTURE_TIME_RANGES = [
+  { label: 'All time', value: -1 },
+  { label: 'Next 5 minutes', value: 5 },
+  { label: 'Next 15 minutes', value: 15 },
+  { label: 'Next 30 minutes', value: 30 },
+  { label: 'Next 1 hour', value: 60 },
+  { label: 'Next 3 hours', value: 180 },
+  { label: 'Next 6 hours', value: 360 },
+  { label: 'Next 12 hours', value: 720 },
+  { label: 'Next 24 hours', value: 1440 },
+  { label: 'Next 3 days', value: 4320 },
+  { label: 'Next 7 days', value: 10080 },
+] as const satisfies { label: string; value: number }[]
diff --git a/dashboard/src/app/utils/getCronTimeWindow.ts b/dashboard/src/app/utils/getCronTimeWindow.ts
new file mode 100644
index 000000000..e6ff9e2fd
--- /dev/null
+++ b/dashboard/src/app/utils/getCronTimeWindow.ts
@@ -0,0 +1,18 @@
+import { parseExpression } from 'cron-parser'
+
+import { FUTURE_TIME_RANGES } from '@/app/constants'
+export function getCronTimeWindow(cronExpression: string): number | undefined {
+  try {
+    const interval = parseExpression(cronExpression)
+    const nextExecution = interval.next().toDate()
+    const now = new Date()
+    const minutesUntil = (nextExecution.getTime() - now.getTime()) / (1000 * 60)
+
+    const timeWindow = FUTURE_TIME_RANGES.find(range => minutesUntil <= range.value)
+
+    return timeWindow?.value ?? undefined
+  } catch (error) {
+    console.error('Invalid cron expression:', error)
+    return undefined
+  }
+}
diff --git a/dashboard/src/components/ui/tabs.tsx b/dashboard/src/components/ui/tabs.tsx
new file mode 100644
index 000000000..7f33065ad
--- /dev/null
+++ b/dashboard/src/components/ui/tabs.tsx
@@ -0,0 +1,55 @@
+'use client'
+
+import * as React from 'react'
+import * as TabsPrimitive from '@radix-ui/react-tabs'
+
+import { cn } from '@/components/utils'
+
+const Tabs = TabsPrimitive.Root
+
+const TabsList = React.forwardRef<
+  React.ElementRef<typeof TabsPrimitive.List>,
+  React.ComponentPropsWithoutRef<typeof TabsPrimitive.List>
+>(({ className, ...props }, ref) => (
+  <TabsPrimitive.List
+    ref={ref}
+    className={cn(
+      'inline-flex h-10 items-center justify-center rounded-md bg-muted p-1 text-muted-foreground',
+      className
+    )}
+    {...props}
+  />
+))
+TabsList.displayName = TabsPrimitive.List.displayName
+
+const TabsTrigger = React.forwardRef<
+  React.ElementRef<typeof TabsPrimitive.Trigger>,
+  React.ComponentPropsWithoutRef<typeof TabsPrimitive.Trigger>
+>(({ className, ...props }, ref) => (
+  <TabsPrimitive.Trigger
+    ref={ref}
+    className={cn(
+      'inline-flex items-center justify-center whitespace-nowrap rounded-sm px-3 py-1.5 text-sm font-medium ring-offset-background transition-all focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 data-[state=active]:bg-background data-[state=active]:text-foreground data-[state=active]:shadow-sm',
+      className
+    )}
+    {...props}
+  />
+))
+TabsTrigger.displayName = TabsPrimitive.Trigger.displayName
+
+const TabsContent = React.forwardRef<
+  React.ElementRef<typeof TabsPrimitive.Content>,
+  React.ComponentPropsWithoutRef<typeof TabsPrimitive.Content>
+>(({ className, ...props }, ref) => (
+  <TabsPrimitive.Content
+    ref={ref}
+    className={cn(
+      'mt-2 ring-offset-background focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2',
+      className
+    )}
+    {...props}
+  />
+))
+TabsContent.displayName = TabsPrimitive.Content.displayName
+
+export { Tabs, TabsList, TabsTrigger, TabsContent }
diff --git a/docs/docs/05-developer-guide/05-task-worker-development.md b/docs/docs/05-developer-guide/05-task-worker-development.md
index c1ee6ec8d..440fb30f7 100644
--- a/docs/docs/05-developer-guide/05-task-worker-development.md
+++ b/docs/docs/05-developer-guide/05-task-worker-development.md
@@ -178,7 +178,7 @@ The Go SDK currently (as of `0.11.0`) does not yet support throwing `LHTaskExcep
   <TabItem value="python" label="Python">
 
 ```python
-from littlehorse.exceptions import LHTaskExceptio
+from littlehorse.exceptions import LHTaskException
 
 async def ship_item(item_sku: str) -> str:
     if is_out_of_stock():
diff --git a/sdk-dotnet/LittleHorse.Sdk/LittleHorse.Sdk.csproj b/sdk-dotnet/LittleHorse.Sdk/LittleHorse.Sdk.csproj
index 7b89de2a0..1f3e09655 100644
--- a/sdk-dotnet/LittleHorse.Sdk/LittleHorse.Sdk.csproj
+++ b/sdk-dotnet/LittleHorse.Sdk/LittleHorse.Sdk.csproj
@@ -4,9 +4,7 @@
     <TargetFramework>net6.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <AssemblyVersion>0.5.8</AssemblyVersion>
-    <FileVersion>0.5.8</FileVersion>
-    <PackageVersion>0.5.8-alpha</PackageVersion>
+    <PackageVersion>0.0.0</PackageVersion>
     <Company>LittleHorse Enterprises LLC</Company>
     <Authors>LittleHorse Enterprises LLC</Authors>
     <Product>LittleHorseSDK</Product>
diff --git a/sdk-go/littlehorse/lh_errors.go b/sdk-go/littlehorse/lh_errors.go
new file mode 100644
index 000000000..867bb4132
--- /dev/null
+++ b/sdk-go/littlehorse/lh_errors.go
@@ -0,0 +1,11 @@
+package littlehorse
+
+type LHTaskException struct {
+	Name    string
+	Message string
+	Content interface{}
+}
+
+func (e *LHTaskException) Error() string {
+	return e.Message
+}
diff --git a/sdk-go/littlehorse/lh_variables.go b/sdk-go/littlehorse/lh_variables.go
index 040b966f2..432f12b9f 100644
--- a/sdk-go/littlehorse/lh_variables.go
+++ b/sdk-go/littlehorse/lh_variables.go
@@ -146,6 +146,11 @@ func InterfaceToVarVal(someInterface interface{}) (*lhproto.VariableValue, error
 	out := &lhproto.VariableValue{}
 	var err error
 
+	interfaceAsVarVal, isVarVal := someInterface.(*lhproto.VariableValue)
+	if isVarVal {
+		return interfaceAsVarVal, nil
+	}
+
 	isPtr, _ := GetIsPtrAndType(reflect.TypeOf(someInterface))
 	if someInterface == nil {
 		return &lhproto.VariableValue{}, nil
diff --git a/sdk-go/littlehorse/task_worker_internal.go b/sdk-go/littlehorse/task_worker_internal.go
index a928b9879..bfd0988d5 100644
--- a/sdk-go/littlehorse/task_worker_internal.go
+++ b/sdk-go/littlehorse/task_worker_internal.go
@@ -5,6 +5,7 @@ import (
 	"github.com/littlehorse-enterprises/littlehorse/sdk-go/lhproto"
 	"log"
 	"reflect"
+	"runtime/debug"
 	"strconv"
 	"sync"
 	"time"
@@ -311,6 +312,7 @@ func (m *serverConnectionManager) submitTaskForExecution(task *lhproto.Scheduled
 }
 
 func (m *serverConnectionManager) doTask(taskToExec *taskExecutionInfo) {
+	defer m.recoverFromPanic(taskToExec)
 	taskResult := m.doTaskHelper(taskToExec.task)
 	_, err := (*taskToExec.specificStub).ReportTask(context.Background(), taskResult)
 	if err != nil {
@@ -318,6 +320,34 @@ func (m *serverConnectionManager) doTask(taskToExec *taskExecutionInfo) {
 	}
 }
 
+func (m *serverConnectionManager) recoverFromPanic(taskToExec *taskExecutionInfo) {
+	if v := recover(); v != nil {
+		varVal, _ := InterfaceToVarVal(v)
+		taskResult := &lhproto.ReportTaskRun{
+			TaskRunId: taskToExec.task.TaskRunId,
+			Time:      timestamppb.Now(),
+			Status:    lhproto.TaskStatus(lhproto.LHStatus_ERROR),
+			LogOutput: &lhproto.VariableValue{
+				Value: &lhproto.VariableValue_Str{
+					Str: string(debug.Stack()),
+				},
+			},
+			AttemptNumber: taskToExec.task.AttemptNumber,
+			Result: &lhproto.ReportTaskRun_Error{
+				Error: &lhproto.LHTaskError{
+					Type:    lhproto.LHErrorType_TASK_FAILURE,
+					Message: "Task Worker Panic: " + varVal.GetStr(),
+				},
+			},
+		}
+		_, err := (*taskToExec.specificStub).ReportTask(context.Background(), taskResult)
+		if err != nil {
+			log.Default().Print(err)
+			m.retryReportTask(context.Background(), taskResult, TOTAL_RETRIES)
+		}
+	}
+}
+
 func (m *serverConnectionManager) retryReportTask(ctx context.Context, taskResult *lhproto.ReportTaskRun, retries int) {
 	log.Println("Retrying reportTask rpc on wfRun {}", taskResult.TaskRunId.WfRunId)
 
@@ -399,16 +429,52 @@ func (m *serverConnectionManager) doTaskHelper(task *lhproto.ScheduledTask) *lhp
 		errorReflect := invocationResults[len(invocationResults)-1]
 
 		if errorReflect.Interface() != nil {
-			errorVarVal, err := InterfaceToVarVal(errorReflect.Interface())
-			if err != nil {
-				log.Println("WARN: was unable to serialize error")
+			// Check if the error is an LHTaskException
+			if lhtErr, ok := errorReflect.Interface().(*LHTaskException); ok {
+				taskErrContent, err := InterfaceToVarVal(lhtErr.Content)
+
+				if err != nil {
+					msg := "LH_SDK_GO_ERR: Failed to serialize task error content passed from task worker: " + err.Error()
+
+					taskErrContent = &lhproto.VariableValue{
+						Value: &lhproto.VariableValue_Str{
+							Str: msg,
+						},
+					}
+				}
+
+				taskResult.Result = &lhproto.ReportTaskRun_Exception{
+					Exception: &lhproto.LHTaskException{
+						Name:    lhtErr.Name,
+						Message: lhtErr.Message,
+						Content: taskErrContent,
+					},
+				}
 			} else {
-				taskResult.LogOutput = errorVarVal
+				// Otherwise, try to interpret the error
+				if err, ok := errorReflect.Interface().(error); ok {
+					taskResult.Result = &lhproto.ReportTaskRun_Error{
+						Error: &lhproto.LHTaskError{
+							Type:    lhproto.LHErrorType_TASK_FAILURE,
+							Message: err.Error(),
+						},
+					}
+				} else {
+					// If the error returned by the taskMethod does not match the error interface
+					taskResult.Result = &lhproto.ReportTaskRun_Error{
+						Error: &lhproto.LHTaskError{
+							Type:    lhproto.LHErrorType_TASK_FAILURE,
+							Message: "Task Method error serialization failed.",
+						},
+					}
+				}
 			}
+
 			taskResult.Status = lhproto.TaskStatus_TASK_FAILED
 		}
 	}
 
+	taskResult.AttemptNumber = task.AttemptNumber
 	taskResult.Time = timestamppb.Now()
 
 	return taskResult