diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index a57e20a5c..70084d222 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -8,7 +8,6 @@ import { ReactiveFormsModule } from "@angular/forms";
 import { BrowserModule } from "@angular/platform-browser";
 import { BrowserAnimationsModule } from "@angular/platform-browser/animations";
 import { BawApiModule } from "@baw-api/baw-api.module";
-import { AudioAnalysisModule } from "@components/audio-analysis/audio-analysis.module";
 import { AudioRecordingModule } from "@components/audio-recordings/audio-recording.module";
 import { ReportsModule } from "@components/reports/reports.module";
 import { CitizenScienceModule } from "@components/citizen-science/citizen-science.module";
@@ -30,6 +29,8 @@ import { TitleStrategy } from "@angular/router";
 import { AnnotationsImportModule } from "@components/import-annotations/import-annotations.module";
 import { WebsiteStatusModule } from "@components/website-status/website-status.module";
 import { AnnotationModule } from "@components/annotations/annotation.module";
+import { ScriptsModule } from "@components/scripts/scripts.module";
+import { AnalysisModule } from "@components/audio-analysis/analysis-jobs.module";
 import { AppRoutingModule } from "./app-routing.module";
 import { AppComponent, PageTitleStrategy } from "./app.component";
 import { toastrRoot } from "./app.helper";
@@ -64,7 +65,8 @@ export const appImports = [
   SharedModule,
   AboutModule,
   AdminModule,
-  AudioAnalysisModule,
+  AnalysisModule,
+  ScriptsModule,
   AudioRecordingModule,
   CitizenScienceModule,
   DataRequestModule,
diff --git a/src/app/components/admin/admin.module.ts b/src/app/components/admin/admin.module.ts
index 288cf2917..9b81d1d69 100644
--- a/src/app/components/admin/admin.module.ts
+++ b/src/app/components/admin/admin.module.ts
@@ -6,7 +6,6 @@ import { adminRoute } from "./admin.menus";
 import { AnalysisJobsModule } from "./analysis-jobs/analysis-jobs.module";
 import { AdminDashboardComponent } from "./dashboard/dashboard.component";
 import { OrphanSitesModule } from "./orphan/orphans.module";
-import { ScriptsModule } from "./scripts/scripts.module";
 import { SettingsModule } from "./settings/settings.module";
 import { TagGroupsModule } from "./tag-group/tag-groups.module";
 import { TagsModule } from "./tags/tags.module";
@@ -18,7 +17,6 @@ import { DateTimeExampleComponent } from "./datetime-example/datetime-example.co
 const modules = [
   AnalysisJobsModule,
   OrphanSitesModule,
-  ScriptsModule,
   SettingsModule,
   TagGroupsModule,
   TagsModule,
diff --git a/src/app/components/admin/all-uploads/all-uploads.component.ts b/src/app/components/admin/all-uploads/all-uploads.component.ts
index 26820cc1c..6a5a361a6 100644
--- a/src/app/components/admin/all-uploads/all-uploads.component.ts
+++ b/src/app/components/admin/all-uploads/all-uploads.component.ts
@@ -1,9 +1,6 @@
 import { Component } from "@angular/core";
 import { List } from "immutable";
 import { ListComponent } from "@components/harvest/pages/list/list.component";
-import { ActivatedRoute } from "@angular/router";
-import { ShallowHarvestsService } from "@baw-api/harvest/harvest.service";
-import { NgbModal } from "@ng-bootstrap/ng-bootstrap";
 import { adminCategory, adminUploadsMenuItem } from "../admin.menus";
 import { adminMenuItemActions } from "../dashboard/dashboard.component";
 
@@ -12,14 +9,6 @@ import { adminMenuItemActions } from "../dashboard/dashboard.component";
   templateUrl: "../../harvest/pages/list/list.component.html",
 })
 class AllUploadsComponent extends ListComponent {
-  public constructor(
-    private modal: NgbModal,
-    private api: ShallowHarvestsService,
-    private activatedRoute: ActivatedRoute
-  ) {
-    super(modal, api, activatedRoute);
-  }
-
   public override get project() {
     return null;
   }
diff --git a/src/app/components/admin/analysis-jobs/analysis-jobs.menus.ts b/src/app/components/admin/analysis-jobs/analysis-jobs.menus.ts
index cacb4cacb..c4a322c5a 100644
--- a/src/app/components/admin/analysis-jobs/analysis-jobs.menus.ts
+++ b/src/app/components/admin/analysis-jobs/analysis-jobs.menus.ts
@@ -7,11 +7,11 @@ export const adminAnalysisJobsRoute = adminRoute.addFeatureModule(
   "analysis_jobs"
 );
 
-export const adminAnalysisJobsCategory: Category = {
+export const adminAnalysisJobsCategory = {
   icon: ["fas", "server"],
   label: "Analysis Jobs",
   route: adminAnalysisJobsRoute,
-};
+} satisfies Category;
 
 export const adminAnalysisJobsMenuItem = menuRoute({
   icon: ["fas", "server"],
diff --git a/src/app/components/admin/analysis-jobs/details/details.component.spec.ts b/src/app/components/admin/analysis-jobs/details/details.component.spec.ts
deleted file mode 100644
index 228849107..000000000
--- a/src/app/components/admin/analysis-jobs/details/details.component.spec.ts
+++ /dev/null
@@ -1,169 +0,0 @@
-import { ActivatedRoute } from "@angular/router";
-import { RouterTestingModule } from "@angular/router/testing";
-import { MockBawApiModule } from "@baw-api/baw-apiMock.module";
-import { ACCOUNT, SAVED_SEARCH, SCRIPT } from "@baw-api/ServiceTokens";
-import { BawApiError } from "@helpers/custom-errors/baw-api-error";
-import { AnalysisJob } from "@models/AnalysisJob";
-import { SavedSearch } from "@models/SavedSearch";
-import { Script } from "@models/Script";
-import { User } from "@models/User";
-import { createComponentFactory, Spectator } from "@ngneat/spectator";
-import { SharedModule } from "@shared/shared.module";
-import { generateAnalysisJob } from "@test/fakes/AnalysisJob";
-import { generateBawApiError } from "@test/fakes/BawApiError";
-import { generateSavedSearch } from "@test/fakes/SavedSearch";
-import { generateScript } from "@test/fakes/Script";
-import { generateUser } from "@test/fakes/User";
-import { assertDetail, Detail } from "@test/helpers/detail-view";
-import { nStepObservable } from "@test/helpers/general";
-import { assertPageInfo } from "@test/helpers/pageRoute";
-import { mockActivatedRoute } from "@test/helpers/testbed";
-import { Subject } from "rxjs";
-import { PageTitleStrategy } from "src/app/app.component";
-import { ASSOCIATION_INJECTOR } from "@services/association-injector/association-injector.tokens";
-import { AssociationInjector } from "@models/ImplementsInjector";
-import { AdminAnalysisJobComponent } from "./details.component";
-
-describe("AdminAnalysisJobComponent", () => {
-  let injector: AssociationInjector;
-  let spec: Spectator<AdminAnalysisJobComponent>;
-  const createComponent = createComponentFactory({
-    component: AdminAnalysisJobComponent,
-    imports: [SharedModule, MockBawApiModule, RouterTestingModule],
-  });
-
-  assertPageInfo<AnalysisJob>(AdminAnalysisJobComponent, "test name", {
-    analysisJob: {
-      model: new AnalysisJob(generateAnalysisJob({ name: "test name" }))
-    },
-  });
-
-  function setup(model: AnalysisJob, error?: BawApiError) {
-    spec = createComponent({
-      detectChanges: false,
-      providers: [
-        {
-          provide: ActivatedRoute,
-          useValue: mockActivatedRoute(
-            { analysisJob: "resolver" },
-            { analysisJob: { model, error } }
-          ),
-        },
-        {
-          provide: PageTitleStrategy,
-        },
-      ],
-    });
-
-    injector = spec.inject(ASSOCIATION_INJECTOR);
-    const accountsApi = spec.inject(ACCOUNT.token);
-    const scriptsApi = spec.inject(SCRIPT.token);
-    const savedSearchesApi = spec.inject(SAVED_SEARCH.token);
-
-    const accountsSubject = new Subject<User>();
-    const scriptsSubject = new Subject<Script>();
-    const savedSearchesSubject = new Subject<SavedSearch>();
-    const promise = Promise.all([
-      nStepObservable(
-        accountsSubject,
-        () => new User(generateUser({ id: 1, userName: "custom username" }))
-      ),
-      nStepObservable(
-        scriptsSubject,
-        () => new Script(generateScript({ id: 1, name: "custom script" }))
-      ),
-      nStepObservable(
-        savedSearchesSubject,
-        () =>
-          new SavedSearch(
-            generateSavedSearch({ id: 1, name: "custom saved search" })
-          )
-      ),
-    ]);
-
-    // Catch associated models
-    accountsApi.show.and.callFake(() => accountsSubject);
-    scriptsApi.show.and.callFake(() => scriptsSubject);
-    savedSearchesApi.show.and.callFake(() => savedSearchesSubject);
-
-    // Update model to contain injector
-    if (model) {
-      model["injector"] = injector;
-    }
-
-    return promise;
-  }
-
-  it("should create", () => {
-    setup(new AnalysisJob(generateAnalysisJob()));
-    spec.detectChanges();
-    expect(spec.component).toBeTruthy();
-  });
-
-  it("should handle error", () => {
-    setup(undefined, generateBawApiError());
-    spec.detectChanges();
-    expect(spec.component).toBeTruthy();
-  });
-
-  describe("details", () => {
-    const model = new AnalysisJob(generateAnalysisJob());
-
-    beforeEach(async function () {
-      const promise = setup(model);
-      spec.detectChanges();
-      await promise;
-      spec.detectChanges();
-      this.fixture = spec.fixture;
-    });
-
-    const details: Detail[] = [
-      { label: "Id", key: "id", plain: model.id },
-      { label: "Name", key: "name", plain: model.name },
-      {
-        label: "Annotation Name",
-        key: "annotationName",
-        plain: model.annotationName,
-      },
-      {
-        label: "Custom Settings",
-        key: "customSettings",
-        code: model.customSettings,
-      },
-      { label: "Script", key: "script", model: "Script: custom script (1)" },
-      {
-        label: "Saved Search",
-        key: "savedSearch",
-        model: "Saved Search: custom saved search (1)",
-      },
-      { label: "Started At", key: "startedAt", dateTime: model.startedAt },
-      {
-        label: "Overall Status",
-        key: "overallStatus",
-        plain: model.overallStatus,
-      },
-      {
-        label: "Overall Status Modified At",
-        key: "overallStatusModifiedAt",
-        dateTime: model.overallStatusModifiedAt,
-      },
-      {
-        label: "Overall Count",
-        key: "overallCount",
-        plain: model.overallCount,
-      },
-      {
-        label: "Overall Duration",
-        key: "overallDuration",
-        duration: model.overallDuration,
-      },
-      {
-        label: "Overall Data Length Bytes",
-        key: "overallDataLengthBytes",
-        plain: model.overallDataLengthBytes,
-      },
-    ];
-
-    details.forEach((detail) => assertDetail(detail));
-  });
-});
diff --git a/src/app/components/admin/analysis-jobs/details/details.component.ts b/src/app/components/admin/analysis-jobs/details/details.component.ts
index fbc9b7b1b..1091fd6d5 100644
--- a/src/app/components/admin/analysis-jobs/details/details.component.ts
+++ b/src/app/components/admin/analysis-jobs/details/details.component.ts
@@ -1,17 +1,8 @@
-import { Component, OnInit } from "@angular/core";
-import { ActivatedRoute } from "@angular/router";
+import { Component } from "@angular/core";
 import { analysisJobResolvers } from "@baw-api/analysis/analysis-jobs.service";
-import {
-  hasResolvedSuccessfully,
-  retrieveResolvers,
-} from "@baw-api/resolver-common";
-import { PageComponent } from "@helpers/page/pageComponent";
-import { IPageInfo } from "@helpers/page/pageInfo";
-import { withUnsubscribe } from "@helpers/unsubscribe/unsubscribe";
 import { permissionsWidgetMenuItem } from "@menu/widget.menus";
-import { AnalysisJob } from "@models/AnalysisJob";
 import { List } from "immutable";
-import schema from "../analysis-job.schema.json";
+import { AnalysisJobComponent } from "@components/audio-analysis/pages/details/details.component";
 import {
   adminAnalysisJobMenuItem,
   adminAnalysisJobsCategory,
@@ -21,40 +12,9 @@ const analysisJobKey = "analysisJob";
 
 @Component({
   selector: "baw-admin-analysis-job",
-  template: `
-    <div *ngIf="!failure">
-      <h1>Analysis Job Details</h1>
-      <baw-detail-view
-        [fields]="fields"
-        [model]="analysisJob"
-      ></baw-detail-view>
-    </div>
-  `,
+  templateUrl: "../../../audio-analysis/pages/details/details.component.html",
 })
-class AdminAnalysisJobComponent
-  extends withUnsubscribe(PageComponent)
-  implements OnInit
-{
-  public analysisJob: AnalysisJob;
-  public failure: boolean;
-  public fields = schema.fields;
-
-  public constructor(private route: ActivatedRoute) {
-    super();
-  }
-
-  public ngOnInit(): void {
-    const data = this.route.snapshot.data;
-    const models = retrieveResolvers(data as IPageInfo);
-
-    if (!hasResolvedSuccessfully(models)) {
-      this.failure = true;
-      return;
-    }
-
-    this.analysisJob = models[analysisJobKey] as AnalysisJob;
-  }
-}
+class AdminAnalysisJobComponent extends AnalysisJobComponent {}
 
 AdminAnalysisJobComponent.linkToRoute({
   category: adminAnalysisJobsCategory,
diff --git a/src/app/components/admin/analysis-jobs/list/list.component.html b/src/app/components/admin/analysis-jobs/list/list.component.html
deleted file mode 100644
index 443466ae5..000000000
--- a/src/app/components/admin/analysis-jobs/list/list.component.html
+++ /dev/null
@@ -1,67 +0,0 @@
-<ng-container *ngIf="rows && !error">
-  <h1>Analysis Jobs</h1>
-
-  <p>
-    Displaying <strong>{{ pageSize }}</strong> of
-    <strong>all {{ totalModels }}</strong> analysis jobs.
-  </p>
-
-  <ngx-datatable
-    #table
-    bawDatatableDefaults
-    [columns]="columns"
-    [rows]="rows"
-    [count]="totalModels"
-    [offset]="pageNumber"
-    (page)="setPage($event)"
-    (sort)="onSort($event)"
-  >
-    <ngx-datatable-column name="Id" [width]="50" [maxWidth]="50">
-    </ngx-datatable-column>
-    <ngx-datatable-column name="Name"></ngx-datatable-column>
-    <ngx-datatable-column
-      name="Script"
-      [width]="50"
-      [maxWidth]="50"
-      [sortable]="false"
-    ></ngx-datatable-column>
-    <ngx-datatable-column
-      name="Creator"
-      [width]="60"
-      [maxWidth]="60"
-      [sortable]="false"
-    ></ngx-datatable-column>
-    <ngx-datatable-column
-      name="Started"
-      [width]="110"
-      [maxWidth]="110"
-    ></ngx-datatable-column>
-    <ngx-datatable-column
-      name="Status"
-      [width]="95"
-      [maxWidth]="95"
-    ></ngx-datatable-column>
-    <ngx-datatable-column
-      name="Status Updated"
-      [width]="115"
-      [maxWidth]="115"
-    ></ngx-datatable-column>
-    <ngx-datatable-column
-      name="Model"
-      [width]="140"
-      [maxWidth]="140"
-      [sortable]="false"
-    >
-      <ng-template let-column="column" ngx-datatable-header-template>
-      </ng-template>
-      <ng-template let-value="value" ngx-datatable-cell-template>
-        <a class="btn btn-sm btn-default me-2" [bawUrl]="value.adminViewUrl">
-          Details
-        </a>
-        <a class="btn btn-sm btn-default" [bawUrl]="value.viewUrl">View</a>
-      </ng-template>
-    </ngx-datatable-column>
-  </ngx-datatable>
-</ng-container>
-
-<baw-error-handler *ngIf="error" [error]="error"></baw-error-handler>
diff --git a/src/app/components/admin/analysis-jobs/list/list.component.spec.ts b/src/app/components/admin/analysis-jobs/list/list.component.spec.ts
index 63ce9d044..8ebe50cd7 100644
--- a/src/app/components/admin/analysis-jobs/list/list.component.spec.ts
+++ b/src/app/components/admin/analysis-jobs/list/list.component.spec.ts
@@ -3,32 +3,50 @@ import { AnalysisJobsService } from "@baw-api/analysis/analysis-jobs.service";
 import { defaultApiPageSize } from "@baw-api/baw-api.service";
 import { MockBawApiModule } from "@baw-api/baw-apiMock.module";
 import { AnalysisJob } from "@models/AnalysisJob";
-import { createComponentFactory, Spectator } from "@ngneat/spectator";
+import { createComponentFactory, Spectator, SpyObject } from "@ngneat/spectator";
 import { SharedModule } from "@shared/shared.module";
 import { generateAnalysisJob } from "@test/fakes/AnalysisJob";
 import { assertPageInfo } from "@test/helpers/pageRoute";
 import { assertPagination } from "@test/helpers/pagedTableTemplate";
+import { ACCOUNT, ANALYSIS_JOB, SCRIPT } from "@baw-api/ServiceTokens";
+import { ASSOCIATION_INJECTOR } from "@services/association-injector/association-injector.tokens";
+import { AssociationInjector } from "@models/ImplementsInjector";
+import { of } from "rxjs";
+import { Script } from "@models/Script";
+import { generateScript } from "@test/fakes/Script";
+import { User } from "@models/User";
+import { generateUser } from "@test/fakes/User";
 import { AdminAnalysisJobsComponent } from "./list.component";
 
-describe("AdminAnalysisJobsComponent", () => {
-  let api: AnalysisJobsService;
-  let defaultModels: AnalysisJob[];
+describe("AnalysisJobComponent", () => {
   let spec: Spectator<AdminAnalysisJobsComponent>;
+
+  let api: SpyObject<AnalysisJobsService>;
+  let defaultModels: AnalysisJob[];
+
+  let injector: SpyObject<AssociationInjector>;
+
   const createComponent = createComponentFactory({
-    detectChanges: false,
     component: AdminAnalysisJobsComponent,
     imports: [SharedModule, RouterTestingModule, MockBawApiModule],
   });
 
   beforeEach(function () {
-    spec = createComponent();
-    api = spec.inject(AnalysisJobsService);
+    spec = createComponent({ detectChanges: false });
+
+    injector = spec.inject(ASSOCIATION_INJECTOR);
+    api = spec.inject(ANALYSIS_JOB.token);
+    const mockScriptsApi = spec.inject(SCRIPT.token);
+    const mockAccountsApi = spec.inject(ACCOUNT.token);
 
     defaultModels = [];
     for (let i = 0; i < defaultApiPageSize; i++) {
-      defaultModels.push(new AnalysisJob(generateAnalysisJob()));
+      defaultModels.push(new AnalysisJob(generateAnalysisJob(), injector));
     }
 
+    mockScriptsApi.show.and.returnValue(() => of(new Script(generateScript(), injector)));
+    mockAccountsApi.show.and.callFake(() => of(new User(generateUser(), injector)));
+
     this.defaultModels = defaultModels;
     this.fixture = spec.fixture;
     this.api = api;
diff --git a/src/app/components/admin/analysis-jobs/list/list.component.ts b/src/app/components/admin/analysis-jobs/list/list.component.ts
index bf2999282..1ceaf873f 100644
--- a/src/app/components/admin/analysis-jobs/list/list.component.ts
+++ b/src/app/components/admin/analysis-jobs/list/list.component.ts
@@ -1,54 +1,19 @@
-import { Component, OnInit } from "@angular/core";
-import { AnalysisJobsService } from "@baw-api/analysis/analysis-jobs.service";
+import { Component } from "@angular/core";
 import { adminAnalysisJobsMenuItem } from "@components/admin/admin.menus";
 import { adminMenuItemActions } from "@components/admin/dashboard/dashboard.component";
-import { PagedTableTemplate } from "@helpers/tableTemplate/pagedTableTemplate";
-import { Id, Param } from "@interfaces/apiInterfaces";
-import { AnalysisJob } from "@models/AnalysisJob";
 import { List } from "immutable";
+import { AnalysesComponent } from "@components/audio-analysis/pages/list/list.component";
 import { adminAnalysisJobsCategory } from "../analysis-jobs.menus";
 
 @Component({
   selector: "baw-admin-analysis-jobs",
-  templateUrl: "./list.component.html",
+  templateUrl: "../../../audio-analysis/pages/list/list.component.html",
 })
-class AdminAnalysisJobsComponent
-  extends PagedTableTemplate<TableRow, AnalysisJob>
-  implements OnInit
-{
-  public columns = [
-    { name: "Id" },
-    { name: "Name" },
-    { name: "Script" },
-    { name: "Creator" },
-    { name: "Started" },
-    { name: "Status" },
-    { name: "Status Updated" },
-    { name: "Actions" },
-  ];
-  public sortKeys = {
-    id: "id",
-    name: "name",
-    started: "startedAt",
-    status: "overallStatus",
-    statusUpdated: "overallStatusModifiedAt",
-  };
-
-  public constructor(api: AnalysisJobsService) {
-    super(api, (analysisJobs) =>
-      analysisJobs.map((analysisJob) => ({
-        id: analysisJob.id,
-        name: analysisJob.name,
-        script: analysisJob.scriptId,
-        creator: analysisJob.creatorId,
-        started: analysisJob.startedAt?.toRelative(),
-        status: analysisJob.overallStatus,
-        statusUpdated: analysisJob.overallStatusModifiedAt?.toRelative(),
-        model: analysisJob,
-      }))
-    );
+class AdminAnalysisJobsComponent extends AnalysesComponent {
+  public override get project() {
+    return null;
   }
-}
+ }
 
 AdminAnalysisJobsComponent.linkToRoute({
   category: adminAnalysisJobsCategory,
@@ -57,14 +22,3 @@ AdminAnalysisJobsComponent.linkToRoute({
 });
 
 export { AdminAnalysisJobsComponent };
-
-interface TableRow {
-  id: Id;
-  name: Param;
-  script: Id;
-  creator: Id;
-  started: string;
-  status: string;
-  statusUpdated: string;
-  model: AnalysisJob;
-}
diff --git a/src/app/components/admin/dashboard/dashboard.component.ts b/src/app/components/admin/dashboard/dashboard.component.ts
index c61a54c73..d2d8bcf99 100644
--- a/src/app/components/admin/dashboard/dashboard.component.ts
+++ b/src/app/components/admin/dashboard/dashboard.component.ts
@@ -1,6 +1,7 @@
 import { ChangeDetectionStrategy, Component } from "@angular/core";
 import { PageComponent } from "@helpers/page/pageComponent";
 import { List } from "immutable";
+import { scriptsMenuItem } from "@components/scripts/scripts.menus";
 import {
   adminAnalysisJobsMenuItem,
   adminCategory,
@@ -13,7 +14,6 @@ import {
   adminDateTimeTemplateMenuItem,
 } from "../admin.menus";
 import { adminOrphansMenuItem } from "../orphan/orphans.menus";
-import { adminScriptsMenuItem } from "../scripts/scripts.menus";
 import { adminSettingsMenuItem } from "../settings/settings.menus";
 import { adminTagGroupsMenuItem } from "../tag-group/tag-group.menus";
 import { adminTagsMenuItem } from "../tags/tags.menus";
@@ -23,7 +23,6 @@ export const adminMenuItemActions = [
   adminCmsMenuItem,
   adminJobStatusMenuItem,
   adminOrphansMenuItem,
-  adminScriptsMenuItem,
   adminSettingsMenuItem,
   adminTagGroupsMenuItem,
   adminTagsMenuItem,
@@ -31,6 +30,12 @@ export const adminMenuItemActions = [
   adminUserListMenuItem,
   adminUploadsMenuItem,
   adminDateTimeTemplateMenuItem,
+
+  // even though listing scripts is not restricted to admins, I have included it
+  // in the admin dashboard because it is not linked to from any other page and
+  // and it's likely that the only people who would want to list all of the
+  // scripts would be admins
+  scriptsMenuItem,
 ];
 
 @Component({
diff --git a/src/app/components/admin/analysis-jobs/analysis-job.schema.json b/src/app/components/audio-analysis/analysis-job.schema.json
similarity index 74%
rename from src/app/components/admin/analysis-jobs/analysis-job.schema.json
rename to src/app/components/audio-analysis/analysis-job.schema.json
index 6edd0048c..dd284c609 100644
--- a/src/app/components/admin/analysis-jobs/analysis-job.schema.json
+++ b/src/app/components/audio-analysis/analysis-job.schema.json
@@ -46,35 +46,35 @@
       }
     },
     {
-      "key": "script",
+      "key": "scripts",
       "hide": true,
       "props": {
-        "label": "Script",
+        "label": "Scripts",
         "disabled": true
       }
     },
     {
-      "key": "scriptId",
-      "type": "input",
+      "key": "audioEventImports",
+      "hide": true,
       "props": {
-        "label": "Script Id",
+        "label": "Audio Event Imports",
         "type": "text"
       }
     },
     {
-      "key": "savedSearch",
-      "hide": true,
+      "key": "ongoing",
+      "type": "checkbox",
       "props": {
-        "label": "Saved Search",
-        "disabled": true
+        "label": "Ongoing",
+        "type": "checkbox"
       }
     },
     {
-      "key": "savedSearchId",
-      "type": "input",
+      "key": "systemJob",
+      "type": "checkbox",
       "props": {
-        "label": "Saved Search Id",
-        "type": "text"
+        "label": "System Job",
+        "type": "checkbox"
       }
     },
     {
@@ -85,6 +85,16 @@
         "disabled": true
       }
     },
+    {
+      "key": "overallProgress",
+      "type": "textarea",
+      "hide": true,
+      "props": {
+        "label": "Overall Progress",
+        "rows": 8,
+        "disabled": true
+      }
+    },
     {
       "key": "overallStatus",
       "hide": true,
@@ -133,6 +143,38 @@
         "disabled": true
       }
     },
+    {
+      "key": "amendCount",
+      "type": "text",
+      "props": {
+        "label": "Amend Count",
+        "type": "text"
+      }
+    },
+    {
+      "key": "resumeCount",
+      "type": "text",
+      "props": {
+        "label": "Resume Count",
+        "type": "text"
+      }
+    },
+    {
+      "key": "retryCount",
+      "type": "text",
+      "props": {
+        "label": "Retry Count",
+        "type": "text"
+      }
+    },
+    {
+      "key": "suspendCount",
+      "type": "text",
+      "props": {
+        "label": "Suspend Count",
+        "type": "text"
+      }
+    },
     {
       "key": "creator",
       "hide": true,
diff --git a/src/app/components/audio-analysis/analysis-jobs.menus.ts b/src/app/components/audio-analysis/analysis-jobs.menus.ts
new file mode 100644
index 000000000..6e0fd1dce
--- /dev/null
+++ b/src/app/components/audio-analysis/analysis-jobs.menus.ts
@@ -0,0 +1,35 @@
+import { Category, menuRoute } from "@interfaces/menusInterfaces";
+import { projectMenuItem } from "@components/projects/projects.menus";
+import { AnalysisJob } from "@models/AnalysisJob";
+import { retrieveResolvedModel } from "@baw-api/resolver-common";
+import { RouterStateSnapshot } from "@angular/router";
+import { analysesRoute, analysisJobRoute } from "./analysis-jobs.routes";
+
+export const analysisCategory = {
+  icon: ["fas", "server"],
+  label: "Analysis Jobs",
+  route: analysisJobRoute,
+} satisfies Category;
+
+export const analysesMenuItem = menuRoute({
+  icon: ["fas", "server"],
+  label: "Analysis Jobs",
+  tooltip: () => "View audio analysis jobs",
+  order: 5,
+  parent: projectMenuItem,
+  route: analysesRoute,
+});
+
+export const analysisJobMenuItem = menuRoute({
+  icon: ["fas", "tasks"],
+  label: "Analysis Job",
+  tooltip: () => "View audio analysis job",
+  route: analysisJobRoute,
+  parent: analysesMenuItem,
+  breadcrumbResolve: (pageInfo) =>
+    retrieveResolvedModel(pageInfo, AnalysisJob)?.name,
+  title: (routeData: RouterStateSnapshot): string => {
+    const componentModel = routeData.root.firstChild.data;
+    return componentModel.analysisJob.model.name;
+  },
+});
diff --git a/src/app/components/audio-analysis/analysis-jobs.module.ts b/src/app/components/audio-analysis/analysis-jobs.module.ts
new file mode 100644
index 000000000..66f7998ce
--- /dev/null
+++ b/src/app/components/audio-analysis/analysis-jobs.module.ts
@@ -0,0 +1,21 @@
+import { NgModule } from "@angular/core";
+import { RouterModule } from "@angular/router";
+import { getRouteConfigForPage } from "@helpers/page/pageRouting";
+import { SharedModule } from "@shared/shared.module";
+import { AnalysisJobComponent } from "./pages/details/details.component";
+import { AnalysesComponent } from "./pages/list/list.component";
+import { analysesRoute } from "./analysis-jobs.routes";
+
+const components = [
+  AnalysesComponent,
+  AnalysisJobComponent,
+];
+
+const routes = analysesRoute.compileRoutes(getRouteConfigForPage);
+
+@NgModule({
+  declarations: components,
+  imports: [SharedModule, RouterModule.forChild(routes)],
+  exports: [RouterModule, ...components],
+})
+export class AnalysisModule {}
diff --git a/src/app/components/audio-analysis/analysis-jobs.routes.ts b/src/app/components/audio-analysis/analysis-jobs.routes.ts
new file mode 100644
index 000000000..14e4c1126
--- /dev/null
+++ b/src/app/components/audio-analysis/analysis-jobs.routes.ts
@@ -0,0 +1,7 @@
+import { projectRoute } from "@components/projects/projects.routes";
+
+const analysesPath = "analysis_jobs";
+const analysisJobPath = ":analysisJobId";
+
+export const analysesRoute = projectRoute.addFeatureModule(analysesPath);
+export const analysisJobRoute = analysesRoute.add(analysisJobPath);
diff --git a/src/app/components/audio-analysis/audio-analysis.menus.ts b/src/app/components/audio-analysis/audio-analysis.menus.ts
deleted file mode 100644
index 50635560d..000000000
--- a/src/app/components/audio-analysis/audio-analysis.menus.ts
+++ /dev/null
@@ -1,86 +0,0 @@
-import { RouterStateSnapshot } from "@angular/router";
-import { retrieveResolvedModel } from "@baw-api/resolver-common";
-import { Category, menuAction, menuRoute } from "@interfaces/menusInterfaces";
-import { StrongRoute } from "@interfaces/strongRoute";
-import { AnalysisJob } from "@models/AnalysisJob";
-import { defaultDeleteIcon, defaultNewIcon } from "src/app/app.menus";
-
-export const audioAnalysesRoute = StrongRoute.newRoot().add("audio_analysis");
-
-export const audioAnalysisCategory: Category = {
-  icon: ["fas", "server"],
-  label: "Audio Analysis",
-  route: audioAnalysesRoute,
-};
-
-export const audioAnalysesMenuItem = menuRoute({
-  icon: ["fas", "server"],
-  label: "Audio Analysis",
-  tooltip: () => "View audio analysis jobs",
-  order: 5,
-  route: audioAnalysesRoute,
-});
-
-export const newAudioAnalysisMenuItem = menuRoute({
-  icon: defaultNewIcon,
-  label: "New Analysis Job",
-  tooltip: () => "Create a custom analysis job",
-  route: audioAnalysesRoute.add("new"),
-  parent: audioAnalysesMenuItem,
-});
-
-export const audioAnalysisRoute = audioAnalysesRoute.add(":analysisJobId");
-
-export const audioAnalysisMenuItem = menuRoute({
-  icon: ["fas", "tasks"],
-  label: "Analysis Job",
-  tooltip: () => "View audio analysis job",
-  route: audioAnalysisRoute,
-  parent: audioAnalysesMenuItem,
-  breadcrumbResolve: (pageInfo) =>
-    retrieveResolvedModel(pageInfo, AnalysisJob)?.name,
-  title: (routeData: RouterStateSnapshot): string => {
-    const componentModel = routeData.root.firstChild.data;
-    return componentModel.analysisJob.model.name;
-  },
-});
-
-export const audioAnalysisResultsMenuItem = menuRoute({
-  icon: ["fas", "table"],
-  label: "Results",
-  tooltip: () => "View results for this analysis job",
-  route: audioAnalysisRoute.add("results"),
-  parent: audioAnalysisMenuItem,
-});
-
-export const retryFailedItemsMenuItem = menuAction({
-  icon: ["fas", "redo"],
-  label: "Retry failed items",
-  tooltip: () => "Retry any failed analysis job items",
-  disabled: "BETA: Feature is still being developed.",
-  action: () => {},
-});
-
-export const pauseProcessingMenuItem = menuAction({
-  icon: ["fas", "pause-circle"],
-  label: "Pause processing",
-  tooltip: () => "Pause all analysis job processing",
-  disabled: "BETA: Feature is still being developed.",
-  action: () => {},
-});
-
-export const deleteAudioAnalysisMenuItem = menuAction({
-  icon: defaultDeleteIcon,
-  label: "Delete this job",
-  tooltip: () => "Delete this analysis job",
-  disabled: "BETA: Feature is still being developed.",
-  action: () => {},
-});
-
-export const downloadAudioAnalysisResultsMenuItem = menuAction({
-  icon: ["fas", "file-archive"],
-  label: "Download analysis results",
-  tooltip: () => "Download a folder containing the analysis results",
-  disabled: "BETA: Feature is still being developed.",
-  action: () => {},
-});
diff --git a/src/app/components/audio-analysis/audio-analysis.module.ts b/src/app/components/audio-analysis/audio-analysis.module.ts
deleted file mode 100644
index 9da39e6e8..000000000
--- a/src/app/components/audio-analysis/audio-analysis.module.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { NgModule } from "@angular/core";
-import { RouterModule } from "@angular/router";
-import { getRouteConfigForPage } from "@helpers/page/pageRouting";
-import { SharedModule } from "@shared/shared.module";
-import { audioAnalysesRoute } from "./audio-analysis.menus";
-import { AudioAnalysisComponent } from "./pages/details/details.component";
-import { AudioAnalysesComponent } from "./pages/list/list.component";
-import { NewAudioAnalysisComponent } from "./pages/new/new.component";
-import { AudioAnalysisResultsComponent } from "./pages/results/results.component";
-
-const components = [
-  AudioAnalysesComponent,
-  NewAudioAnalysisComponent,
-  AudioAnalysisComponent,
-  AudioAnalysisResultsComponent,
-];
-
-const routes = audioAnalysesRoute.compileRoutes(getRouteConfigForPage);
-
-@NgModule({
-  declarations: components,
-  imports: [SharedModule, RouterModule.forChild(routes)],
-  exports: [RouterModule, ...components],
-})
-export class AudioAnalysisModule {}
diff --git a/src/app/components/audio-analysis/pages/details/details.component.html b/src/app/components/audio-analysis/pages/details/details.component.html
new file mode 100644
index 000000000..c64557ffc
--- /dev/null
+++ b/src/app/components/audio-analysis/pages/details/details.component.html
@@ -0,0 +1,4 @@
+<div *ngIf="!failure">
+  <h1>Analysis Job Details</h1>
+  <baw-detail-view [fields]="fields" [model]="analysisJob"></baw-detail-view>
+</div>
diff --git a/src/app/components/audio-analysis/pages/details/details.component.spec.ts b/src/app/components/audio-analysis/pages/details/details.component.spec.ts
index e4dc0c5ce..34fd9ae65 100644
--- a/src/app/components/audio-analysis/pages/details/details.component.spec.ts
+++ b/src/app/components/audio-analysis/pages/details/details.component.spec.ts
@@ -1,32 +1,155 @@
-import { AnalysisJobsService } from "@baw-api/analysis/analysis-jobs.service";
-import { audioAnalysesRoute } from "@components/audio-analysis/audio-analysis.menus";
-import { AudioAnalysisModule } from "@components/audio-analysis/audio-analysis.module";
+import { ActivatedRoute } from "@angular/router";
+import { RouterTestingModule } from "@angular/router/testing";
+import { MockBawApiModule } from "@baw-api/baw-apiMock.module";
+import { ACCOUNT, SCRIPT } from "@baw-api/ServiceTokens";
+import { BawApiError } from "@helpers/custom-errors/baw-api-error";
 import { AnalysisJob } from "@models/AnalysisJob";
+import { Script } from "@models/Script";
+import { User } from "@models/User";
+import { createComponentFactory, Spectator } from "@ngneat/spectator";
+import { SharedModule } from "@shared/shared.module";
 import { generateAnalysisJob } from "@test/fakes/AnalysisJob";
-import { validateBawClientPage } from "@test/helpers/baw-client";
+import { generateBawApiError } from "@test/fakes/BawApiError";
+import { generateScript } from "@test/fakes/Script";
+import { generateUser } from "@test/fakes/User";
+import { assertDetail, Detail } from "@test/helpers/detail-view";
+import { nStepObservable } from "@test/helpers/general";
 import { assertPageInfo } from "@test/helpers/pageRoute";
-import { BehaviorSubject } from "rxjs";
-import { AudioAnalysisComponent } from "./details.component";
-
-describe("AudioAnalysisComponent", () => {
-  validateBawClientPage(
-    audioAnalysesRoute,
-    AudioAnalysisComponent,
-    [AudioAnalysisModule],
-    "/audio_analysis/123",
-    "Results are available as they are generated.",
-    (spec) => {
-      const analysisJobApi = spec.inject(AnalysisJobsService);
-      analysisJobApi.show.andCallFake(
-        (id: number) =>
-          new BehaviorSubject(new AnalysisJob(generateAnalysisJob({ id })))
-      );
-    }
-  );
+import { mockActivatedRoute } from "@test/helpers/testbed";
+import { Subject } from "rxjs";
+import { ASSOCIATION_INJECTOR } from "@services/association-injector/association-injector.tokens";
+import { AssociationInjector } from "@models/ImplementsInjector";
+import { modelData } from "@test/helpers/faker";
+import { AnalysisJobComponent } from "./details.component";
+
+describe("AnalysisJobComponent", () => {
+  let injector: AssociationInjector;
+  let spec: Spectator<AnalysisJobComponent>;
+
+  const createComponent = createComponentFactory({
+    component: AnalysisJobComponent,
+    imports: [SharedModule, MockBawApiModule, RouterTestingModule],
+  });
 
-  assertPageInfo<AnalysisJob>(AudioAnalysisComponent, "Test Analysis Job", {
+  assertPageInfo<AnalysisJob>(AnalysisJobComponent, "Test Analysis Job", {
     analysisJob: {
       model: new AnalysisJob(generateAnalysisJob({ name: "Test Analysis Job" })),
+    },
+  });
+
+  function setup(model?: AnalysisJob, error?: BawApiError) {
+    spec = createComponent({
+      detectChanges: false,
+      providers: [
+        {
+          provide: ActivatedRoute,
+          useValue: mockActivatedRoute(
+            { analysisJob: "resolver" },
+            { analysisJob: { model, error } }
+          ),
+        },
+      ],
+    });
+
+    injector = spec.inject(ASSOCIATION_INJECTOR);
+    if (model) {
+      model["injector"] = injector;
     }
+
+    const accountsApi = spec.inject(ACCOUNT.token);
+    const scriptsApi = spec.inject(SCRIPT.token);
+
+    const accountsSubject = new Subject<User>();
+    const scriptsSubject = new Subject<Script>();
+
+    const promise = Promise.all([
+      nStepObservable(
+        accountsSubject,
+        () => new User(generateUser({ id: 1, userName: "custom username" }))
+      ),
+      nStepObservable(
+        scriptsSubject,
+        () => new Script(generateScript({ id: 1, name: "custom script" }))
+      ),
+    ]);
+
+    // Catch associated models
+    accountsApi.show.and.callFake(() => accountsSubject);
+    scriptsApi.show.and.callFake(() => scriptsSubject);
+
+    return promise;
+  }
+
+  it("should create", () => {
+    setup(new AnalysisJob(generateAnalysisJob()));
+    spec.detectChanges();
+    expect(spec.component).toBeTruthy();
+  });
+
+  it("should handle error", () => {
+    setup(undefined, generateBawApiError());
+    spec.detectChanges();
+    expect(spec.component).toBeTruthy();
+  });
+
+  describe("details", () => {
+    // when asserting the details page, I use an analysis job model with only
+    // one associated script and audioEventImport model because the assertDetail()
+    // function will not work correctly if there is an array of associated models
+    //
+    // TODO: This should be fixed correctly by fixing the bugs in assertDetail()
+    const model = new AnalysisJob(
+      generateAnalysisJob({
+        scriptIds: [modelData.id()],
+        audioEventImportIds: [modelData.id()],
+      })
+    );
+
+    beforeEach(async function () {
+      const promise = setup(model);
+      spec.detectChanges();
+      await promise;
+      spec.detectChanges();
+      this.fixture = spec.fixture;
+    });
+
+    const details: Detail[] = [
+      { label: "Id", key: "id", plain: model.id },
+      { label: "Name", key: "name", plain: model.name },
+      {
+        label: "Scripts",
+        key: "script",
+        children: [{ model: "Script: custom script (1)" }],
+      },
+      { label: "Started At", key: "startedAt", dateTime: model.startedAt },
+      {
+        label: "Overall Status",
+        key: "overallStatus",
+        plain: model.overallStatus,
+      },
+      {
+        label: "Overall Status Modified At",
+        key: "overallStatusModifiedAt",
+        dateTime: model.overallStatusModifiedAt,
+      },
+      {
+        label: "Overall Count",
+        key: "overallCount",
+        plain: model.overallCount,
+      },
+      {
+        label: "Overall Duration",
+        key: "overallDuration",
+        duration: model.overallDuration,
+      },
+      {
+        label: "Overall Data Length Bytes",
+        key: "overallDataLengthBytes",
+        plain: model.overallDataLengthBytes,
+      },
+    ];
+
+    details.forEach((detail) => assertDetail(detail));
   });
 });
+
diff --git a/src/app/components/audio-analysis/pages/details/details.component.ts b/src/app/components/audio-analysis/pages/details/details.component.ts
index e528ac007..bb43b967f 100644
--- a/src/app/components/audio-analysis/pages/details/details.component.ts
+++ b/src/app/components/audio-analysis/pages/details/details.component.ts
@@ -1,39 +1,62 @@
-import { Component } from "@angular/core";
+import { Component, OnInit } from "@angular/core";
 import { analysisJobResolvers } from "@baw-api/analysis/analysis-jobs.service";
-import {
-  audioAnalysisCategory,
-  audioAnalysisMenuItem,
-  audioAnalysisResultsMenuItem,
-  deleteAudioAnalysisMenuItem,
-  pauseProcessingMenuItem,
-  retryFailedItemsMenuItem,
-} from "@components/audio-analysis/audio-analysis.menus";
+import { analysisCategory, analysisJobMenuItem } from "@components/audio-analysis/analysis-jobs.menus";
 import { PageComponent } from "@helpers/page/pageComponent";
+import { withUnsubscribe } from "@helpers/unsubscribe/unsubscribe";
 import { permissionsWidgetMenuItem } from "@menu/widget.menus";
 import { List } from "immutable";
+import { ActivatedRoute } from "@angular/router";
+import { retrieveResolvers, hasResolvedSuccessfully } from "@baw-api/resolver-common";
+import { IPageInfo } from "@helpers/page/pageInfo";
+import { AnalysisJob } from "@models/AnalysisJob";
+import { projectResolvers } from "@baw-api/project/projects.service";
+import { Project } from "@models/Project";
+import schema from "../../analysis-job.schema.json";
 
-const audioAnalysisKey = "audioAnalysis";
+const analysisJobKey = "analysisJob";
+const projectKey = "project";
 
-//TODO: OLD-CLIENT REMOVE
 @Component({
-  selector: "baw-audio-analysis",
-  template: "<baw-client></baw-client>",
+  selector: "baw-analysis",
+  templateUrl: "details.component.html",
 })
-class AudioAnalysisComponent extends PageComponent {}
+class AnalysisJobComponent
+  extends withUnsubscribe(PageComponent)
+  implements OnInit
+{
+  public analysisJob: AnalysisJob;
+  public failure: boolean;
+  public fields = schema.fields;
+  public project: Project;
 
-AudioAnalysisComponent.linkToRoute({
-  category: audioAnalysisCategory,
-  pageRoute: audioAnalysisMenuItem,
+  public constructor(private route: ActivatedRoute) {
+    super();
+  }
+
+  public ngOnInit(): void {
+    const data = this.route.snapshot.data;
+    const models = retrieveResolvers(data as IPageInfo);
+
+    if (!hasResolvedSuccessfully(models)) {
+      this.failure = true;
+      return;
+    }
+
+    this.analysisJob = models[analysisJobKey] as AnalysisJob;
+    this.project = models[projectKey] as Project;
+  }
+}
+
+AnalysisJobComponent.linkToRoute({
+  category: analysisCategory,
+  pageRoute: analysisJobMenuItem,
   menus: {
-    actions: List([
-      audioAnalysisResultsMenuItem,
-      retryFailedItemsMenuItem,
-      pauseProcessingMenuItem,
-      deleteAudioAnalysisMenuItem,
-    ]),
     actionWidgets: List([permissionsWidgetMenuItem]),
   },
-  resolvers: { [audioAnalysisKey]: analysisJobResolvers.show },
+  resolvers: {
+    [analysisJobKey]: analysisJobResolvers.show,
+    [projectKey]: projectResolvers.show,
+  },
 });
 
-export { AudioAnalysisComponent };
+export { AnalysisJobComponent };
diff --git a/src/app/components/audio-analysis/pages/list/list.component.html b/src/app/components/audio-analysis/pages/list/list.component.html
new file mode 100644
index 000000000..ed9c053fc
--- /dev/null
+++ b/src/app/components/audio-analysis/pages/list/list.component.html
@@ -0,0 +1,55 @@
+<ng-container *ngIf="rows && !error">
+  <h1>Analysis Jobs</h1>
+
+  <p>
+    Displaying <strong>{{ pageSize }}</strong> of
+    <strong>all {{ totalModels }}</strong> analysis jobs.
+  </p>
+
+  <ngx-datatable
+    #table
+    bawDatatableDefaults
+    [columns]="columns"
+    [rows]="rows"
+    [count]="totalModels"
+    [offset]="pageNumber"
+    (page)="setPage($event)"
+    (sort)="onSort($event)"
+  >
+    <ngx-datatable-column name="Name"></ngx-datatable-column>
+    <ngx-datatable-column name="Scripts" [width]="50" [sortable]="false">
+      <ng-template let-value="value" ngx-datatable-cell-template>
+        <baw-inline-list [items]="value.scripts" itemKey="name"></baw-inline-list>
+      </ng-template>
+    </ngx-datatable-column>
+    <ngx-datatable-column name="Creator" [sortable]="false">
+      <ng-template let-value="value" ngx-datatable-cell-template>
+        <baw-user-link [user]="value.creator"></baw-user-link>
+      </ng-template>
+    </ngx-datatable-column>
+    <ngx-datatable-column name="Started" [width]="110" [maxWidth]="110">
+      <ng-template let-value="value" ngx-datatable-cell-template>
+        @if (value) {
+        <baw-datetime [value]="value"></baw-datetime>
+        } @else {
+        <span>Unknown</span>
+        }
+      </ng-template>
+    </ngx-datatable-column>
+    <ngx-datatable-column name="Status"></ngx-datatable-column>
+    <ngx-datatable-column name="Status Updated" [width]="115" [maxWidth]="115">
+      <ng-template let-value="value" ngx-datatable-cell-template>
+        <baw-datetime [value]="value"></baw-datetime>
+      </ng-template>
+    </ngx-datatable-column>
+    <ngx-datatable-column name="Model" [sortable]="false">
+      <ng-template let-value="value" ngx-datatable-cell-template>
+        <a class="btn btn-sm btn-primary" [bawUrl]="value?.createViewUrl(project?.id)">
+          View
+        </a>
+      </ng-template>
+    </ngx-datatable-column>
+  </ngx-datatable>
+</ng-container>
+
+<baw-error-handler *ngIf="error" [error]="error"></baw-error-handler>
diff --git a/src/app/components/audio-analysis/pages/list/list.component.spec.ts b/src/app/components/audio-analysis/pages/list/list.component.spec.ts
index 695f2b6dc..37458ab88 100644
--- a/src/app/components/audio-analysis/pages/list/list.component.spec.ts
+++ b/src/app/components/audio-analysis/pages/list/list.component.spec.ts
@@ -1,17 +1,84 @@
-import { audioAnalysesRoute } from "@components/audio-analysis/audio-analysis.menus";
-import { AudioAnalysisModule } from "@components/audio-analysis/audio-analysis.module";
-import { validateBawClientPage } from "@test/helpers/baw-client";
+import { RouterTestingModule } from "@angular/router/testing";
+import { AnalysisJobsService } from "@baw-api/analysis/analysis-jobs.service";
+import { defaultApiPageSize, InnerFilter } from "@baw-api/baw-api.service";
+import { MockBawApiModule } from "@baw-api/baw-apiMock.module";
+import { AnalysisJob } from "@models/AnalysisJob";
+import { createRoutingFactory, Spectator, SpyObject } from "@ngneat/spectator";
+import { SharedModule } from "@shared/shared.module";
+import { generateAnalysisJob } from "@test/fakes/AnalysisJob";
 import { assertPageInfo } from "@test/helpers/pageRoute";
-import { AudioAnalysesComponent } from "./list.component";
-
-describe("AudioAnalysesComponent", () => {
-  validateBawClientPage(
-    audioAnalysesRoute,
-    AudioAnalysesComponent,
-    [AudioAnalysisModule],
-    "/audio_analysis",
-    "This is a list of analysis jobs you have access to."
-  );
-
-  assertPageInfo(AudioAnalysesComponent, "Audio Analysis");
+import { assertPagination } from "@test/helpers/pagedTableTemplate";
+import { ACCOUNT, ANALYSIS_JOB, SCRIPT } from "@baw-api/ServiceTokens";
+import { ASSOCIATION_INJECTOR } from "@services/association-injector/association-injector.tokens";
+import { AssociationInjector } from "@models/ImplementsInjector";
+import { of } from "rxjs";
+import { Script } from "@models/Script";
+import { generateScript } from "@test/fakes/Script";
+import { User } from "@models/User";
+import { generateUser } from "@test/fakes/User";
+import { Project } from "@models/Project";
+import { generateProject } from "@test/fakes/Project";
+import { AnalysesComponent } from "./list.component";
+
+describe("AnalysesComponent", () => {
+  let spec: Spectator<AnalysesComponent>;
+
+  let api: SpyObject<AnalysisJobsService>;
+  let defaultModels: AnalysisJob[];
+
+  let injector: SpyObject<AssociationInjector>;
+
+  const createComponent = createRoutingFactory({
+    component: AnalysesComponent,
+    imports: [SharedModule, RouterTestingModule, MockBawApiModule],
+  });
+
+  beforeEach(function () {
+    const mockProject = new Project(generateProject());
+
+    spec = createComponent({
+      detectChanges: false,
+      data: {
+        project: { model: mockProject },
+      },
+    });
+
+    injector = spec.inject(ASSOCIATION_INJECTOR);
+    api = spec.inject(ANALYSIS_JOB.token);
+    const mockScriptsApi = spec.inject(SCRIPT.token);
+    const mockAccountsApi = spec.inject(ACCOUNT.token);
+
+    defaultModels = [];
+    for (let i = 0; i < defaultApiPageSize; i++) {
+      defaultModels.push(new AnalysisJob(generateAnalysisJob(), injector));
+    }
+
+    const expectedInnerFilters = {
+      or: {
+        projectId: { eq: mockProject.id },
+        systemJob: { eq: true },
+      },
+    } as const satisfies InnerFilter<AnalysisJob>;
+
+    mockScriptsApi.show.and.returnValue(() => of(new Script(generateScript(), injector)));
+    mockAccountsApi.show.and.callFake(() => of(new User(generateUser(), injector)));
+
+    this.defaultInnerFilters = expectedInnerFilters;
+    this.defaultModels = defaultModels;
+    this.fixture = spec.fixture;
+    this.api = api;
+  });
+
+  assertPagination<AnalysisJob, AnalysisJobsService>();
+
+  assertPageInfo(AnalysesComponent, "Analysis Jobs")
+
+  it("should create", () => {
+    expect(spec.component).toBeInstanceOf(AnalysesComponent);
+  });
+
+  // TODO Write Tests
+  // xdescribe("rows", () => {});
+  // xdescribe("actions", () => {});
 });
+
diff --git a/src/app/components/audio-analysis/pages/list/list.component.ts b/src/app/components/audio-analysis/pages/list/list.component.ts
index b25620c78..3b1f22a12 100644
--- a/src/app/components/audio-analysis/pages/list/list.component.ts
+++ b/src/app/components/audio-analysis/pages/list/list.component.ts
@@ -1,23 +1,115 @@
 import { Component } from "@angular/core";
+import { ActivatedRoute } from "@angular/router";
+import { AnalysisJobsService } from "@baw-api/analysis/analysis-jobs.service";
+import { Filters } from "@baw-api/baw-api.service";
+import { projectResolvers } from "@baw-api/project/projects.service";
 import {
-  audioAnalysesMenuItem,
-  audioAnalysisCategory,
-  newAudioAnalysisMenuItem,
-} from "@components/audio-analysis/audio-analysis.menus";
-import { PageComponent } from "@helpers/page/pageComponent";
-import { List } from "immutable";
-
-//TODO: OLD-CLIENT REMOVE
+  analysesMenuItem,
+  analysisCategory,
+} from "@components/audio-analysis/analysis-jobs.menus";
+import { PagedTableTemplate } from "@helpers/tableTemplate/pagedTableTemplate";
+import { Param } from "@interfaces/apiInterfaces";
+import { AnalysisJob } from "@models/AnalysisJob";
+import { Project } from "@models/Project";
+import { DateTime } from "luxon";
+import { Observable } from "rxjs";
+
+interface TableRow {
+  name: Param;
+  scripts: AnalysisJob;
+  creator: AnalysisJob;
+  started: DateTime;
+  status: string;
+  statusUpdated: DateTime;
+  model: AnalysisJob;
+}
+
+const projectKey = "project";
+
 @Component({
-  selector: "baw-audio-analyses",
-  template: "<baw-client></baw-client>",
+  selector: "baw-analyses",
+  templateUrl: "list.component.html",
 })
-class AudioAnalysesComponent extends PageComponent {}
+class AnalysesComponent extends PagedTableTemplate<TableRow, AnalysisJob> {
+  public constructor(
+    protected api: AnalysisJobsService,
+    protected route: ActivatedRoute
+  ) {
+    super(api, (analysisJobs) =>
+      analysisJobs.map((analysisJob) => ({
+        name: analysisJob.name,
+        scripts: analysisJob,
+        creator: analysisJob,
+        started: analysisJob.startedAt,
+        status: analysisJob.overallStatus,
+        statusUpdated: analysisJob.updatedAt,
+        model: analysisJob,
+      }))
+    );
+  }
+
+  public columns = [
+    { name: "Id" },
+    { name: "Name" },
+    { name: "Scripts" },
+    { name: "Creator" },
+    { name: "Started" },
+    { name: "Status" },
+    { name: "Updated" },
+    { name: "Actions" },
+  ];
+
+  public sortKeys = {
+    id: "id",
+    name: "name",
+    started: "startedAt",
+    status: "overallStatus",
+    statusUpdated: "overallStatusModifiedAt",
+  };
+
+  public get project(): Project | null {
+    const routeProjectModel = this.route.snapshot.data[projectKey];
+    if (routeProjectModel) {
+      return routeProjectModel.model;
+    }
+
+    // we should never reach this case but I throw an error in this case so that
+    // the page will hard fail and the user won't be stuck in untested and
+    // partial/buggy site state
+    throw new Error("Project is not defined in route");
+  }
+
+  protected override apiAction(
+    filters: Filters<AnalysisJob>
+  ): Observable<AnalysisJob[]> {
+    if (!this.project) {
+      return this.api.filter(filters);
+    }
+
+    const filterByProject: Filters<AnalysisJob> = {
+      filter: {
+        or: {
+          projectId: { eq: this.project.id },
+          systemJob: { eq: true },
+        },
+      },
+    };
+
+    const actionedFilters = {
+      ...filters,
+      ...filterByProject,
+    } satisfies Filters<AnalysisJob>;
+
+    return this.api.filter(actionedFilters);
+  }
+}
 
-AudioAnalysesComponent.linkToRoute({
-  category: audioAnalysisCategory,
-  pageRoute: audioAnalysesMenuItem,
-  menus: { actions: List([newAudioAnalysisMenuItem]) },
+AnalysesComponent.linkToRoute({
+  category: analysisCategory,
+  pageRoute: analysesMenuItem,
+  resolvers: {
+    [projectKey]: projectResolvers.show,
+  },
 });
 
-export { AudioAnalysesComponent };
+export { AnalysesComponent };
diff --git a/src/app/components/audio-analysis/pages/new/new.component.spec.ts b/src/app/components/audio-analysis/pages/new/new.component.spec.ts
deleted file mode 100644
index c968421bf..000000000
--- a/src/app/components/audio-analysis/pages/new/new.component.spec.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { audioAnalysesRoute } from "@components/audio-analysis/audio-analysis.menus";
-import { AudioAnalysisModule } from "@components/audio-analysis/audio-analysis.module";
-import { validateBawClientPage } from "@test/helpers/baw-client";
-import { assertPageInfo } from "@test/helpers/pageRoute";
-import { NewAudioAnalysisComponent } from "./new.component";
-
-describe("NewAudioAnalysisComponent", () => {
-  validateBawClientPage(
-    audioAnalysesRoute,
-    NewAudioAnalysisComponent,
-    [AudioAnalysisModule],
-    "/audio_analysis/new",
-    "Use this page to select the data to analyze, choose the analysis to run"
-  );
-
-  assertPageInfo(NewAudioAnalysisComponent, "New Analysis Job");
-});
diff --git a/src/app/components/audio-analysis/pages/new/new.component.ts b/src/app/components/audio-analysis/pages/new/new.component.ts
deleted file mode 100644
index 538b567e7..000000000
--- a/src/app/components/audio-analysis/pages/new/new.component.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { Component } from "@angular/core";
-import {
-  audioAnalysisCategory,
-  newAudioAnalysisMenuItem,
-} from "@components/audio-analysis/audio-analysis.menus";
-import { PageComponent } from "@helpers/page/pageComponent";
-
-//TODO: OLD-CLIENT REMOVE
-@Component({
-  selector: "baw-new-audio-analyses",
-  template: "<baw-client></baw-client>",
-})
-class NewAudioAnalysisComponent extends PageComponent {}
-
-NewAudioAnalysisComponent.linkToRoute({
-  category: audioAnalysisCategory,
-  pageRoute: newAudioAnalysisMenuItem,
-});
-
-export { NewAudioAnalysisComponent };
diff --git a/src/app/components/audio-analysis/pages/results/results.component.spec.ts b/src/app/components/audio-analysis/pages/results/results.component.spec.ts
deleted file mode 100644
index b7f5487ba..000000000
--- a/src/app/components/audio-analysis/pages/results/results.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { AnalysisJobsService } from "@baw-api/analysis/analysis-jobs.service";
-import { audioAnalysesRoute } from "@components/audio-analysis/audio-analysis.menus";
-import { AudioAnalysisModule } from "@components/audio-analysis/audio-analysis.module";
-import { AnalysisJob } from "@models/AnalysisJob";
-import { generateAnalysisJob } from "@test/fakes/AnalysisJob";
-import { validateBawClientPage } from "@test/helpers/baw-client";
-import { BehaviorSubject } from "rxjs";
-import { AudioAnalysisResultsComponent } from "./results.component";
-
-describe("AudioAnalysisResultsComponent", () => {
-  validateBawClientPage(
-    audioAnalysesRoute,
-    AudioAnalysisResultsComponent,
-    [AudioAnalysisModule],
-    "/audio_analysis/123/results",
-    "Results are available as they are generated. There is a basic file explorer below",
-    (spec) => {
-      const analysisJobApi = spec.inject(AnalysisJobsService);
-      analysisJobApi.show.andCallFake(
-        (id: number) =>
-          new BehaviorSubject(new AnalysisJob(generateAnalysisJob({ id })))
-      );
-    }
-  );
-});
diff --git a/src/app/components/audio-analysis/pages/results/results.component.ts b/src/app/components/audio-analysis/pages/results/results.component.ts
deleted file mode 100644
index 4a482541c..000000000
--- a/src/app/components/audio-analysis/pages/results/results.component.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import { Component } from "@angular/core";
-import { analysisJobResolvers } from "@baw-api/analysis/analysis-jobs.service";
-import {
-  audioAnalysisCategory,
-  audioAnalysisResultsMenuItem,
-  downloadAudioAnalysisResultsMenuItem,
-} from "@components/audio-analysis/audio-analysis.menus";
-import { PageComponent } from "@helpers/page/pageComponent";
-import { permissionsWidgetMenuItem } from "@menu/widget.menus";
-import { List } from "immutable";
-
-const audioAnalysisKey = "audioAnalysis";
-
-//TODO: OLD-CLIENT REMOVE
-@Component({
-  selector: "baw-audio-analysis-results",
-  template: "<baw-client></baw-client>",
-})
-class AudioAnalysisResultsComponent extends PageComponent {}
-
-AudioAnalysisResultsComponent.linkToRoute({
-  category: audioAnalysisCategory,
-  pageRoute: audioAnalysisResultsMenuItem,
-  menus: {
-    actions: List([downloadAudioAnalysisResultsMenuItem]),
-    actionWidgets: List([permissionsWidgetMenuItem]),
-  },
-  resolvers: { [audioAnalysisKey]: analysisJobResolvers.show },
-});
-
-export { AudioAnalysisResultsComponent };
diff --git a/src/app/components/audio-recordings/pages/list/list.component.ts b/src/app/components/audio-recordings/pages/list/list.component.ts
index 0c2e57d56..4eaab86f8 100644
--- a/src/app/components/audio-recordings/pages/list/list.component.ts
+++ b/src/app/components/audio-recordings/pages/list/list.component.ts
@@ -140,7 +140,7 @@ class AudioRecordingsListComponent
     this.getPageData();
   }
 
-  protected apiAction(
+  protected override apiAction(
     filters: Filters<AudioRecording>
   ): Observable<AudioRecording[]> {
     if (this.site) {
diff --git a/src/app/components/projects/pages/details/details.component.ts b/src/app/components/projects/pages/details/details.component.ts
index 6066492d7..239c69d95 100644
--- a/src/app/components/projects/pages/details/details.component.ts
+++ b/src/app/components/projects/pages/details/details.component.ts
@@ -37,6 +37,7 @@ import { List } from "immutable";
 import { ToastrService } from "ngx-toastr";
 import { merge, Observable, takeUntil } from "rxjs";
 import { annotationMenuItems } from "@components/annotations/annotation.menu";
+import { analysesMenuItem } from "@components/audio-analysis/analysis-jobs.menus";
 
 export const projectMenuItemActions = [
   visualizeMenuItem,
@@ -51,6 +52,7 @@ export const projectMenuItemActions = [
   harvestsMenuItem,
   reportMenuItems.new.project,
   annotationMenuItems.search.project,
+  analysesMenuItem,
 ];
 
 const projectKey = "project";
diff --git a/src/app/components/admin/scripts/details/details.component.spec.ts b/src/app/components/scripts/details/details.component.spec.ts
similarity index 97%
rename from src/app/components/admin/scripts/details/details.component.spec.ts
rename to src/app/components/scripts/details/details.component.spec.ts
index 6e83ce1ea..f7f603dd6 100644
--- a/src/app/components/admin/scripts/details/details.component.spec.ts
+++ b/src/app/components/scripts/details/details.component.spec.ts
@@ -136,11 +136,6 @@ describe("ScriptComponent", () => {
         key: "executableSettingsMediaType",
         plain: model.executableSettingsMediaType,
       },
-      {
-        label: "Analysis Action Parameters",
-        key: "analysisActionParams",
-        code: model.analysisActionParams,
-      },
       { label: "Verified", key: "verified", checkbox: model.verified },
       { label: "Group Id", key: "groupId", plain: model.groupId },
       { label: "Group", key: "group", model: "Script: custom script (1)" },
diff --git a/src/app/components/admin/scripts/details/details.component.ts b/src/app/components/scripts/details/details.component.ts
similarity index 97%
rename from src/app/components/admin/scripts/details/details.component.ts
rename to src/app/components/scripts/details/details.component.ts
index ae1324c75..546f4a4e6 100644
--- a/src/app/components/admin/scripts/details/details.component.ts
+++ b/src/app/components/scripts/details/details.component.ts
@@ -15,7 +15,7 @@ import baseSchema from "../script.base.schema.json";
 import extendedSchema from "../script.extended.schema.json";
 import {
   adminEditScriptMenuItem,
-  adminScriptMenuItem,
+  scriptMenuItem,
   adminScriptsCategory,
 } from "../scripts.menus";
 
@@ -35,14 +35,14 @@ class AdminScriptComponent
   extends withUnsubscribe(PageComponent)
   implements OnInit
 {
-  public script: Script;
-  public failure: boolean;
-  public fields = [...baseSchema.fields, ...extendedSchema.fields];
-
   public constructor(private route: ActivatedRoute) {
     super();
   }
 
+  public script: Script;
+  public failure: boolean;
+  public fields = [...baseSchema.fields, ...extendedSchema.fields];
+
   public ngOnInit(): void {
     const models = retrieveResolvers(this.route.snapshot.data as IPageInfo);
 
@@ -57,7 +57,7 @@ class AdminScriptComponent
 
 AdminScriptComponent.linkToRoute({
   category: adminScriptsCategory,
-  pageRoute: adminScriptMenuItem,
+  pageRoute: scriptMenuItem,
   menus: {
     actions: List(adminScriptActions),
     actionWidgets: List([permissionsWidgetMenuItem]),
diff --git a/src/app/components/admin/scripts/edit/edit.component.spec.ts b/src/app/components/scripts/edit/edit.component.spec.ts
similarity index 88%
rename from src/app/components/admin/scripts/edit/edit.component.spec.ts
rename to src/app/components/scripts/edit/edit.component.spec.ts
index f70b2d009..835cdb95c 100644
--- a/src/app/components/admin/scripts/edit/edit.component.spec.ts
+++ b/src/app/components/scripts/edit/edit.component.spec.ts
@@ -18,6 +18,8 @@ import { mockActivatedRoute } from "@test/helpers/testbed";
 import { ToastrService } from "ngx-toastr";
 import { Subject } from "rxjs";
 import { appLibraryImports } from "src/app/app.module";
+import { AssociationInjector } from "@models/ImplementsInjector";
+import { ASSOCIATION_INJECTOR } from "@services/association-injector/association-injector.tokens";
 import { AdminScriptsEditComponent } from "./edit.component";
 
 describe("AdminScriptsEditComponent", () => {
@@ -27,8 +29,9 @@ describe("AdminScriptsEditComponent", () => {
   let fixture: ComponentFixture<AdminScriptsEditComponent>;
   let notifications: ToastrService;
   let router: Router;
+  let injector: AssociationInjector;
 
-  function configureTestingModule(model: Script, error?: BawApiError) {
+  function configureTestingModule(model?: Script, error?: BawApiError) {
     TestBed.configureTestingModule({
       imports: [
         ...appLibraryImports,
@@ -52,6 +55,12 @@ describe("AdminScriptsEditComponent", () => {
     api = TestBed.inject(ScriptsService) as SpyObject<ScriptsService>;
     router = TestBed.inject(Router);
     notifications = TestBed.inject(ToastrService);
+
+    injector = TestBed.inject(ASSOCIATION_INJECTOR);
+    if (model) {
+      model["injector"] = injector;
+    }
+
     component = fixture.componentInstance;
 
     spyOn(notifications, "success").and.stub();
diff --git a/src/app/components/admin/scripts/edit/edit.component.ts b/src/app/components/scripts/edit/edit.component.ts
similarity index 100%
rename from src/app/components/admin/scripts/edit/edit.component.ts
rename to src/app/components/scripts/edit/edit.component.ts
index 4691c69c8..fd57c4cc3 100644
--- a/src/app/components/admin/scripts/edit/edit.component.ts
+++ b/src/app/components/scripts/edit/edit.component.ts
@@ -35,9 +35,6 @@ const scriptKey = "script";
   `,
 })
 class AdminScriptsEditComponent extends FormTemplate<Script> implements OnInit {
-  public fields = schema.fields;
-  public title: string;
-
   public constructor(
     private api: ScriptsService,
     notifications: ToastrService,
@@ -51,6 +48,9 @@ class AdminScriptsEditComponent extends FormTemplate<Script> implements OnInit {
     });
   }
 
+  public fields = schema.fields;
+  public title: string;
+
   public ngOnInit() {
     super.ngOnInit();
 
diff --git a/src/app/components/admin/scripts/list/list.component.html b/src/app/components/scripts/list/list.component.html
similarity index 81%
rename from src/app/components/admin/scripts/list/list.component.html
rename to src/app/components/scripts/list/list.component.html
index a4c033fdb..693553dd7 100644
--- a/src/app/components/admin/scripts/list/list.component.html
+++ b/src/app/components/scripts/list/list.component.html
@@ -30,24 +30,22 @@ <h1>Scripts</h1>
     <ngx-datatable-column name="Command" [sortable]="false">
     </ngx-datatable-column>
     <ngx-datatable-column
+      *ngIf="session.isLoggedIn"
       name="Model"
       [width]="155"
       [maxWidth]="155"
       [sortable]="false"
     >
       <ng-template let-column="column" ngx-datatable-header-template>
+        Actions
       </ng-template>
+
       <ng-template let-value="value" ngx-datatable-cell-template>
-        <a
-          class="btn btn-sm btn-default me-1"
-          [strongRoute]="updatePath"
-          [routeParams]="{ scriptId: value.id }"
-        >
-          Update
-        </a>
-        <a class="btn btn-sm btn-default" [bawUrl]="value.adminViewUrl">
-          Details
-        </a>
+        <baw-can [ifLoggedIn]="true">
+          <a class="btn btn-sm btn-primary me-1" [bawUrl]="value.viewUrl">
+            View
+          </a>
+        </baw-can>
       </ng-template>
     </ngx-datatable-column>
   </ngx-datatable>
diff --git a/src/app/components/admin/scripts/list/list.component.spec.ts b/src/app/components/scripts/list/list.component.spec.ts
similarity index 100%
rename from src/app/components/admin/scripts/list/list.component.spec.ts
rename to src/app/components/scripts/list/list.component.spec.ts
diff --git a/src/app/components/admin/scripts/list/list.component.ts b/src/app/components/scripts/list/list.component.ts
similarity index 69%
rename from src/app/components/admin/scripts/list/list.component.ts
rename to src/app/components/scripts/list/list.component.ts
index da8888eb3..b6d07648c 100644
--- a/src/app/components/admin/scripts/list/list.component.ts
+++ b/src/app/components/scripts/list/list.component.ts
@@ -1,23 +1,45 @@
-import { Component } from "@angular/core";
+import { Component, OnInit } from "@angular/core";
 import { ScriptsService } from "@baw-api/script/scripts.service";
 import { PagedTableTemplate } from "@helpers/tableTemplate/pagedTableTemplate";
 import { Id } from "@interfaces/apiInterfaces";
 import { Script } from "@models/Script";
 import { List } from "immutable";
+import { BawSessionService } from "@baw-api/baw-session.service";
+import { User } from "@models/User";
 import {
   adminEditScriptMenuItem,
-  adminNewScriptsMenuItem,
+  newScriptMenuItem,
   adminScriptsCategory,
-  adminScriptsMenuItem,
+  scriptsMenuItem,
 } from "../scripts.menus";
 
-export const adminScriptsMenuItemActions = [adminNewScriptsMenuItem];
+export const adminScriptsMenuItemActions = [newScriptMenuItem];
 
 @Component({
-  selector: "baw-admin-scripts",
+  selector: "baw-scripts",
   templateUrl: "./list.component.html",
 })
-class AdminScriptsComponent extends PagedTableTemplate<TableRow, Script> {
+class AdminScriptsComponent
+  extends PagedTableTemplate<TableRow, Script>
+  implements OnInit
+{
+  public constructor(
+    protected api: ScriptsService,
+    protected session: BawSessionService
+  ) {
+    super(api, (scripts) =>
+      scripts.map((script) => ({
+        name: script.name,
+        version: script.version,
+        id: script.id,
+        command: script.executableCommand,
+        model: script,
+      }))
+    );
+
+    this.filterKey = "name";
+  }
+
   public columns = [
     { name: "Name" },
     { name: "Version" },
@@ -25,31 +47,20 @@ class AdminScriptsComponent extends PagedTableTemplate<TableRow, Script> {
     { name: "Command" },
     { name: "Model" },
   ];
+
   public sortKeys = {
     name: "name",
     version: "version",
     id: "id",
   };
-  public updatePath = adminEditScriptMenuItem.route;
-
-  public constructor(api: ScriptsService) {
-    super(api, (scripts) =>
-      scripts.map((script) => ({
-        name: script.name,
-        version: script.version,
-        id: script.id,
-        command: script.executableCommand,
-        model: script,
-      }))
-    );
 
-    this.filterKey = "name";
-  }
+  public updatePath = adminEditScriptMenuItem.route;
+  protected user?: User;
 }
 
 AdminScriptsComponent.linkToRoute({
   category: adminScriptsCategory,
-  pageRoute: adminScriptsMenuItem,
+  pageRoute: scriptsMenuItem,
   menus: { actions: List(adminScriptsMenuItemActions) },
 });
 
diff --git a/src/app/components/admin/scripts/new/new.component.spec.ts b/src/app/components/scripts/new/new.component.spec.ts
similarity index 100%
rename from src/app/components/admin/scripts/new/new.component.spec.ts
rename to src/app/components/scripts/new/new.component.spec.ts
diff --git a/src/app/components/admin/scripts/new/new.component.ts b/src/app/components/scripts/new/new.component.ts
similarity index 94%
rename from src/app/components/admin/scripts/new/new.component.ts
rename to src/app/components/scripts/new/new.component.ts
index 417240a28..bd40289a8 100644
--- a/src/app/components/admin/scripts/new/new.component.ts
+++ b/src/app/components/scripts/new/new.component.ts
@@ -11,7 +11,7 @@ import { ToastrService } from "ngx-toastr";
 import { adminScriptsMenuItemActions } from "../list/list.component";
 import schema from "../script.base.schema.json";
 import {
-  adminNewScriptsMenuItem,
+  newScriptMenuItem,
   adminScriptsCategory,
 } from "../scripts.menus";
 
@@ -29,13 +29,10 @@ import {
       [fields]="fields"
       [submitLoading]="loading"
       (onSubmit)="submit($event)"
-    >
-    </baw-form>
+    ></baw-form>
   `,
 })
 class AdminScriptsNewComponent extends FormTemplate<Script> {
-  public fields = schema.fields;
-
   public constructor(
     private api: ScriptsService,
     notifications: ToastrService,
@@ -48,6 +45,8 @@ class AdminScriptsNewComponent extends FormTemplate<Script> {
     });
   }
 
+  public fields = schema.fields;
+
   protected apiAction(model: Partial<Script>) {
     return this.api.create(new Script(model));
   }
@@ -55,7 +54,7 @@ class AdminScriptsNewComponent extends FormTemplate<Script> {
 
 AdminScriptsNewComponent.linkToRoute({
   category: adminScriptsCategory,
-  pageRoute: adminNewScriptsMenuItem,
+  pageRoute: newScriptMenuItem,
   menus: { actions: List(adminScriptsMenuItemActions) },
 });
 
diff --git a/src/app/components/admin/scripts/script.base.schema.json b/src/app/components/scripts/script.base.schema.json
similarity index 69%
rename from src/app/components/admin/scripts/script.base.schema.json
rename to src/app/components/scripts/script.base.schema.json
index aa2d3985f..2a707771a 100644
--- a/src/app/components/admin/scripts/script.base.schema.json
+++ b/src/app/components/scripts/script.base.schema.json
@@ -73,19 +73,28 @@
       }
     },
     {
-      "key": "analysisActionParams",
-      "type": "textarea",
+      "key": "verified",
+      "type": "checkbox",
       "props": {
-        "label": "Analysis Action Parameters",
-        "required": false,
-        "rows": 8
+        "label": "Verified"
       }
     },
     {
-      "key": "verified",
+      "key": "isLastVersion",
       "type": "checkbox",
+      "hide": true,
       "props": {
-        "label": "Verified"
+        "label": "Is Last Version",
+        "disabled": true
+      }
+    },
+    {
+      "key": "isFirstVersion",
+      "type": "checkbox",
+      "hide": true,
+      "props": {
+        "label": "Is First Version",
+        "disabled": true
       }
     },
     {
@@ -95,6 +104,32 @@
         "label": "Group Id",
         "disabled": true
       }
+    },
+    {
+      "key": "provenanceId",
+      "hide": true,
+      "props": {
+        "label": "Provenance Id",
+        "disabled": true
+      }
+    },
+    {
+      "key": "provenance",
+      "hide": true,
+      "props": {
+        "label": "Provenance",
+        "type": "text"
+      }
+    },
+    {
+      "key": "resources",
+      "type": "textarea",
+      "hide": true,
+      "props": {
+        "label": "PBS Resources",
+        "rows": 8,
+        "disabled": true
+      }
     }
   ]
 }
diff --git a/src/app/components/admin/scripts/script.extended.schema.json b/src/app/components/scripts/script.extended.schema.json
similarity index 100%
rename from src/app/components/admin/scripts/script.extended.schema.json
rename to src/app/components/scripts/script.extended.schema.json
diff --git a/src/app/components/admin/scripts/scripts.menus.ts b/src/app/components/scripts/scripts.menus.ts
similarity index 62%
rename from src/app/components/admin/scripts/scripts.menus.ts
rename to src/app/components/scripts/scripts.menus.ts
index f418af2b4..0475f1065 100644
--- a/src/app/components/admin/scripts/scripts.menus.ts
+++ b/src/app/components/scripts/scripts.menus.ts
@@ -4,45 +4,32 @@ import {
   defaultEditIcon,
   defaultNewIcon,
   isAdminPredicate,
+  isLoggedInPredicate,
 } from "src/app/app.menus";
 import { CommonRouteTitles } from "src/app/stringConstants";
-import { adminDashboardMenuItem, adminRoute } from "../admin.menus";
-
-export const adminScriptsRoute = adminRoute.addFeatureModule("scripts");
+import { scriptRoute, scriptsRoute } from "./scripts.routes";
 
 export const adminScriptsCategory: Category = {
   icon: ["fas", "scroll"],
   label: "Scripts",
-  route: adminScriptsRoute,
+  route: scriptsRoute,
 };
 
-export const adminScriptsMenuItem = menuRoute({
+export const scriptsMenuItem = menuRoute({
   icon: ["fas", "scroll"],
   label: "Scripts",
   route: adminScriptsCategory.route,
   tooltip: () => "Manage custom scripts",
-  parent: adminDashboardMenuItem,
-  predicate: isAdminPredicate,
-});
-
-export const adminNewScriptsMenuItem = menuRoute({
-  icon: defaultNewIcon,
-  label: "New Script",
-  route: adminScriptsMenuItem.route.add("new"),
-  tooltip: () => "Create a new script",
-  parent: adminScriptsMenuItem,
-  predicate: isAdminPredicate,
+  predicate: isLoggedInPredicate,
 });
 
-const adminScriptRoute = adminScriptsRoute.add(":scriptId");
-
-export const adminScriptMenuItem = menuRoute({
+export const scriptMenuItem = menuRoute({
   icon: ["fas", "scroll"],
   label: "Script",
-  route: adminScriptRoute,
+  route: scriptRoute,
   tooltip: () => "Manage script",
-  parent: adminScriptsMenuItem,
-  predicate: isAdminPredicate,
+  predicate: isLoggedInPredicate,
+  parent: scriptsMenuItem,
   title: (routeData: RouterStateSnapshot): string => {
     const componentModel = routeData.root.firstChild.data;
     const scriptName = componentModel.script.model.name;
@@ -50,12 +37,21 @@ export const adminScriptMenuItem = menuRoute({
   }
 });
 
+export const newScriptMenuItem = menuRoute({
+  icon: defaultNewIcon,
+  label: "New Script",
+  route: scriptsMenuItem.route.add("new"),
+  parent: scriptsMenuItem,
+  tooltip: () => "Create a new script",
+  predicate: isAdminPredicate,
+});
+
 export const adminEditScriptMenuItem = menuRoute({
   icon: defaultEditIcon,
   label: "New Version",
-  route: adminScriptRoute.add("edit"),
+  route: scriptRoute.add("edit"),
   tooltip: () => "Create new version of this script",
-  parent: adminScriptMenuItem,
   predicate: isAdminPredicate,
+  parent: scriptMenuItem,
   title: () => CommonRouteTitles.routeEditTitle,
 });
diff --git a/src/app/components/admin/scripts/scripts.module.ts b/src/app/components/scripts/scripts.module.ts
similarity index 86%
rename from src/app/components/admin/scripts/scripts.module.ts
rename to src/app/components/scripts/scripts.module.ts
index 216013d27..391b85e69 100644
--- a/src/app/components/admin/scripts/scripts.module.ts
+++ b/src/app/components/scripts/scripts.module.ts
@@ -6,7 +6,7 @@ import { AdminScriptComponent } from "./details/details.component";
 import { AdminScriptsEditComponent } from "./edit/edit.component";
 import { AdminScriptsComponent } from "./list/list.component";
 import { AdminScriptsNewComponent } from "./new/new.component";
-import { adminScriptsRoute } from "./scripts.menus";
+import { scriptsRoute } from "./scripts.routes";
 
 const components = [
   AdminScriptsComponent,
@@ -14,7 +14,7 @@ const components = [
   AdminScriptsNewComponent,
   AdminScriptsEditComponent,
 ];
-const routes = adminScriptsRoute.compileRoutes(getRouteConfigForPage);
+const routes = scriptsRoute.compileRoutes(getRouteConfigForPage);
 
 @NgModule({
   declarations: components,
diff --git a/src/app/components/scripts/scripts.routes.ts b/src/app/components/scripts/scripts.routes.ts
new file mode 100644
index 000000000..bc82dafb2
--- /dev/null
+++ b/src/app/components/scripts/scripts.routes.ts
@@ -0,0 +1,7 @@
+import { StrongRoute } from "@interfaces/strongRoute";
+
+/** /scripts */
+export const scriptsRoute = StrongRoute.newRoot().addFeatureModule("scripts");
+
+/** /scripts/:scriptId */
+export const scriptRoute = scriptsRoute.add(":scriptId");
diff --git a/src/app/components/shared/detail-view/detail-view.component.ts b/src/app/components/shared/detail-view/detail-view.component.ts
index 17ffab52a..bccbb39a0 100644
--- a/src/app/components/shared/detail-view/detail-view.component.ts
+++ b/src/app/components/shared/detail-view/detail-view.component.ts
@@ -9,7 +9,7 @@ import { FormlyFieldConfig } from "@ngx-formly/core";
       <dt
         class="col-sm-3 text-start text-sm-end fw-bold"
         [innerText]="field.props.label"
-        ></dt>
+      ></dt>
 
       <baw-render-field
         class="col-sm-9"
diff --git a/src/app/components/shared/inline-list/inline-list.component.ts b/src/app/components/shared/inline-list/inline-list.component.ts
index a13a03ccc..4ebc24124 100644
--- a/src/app/components/shared/inline-list/inline-list.component.ts
+++ b/src/app/components/shared/inline-list/inline-list.component.ts
@@ -15,8 +15,6 @@ import { AbstractModel } from "@models/AbstractModel";
   `
 })
 export class InlineListComponent {
-  public constructor() {}
-
   @Input() public items: AbstractModel[];
   @Input() public emptyTemplate: TemplateRef<NgIfContext<boolean>>;
   @Input() public itemKey?: string;
diff --git a/src/app/components/shared/menu/side-nav/side-nav.component.ts b/src/app/components/shared/menu/side-nav/side-nav.component.ts
index 76472f1d2..f56e88b7d 100644
--- a/src/app/components/shared/menu/side-nav/side-nav.component.ts
+++ b/src/app/components/shared/menu/side-nav/side-nav.component.ts
@@ -8,7 +8,7 @@ import { MenuService } from "@services/menu/menu.service";
       <ng-content></ng-content>
     </div>
   `,
-  styleUrls: ["side-nav.component.scss"],
+  styleUrl: "side-nav.component.scss",
 })
 export class SideNavComponent {
   public constructor(public menu: MenuService) {}
diff --git a/src/app/helpers/page/defaultMenus.ts b/src/app/helpers/page/defaultMenus.ts
index 38a409731..cd74acd17 100644
--- a/src/app/helpers/page/defaultMenus.ts
+++ b/src/app/helpers/page/defaultMenus.ts
@@ -1,5 +1,4 @@
 import { Injectable, InjectionToken } from "@angular/core";
-import { audioAnalysesMenuItem } from "@components/audio-analysis/audio-analysis.menus";
 import { dataRequestMenuItem } from "@components/data-request/data-request.menus";
 import { homeCategory, homeMenuItem } from "@components/home/home.menus";
 import { annotationsImportMenuItem } from "@components/import-annotations/import-annotations.menu";
@@ -46,7 +45,6 @@ export class DefaultMenu {
         registerMenuItem,
         myAccountMenuItem,
         myAnnotationsMenuItem,
-        audioAnalysesMenuItem,
         libraryMenuItem,
         dataRequestMenuItem,
         sendAudioMenuItem,
diff --git a/src/app/interfaces/apiInterfaces.ts b/src/app/interfaces/apiInterfaces.ts
index bda464619..399f80585 100644
--- a/src/app/interfaces/apiInterfaces.ts
+++ b/src/app/interfaces/apiInterfaces.ts
@@ -1,3 +1,4 @@
+import { InnerFilter } from "@baw-api/baw-api.service";
 import humanizeDuration from "humanize-duration";
 import { DateTime, Duration } from "luxon";
 
@@ -36,6 +37,8 @@ export type UserName = string;
  */
 export type AuthToken = string;
 
+export type ExecutableCommand = string;
+
 /**
  * BAW API Permission Levels
  */
@@ -195,6 +198,14 @@ export interface HasDescription {
   descriptionHtmlTagline?: Description;
 }
 
+/**
+ * An interface that can be implemented if a model echos back a filter object
+ * representation.
+ */
+export interface HasFilter {
+  filter?: InnerFilter;
+}
+
 export type HasAllUsers = HasCreator & HasUpdater & HasDeleter;
 export type HasCreatorAndUpdater = HasCreator & HasUpdater;
 export type HasCreatorAndDeleter = HasCreator & HasDeleter;
diff --git a/src/app/interfaces/pbsInterfaces.ts b/src/app/interfaces/pbsInterfaces.ts
new file mode 100644
index 000000000..522230b92
--- /dev/null
+++ b/src/app/interfaces/pbsInterfaces.ts
@@ -0,0 +1,6 @@
+export interface PbsResources {
+  ncpus?: number;
+  ngpus?: number;
+  mem?: number;
+  walltime?: number;
+}
diff --git a/src/app/models/AnalysisJob.ts b/src/app/models/AnalysisJob.ts
index 0fa2cebe2..568b8b1a1 100644
--- a/src/app/models/AnalysisJob.ts
+++ b/src/app/models/AnalysisJob.ts
@@ -1,47 +1,88 @@
-import { SAVED_SEARCH, SCRIPT } from "@baw-api/ServiceTokens";
+import { AUDIO_EVENT_IMPORT, PROJECT, SCRIPT } from "@baw-api/ServiceTokens";
 import { adminAnalysisJobMenuItem } from "@components/admin/analysis-jobs/analysis-jobs.menus";
-import { audioAnalysisMenuItem } from "@components/audio-analysis/audio-analysis.menus";
 import { Duration } from "luxon";
+import { InnerFilter } from "@baw-api/baw-api.service";
+import { analysisJobMenuItem } from "@components/audio-analysis/analysis-jobs.menus";
 import {
   DateTimeTimezone,
   Description,
   HasAllUsers,
   HasDescription,
-  Hash,
+  HasFilter,
   Id,
+  Ids,
   Param,
 } from "../interfaces/apiInterfaces";
 import { AbstractModel } from "./AbstractModel";
-import { creator, deleter, hasOne, updater } from "./AssociationDecorators";
+import { creator, deleter, hasMany, hasOne, updater } from "./AssociationDecorators";
 import {
   bawBytes,
+  bawCollection,
   bawDateTime,
   bawDuration,
   bawPersistAttr,
 } from "./AttributeDecorators";
-import type { SavedSearch } from "./SavedSearch";
 import type { Script } from "./Script";
 import type { User } from "./User";
 import { AssociationInjector } from "./ImplementsInjector";
+import { AudioEventImport } from "./AudioEventImport";
+import { Project } from "./Project";
+
+export type AnalysisJobStatus =
+  | "beforeSave"
+  | "new"
+  | "preparing"
+  | "processing"
+  | "suspended"
+  | "completed";
+
+export interface OverallProgress {
+  statusNewCount?: number;
+
+  resultSuccessCount?: number;
+  resultFailedCount?: number;
+  resultKilledCount?: number;
+  resultCancelledCount?: number;
+  resultEmptyCount?: number;
+
+  statusQueuedCount?: number;
+  statusWorkingCount?: number;
+  statusFinishedCount?: number;
+
+  transitionQueueCount?: number;
+  transitionFinishedCount?: number;
+  transitionRetryCount?: number;
+  transitionCancelCount?: number;
+  transitionEmptyCount?: number;
+}
 
 /**
  * An analysis job model.
  */
-export interface IAnalysisJob extends HasAllUsers, HasDescription {
+export interface IAnalysisJob extends HasAllUsers, HasDescription, HasFilter {
   id?: Id;
   name?: Param;
-  annotationName?: Param;
-  customSettings?: Hash;
-  scriptId?: Id;
-  savedSearchId?: Id;
+  scriptIds?: Id[] | Ids;
+  audioEventImportIds?: Id[] | Ids;
+  projectId?: Id;
+
+  ongoing?: boolean;
+  systemJob?: boolean;
+
   startedAt?: DateTimeTimezone | string;
+
   overallStatus?: AnalysisJobStatus;
   overallStatusModifiedAt?: DateTimeTimezone | string;
-  overallProgress?: Hash;
+  overallProgress?: OverallProgress;
   overallProgressModifiedAt?: DateTimeTimezone | string;
   overallCount?: number;
   overallDurationSeconds?: number;
   overallDataLengthBytes?: number;
+
+  amendCount?: number;
+  resumeCount?: number;
+  retryCount?: number;
+  suspendCount?: number;
 }
 
 export class AnalysisJob extends AbstractModel implements IAnalysisJob {
@@ -49,32 +90,40 @@ export class AnalysisJob extends AbstractModel implements IAnalysisJob {
   public readonly id?: Id;
   @bawPersistAttr()
   public readonly name?: Param;
-  @bawPersistAttr()
-  public readonly annotationName?: Param;
-  @bawPersistAttr()
-  public readonly customSettings?: Hash;
+  public readonly filter?: InnerFilter;
   @bawPersistAttr()
   public readonly description?: Description;
   public readonly descriptionHtml?: Description;
   public readonly descriptionHtmlTagline?: Description;
-  public readonly scriptId?: Id;
+  @bawCollection({ persist: false })
+  public readonly scriptIds?: Ids;
+  @bawCollection({ persist: false })
+  public readonly audioEventImportIds?: Ids;
   public readonly creatorId?: Id;
   public readonly updaterId?: Id;
   public readonly deleterId?: Id;
+  @bawPersistAttr()
+  public readonly projectId?: Id;
   @bawDateTime()
   public readonly createdAt?: DateTimeTimezone;
   @bawDateTime()
   public readonly updatedAt?: DateTimeTimezone;
   @bawDateTime()
   public readonly deletedAt?: DateTimeTimezone;
-  public readonly savedSearchId?: Id;
   @bawDateTime()
   public readonly startedAt?: DateTimeTimezone;
   @bawPersistAttr({ create: true, update: true, convertCase: true })
   public readonly overallStatus?: AnalysisJobStatus;
+
+  public readonly amendCount?: number;
+  public readonly ongoing?: boolean;
+  public readonly systemJob?: boolean;
+  public readonly resumeCount?: number;
+  public readonly retryCount?: number;
+  public readonly suspendCount?: number;
   @bawDateTime()
   public readonly overallStatusModifiedAt?: DateTimeTimezone;
-  public readonly overallProgress?: Hash;
+  public readonly overallProgress?: OverallProgress;
   @bawDateTime()
   public readonly overallProgressModifiedAt?: DateTimeTimezone;
   public readonly overallCount?: number;
@@ -92,18 +141,38 @@ export class AnalysisJob extends AbstractModel implements IAnalysisJob {
   public updater?: User;
   @deleter<AnalysisJob>()
   public deleter?: User;
-  @hasOne<AnalysisJob, Script>(SCRIPT, "scriptId")
-  public script?: Script;
-  @hasOne<AnalysisJob, SavedSearch>(SAVED_SEARCH, "savedSearchId")
-  public savedSearch?: SavedSearch;
+  @hasOne<AnalysisJob, Project>(PROJECT, "projectId")
+  public project?: Project;
+  @hasMany<AnalysisJob, Script>(SCRIPT, "scriptIds")
+  public scripts?: Script[];
+  @hasMany<AnalysisJob, AudioEventImport>(AUDIO_EVENT_IMPORT, "audioEventImportIds")
+  public audioEventImports?: AudioEventImport[];
 
   public constructor(analysisJob: IAnalysisJob, injector?: AssociationInjector) {
     super(analysisJob, injector);
   }
 
+  public createViewUrl(fakeProjectId?: Id): string {
+    const projectId = this.projectId ?? fakeProjectId;
+    if (!projectId) {
+      return this.adminViewUrl;
+    }
+
+    return analysisJobMenuItem.route.format({
+      analysisJobId: this.id,
+      projectId,
+    });
+  }
+
   public get viewUrl(): string {
-    return audioAnalysisMenuItem.route.format({
+    const projectId = this.projectId;
+    if (!projectId) {
+      return this.adminViewUrl;
+    }
+
+    return analysisJobMenuItem.route.format({
       analysisJobId: this.id,
+      projectId,
     });
   }
 
@@ -116,11 +185,3 @@ export class AnalysisJob extends AbstractModel implements IAnalysisJob {
     });
   }
 }
-
-export type AnalysisJobStatus =
-  | "beforeSave"
-  | "new"
-  | "preparing"
-  | "processing"
-  | "suspended"
-  | "completed";
diff --git a/src/app/models/Script.ts b/src/app/models/Script.ts
index bd42c9f81..d17d92e16 100644
--- a/src/app/models/Script.ts
+++ b/src/app/models/Script.ts
@@ -1,11 +1,12 @@
-import { SCRIPT } from "@baw-api/ServiceTokens";
-import { adminScriptMenuItem } from "@components/admin/scripts/scripts.menus";
+import { AUDIO_EVENT_PROVENANCE, SCRIPT } from "@baw-api/ServiceTokens";
+import { PbsResources } from "@interfaces/pbsInterfaces";
+import { scriptMenuItem } from "@components/scripts/scripts.menus";
 import {
   DateTimeTimezone,
   Description,
+  ExecutableCommand,
   HasCreator,
   HasDescription,
-  Hash,
   Id,
   Param,
 } from "../interfaces/apiInterfaces";
@@ -13,6 +14,7 @@ import { AbstractModel } from "./AbstractModel";
 import { creator, hasOne } from "./AssociationDecorators";
 import { bawDateTime, bawPersistAttr } from "./AttributeDecorators";
 import type { User } from "./User";
+import { AudioEventProvenance } from "./AudioEventProvenance";
 
 /**
  * A script model
@@ -24,10 +26,14 @@ export interface IScript extends HasCreator, HasDescription {
   version?: number;
   verified?: boolean;
   groupId?: Id;
-  executableCommand?: string;
+  provenanceId?: Id;
+  executableCommand?: ExecutableCommand;
   executableSettings?: string;
   executableSettingsMediaType?: string;
-  analysisActionParams?: Hash;
+  executableSettingsName?: string;
+  resources?: PbsResources;
+  isLastVersion?: boolean;
+  isFirstVersion?: boolean;
 }
 
 export class Script extends AbstractModel<IScript> implements IScript {
@@ -46,6 +52,7 @@ export class Script extends AbstractModel<IScript> implements IScript {
   @bawPersistAttr()
   public readonly verified?: boolean;
   public readonly groupId?: Id;
+  public readonly provenanceId?: Id;
   public readonly creatorId?: Id;
   @bawDateTime()
   public readonly createdAt?: DateTimeTimezone;
@@ -54,21 +61,23 @@ export class Script extends AbstractModel<IScript> implements IScript {
   @bawPersistAttr()
   public readonly executableSettings?: string;
   @bawPersistAttr()
+  public readonly executableSettingsName?: string;
+  @bawPersistAttr()
   public readonly executableSettingsMediaType?: string;
   @bawPersistAttr()
-  public readonly analysisActionParams?: Hash;
+  public readonly resources?: PbsResources;
+  public readonly isLastVersion?: boolean;
+  public readonly isFirstVersion?: boolean;
 
   // Associations
   @creator<Script>()
   public creator?: User;
   @hasOne<Script, Script>(SCRIPT, "groupId")
   public group?: Script;
+  @hasOne<Script, AudioEventProvenance>(AUDIO_EVENT_PROVENANCE, "provenanceId")
+  public provenance?: AudioEventProvenance;
 
   public get viewUrl(): string {
-    throw new Error("Script viewUrl not implemented.");
-  }
-
-  public get adminViewUrl(): string {
-    return adminScriptMenuItem.route.format({ scriptId: this.id });
+    return scriptMenuItem.route.format({ scriptId: this.id });
   }
 }
diff --git a/src/app/services/baw-api/ServiceTokens.ts b/src/app/services/baw-api/ServiceTokens.ts
index 0d05e9df1..e7fd419d3 100644
--- a/src/app/services/baw-api/ServiceTokens.ts
+++ b/src/app/services/baw-api/ServiceTokens.ts
@@ -115,8 +115,8 @@ export class ServiceToken<
 }
 
 export const ACCOUNT = new ServiceToken<AccountsService, User>("ACCOUNT");
-export const ANALYSIS_JOB = new ServiceToken<AnalysisJobsService, AnalysisJob>("A_JOB");
-export const ANALYSIS_JOB_ITEM = new ServiceToken<AnalysisJobItemsService, AnalysisJobItem>("A_JOB_ITEM");
+export const ANALYSIS_JOB = new ServiceToken<AnalysisJobsService, AnalysisJob>("ANALYSIS_JOB");
+export const ANALYSIS_JOB_ITEM = new ServiceToken<AnalysisJobItemsService, AnalysisJobItem>("ANALYSIS_JOB_ITEM");
 export const ANALYSIS_JOB_ITEM_RESULTS = new ServiceToken<AnalysisJobItemResultsService, AnalysisJobItemResult>("A_JOB_ITEM_RESULTS");
 export const AUDIO_EVENT = new ServiceToken<AudioEventsService, AudioEvent>("AUDIO");
 export const SHALLOW_AUDIO_EVENT = new ServiceToken<ShallowAudioEventsService, AudioEvent>("S_AUDIO");
diff --git a/src/app/test/fakes/AnalysisJob.ts b/src/app/test/fakes/AnalysisJob.ts
index e406b7290..5d45d5084 100644
--- a/src/app/test/fakes/AnalysisJob.ts
+++ b/src/app/test/fakes/AnalysisJob.ts
@@ -1,4 +1,4 @@
-import { AnalysisJobStatus, IAnalysisJob } from "@models/AnalysisJob";
+import { AnalysisJobStatus, IAnalysisJob, OverallProgress } from "@models/AnalysisJob";
 import { modelData } from "@test/helpers/faker";
 
 export function generateAnalysisJob(
@@ -6,38 +6,62 @@ export function generateAnalysisJob(
 ): Required<IAnalysisJob> {
   const overallDurationSeconds = modelData.datatype.number(3.154e7); // 1 year
   const overallDataLengthBytes = overallDurationSeconds * 22050 * 2; // duration seconds * sample rate * two bytes per sample
-  const statuses: AnalysisJobStatus[] = [
+  const statuses = [
     "beforeSave",
     "new",
     "preparing",
     "processing",
     "suspended",
     "completed",
-  ];
+  ] satisfies AnalysisJobStatus[];
 
   return {
     id: modelData.id(),
     name: modelData.param(),
-    annotationName: modelData.param(),
-    scriptId: modelData.id(),
-    savedSearchId: modelData.id(),
+    scriptIds: modelData.ids(),
+    audioEventImportIds: modelData.ids(),
+    projectId: modelData.id(),
     startedAt: modelData.timestamp(),
+    ongoing: modelData.bool(),
+    systemJob: modelData.bool(),
+    amendCount: modelData.datatype.number(),
+    resumeCount: modelData.datatype.number(),
+    retryCount: modelData.datatype.number(),
+    suspendCount: modelData.datatype.number(),
+    filter: {}, // TODO: this should be randomly generated
     overallStatus: modelData.helpers.arrayElement(statuses),
     overallStatusModifiedAt: modelData.timestamp(),
-    overallProgress: {
-      queued: 1,
-      working: 0,
-      success: 0,
-      failed: 0,
-      total: 1,
-    },
+    overallProgress: generateOverallProgress(),
     overallProgressModifiedAt: modelData.timestamp(),
     overallCount: modelData.datatype.number(1000),
     overallDurationSeconds,
     overallDataLengthBytes,
-    customSettings: modelData.randomObject(0, 5),
     ...modelData.model.generateDescription(),
     ...modelData.model.generateAllUsers(),
     ...data,
   };
 }
+
+// I have decided not to include this fake generator in the modelData object
+// because we only use it once inside the generateAnalysisJob() function
+function generateOverallProgress(): Required<OverallProgress> {
+  return {
+    statusNewCount: modelData.datatype.number(),
+
+    resultSuccessCount: modelData.datatype.number(),
+    resultFailedCount: modelData.datatype.number(),
+    resultKilledCount: modelData.datatype.number(),
+    resultCancelledCount: modelData.datatype.number(),
+    resultEmptyCount: modelData.datatype.number(),
+
+    statusQueuedCount: modelData.datatype.number(),
+    statusWorkingCount: modelData.datatype.number(),
+    statusFinishedCount: modelData.datatype.number(),
+
+    transitionQueueCount: modelData.datatype.number(),
+    transitionFinishedCount: modelData.datatype.number(),
+    transitionRetryCount: modelData.datatype.number(),
+    transitionCancelCount: modelData.datatype.number(),
+    transitionEmptyCount: modelData.datatype.number(),
+  };
+}
diff --git a/src/app/test/fakes/Script.ts b/src/app/test/fakes/Script.ts
index 2ea635040..a415a2810 100644
--- a/src/app/test/fakes/Script.ts
+++ b/src/app/test/fakes/Script.ts
@@ -9,15 +9,14 @@ export function generateScript(data?: Partial<IScript>): Required<IScript> {
     version: parseFloat(modelData.system.semver()),
     verified: modelData.bool(),
     groupId: modelData.id(),
+    provenanceId: modelData.id(),
     executableCommand: "executive command", // TODO Implement with random values
     executableSettings: "executive settings", // TODO Implement with random values
+    executableSettingsName: "executive settings name", // TODO Implement with random values
     executableSettingsMediaType: "text/plain", // TODO Implement with random values
-    analysisActionParams: {
-      fileExecutable: "./AnalysisPrograms/AnalysisPrograms.exe",
-      copyPaths: ["./programs/AnalysisPrograms/Logs/log.txt"],
-      subFolders: [],
-      customSettings: {},
-    }, // TODO Implement with random values
+    resources: modelData.pbsResources(),
+    isLastVersion: modelData.bool(),
+    isFirstVersion: modelData.bool(),
     ...modelData.model.generateDescription(),
     ...modelData.model.generateCreator(),
     ...data,
diff --git a/src/app/test/helpers/detail-view.ts b/src/app/test/helpers/detail-view.ts
index 733f51f01..6a6d09ae7 100644
--- a/src/app/test/helpers/detail-view.ts
+++ b/src/app/test/helpers/detail-view.ts
@@ -8,15 +8,17 @@ import { DateTime, Duration } from "luxon";
  * @param nativeElement Fixture native element
  * @param label Label to find
  */
-function findDetailIndex(nativeElement: HTMLElement, label: string) {
+function findDetailIndex(nativeElement: HTMLElement, label: string): number {
   let detailIndex = -1;
   const details = nativeElement.querySelectorAll("dt");
+
   details.forEach((detail, index) => {
     if (detail.innerText.trim() === label) {
       detailIndex = index;
       return;
     }
   });
+
   return detailIndex;
 }
 
diff --git a/src/app/test/helpers/faker.ts b/src/app/test/helpers/faker.ts
index 739eebb51..b39ab9812 100644
--- a/src/app/test/helpers/faker.ts
+++ b/src/app/test/helpers/faker.ts
@@ -8,6 +8,7 @@ import {
 } from "@interfaces/apiInterfaces";
 import { faker } from "@faker-js/faker";
 import { DateTime, Duration } from "luxon";
+import { PbsResources } from "@interfaces/pbsInterfaces";
 
 const specialCharRegex = /[^\w\s]/gi;
 
@@ -89,6 +90,12 @@ export const modelData = {
     }),
   dateTime: (): DateTime => DateTime.fromJSDate(faker.date.past()),
   uuid: () => faker.datatype.uuid(),
+  pbsResources: (): Required<PbsResources> => ({
+    ncpus: modelData.datatype.number(),
+    ngpus: modelData.datatype.number(),
+    mem: modelData.datatype.number(),
+    walltime: modelData.datatype.number(),
+  }),
   hexaDecimal,
   randomArray,
   randomObject,
diff --git a/src/app/test/helpers/pagedTableTemplate.ts b/src/app/test/helpers/pagedTableTemplate.ts
index e81c7f9b3..6a9b7ebca 100644
--- a/src/app/test/helpers/pagedTableTemplate.ts
+++ b/src/app/test/helpers/pagedTableTemplate.ts
@@ -1,7 +1,12 @@
 import { ComponentFixture } from "@angular/core/testing";
 import { By } from "@angular/platform-browser";
 import { ApiFilter } from "@baw-api/api-common";
-import { defaultApiPageSize, Filters, Paging } from "@baw-api/baw-api.service";
+import {
+  defaultApiPageSize,
+  Filters,
+  InnerFilter,
+  Paging,
+} from "@baw-api/baw-api.service";
 import { ApiErrorDetails } from "@helpers/custom-errors/baw-api-error";
 import { AbstractModel } from "@models/AbstractModel";
 import { ErrorHandlerComponent } from "@shared/error-handler/error-handler.component";
@@ -67,19 +72,26 @@ export function datatableApiResponse<M extends AbstractModel>(
  * arrow function re-declares `this` and tests will fail.
  */
 export function assertPagination<
-  M extends AbstractModel,
-  S extends ApiFilter<M, any[]>
+  MockModel extends AbstractModel,
+  TestedService extends ApiFilter<MockModel, any[]>
 >(apiAction: string = "filter") {
   describe("pagination", function () {
-    let api: S;
-    let defaultModels: M[];
+    let api: TestedService;
+    let defaultModels: MockModel[];
+
+    /**
+     * Default inner filters that will be present in all requests.
+     * This is useful if the pagination table is scoped to a model
+     * e.g. project.
+     */
+    let defaultInnerFilters: InnerFilter<MockModel> = {};
     let defaultPaging: Paging;
     let fixture: ComponentFixture<any>;
 
     function assertSecondRequestFilters(
       done: () => void,
       expectation: Filters,
-      models: M[]
+      models: MockModel[]
     ) {
       let secondRequest = false;
       const paging = {
@@ -97,13 +109,13 @@ export function assertPagination<
         }
 
         secondRequest = true;
-        return new BehaviorSubject<M[]>(models);
+        return new BehaviorSubject<MockModel[]>(models);
       });
     }
 
     function apiErrorResponse(error: ApiErrorDetails) {
       api[apiAction].and.callFake(() => {
-        const subject = new Subject<M[]>();
+        const subject = new Subject<MockModel[]>();
         subject.error(error);
         return subject;
       });
@@ -130,10 +142,27 @@ export function assertPagination<
       }, 0);
     }
 
+    function buildExpectedFilters(
+      paging?: Paging,
+      filter: InnerFilter<MockModel> = defaultInnerFilters
+    ): Filters {
+      const result: Filters = {};
+
+      if (filter) {
+        result.filter = filter;
+      }
+      if (paging) {
+        result.paging = paging;
+      }
+
+      return result;
+    }
+
     beforeEach(function () {
       api = this.api;
       fixture = this.fixture;
       defaultModels = this.defaultModels;
+      defaultInnerFilters = this.defaultInnerFilters;
       defaultPaging = {
         page: 1,
         items: defaultApiPageSize,
@@ -142,14 +171,14 @@ export function assertPagination<
       };
     });
 
-    it("should send " + apiAction + " request", () => {
+    it(`should send ${apiAction} request`, () => {
       datatableApiResponse(api, [], undefined, apiAction);
       fixture.detectChanges();
-      expect(api[apiAction]).toHaveBeenCalledWith({});
+      expect(api[apiAction]).toHaveBeenCalledWith(buildExpectedFilters());
     });
 
     it("should request the second page from api", (done) => {
-      assertSecondRequestFilters(done, { paging: { page: 2 } }, [
+      assertSecondRequestFilters(done, buildExpectedFilters({ page: 2 }), [
         defaultModels[0],
       ]);
       fixture.detectChanges();
@@ -159,7 +188,7 @@ export function assertPagination<
     });
 
     it("should request next page from api", (done) => {
-      assertSecondRequestFilters(done, { paging: { page: 2 } }, [
+      assertSecondRequestFilters(done, buildExpectedFilters({ page: 2 }), [
         defaultModels[0],
       ]);
       fixture.detectChanges();
@@ -170,7 +199,7 @@ export function assertPagination<
     });
 
     it("should request final page from api", (done) => {
-      assertSecondRequestFilters(done, { paging: { page: 4 } }, [
+      assertSecondRequestFilters(done, buildExpectedFilters({ page: 4 }), [
         defaultModels[0],
       ]);
       fixture.detectChanges();
diff --git a/workbench-client.code-workspace b/workbench-client.code-workspace
index dbcb50a1c..84450c5d8 100644
--- a/workbench-client.code-workspace
+++ b/workbench-client.code-workspace
@@ -28,6 +28,10 @@
       "datetime",
       "luxon",
       "datatable",
+      "ngneat",
+      "ncpus",
+      "ngpus",
+      "walltime"
     ],
     "cSpell.ignorePaths": [
       "**/.git/objects/**",
@@ -58,7 +62,6 @@
       "statusBarItem.remoteBackground": "#2b7489",
       "statusBarItem.remoteForeground": "#e7e7e7"
     },
-    "peacock.color": "#2b7489",
     "angularKarmaTestExplorer.debugMode": true,
     "explorer.compactFolders": false,
     "files.eol": "\n"