diff --git a/css/._biobank.css b/css/._biobank.css
new file mode 100644
index 00000000..b154692c
Binary files /dev/null and b/css/._biobank.css differ
diff --git a/css/biobank.css b/css/biobank.css
index bbb6cbca..c5091c2c 100644
--- a/css/biobank.css
+++ b/css/biobank.css
@@ -38,23 +38,6 @@
   margin: auto 0;
 }
 
-.action {
-  display: inline-block;
-}
-
-.action > * {
-  margin: 0 5px;
-}
-
-.action-title {
-  font-size: 16px;
-  display: inline;
-}
-
-.action-title > * {
-  margin: 0 5px;
-}
-
 .lifecycle {
   flex-basis: 73%;
   display: flex;
@@ -367,73 +350,6 @@
   font-size: 12px;
 }
 
-.action-button .glyphicon {
-  font-size: 20px;
-  top: 0;
-}
-
-.action-button {
-  font-size: 30px;
-  color: #FFFFFF;
-  border-radius: 50%;
-  height: 45px;
-  width: 45px;
-  cursor: pointer;
-  user-select: none;
-
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-
-.action-button.add {
-  background-color: #0f9d58;
-  box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
-}
-
-.action-button.disabled {
-  background-color: #dddddd;
-}
-
-.action-button.pool {
-  background-color: #96398C;
-  box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
-}
-
-.action-button.prepare {
-  background-color: #A6D3F5;
-  box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
-}
-
-.action-button.search {
-  background-color: #E98430;
-  box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
-}
-
-.action-button.add:hover, .pool:hover{
-  box-shadow: 0 6px 10px 0 rgba(0, 0, 0, 0.2), 0 8px 22px 0 rgba(0, 0, 0, 0.19);
-}
-
-.action-button.update, .action-button.delete {
-  background-color: #FFFFFF;
-  color: #DDDDDD;
-  border: 2px solid #DDDDDD;
-}
-
-.action-button.update:hover {
-  border: none;
-  background-color: #093782;
-  color: #FFFFFF;
-  box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
-}
-
-.action-button.delete:hover {
-  border: none;
-  background-color: #BC1616;
-  color: #FFFFFF;
-  box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
-}
-
 .container-list {
   flex: 0 1 25%;
 
diff --git a/jsx/APIs/BaseAPI.ts b/jsx/APIs/BaseAPI.ts
new file mode 100644
index 00000000..717416eb
--- /dev/null
+++ b/jsx/APIs/BaseAPI.ts
@@ -0,0 +1,205 @@
+declare const loris: any;
+import Query, { QueryParam } from './Query';
+import fetchDataStream from 'jslib/fetchDataStream';
+
+interface ApiResponse<T> {
+    data: T,
+    // Other fields like 'message', 'status', etc., can be added here
+}
+
+interface ApiError {
+    message: string,
+    code: number,
+    // Additional error details can be added here
+}
+
+export default class BaseAPI<T> {
+  protected baseUrl: string;
+  protected subEndpoint: string;
+
+  constructor(baseUrl: string) {
+    this.baseUrl = loris.BaseURL+'/biobank/'+baseUrl;
+  }
+
+  setSubEndpoint(subEndpoint: string): this {
+    this.subEndpoint = subEndpoint;
+    return this;
+  }
+
+  async get<U = T>(query?: Query): Promise<U[]> {
+    const path = this.subEndpoint ? `${this.baseUrl}/${this.subEndpoint}` : this.baseUrl;
+    const queryString = query ? query.build() : '';
+    const url = queryString ? `${path}?${queryString}` : path;
+    return BaseAPI.fetchJSON<U[]>(url);
+  }
+
+  async getLabels(...params: QueryParam[]): Promise<string[]> {
+    const query = new Query();
+    params.forEach(param => query.addParam(param));
+    return this.get<string>(query.addField('label'));
+  }
+
+  async getById(id: string): Promise<T> {
+    return BaseAPI.fetchJSON<T>(`${this.baseUrl}/${id}`);
+  }
+
+  async create(data: T): Promise<T> {
+    return BaseAPI.fetchJSON<T>(this.baseUrl, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+      },
+      body: JSON.stringify(data),
+    });
+  }
+
+  async update(id: string, data: T): Promise<T> {
+    return BaseAPI.fetchJSON<T>(`${this.baseUrl}/${id}`, {
+      method: "PUT",
+      headers: {
+        "Content-Type": "application/json",
+      },
+      body: JSON.stringify(data),
+    });
+  }
+
+  static async fetchJSON<T>(url: string, options?: RequestInit): Promise<T> {
+    try {
+      const response = await fetch(url, { ...options });
+      let data: T;
+  
+      try {
+        data = await response.json();
+      } catch (parseError) {
+        // Handle JSON parsing errors
+        ErrorHandler.handleError(parseError, { url, options });
+        throw parseError; // Re-throw to be caught by the caller
+      }
+  
+      // Use ErrorHandler to log non-OK responses
+      if (!response.ok) {
+        ErrorHandler.handleResponse(response, data, { url, options });
+      }
+  
+      // Return data regardless of response.ok
+      return data;
+    } catch (error) {
+      // Handle network errors
+      ErrorHandler.handleError(error, { url, options });
+      throw error; // Re-throw to be handled by the caller
+    }
+  }  
+  
+
+  async fetchStream(
+    addEntity: (entity: T) => void,
+    setProgress: (progress: number) => void,
+    signal: AbortSignal
+  ): Promise<void> {
+    const url = new URL(this.baseUrl);
+    url.searchParams.append('format', 'json');
+  
+    try {
+      await this.streamData(url.toString(), addEntity, setProgress, signal);
+    } catch (error) {
+      if (signal.aborted) {
+        console.log('Fetch aborted');
+      } else {
+        throw error;
+      }
+    }
+  }
+
+  async streamData(
+    dataURL: string,
+    addEntity: (entity: T) => void,
+    setProgress: (progress: number) => void,
+    signal: AbortSignal
+  ): Promise<void> {
+    const response = await fetch(dataURL, {
+      method: 'GET',
+      credentials: 'same-origin',
+      signal,
+    });
+  
+    const reader = response.body.getReader();
+    const utf8Decoder = new TextDecoder('utf-8');
+    let remainder = ''; // For JSON parsing
+    let processedSize = 0;
+    const contentLength = +response.headers.get('Content-Length') || 0;
+    console.log('Content Length: '+contentLength);
+  
+    while (true) {
+      const { done, value } = await reader.read();
+  
+      if (done) {
+        if (remainder.trim()) {
+          try {
+            console.log(remainder);
+            addEntity(JSON.parse(remainder));
+          } catch (e) {
+            console.error("Failed to parse final JSON object:", e);
+          }
+        }
+        break;
+      }
+  
+      const chunk = utf8Decoder.decode(value, { stream: true });
+      remainder += chunk;
+  
+      let boundary = remainder.indexOf('\n'); // Assuming newline-delimited JSON objects
+      while (boundary !== -1) {
+        const jsonStr = remainder.slice(0, boundary);
+        remainder = remainder.slice(boundary + 1);
+  
+        try {
+          addEntity(JSON.parse(jsonStr));
+        } catch (e) {
+          console.error("Failed to parse JSON object:", e);
+        }
+  
+        boundary = remainder.indexOf('\n');
+      }
+  
+      processedSize += value.length;
+      if (setProgress && contentLength > 0) {
+        setProgress(Math.min((processedSize / contentLength) * 100, 100));
+      }
+    }
+  
+    setProgress(100); // Ensure progress is set to 100% on completion
+  }
+}
+
+class ErrorHandler {
+  static handleResponse(
+    response: Response,
+    data: any,
+    context: { url: string; options?: RequestInit }
+  ): void {
+    if (!response.ok) {
+      if (response.status === 400 && data.status === 'error' && data.errors) {
+        // Validation error occurred
+        console.warn('Validation Error:', data.errors);
+      } else {
+        // Other HTTP errors
+        console.error(`HTTP Error! Status: ${response.status}`, {
+          url: context.url,
+          options: context.options,
+          responseData: data,
+        });
+      }
+    }
+    // No need to throw an error here since we're returning data
+  }
+
+  static handleError(error: any, context: { url: string; options?: RequestInit }) {
+    console.error('An error occurred:', {
+      url: context.url,
+      options: context.options,
+      error,
+    });
+    // Re-throw the error to propagate it to the caller
+    throw error;
+  }
+}
diff --git a/jsx/APIs/ContainerAPI.ts b/jsx/APIs/ContainerAPI.ts
new file mode 100644
index 00000000..57554e52
--- /dev/null
+++ b/jsx/APIs/ContainerAPI.ts
@@ -0,0 +1,37 @@
+import BaseAPI from './BaseAPI';
+import Query, { QueryParam } from './Query';
+import { IContainer } from '../entities';
+
+export enum ContainerSubEndpoint {
+  Types = 'types',
+  Statuses = 'statuses',
+}
+
+export default class ContainerAPI extends BaseAPI<IContainer> {
+  constructor() {
+    super('containers'); // Provide the base URL for container-related API
+  }
+
+  async getTypes(queryParam?: QueryParam): Promise<string[]> {
+    this.setSubEndpoint(ContainerSubEndpoint.Types);
+    const query = new Query();
+    if (queryParam) {
+      query.addParam(queryParam);
+    }
+
+    return await this.get<string>(query);
+  }
+
+  // TODO: to be updated to something more useful — status will probably no
+  // longer be something that you can select but rather something that is
+  // derived. 
+  async getStatuses(queryParam?: QueryParam): Promise<string[]> {
+    this.setSubEndpoint(ContainerSubEndpoint.Types);
+    const query = new Query();
+    if (queryParam) {
+      query.addParam(queryParam);
+    }
+
+    return await this.get<string>(query);
+  }
+}
diff --git a/jsx/APIs/LabelAPI.ts b/jsx/APIs/LabelAPI.ts
new file mode 100644
index 00000000..59fe9522
--- /dev/null
+++ b/jsx/APIs/LabelAPI.ts
@@ -0,0 +1,8 @@
+import BaseAPI from './BaseAPI';
+import { Label } from '../types'; // Assuming you have a User type
+
+export default class LabelAPI extends BaseAPI<Label> {
+  constructor() {
+    super('/labels'); // Provide the base URL for label-related API
+  }
+}
diff --git a/jsx/APIs/PoolAPI.ts b/jsx/APIs/PoolAPI.ts
new file mode 100644
index 00000000..c8d483ca
--- /dev/null
+++ b/jsx/APIs/PoolAPI.ts
@@ -0,0 +1,8 @@
+import BaseAPI from './BaseAPI';
+import { IPool } from '../entities';
+
+export default class PoolAPI extends BaseAPI<IPool> {
+  constructor() {
+    super('pools');
+  }
+}
diff --git a/jsx/APIs/Query.ts b/jsx/APIs/Query.ts
new file mode 100644
index 00000000..09a95317
--- /dev/null
+++ b/jsx/APIs/Query.ts
@@ -0,0 +1,70 @@
+export enum Operator {
+  Equals = '=',
+  NotEquals = '!=',
+  LessThan = '<',
+  GreaterThan = '>',
+  LessThanOrEqual = '<=',
+  GreaterThanOrEqual = '>=',
+  Like = 'like',
+  Includes = 'in'
+}
+
+export interface QueryParam {
+  field: string,
+  value: string,
+  operator: Operator
+}
+
+export default class Query {
+  private params: Record<string, string> = {};
+
+  addParam({
+    field,
+    value,
+    operator = Operator.Equals
+  }): this {
+    const encodedField = encodeURIComponent(field);
+    const encodedValue = encodeURIComponent(value);
+    this.params[`${encodedField}${this.getOperatorSuffix(operator)}`] = encodedValue;
+    return this;
+  }
+
+  addField(field: string): this {
+    const encodedField = encodeURIComponent(field);
+    this.params['fields'] = this.params['fields'] ? `${this.params['fields']},${encodedField}` : encodedField;
+    return this;
+  }
+
+  addLimit(limit: number): this {
+    this.params['limit'] = limit.toString();
+    return this;
+  }
+
+  addOffset(offset: number): this {
+    this.params['offset'] = offset.toString();
+    return this;
+  }
+
+  addSort(field: string, direction: 'asc' | 'desc'): this {
+    const encodedField = encodeURIComponent(field);
+    this.params['sort'] = `${encodedField}:${direction}`;
+    return this;
+  }
+
+  build(): string {
+    return new URLSearchParams(this.params).toString();
+  }
+
+  private getOperatorSuffix(operator: Operator): string {
+    switch (operator) {
+      case Operator.Equals: return '';
+      case Operator.NotEquals: return '!=';
+      case Operator.LessThan: return '<';
+      case Operator.GreaterThan: return '>';
+      case Operator.LessThanOrEqual: return '<=';
+      case Operator.GreaterThanOrEqual: return '>=';
+      case Operator.Like: return '_like';
+      default: return '';
+    }
+  }
+}
diff --git a/jsx/APIs/ShipmentAPI.ts b/jsx/APIs/ShipmentAPI.ts
new file mode 100644
index 00000000..44140282
--- /dev/null
+++ b/jsx/APIs/ShipmentAPI.ts
@@ -0,0 +1,36 @@
+import BaseAPI from './BaseAPI';
+import Query, { QueryParam } from './Query';
+import { IShipment, IShipmentStatus, IShipmentType } from '../entities';
+
+export enum ShipmentSubEndpoint {
+  Statuses = 'statuses',
+  Types = 'types',
+  Details = 'details'
+}
+
+export default class ShipmentAPI extends BaseAPI<IShipment> {
+  constructor() {
+    super('shipments');
+  }
+
+  async getStatuses(queryParam?: QueryParam): Promise<string[]> {
+    this.setSubEndpoint(ShipmentSubEndpoint.Statuses);
+    const query = new Query();
+    if (queryParam) {
+      query.addParam(queryParam);
+    }
+
+    return this.get<string>(query);
+  }
+
+  async getTypes(queryParam?: QueryParam): Promise<IShipmentType[]> {
+    this.setSubEndpoint(ShipmentSubEndpoint.Types);
+    const query = new Query();
+
+    if (queryParam) {
+      query.addParam(queryParam);
+    }
+
+    return this.get<IShipmentType>(query);
+  }
+}
diff --git a/jsx/APIs/SpecimenAPI.ts b/jsx/APIs/SpecimenAPI.ts
new file mode 100644
index 00000000..81db1407
--- /dev/null
+++ b/jsx/APIs/SpecimenAPI.ts
@@ -0,0 +1,36 @@
+import BaseAPI from './BaseAPI';
+import Query, { QueryParam } from './Query';
+import { ISpecimen, ISpecimenType } from '../entities';
+
+export enum SpecimenSubEndpoint {
+  Types = 'types',
+  Protocols = 'protocols',
+}
+
+export default class SpecimenAPI extends BaseAPI<ISpecimen> {
+  constructor() {
+    super('specimens');
+  }
+
+  //TODO: the new Query() should not be repeated across functions. These
+  //functions are great but should avoid repetition.
+  async getTypes(queryParam?: QueryParam): Promise<string[]> {
+    this.setSubEndpoint(SpecimenSubEndpoint.Types);
+    const query = new Query();
+    if (queryParam) {
+      query.addParam(queryParam);
+    }
+
+    return this.get<string>(query);
+  }
+
+  async getProtocols(queryParam?: QueryParam): Promise<string[]> {
+    this.setSubEndpoint(SpecimenSubEndpoint.Protocols);
+    const query = new Query();
+    if (queryParam) {
+      query.addParam(queryParam);
+    }
+
+    return this.get<string>(query);
+  }
+}
diff --git a/jsx/APIs/index.js b/jsx/APIs/index.js
new file mode 100644
index 00000000..e7549afe
--- /dev/null
+++ b/jsx/APIs/index.js
@@ -0,0 +1,8 @@
+// index.js
+export { default as BaseAPI } from './BaseAPI';
+export { default as ContainerAPI } from './ContainerAPI';
+export { default as SpecimenAPI } from './SpecimenAPI';
+export { default as PoolAPI } from './PoolAPI';
+export { default as ShipmentAPI } from './ShipmentAPI';
+export { default as LabelAPI } from './LabelAPI';
+export { default as Query } from './Query';
diff --git a/jsx/Shipment.js b/jsx/Shipment.js
deleted file mode 100644
index f1ea44e1..00000000
--- a/jsx/Shipment.js
+++ /dev/null
@@ -1,179 +0,0 @@
-import {useState} from 'react';
-import {get, post} from './helpers.js';
-
-/**
- * React effect for creating a request to create a new
- * shipment
- *
- * @param {object} initShipment - the initial value for the shipment
- *
- * @return {Shipment}
- */
-export function UseShipment(initShipment = {}) {
-  const [init, setInit] = useState(initShipment);
-  const [shipment, setShipment] = useState(new Shipment(init));
-  const [errors, setErrors] = useState(new Shipment({}));
-
-  this.set = (name, value) => setShipment(shipment.set(name, value));
-  this.setContainerIds = (value) => this.set('containerIds', value);
-  this.addLog = (log) => this.setLogs(shipment.addLog(log));
-  this.setLogs = (value) => this.set('logs', value);
-  this.setLog = (name, value, index) =>
-        this.setLogs(shipment.setLog(name, value, index));
-  this.remove = (name) => setShipment(shipment.remove(name));
-  this.clear = () => {
-    setShipment(new Shipment(init));
-    setErrors(new Shipment({}));
-  };
-  this.post = async () =>
-    await post(
-        shipment,
-        `${loris.BaseURL}/biobank/shipments/`,
-        'POST'
-    ).catch((e) => Promise.reject(setErrors(new Shipment(e))));
-  this.put = async () =>
-    await post(
-        shipment,
-        `${loris.BaseURL}/biobank/shipments/`,
-        'PUT'
-    ).then((shipments) => {
-      setInit(new Shipment(shipments[0]));
-      setShipment(new Shipment(shipments[0]));
-      return shipments;
-    })
-    .catch((e) => Promise.reject(setErrors(new Shipment(e))));
-  this.getShipment = () => shipment;
-  this.getErrors = () => errors;
-
-  return this;
-}
-
-/**
- * A Shipment of a container
- */
-class Shipment {
-  /**
-   * Constructor
-   *
-   * @param {string} id - shipment id
-   * @param {string} barcode - shipment barcode
-   * @param {string} type - shipment type
-   * @param {int} destinationCenterId - shipment destination
-   * @param {array} logs - logs for this shipment
-   * @param {array} containerIds - containers in this shipment
-   */
-  constructor({
-    id = null,
-    barcode = null,
-    type = null,
-    destinationCenterId = null,
-    logs = [],
-    containerIds = [],
-  }) {
-    this.id = id;
-    this.barcode = barcode;
-    this.type = type;
-    this.destinationCenterId = destinationCenterId;
-    this.logs = logs.map((log) => new Log(log));
-    this.containerIds = containerIds;
-  }
-
-  /**
-   * Sets name to value in this shipment
-   *
-   * @param {string} name - the key
-   * @param {object} value - the value
-   *
-   * @return {Shipment}
-   */
-  set(name, value) {
-    return new Shipment({...this, [name]: value});
-  }
-
-  /**
-   * ?
-   *
-   * @param {object} name - ?
-   *
-   * @return {Shipment}
-   */
-  remove(name) {
-    return new Shipment({name, ...this});
-  }
-
-  /**
-   * Load a shipment from the server
-   *
-   * @param {string} id - the id of the shipment
-   *
-   * @return {Shipment}
-   */
-  async load(id) {
-   const shipment = await get(`${loris.BaseURL}/biobank/shipments/${id}`);
-   return new Shipment(shipment);
-  }
-
-  /**
-   * Adds a new log to this shipment
-   *
-   * @param {object} log - the log values
-   *
-   * @return {array}
-   */
-  addLog(log) {
-    return [...this.logs, new Log(log)];
-  };
-
-  /**
-   * Sets the log at index i to name/value
-   *
-   * @param {string} name - the log name
-   * @param {?} value - the log value
-   * @param {int} index - the index
-   *
-   * @return {array}
-   */
-  setLog(name, value, index) {
-    return this.logs.map((log, i) => {
-      if (i !== index) {
-        return log;
-      }
-      return new Log({...log, [name]: value});
-    });
-  };
-}
-
-/**
- * A log of shipments
- */
-class Log {
-  /**
-   * Constructor
-   *
-   * @param {object} props - React props
-   */
-  constructor(props = {}) {
-    this.barcode = props.barcode || null;
-    this.centerId = props.centerId || null;
-    this.status = props.status || null;
-    this.user = props.user || null;
-    this.temperature = props.temperature || null;
-    this.date = props.date || null;
-    this.time = props.time || null;
-    this.comments = props.comments || null;
-  }
-
-  /**
-   * Set a value
-   *
-   * @param {string} name - the key
-   * @param {?} value - the value
-   *
-   * @return {Log} - A new log object with the key set to value
-   */
-  set(name, value) {
-    return new Log({...this, [name]: value});
-  }
-}
-
-export default Shipment;
diff --git a/jsx/barcodePage.js b/jsx/barcodePage.js
deleted file mode 100644
index db49b527..00000000
--- a/jsx/barcodePage.js
+++ /dev/null
@@ -1,423 +0,0 @@
-import React, {Component} from 'react';
-import {Link} from 'react-router-dom';
-
-import {clone, isEmpty} from './helpers.js';
-
-import Globals from './globals';
-import Header from './header';
-import BiobankSpecimen from './specimen';
-import BiobankContainer from './container';
-import LoadingBar from 'jsx/LoadingBar';
-
-const initialState = {
-  loading: false,
-  current: {
-    files: {},
-    list: {},
-    coordinate: null,
-    sequential: false,
-    count: null,
-    multiplier: 1,
-    specimen: {},
-    container: {},
-  },
-  errors: {
-    container: {},
-    specimen: {},
-  },
-  editable: {
-    aliquotForm: false,
-    containerParentForm: false,
-    loadContainer: false,
-    containerCheckout: false,
-    containerType: false,
-    temperature: false,
-    quantity: false,
-    status: false,
-    center: false,
-    collection: false,
-    preparation: false,
-    analysis: false,
-  },
-};
-
-/**
- * A page with barcodes?
- */
-class BarcodePage extends Component {
-  /**
-   * Constructor
-   */
-  constructor() {
-    super();
-
-    this.state = initialState;
-    this.getParentContainerBarcodes
-      = this.getParentContainerBarcodes.bind(this);
-    this.getCoordinateLabel = this.getCoordinateLabel.bind(this);
-    this.edit = this.edit.bind(this);
-    this.clearEditable = this.clearEditable.bind(this);
-    this.clearAll = this.clearAll.bind(this);
-    this.setCheckoutList = this.setCheckoutList.bind(this);
-    this.editSpecimen = this.editSpecimen.bind(this);
-    this.editContainer = this.editContainer.bind(this);
-    this.setSpecimen = this.setSpecimen.bind(this);
-    this.setContainer = this.setContainer.bind(this);
-    this.setCurrent = this.setCurrent.bind(this);
-    this.setErrors = this.setErrors.bind(this);
-    this.getBarcodePathDisplay = this.getBarcodePathDisplay.bind(this);
-  }
-
-  /**
-   * Get the barcodes from a parent container recursively
-   *
-   * @param {object} container - the container with siblings
-   * @param {array} barcodes - the initial list of barcodes
-   *
-   * @return {array}
-   */
-  getParentContainerBarcodes(container, barcodes=[]) {
-    barcodes.push(container.barcode);
-
-    const parent = Object.values(this.props.data.containers)
-      .find((c) => container.parentContainerId == c.id);
-
-    parent && this.getParentContainerBarcodes(parent, barcodes);
-
-    return barcodes.slice(0).reverse();
-  }
-
-  /**
-   * Get the label for a coordinate in a container
-   *
-   * @param {object} container
-   *
-   * @return {string}
-   */
-  getCoordinateLabel(container) {
-    const optcontainer = this.props.options.container;
-    const datacontainers = this.props.data.containers;
-    const parentContainer = datacontainers[container.parentContainerId];
-    const dimensions = optcontainer.dimensions[parentContainer.dimensionId];
-    let coordinate;
-    let j = 1;
-    outerloop:
-    for (let y=1; y<=dimensions.y; y++) {
-      for (let x=1; x<=dimensions.x; x++) {
-        if (j == container.coordinate) {
-          if (dimensions.xNum == 1 && dimensions.yNum == 1) {
-            coordinate = x + (dimensions.x * (y-1));
-          } else {
-            const xVal = dimensions.xNum == 1 ? x : String.fromCharCode(64+x);
-            const yVal = dimensions.yNum == 1 ? y : String.fromCharCode(64+y);
-            coordinate = yVal+''+xVal;
-          }
-          break outerloop;
-        }
-        j++;
-      }
-    }
-    return coordinate;
-  }
-
-  /**
-   * Set a key as editable
-   *
-   * @param {string} stateKey - the key to edit
-   *
-   * @return {Promise}
-   */
-  edit(stateKey) {
-    return new Promise((resolve) => {
-      this.clearEditable()
-      .then(() => {
-        const editable = clone(this.state.editable);
-        editable[stateKey] = true;
-        this.setState({editable}, resolve());
-      });
-    });
-  }
-
-  /**
-   * Reset the editable state of the page
-   *
-   * @return {Promise}
-   */
-  clearEditable() {
-    const state = clone(this.state);
-    state.editable = initialState.editable;
-    return new Promise((res) => this.setState(state, res()));
-  }
-
-  /**
-   * Reset the state of the page
-   *
-   * @return {Promise}
-   */
-  clearAll() {
-    return new Promise((res) => this.setState(initialState, res()));
-  }
-
-  /**
-   * Set a list of containers to checkout?
-   *
-   * @param {object} container - a container to checkout?
-   */
-  setCheckoutList(container) {
-    // Clear current container field.
-    this.setCurrent('containerId', 1)
-      .then(()=>this.setCurrent('containerId', null));
-    const list = this.state.current.list;
-    list[container.coordinate] = container;
-    this.setCurrent('list', list);
-  }
-
-  /**
-   * Edit a specimen
-   *
-   * @param {object} specimen - specimen
-   *
-   * @return {Promise}
-   */
-  editSpecimen(specimen) {
-    specimen = clone(specimen);
-    return this.setCurrent('specimen', specimen);
-  }
-
-  /**
-   * Edit a container
-   *
-   * @param {object} container - container
-   *
-   * @return {Promise}
-   */
-  editContainer(container) {
-    container = clone(container);
-    return this.setCurrent('container', container);
-  }
-
-  /**
-   * Set current thing being edited?
-   *
-   * @param {string} name - the name to display
-   * @param {object} value - the error message
-   *
-   * @return {Promise}
-   */
-  setCurrent(name, value) {
-    const current = clone(this.state.current);
-    current[name] = value;
-    return new Promise((res) => this.setState({current}, res()));
-  }
-
-  /**
-   * Set active errors to display
-   *
-   * @param {string} name - the key with an error
-   * @param {string} value - the error message
-   */
-  setErrors(name, value) {
-    console.log(name+': '+value);
-    const errors = clone(this.state.errors);
-    errors[name] = value;
-    console.log(errors);
-    this.setState({errors});
-  }
-
-  /**
-   * Get the path to display for a barcode
-   *
-   * @param {array} parentBarcodes - parent barcodes
-   *
-   * @return {JSX}
-   */
-  getBarcodePathDisplay(parentBarcodes) {
-    return Object.keys(parentBarcodes).map((i) => {
-      const container = Object.values(this.props.data.containers)
-        .find(
-          (container) =>
-            container.barcode == parentBarcodes[parseInt(i)+1]
-        );
-      let coordinateDisplay;
-      if (container) {
-        const coordinate = this.getCoordinateLabel(container);
-        coordinateDisplay = <b>{'-'+(coordinate || 'UAS')}</b>;
-      }
-      return (
-        <span className='barcodePath'>
-          {i != 0 && ': '}
-          <Link
-            key={i}
-            to={`/barcode=${parentBarcodes[i]}`}>{parentBarcodes[i]}
-          </Link>
-          {coordinateDisplay}
-        </span>
-      );
-    });
-  }
-
-  /**
-   * Sets the current specimen
-   *
-   * @param {string} name - the specimen name
-   * @param {string} value - the specimen value
-   *
-   * @return {Promise}
-   */
-  setSpecimen(name, value) {
-    return new Promise((resolve) => {
-      const specimen = clone(this.state.current.specimen);
-      specimen[name] = value;
-      this.setCurrent('specimen', specimen)
-      .then(() => resolve());
-    });
-  }
-
-  /**
-   * Sets the current container
-   *
-   * @param {string} name - the container name
-   * @param {string} value - the container value
-   *
-   * @return {Promise}
-   */
-  setContainer(name, value) {
-    return new Promise((resolve) => {
-      const container = clone(this.state.current.container);
-      value ? container[name] = value : delete container[name];
-      this.setCurrent('container', container)
-      .then(() => resolve());
-    });
-  }
-
-  /**
-   * Render the React component
-   *
-   * @return {JSX}
-   */
-  render() {
-    const {current, editable, errors} = clone(this.state);
-    const {specimen, container, data, options} = this.props;
-
-    // THIS IS A PLACE HOLDER FOR BETTER LAZY LOADING
-    if (isEmpty(data.containers) ||
-        isEmpty(data.specimens) || isEmpty(data.pools)
-    ) {
-      return <LoadingBar progress={this.props.loading}/>;
-    }
-
-    const updateContainer = (container, close = true) => {
-      this.setErrors('container', {});
-      return new Promise((resolve) => this.setState({loading: true}, () =>
-        this.props.updateContainer(container)
-        .then(() => close && this.clearEditable(),
-          (errors) => errors.container && this.setErrors('container', errors.container))
-        .then(() => this.setState({loading: false}, resolve()))
-      ));
-    };
-    const updateSpecimen = (specimen) => {
-      this.setErrors('specimen', {});
-      return this.setState({loading: true}, () =>
-        this.props.updateSpecimen(specimen)
-        .then(() => this.clearEditable(),
-          (errors) => errors.specimen && this.setErrors('specimen', errors.specimen))
-        .then(() => this.setState({loading: false}))
-      );
-    };
-
-    const renderMain = () => {
-      if (this.props.specimen) {
-        return (
-          <BiobankSpecimen
-            specimen={specimen}
-            container={container}
-            options={options}
-            errors={this.state.errors}
-            current={this.state.current}
-            editable={this.state.editable}
-            setCurrent={this.setCurrent}
-            edit={this.edit}
-            clearAll={this.clearAll}
-            setSpecimen={this.setSpecimen}
-            editSpecimen={this.editSpecimen}
-            updateSpecimen={updateSpecimen}
-          />
-        );
-      } else {
-        return (
-          <BiobankContainer
-            history={this.props.history}
-            container={container}
-            data={data}
-            options={options}
-            current={this.state.current}
-            editable={this.state.editable}
-            editContainer={this.editContainer}
-            updateContainer={updateContainer}
-            setCurrent={this.setCurrent}
-            setCheckoutList={this.setCheckoutList}
-            edit={this.edit}
-            clearAll={this.clearAll}
-            getCoordinateLabel={this.getCoordinateLabel}
-            getParentContainerBarcodes={this.getParentContainerBarcodes}
-            getBarcodePathDisplay={this.getBarcodePathDisplay}
-          />
-        );
-      }
-    };
-
-    return (
-      <div>
-        <Link to={`/`}>
-          <span className='glyphicon glyphicon-chevron-left'/>
-          Return to Filter
-        </Link>
-        <Header
-          data={data}
-          current={current}
-          editable={editable}
-          options={options}
-          editContainer={this.editContainer}
-          edit={this.edit}
-          specimen={this.props.specimen}
-          container={this.props.container}
-          clearAll={this.clearAll}
-          setContainer={this.setContainer}
-          setSpecimen={this.setSpecimen}
-          createSpecimens={this.props.createSpecimens}
-          updateContainer={updateContainer}
-          getParentContainerBarcodes={this.getParentContainerBarcodes}
-          getBarcodePathDisplay={this.getBarcodePathDisplay}
-          increaseCoordinate={this.props.increaseCoordinate}
-          printLabel={this.props.printLabel}
-        />
-        <div className='summary'>
-          <Globals
-            loading={this.state.loading}
-            current={current}
-            errors={errors}
-            editable={editable}
-            data={data}
-            options={options}
-            specimen={specimen}
-            container={container}
-            edit={this.edit}
-            clearAll={this.clearAll}
-            editContainer={this.editContainer}
-            editSpecimen={this.editSpecimen}
-            setContainer={this.setContainer}
-            setSpecimen={this.setSpecimen}
-            uC={() => this.props.updateContainer(current.container)}
-            updateContainer={updateContainer}
-            updateSpecimen={updateSpecimen}
-            getCoordinateLabel={this.getCoordinateLabel}
-            setCurrent={this.setCurrent}
-          />
-          {renderMain()}
-        </div>
-      </div>
-    );
-  }
-}
-
-export default BarcodePage;
diff --git a/jsx/batchEditForm.js b/jsx/batchEditForm.js
deleted file mode 100644
index 180188bb..00000000
--- a/jsx/batchEditForm.js
+++ /dev/null
@@ -1,658 +0,0 @@
-import SpecimenProcessForm from './processForm';
-import {VerticalTabs, TabPane} from 'Tabs';
-import Modal from 'Modal';
-import Loader from 'Loader';
-import {mapFormOptions, clone, isEmpty} from './helpers.js';
-
-import Swal from 'sweetalert2';
-
-/**
- * Biobank Batch Edit Specimen Form
- *
- * TODO: DESCRIPTION
- *
- * @author Henri Rabalais
- * @version 1.0.0
- *
- **/
-const initialState = {
-  specimen: {},
-  container: {},
-  collection: {},
-  preparation: {},
-  list: {},
-  count: 0,
-  current: {},
-  errors: {specimen: {}, container: {}},
-  loading: false,
-  editable: {global: true},
-  show: {collection: false, preparation: false},
-};
-
-/**
- * Biobank batch edit specimen form
- */
-class BatchEditForm extends React.PureComponent {
-  /**
-   * Constructor
-   */
-  constructor() {
-    super();
-
-    this.state = initialState;
-    this.setSpecimen = this.setSpecimen.bind(this);
-    this.setContainer = this.setContainer.bind(this);
-    this.setCurrent = this.setCurrent.bind(this);
-    this.setProcess = this.setProcess.bind(this);
-    this.validateListItem = this.validateListItem.bind(this);
-    this.addListItem = this.addListItem.bind(this);
-    this.setPool = this.setPool.bind(this);
-  };
-
-  /**
-   * Add a new list item to a container
-   *
-   * FIXME: SHOULD LIKELY GO INTO A HIGHER LEVEL COMPONENT
-   *
-   * @param {int} containerId - the container to add an item to
-   */
-  addListItem(containerId) {
-    let {
-      list,
-      current,
-      collection,
-      preparation,
-      count,
-      show,
-    } = clone(this.state);
-
-    // Increase count.
-    count++;
-
-    // Set Specimen and Container.
-    const container = this.props.data.containers[containerId];
-    const specimen = this.props.data.specimens[container.specimenId];
-
-    // Set current global values.
-    current.typeId = specimen.typeId;
-
-    // Set list values.
-    list[count] = {specimen, container};
-
-    // This determines if every specimen in the list has the same collection
-    // protocol.
-    show.collection = Object.keys(list).length > 1 && Object.values(list)
-    .every((item, i, listArray) => {
-      return item.specimen.collection &&
-        item.specimen.collection.protocolId ===
-        listArray[0].specimen.collection.protocolId;
-    });
-
-    // If so, set the collection protocolId.
-    if (show.collection) {
-      collection.protocolId = list[
-        Object.keys(list)[0]
-      ].specimen.collection.protocolId;
-    }
-
-    // This determines if every specimen in the list has the same preparation
-    // protocol.
-    show.preparation = Object.keys(list).length > 1 && Object.values(list)
-    .every((item, i, listArray) => {
-      return item.specimen.preparation &&
-        item.specimen.preparation.protocolId ===
-        listArray[0].specimen.preparation.protocolId;
-    });
-
-    // If so, set the preparation protocolId.
-    if (show.preparation) {
-      preparation.protocolId = list[
-        Object.keys(list)[0]
-      ].specimen.preparation.protocolId;
-    }
-
-    this.setState(
-      {list, current, collection, preparation, count, show}
-    );
-  }
-
-  /**
-   * Remove a list item from a container
-   *
-   * FIXME: SHOULD LIKELY GO INTO A HIGHER LEVEL COMPONENT
-   *
-   * @param {string} key - the key to remove
-   */
-  removeListItem(key) {
-    let {list, current} = clone(this.state);
-    delete list[key];
-    current = isEmpty(list) ? {} : current;
-    this.setState({list, current});
-  }
-
-  /**
-   * Set the current specimen being edited?
-   *
-   * @param {string} name - process name
-   * @param {object} value - value to set
-   */
-  setSpecimen(name, value) {
-    const specimen = clone(this.state.specimen);
-    specimen[name] = value;
-    // if (!value) delete specimen[name];
-    this.setState({specimen});
-  }
-
-  /**
-   * Set the current container being edited?
-   *
-   * @param {string} name - process name
-   * @param {object} value - value to set
-   */
-  setContainer(name, value) {
-    const container = clone(this.state.container);
-    container[name] = value;
-    this.setState({container});
-  }
-
-  /**
-   * Set the current specimen being edited?
-   *
-   * @param {string} name - process name
-   * @param {object} value - value to set
-   *
-   * @return {Promise}
-   */
-  setCurrent(name, value) {
-    const current = clone(this.state.current);
-    current[name] = value;
-    return new Promise((res) => this.setState({current}, res()));
-  }
-
-  /**
-   * Sets the process being edited
-   *
-   * @param {string} name - process name
-   * @param {object} value - value to set
-   */
-  setProcess(name, value) {
-    this.setState({[name]: value});
-  }
-
-  /**
-   * Set a pool?
-   *
-   * @param {string} name - the pool name
-   * @param {int} poolId - the pool id
-   */
-  setPool(name, poolId) {
-    const pool = clone(this.props.data.pools[poolId]);
-
-    // This struture is what allows pools to be loaded and then have the pool
-    // label disappear once the barcodes have been added to the list.
-    this.setState({loading: true});
-    this.setCurrent('poolId', poolId)
-    .then(() => Promise.all(pool.specimenIds
-      .map((specimenId) => Object.values(this.state.list)
-        .find((item) => item.specimen.id === specimenId)
-        || this.addListItem(this.props.data.specimens[specimenId].containerId))
-      .map((p) => p instanceof Promise ? p : Promise.resolve(p))))
-    .then(() => this.setCurrent('poolId', null))
-    .then(() => this.setState({loading: false}));
-  }
-
-  /**
-   * Validate the list items for a container
-   *
-   * @param {int} containerId - the container to validate
-   *
-   * @return {Promise}
-   */
-  validateListItem(containerId) {
-    const {current, list} = clone(this.state);
-    const container = this.props.data.containers[containerId];
-    const specimen = this.props.data.specimens[container.specimenId];
-    if (!isEmpty(list) &&
-      (specimen.typeId !== current.typeId)) {
-      Swal.fire(
-        'Oops!',
-        'Specimens must be of the same Type and Center',
-        'warning'
-      );
-      return Promise.reject();
-    }
-    return Promise.resolve();
-  }
-
-  /**
-   * Render the react component
-   *
-   * @return {JSX}
-   */
-  render() {
-    if (this.state.loading) {
-      return <Loader/>;
-    }
-
-    const {data, options} = this.props;
-    const {poolId, collection, preparation, list, current, errors} = this.state;
-
-    const units = current.typeId ? mapFormOptions(
-      options.specimen.typeUnits[current.typeId],
-      'label'
-    ) : {};
-    const stati = mapFormOptions(options.container.stati, 'label');
-    const containerTypesPrimary = mapFormOptions(
-      options.container.typesPrimary,
-      'label',
-    );
-    const containerTypes = {};
-    if (current.typeId && options.specimen.typeContainerTypes[current.typeId]) {
-      Object.keys(containerTypesPrimary).forEach((id) => {
-        options.specimen.typeContainerTypes[current.typeId].forEach((i) => {
-          if (id == i) {
-            containerTypes[id] = containerTypesPrimary[id];
-          }
-        });
-      });
-    }
-    const globalForm = current.typeId ? (
-      <EditForm>
-        <TextboxElement
-          name='quantity'
-          label='Quantity'
-          value={this.state.specimen.quantity}
-          errorMessage={errors.specimen.quantity}
-          onUserInput={this.setSpecimen}
-        />
-        <SelectElement
-          name='unitId'
-          label='Unit'
-          value={this.state.specimen.unitId}
-          options={units}
-          errorMessage={errors.specimen.unitId}
-          onUserInput={this.setSpecimen}
-        />
-        {options.specimen.types[current.typeId].freezeThaw == 1 ? (
-          <TextboxElement
-            name='fTCycle'
-            label='Freeze-Thaw Cycle'
-            value={this.state.specimen.fTCycle}
-            onUserInput={this.setSpecimen}
-            errorMessage={errors.specimen.fTCycle}
-            min={0}
-          />
-        ) : null}
-        <SelectElement
-          name='typeId'
-          label='Container Type'
-          value={this.state.container.typeId}
-          options={containerTypes}
-          errorMessage={errors.container.typeId}
-          onUserInput={this.setContainer}
-        />
-        <TextboxElement
-          name='lotNumber'
-          label='Lot Number'
-          value={this.state.container.lotNumber}
-          errorMessage={errors.container.lotNumber}
-          onUserInput={this.setContainer}
-        />
-        <SelectElement
-          name='statusId'
-          label='Status'
-          value={this.state.container.statusId}
-          options={stati}
-          errorMessage={errors.container.statusId}
-          onUserInput={this.setContainer}
-        />
-        <SelectElement
-          name='projectIds'
-          label='Project'
-          value={this.state.container.projectIds}
-          options={options.projects}
-          multiple={true}
-          emptyOption={false}
-          errorMessage={errors.container.projectIds}
-          onUserInput={this.setContainer}
-        />
-      </EditForm>
-    ) : null;
-
-    const collectionForm = this.state.editable.collection ? (
-      <div>
-        <StaticElement
-          label='Protocol'
-          text={options.specimen.protocols[collection.protocolId].label}
-        />
-        <EditForm>
-          <SpecimenProcessForm
-            edit={true}
-            errors={errors.specimen.collection || {}}
-            options={options}
-            process={collection}
-            processStage='collection'
-            setParent={this.setProcess}
-            setCurrent={this.setCurrent}
-            typeId={current.typeId}
-            hideProtocol={true}
-            />
-        </EditForm>
-      </div>
-    ) : null;
-
-    const preparationForm = this.state.editable.preparation ? (
-      <div>
-        <StaticElement
-          label='Protocol'
-          text={options.specimen.protocols[preparation.protocolId].label}
-        />
-        <EditForm>
-          <SpecimenProcessForm
-            edit={true}
-            errors={errors.specimen.preparation || {}}
-            options={options}
-            process={preparation}
-            processStage='preparation'
-            setParent={this.setProcess}
-            setCurrent={this.setCurrent}
-            typeId={current.typeId}
-            hideProtocol={true}
-            />
-        </EditForm>
-      </div>
-    ) : null;
-
-    // TODO: This should likely be filtered so that only pools that match the
-    // proper criteria are left in the list.
-    const pools = mapFormOptions(data.pools, 'label');
-    const glyphStyle = {
-      color: '#DDDDDD',
-      marginLeft: 10,
-      cursor: 'pointer',
-    };
-
-    const barcodeList = Object.entries(list)
-      .map(([key, item]) => {
-        const handleRemoveItem = () => this.removeListItem(key);
-        return (
-          <div key={key} className='preparation-item'>
-            <div>{item.container.barcode}</div>
-            <div
-              className='glyphicon glyphicon-remove'
-              style={glyphStyle}
-              onClick={handleRemoveItem}
-            />
-          </div>
-        );
-      });
-
-    const tabList = [{
-      id: 'global',
-      label: 'Global',
-      error: !isEmpty(errors.specimen) || !isEmpty(errors.container),
-      content: globalForm,
-    }];
-    if (this.state.show.collection) {
-      tabList.push({
-        id: 'collection',
-        label: 'Collection',
-        error: !isEmpty(errors.specimen.collection),
-        content: collectionForm,
-      });
-    }
-    if (this.state.show.preparation) {
-      tabList.push({
-        id: 'preparation',
-        label: 'Preparation',
-        content: preparationForm,
-      });
-    }
-    const tabContent = tabList
-    .map((tab, i) => <TabPane key={i} TabId={tab.id}>{tab.content}</TabPane>);
-
-    const handlePoolInput = (name, value) => value && this.setPool(name, value);
-    const handleClose = () => this.setState(initialState, this.props.onClose);
-
-    // TODO: This should likely be cleaned up because there must be a more
-    // efficient way of structuring it.
-    const handleSubmit = () => {
-      this.setState({errors: {container: {}, specimen: {}}});
-      const prepList = Object.values(list).map((item) => {
-        const specimen = clone(item.specimen);
-        const container = clone(item.container);
-
-        // Clone values from global specimen.
-        Object.keys(this.state.specimen).forEach((name) => {
-          if (this.state.specimen[name] != null) {
-            specimen[name] = this.state.specimen[name];
-          }
-        });
-
-        // Clone values from global container.
-        Object.keys(this.state.container).forEach((name) => {
-          if (this.state.container[name] != null) {
-            container[name] = this.state.container[name];
-          }
-        });
-
-        // Clone collection values to specimen.
-        Object.keys(collection).forEach((name) => {
-          if (typeof specimen.collection[name] === 'object' &&
-              specimen.collection[name] !== null) {
-            Object.keys(collection[name]).forEach((index) => {
-              if (collection[name][index] != null) {
-                specimen.collection[name][index] = collection[name][index];
-              }
-            });
-          } else {
-            if (collection[name] != null) {
-              specimen.collection[name] = collection[name];
-            }
-          }
-        });
-
-        // Clone specimen values to specimen.
-        Object.keys(preparation).forEach((name) => {
-          if (typeof specimen.preparation[name] === 'object' &&
-              specimen.preparation[name] !== null) {
-            Object.keys(preparation[name]).forEach((index) => {
-              if (preparation[name][index] != null) {
-                specimen.preparation[name][index] = preparation[name][index];
-              }
-            });
-          } else {
-            if (preparation[name] != null) {
-              specimen.preparation[name] = preparation[name];
-            }
-          }
-        });
-
-        return {specimen, container};
-      });
-
-      return new Promise((resolve, reject) => {
-        this.props.onSubmit(prepList)
-        .then(() => resolve(), (errors) => this.setState({errors}, reject()));
-      });
-    };
-
-    const editForms = Object.keys(list).length > 1 ? (
-      <div className='form-top'>
-        <StaticElement
-          label='Editing Note'
-          text="Select a form for the list to
-                edit the specimen values. Any previous value associated
-                with a Specimen for a given field will be
-                overwritten if one is added on this form."
-        />
-        <VerticalTabs
-          tabs={tabList}
-          onTabChange={(id) => this.setState({editable: {[id]: true}})}
-          updateURL={false}
-        >
-          {tabContent}
-        </VerticalTabs>
-      </div>
-    ) : null;
-
-    return (
-      <Modal
-        title='Edit Specimens'
-        show={this.props.show}
-        onClose={handleClose}
-        onSubmit={Object.keys(list).length > 1 && handleSubmit}
-        throwWarning={true}
-      >
-        <FormElement>
-          <div className='row'>
-            <div className='col-sm-10 col-sm-offset-1'>
-              <StaticElement
-                label='Editing Note'
-                text="Select or Scan the specimens to be edited. Specimens
-                      must share the same Type."
-              />
-              <StaticElement
-                label='Specimen Type'
-                text={(options.specimen.types[current.typeId]||{}).label || '—'}
-              />
-              <div className='row'>
-                <div className='col-xs-6'>
-                  <h4>Barcode Input</h4>
-                  <div className='form-top'/>
-                  <BarcodeInput
-                    data={data}
-                    options={options}
-                    list={list}
-                    validateListItem={this.validateListItem}
-                    addListItem={this.addListItem}
-                  />
-                  <SearchableDropdown
-                    name={'poolId'}
-                    label={'Pool'}
-                    onUserInput={handlePoolInput}
-                    options={pools}
-                    value={poolId}
-                  />
-                </div>
-                <div className='col-xs-6'>
-                  <h4>Barcode List</h4>
-                  <div className='form-top'/>
-                  <div className='preparation-list'>
-                    {barcodeList}
-                  </div>
-                </div>
-              </div>
-              {editForms}
-            </div>
-          </div>
-        </FormElement>
-      </Modal>
-    );
-  }
-}
-
-BatchEditForm.propTypes = {
-};
-
-/**
- * Input form to enter a barcode
- */
-class BarcodeInput extends React.PureComponent {
-  /**
-   * Constructor
-   *
-   * @param {object} props - React props
-   */
-  constructor(props) {
-    super(props);
-
-    const barcodesPrimary = Object.values(props.data.containers)
-    .reduce((result, container) => {
-      if (props.options.container.types[container.typeId].primary == 1) {
-        const inList = Object.values(props.list)
-        .find((i) => i.container.id == container.id);
-
-        if (!inList) {
-          result[container.id] = container.barcode;
-        }
-      }
-      return result;
-    }, {});
-
-    this.state = {
-      barcodesPrimary: barcodesPrimary,
-      barcode: null,
-    };
-  }
-
-  /**
-   * Render the React component
-   *
-   * @return {JSX}
-   */
-  render() {
-    const {addListItem} = this.props;
-
-    const handleInput = (name, value) => {
-      this.setState({barcode: value});
-      const containerId = Object.keys(this.state.barcodesPrimary)
-      .find((id) => this.state.barcodesPrimary[id] == value);
-      containerId && this.props.validateListItem(containerId)
-      .then(() => addListItem(containerId))
-      .then(() => this.setState({barcode: null}));
-    };
-    return (
-      <TextboxElement
-        name={'barcode'}
-        label={'Specimen'}
-        value={this.state.barcode}
-        onUserInput={handleInput}
-      />
-    );
-    // <SearchableDropdown
-    //   name={'containerId'}
-    //   label={'Search Specimen'}
-    //   onUserInput={onSearch}
-    //   options={this.state.barcodesPrimary}
-    //   value={containerId}
-    // />
-  }
-}
-
-/**
- * @param {object} props
- * @return {*}
- */
-function EditForm(props) {
-  return React.Children.map(props.children, (child) => {
-    const handleClick = (name, value) => {
-      if (!value) {
-        child.props.onUserInput(name, null);
-      }
-      if (value && child.props.value == null) {
-        child.props.onUserInput(name, '');
-      }
-    };
-    return React.isValidElement(child) && typeof child.type === 'function' && (
-      <div className="row">
-        <div className="col-xs-12">
-          <div className="row">
-            <div className="col-xs-10">
-              {React.cloneElement(child, {required: false})}
-            </div>
-            <div className="col-xs-2">
-              <CheckboxElement
-                name={child.props.name}
-                value={child.props.value != null}
-                onUserInput={handleClick}
-              />
-            </div>
-          </div>
-        </div>
-      </div>
-    );
-  });
-}
-
-export default BatchEditForm;
diff --git a/jsx/batchProcessForm.js b/jsx/batchProcessForm.js
deleted file mode 100644
index 00ffad33..00000000
--- a/jsx/batchProcessForm.js
+++ /dev/null
@@ -1,399 +0,0 @@
-import {PureComponent} from 'react';
-import SpecimenProcessForm from './processForm';
-import {VerticalTabs, TabPane} from 'Tabs';
-import Modal from 'Modal';
-import Loader from 'Loader';
-import {mapFormOptions, clone, isEmpty} from './helpers.js';
-
-import Swal from 'sweetalert2';
-
-/**
- * Biobank Bath Process Specimen Form
- *
- * TODO: DESCRIPTION
- *
- * @author Henri Rabalais
- * @version 1.0.0
- *
- **/
-const initialState = {
-  preparation: {},
-  list: {},
-  count: 0,
-  current: {},
-  errors: {specimen: {}},
-  loading: false,
-  editable: {preparation: true},
-};
-
-/**
- * A batch process form for specimens
- */
-class BatchProcessForm extends React.PureComponent {
-  /**
-   * Constructor
-   */
-  constructor() {
-    super();
-
-    this.state = initialState;
-    this.setCurrent = this.setCurrent.bind(this);
-    this.setProcess = this.setProcess.bind(this);
-    this.validateListItem = this.validateListItem.bind(this);
-    this.addListItem = this.addListItem.bind(this);
-    this.setPool = this.setPool.bind(this);
-  };
-
-  /**
-   * Sets a process?
-   *
-   * @param {string} name - a name
-   * @param {?} value - the value
-   *
-   * @return {Promise}
-   */
-  setProcess(name, value) {
-    return new Promise((res) => this.setState({[name]: value}, res()));
-  }
-
-  /**
-   * Add a list item to a container.
-   *
-   * @param {int} containerId - the container to add an item to
-   *
-   */
-  addListItem(containerId) {
-    let {list, current, preparation, count} = clone(this.state);
-
-    // Increase count.
-    count++;
-
-    // Set Specimen and Container.
-    const container = this.props.data.containers[containerId];
-    const specimen = this.props.data.specimens[container.specimenId];
-
-    // Set current global values.
-    current.typeId = specimen.typeId;
-    current.centerId = container.centerId;
-
-    // Set list values.
-    list[count] = {specimen, container};
-
-    // Set current preparation values.
-    preparation.centerId = container.centerId;
-
-    this.setState(
-      {preparation, list, current, count, containerId},
-      this.setState({containerId: null})
-    );
-  }
-
-  /**
-   * Set the current pool to display(?)
-   *
-   * @param {string} name - the name to display
-   * @param {int} poolId - the pool to display
-   */
-  setPool(name, poolId) {
-    const pool = clone(this.props.data.pools[poolId]);
-
-    this.setState({loading: true});
-    this.setCurrent('poolId', poolId)
-    .then(() => Promise.all(pool.specimenIds
-      .map((specimenId) => Object.values(this.state.list)
-        .find((item) => item.specimen.id === specimenId)
-        || this.addListItem(this.props.data.specimens[specimenId].containerId))
-      .map((p) => p instanceof Promise ? p : Promise.resolve(p))))
-    .then(() => this.setCurrent('poolId', null))
-    .then(() => this.setState({loading: false}));
-  }
-
-  /**
-   * Remove a key from the list.
-   *
-   * @param {string} key - the key to remove
-   */
-  removeListItem(key) {
-    let {list, current} = clone(this.state);
-    delete list[key];
-    current = isEmpty(list) ? {} : current;
-    const containerId = null;
-    this.setState({list, current, containerId});
-  }
-
-  /**
-   * Validate a container in a list
-   *
-   * @param {int} containerId - the container to validate
-   *
-   * @return {Promise}
-   */
-  validateListItem(containerId) {
-    const {current, list} = clone(this.state);
-    const container = this.props.data.containers[containerId];
-    const specimen = this.props.data.specimens[container.specimenId];
-    if (!isEmpty(list) &&
-      (specimen.typeId !== current.typeId)
-    ) {
-      Swal.fire('Oops!', 'Specimens must be of the same Type', 'warning');
-      return Promise.reject();
-    }
-    // XXX: This is what the validation used to be. Removed because CBIGR requires
-    // process from two different sites that are semantically the same. When
-    // project-level permissions are enabled, this should be restored.
-    // if (!isEmpty(list) &&
-    //   (specimen.typeId !== current.typeId ||
-    //   container.centerId !== current.centerId)
-    // ) {
-    //   swal.fire('Oops!', 'Specimens must be of the same Type and Center', 'warning');
-    //   return Promise.reject();
-    // }
-    return Promise.resolve();
-  }
-
-  /**
-   * Validate a list of specimens
-   *
-   * @param {array} list - the list of specimens to validate
-   *
-   * @return {Promise}
-   */
-  validateList(list) {
-    return new Promise((resolve, reject) => {
-      const barcodes = Object.values(list)
-        .filter((item) => !!item.specimen.preparation)
-        .map((item) => item.container.barcode);
-
-      if (barcodes.length > 0) {
-        return Swal.fire({
-          title: 'Warning!',
-          html: `Preparation for specimen(s) <b>${barcodes.join(', ')}</b> ` +
-            `already exists. By completing this form, the previous `
-            + `preparation will be overwritten.`,
-          type: 'warning',
-          showCancelButton: true,
-          confirmButtonText: 'Proceed'})
-        .then((result) => result.value ? resolve(list) : reject());
-      } else {
-        return resolve(list);
-      }
-    });
-  }
-
-  /**
-   * Set the current specimen(?) being processed
-   *
-   * @param {string} name - the name
-   * @param {string} value - the value
-   *
-   * @return {Promise}
-   */
-  setCurrent(name, value) {
-    const current = clone(this.state.current);
-    current[name] = value;
-    return new Promise((res) => this.setState({current}, res()));
-  }
-
-  /**
-   * Render the React element
-   *
-   * @return {JSX}
-   */
-  render() {
-    if (this.state.loading) {
-      return <Loader/>;
-    }
-
-    const {data, options} = this.props;
-    const {
-      containerId,
-      poolId,
-      preparation,
-      list,
-      current,
-      errors,
-    } = this.state;
-
-    const preparationForm = this.state.editable.preparation ? (
-      <SpecimenProcessForm
-        edit={true}
-        errors={errors.specimen.preparation || {}}
-        options={options}
-        process={preparation}
-        processStage='preparation'
-        setParent={this.setProcess}
-        setCurrent={this.setCurrent}
-        typeId={current.typeId}
-      />
-    ) : null;
-
-    // TODO: This should likely be filtered so that only pools that match the
-    // proper criteria are left in the list.
-    const pools = mapFormOptions(data.pools, 'label');
-    const glyphStyle = {
-      color: '#DDDDDD',
-      marginLeft: 10,
-      cursor: 'pointer',
-    };
-
-    const barcodeList = Object.entries(list)
-      .map(([key, item]) => {
-        const handleRemoveItem = () => this.removeListItem(key);
-        return (
-          <div key={key} className='preparation-item'>
-            <div>{item.container.barcode}</div>
-            <div
-              className='glyphicon glyphicon-remove'
-              style={glyphStyle}
-              onClick={handleRemoveItem}
-            />
-          </div>
-        );
-      });
-
-    const editForms = Object.keys(list).length > 1 && (
-      <div className='form-top'>
-        <VerticalTabs
-          tabs={[{id: 'preparation', label: 'Preparation'}]}
-          onTabChange={(id) => this.setState({editable: {[id]: true}})}
-          updateURL={false}
-        >
-          <TabPane TabId='preparation'>{preparationForm}</TabPane>
-        </VerticalTabs>
-      </div>
-    );
-
-    const handlePoolInput = (name, value) => value && this.setPool(name, value);
-    const form = (
-      <FormElement>
-        <div className='row'>
-          <div className='col-sm-10 col-sm-offset-1'>
-            <StaticElement
-              label='Processing Note'
-              text="Select or Scan the specimens to be prepared. Specimens must
-                    have a Status of 'Available', and share the same Type and
-                    Site. Any previous value associated with a Specimen will be
-                    overwritten if one is added on this form."
-            />
-            <StaticElement
-              label='Specimen Type'
-              text={(options.specimen.types[current.typeId]||{}).label || '—'}
-            />
-            <StaticElement
-              label='Site'
-              text={options.centers[current.centerId] || '—'}
-            />
-            <div className='row'>
-              <div className='col-xs-6'>
-                <h4>Barcode Input</h4>
-                <div className='form-top'/>
-                <BarcodeInput
-                  data={data}
-                  options={options}
-                  list={list}
-                  containerId={containerId}
-                  validateListItem={this.validateListItem}
-                  addListItem={this.addListItem}
-                />
-                <SearchableDropdown
-                  name={'poolId'}
-                  label={'Pool'}
-                  onUserInput={handlePoolInput}
-                  options={pools}
-                  value={poolId}
-                />
-              </div>
-              <div className='col-xs-6'>
-                <h4>Barcode List</h4>
-                <div className='form-top'/>
-                <div className='preparation-list'>
-                  {barcodeList}
-                </div>
-              </div>
-            </div>
-            {editForms}
-          </div>
-        </div>
-      </FormElement>
-    );
-
-    const handleClose = () => this.setState(initialState, this.props.onClose);
-    const handleSubmit = () => {
-      const prepList = Object.values(list).map((item) => {
-        const specimen = clone(item.specimen);
-        specimen.preparation = preparation;
-        return specimen;
-      });
-
-      return new Promise((resolve, reject) => {
-        this.validateList(list)
-        .then(() => this.props.onSubmit(prepList), () => reject())
-        .then(() => resolve(), (errors) => this.setState({errors}, reject()));
-      });
-    };
-    return (
-      <Modal
-        title='Process Specimens'
-        show={this.props.show}
-        onClose={handleClose}
-        onSubmit={handleSubmit}
-        throwWarning={true}
-      >
-        {form}
-      </Modal>
-    );
-  }
-}
-
-BatchProcessForm.propTypes = {
-};
-
-/**
- * Component to read a barcode from the barcode scanner
- */
-class BarcodeInput extends PureComponent {
-  /**
-   * Render the React component
-   *
-   * @return {JSX}
-   */
-  render() {
-    const {data, options, list, containerId, addListItem} = this.props;
-    // Create options for barcodes based on match typeId
-    const barcodesPrimary = Object.values(data.containers)
-    .reduce((result, container) => {
-      if (options.container.types[container.typeId].primary == 1) {
-        const specimen = data.specimens[container.specimenId];
-        const availableId = Object.keys(options.container.stati).find(
-          (key) => options.container.stati[key].label == 'Available'
-        );
-        const protocolExists = Object.values(options.specimen.protocols).find(
-          (protocol) => protocol.typeId == specimen.typeId
-        );
-        const inList = Object.values(list)
-        .find((i) => i.container.id == container.id);
-
-        if (container.statusId == availableId && protocolExists && !inList) {
-          result[container.id] = container.barcode;
-        }
-      }
-      return result;
-    }, {});
-
-    const handleInput = (name, containerId) => {
-      containerId && this.props.validateListItem(containerId)
-      .then(() => addListItem(containerId));
-    };
-    return (
-      <SearchableDropdown
-        name={'containerId'}
-        label={'Specimen'}
-        onUserInput={handleInput}
-        options={barcodesPrimary}
-        value={containerId}
-      />
-    );
-  }
-}
-
-export default BatchProcessForm;
diff --git a/jsx/biobankIndex.js b/jsx/biobankIndex.js
deleted file mode 100644
index 0ea05a7e..00000000
--- a/jsx/biobankIndex.js
+++ /dev/null
@@ -1,838 +0,0 @@
-import {BrowserRouter, Route, Switch} from 'react-router-dom';
-import Swal from 'sweetalert2';
-
-import BiobankFilter from './filter';
-import BarcodePage from './barcodePage';
-import {clone, isEmpty, get, getStream, post} from './helpers.js';
-
-/**
- * The main React entrypoint for the biobank module. This component
- * renders the index page.
- */
-class BiobankIndex extends React.Component {
-  /**
-   * Constructor
-   */
-  constructor() {
-    super();
-
-    this.state = {
-      data: {
-        containers: {},
-        pools: {},
-        specimens: {},
-      },
-      loading: 0,
-      options: {
-        candidatesSessions: {},
-        candidates: {},
-        centers: {},
-        container: {
-          types: {},
-          typesPrimary: {},
-          typesNonPrimary: {},
-          dimensions: {},
-          stati: {},
-        },
-        diagnoses: {},
-        examiners: {},
-        users: {},
-        projects: {},
-        sessionCenters: {},
-        sessions: {},
-        specimen: {
-          types: {},
-          typeUnits: {},
-          typeContainerTypes: {},
-          protocols: {},
-          protocolAttributes: {},
-          protocolContainers: {},
-          processes: {},
-          processAttributes: {},
-          attributes: {},
-          attributeDatatypes: {},
-          attributesOptions: {},
-          units: {},
-        },
-        shipment: {
-          statuses: {},
-          types: {},
-        },
-      },
-    };
-
-    this.printLabel = this.printLabel.bind(this);
-    this.routeBarcode = this.routeBarcode.bind(this);
-    this.setData = this.setData.bind(this);
-    this.increaseCoordinate = this.increaseCoordinate.bind(this);
-    this.updateSpecimen = this.updateSpecimen.bind(this);
-    this.updateSpecimens = this.updateSpecimens.bind(this);
-    this.editSpecimens = this.editSpecimens.bind(this);
-    this.updateContainer = this.updateContainer.bind(this);
-    this.createPool = this.createPool.bind(this);
-    this.saveBatchEdit = this.saveBatchEdit.bind(this);
-    this.createSpecimens = this.createSpecimens.bind(this);
-    this.createContainers = this.createContainers.bind(this);
-    this.validateSpecimen = this.validateSpecimen.bind(this);
-    this.validateProcess = this.validateProcess.bind(this);
-    this.validateContainer = this.validateContainer.bind(this);
-  }
-
-  /**
-   * React lifecycle method
-   */
-  async componentDidMount() {
-    const updateProgress = (loading) => this.setState({loading});
-
-    const specimens = getStream(this.props.specimenAPI, updateProgress);
-    const containers = get(this.props.containerAPI);
-    const pools = get(this.props.poolAPI);
-    const options = await get(this.props.optionsAPI);
-    this.setState({options});
-
-    const data = this.state.data;
-    data.containers = await containers;
-    data.specimens = await specimens;
-    data.pools = await pools;
-    this.setState({data});
-    updateProgress(100);
-  }
-
-  /**
-   * Sets data for entities
-   *
-   * @param {string} type - the type of entity
-   * @param {object} entities - the entities to set
-   *
-   * @return {Promise}
-   */
-  setData(type, entities) {
-    return new Promise((resolve) => {
-      const data = clone(this.state.data);
-      entities.forEach((entity) => data[type][entity.id] = entity);
-      this.setState({data}, resolve());
-    });
-  }
-
-  /**
-   * Send a request to a server to print a label
-   *
-   * @param {object} labelParams - the properties of the label to print
-   *
-   * @return {Promise}
-   */
-  printLabel(labelParams) {
-    return post(labelParams, this.props.labelAPI, 'POST');
-  }
-
-  /**
-   * Find the appropriate container for a barcode.
-   *
-   * @param {string} barcode - the value to route
-   *
-   * @return {object}
-   */
-  routeBarcode(barcode) {
-    const container = Object.values(this.state.data.containers)
-      .find((container) => container.barcode == barcode);
-
-    const specimen = Object.values(this.state.data.specimens)
-      .find((specimen) => specimen.containerId == container.id);
-
-    return {container, specimen};
-  }
-
-  /**
-   * Send a request to update a single specimen on the server after
-   * validating it
-   *
-   * @param {object} specimen - the specimen to update
-   *
-   * @return {Promise}
-   */
-  updateSpecimen(specimen) {
-    const errors = this.validateSpecimen(specimen);
-    if (!isEmpty(errors)) {
-      return Promise.reject({specimen: errors});
-    }
-
-    return post(specimen, this.props.specimenAPI, 'PUT')
-    .then((specimens) => this.setData('specimens', specimens));
-  }
-
-  /**
-   * Update multiple specimens at once
-   *
-   * TODO: This should eventually check for errors and replace 'updateSpecimen'
-   * All updates can be sent via an array. This change should be reflected in
-   * the backend too. It should also be able to be be sent with a nested
-   * container object.
-   *
-   * @param {array} list - the list of specimens to update
-   *
-   * @return {Promise}
-   */
-  updateSpecimens(list) {
-    const updateList = list
-    .map((specimen) => () => this.updateSpecimen(specimen));
-
-    return Promise.all(updateList.map((updateSpecimen) => updateSpecimen()));
-  }
-
-  /**
-   * Edit a list of specimens
-   *
-   * @param {array} list - a list of specimens
-   *
-   * @return {Promise}
-   */
-  editSpecimens(list) {
-    let errors = {};
-    errors.specimen = this.validateSpecimen(list[0].specimen);
-    errors.container = this.validateContainer(list[0].container);
-    if (!isEmpty(errors.specimen) || !isEmpty(errors.container)) {
-      return Promise.reject(errors);
-    }
-
-    // TODO: For now, specimens and their respective containers are sent
-    // separately and 1 by 1 to be updated. They should eventually be sent
-    // together and batched in an array.
-    const specimenList = list
-    .map((item) => () => this.updateSpecimen(item.specimen));
-    const containerList = list
-    .map((item) => () => this.updateContainer(item.container));
-
-    return Promise.all(specimenList.map((item) => item()))
-    .then(() => Promise.all(containerList.map((item) => item())));
-  }
-
-  /**
-   * Sends a request to update a container on the server
-   *
-   * @param {object} container - the container to update
-   *
-   * @return {Promise}
-   */
-  updateContainer(container) {
-    const errors = this.validateContainer(container);
-    if (!isEmpty(errors)) {
-      return Promise.reject({container: errors});
-    }
-
-    return post(container, this.props.containerAPI, 'PUT')
-    .then((containers) => this.setData('containers', containers));
-  }
-
-  /**
-   * Increase the coordinates of a container to put it in the
-   * next available slot.
-   *
-   * @param {object} coordinate - the coordinate to increment
-   * @param {int} parentContainerId - the parent container
-   *
-   * @return {int}
-   */
-  increaseCoordinate(coordinate, parentContainerId) {
-    const containers = this.state.data.containers;
-    const childCoordinates = containers[parentContainerId].childContainerIds
-    .reduce((result, id) => {
-      const container = containers[id];
-      if (container.coordinate) {
-        result[container.coordinate] = id;
-      }
-      return result;
-    }, {});
-
-    const increment = (coord) => {
-      coord++;
-      if (childCoordinates.hasOwnProperty(coord)) {
-        coord = increment(coord);
-      }
-
-      return coord;
-    };
-
-    return increment(coordinate);
-  }
-
-  /**
-   * Create a batch of speciments
-   *
-   * @param {object} list - ?
-   * @param {object} current - ?
-   * @param {object} print - ?
-   *
-   * @return {Promise}
-   */
-  createSpecimens(list, current, print) {
-    const {options, data} = this.state;
-    const labelParams = [];
-    const projectIds = current.projectIds;
-    const centerId = current.centerId;
-    const availableId = Object.keys(options.container.stati).find(
-      (key) => options.container.stati[key].label === 'Available'
-    );
-    const errors = {specimen: {}, container: {}, list: {}};
-
-    let isError = false;
-    Object.keys(list).reduce((coord, key) => {
-      // set specimen values
-      const specimen = list[key];
-      specimen.candidateId = current.candidateId;
-      specimen.sessionId = current.sessionId;
-      specimen.quantity = specimen.collection.quantity;
-      specimen.unitId = specimen.collection.unitId;
-      specimen.collection.centerId = centerId;
-      if ((options.specimen.types[specimen.typeId]||{}).freezeThaw == 1) {
-        specimen.fTCycle = 0;
-      }
-      specimen.parentSpecimenIds = current.parentSpecimenIds || null;
-
-      // set container values
-      const container = specimen.container;
-      container.statusId = availableId;
-      container.temperature = 20;
-      container.projectIds = projectIds;
-      container.centerId = centerId;
-      container.originId = centerId;
-
-      // If the container is assigned to a parent, place it sequentially in the
-      // parent container and inherit the status, temperature and centerId.
-      if (current.container.parentContainerId) {
-        const containerParentId = current.container.parentContainerId;
-        container.parentContainerId = current.container.parentContainerId;
-        const parentContainer = data.containers[containerParentId];
-        const dims = options.container.dimensions;
-        const dimensions = dims[parentContainer.dimensionId];
-        const capacity = dimensions.x * dimensions.y * dimensions.z;
-        coord = this.increaseCoordinate(
-           coord,
-           current.container.parentContainerId
-        );
-        if (coord <= capacity) {
-          container.coordinate = parseInt(coord);
-        } else {
-          container.coordinate = null;
-        }
-        container.statusId = parentContainer.statusId;
-        container.temperature = parentContainer.temperature;
-        container.centerId = parentContainer.centerId;
-      }
-
-      // if specimen type id is not set yet, this will throw an error
-      if (specimen.typeId) {
-        labelParams.push({
-          barcode: container.barcode,
-          type: options.specimen.types[specimen.typeId].label,
-        });
-      }
-
-      specimen.container = container;
-      list[key] = specimen;
-
-      // this is so the global params (sessionId, candidateId, etc.) show errors
-      // as well.
-      errors.container = this.validateContainer(container, key);
-      errors.specimen = this.validateSpecimen(specimen, key);
-
-      if (!isEmpty(errors.container)) {
-        errors.list[key] = {container: errors.container};
-      }
-      if (!isEmpty(errors.specimen)) {
-        errors.list[key] = {...errors.list[key], specimen: errors.specimen};
-      }
-
-      if (!isEmpty(errors.list[key])) {
-        isError = true;
-      }
-
-      return coord;
-    }, 0);
-
-    if (isError) {
-      return Promise.reject(errors);
-    }
-
-    const printBarcodes = () => {
-      return new Promise((resolve) => {
-        if (print) {
-          Swal.fire({
-            title: 'Print Barcodes?',
-            type: 'question',
-            confirmButtonText: 'Yes',
-            cancelButtonText: 'No',
-            showCancelButton: true,
-          })
-          .then((result) => result.value && this.printLabel(labelParams))
-          .then(() => resolve());
-        } else {
-          resolve();
-        }
-      });
-    };
-
-    return printBarcodes()
-    .then(() => post(list, this.props.specimenAPI, 'POST'))
-    .then((entities) => {
-      this.setData('containers', entities.containers);
-      this.setData('specimens', entities.specimens);
-    })
-    .then(() => Promise.resolve());
-  }
-
-  /**
-   * Create containers
-   *
-   * @param {object} list - ?
-   * @param {object} current - ?
-   * @param {object} errors - ?
-   *
-   * @return {Promise}
-   */
-  createContainers(list, current, errors) {
-    const stati = this.state.options.container.stati;
-    const availableId = Object.keys(stati)
-    .find((key) => stati[key].label === 'Available');
-
-    let isError = false;
-    Object.entries(list).forEach(([key, container]) => {
-      container.statusId = availableId;
-      container.temperature = 20;
-      container.projectIds = current.projectIds;
-      container.originId = current.centerId;
-      container.centerId = current.centerId;
-
-      errors.container = this.validateContainer(container, key);
-      errors.list[key] = this.validateContainer(container, key);
-      if (!isEmpty(errors.list[key])) {
-        isError = true;
-      }
-    });
-
-    if (isError) {
-      return Promise.reject(errors);
-    }
-
-    return post(list, this.props.containerAPI, 'POST')
-    .then((containers) => this.setData('containers', containers))
-    .then(() => Promise.resolve());
-  }
-
-  /**
-   * Create a new pool
-   *
-   * @param {object} pool - the pool to create
-   * @param {object} list - the specimens to add to the pool
-   *
-   * @return {Promise}
-   */
-  createPool(pool, list) {
-    const stati = this.state.options.container.stati;
-    const dispensedId = Object.keys(stati)
-    .find(
-       (key) => stati[key].label === 'Dispensed'
-       );
-    const update = Object.values(list)
-    .reduce((result, item) => {
-      item.container.statusId = dispensedId;
-      item.specimen.quantity = '0';
-      return [...result,
-              () => this.updateContainer(item.container, false),
-              () => this.updateSpecimen(item.specimen, false),
-            ];
-    }, []);
-
-    const errors = this.validatePool(pool);
-    if (!isEmpty(errors)) {
-      return Promise.reject(errors);
-    }
-
-    return post(pool, this.props.poolAPI, 'POST')
-    .then((pools) => this.setData('pools', pools))
-    .then(() => Promise.all(update.map((update) => update())));
-  }
-
-  /**
-   * Save a batch of edits
-   *
-   * @param {object} list - a list of edits
-   *
-   * @return {Promise}
-   */
-  saveBatchEdit(list) {
-    const saveList = list
-    .map((specimen) => () => post(specimen, this.props.specimenAPI, 'PUT'));
-
-    const errors = this.validateSpecimen(list[0]);
-    if (!isEmpty(errors)) {
-      return Promise.reject(errors);
-    }
-
-    return Promise.all(saveList.map((item) => item()))
-    .then(
-       (data) => Promise.all(
-          data.map((item) => this.setData('specimens', item))
-       )
-    ).then(() => Swal.fire('Batch Preparation Successful!', '', 'success'));
-  }
-
-  /**
-   * Validate a specimen
-   *
-   * @param {object} specimen - the specimen to validate
-   * @param {string} key - unused?
-   *
-   * @return {object} an object of errors
-   */
-  validateSpecimen(specimen, key) {
-    const errors = {};
-
-    const required = [
-      'typeId',
-      'quantity',
-      'unitId',
-      'candidateId',
-      'sessionId',
-      'collection',
-    ];
-    const float = ['quantity'];
-    const positive = ['quantity', 'fTCycle'];
-    const integer = ['fTCycle'];
-
-    required.map((field) => {
-      // TODO: seems like for certain cases it needs to be !== null
-      if (!specimen[field]) {
-        errors[field] = 'This field is required! ';
-      }
-    });
-
-    float.map((field) => {
-      if (isNaN(parseInt(specimen[field])) || !isFinite(specimen[field])) {
-        errors[field] = 'This field must be a number! ';
-      }
-    });
-
-    positive.map((field) => {
-      if (specimen[field] != null && specimen[field] < 0) {
-        errors[field] = 'This field must not be negative!';
-      }
-    });
-
-    integer.map((field) => {
-      if (specimen[field] != null
-          && !/^\+?(0|[1-9]\d*)$/.test(specimen[field])
-      ) {
-        errors[field] = 'This field must be an integer!';
-      }
-    });
-
-    const optspecimen = this.state.options.specimen;
-    errors.collection =
-      this.validateProcess(
-        specimen.collection,
-        optspecimen.protocolAttributes[specimen.collection.protocolId],
-        [
-          'protocolId',
-          'examinerId',
-          'quantity',
-          'unitId',
-          'centerId',
-          'date',
-          'time',
-        ],
-        ['quantity']
-      );
-
-    // collection should only be set if there are errors associated with it.
-    if (isEmpty(errors.collection)) {
-      delete errors.collection;
-    }
-
-    if (specimen.preparation) {
-      errors.preparation =
-        this.validateProcess(
-          specimen.preparation,
-          optspecimen.protocolAttributes[specimen.preparation.protocolId],
-          ['protocolId', 'examinerId', 'centerId', 'date', 'time']
-        );
-    }
-
-    if (isEmpty(errors.preparation)) {
-      delete errors.preparation;
-    }
-
-    if (specimen.analysis) {
-      errors.analysis =
-        this.validateProcess(
-          specimen.analysis,
-          optspecimen.protocolAttributes[specimen.analysis.protocolId],
-          ['protocolId', 'examinerId', 'centerId', 'date', 'time']
-        );
-    }
-
-    if (isEmpty(errors.analysis)) {
-      delete errors.analysis;
-    }
-
-    return errors;
-  }
-
-  /**
-   * Validate a process
-   *
-   * @param {object} process - the process to validate
-   * @param {object} attributes - the attributes of the process
-   * @param {array} required - the required fields
-   * @param {array} number - an array of fields that must be numbers
-   *
-   * @return {object} errors
-   */
-  validateProcess(process, attributes, required, number) {
-    let errors = {};
-    let regex;
-
-    // validate required fields
-    required && required.map((field) => {
-      if (!process[field]) {
-        errors[field] = 'This field is required! ';
-      }
-    });
-
-    // validate floats
-    number && number.map((field) => {
-      if (isNaN(parseInt(process[field])) || !isFinite(process[field])) {
-        errors[field] = 'This field must be a number! ';
-      }
-    });
-
-    // validate date
-    regex = /^[12]\d{3}\-(0[1-9]|1[012])\-(0[1-9]|[12][0-9]|3[01])$/;
-    if (regex.test(process.date) === false ) {
-      errors.date = 'This field must be a valid date! ';
-    }
-
-    // validate time
-    regex = /^([01]\d|2[0-3]):([0-5]\d)$/;
-    if (regex.test(process.time) === false) {
-      errors.time = 'This field must be a valid time! ';
-    }
-
-    // validate custom attributes
-    if (!isEmpty(process.data)) {
-      errors.data = {};
-      const specimenopts = this.state.options.specimen;
-      const datatypes = specimenopts.attributeDatatypes;
-
-      const protocolId = process.protocolId;
-      const protocolAttributes = specimenopts.protocolAttributes[protocolId];
-      // FIXME: This if statement was introduced because certain processes have
-      // a data object even though their protocol isn't associated with attributes.
-      // This is a sign of bad importing/configuration and should be fixed in configuration
-      // rather than here.
-      if (protocolAttributes) {
-        Object.keys(protocolAttributes)
-          .forEach((attributeId) => {
-          // validate required
-          if (protocolAttributes[attributeId].required == 1
-              && !process.data[attributeId]) {
-            errors.data[attributeId] = 'This field is required!';
-          }
-
-          const dataTypeId= attributes[attributeId].datatypeId;
-          // validate number
-          if (datatypes[dataTypeId].datatype === 'number') {
-            if (isNaN(parseInt(process.data[attributeId])) ||
-                !isFinite(process.data[attributeId])) {
-              errors.data[attributeId] = 'This field must be a number!';
-            }
-          }
-
-          // validate date
-          if (datatypes[dataTypeId].datatype === 'date') {
-            regex = /^[12]\d{3}\-(0[1-9]|1[012])\-(0[1-9]|[12][0-9]|3[01])$/;
-            if (regex.test(process.data[attributeId]) === false ) {
-              errors.data[attributeId] = 'This field must be a valid date! ';
-            }
-          }
-
-          // validate time
-          if (datatypes[dataTypeId].datatype === 'time') {
-            regex = /^([01]\d|2[0-3]):([0-5]\d)$/;
-            if (regex.test(process.data[attributeId]) === false) {
-              errors.data[attributeId] = 'This field must be a valid time! ';
-            }
-          }
-
-          // TODO: Eventually introduce file validation.
-        });
-      }
-
-      if (isEmpty(errors.data)) {
-        delete errors.data;
-      }
-    }
-
-    // Return Errors
-    return errors;
-  }
-
-  /**
-   * Validate a container object
-   *
-   * @param {object} container - the container to validate
-   * @param {string} key - unused?
-   *
-   * @return {object} - an object full of errors
-   */
-  validateContainer(container, key) {
-    const errors = {};
-
-    const required = [
-      'barcode',
-      'typeId',
-      'temperature',
-      'statusId',
-      'projectIds',
-      'centerId',
-    ];
-
-    const float = [
-      'temperature',
-    ];
-
-    required.map((field) => {
-      if (!container[field]) {
-        errors[field] = 'This field is required! ';
-      }
-    });
-
-    float.map((field) => {
-      if (isNaN(parseInt(container[field])) || !isFinite(container[field])) {
-        errors[field] = 'This field must be a number! ';
-      }
-    });
-
-    Object.values(this.state.data.containers).map((c) => {
-      if (container.barcode === c.barcode && container.id !== c.id) {
-        errors.barcode = 'Barcode must be unique.';
-      }
-    });
-
-    // TODO: Regex barcode check will eventually go here.
-    // The regex is not currently in the schema and should be implemented here
-    // when it is.
-
-    return errors;
-  }
-
-  /**
-   * Validate a pool of speciments
-   *
-   * @param {object} pool - The pool to validate
-   *
-   * @return {object} an object of any errors
-   */
-  validatePool(pool) {
-    let regex;
-    const errors = {};
-
-    const required = ['label', 'quantity', 'unitId', 'date', 'time'];
-
-    required.forEach((field) => {
-      if (!pool[field]) {
-        errors[field] = 'This field is required! ';
-      }
-    });
-
-    if (isNaN(parseInt(pool.quantity)) || !isFinite(pool.quantity)) {
-      errors.quantity = 'This field must be a number! ';
-    }
-
-    // validate date
-    regex = /^[12]\d{3}\-(0[1-9]|1[012])\-(0[1-9]|[12][0-9]|3[01])$/;
-    if (regex.test(pool.date) === false ) {
-      errors.date = 'This field must be a valid date! ';
-    }
-
-    // validate time
-    regex = /^([01]\d|2[0-3]):([0-5]\d)$/;
-    if (regex.test(pool.time) === false) {
-      errors.time = 'This field must be a valid time! ';
-    }
-
-    if (pool.specimenIds == null || pool.specimenIds.length < 2) {
-      errors.total = 'Pooling requires at least 2 specimens';
-    };
-
-    return errors;
-  }
-
-  /**
-   * Render React component
-   *
-   * @return {JSX}
-   */
-  render() {
-    const barcode = (props) => {
-      const target = this.routeBarcode(props.match.params.barcode);
-      return (
-        <BarcodePage
-          history={props.history}
-          specimen={target.specimen}
-          container={target.container}
-          data={this.state.data}
-          options={this.state.options}
-          updateSpecimen={this.updateSpecimen}
-          updateContainer={this.updateContainer}
-          createSpecimens={this.createSpecimens}
-          createContainers={this.createContainers}
-          printLabel={this.printLabel}
-          increaseCoordinate={this.increaseCoordinate}
-          loading={this.state.loading}
-        />
-      );
-    };
-
-    const filter = (props) => (
-      <div>
-        <BiobankFilter
-          history={props.history}
-          data={this.state.data}
-          setData={this.setData}
-          options={this.state.options}
-          increaseCoordinate={this.increaseCoordinate}
-          createPool={this.createPool}
-          createContainers={this.createContainers}
-          createSpecimens={this.createSpecimens}
-          editSpecimens={this.editSpecimens}
-          updateSpecimens={this.updateSpecimens}
-          loading={this.state.loading}
-        />
-      </div>
-    );
-
-    return (
-      <BrowserRouter basename='/biobank'>
-        <div>
-          <Switch>
-            <Route exact path='/' render={filter}/>
-            <Route exact path='/barcode=:barcode' render={barcode}/>
-          </Switch>
-        </div>
-      </BrowserRouter>
-    );
-  }
-}
-
-window.addEventListener('load', () => {
-  const biobank = `${loris.BaseURL}/biobank/`;
-  ReactDOM.render(
-    <BiobankIndex
-      specimenAPI={`${biobank}specimenendpoint/`}
-      containerAPI={`${biobank}containerendpoint/`}
-      poolAPI={`${biobank}poolendpoint/`}
-      optionsAPI={`${biobank}optionsendpoint/`}
-      labelAPI={`${biobank}labelendpoint/`}
-    />,
-    document.getElementById('lorisworkspace'));
-});
diff --git a/jsx/common/Button.tsx b/jsx/common/Button.tsx
new file mode 100644
index 00000000..d0dd151f
--- /dev/null
+++ b/jsx/common/Button.tsx
@@ -0,0 +1,17 @@
+import React from 'react';
+
+interface ButtonProps {
+  onClick: (e: React.MouseEvent<HTMLButtonElement>) => void;
+  label?: string;
+  disabled?: boolean;
+}
+
+const Button: React.FC<ButtonProps> = ({ label, onClick, disabled }) => {
+  return (
+    <button className={'btn btn-primary'} onClick={onClick} disabled={disabled}>
+      {label}
+    </button>
+  );
+};
+
+export default Button;
diff --git a/jsx/common/CheckboxField.tsx b/jsx/common/CheckboxField.tsx
new file mode 100644
index 00000000..c39d616c
--- /dev/null
+++ b/jsx/common/CheckboxField.tsx
@@ -0,0 +1,14 @@
+import React from 'react';
+import { Input, FieldProps, ValueProps, LabelProps } from '../Form';
+
+interface CheckboxProps extends ValueProps<boolean>, LabelProps, FieldProps {}
+
+const CheckboxField: React.FC<CheckboxProps> = ({ required, label, ...props }) => {
+  return (
+    <Field required={required} label={label}>
+      <Input type='checkbox' {...props} />
+    </Field>
+  );
+};
+
+export default CheckboxField;
diff --git a/jsx/common/DateField.tsx b/jsx/common/DateField.tsx
new file mode 100644
index 00000000..d7424b13
--- /dev/null
+++ b/jsx/common/DateField.tsx
@@ -0,0 +1,19 @@
+import React from 'react';
+import { Input, FieldProps, ValueProps, LabelProps } from '../Form';
+import { Button } from '../Button';
+
+interface DateProps extends ValueProps<string>, LabelProps, FieldProps {}
+
+const DateField: React.FC<DateProps> = ({ required, label, ...props }) => {
+  const today = new Date().toISOString().split('T')[0];
+  const setToday = () => props.onChange(props.name, today);
+
+  return (
+    <Field required={required} label={label}>
+      <Input type='date' {...props} />
+      <Button onClick={setToday} label={'Today'} />
+    </Field>
+  );
+};
+
+export default DateField;
diff --git a/jsx/common/FormWrapper.tsx b/jsx/common/FormWrapper.tsx
new file mode 100644
index 00000000..70a07a87
--- /dev/null
+++ b/jsx/common/FormWrapper.tsx
@@ -0,0 +1,33 @@
+import React, { ReactNode } from 'react';
+import { Button } from '../Button';
+
+interface FormWrapperProps {
+  onSubmit: (event: React.FormEvent<HTMLFormElement>) => void;
+  children: ReactNode;
+  submitLabel?: string;
+  className?: string;
+}
+
+const FormWrapper: React.FC<FormWrapperProps> = ({
+  onSubmit,
+  children,
+  submitLabel = 'Submit',
+  className = '',
+}) => {
+  return (
+    <form onSubmit={onSubmit} className={className}>
+      {children}
+      <div className="form-group mt-3">
+        <Button 
+          onClick={(e) => {
+            e.preventDefault();
+            onSubmit(e as unknown as React.FormEvent<HTMLFormElement>);
+          }}
+          label={submitLabel}
+        />
+      </div>
+    </form>
+  );
+};
+
+export default FormWrapper;
diff --git a/jsx/common/ListField.tsx b/jsx/common/ListField.tsx
new file mode 100644
index 00000000..2ff3f041
--- /dev/null
+++ b/jsx/common/ListField.tsx
@@ -0,0 +1,58 @@
+import React, { useState } from 'react';
+import { SearchField } from '../FormFields';
+import { FieldProps, LabelProps, OptionsProps } from '../Form';
+import { Button } from '../Button';
+import Styles from '../styles';
+
+interface ListProps<T> extends LabelProps, FieldProps, OptionsProps<T> {
+  list: Map<string, T>;
+  onAdd: (key: string, value: T) => void;
+  onRemove: (key: string) => void;
+}
+
+const ListField = <T extends {}>({
+  label,
+  onAdd,
+  onRemove,
+  list,
+  ...props
+}: ListProps<T>) => {
+  const [input, setInput] = useState<string | null>(null);
+
+  const handleSearch = (name: string, value: string) => {
+    setInput(value);
+  };
+
+  const handleAdd = () => {
+    if (input) {
+      onAdd(input, props.options[input]);
+      setInput(null);
+    }
+  };
+
+  return (
+    <Styles.Form.ListContainer>
+      <h4>{label + ' Input'}</h4>
+      <Styles.Form.HorizontalRule />
+      <SearchField
+        value=''
+        onChange={handleSearch}
+        {...props}
+      />
+      <Button label='Add' onClick={handleAdd} />
+      <h4>{label + ' List'}</h4>
+      <Styles.Form.HorizontalRule />
+      {Array.from(list.keys()).map((key) => (
+        <Styles.Form.ListItem key={key}>
+          <div>{list[key]}</div>
+          <Styles.Form.Icon
+            className="glyphicon glyphicon-remove"
+            onClick={() => onRemove(key)}
+          />
+        </Styles.Form.ListItem>
+      ))}
+    </Styles.Form.ListContainer>
+  );
+};
+
+export default ListField;
diff --git a/jsx/common/NumberField.tsx b/jsx/common/NumberField.tsx
new file mode 100644
index 00000000..89635e9b
--- /dev/null
+++ b/jsx/common/NumberField.tsx
@@ -0,0 +1,15 @@
+import React from 'react';
+import { Input, FieldProps, ValueProps, LabelProps, MinMaxProps } from '../Form';
+
+interface NumberProps extends ValueProps<number>, LabelProps, FieldProps, MinMaxProps {}
+
+const NumberField: React.FC<NumberProps> = ({ required, label, ...props }) => {
+  return (
+    <Field required={required} label={label}>
+      <Input type='number' {...props} />
+    </Field>
+  );
+};
+
+export default NumberField;
+
diff --git a/jsx/common/SearchField.tsx b/jsx/common/SearchField.tsx
new file mode 100644
index 00000000..e9ba9925
--- /dev/null
+++ b/jsx/common/SearchField.tsx
@@ -0,0 +1,60 @@
+import React, { useState, useEffect } from 'react';
+import { Input, FieldProps, ValueProps, LabelProps, OptionsProps, normalizeOptions } from '../Form';
+
+interface SearchProps<T> extends ValueProps<T>, LabelProps, FieldProps, OptionsProps<T> {}
+
+const SearchField = <T,>({
+  required,
+  label,
+  options,
+  onChange,
+  ...props
+}: SearchProps<T>) => {
+  const [searchTerm, setSearchTerm] = useState('');
+  const [filteredOptions, setFilteredOptions] = useState<string[]>([]);
+
+  const renderedOptions = normalizeOptions(options);
+
+  useEffect(() => {
+    const filtered = Object.keys(options).filter(key =>
+      options[key].toLowerCase().includes(searchTerm.toLowerCase())
+    );
+    setFilteredOptions(filtered);
+  }, [searchTerm, options]);
+
+  const handleChange = (name: string, value: string) => {
+    setSearchTerm(value);
+    const matchedOption = filteredOptions.find(option => option.toLowerCase() === searchTerm.toLowerCase());
+    if (matchedOption) {
+      handleOptionClick(matchedOption);
+    } else {
+      onChange(props.name, null);
+    }
+  };
+
+  const handleOptionClick = (key: string) => {
+    setSearchTerm(key);
+    onChange(props.name, key);
+  };
+
+  return (
+    <Field required={required} label={label}>
+      <Input
+        type='text'
+        value={searchTerm}
+        onChange={handleChange}
+        {...props}
+      />
+      <ul>
+        {filteredOptions.map(key => (
+          <li key={key} onClick={() => handleOptionClick(key)}>
+            {renderedOptions[key]}
+          </li>
+        ))}
+      </ul>
+    </Field>
+  );
+};
+
+export default SearchField;
+
diff --git a/jsx/common/SelectField.tsx b/jsx/common/SelectField.tsx
new file mode 100644
index 00000000..129624be
--- /dev/null
+++ b/jsx/common/SelectField.tsx
@@ -0,0 +1,35 @@
+import React from 'react';
+import { FieldProps, ValueProps, LabelProps, OptionsProps, normalizeOptions } from '../Form';
+
+interface SelectProps<T> extends ValueProps<T>, LabelProps, FieldProps, OptionsProps<T> {}
+
+const SelectField = ({
+  required,
+  label,
+  options,
+  onChange,
+  ...props
+}: SelectProps<string>) => {
+  const handleChange = (event: React.ChangeEvent<HTMLSelectElement>) => {
+    console.log(event.target.value);
+    onChange(event.target.name, event.target.value);
+  };
+
+  const renderedOptions = normalizeOptions(options);
+
+  return (
+    <Field required={required} label={label}>
+      <select className='form-control' onChange={handleChange} {...props}>
+        <option value="">Select an option</option>
+        {Object.keys(renderedOptions).map(key => (
+          <option key={key} value={key}>
+            {renderedOptions[key]}
+          </option>
+        ))}
+      </select>
+      {props.error && <span className="text-danger">{props.error}</span>}
+    </Field>
+  );
+};
+
+export default SelectField;
diff --git a/jsx/common/StaticField.tsx b/jsx/common/StaticField.tsx
new file mode 100644
index 00000000..cf4b1f57
--- /dev/null
+++ b/jsx/common/StaticField.tsx
@@ -0,0 +1,11 @@
+import React from 'react';
+import { FieldProps, LabelProps, ValueProps } from '../Form';
+
+interface StaticProps extends ValueProps<any>, LabelProps {}
+
+const StaticField: React.FC<StaticProps> = ({ label, value }) => {
+  return <Field label={label}>{value}</Field>;
+};
+
+export default StaticField;
+
diff --git a/jsx/common/TextField.tsx b/jsx/common/TextField.tsx
new file mode 100644
index 00000000..c38e683a
--- /dev/null
+++ b/jsx/common/TextField.tsx
@@ -0,0 +1,14 @@
+import React from 'react';
+import { Input, FieldProps, ValueProps, LabelProps } from '../Form';
+
+interface TextProps extends ValueProps<string>, LabelProps, FieldProps {}
+
+const TextField: React.FC<TextProps> = ({ required, label, ...props }) => {
+  return (
+    <Field required={required} label={label}>
+      <Input type='text' {...props} />
+    </Field>
+  );
+};
+
+export default TextField;
diff --git a/jsx/common/TextareField.tsx b/jsx/common/TextareField.tsx
new file mode 100644
index 00000000..ca806070
--- /dev/null
+++ b/jsx/common/TextareField.tsx
@@ -0,0 +1,24 @@
+import React from 'react';
+import { FieldProps, ValueProps, LabelProps } from '../Form';
+
+interface TextareaProps extends ValueProps<string>, LabelProps, FieldProps {}
+
+const TextareaField: React.FC<TextareaProps> = ({
+  required,
+  label,
+  onChange,
+  ...props
+}) => {
+  const handleChange = (event: React.ChangeEvent<HTMLTextAreaElement>) => {
+    onChange(event.target.name, event.target.value);
+  };
+
+  return (
+    <Field required={required} label={label}>
+      <textarea className='form-control' onChange={handleChange} {...props} />
+      {props.error && <span className="text-danger">{props.error}</span>}
+    </Field>
+  );
+};
+
+export default TextareaField;
diff --git a/jsx/common/TimeField.tsx b/jsx/common/TimeField.tsx
new file mode 100644
index 00000000..42670a8c
--- /dev/null
+++ b/jsx/common/TimeField.tsx
@@ -0,0 +1,24 @@
+import React from 'react';
+import { Input, FieldProps, ValueProps, LabelProps } from '../Form';
+import { Button } from '../Button';
+
+interface TimeProps extends ValueProps<string>, LabelProps, FieldProps {}
+
+const TimeField: React.FC<TimeProps> = ({ required, label, ...props }) => {
+  const handleNow = () => {
+    const date = new Date();
+    const hours = date.getHours();
+    const minutes = date.getMinutes();
+    const timeString = `${hours.toString().padStart(2, '0')}:${minutes.toString().padStart(2, '0')}`;
+    props.onChange(props.name, timeString);
+  };
+
+  return (
+    <Field required={required} label={label}>
+      <Input type="time" {...props} />
+      <Button onClick={handleNow} label={'Now'} />
+    </Field>
+  );
+};
+
+export default TimeField;
diff --git a/jsx/common/index.ts b/jsx/common/index.ts
new file mode 100644
index 00000000..6a4e6150
--- /dev/null
+++ b/jsx/common/index.ts
@@ -0,0 +1,12 @@
+export { default as FormWrapper } from './FormWrapper';
+export { default as Button } from './Button';
+export { default as TextField } from './TextField';
+export { default as DateField } from './DateField';
+export { default as TimeField } from './TimeField';
+export { default as CheckboxField } from './CheckboxField';
+export { default as SelectField } from './SelectField';
+export { default as SearchField } from './SearchField';
+export { default as TextareaField } from './TextareaField';
+export { default as ListField } from './ListField';
+export { default as NumberField } from './NumberField';
+export { default as StaticField } from './StaticField';
diff --git a/jsx/components/BarcodePathDisplay.tsx b/jsx/components/BarcodePathDisplay.tsx
new file mode 100644
index 00000000..edbc0356
--- /dev/null
+++ b/jsx/components/BarcodePathDisplay.tsx
@@ -0,0 +1,55 @@
+import { useState, useEffect } from 'react';
+import { IContainer, Container } from '../entities';
+import Loader from 'jsx/Loader';
+import { Link } from 'react-router-dom';
+
+export const BarcodePathDisplay = (
+  { container }: { container: Partial<IContainer> }
+) => {
+  const [barcodeData, setBarcodeData] = useState(null);
+  const [isLoading, setIsLoading] = useState(true);
+
+  useEffect(() => {
+    const fetchData = async () => {
+      try {
+        setIsLoading(true);
+        const containerEntity = new Container(container);
+        const parentBarcodes = await
+        containerEntity.getParentContainerBarcodes(container.barcode, []);
+        const displayData = parentBarcodes.map((barcode, index) => {
+  //     const container = Object.values(data.containers)
+  //       .find(
+  //         (container) =>
+  //           container.barcode == parentBarcodes[index+1]
+  //       );
+  //     let coordinateDisplay;
+  //     if (container) {
+  //       const coordinate = getCoordinateLabel(container);
+  //       coordinateDisplay = <b>{'-'+(coordinate || 'UAS')}</b>;
+  //     }
+          return (
+            <span className='barcodePath'>
+              {index !== 0 && ': '}
+              <Link key={index} to={'/containers/'+barcode}>{barcode}</Link>
+             {/*coordinateDisplay*/}
+            </span>
+          );
+        });
+        setBarcodeData(displayData);
+      } catch (error) {
+        console.error("Error fetching barcode data:", error);
+        // Handle error appropriately
+      } finally {
+        setIsLoading(false);
+      }
+    };
+
+    fetchData();
+  }, [container]); //XXX: currently this is re-rendering even if the parent doesn't change.
+
+  if (isLoading) {
+    return <Loader size={20}/>; // Replace with your actual loader component
+  }
+
+  return <>{barcodeData}</>;
+}
diff --git a/jsx/components/BiobankIndex.tsx b/jsx/components/BiobankIndex.tsx
new file mode 100644
index 00000000..374a7cc0
--- /dev/null
+++ b/jsx/components/BiobankIndex.tsx
@@ -0,0 +1,84 @@
+import ReactDOM from 'react-dom';
+import React from 'react';
+import { QueryClient, QueryClientProvider } from 'react-query';
+import { BrowserRouter, Switch, Route } from 'react-router-dom';
+import { Tabs, TabPane } from 'Tabs';
+import {
+  ContainerPage,
+  SpecimenPage,
+  SpecimenTab,
+  ContainerTab,
+  PoolTab,
+  ShipmentTab,
+} from '../components';
+import { useBiobankContext } from '../hooks';
+import { BiobankProvider, BarcodePageProvider } from '../contexts';
+
+declare const loris: any;
+
+/**
+ * The main React entrypoint for the biobank module. This component
+ * renders the index page.
+ */
+const BiobankIndex = () => {
+  const tabInfo = [];
+  const tabList = [];
+
+  if (loris.userHasPermission('biobank_specimen_view')) {
+    tabInfo.push({ id: 'specimens', content: <SpecimenTab /> });
+    tabList.push({ id: 'specimens', label: 'Specimens' });
+  }
+
+  if (loris.userHasPermission('biobank_container_view')) {
+    tabInfo.push({ id: 'containers', content: <ContainerTab /> });
+    tabList.push({ id: 'containers', label: 'Containers' });
+  }
+
+  if (loris.userHasPermission('biobank_pool_view')) {
+    tabInfo.push({ id: 'pools', content: <PoolTab /> });
+    tabList.push({ id: 'pools', label: 'Pools' });
+  }
+
+  tabInfo.push({ id: 'shipments', content: <ShipmentTab /> });
+  tabList.push({ id: 'shipments', label: 'Shipments' });
+
+  // Updated Tab Content: Wrapped in LazyTabContent for lazy loading
+  const tabContent = tabInfo.map((tab) => (
+    <TabPane key={tab.id} TabId={tab.id}>
+      {tab.content}
+    </TabPane>
+  ));
+
+  const fallback = <div>Loading...</div>;
+
+  const filter = () => (
+    <div id='biobank-page'>
+      <Tabs tabs={tabList} defaultTab={tabList[0].id} updateURL={true}>
+        {tabContent}
+      </Tabs>
+    </div>
+  );
+
+  return (
+    <BrowserRouter basename='/biobank'>
+      <Switch>
+        <Route path='/' render={filter} />
+        <Route path='/containers/:barcode' render={() => <ContainerPage />} />
+        <Route path='/specimens/:barcode' render={() => <SpecimenPage />} />
+      </Switch>
+    </BrowserRouter>
+  );
+};
+
+const queryClient = new QueryClient();
+window.addEventListener('load', () => {
+  ReactDOM.render(
+    <QueryClientProvider client={queryClient}>
+      <BiobankProvider>
+        <BiobankIndex />
+      </BiobankProvider>
+    </QueryClientProvider>,
+    document.getElementById('lorisworkspace')
+  );
+});
+
diff --git a/jsx/components/ContainerDisplay.tsx b/jsx/components/ContainerDisplay.tsx
new file mode 100644
index 00000000..5ddf253d
--- /dev/null
+++ b/jsx/components/ContainerDisplay.tsx
@@ -0,0 +1,395 @@
+import { useEffect, ReactElement } from 'react';
+import { useHistory } from 'react-router-dom';
+import Swal from 'sweetalert2';
+import { useBiobankContext } from '../hooks';
+import { mapFormOptions } from '../utils';
+import { IContainer, ISpecimen, ContainerHook } from '../entities';
+import { ContainerAPI } from '../APIs';
+import { Current } from './ContainerPage';
+import {
+  StaticField,
+  TextField,
+  CheckboxField,
+  Button,
+} from '../forms';
+declare const loris: any;
+
+interface ContainerDisplayProps {
+  barcodes?: Record<string, string>; // Assuming barcodes is a mapping of ids to barcode strings
+  current?: Current,
+  editable?: {
+    loadContainer?: boolean;
+    containerCheckout?: boolean;
+  };
+  select?: boolean;
+  container: ContainerHook,
+  selectedCoordinate?: number;
+  clearAll?: () => void;
+  updateCurrent?: (name: string, value: any) => void,
+  setCheckoutList?: (container: any) => void; // Specify a more precise type for container if possible
+  edit?: (action: string) => Promise<void>; // Adjust the type of action based on actual usage
+}
+
+function ContainerDisplay({
+    barcodes,
+    current,
+    editable,
+    select = false,
+    container, // Further specify this type based on the actual object structure
+    selectedCoordinate,
+    clearAll,
+    updateCurrent,
+    setCheckoutList,
+    edit,
+}: ContainerDisplayProps): ReactElement {
+
+  const { options, containers, specimens } = useBiobankContext();
+  const history = useHistory();
+  const dimensions = containers[container.parent].dimensions;
+
+  useEffect(() => {
+    // TODO: Use react-based approach isntead of jquery
+    // $('[data-toggle="tooltip"]').tooltip();
+  });
+
+  const redirectURL = (e: React.MouseEvent<HTMLDivElement>) => {
+    const coordinate = (e.target as HTMLElement).id;
+    if (container.children[coordinate]) {
+      const barcode = containers[container.children[coordinate]].barcode;
+      history.push(`/barcode=${barcode}`);
+    }
+  };
+
+  const allowDrop = (e: React.MouseEvent<HTMLDivElement>) => e.preventDefault();
+
+  const drag = (e: React.DragEvent<HTMLDivElement>) => {
+    // $('[data-toggle="tooltip"]').tooltip('hide');
+    // TODO: TO BE FIXED 
+    // const container = JSON.stringify(containers[coordinates[(e.target as
+    //                                                          HTMLElement).id]]);
+    // e.dataTransfer.setData('text/plain', container);
+  };
+
+  const drop = (e: React.DragEvent<HTMLDivElement>) => {
+    e.preventDefault();
+    const container = JSON.parse(e.dataTransfer.getData('text/plain'));
+    const newCoordinate = parseInt(e.currentTarget.id);
+    container.coordinate = newCoordinate;
+    new ContainerAPI().update(container);
+  };
+
+  const increaseCoordinate = (coordinate: number): void => {
+    const capacity = dimensions.x * dimensions.y * dimensions.z;
+    let nextCoordinate = coordinate +1 ;
+    while (Object.keys(container.children).includes(nextCoordinate.toString()) && nextCoordinate <= capacity) {
+      nextCoordinate++;
+    }
+
+    if (nextCoordinate > capacity) {
+      clearAll();
+    } else {
+      updateCurrent('coordinate', nextCoordinate);
+    }
+  };
+
+  const setBarcode = (name: string, barcode: string): void => {
+    updateCurrent('barcode', barcode);
+  };
+
+  const loadContainer = (): void => {
+    const barcode = current.barcode;
+    const containerBarcode = Object.keys(barcodes)
+      .find((id) => barcodes[id] === barcode);
+
+    if (!containerBarcode) {
+      return;
+    }
+
+    const newContainer = {
+      ...containers[containerBarcode],
+      parent: container.barcode,
+      coordinate: current.coordinate,
+    }
+
+    new ContainerAPI().update(newContainer)
+    .then(() => {
+      if (current.sequential) {
+        increaseCoordinate(current.coordinate);
+        updateCurrent('barcode', null);
+      } else {
+        clearAll();
+      }
+    });
+
+    updateCurrent('prevCoordinate', newContainer.coordinate);
+  };
+
+  const checkoutContainers = (): void => {
+    const checkoutPromises = Object.values(current.list).map((container:
+                                                              IContainer) => {
+      const updatedContainer = { ...container, parent: null, coordinate: null };
+      return new ContainerAPI().update(updatedContainer);
+    });
+
+    Promise.all(checkoutPromises)
+    .then(() => clearAll())
+    .then(() => Swal.fire('Containers Successfully Checked Out!', '', 'success'))
+    .catch(error => {
+      // Handle any errors that occur during the update
+      console.error("Error checking out containers:", error);
+      Swal.fire('Error', 'There was a problem checking out the containers.', 'error');
+    });
+
+  };
+
+  const barcodeField = (editable||{}).loadContainer && 
+    <TextField
+      name='barcode'
+      label='Barcode'
+      onChange={setBarcode}
+      value={current.barcode}
+      placeholder='Please Scan or Type Barcode'
+      autofocus={true}
+    />
+
+  let load = (
+    <div className={((editable||{}).loadContainer) ? 'open' : 'closed'}>
+        <StaticField
+          label='Note'
+          value='Scan Containers to be Loaded. If Sequential is checked,
+           the Coordinate will Auto-Increment after each Load.'
+        />
+        <CheckboxField
+          name='sequential'
+          label='Sequential'
+          value={current.sequential}
+          onChange={updateCurrent}
+        />
+        {barcodeField}
+        <Button
+          label='Load'
+          onClick={loadContainer}
+        />
+        <Button
+          label='Cancel'
+          onClick={clearAll}
+        />
+    </div>
+  );
+
+  // // place container children in an object
+  // let children = {};
+  // if ((container||{}).children) {
+  //   Object.values(containers).map((c) => {
+  //     container.childContainerIds.forEach((id) => {
+  //       if (c.id == id) {
+  //         children[id] = c;
+  //       }
+  //     });
+  //   });
+  // }
+
+  // if ((editable||{}).containerCheckout) {
+  //   // Only children of the current container can be checked out.
+  //   let barcodes = mapFormOptions(children, 'barcode');
+
+  //   barcodeField = (
+  //     <SearchableDropdown
+  //       name='barcode'
+  //       label='Barcode'
+  //       options={barcodes}
+  //       onUserInput={(name, value) => {
+  //         value && setCheckoutList(children[value]);
+  //       }}
+  //       value={current.containerId}
+  //       placeHolder='Please Scan or Select Barcode'
+  //       autoFocus={true}
+  //     />
+  //   );
+  // }
+
+  let checkout = (
+    <div className={((editable||{}).containerCheckout) ? 'open' : 'closed'}>
+        <StaticField
+          label='Note'
+          value="Click, Select or Scan Containers to be
+                Unloaded and Press 'Confirm'"
+        />
+        {barcodeField}
+        <Button
+          label='Confirm'
+          onClick={checkoutContainers}
+        />
+        <Button
+          label='Cancel'
+          onClick={clearAll}
+        />
+    </div>
+
+  );
+
+  // TODO: This will eventually need to be reworked and cleaned up
+  let display;
+  let column = [];
+  let row = [];
+  let coordinate = 1;
+  if (dimensions) {
+    for (let y=1; y <= dimensions.y; y++) {
+      column = [];
+      for (let x=1; x <= dimensions.x; x++) {
+        let nodeWidth = (500/dimensions.x) - (500/dimensions.x * 0.08);
+        let nodeStyle = {width: nodeWidth};
+        let nodeClass = 'node';
+        let tooltipTitle = null;
+        let title = null;
+        let dataHtml = false;
+        let dataToggle = null;
+        let dataPlacement = null;
+        let draggable = false;
+        let onDragStart = null;
+        let onDragOver = allowDrop;
+        let onDrop = drop;
+        let onClick = null;
+        const optcon = options.container;
+
+        if (!select) {
+          if ((container.children[coordinate])) {
+            onClick = redirectURL;
+            if (coordinate in current.list) {
+              nodeClass = 'node checkout';
+            } else if (coordinate == current.prevCoordinate) {
+              nodeClass = 'node new';
+            } else {
+              nodeClass = 'node occupied';
+            }
+
+            dataHtml = true;
+            dataToggle = 'tooltip';
+            dataPlacement = 'top';
+            // This is to avoid a console error
+            const child = containers[container.children[coordinate]];
+            tooltipTitle =
+              '<h5>'+child.barcode+'</h5>' +
+              '<h5>'+optcon.types[child.type].label+'</h5>' +
+              '<h5>'+optcon.stati[child.status].label+'</h5>';
+            
+            draggable = !loris.userHasPermission(
+               'biobank_container_update') ||
+                        editable.loadContainer ||
+                        editable.containerCheckout
+                        ? false : true;
+            onDragStart = drag;
+
+            if (editable.containerCheckout) {
+              onClick = (e) => {
+                const checkoutContainer = containers[container.children[e.target.id]];
+                setCheckoutList(checkoutContainer);
+              };
+            }
+            if (editable.loadContainer) {
+              onClick = null;
+            }
+            onDragOver = null;
+            onDrop = null;
+          } else if (loris.userHasPermission('biobank_container_update') &&
+                     !editable.containerCheckout) {
+            nodeClass = coordinate == current.coordinate ?
+              'node selected' : 'node load';
+            title = 'Load...';
+            onClick = (e) => {
+              let containerBarcode = e.target.id;
+              edit('loadContainer')
+              .then(() => updateCurrent('coordinate', containerBarcode));
+            };
+          }
+        }
+
+        if (select) {
+          if (coordinate == selectedCoordinate) {
+            nodeClass = 'node occupied';
+          } else if (!container.children) {
+            nodeClass = 'node available';
+            onClick = (e) => container.set('coordinate', e.target.id);
+          } else if (container.children) {
+            if (!container.children[coordinate]) {
+              nodeClass = 'node available';
+              onClick = (e) => container.set('coordinate', e.target.id);
+            } else if (container.children[coordinate]) {
+              const child = containers[container.children[coordinate]];
+              const specimen = Object.values(specimens as Record<string, ISpecimen>)
+                .find((specimen: ISpecimen) => specimen.barcode ==
+                      child.barcode);
+              let quantity = '';
+              if (specimen) {
+                quantity = `<h5>${specimen.quantity +
+                    ' '+specimen.unit.label}</h5>`;
+              }
+              dataHtml = true;
+              dataToggle = 'tooltip';
+              dataPlacement = 'top';
+              tooltipTitle =
+                `<h5>${child.barcode}</h5>` +
+                `<h5>${optcon.types[child.type].label}</h5>` +
+                quantity +
+                `<h5>${optcon.stati[child.status].label}</h5>`;
+            }
+          }
+        }
+
+        let coordinateDisplay;
+        if (dimensions.xNum == 1 && dimensions.yNum == 1) {
+          coordinateDisplay = x + (dimensions.x * (y-1));
+        } else {
+          const xVal = dimensions.xNum == 1 ? x : String.fromCharCode(64+x);
+          const yVal = dimensions.yNum == 1 ? y : String.fromCharCode(64+y);
+          coordinateDisplay = yVal+''+xVal;
+        }
+
+        column.push(
+          <div
+            key={x}
+            id={coordinate.toString()}
+            title={title}
+            className={nodeClass}
+            data-html={dataHtml}
+            data-toggle={dataToggle}
+            data-placement={dataPlacement}
+            data-original-title={tooltipTitle}
+            style={nodeStyle}
+            onClick={onClick}
+            draggable={draggable}
+            onDragStart={onDragStart}
+            onDragOver={onDragOver}
+            onDrop={onDrop}
+          >
+            {coordinateDisplay}
+          </div>
+        );
+
+        coordinate++;
+      }
+
+      let rowHeight = (500/dimensions.y) - (500/dimensions.y * 0.08);
+      // let rowMargin = (500/dimensions.y * 0.04);
+      let rowStyle = {height: rowHeight};
+
+      row.push(<div key={y} className='row' style={rowStyle}>{column}</div>);
+    }
+
+    display = row;
+  }
+
+  return (
+    <>
+      <div style={{width: 500}}>
+        {checkout}
+        {load}
+      </div>
+      <div className='display'>
+        {display}
+      </div>
+    </>
+  );
+}
+
+export default ContainerDisplay;
diff --git a/jsx/components/ContainerPage.tsx b/jsx/components/ContainerPage.tsx
new file mode 100644
index 00000000..a9884295
--- /dev/null
+++ b/jsx/components/ContainerPage.tsx
@@ -0,0 +1,205 @@
+import React, { useState, useCallback, useEffect, useContext, ReactElement }  from 'react';
+import { Link, RouteComponentProps } from 'react-router-dom';
+import {
+  ISpecimen,
+  IContainer,
+  useContainer,
+  Container,
+  ContainerProvider,
+  IDimension,
+} from '../entities';
+import { clone, mapFormOptions } from '../utils';
+import {
+  useBiobankContext,
+  useContainerById,
+  useEditable,
+  useBarcodePageContext
+} from '../hooks';
+import { Globals, Header, ContainerDisplay, BarcodePathDisplay, CoordinateLabel } from '../components';
+import { ContainerAPI } from '../APIs';
+import { BarcodePageProvider } from '../contexts';
+import Loader from 'jsx/Loader';
+declare const loris: any;
+
+const initCurrent = {                                                           
+  list: {},                                                                     
+};                                                                              
+
+export type Current = {
+  list?: Record<string, any>,
+  prevCoordinate?: number,
+  coordinate?: number,
+  barcode?: string,
+  sequential?: boolean,
+  containerBarcode?: string
+}
+
+export const ContainerPage: React.FC<RouteComponentProps<{barcode: string}>> = ({
+  match,
+  location,
+  history
+}) => {
+
+  const [current, setCurrent] = useState<Current>(initCurrent);                          
+  const { editable, edit, clear } = useBarcodePageContext();
+  const { options, containers } = useBiobankContext();
+  const container = useContainer(new Container(containers[match.params.barcode]));
+
+  const drag = useCallback((e) => {                                             
+    const cont = JSON.stringify(containers[e.target.id]);             
+    e.dataTransfer.setData('text/plain', cont);                            
+  }, [containers]);                                                        
+                                                                                
+  const updateCurrent = (name: string, value: any) =>  {                        
+    setCurrent(prevCurr => ({                                                   
+      ...prevCurr,                                                              
+      [name]: value                                                             
+    }));                                                                        
+  }                                                                             
+
+  function setCheckoutList(selectedContainer: IContainer): void {                        
+    // Clear current container field.                                           
+    updateCurrent('containerBarcode', 1)                                             
+    updateCurrent('containerBarcode', null);                                         
+    const list = clone(current.list);                                           
+    list[container.coordinate] = selectedContainer;                                     
+    updateCurrent('list', list);                                                
+  }                                                                             
+
+  const checkoutButton = () => {                                                
+    if (                                                                        
+      !loris.userHasPermission('biobank_container_update') ||                   
+      containers[container.barcode].children.length == 0               
+    ) {                                                                         
+      return;                                                                   
+    }                                                                           
+                                                                                
+    return (                                                                    
+      <div style={{ marginLeft: 'auto', height: '10%', marginRight: '10%' }}>   
+        <div                                                                    
+          className={                                                           
+            !editable.containerCheckout && !editable.loadContainer              
+              ? 'action-button update open'                                     
+              : 'action-button update closed'                                   
+          }                                                                     
+          title='Checkout Child Containers'                                     
+          onClick={() => edit('containerCheckout')}                             
+        >                                                                       
+          <span className='glyphicon glyphicon-share' />                        
+        </div>                                                                  
+      </div>                                                                    
+    );                                                                          
+  };                                                                            
+
+  const barcodes = mapFormOptions(containers, 'barcode');                  
+
+  // XXX: KEEP COMMENTED OUT
+  // delete values that are parents of the container                            
+                                                                                
+  //TODO re-instate this in some form!                                          
+  //  Object.keys(parents).forEach((key) =>                              
+  //    Object.keys(barcodes).forEach(                                          
+  //      (i) =>                                                                
+  //        parents[key] == barcodes[i] && delete barcodes[i]            
+  //    )                                                                       
+  //  );                                                                        
+  // UP UNTIL HERE
+
+
+  const containerDisplay = (                                                    
+    <div className='display-container'>                                         
+      {checkoutButton()}                                                        
+      <ContainerDisplay                                                         
+        container={container}                                                   
+        barcodes={barcodes}                                                     
+        current={current}                                                       
+        editable={editable}                                                     
+        edit={edit}                                                             
+        clearAll={clear}                                                     
+        updateCurrent={updateCurrent}                                                 
+        setCheckoutList={setCheckoutList}                                       
+      />                                                                        
+      <div style={{ display: 'inline' }}>
+        <BarcodePathDisplay container={container.getData()}/>
+      </div>             
+    </div>                                                                      
+  );                                                                            
+
+  const containerList = () => {                                                 
+    if (!container.children) {                                         
+      return <div className='title'>This Container is Empty!</div>;             
+    }                                                                           
+                                                                                
+    let listAssigned = [];                                                      
+    let unassigned = [];                                                      
+    let coordinateList = [];                                                    
+                                                                                
+    // if (!loris.userHasPermission('biobank_specimen_view')) {                  
+    //   return; // This is the correct place for the return statement           
+    // }                                                                         
+
+    container.children.forEach((child) => {
+      if (child.coordinate) {
+        listAssigned.push(
+          <div key={child.barcode}>
+            <Link to={'/barcode='+child.barcode}>
+              {child.barcode}
+            </Link>
+          </div>
+        );
+      } else {
+        unassigned.push(
+          <div key={child.barcode}>
+            <Link
+              to={'/barcode='+child.barcode}
+              id={child.barcode}
+              draggable={true}
+              onDragStart={drag}
+            >
+              {child.barcode}
+            </Link>
+            <br />
+          </div>
+        );
+      }
+
+      const coordinateLabel = <CoordinateLabel
+      container={containers[child.barcode]}/>;
+      coordinateList.push(<div key={child.barcode}>at {coordinateLabel}</div>);
+    })
+                                                                                
+    return (                                                                    
+      <div>                                                                     
+        <div className='title'>                                                 
+          {listAssigned.length !== 0 ? 'Assigned Containers' : null}            
+        </div>                                                                  
+        <div className='container-coordinate'>                                  
+          <div>{listAssigned}</div>                                             
+          <div style={{ paddingLeft: 10 }}>{coordinateList}</div>               
+        </div>                                                                  
+        {listAssigned.length !== 0 ? <br /> : null}                             
+        <div className='title'>                                                 
+          {unassigned.length !== 0 ? 'Unassigned Containers' : null}        
+        </div>                                                                  
+        {unassigned}                                                        
+      </div>                                                                    
+    );                                                                          
+  };                                                                            
+
+  return (
+    <ContainerProvider container={container}>
+      <Link to={`/`}>
+        <span className='glyphicon glyphicon-chevron-left'/>
+        Return to Filter
+      </Link>
+      <Header clearAll={clear}/>
+      <div className='summary'>
+        <Globals clearAll={clear}/>
+        <div className='container-display'>                                         
+          {containerDisplay}                                                        
+          <div className='container-list'>{containerList()}</div>                   
+        </div>                                                                      
+      </div>
+    </ContainerProvider>
+  );
+}
diff --git a/jsx/components/ContainerTab.tsx b/jsx/components/ContainerTab.tsx
new file mode 100644
index 00000000..e7fcaf5e
--- /dev/null
+++ b/jsx/components/ContainerTab.tsx
@@ -0,0 +1,131 @@
+import { useState, useEffect, ReactElement, CSSProperties } from 'react';
+import { Link } from 'react-router-dom';
+import { ContainerForm } from '../forms';
+import { Search } from '../components';
+import FilterableDataTable from 'FilterableDataTable';
+import Utils from '../utils'
+import { useBiobankContext, useEditable, useRequest } from '../hooks';
+import { IContainer } from '../entities';
+import { EntityType } from '../contexts';
+import { ContainerAPI, BaseAPI } from '../APIs';
+declare const loris: any;
+
+export const ContainerTab: React.FC = () => {
+
+  const { containers, initializeEntity } = useBiobankContext();
+  const { editable, edit, clear } = useEditable();
+
+  useEffect(() => {
+    initializeEntity(EntityType.Containers);
+  });
+
+  /**
+   * Format the cells for a column in the container
+   *
+   * @param {string} column - the column name to format
+   * @param {string} value - the value of the column
+   * @param {object} row - the rest of the row
+   *
+   * @return {ReactElement} a table cell
+   */
+  function formatContainerColumns(column: string, value: any, row: any): ReactElement {
+
+    const style: CSSProperties = {};
+
+    switch (column) {
+      case 'Barcode':
+        return <td><Link to={`/containers/${value}`}>{value}</Link></td>;
+
+      // case 'Status':
+      //   switch (value) {
+      //     case 'Available':
+      //       style.color = 'green';
+      //       break;
+      //     case 'Reserved':
+      //       style.color = 'orange';
+      //       break;
+      //     case 'Dispensed':
+      //       style.color = 'red';
+      //       break;
+      //     case 'Discarded':
+      //       style.color = 'red';
+      //       break;
+      //   }
+      //   return <td style={style}>{value}</td>;
+
+      case 'Parent Barcode':
+        return <td><Link to={`/containers/${value}`}>{value}</Link></td>;
+
+      default:
+        return <td>{value}</td>;
+    }
+  }
+
+  const data = containers.data.map((container: IContainer) => {
+      return [
+        container.barcode,
+        container.type.label,
+        container.center.label,
+        container.parent?.barcode,
+      ];
+    }
+  );
+
+  const fields = [
+    {label: 'Barcode', show: true, filter: {
+      name: 'barcode',
+      type: 'text',
+    }},
+    {label: 'Type', show: true, filter: {
+      name: 'type',
+      type: 'select',
+      options: Utils.mapLabel(useRequest(() => new ContainerAPI().getTypes()))
+    }},
+    {label: 'Site', show: true, filter: {
+      name: 'currentSite',
+      type: 'select',
+      options: Utils.mapLabel(useRequest(() => new BaseAPI('centers').get()))
+    }},
+    {label: 'Parent Barcode', show: true, filter: {
+      name: 'parentBarcode',
+      type: 'text',
+    }},
+  ];
+
+  const actions = [
+    {
+      name: 'goToContainer',
+      label: 'Go To Container',
+      action: () => edit('searchContainer'),
+    },
+    {
+      name: 'addContainer',
+      label: 'Add Container',
+      action: () => edit('containerForm'),
+    },
+  ];
+
+  return (
+    <>
+      <FilterableDataTable
+        name='container'
+        data={data}
+        fields={fields}
+        actions={actions}
+        getFormattedCell={formatContainerColumns}
+        progress={containers.progress}
+      />
+      <Search
+        title='Go To Container'
+        show={editable.searchContainer}
+        onClose={clear}
+        barcodes={containers.data}
+      />
+      {loris.userHasPermission('biobank_container_create') ?
+      <ContainerForm
+        show={editable.containerForm}
+        onClose={clear}
+      /> : null}
+    </>
+  );
+}
diff --git a/jsx/components/CoordinateLabel.tsx b/jsx/components/CoordinateLabel.tsx
new file mode 100644
index 00000000..71161f80
--- /dev/null
+++ b/jsx/components/CoordinateLabel.tsx
@@ -0,0 +1,35 @@
+import { useBiobankContext } from '../hooks';
+import { IContainer, IDimension } from '../entities';
+
+export const CoordinateLabel: React.FC<{
+  container: Partial<IContainer>
+}> = ({
+  container
+}) => {   
+  const { options, containers } = useBiobankContext();
+
+  const parent = containers[container.parent];       
+  if (!parent) return null;                                          
+                                                                              
+  const dimension = container.dimension;
+  if (!dimension) return null;                                               
+                                                                              
+  const formatCoordinate = (x: number, y: number, dimension: IDimension): string => {
+    const xVal = dimension.xNum === true ? x : String.fromCharCode(64 + x);     
+    const yVal = dimension.yNum === true ? y : String.fromCharCode(64 + y);     
+    return dimension.xNum === true && dimension.yNum === true                    
+      ? `${x + (dimension.x * (y - 1))}`                                     
+      : `${yVal}${xVal}`;                                                     
+  }                                                                           
+                                                                              
+  let coordinateCount = 1;                                                    
+  for (let y = 1; y <= dimension.y; y++) {                                   
+    for (let x = 1; x <= dimension.x; x++, coordinateCount++) {              
+      if (coordinateCount === container.coordinate) {                         
+        return <span>{formatCoordinate(x, y, dimension)}</span>;             
+      }                                                                       
+    }                                                                         
+  }                                                                           
+                                                                              
+  return null;                                                                
+}   
diff --git a/jsx/components/Globals.tsx b/jsx/components/Globals.tsx
new file mode 100644
index 00000000..f3fbc791
--- /dev/null
+++ b/jsx/components/Globals.tsx
@@ -0,0 +1,452 @@
+import React, { useState, ReactNode } from 'react';
+import { Link } from 'react-router-dom';
+import { mapFormOptions, isEmpty } from '../utils';
+import Modal from 'Modal';
+import Loader from 'Loader';
+import {
+  ContainerParentForm,
+  SpecimenField,
+  ContainerField,
+  Button,
+} from '../forms';
+import { CoordinateLabel } from '../components';
+import { useSpecimenContext, useContainerContext } from '../entities';
+import { useBarcodePageContext, useBiobankContext } from '../hooks';
+import { ContainerAPI, SpecimenAPI } from '../APIs';
+
+declare const loris: any;
+
+const Globals: React.FC<{
+  clearAll: () => void,
+}> = ({ clearAll }) => {
+  const { editable, edit } = useBarcodePageContext();
+  const { options } = useBiobankContext();
+  const specimen = useSpecimenContext();
+  const container = useContainerContext();
+
+  const editContainerType = loris.userHasPermission('biobank_specimen_alter')
+    && specimen && (
+    () => {
+      edit('containerType');
+    }
+  );
+  const containerTypeField = (
+    <InlineField
+      label={'Container Type'}
+      updateValue={() => ContainerAPI.update(container)}
+      clearAll={clearAll}
+      pencil={true}
+      value={container.type} //TODO remove '?'
+      edit={editContainerType}
+      editable={editable.containerType}
+    >
+      <ContainerField property={'type'}/> //TODO: this will have to be modified to type primary
+    </InlineField>
+  );
+
+  const poolField = (specimen||{}).pool ? (
+    <InlineField
+      label='Pool'
+      value={specimen.pool.label}
+    />
+  ) : null;
+
+  const quantityField = !isEmpty(specimen) ? (
+    <InlineField
+      label='Quantity'
+      clearAll={clearAll}
+      updateValue={() => SpecimenAPI.update(specimen)}
+      edit={() => edit('quantity')}
+      value={Math.round(specimen.quantity * 100) / 100+
+      ' '+specimen.unit.label}
+      editable={editable.quantity}
+    >
+      <SpecimenField property={'quantity'}/>
+      <SpecimenField property={'unit'}/>
+    </InlineField>
+  ) : null;
+
+  const fTCycleField = () => {
+    if (!isEmpty(specimen)
+        && specimen.fTCycle) {
+      // const changeCycle = (value) => {
+      //   editSpecimen(specimen)
+      //   .then(() => {
+      //     let cycle = specimen.fTCycle;
+      //     cycle = cycle+value;
+      //     setSpecimen('fTCycle', cycle);
+      //   })
+      //   .then(()=>updateSpecimen(specimen));
+      // };
+      // const increaseCycle = () => changeCycle(1);
+      // const decreaseCycle = () => changeCycle(-1);
+      // const updateFTCycle = loris.userHasPermission('biobank_specimen_update') ? (
+      //   <div>
+      //     {specimen.fTCycle > 0 ? (
+      //       <div className='action' title='Remove Cycle'>
+      //         <span
+      //           className='action-button update'
+      //           onClick={decreaseCycle}
+      //         >
+      //           <span className='glyphicon glyphicon-minus'/>
+      //         </span>
+      //       </div>
+      //     ) : null}
+      //     <div className='action' title='Add Cycle'>
+      //       <span className='action-button update' onClick={increaseCycle}>
+      //         <span className='glyphicon glyphicon-plus'/>
+      //       </span>
+      //     </div>
+      //   </div>
+      // ) : null;
+
+      const editFTCycle = () => edit('fTCycle');
+      return (
+        <InlineField
+          label={'Freeze-Thaw Cycle'}
+          clearAll={clearAll}
+          updateValue={() => SpecimenAPI.update(specimen)}
+          edit={editFTCycle}
+          value={specimen.fTCycle || 0}
+          editable={editable.fTCycle}
+        >
+          <SpecimenField property={'fTCycle'}/>
+        </InlineField>
+      );
+    }
+  };
+
+  const editTemperature = () => edit('temperature');
+  const temperatureField = (
+    <InlineField
+      label={'Temperature'}
+      clearAll={clearAll}
+      updateValue={() => ContainerAPI.update(container)}
+      edit={!container.parent && editTemperature}
+      value={container.temperature + '°'}
+      editable={editable.temperature}
+    >
+      <ContainerField property={'temperature'}/>
+    </InlineField>
+  );
+
+  const statusField = (
+    <InlineField
+      label={'Status'}
+      clearAll={clearAll}
+      updateValue={() => ContainerAPI.update(container)}
+      edit={() => edit('status')}
+      value={container.status}
+      subValue={container.comments}
+      editable={editable.status}
+    >
+      <ContainerField property={'status'}/>
+      <ContainerField property={'comments'}/>
+    </InlineField>
+  );
+
+  const projectField = () => !isEmpty(specimen) && (
+    <InlineField
+      label='Projects'
+      clearAll={clearAll}
+      updateValue={() => SpecimenAPI.update(specimen)}
+      edit={() => edit('project')}
+      value={specimen.projects.length !== 0 ?
+       specimen.projects
+         .map((id) => options.projects[id])
+         .join(', ') : 'None'}
+      editable={editable.project}
+    >
+      <SpecimenField property={'projects'}/>
+    </InlineField>
+  );
+
+  const drawField = !isEmpty(specimen) && (
+    <InlineField
+      label='Draw Site'
+      value={options.centers[
+        options.sessionCenters[specimen.session].center
+      ]}
+    />
+  );
+
+  const centerField = (
+    <InlineField
+      label='Current Site'
+      value={container.center}
+    />
+  );
+
+  const shipmentField = () => {
+    if (container.shipments.length !== 0) {
+      return (
+        <InlineField
+          label='Shipment'
+          value={container.shipments.slice(-1)[0]}
+        />
+      );
+    }
+  };
+
+  const parentSpecimenField = () => {
+    if (isEmpty(specimen)) {
+      return null;
+    }
+  
+    const value = specimen.parents.length === 0
+        ? 'None'
+        : <>
+            {specimen.parents.map((parent, index) => (
+              <React.Fragment key={parent.container.barcode}>
+                {index > 0 && ', '}
+                <Link
+                  to={'/specimens/'+parent.container.barcode}
+                >
+                  {parent.container.barcode}
+                </Link>
+              </React.Fragment>
+            ))}
+          </>;
+
+    return (
+      <InlineField
+        label="Parent Specimen"
+        value={value}
+      />
+    );
+  };
+
+  // TODO: Find a way to make this conform to the GLOBAL ITEM structure.
+  const parentContainerField = () => {
+    if (loris.userHasPermission('biobank_container_view')) {
+      // Set Parent Container Barcode Value if it exists
+      const parentContainerBarcodeValue = () => {
+        if (container.parent) {
+          const barcode = container.parent
+          // TODO: in the future, this should only be linked conditionally based
+          // on whether the user has permission to view this container.
+          return <Link to={'/containers/'+barcode}>{barcode}</Link>;
+        }
+      };
+
+      const updateParentContainer = () => {
+        if (loris.userHasPermission('biobank_container_update')) {
+          return (
+            <div>
+              <div className='action' title='Move Container'>
+                <span
+                  className='action-button update'
+                  onClick={() => {
+                    edit('containerParentForm');
+                  }}
+                >
+                  <span className='glyphicon glyphicon-chevron-right'/>
+                </span>
+              </div>
+              <div>
+                <Modal
+                  title='Update Parent Container'
+                  onClose={clearAll}
+                  show={editable.containerParentForm}
+                  onSubmit={() => ContainerAPI.update(container)}
+                >
+                  <ContainerParentForm
+                    display={true}
+                    container={container}
+                  />
+                </Modal>
+              </div>
+            </div>
+          );
+        }
+      };
+
+      let coordinate;
+      if (container.coordinate) {
+        coordinate = <CoordinateLabel container={container.getData()}/>;
+      }
+
+      return (
+        <div className="item">
+          <div className='field'>
+            Parent Container
+            <div className='value'>
+              {parentContainerBarcodeValue() || 'None'}
+            </div>
+            {(parentContainerBarcodeValue && container.coordinate) ?
+            'Coordinate '+ coordinate : null}
+          </div>
+          {updateParentContainer()}
+        </div>
+      );
+    }
+  };
+
+  const candidateSessionField = !isEmpty(specimen) ? (
+    <div>
+      <InlineField
+        label='PSCID'
+        value={specimen.candidate}
+        link={loris.BaseURL+'/'+specimen.candidate}
+      />
+      <InlineField
+        label='Visit Label'
+        value={specimen.session}
+        link={
+            loris.BaseURL+'/instrument_list/?candID='+
+            specimen.candidate+'&sessionID='+
+            specimen.session
+        }
+      />
+    </div>
+  ) : null;
+
+  return (
+    <div className="globals">
+      <div className='list'>
+        {!isEmpty(specimen) && (
+          <InlineField label='Specimen Type'
+            value={options.specimen.types[specimen.type]?.label}
+          />
+        )}
+        {containerTypeField}
+        {poolField}
+        {quantityField}
+        {fTCycleField()}
+        {temperatureField}
+        {statusField}
+        {projectField()}
+        {drawField}
+        {centerField}
+        {shipmentField()}
+        {parentSpecimenField()}
+        {parentContainerField()}
+        {candidateSessionField}
+      </div>
+    </div>
+  );
+}
+
+const Item = ({children}: {children: ReactNode}) => (
+  <div className="item">{children}</div>
+);
+
+const InlineField: React.FC<{
+  label: string,
+  value: any,
+  edit?: Function, //TODO: type declaration 
+  editable?: boolean,
+  pencil?: boolean,
+  updateValue?: Function, //TODO: type declaration
+  clearAll?: () => void,
+  link?: string
+  subValue?: string
+  children?: ReactNode
+}> = ({
+  label,
+  value,
+  children,
+  edit,
+  editable = false,
+  pencil = false,
+  updateValue,
+  clearAll,
+  link,
+  subValue,
+}) => {
+  const [loading, setLoading] = useState(false);
+
+  // const fields = React.Children.map(children, (child) => {
+  //   return child && React.isValidElement(child) ? (
+  //     <div style={{flex: '1 0 25%', minWidth: '90px'}}>
+  //       {React.cloneElement(child, {inputClass: 'col-lg-11'})}
+  //     </div>
+  //   ) : null;
+  // });
+
+  const handleUpdate = async () => {
+    setLoading(true);
+    try {
+      await updateValue();
+      edit();
+      // Add any additional logic after the promise is resolved, if necessary
+    } catch (error) {
+      // Handle errors if necessary
+    } finally {
+      setLoading(false);
+    }
+  };
+
+
+  // loris.userHasPermission('biobank_container_update') should determine if 'edit'
+  // can be passed in the first place.
+  const editButton = edit instanceof Function && !editable && (
+    <div className='action' title={'Update '+label}>
+      <span
+        className={
+            pencil
+              ? 'glyphicon glyphicon-pencil'
+              : 'action-button update'
+        }
+        onClick={() => edit()}
+      >
+        {!pencil && <span className='glyphicon glyphicon-chevron-right'/>}
+      </span>
+    </div>
+  );
+
+  const loader = loading && (
+    <>
+      <div style={{flex: '0 1 15%', margin: '0 1%'}}>
+        <Loader size={20}/>
+      </div>
+      <div style={{flex: '0 1 15%', margin: '0 1%'}}>
+        <h5 className='animate-flicker'>Saving...</h5>
+      </div>
+    </>
+  );
+
+  const submitButton = !loading && (
+    <>
+      <div style={{flex: '0 1 15%', margin: '0 1%'}}>
+        <Button label="Update" onClick={handleUpdate}/>
+      </div>
+      <div style={{flex: '0 1 15%', margin: '0 1%'}}>
+        <a onClick={clearAll} style={{cursor: 'pointer'}}>Cancel</a>
+      </div>
+    </>
+  );
+
+  const displayValue = link ? (
+    <a href={link}>{value}</a>
+  ) : value;
+
+  const renderField = editable ? (
+    <div className='field'>
+      {label}
+      <div className='inline-field'>
+        {children}
+        {submitButton}
+        {loader}
+      </div>
+    </div>
+  ) : (
+    <div className="field">
+      {label}
+      {pencil && editButton}
+      <div className='value'>
+        {displayValue}
+      </div>
+      {subValue}
+    </div>
+  );
+
+  return (
+    <Item>
+      {renderField}
+      {!pencil && editButton}
+    </Item>
+  );
+}
+
+export default Globals;
diff --git a/jsx/components/Header.tsx b/jsx/components/Header.tsx
new file mode 100644
index 00000000..4c43328e
--- /dev/null
+++ b/jsx/components/Header.tsx
@@ -0,0 +1,208 @@
+import { ReactElement } from 'react';
+import Modal from 'Modal';
+import { LifeCycle, BarcodePathDisplay } from '../components';
+import { ContainerField } from '../forms';
+// import { SpecimenForm } from '../forms';
+import Swal from 'sweetalert2';
+import { useSpecimenContext, useContainerContext } from '../entities';
+import { useBarcodePageContext, useBiobankContext } from '../hooks';
+import { LabelAPI, ContainerAPI } from '../APIs';
+
+declare const loris: any;
+
+const Header: React.FC<{
+  clearAll: () => void,
+}> = ({ clearAll }) => {
+
+  const { editable, edit } = useBarcodePageContext();
+  const { options } = useBiobankContext();
+  const specimen = useSpecimenContext();
+  const container = useContainerContext();
+
+  /**
+   * Renders an action button for adding aliquots based on specimen and container status.
+   *
+   * @returns {ReactElement} Action button for adding aliquots.
+   */
+  const renderActionButton = (): ReactElement => {
+    if (container.status === 'Available' && specimen.quantity > 0 && !specimen.pool) {
+      return (
+        <div className='action-button add' onClick={() => edit('aliquotForm')}>
+          +
+        </div>
+      );
+    } else {
+      return <div className='action-button disabled'>+</div>;
+    }
+  };
+
+  /**
+   * Generates the form for adding aliquots based on user permissions and specimen data.
+   *
+   * @function
+   * @returns {ReactElement|null} Aliquot form or null if the user doesn't have permission.
+   */
+  const addAliquotForm = (): ReactElement => {
+    if (specimen && loris.userHasPermission('biobank_specimen_create')) {
+      return (
+        <>
+          <div className='action' title='Make Aliquots'>
+            {renderActionButton()}
+          </div>
+          {/*<SpecimenForm
+            title='Add Aliquots'
+            parent={specimen}
+            show={editable.aliquotForm}
+            onClose={clearAll}
+          />*/}
+        </>
+      );
+    }
+  };
+
+  /**
+   * Handles editing the lot number of the container.
+   *
+   * @component
+   * @returns {ReactElement|null} Edit lot number button or null if the user doesn't have permission.
+   */
+  const AlterLotNumberButton = (): ReactElement => {
+    if (loris.userHasPermission('biobank_specimen_alter')) {
+      return (
+        <div className='action' title='Alter Lot Number'>
+          <span
+            style={{ color: 'grey' }}
+            className='glyphicon glyphicon-pencil'
+            onClick={() => edit('lotForm')}
+          />
+        </div>
+      );
+    }
+  };
+
+  /**
+   * Handles editing the expiration date of the container.
+   *
+   * @component
+   * @returns {ReactElement|null} Edit expiration date button or null if the user doesn't have permission.
+   */
+  const AlterExpirationDateButton = (): ReactElement => {
+    if (loris.userHasPermission('biobank_specimen_alter')) {
+      return (
+        <div className='action' title='Alter Expiration Date'>
+          <span
+            style={{ color: 'grey' }}
+            className='glyphicon glyphicon-pencil'
+            onClick={() => edit('expirationForm')}
+          />
+        </div>
+      );
+    }
+  };
+
+  const lotForm = (
+    <Modal
+      title='Edit Lot Number'
+      onClose={clearAll}
+      show={editable.lotForm}
+      onSubmit={() => ContainerAPI.update(container)}
+    >
+      <ContainerField property={'lotNumber'}/>
+    </Modal>
+  );
+
+  const expirationForm = (
+    <Modal
+      title='Edit Expiration Date'
+      onClose={clearAll}
+      show={editable.expirationForm}
+      onSubmit={() => ContainerAPI.update(container)}
+    >
+      <ContainerField property={'expirationDate'}/>
+    </Modal>
+  );
+
+  const barcodePathDisplay = <BarcodePathDisplay container={container.getData()}/>;
+
+  /**
+   * Prints the barcode of the container and its type.
+   *
+   * @function
+   * @returns {void}
+   */
+  const printBarcode = (): void => {
+    const label = [
+      {
+        barcode: container.barcode,
+        type: specimen.type,
+      },
+    ];
+    LabelAPI.create(label)
+      .then(() => {
+        // This block executes if the creation was successful
+        Swal.fire('Print Barcode Number: ' + container.barcode);
+      })
+      .catch((error) => {
+        // This block executes if there was an error during creation
+        console.error('Error during label creation:', error);
+        // Optionally show an error message to the user
+        Swal.fire('Error', 'Failed to print barcode', 'error');
+      });
+  };
+
+  /**
+   * Handles the container checkout action.
+   *
+   * @function
+   * @returns {void}
+   */
+  const checkoutContainer = (): void => {
+      container.set('parent', null);
+      container.set('coordinate', null);
+      // TODO: this function has to be created!
+      //contHandler.put();
+  };
+
+  return (
+    <div className='specimen-header'>
+      <div className='specimen-title'>
+        <div className='barcode'>
+          Barcode
+          <div className='value'>
+            <strong>{container.barcode}</strong>
+          </div>
+          <span className='barcodePath'>
+            Address: {barcodePathDisplay} <br />
+            Lot Number: {container.lotNumber} <AlterLotNumberButton />
+            <br />
+            Expiration Date: {container.expirationDate}
+            <AlterExpirationDateButton />
+          </span>
+          {lotForm}
+          {expirationForm}
+        </div>
+        <div className='action' title='Print Barcode'>
+          <div className='action-button update' onClick={printBarcode}>
+            <span className='glyphicon glyphicon-print' />
+          </div>
+        </div>
+        {addAliquotForm()}
+        {loris.userHasPermission('biobank_container_update') &&
+        container.parent ? (
+          <div className='action'>
+            <div
+              className='action-button update'
+              title='Checkout Container'
+              onClick={checkoutContainer}
+            >
+              <span className='glyphicon glyphicon-share' />
+            </div>
+          </div>
+        ) : null}
+      </div>
+      <LifeCycle specimen={specimen}/>
+    </div>
+  );
+};
+
+export default Header;
diff --git a/jsx/components/LifeCycle.tsx b/jsx/components/LifeCycle.tsx
new file mode 100644
index 00000000..5db88ba0
--- /dev/null
+++ b/jsx/components/LifeCycle.tsx
@@ -0,0 +1,70 @@
+import React from 'react';
+import { ContainerHook, SpecimenHook } from '../entities';
+
+/**
+ * Functional component representing the lifecycle of a specimen.
+ * Renders different nodes based on the specimen's properties.
+ * 
+ * @param {LifeCycleProps} props - The props object for the component.
+ * @returns {ReactElement} - A React Element representing the component.
+ */
+const LifeCycle: React.FC<{
+  specimen: SpecimenHook,
+  container?: ContainerHook,
+}> = ({
+  specimen,
+  container
+}) => {
+  // Conditionally renders the collection node
+  const collectionNode = specimen?.collection || container ? (
+    <div
+      onMouseLeave={(e) => console.log('Mouse leave', e)}
+      className="lifecycle-node collection"
+    >
+      <div className="letter">C</div>
+    </div>
+  ) : null;
+
+  // Conditionally renders the preparation node
+  const preparationNode = specimen?.preparation ? (
+    <div className="lifecycle-node preparation">
+      <div className="letter">P</div>
+    </div>
+  ) : null;
+
+  // Conditionally renders the analysis node
+  const analysisNode = specimen?.analysis ? (
+    <div className="lifecycle-node-container">
+      <div className="lifecycle-node">
+        <div className="letter">A</div>
+      </div>
+    </div>
+  ) : null;
+
+  // Calculates the number of active nodes and line width
+  let nodes = 0;
+  if (specimen) {
+    nodes = ['collection', 'preparation', 'analysis']
+      .reduce((count, key) => specimen[key] ? count + 1 : count, 0);
+  }
+  const lineWidth = nodes > 1 ? 60 / (nodes - 1) : 0;
+  const lineStyle = { width: `${lineWidth}%` };
+
+  // Renders a line connecting nodes, if applicable
+  const line = <div className="lifecycle-line" style={lineStyle} />;
+
+  // Main render return
+  return (
+    <div className="lifecycle">
+      <div className="lifecycle-graphic">
+        {collectionNode}
+        {preparationNode && line}
+        {preparationNode}
+        {analysisNode && line}
+        {analysisNode}
+      </div>
+    </div>
+  );
+}
+
+export default LifeCycle;
diff --git a/jsx/components/Link.tsx b/jsx/components/Link.tsx
new file mode 100644
index 00000000..0d080144
--- /dev/null
+++ b/jsx/components/Link.tsx
@@ -0,0 +1,26 @@
+import React from 'react';
+import { Link as RouterLink } from 'react-router-dom';
+
+type LinkProps = {
+  to?: string; // URL for <Link> component
+  href?: string; // URL for <a> tag
+  condition?: boolean; // Renamed from 'if' to 'condition'
+  children: React.ReactNode;
+};
+
+const Link: React.FC<LinkProps> = ({ to, href, condition, children }) => {
+  if (!condition) { // Updated to use 'condition'
+    return <>{children}</>;
+  }
+
+  if (to) {
+    return <RouterLink to={to}>{children}</RouterLink>;
+  } else if (href) {
+    return <a href={href}>{children}</a>;
+  } else {
+    return <>{children}</>; // Render just the children if no link is provided
+  }
+};
+
+export default Link;
+
diff --git a/jsx/components/LoadingBar.jsx b/jsx/components/LoadingBar.jsx
new file mode 100644
index 00000000..261d3680
--- /dev/null
+++ b/jsx/components/LoadingBar.jsx
@@ -0,0 +1,47 @@
+// ########### CBIGR START ###########
+import React from 'react';
+
+/**
+ * LoadingBar is a React component which shows a loading bar while
+ * something is loading.
+ *
+ * @param {array} props - The React props
+ *
+ * @return {DOMObject} - Loading Bar React component
+ */
+function LoadingBar(props) {
+  const {progress} = props;
+
+  const wrapperStyle = {
+    margin: 50,
+  };
+
+  const containerStyles = {
+    height: 5,
+    backgroundColor: '#e0e0de',
+    borderRadius: 50,
+  };
+
+  const fillerStyles = {
+    height: '100%',
+    width: `${progress}%`,
+    backgroundColor: '#E89A0C',
+    borderRadius: 'inherit',
+    textAlign: 'right',
+    transition: 'width 1s linear',
+  };
+
+  const progressBar = progress >= 0 ? (
+    <div style={wrapperStyle}>
+      <h5 className='animate-flicker'>Loading...</h5>
+      <div style={containerStyles}>
+        <div style={fillerStyles}/>
+      </div>
+    </div>
+  ) : null;
+
+  return progressBar;
+};
+
+export default LoadingBar;
+// ###########  CBIGR END  ###########
diff --git a/jsx/components/PoolTab.tsx b/jsx/components/PoolTab.tsx
new file mode 100644
index 00000000..fc8c3e53
--- /dev/null
+++ b/jsx/components/PoolTab.tsx
@@ -0,0 +1,138 @@
+import { Fragment, useState, useEffect, ReactElement} from 'react';
+import { Link } from '../components';
+import { SpecimenForm } from '../forms';
+import { IPool } from '../entities';
+import Utils from '../utils';
+import { Button } from '../forms';
+import FilterableDataTable from 'FilterableDataTable';
+import { useBiobankContext, useEditable, useRequest } from '../hooks';
+import { EntityType } from '../contexts'
+import { BaseAPI, SpecimenAPI } from '../APIs';
+declare const loris: any;
+
+export const PoolTab: React.FC = () => {
+  const { pools, initializeEntity } = useBiobankContext();
+  const { editable, edit, clear } = useEditable();
+
+  useEffect(() => {
+    initializeEntity(EntityType.Pools);
+  });
+                                                                                
+  const openAliquotForm = (pool) => {
+    edit('aliquotForm');
+  }
+
+  /**
+   * Format a row of columns for the pooled specimen.
+   *
+   * @param {string} column - the column name
+   * @param {string} value - the column value
+   * @param {object} row - all the values from the row
+   *
+   * @return {JSX}
+   */
+  function formatPoolColumns(
+    column: string,
+    value: any,
+    row: any
+  ): ReactElement {
+    const handlers = {
+      //'Pooled Specimens': () => (
+      //  value.map((barcode, i) => (
+      //    <Fragment key={i}>
+      //      {i > 0 && ', '}
+      //      <Link to={'/specimens/'+barcode}>
+      //        {barcode}
+      //      </Link>
+      //    </Fragment>
+      //  ))
+      //),
+      'PSCID': () => (
+        <Link href={loris.BaseURL+'/'+value.id} condition={!!value.id}>
+          {value.label}
+        </Link>
+      ),
+      'Visit Label': () => (
+        <Link
+          href={loris.BaseURL+'/instrument_list/?candID='+row['PSCID'].id+'&sessionID='+value.id}
+          condition={!!value.id}
+        >
+          {value.label}
+        </Link>
+      ),
+      'Aliquot': () => (
+        loris.userHasPermission('biobank_specimen_create') && row['ID'] ? (
+          <Button label='Aliquot' onClick={() => openAliquotForm(row['ID'])} />
+        ) : value
+      ),
+      'default': () => value
+    };
+
+    // Return the result wrapped in a <td> tag, falling back to 'default' if the column is not found.
+    return <td>{(handlers[column] || handlers['default'])()}</td>;
+  }
+
+  //console.log('pools:', pools);  // Check if `pools` is defined and what it contains
+  //console.log('pools.data:', pools.data);  // Check if `pools.data` is defined
+
+  const poolData = pools?.data?.map((pool: IPool) => {
+    return [
+      pool.label,
+      Math.round(pool.quantity*100)/100 + ' ' + pool.unit.label,
+      pool.specimens?.map((specimen) => specimen.barcode),
+      pool.candidate,
+      pool.session,
+      pool.type.label,
+      pool.center.label,
+      pool.date,
+      pool.time,
+    ];
+  });
+
+  const fields = [
+    {label: 'Label', show: true, filter: {
+      name: 'barcode',
+      type: 'text',
+    }},
+    {label: 'Quantity', show: true},
+    {label: 'Pooled Specimens', show: true},
+    {label: 'PSCID', show: true, filter: {
+      name: 'pscid',
+      type: 'text',
+    }},
+    {label: 'Visit Label', show: true, filter: {
+      name: 'session',
+      type: 'text',
+    }},
+    {label: 'Type', show: true, filter: {
+      name: 'type',
+      type: 'select',
+      options: Utils.mapLabel(useRequest(() => new SpecimenAPI().getTypes())),
+    }},
+    {label: 'Site', show: true, filter: {
+      name: 'site',
+      type: 'select',
+      options: Utils.mapLabel(useRequest(() => new BaseAPI('centers').get())),
+    }},
+    {label: 'Date', show: true},
+    {label: 'Time', show: true},
+    {label: 'Aliquot', show: true},
+  ];
+
+  return (
+    <>
+      <FilterableDataTable
+        name='pool'
+        data={poolData}
+        fields={fields}
+        getFormattedCell={formatPoolColumns}
+        progress={pools.progress}
+      />
+      <SpecimenForm
+        title='Aliquot Pool'
+        show={editable.aliquotForm}
+        onClose={clear}
+      />
+    </>
+  );
+}
diff --git a/jsx/components/ProcessPanel.tsx b/jsx/components/ProcessPanel.tsx
new file mode 100644
index 00000000..911ccd27
--- /dev/null
+++ b/jsx/components/ProcessPanel.tsx
@@ -0,0 +1,117 @@
+import { ReactElement } from 'react';
+import { ProcessForm } from '../forms';
+import { IProtocol, ProcessType, useSpecimenContext } from '../entities';
+import { useRequest, useBarcodePageContext, useBiobankContext } from '../hooks';
+import { Button } from '../forms'
+import { SpecimenAPI } from '../APIs';
+
+declare const loris: any;
+
+// Define the type for your props
+type ProcessPanelProps = {
+  process: ProcessType;
+  clearAll: () => void,
+};
+
+function ProcessPanel({
+  process,
+  clearAll,
+}: ProcessPanelProps): ReactElement {
+
+  const { edit, editable } = useBarcodePageContext();
+  const { options } = useBiobankContext();
+  const specimen = useSpecimenContext();
+
+  const addProcess = async () => {
+    specimen[process].set('center', specimen.container.center);
+    edit(process);
+  };
+
+  const alterProcess = () => {
+    if (loris.userHasPermission('biobank_specimen_alter')) {
+      return (
+        <span
+          className={editable[process] ? null : 'glyphicon glyphicon-pencil'}
+          onClick={editable[process] ? null : () => edit(process)}
+        />
+      );
+    }
+  };
+
+  const cancelAlterProcess = () => {
+    if (editable[process]) {
+      return (
+        <a
+          className="pull-right"
+          style={{cursor: 'pointer'}}
+          onClick={clearAll}
+        >
+          Cancel
+        </a>
+      );
+    }
+  };
+
+  // TODO: replace with API that does this itself....
+  const protocolExists = Object.values(useRequest(new SpecimenAPI().getProtocols()))
+    .find(
+    (protocol: IProtocol) => {
+      return protocol.type == specimen.type &&
+      protocol.process == process.replace(/^\w/, (c) => c.toUpperCase());
+    }
+  );
+
+  let panel = null;
+  if (protocolExists &&
+      !specimen[process] &&
+      !editable[process] &&
+      loris.userHasPermission('biobank_specimen_update')) {
+    panel = (
+      <div className='panel specimen-panel inactive'>
+        <div className='add-process' onClick={addProcess}>
+          <span className='glyphicon glyphicon-plus'/>
+        </div>
+        <div>ADD {process.toUpperCase()}</div>
+      </div>
+    );
+  }
+
+  const updateButton = specimen && (
+    <Button
+      label="Update"
+      onClick={ () => new SpecimenAPI().update(specimen)}
+    />
+  );
+
+  if (specimen[process] || editable[process]) {
+    panel = (
+      <div className='panel specimen-panel panel-default'>
+        <div className='panel-heading'>
+          <div className={'lifecycle-node '+process}>
+            <div className='letter'>
+              {process.charAt(0).toUpperCase()}
+            </div>
+          </div>
+          <div className='title'>
+            {process.replace(/^\w/, (c) => c.toUpperCase())}
+          </div>
+          {alterProcess()}
+        </div>
+        <div className='panel-body'>
+          <ProcessForm
+            edit={editable[process]}
+            process={specimen[process]}
+            processStage={process}
+            type={editable[process] ? specimen.type : specimen.type}
+          />
+          {cancelAlterProcess()}
+          {updateButton}
+        </div>
+      </div>
+    );
+  }
+
+  return panel;
+}
+
+export default ProcessPanel;
diff --git a/jsx/components/Search.tsx b/jsx/components/Search.tsx
new file mode 100644
index 00000000..4cf47ded
--- /dev/null
+++ b/jsx/components/Search.tsx
@@ -0,0 +1,62 @@
+import { useState, ReactElement } from 'react';
+import { useHistory } from 'react-router-dom';
+import Modal from 'Modal';
+import { TextField } from '../forms';
+
+/**
+ * Provides a modal window that can be used to search barcodes.
+ *
+ * @component
+ * @param {SearchProps} props - The component's props.
+ * @returns {ReactElement} The rendered component.
+ */
+export const Search: React.FC<{
+  title: string,
+  show: boolean,
+  onClose: () => void,
+  barcodes?: {[key: string]: string},
+}> = ({
+  title,
+  show,
+  onClose,
+  barcodes = {},
+}) => {
+
+  const [barcode, setBarcode] = useState<string | null>(null);
+  const history = useHistory();
+
+  /**
+   * Handles user input in the barcode textbox.
+   *
+   * @function
+   * @param {string} name - The name of the input element.
+   * @param {string} value - The new value of the barcode.
+   * @returns {void}
+   */
+  const onInput = (name: string, value: string) : void => {
+    setBarcode(value);
+    if (Object.values(barcodes).find((barcode) => barcode === value)) {
+      history.push(`/barcode=${value}`);
+      onClose();
+    }
+  };
+
+  return (
+    <Modal
+      title={title}
+      show={show}
+      onClose={onClose}
+      throwWarning={false}
+      onSubmit={() => Promise.resolve()}
+    >
+      <TextField
+        name="barcode"
+        label="Barcode"
+        value={barcode}
+        onChange={onInput}
+        placeholder="Please Scan or Type Barcode"
+        autofocus={true}
+      />
+    </Modal>
+  );
+}
diff --git a/jsx/components/ShipmentTab.tsx b/jsx/components/ShipmentTab.tsx
new file mode 100644
index 00000000..b071a315
--- /dev/null
+++ b/jsx/components/ShipmentTab.tsx
@@ -0,0 +1,279 @@
+import React, { useState, useEffect } from 'react';
+import { Link } from 'react-router-dom';
+import FilterableDataTable from 'FilterableDataTable';
+import { useBiobankContext, useRequest } from '../hooks';
+import Utils from '../utils';
+// import Container from './Container';
+import { IShipment, Shipment, ILog, Log, useShipment, useLog, ShipmentProvider,
+  LogProvider } from '../entities';
+import { EntityType } from '../contexts';
+import TriggerableModal from 'TriggerableModal';
+import { BaseAPI, ShipmentAPI } from '../APIs';
+import dict from '../i18n/en.json';
+import { StaticField, ShipmentField, LogField} from '../forms';
+import { HorizontalRule } from '../styles/form'; 
+
+// TODO:
+// - Make sure all subcontainers are loaded into shipment
+// - Make sure all containers change center when shipment is received
+// - Make sure to block all
+
+/**
+ * Returns a component for the shipment tab of the module
+ *
+ * @return {ReactDOM}
+ */
+const ShipmentTab: React.FC = () => {
+
+  const { shipments, updateEntity, initializeEntity } = useBiobankContext();
+
+  useEffect(() => {
+    initializeEntity(EntityType.Shipments);
+  });
+
+  const updateShipments = (updatedShipments: IShipment[]) => {
+    updatedShipments.forEach((shipment) => {
+      updateEntity('Shipments', shipment.barcode, shipment);
+   });
+  };
+
+  const formatShipmentColumns = (
+    column: string,
+    value: string,
+    row: Record<string, string>
+  ) => {
+    switch (column) {
+      case 'Barcode':
+        return (
+          <td>
+            <TriggerableModal label={value} title={value+' Information'}>
+              <ShipmentInformation shipment={shipments[value]}/>
+            </TriggerableModal>
+          </td>
+        );
+      case 'Actions':
+        if (row['Status'] !== 'received') {
+          // this should maybe just pass the barcode to receive shipment and
+          // then upon receiving a barcode the receiveshipment component actually
+          // renders itself.
+          const shipment = shipments.find(shipment => shipment.barcode ===
+                                          row['Barcode']);
+          return <td><ReceiveShipment shipment={shipment}/></td>;
+        }
+      default:
+        return <td>{value}</td>;
+    }
+  };
+
+  const shipmentData = Object.values(shipments.data).map((shipment: IShipment) => {
+    return [
+      shipment.barcode,
+      shipment.type,
+      shipment.status,
+      shipment.originCenter,
+      shipment.destinationCenter,
+    ];
+  });
+
+  const shipmentAPI = new ShipmentAPI();
+  const centers = Utils.mapLabel(useRequest(() => new BaseAPI('centers').get()));
+
+  const fields = [
+    {label: 'ID', show: false},
+    {label: 'Barcode', show: true, filter: {
+      name: 'barcode',
+      type: 'text',
+    }},
+    {label: 'Type', show: true, filter: {
+      name: 'type',
+      type: 'select',
+      options: Utils.mapLabel(useRequest(() => shipmentAPI.getTypes()))
+    }},
+    {label: 'Status', show: true, filter: {
+      name: 'status',
+      type: 'select',
+      options: Utils.mapLabel(useRequest(() => shipmentAPI.getStatuses()))
+    }},
+    {label: 'Origin Center', show: true, filter: {
+      name: 'originCenter',
+      type: 'select',
+      options: centers,
+    }},
+    {label: 'Destination Center', show: true, filter: {
+      name: 'destinationCenter',
+      type: 'select',
+      options: centers,
+    }},
+    {label: 'Actions', show: true},
+  ];
+
+  const forms = [<CreateShipment/>];
+
+  return (
+    <FilterableDataTable
+      progress={shipments.progress}
+      data={shipmentData}
+      fields={fields}
+      forms={forms}
+      getFormattedCell={formatShipmentColumns}
+    />
+  );
+}
+
+const ShipmentInformation: React.FC<{
+  shipment: IShipment,
+}> = ({
+  shipment,
+}) => {
+
+  const shipmentHook = useShipment(new Shipment(shipment));
+
+  const logs = shipment.logs.map((log, i) => (
+    <LogEntry key={i} log={log} index={i} />
+  ));
+
+  const containers = shipment.containers.map((barcode, i) => (
+    <React.Fragment key={i}>
+      {i > 0 && ', '}
+      <Link to={'/containers/'+barcode}>
+        {barcode}
+      </Link>
+    </React.Fragment>
+  ))
+
+  return (
+    <ShipmentProvider shipment={shipmentHook}>
+      <ShipmentField isStatic property='barcode'/>
+      <ShipmentField isStatic property='type'/>
+      <ShipmentField isStatic property='containers'/>
+      <ShipmentField isStatic property='originCenter'/>
+      <ShipmentField isStatic property='destinationCenter'/>
+      {logs}
+    </ShipmentProvider>
+  );
+}
+
+const LogEntry: React.FC<{ log: Partial<ILog>; index: number }> = ({ log, index }) => {
+  const logHook = useLog(new Log(log)); // Assuming useLog is your custom hook
+
+  return (
+    <LogProvider log={logHook}>
+      <h4>Shipment Log {index + 1}</h4>
+      <HorizontalRule />
+      <LogField isStatic property='center'/>
+      <LogField isStatic property='status'/>
+      <LogField isStatic property='temperature'/>
+      <LogField isStatic property='date'/>
+      <LogField isStatic property='time'/>
+      <LogField isStatic property='user'/>
+      <LogField isStatic property='comments'/>
+    </LogProvider>
+  );
+};
+
+// TODO: this will be reinstated as a prop when I start re-instating context updates
+// updateShipments: (updatedShipments: Shipment[]) => void,
+const CreateShipment: React.FC = () => {
+
+  const { containers, updateEntities } = useBiobankContext();
+
+  const logIndex = 0;
+  const shipment = useShipment(new Shipment({logs: [{status: {label:
+                                            'created'}}]}));
+  const log = shipment.logs[logIndex];
+
+  const setLog = (log) => shipment.setLog(logIndex, log);
+
+  const onSubmit = async () => {
+    const container = containers(shipment.containers[0]);
+    const l = new Log(log).set('center', container.center);
+    shipment.setLog(logIndex, l.getData());
+    const entities = await ShipmentAPI.create(shipment);
+    updateEntities('shipments', entities.shipments);
+  };
+
+  return (
+    <TriggerableModal
+      label='Create Shipment'
+      title='Create Shipment'
+      onSubmit={onSubmit}
+      onClose={shipment.clear}
+    >
+      <ShipmentProvider shipment={shipment}>
+        <StaticField label='Note' value={dict.noteForCreateShipment}/>
+        <ShipmentField property='barcode'/>
+        <ShipmentField property='type'/>
+        <ShipmentField property='containers'/>
+        <ShipmentField property='destinationCenter'/>
+        <ShipmentLogForm log={log} setLog={setLog}/>
+      </ShipmentProvider>
+    </TriggerableModal>
+  );
+}
+
+/**
+ * React Component for a received shipment
+ */
+// TODO: this will be reinstated as a prop when I start re-instating context updates
+// updateShipments: (updatedShipments: Shipment[]) => void,
+const ReceiveShipment = ({
+  shipment: initShipment
+}: { shipment: IShipment }) => {
+  const shipment = useShipment(new Shipment(initShipment));
+  const logIndex = shipment.logs.length-1;
+  const onSuccess = ({shipments, containers}) => {
+    // updateShipments(shipments);
+  };
+
+  const onOpen = () => {
+    shipment.addLog({status: {label: 'received'}, center: shipment.destinationCenter});
+  };
+
+  return (
+    <TriggerableModal
+      label='Receive Shipment'
+      title={'Receive Shipment '+shipment.barcode}
+      onUserInput={onOpen}
+      onSubmit={() => ShipmentAPI.create(shipment)}
+      onSuccess={onSuccess}
+      onClose={shipment.clear}
+    >
+      <ShipmentLogForm
+        log={shipment.logs[logIndex]}
+        setLog={(log) => shipment.setLog(logIndex, log)}
+      />
+    </TriggerableModal>
+  );
+}
+
+/**
+ * Return a form for the shipment log
+ *
+ * @param {object} log - the log
+ * @param {callback} setLog - a callback for when the log is set
+ *
+ * @return {ReactDOM[]}
+ */
+const ShipmentLogForm: React.FC<{
+  log: Partial<ILog>,
+  setLog: (log: Partial<ILog>) => void,
+}> = ({ log, setLog }) => {
+
+  const logHook = useLog(new Log(log));
+
+  useEffect(() => {
+    setLog(logHook.getData());
+  }, [log])
+
+  return (
+    <LogProvider log={logHook}>
+      <LogField property={'temperature'}/>
+      <LogField property={'date'}/>
+      <LogField property={'time'}/>
+      <LogField property={'user'}/>
+      <LogField property={'comments'}/>
+    </LogProvider>
+  );
+}
+
+export default ShipmentTab;
diff --git a/jsx/components/SpecimenPage.tsx b/jsx/components/SpecimenPage.tsx
new file mode 100644
index 00000000..3eba19fc
--- /dev/null
+++ b/jsx/components/SpecimenPage.tsx
@@ -0,0 +1,46 @@
+import React, { useState, ReactElement } from 'react';
+import { Link, RouteComponentProps } from 'react-router-dom';
+import {
+  useSpecimen,
+  useContainer,
+  SpecimenProvider,
+} from '../entities';
+import { useBarcodePageContext, useBiobankContext} from '../hooks';
+import { Globals, Header, ProcessPanel } from '../components';
+import { BarcodePageProvider } from '../contexts';
+
+export const SpecimenPage: React.FC<RouteComponentProps<{ barcode: string }>> = ({
+  match,
+  location,
+  history
+}) => {
+  const { specimens } = useBiobankContext();
+  const specimenHook = useSpecimen(specimens[match.param.barcode]);
+  const { clear } = useBarcodePageContext();
+
+  function clearAll() {
+    // specimen.reset();
+    // container.reset();
+    clear();
+  }
+
+  return (
+    <SpecimenProvider specimen={specimenHook}>
+      <BarcodePageProvider>
+        <Link to={`/`}>
+          <span className='glyphicon glyphicon-chevron-left'/>
+          Return to Filter
+        </Link>
+        <Header clearAll={clearAll}/>
+        <div className='summary'>
+          <Globals clearAll={clearAll}/>
+          <div className="processing">
+            <ProcessPanel process={'collection'} clearAll={clearAll}/>
+            <ProcessPanel process={'preparation'} clearAll={clearAll}/>
+            <ProcessPanel process={'analysis'} clearAll={clearAll}/>
+          </div>
+        </div>
+      </BarcodePageProvider>
+    </SpecimenProvider>
+  );
+}
diff --git a/jsx/components/SpecimenTab.tsx b/jsx/components/SpecimenTab.tsx
new file mode 100644
index 00000000..20e9b0ec
--- /dev/null
+++ b/jsx/components/SpecimenTab.tsx
@@ -0,0 +1,302 @@
+import { Fragment, useState, useEffect, ReactElement } from 'react';
+import { mapLabel } from '../utils';
+import { Link } from 'react-router-dom';
+import { ISpecimen } from '../entities';
+import FilterableDataTable from 'FilterableDataTable';
+import { useBiobankContext, useEditable, useRequest } from '../hooks';
+// import {
+//   SpecimenForm,
+//   PoolForm,
+//   BatchProcessForm,
+//   EditEntitiesForm,
+// } from '../forms';
+import { Search } from '../components';
+import { EntityType } from '../contexts';
+import {
+  ContainerAPI,
+  SpecimenAPI,
+  BaseAPI,
+} from '../APIs';
+
+declare const loris: any;
+
+const SpecimenTab = () => {
+  const { specimens, initializeEntity } = useBiobankContext();
+  const { editable, edit, clear } = useEditable();
+
+  useEffect(() => {
+    initializeEntity(EntityType.Specimens);
+  });
+
+  /**
+   * Format columns for a specimen row
+   *
+   * @param {string} column - the column name being mapped
+   * @param {string} value - the value being mapped
+   * @param {array} row - an array of the row values
+   *
+   * @return {ReactDOM}
+   */
+  function formatSpecimenColumns(
+    column: string,
+    value: any,
+    row: Record<string, any>,
+  ): ReactElement {
+    const statusColorMap: Record<string, string> = {
+      Available: 'green',
+      Reserved: 'orange',
+      Dispensed: 'red',
+      Discarded: 'red',
+    };
+    console.log(value);
+    switch (column) {
+      case 'Barcode':
+        return <td><Link to={`/specimens/${value}`}>{value}</Link></td>;
+      case 'Parent Specimens':
+        // Check if 'value' is an array and map over it to produce Link elements
+
+        const barcodes = Array.isArray(value) ? value.map((specimen, index) => (
+          // Use React.Fragment to wrap each Link and comma
+          <Fragment key={index}>
+            <Link to={'/specimens/'+specimen.id}>{specimen.id}</Link>
+            {index < value.length - 1 ? ', ' : ''}
+          </Fragment>
+        )) : null; // Handle case where 'value' is not an array
+
+        return <td>{barcodes}</td>;
+      case 'PSCID':
+        if (value.id) {
+          return <td><a href={loris.BaseURL + '/' + value.id}>{value.label}</a></td>;
+        }
+        return <td>{value}</td>;
+      case 'Visit Label':
+        if (value.id) {
+          const visitLabelURL =
+            loris.BaseURL+'/instrument_list/?candID='+row['PSCID'].id+
+            '&sessionID='+value.id;
+          return <td><a href={visitLabelURL}>{value}</a></td>;
+        }
+        return <td>{value}</td>;
+      case 'Status':
+        const color = typeof value === 'string' ? statusColorMap[value] || '' : ''; // Fallback to empty string if status is not found
+        return <td style={{color: color}}>{value}</td>;
+      case 'Projects':
+        return <td>{Array.isArray(value) && value.join(', ')}</td>;
+      case 'Container Barcode':
+        // TODO: this should not be a link when user doesn't have permission to view
+        return <td><Link to={`/containers/${value}`}>{value}</Link></td>;
+      default:
+        return <td>{value}</td>;
+     }
+  }
+
+  const data = Object.values(specimens.data).map((specimen: ISpecimen) => {
+     let specimenAttributeData = [];
+  //   Object.keys(options.specimen.processAttributes)
+  //     .forEach((processId) => {
+  //       Object.keys(options.specimen.processAttributes[processId])
+  //         .forEach((attributeId) => {
+  //           const process = options.specimen.processes[processId].label.toLowerCase();
+  //           if ((specimen[process]||{}).data) {
+  //             const protocols = options.specimen.processAttributes[processId][attributeId].protocolIds;
+  //             if (protocols.includes(specimen[process].protocol)) {
+  //               const data = specimen[process].data[attributeId];
+  //               specimenAttributeData.push(data);
+  //             } else {
+  //               specimenAttributeData.push(null);
+  //             }
+  //           }
+  //         });
+  //     });
+     return [
+       specimen.container.barcode,
+       specimen.type.label,
+       specimen.container.type.label,
+       specimen.quantity+' '+specimen.unit.label,
+       specimen.fTCycle,
+       specimen.parents,
+       specimen.candidate,
+       specimen.candidate.sex,
+       specimen.candidate.age,
+       specimen.candidate.diagnosisIds,
+       specimen.session,
+       specimen.pool.label,
+       specimen.container.status,
+       specimen.projects,
+       specimen.container.center.label,
+       specimen.session.center.label,
+       specimen.collection.date,
+       specimen.collection.time,
+       specimen.preparation?.time,
+       specimen.container.parent.barcode,
+       specimen.container.coordinate,
+       ...specimenAttributeData,
+     ];
+  });
+
+  // let specimenAttributeFields = [];
+  // Object.keys(options.specimen.processAttributes)
+  //   .forEach((processId) => {
+  //     Object.keys(options.specimen.processAttributes[processId])
+  //       .forEach((attributeId) => {
+  //         specimenAttributeFields.push(
+  //           {
+  //             label: options.specimen.attributes[attributeId].label,
+  //             show: true,
+  //           },
+  //         );
+  //       });
+  //   });
+
+  const fields = [
+    {label: 'Barcode', show: true, filter: {
+      name: 'barcode',
+      type: 'text',
+    }},
+    {label: 'Type', show: true, filter: {
+      name: 'type',
+      type: 'select',
+      options: mapLabel(useRequest(() => new SpecimenAPI().getTypes())),
+    }},
+    {label: 'Container Type', show: true, filter: {
+      name: 'containerType',
+      type: 'select',
+      options: mapLabel(useRequest(() => new ContainerAPI().getTypes())),
+    }},
+    {label: 'Quantity', show: true},
+    {label: 'F/T Cycle', show: false, filter: {
+      name: 'fTCycle',
+      type: 'text',
+      hide: true,
+    }},
+    {label: 'Parent Specimen(s)', show: false, filter: {
+      name: 'parents',
+      type: 'text',
+      hide: true,
+    }},
+    {label: 'PSCID', show: true, filter: {
+      name: 'pscid',
+      type: 'text',
+    }},
+    {label: 'Sex', show: true, filter: {
+      name: 'sex',
+      type: 'select',
+      options: {Male: 'Male', Female: 'Female'},
+    }},
+    {label: 'Age at Collection', show: true, filter: {
+      name: 'age',
+      type: 'number',
+    }},
+    {label: 'Diagnosis', show: true, filter: {
+      name: 'diagnosis',
+      type: 'multiselect',
+      options: mapLabel(useRequest(() => new BaseAPI('diagnoses').get())),
+    }},
+    {label: 'Visit Label', show: true, filter: {
+      name: 'session',
+      type: 'text',
+    }},
+    {label: 'Pool', show: false, filter: {
+      name: 'pool',
+      type: 'text',
+      hide: true,
+    }},
+    {label: 'Status', show: true, filter: {
+      name: 'status',
+      type: 'select',
+      options: mapLabel(useRequest(() => new ContainerAPI().getStatuses())),
+    }},
+    {label: 'Projects', show: true, filter: {
+      name: 'projects',
+      type: 'multiselect',
+      options: mapLabel(useRequest(() => new BaseAPI('projects').get())),
+    }},
+    {label: 'Current Site', show: true, filter: {
+      name: 'currentSite',
+      type: 'select',
+      options: mapLabel(useRequest(() => new BaseAPI('centers').get())),
+    }},
+    {label: 'Draw Site', show: true, filter: {
+      name: 'drawSite',
+      type: 'select',
+      options: mapLabel(useRequest(() => new BaseAPI('centers').get()))
+    }},
+    {label: 'Collection Date', show: true, filter: {
+      name: 'collectionDate',
+      type: 'date',
+    }},
+    {label: 'Collection Time', show: true, filter: {
+      name: 'collectionTime',
+      type: 'text',
+    }},
+    {label: 'Preparation Time', show: true, filter: {
+      name: 'preparationTime',
+      type: 'text',
+    }},
+    {label: 'Container Barcode', show: true, filter: {
+      name: 'containerBarcode',
+      type: 'text',
+    }},
+    {label: 'Coordinate', show: true},
+    // ...specimenAttributeFields,
+  ];
+
+  const actions = [
+    {
+      name: 'goToSpecimen',
+      label: 'Go To Specimen',
+      action: () => edit('searchSpecimen'),
+    },
+    {name: 'addSpecimen', label: 'Add Specimen', action: () => edit('specimenForm')},
+    {name: 'poolForm', label: 'Pool Specimens', action: () => edit('poolForm')},
+    {
+      name: 'batchProcess',
+      label: 'Process Specimens',
+      action: () => edit('batchProcessForm'),
+    },
+    {name: 'batchEdit', label: 'Edit Specimens', action: () => edit('batchEditForm')},
+  ];
+
+  return (
+    <>
+      <FilterableDataTable
+        name='specimen'
+        progress={specimens.progress}
+        data={data}
+        fields={fields}
+        actions={actions}
+        getFormattedCell={formatSpecimenColumns}
+      />
+    </>
+  );
+}
+      // <Search
+      //   title='Go To Specimen'
+      //   show={editable.searchSpecimen}
+      //   onClose={clear}
+      //   barcodes={specimens.data}
+      // />
+      // {loris.userHasPermission('biobank_specimen_create') ?
+      // <SpecimenForm
+      //   title='Add New Specimen'
+      //   show={editable.specimenForm}
+      //   onClose={clear}
+      // /> : null}
+      // {loris.userHasPermission('biobank_pool_create') ?
+      // <PoolForm show={editable.poolForm} onClose={clear} /> : null}
+      // {loris.userHasPermission('biobank_specimen_update') &&
+      //   <BatchProcessForm
+      //     show={editable.batchProcessForm}
+      //     onClose={clear}
+      //   />
+      // }
+      // {loris.userHasPermission('biobank_specimen_update') &&
+      //   <EditEntitiesForm
+      //     show={editable.batchEditForm}
+      //     options={specimens}
+      //     entityType={}
+      //     onClose={clear}
+      //   />
+      // }
+
+export default SpecimenTab;
diff --git a/jsx/components/index.ts b/jsx/components/index.ts
new file mode 100644
index 00000000..3cfa3b01
--- /dev/null
+++ b/jsx/components/index.ts
@@ -0,0 +1,18 @@
+// components index.js
+// TODO: convert to named exports by removing 'default' here and in component
+// file.
+export * from './CoordinateLabel';
+export * from './BarcodePathDisplay';
+export * from './SpecimenPage';                         
+export { default as Link } from './Link';
+export { default as ContainerDisplay } from './ContainerDisplay';               
+export { ContainerTab } from './ContainerTab';                       
+export { ContainerPage } from './ContainerPage';                     
+export { default as Globals } from './Globals';                                 
+export { default as Header } from './Header';                                   
+export { default as LifeCycle } from './LifeCycle';                             
+export { PoolTab } from './PoolTab';                                 
+export { Search } from './Search';                                   
+export { default as ShipmentTab } from './ShipmentTab';                         
+export { default as SpecimenTab } from './SpecimenTab';                         
+export { default as ProcessPanel } from './ProcessPanel';
diff --git a/jsx/container.js b/jsx/container.js
deleted file mode 100644
index fb5a4654..00000000
--- a/jsx/container.js
+++ /dev/null
@@ -1,191 +0,0 @@
-import React, {Component} from 'react';
-import PropTypes from 'prop-types';
-import {Link} from 'react-router-dom';
-
-import {mapFormOptions} from './helpers.js';
-import ContainerDisplay from './containerDisplay';
-
-/**
- * Biobank Container
- *
- * Fetches data corresponding to a given Container from Loris backend and
- * displays a page allowing viewing of meta information of the container
- *
- * @author Henri Rabalais
- * @version 1.0.0
- *
- * */
-class BiobankContainer extends Component {
-  /**
-   * Constructor
-   */
-  constructor() {
-    super();
-    this.drag = this.drag.bind(this);
-  }
-
-  /**
-   * Handle dragging of a container
-   *
-   * @param {Event} e - the drag event
-   */
-  drag(e) {
-    const container = JSON.stringify(this.props.data.containers[e.target.id]);
-    e.dataTransfer.setData('text/plain', container);
-  }
-
-  /**
-   * Render React component
-   *
-   * @return {JSX}
-   */
-  render() {
-    const {current, data, editable, options, container} = this.props;
-
-    const checkoutButton = () => {
-      if (!(loris.userHasPermission('biobank_container_update')) ||
-          (data.containers[container.id].childContainerIds.length == 0)) {
-        return;
-      }
-
-      return (
-        <div style = {{marginLeft: 'auto', height: '10%', marginRight: '10%'}}>
-          <div
-            className={!editable.containerCheckout && !editable.loadContainer ?
-              'action-button update open' : 'action-button update closed'}
-            title='Checkout Child Containers'
-            onClick={()=>{
-              this.props.edit('containerCheckout');
-            }}
-          >
-            <span className='glyphicon glyphicon-share'/>
-          </div>
-        </div>
-      );
-    };
-
-    const parentBarcodes = this.props.getParentContainerBarcodes(container);
-    const barcodes = mapFormOptions(data.containers, 'barcode');
-    // delete values that are parents of the container
-    Object.keys(parentBarcodes)
-      .forEach((key) => Object.keys(barcodes)
-        .forEach(
-           (i) => (parentBarcodes[key] == barcodes[i])
-                && delete barcodes[i]
-        )
-    );
-
-    const barcodePathDisplay = this.props.getBarcodePathDisplay(parentBarcodes);
-    const coordinates = data.containers[container.id].childContainerIds
-      .reduce((result, id) => {
-        const container = data.containers[id];
-        if (container.coordinate) {
-          result[container.coordinate] = id;
-        }
-        return result;
-      }, {});
-
-    const containerDisplay = (
-      <div className='display-container'>
-        {checkoutButton()}
-        <ContainerDisplay
-          history={this.props.history}
-          data={data}
-          container={container}
-          barcodes={barcodes}
-          current={current}
-          options={options}
-          dimensions={options.container.dimensions[container.dimensionId]}
-          coordinates={coordinates}
-          editable={editable}
-          edit={this.props.edit}
-          clearAll={this.props.clearAll}
-          setCurrent={this.props.setCurrent}
-          setCheckoutList={this.props.setCheckoutList}
-          editContainer={this.props.editContainer}
-          updateContainer={this.props.updateContainer}
-        />
-        <div style={{display: 'inline'}}>
-          {barcodePathDisplay}
-        </div>
-      </div>
-    );
-
-    const containerList = () => {
-      if (!container.childContainerIds) {
-        return <div className='title'>This Container is Empty!</div>;
-      }
-      const childIds = container.childContainerIds;
-      let listAssigned = [];
-      let coordinateList = [];
-      let listUnassigned = [];
-      childIds.forEach((childId) => {
-        if (!loris.userHasPermission('biobank_specimen_view')) {
-          return;
-        }
-
-        const child = data.containers[childId];
-        if (child.coordinate) {
-          listAssigned.push(
-            <div>
-               <Link
-                  key={childId}
-                  to={`/barcode=${child.barcode}`}>
-                    {child.barcode}
-               </Link>
-            </div>
-          );
-          const coordinate = this.props.getCoordinateLabel(child);
-          coordinateList.push(<div>at {coordinate}</div>);
-        } else {
-          listUnassigned.push(
-            <div>
-            <Link
-              key={childId}
-              to={`/barcode=${child.barcode}`}
-              id={child.id}
-              draggable={true}
-              onDragStart={this.drag}
-            >
-              {child.barcode}
-            </Link>
-            <br/>
-            </div>
-          );
-        }
-      });
-
-      return (
-        <div>
-          <div className='title'>
-            {listAssigned.length !== 0 ? 'Assigned Containers' : null}
-          </div>
-          <div className='container-coordinate'>
-            <div>{listAssigned}</div>
-            <div style={{paddingLeft: 10}}>{coordinateList}</div>
-          </div>
-            {listAssigned.length !==0 ? <br/> : null}
-          <div className='title'>
-            {listUnassigned.length !== 0 ? 'Unassigned Containers' : null}
-          </div>
-          {listUnassigned}
-        </div>
-      );
-    };
-
-    return (
-      <div className="container-display">
-        {containerDisplay}
-        <div className='container-list'>
-          {containerList()}
-        </div>
-      </div>
-    );
-  }
-}
-
-BiobankContainer.propTypes = {
-  containerPageDataURL: PropTypes.string.isRequired,
-};
-
-export default BiobankContainer;
diff --git a/jsx/containerDisplay.js b/jsx/containerDisplay.js
deleted file mode 100644
index 13aac0db..00000000
--- a/jsx/containerDisplay.js
+++ /dev/null
@@ -1,390 +0,0 @@
-import {useEffect} from 'react';
-import Swal from 'sweetalert2';
-import {mapFormOptions} from './helpers.js';
-
-/**
- * React component to display a container
- *
- * @param {object} props - React props
- *
- * @return {JSX}
- **/
-function ContainerDisplay(props) {
-  const {
-      barcodes,
-      coordinates,
-      current,
-      data,
-      dimensions,
-      editable,
-      options,
-  } = props;
-  const {history, select, container, selectedCoordinate} = props;
-  const {
-      clearAll,
-      editContainer,
-      setContainer,
-      updateContainer,
-      setCurrent,
-      setCheckoutList,
-      edit,
-  } = props;
-
-  useEffect(() => {
-    $('[data-toggle="tooltip"]').tooltip();
-  });
-
-  const redirectURL = (e) => {
-    let coordinate = e.target.id;
-    if (coordinates[coordinate]) {
-      let barcode = data.containers[coordinates[coordinate]].barcode;
-      history.push(`/barcode=${barcode}`);
-    }
-  };
-
-  const allowDrop = (e) => e.preventDefault();
-
-  const drag = (e) => {
-    $('[data-toggle="tooltip"]').tooltip('hide');
-    let container = JSON.stringify(
-      data.containers[coordinates[e.target.id]]
-    );
-    e.dataTransfer.setData('text/plain', container);
-  };
-
-  const drop = (e) => {
-    e.preventDefault();
-    const container = JSON.parse(e.dataTransfer.getData('text/plain'));
-    const newCoordinate = parseInt(e.target.id);
-    container.coordinate = newCoordinate;
-    updateContainer(container, false);
-  };
-
-  const increaseCoordinate = (coordinate) => {
-    const capacity = dimensions.x * dimensions.y * dimensions.z;
-    coordinate++;
-    Object.keys(coordinates).forEach((c) => {
-      if (coordinate > capacity) {
-        clearAll();
-      } else if (c == coordinate) {
-        coordinate++;
-      }
-    });
-    setCurrent('coordinate', coordinate);
-  };
-
-  const setBarcode = (name, barcode) => setCurrent('barcode', barcode);
-
-  const loadContainer = () => {
-    const barcode = current.barcode;
-    const containerId = Object.keys(barcodes)
-    .find((id) => barcodes[id] === barcode);
-
-    if (!containerId) {
-      return;
-    }
-
-    const newContainer = data.containers[containerId];
-    newContainer.parentContainerId = container.id;
-    newContainer.coordinate = current.coordinate;
-
-    updateContainer(newContainer, false)
-    .then(() => {
-      if (current.sequential) {
-        let coordinate = current.coordinate;
-        increaseCoordinate(coordinate);
-        setCurrent('barcode', null);
-      } else {
-        clearAll();
-      }
-    });
-
-    setCurrent('prevCoordinate', newContainer.coordinate);
-  };
-
-  const checkoutContainers = () => {
-    const checkoutList = current.list;
-    const checkoutPromises = Object.values(checkoutList).map((container) => {
-      container.parentContainerId = null;
-      container.coordinate = null;
-      return updateContainer(container, false);
-    });
-
-    Promise.all(checkoutPromises)
-    .then(() => clearAll())
-    .then(() => Swal.fire('Containers Successfully Checked Out!', '', 'success'));
-  };
-
-  let barcodeField;
-  if ((editable||{}).loadContainer) {
-    barcodeField = (
-      <TextboxElement
-        name='barcode'
-        label='Barcode'
-        onUserInput={setBarcode}
-        value={current.barcode}
-        placeHolder='Please Scan or Type Barcode'
-        autoFocus={true}
-      />
-    );
-  }
-
-  let load = (
-    <div className={((editable||{}).loadContainer) ? 'open' : 'closed'}>
-      <FormElement>
-        <StaticElement
-          label='Note'
-          text='Scan Containers to be Loaded. If Sequential is checked,
-           the Coordinate will Auto-Increment after each Load.'
-        />
-        <CheckboxElement
-          name='sequential'
-          label='Sequential'
-          value={current.sequential}
-          onUserInput={setCurrent}
-        />
-        {barcodeField}
-        <ButtonElement
-          label='Load'
-          onUserInput={loadContainer}
-        />
-        <StaticElement
-          text={<a onClick={clearAll} style={{cursor: 'pointer'}}>Cancel</a>}
-        />
-      </FormElement>
-    </div>
-  );
-
-  // place container children in an object
-  let children = {};
-  if ((container||{}).childContainerIds) {
-    Object.values(data.containers).map((c) => {
-      container.childContainerIds.forEach((id) => {
-        if (c.id == id) {
-          children[id] = c;
-        }
-      });
-    });
-  }
-
-  if ((editable||{}).containerCheckout) {
-    // Only children of the current container can be checked out.
-    let barcodes = mapFormOptions(children, 'barcode');
-
-    barcodeField = (
-      <SearchableDropdown
-        name='barcode'
-        label='Barcode'
-        options={barcodes}
-        onUserInput={(name, value) => {
-          value && setCheckoutList(children[value]);
-        }}
-        value={current.containerId}
-        placeHolder='Please Scan or Select Barcode'
-        autoFocus={true}
-      />
-    );
-  }
-
-  let checkout = (
-    <div className={((editable||{}).containerCheckout) ? 'open' : 'closed'}>
-      <FormElement>
-        <StaticElement
-          label='Note'
-          text="Click, Select or Scan Containers to be
-                Unloaded and Press 'Confirm'"
-        />
-        {barcodeField}
-        <ButtonElement
-          label='Confirm'
-          type='button'
-          onUserInput={checkoutContainers}
-        />
-        <StaticElement
-          text={<a onClick={clearAll} style={{cursor: 'pointer'}}>Cancel</a>}
-        />
-      </FormElement>
-    </div>
-
-  );
-
-  // TODO: This will eventually need to be reworked and cleaned up
-  let display;
-  let column = [];
-  let row = [];
-  let coordinate = 1;
-  if (dimensions) {
-    for (let y=1; y <= dimensions.y; y++) {
-      column = [];
-      for (let x=1; x <= dimensions.x; x++) {
-        let nodeWidth = (500/dimensions.x) - (500/dimensions.x * 0.08);
-        let nodeStyle = {width: nodeWidth};
-        let nodeClass = 'node';
-        let tooltipTitle = null;
-        let title = null;
-        let dataHtml = 'false';
-        let dataToggle = null;
-        let dataPlacement = null;
-        let draggable = 'false';
-        let onDragStart = null;
-        let onDragOver = allowDrop;
-        let onDrop = drop;
-        let onClick = null;
-        const optcon = options.container;
-
-        if (!select) {
-          if ((coordinates||{})[coordinate]) {
-            if (!loris.userHasPermission('biobank_specimen_view') &&
-                children[coordinates[coordinate]] === undefined) {
-              nodeClass = 'node forbidden';
-            } else {
-              onClick = redirectURL;
-              if (coordinate in current.list) {
-                nodeClass = 'node checkout';
-              } else if (coordinate == current.prevCoordinate) {
-                nodeClass = 'node new';
-              } else {
-                nodeClass = 'node occupied';
-              }
-
-              dataHtml = 'true';
-              dataToggle = 'tooltip';
-              dataPlacement = 'top';
-              // This is to avoid a console error
-              if (children[coordinates[coordinate]]) {
-                const coord = coordinates[coordinate];
-                tooltipTitle =
-                  '<h5>'+children[coord].barcode+'</h5>' +
-                  '<h5>'+optcon.types[children[coord].typeId].label+'</h5>' +
-                  '<h5>'+optcon.stati[children[coord].statusId].label+'</h5>';
-              }
-              draggable = !loris.userHasPermission(
-                 'biobank_container_update') ||
-                          editable.loadContainer ||
-                          editable.containerCheckout
-                          ? 'false' : 'true';
-              onDragStart = drag;
-
-              if (editable.containerCheckout) {
-                onClick = (e) => {
-                  let container = data.containers[coordinates[e.target.id]];
-                  setCheckoutList(container);
-                };
-              }
-              if (editable.loadContainer) {
-                onClick = null;
-              }
-            }
-            onDragOver = null;
-            onDrop = null;
-          } else if (loris.userHasPermission('biobank_container_update') &&
-                     !editable.containerCheckout) {
-            nodeClass = coordinate == current.coordinate ?
-              'node selected' : 'node load';
-            title = 'Load...';
-            onClick = (e) => {
-              let containerId = e.target.id;
-              edit('loadContainer')
-              .then(() => editContainer(container))
-              .then(() => setCurrent('coordinate', containerId));
-            };
-          }
-        }
-
-        if (select) {
-          if (coordinate == selectedCoordinate) {
-            nodeClass = 'node occupied';
-          } else if (selectedCoordinate instanceof Array &&
-                     selectedCoordinate.includes(coordinate)) {
-            nodeClass = 'node occupied';
-          } else if (!coordinates) {
-            nodeClass = 'node available';
-            onClick = (e) => setContainer('coordinate', e.target.id);
-          } else if (coordinates) {
-            if (!coordinates[coordinate]) {
-              nodeClass = 'node available';
-              onClick = (e) => setContainer('coordinate', e.target.id);
-            } else if (coordinates[coordinate]) {
-              const childContainer = data.containers[coordinates[coordinate]];
-              const specimen = Object.values(data.specimens)
-                .find((specimen) => specimen.containerId == childContainer.id);
-              let quantity = '';
-              if (specimen) {
-                quantity = `<h5>${specimen.quantity +
-                    ' '+options.specimen.units[specimen.unitId].label}</h5>`;
-              }
-              dataHtml = 'true';
-              dataToggle = 'tooltip';
-              dataPlacement = 'top';
-              tooltipTitle =
-                `<h5>${childContainer.barcode}</h5>` +
-                `<h5>${optcon.types[childContainer.typeId].label}</h5>` +
-                quantity +
-                `<h5>${optcon.stati[childContainer.statusId].label}</h5>`;
-            }
-          }
-        }
-
-        let coordinateDisplay;
-        if (dimensions.xNum == 1 && dimensions.yNum == 1) {
-          coordinateDisplay = x + (dimensions.x * (y-1));
-        } else {
-          const xVal = dimensions.xNum == 1 ? x : String.fromCharCode(64+x);
-          const yVal = dimensions.yNum == 1 ? y : String.fromCharCode(64+y);
-          coordinateDisplay = yVal+''+xVal;
-        }
-
-        column.push(
-          <div
-            key={x}
-            id={coordinate}
-            title={title}
-            className={nodeClass}
-            data-html={dataHtml}
-            data-toggle={dataToggle}
-            data-placement={dataPlacement}
-            data-original-title={tooltipTitle}
-            style={nodeStyle}
-            onClick={onClick}
-            draggable={draggable}
-            onDragStart={onDragStart}
-            onDragOver={onDragOver}
-            onDrop={onDrop}
-          >
-            {coordinateDisplay}
-          </div>
-        );
-
-        coordinate++;
-      }
-
-      let rowHeight = (500/dimensions.y) - (500/dimensions.y * 0.08);
-      // let rowMargin = (500/dimensions.y * 0.04);
-      let rowStyle = {height: rowHeight};
-
-      row.push(
-        <div key={y} className='row' style={rowStyle}>{column}</div>
-      );
-    }
-
-    display = row;
-  }
-
-  return (
-    <div>
-      <div style={{width: 500}}>
-        {checkout}
-        {load}
-      </div>
-      <div className='display'>
-        {display}
-      </div>
-    </div>
-  );
-}
-
-ContainerDisplay.defaultProps = {
-  current: {},
-};
-
-export default ContainerDisplay;
diff --git a/jsx/containerForm.js b/jsx/containerForm.js
deleted file mode 100644
index 535020c5..00000000
--- a/jsx/containerForm.js
+++ /dev/null
@@ -1,206 +0,0 @@
-import React, {Component} from 'react';
-
-import Modal from 'Modal';
-import {ListForm, ListItem} from './listForm.js';
-import {clone, mapFormOptions} from './helpers.js';
-
-/**
- * Container Form
- *
- **/
-
-const initialState = {
-  current: {},
-  list: {},
-  errors: {list: {}},
-};
-
-/**
- * A form for editing Containers in the Biobank
- */
-class ContainerForm extends Component {
-  /**
-   * Constructor
-   */
-  constructor() {
-    super();
-    this.state = initialState;
-    this.setCurrent = this.setCurrent.bind(this);
-    this.setList = this.setList.bind(this);
-    this.handleSubmit = this.handleSubmit.bind(this);
-  }
-
-  /**
-   * Set the current container being displayed
-   *
-   * @param {string} name - the name of the container
-   * @param {string} value - the value
-   */
-  setCurrent(name, value) {
-    const {current} = clone(this.state);
-    current[name] = value;
-    this.setState({current});
-  }
-
-  /**
-   * Sets a list in the container state
-   *
-   * @param {object} list - the state to set
-   */
-  setList(list) {
-    this.setState({list});
-  }
-
-  /**
-   * Handle submission of a form by calling onSubmit callback
-   *
-   * @return {Promise}
-   */
-  handleSubmit() {
-    const {list, current, errors} = this.state;
-    return new Promise((resolve, reject) => {
-      this.props.onSubmit(list, current, errors)
-      .then(() => resolve(), (errors) => this.setState({errors}, reject()));
-    });
-  }
-
-  /**
-   * Render React component
-   *
-   * @return {JSX}
-   */
-  render() {
-    const {current, errors, list} = this.state;
-    const {options, show} = this.props;
-    const handleClose = () => this.setState(initialState, this.props.onClose);
-    return (
-      <Modal
-        title='Add New Container'
-        show={show}
-        onClose={handleClose}
-        onSubmit={this.handleSubmit}
-        throwWarning={true}
-      >
-        <FormElement>
-          <div className="row">
-            <div className="col-xs-11">
-              <SelectElement
-                name="projectIds"
-                label="Project"
-                options={options.projects}
-                onUserInput={this.setCurrent}
-                required={true}
-                multiple={true}
-                emptyOption={false}
-                value={current.projectIds}
-                errorMessage={(errors.container||{}).projectIds}
-              />
-              <SelectElement
-                name="centerId"
-                label="Site"
-                options={options.centers}
-                onUserInput={this.setCurrent}
-                required={true}
-                value={current.centerId}
-                errorMessage={(errors.container||{}).centerId}
-              />
-            </div>
-          </div>
-          <ListForm
-            list={list}
-            errors={errors.list}
-            setList={this.setList}
-            listItem={{}}
-          >
-            <ContainerSubForm options={options}/>
-          </ListForm>
-        </FormElement>
-      </Modal>
-    );
-  }
-}
-
-ContainerForm.propTypes = {
-};
-
-/**
- * Container Barcode Form
- *
- * Acts a subform for ContainerForm
- **/
-class ContainerSubForm extends Component {
-  /**
-   * Constructor
-   */
-  constructor() {
-    super();
-
-    this.setContainer = this.setContainer.bind(this);
-  }
-
-  /**
-   * Set a value in the container
-   *
-   * @param {string} name - key name in list
-   * @param {string} value - value in list
-   */
-  setContainer(name, value) {
-    this.props.setListItem(name, value, this.props.itemKey);
-  }
-
-  /**
-   * Render React component
-   *
-   * @return {JSX}
-   */
-  render() {
-    const {item, errors, options} = this.props;
-
-    const containerTypesNonPrimary = mapFormOptions(
-      options.container.typesNonPrimary, 'label'
-    );
-    return (
-      <ListItem {...this.props}>
-        <TextboxElement
-          name='barcode'
-          label='Barcode'
-          onUserInput={this.setContainer}
-          required={true}
-          value={item.barcode}
-          errorMessage={errors.barcode}
-        />
-        <SelectElement
-          name='typeId'
-          label='Container Type'
-          options={containerTypesNonPrimary}
-          onUserInput={this.setContainer}
-          required={true}
-          value={item.typeId}
-          errorMessage={errors.typeId}
-        />
-        <TextboxElement
-          name='lotNumber'
-          label='Lot Number'
-          onUserInput={this.setContainer}
-          value={item.lotNumber}
-          errorMessage={errors.lotNumber}
-        />
-        <DateElement
-          name='expirationDate'
-          label='Expiration Date'
-          onUserInput={this.setContainer}
-          value={item.expirationDate}
-          errorMessage={errors.expirationDate}
-        />
-      </ListItem>
-    );
-  }
-}
-
-ContainerSubForm.propTypes = {
-};
-
-ContainerSubForm.defaultProps = {
-};
-
-export default ContainerForm;
diff --git a/jsx/containerParentForm.js b/jsx/containerParentForm.js
deleted file mode 100644
index 9162fa66..00000000
--- a/jsx/containerParentForm.js
+++ /dev/null
@@ -1,124 +0,0 @@
-import React from 'react';
-import ContainerDisplay from './containerDisplay';
-import PropTypes from 'prop-types';
-
-import {clone} from './helpers';
-
-/**
- * Biobank Container Parent Form
- *
- * Fetches data from Loris backend and displays a form allowing
- * to specimen a biobank file attached to a specific instrument
- *
- * @param {object} props
- * @return {*}
- **/
-function ContainerParentForm(props) {
-  const {data, current, options} = props;
-  // TODO: there might be a better way to do this.
-  const setInheritedProperties = (name, containerId) => {
-    if (!containerId) {
-      return;
-    }
-
-    const parentContainer = data.containers[containerId];
-    const container = clone(current.container);
-    container.parentContainerId = parentContainer.id;
-    container.coordinate = null;
-    container.temperature = parentContainer.temperature;
-    container.centerId = parentContainer.centerId;
-    container.statusId = parentContainer.statusId;
-
-    props.setCurrent('container', container);
-  };
-
-  const removeChildContainers = (object, id) => {
-    delete object[id];
-    for (let key in data.containers) {
-      if (id == data.containers[key].parentContainerId) {
-        object = removeChildContainers(object, key);
-      }
-    }
-    return object;
-  };
-
-  let containerBarcodesNonPrimary = Object.values(data.containers)
-  .reduce((result, container) => {
-    if (options.container.types[container.typeId].primary == 0) {
-      const dimensions = options.container.dimensions[data.containers[
-        container.id
-      ].dimensionId];
-      const capacity = dimensions.x * dimensions.y * dimensions.z;
-      const available = capacity - container.childContainerIds.length;
-      result[container.id] = container.barcode +
-           ' (' +available + ' Available Spots)';
-    }
-    return result;
-  }, {});
-
-  // Delete child containers from options if a container is being placed in a
-  // another container.
-  if (props.container) {
-    containerBarcodesNonPrimary = removeChildContainers(
-      containerBarcodesNonPrimary,
-      props.container.id
-    );
-  }
-
-  const renderContainerDisplay = () => {
-    if (!(current.container.parentContainerId && props.display)) {
-      return;
-    }
-
-    const coordinates = data.containers[
-      current.container.parentContainerId
-    ].childContainerIds
-    .reduce((result, id) => {
-      const container = data.containers[id];
-      if (container.coordinate) {
-        result[container.coordinate] = id;
-      }
-      return result;
-    }, {});
-
-    return (
-      <ContainerDisplay
-        container={props.container}
-        data={data}
-        dimensions={options.container.dimensions[data.containers[
-          current.container.parentContainerId
-        ].dimensionId]}
-        coordinates={coordinates}
-        parentContainerId={current.container.parentContainerId}
-        options={options}
-        select={true}
-        selectedCoordinate={current.container.coordinate}
-        setContainer={props.setContainer}
-      />
-    );
-  };
-
-  return (
-    <div className='row'>
-      <div className="col-lg-11">
-        <SearchableDropdown
-          name="parentContainerId"
-          label="Parent Container Barcode"
-          options={containerBarcodesNonPrimary}
-          onUserInput={setInheritedProperties}
-          value={current.container.parentContainerId}
-        />
-      </div>
-      {renderContainerDisplay()}
-    </div>
-  );
-}
-
-ContainerParentForm.propTypes = {
-  setContainer: PropTypes.func.isRequired,
-  data: PropTypes.object,
-  container: PropTypes.object.isRequired,
-  options: PropTypes.object.isRequired,
-};
-
-export default ContainerParentForm;
diff --git a/jsx/containerTab.js b/jsx/containerTab.js
deleted file mode 100644
index 58e7e987..00000000
--- a/jsx/containerTab.js
+++ /dev/null
@@ -1,230 +0,0 @@
-import React, {Component} from 'react';
-import {Link} from 'react-router-dom';
-
-import FilterableDataTable from 'FilterableDataTable';
-import Search from './search';
-import ContainerForm from './containerForm';
-import {mapFormOptions, clone} from './helpers.js';
-
-/**
- * React component for the Container tab in the Biobank module
- */
-class ContainerTab extends Component {
-  /**
-   * Constructor
-   */
-  constructor() {
-    super();
-
-    this.state = {editable: {}};
-    this.edit = this.edit.bind(this);
-    this.clearEditable = this.clearEditable.bind(this);
-    this.mapContainerColumns = this.mapContainerColumns.bind(this);
-    this.formatContainerColumns = this.formatContainerColumns.bind(this);
-  }
-
-  /**
-   * Mark a key as editable
-   *
-   * @param {string} stateKey - the key
-   *
-   * @return {Promise}
-   */
-  edit(stateKey) {
-    const {editable} = clone(this.state);
-    editable[stateKey] = true;
-    return new Promise((res) => this.setState({editable}, res()));
-  }
-
-  /**
-   * Clear the editable state of this form.
-   */
-  clearEditable() {
-    this.setState({editable: {}});
-  }
-
-  /**
-   * Map the columns for this container
-   *
-   * @param {string} column - the column name
-   * @param {string} value - the column value
-   *
-   * @return {string}
-   */
-  mapContainerColumns(column, value) {
-    switch (column) {
-      case 'Type':
-        return this.props.options.container.types[value].label;
-      case 'Status':
-        return this.props.options.container.stati[value].label;
-      case 'Projects':
-        return value.map((id) => this.props.options.projects[id]);
-      case 'Site':
-        return this.props.options.centers[value];
-      default:
-        return value;
-    }
-  }
-
-  /**
-   * Format the cells for a column in the container
-   *
-   * @param {string} column - the column name to format
-   * @param {string} value - the value of the column
-   * @param {object} row - the rest of the row
-   *
-   * @return {JSX} a table cell
-   */
-  formatContainerColumns(column, value, row) {
-    value = this.mapContainerColumns(column, value);
-    switch (column) {
-      case 'Barcode':
-        return <td><Link to={`/barcode=${value}`}>{value}</Link></td>;
-      case 'Status':
-        const style = {};
-        switch (value) {
-          case 'Available':
-            style.color = 'green';
-            break;
-          case 'Reserved':
-            style.color = 'orange';
-            break;
-          case 'Dispensed':
-            style.color = 'red';
-            break;
-          case 'Discarded':
-            style.color = 'red';
-            break;
-        }
-        return <td style={style}>{value}</td>;
-      case 'Projects':
-        return <td>{value.join(', ')}</td>;
-      case 'Parent Barcode':
-        return <td><Link to={`/barcode=${value}`}>{value}</Link></td>;
-      default:
-        return <td>{value}</td>;
-    }
-  }
-
-  /**
-   * Render React component
-   *
-   * @return {JSX}
-   */
-  render() {
-    const {editable} = this.state;
-
-    const stati = mapFormOptions(
-      this.props.options.container.stati, 'label'
-    );
-    const containerTypesNonPrimary = mapFormOptions(
-      this.props.options.container.typesNonPrimary, 'label'
-    );
-    const containersNonPrimary = Object.values(this.props.data.containers)
-      .reduce((result, container) => {
-        // TODO: this check is necessary or else the page will go blank when the
-        // first specimen is added.
-        if (container) {
-          const tprops = this.props.options.container.types;
-          if (tprops[container.typeId].primary == 0) {
-            result[container.id] = container;
-          }
-          return result;
-        }
-      }, {});
-    const barcodesNonPrimary = mapFormOptions(
-      containersNonPrimary, 'barcode'
-    );
-
-    const data = Object.values(containersNonPrimary).map(
-      (container) => {
-        return [
-          container.barcode,
-          container.typeId,
-          container.statusId,
-          container.projectIds,
-          container.centerId,
-          container.parentContainerId ?
-            this.props.data.containers[container.parentContainerId].barcode :
-            null,
-        ];
-      }
-    );
-
-    const fields = [
-      {label: 'Barcode', show: true, filter: {
-        name: 'barcode',
-        type: 'text',
-      }},
-      {label: 'Type', show: true, filter: {
-        name: 'type',
-        type: 'select',
-        options: containerTypesNonPrimary,
-      }},
-      {label: 'Status', show: true, filter: {
-        name: 'status',
-        type: 'select',
-        options: stati,
-      }},
-      {label: 'Projects', show: true, filter: {
-        name: 'project',
-        type: 'multiselect',
-        options: this.props.options.projects,
-      }},
-      {label: 'Site', show: true, filter: {
-        name: 'currentSite',
-        type: 'select',
-        options: this.props.options.centers,
-      }},
-      {label: 'Parent Barcode', show: true, filter: {
-        name: 'parentBarcode',
-        type: 'text',
-      }},
-    ];
-
-    const openSearchContainer = () => this.edit('searchContainer');
-    const openContainerForm = () => this.edit('containerForm');
-    const actions = [
-      {
-        name: 'goToContainer',
-        label: 'Go To Container',
-        action: openSearchContainer,
-      },
-      {
-        name: 'addContainer',
-        label: 'Add Container',
-        action: openContainerForm,
-      },
-    ];
-
-    return (
-      <div>
-        <FilterableDataTable
-          name='container'
-          data={data}
-          fields={fields}
-          actions={actions}
-          getFormattedCell={this.formatContainerColumns}
-          getMappedCell={this.mapContainerColumns}
-          progress={this.props.loading}
-        />
-        <Search
-          title='Go To Container'
-          show={editable.searchContainer}
-          onClose={this.clearEditable}
-          barcodes={barcodesNonPrimary}
-          history={this.props.history}
-        />
-        {loris.userHasPermission('biobank_container_create') ?
-        <ContainerForm
-          options={this.props.options}
-          show={editable.containerForm}
-          onClose={this.clearEditable}
-          onSubmit={this.props.createContainers}
-        /> : null}
-      </div>
-    );
-  }
-}
-
-export default ContainerTab;
diff --git a/jsx/contexts/BarcodePageContext.tsx b/jsx/contexts/BarcodePageContext.tsx
new file mode 100644
index 00000000..92fe6603
--- /dev/null
+++ b/jsx/contexts/BarcodePageContext.tsx
@@ -0,0 +1,34 @@
+import React, { createContext, ReactNode } from 'react';
+import { useEditable } from '../hooks';
+
+// TODO: bring context to another file:                                         
+interface BarcodePageContextType {                                              
+  editable: Record<string, boolean>,                                            
+  edit?: (name: string) => void,                                                
+  clear?: () => void,                                                           
+}                                                                               
+                                                                                
+// TODO: I really don't like this 'default value'                               
+const defaultValue: BarcodePageContextType = {                                  
+  editable: {},                                                                 
+  edit: () => {},                                                              
+  clear: () => {},                                                             
+}                                                                               
+
+const BarcodePageContext = React.createContext<BarcodePageContextType>(defaultValue);
+
+interface BarcodePageProviderProps {
+  children: ReactNode;
+}
+
+export const BarcodePageProvider: React.FC<BarcodePageProviderProps> = ({ children }) => {
+  const {editable, edit, clear} = useEditable();
+
+  return (
+    <BarcodePageContext.Provider value={{ editable, edit, clear }}>
+      {children}
+    </BarcodePageContext.Provider>
+  );
+};
+                                                                                
+export default BarcodePageContext;
diff --git a/jsx/contexts/BiobankContext.tsx b/jsx/contexts/BiobankContext.tsx
new file mode 100644
index 00000000..38e6a8f3
--- /dev/null
+++ b/jsx/contexts/BiobankContext.tsx
@@ -0,0 +1,70 @@
+import React, { createContext, useCallback, ReactNode } from 'react';
+import { ISpecimen, IContainer, IPool, IShipment } from '../entities';
+import {                                                                        
+  SpecimenAPI,                                                                  
+  ContainerAPI,                                                                 
+  PoolAPI,                                                                      
+  ShipmentAPI                                                                   
+} from '../APIs'; 
+import { useRequest, useStream, Stream } from '../hooks';
+
+export enum EntityType {
+  Containers = 'containers',
+  Specimens = 'specimens',
+  Pools = 'pools',
+  Shipments = 'shipments',
+}
+
+export interface BiobankContextType {
+  containers: Stream<IContainer>;
+  specimens: Stream<ISpecimen>;
+  pools: Stream<IPool>;
+  shipments: Stream<IShipment>;
+  updateEntity: (type: EntityType, id: string, newEntity: any) => void;
+  updateEntities: (type: EntityType, newEntities: Record<string, any>) => void;
+  initializeEntity: (type: EntityType) => void;
+}
+
+const BiobankContext = React.createContext<BiobankContextType | null>(null);
+
+export const BiobankProvider = ({
+  children
+}: { children: ReactNode } ) => {
+  const streams = {
+    [EntityType.Containers]: useStream(new ContainerAPI()),
+    [EntityType.Specimens]: useStream(new SpecimenAPI()),
+    [EntityType.Pools]: useStream(new PoolAPI()),
+    [EntityType.Shipments]: useStream(new ShipmentAPI()),
+  };
+
+  const updateEntity = useCallback((type: EntityType, id: string, newEntity: any) => {
+    const stream = streams[type];
+    if (stream && stream.data) {
+      stream.data = { ...stream.data, [id]: newEntity };
+    }
+  }, [streams]);
+
+  const updateEntities = useCallback((type: EntityType, newEntities: Record<string, any>) => {
+    const stream = streams[type];
+    if (stream) {
+      stream.data = newEntities;
+    }
+  }, [streams]);
+
+  const initializeEntity = useCallback((type: EntityType) => {
+    const stream = streams[type];
+    if (stream && !stream.initialized) {
+      stream.initialize();
+    }
+  }, [streams]);
+
+  return (
+    <BiobankContext.Provider
+      value={{ ...streams, updateEntity, updateEntities, initializeEntity }}
+    >
+      {children}
+    </BiobankContext.Provider>
+  );
+};
+                                                                                
+export default BiobankContext;
diff --git a/jsx/contexts/index.ts b/jsx/contexts/index.ts
new file mode 100644
index 00000000..11dafcea
--- /dev/null
+++ b/jsx/contexts/index.ts
@@ -0,0 +1,2 @@
+export { default as BarcodePageContext, BarcodePageProvider } from './BarcodePageContext';
+export { default as BiobankContext, EntityType, BiobankProvider, BiobankContextType } from './BiobankContext';
diff --git a/jsx/customFields.js b/jsx/customFields.js
deleted file mode 100644
index 3c753e37..00000000
--- a/jsx/customFields.js
+++ /dev/null
@@ -1,105 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-
-/**
- * Biobank Custom Attribute Fields
- *
- * @param {object} props
- * @return {*}
- */
-function CustomFields(props) {
-  const {options, errors, fields, object} = props;
-
-  return Object.keys(fields).map((attribute, key) => {
-    const datatype = options.specimen.attributeDatatypes[
-        fields[attribute]['datatypeId']
-      ].datatype;
-    if (datatype === 'text' || datatype === 'number') {
-      return (
-        <TextboxElement
-          key={key}
-          name={attribute}
-          label={fields[attribute].label}
-          onUserInput={props.setData}
-          required={fields[attribute].required}
-          value={object[attribute]}
-          errorMessage={errors[attribute]}
-        />
-      );
-    }
-
-    if (datatype === 'date') {
-      return (
-        <DateElement
-          key={key}
-          name={attribute}
-          label={fields[attribute].label}
-          onUserInput={props.setData}
-          required={fields[attribute].required}
-          value={object[attribute]}
-          errorMessage={errors[attribute]}
-        />
-      );
-    }
-
-    if (datatype === 'time') {
-      return (
-        <TimeElement
-          key={key}
-          name={attribute}
-          label={fields[attribute].label}
-          onUserInput={props.setData}
-          required={fields[attribute].required}
-          value={object[attribute]}
-          errorMessage={errors[attribute]}
-        />
-      );
-    }
-
-    if (datatype === 'boolean') {
-      // TODO: delete the following line.
-      // object[attribute] == null && props.setData(attribute, false);
-      return (
-        <CheckboxElement
-          key={key}
-          name={attribute}
-          label={fields[attribute].label}
-          onUserInput={props.setData}
-          required={fields[attribute].required}
-          value={object[attribute]}
-          errorMessage={errors[attribute]}
-        />
-      );
-    }
-
-    // Do not present the possibility of uploading if file is already set
-    // File must instead be deleted or overwritten.
-    if (datatype === 'file' && !(props.data||{})[attribute]) {
-      return (
-        <FileElement
-          key={key}
-          name={attribute}
-          label={fields[attribute].label}
-          onUserInput={props.setData}
-          required={fields[attribute].required}
-          value={props.current.files[object[attribute]]}
-          errorMessage={errors[attribute]}
-        />
-      );
-    }
-  });
-}
-
-CustomFields.propTypes = {
-  fields: PropTypes.object.isRequired,
-  options: PropTypes.object.isRequired,
-  object: PropTypes.object.isRequired,
-  setData: PropTypes.func.isRequired,
-  errors: PropTypes.object,
-};
-
-CustomFields.defaultProps = {
-  errors: {},
-};
-
-export default CustomFields;
diff --git a/jsx/entities/Entity.ts b/jsx/entities/Entity.ts
new file mode 100644
index 00000000..3d64d4c4
--- /dev/null
+++ b/jsx/entities/Entity.ts
@@ -0,0 +1,101 @@
+export abstract class Entity<I extends object> {                                           
+  protected data: Partial<I>;                                                            
+  protected initialData: Partial<I>;                                                     
+  public errors: Partial<Record<keyof I, string>> = {};                                
+                                                                                
+  constructor(initialData: Partial<I>) {                                                 
+    this.data = initialData;                                                    
+    this.initialData = initialData;                                             
+  }                                                                             
+
+  protected clone(newData: Partial<I> = {}): this {
+    const clone = Object.create(Object.getPrototypeOf(this));
+    Object.assign(clone, this); // Copy all properties
+    clone.data = { ...this.data, ...newData }; // Update data with newData
+    return clone;
+  }  
+
+  // Example initialization method that you might define in your class
+  protected initialize(data: Partial<I>): void {
+    this.data = data;
+    // Initialize or copy other properties as necessary
+  }
+                                                                                
+  // Abstract method to perform validation. Subclasses must implement this.     
+  abstract validate(): Partial<Record<keyof I, string>>;                                  
+
+  // Method to update a property in an immutable way.                           
+  set(key: keyof I, value: I[keyof I]): this {                      
+    return this.clone({...this.data, [key]: value});                                         
+  }                                                                             
+
+  // Method to remove a property in an immutable way.                           
+  remove(key: keyof I): this {                                
+    const { [key]: _, ...rest } = this.data;                                    
+    return this.clone(rest as I);                                       
+  }                                                                             
+
+  replace(data: Partial<I>): this {
+    return this.clone(data);
+  }
+
+  // Method to clear the data in an immutable way.                              
+  clear(): this {                                                          
+    return this.clone();                                         
+  }                                                                             
+                                                                                
+  // Method to reset the data to its initial state in an immutable way.         
+  reset(): this {                                                          
+    return this.clone(this.initialData);                                
+  }                                                                             
+                                                                                
+  // Method to get the current state of data.                                   
+  getData(): Partial<I> {                                                                
+    return this.data;                                                           
+  }                                                                             
+
+  // Set errors after validation
+  setErrors(errors: Partial<Record<keyof I, string>>): this {
+    const clone = this.clone(); // Create a new clone
+    clone.errors = errors; // Set the errors on the clone
+    return clone; // Return the new entity with errors
+  }
+                                                                                
+  // Method to get the current errors.                                          
+  getErrors(): Partial<Record<keyof I, string>> {
+    return this.errors;                                                         
+  }                                                                             
+}
+
+  // protected addToArray(key: keyof I, newValue: any): this {
+  //   if (!Array.isArray(this.data[key])) {
+  //     throw new Error(`${String(key)} is not an array.`);
+  //   }
+
+  //   const newArray = [...this.data[key], newValue];
+
+  //   return this.clone({ ...this.data, [key]: newArray });
+  // }
+
+  // // Generic method to update arrays in an immutable way
+  // protected updateArray(key: keyof I, index: number, newValue: any): this {
+  //   if (!Array.isArray(this.data[key])) {
+  //       throw new Error(`${key.toString()} is not an array.`);
+  //   }
+
+  // // Create a new array with the specified value updated at the given index
+  //   const newArray = this.data[key].map((item, idx) => idx === index ? newValue : item);
+  //   return this.clone({ ...this.data, [key]: newArray });
+  // }
+
+  // protected removeFromArray(key: keyof I, index: number): this {
+  //   if (!Array.isArray(this.data[key])) {
+  //     throw new Error(`${String(key)} is not an array.`);
+  //   }
+
+  //   const newArray = this.data[key].filter((_, idx) => idx !== index);
+
+  //   return this.clone({ ...this.data, [key]: newArray });
+  // }
+                                                                                
+    
diff --git a/jsx/entities/candidate/candidate.interfaces.ts b/jsx/entities/candidate/candidate.interfaces.ts
new file mode 100644
index 00000000..0735b49a
--- /dev/null
+++ b/jsx/entities/candidate/candidate.interfaces.ts
@@ -0,0 +1,7 @@
+export interface ICandidate {                                                            
+  id: number,                                                                   
+  label: string,                                                       
+  sex: string,                                                             
+  age: string,                                                                 
+  diagnosisIds: string[],                                                                
+}; 
diff --git a/jsx/entities/candidate/index.ts b/jsx/entities/candidate/index.ts
new file mode 100644
index 00000000..7a0fafb9
--- /dev/null
+++ b/jsx/entities/candidate/index.ts
@@ -0,0 +1 @@
+export * from './candidate.interfaces';                                               
diff --git a/jsx/entities/center/center.interfaces.ts b/jsx/entities/center/center.interfaces.ts
new file mode 100644
index 00000000..bce3efef
--- /dev/null
+++ b/jsx/entities/center/center.interfaces.ts
@@ -0,0 +1,4 @@
+export interface ICenter {                                                            
+  id: number,                                                                   
+  label: string,                                                       
+}; 
diff --git a/jsx/entities/center/index.ts b/jsx/entities/center/index.ts
new file mode 100644
index 00000000..d2057b6d
--- /dev/null
+++ b/jsx/entities/center/index.ts
@@ -0,0 +1 @@
+export * from './center.interfaces';                                               
diff --git a/jsx/entities/container/Container.ts b/jsx/entities/container/Container.ts
new file mode 100644
index 00000000..d420cd8b
--- /dev/null
+++ b/jsx/entities/container/Container.ts
@@ -0,0 +1,71 @@
+import { IContainer } from './';                                                      
+import { ContainerAPI } from '../../APIs';
+import { Entity } from '../';
+                                                                                
+export class Container extends Entity<IContainer> {                                         
+  constructor(initialData: Partial<IContainer>) {
+    super(initialData);                                                         
+  }                                                                             
+                                                                                
+  validate() {
+    let errors: { [key: string]: string } = {};
+
+    const required = [
+      'barcode',
+      'type',
+      'temperature',
+      // 'status',
+      'center',
+    ];
+
+    const float = ['temperature'];
+    console.log(this);
+
+    // Check required fields
+    required.forEach((field) => {
+      const value = this.data[field];
+      if (value === undefined || (typeof value === 'string' && !value.trim())) {
+        errors[field] = 'This field is required!';
+      }
+    });
+
+    // Validate floating-point fields
+    float.forEach((field) => {
+      const value = parseFloat(this.data[field]);
+      if (isNaN(value) || value === Math.trunc(value)) {
+        errors[field] = 'This field must be a floating-point number!';
+      }
+    });    
+ 
+    // const barcodeSet = new Set(this.state.data.containers.map(c => c.id !== container.id && c.barcode));
+    // if (barcodeSet.has(container.barcode)) {
+    //     errors.barcode = 'Barcode must be unique.';
+    // }
+
+    console.log(errors);
+ 
+    return errors;
+  }
+
+  /**
+   * Recursively retrieves the barcodes of a container and its parent containers.
+   *
+   * @param {string} container - The container to start from.
+   * @param {string[]} barcodes - Accumulator for barcodes. Defaults to empty.
+   * @returns {string[]} - Array of barcodes from the given container upwards.
+   */
+  async getParentContainerBarcodes(
+    barcode: string = '',
+    barcodes: string[] = []
+  ): Promise<string[]> {
+
+    const currentContainer = await ContainerAPI.getById(barcode);
+    barcodes.push(currentContainer.barcode);
+
+    if (currentContainer.parentContainerBarcode) {
+      await this.getParentContainerBarcodes(currentContainer.parentContainerBarcode, barcodes);
+    }
+
+    return barcodes.reverse();
+  }
+}      
diff --git a/jsx/entities/container/ContainerContext.tsx b/jsx/entities/container/ContainerContext.tsx
new file mode 100644
index 00000000..422d140f
--- /dev/null
+++ b/jsx/entities/container/ContainerContext.tsx
@@ -0,0 +1,28 @@
+import { createContext, useContext, ReactNode } from 'react';
+import { ContainerHook } from './';
+
+const ContainerContext = createContext<ContainerHook | null>(null);
+
+interface ContainerProviderProps {
+  container: ContainerHook;
+  children?: ReactNode;
+}
+
+export const ContainerProvider = ({                                                 
+  children,                                                                        
+  container                                                                         
+}: ContainerProviderProps): JSX.Element => {   
+  return (
+    <ContainerContext.Provider value={container}>
+      {children}
+    </ContainerContext.Provider>
+  );
+};
+
+export const useContainerContext = (): ContainerHook => {
+  const context = useContext(ContainerContext);
+  if (context === null) {
+    throw new Error('useContainerContext must be used within a ContainerProvider');
+  }
+  return context;
+};
diff --git a/jsx/entities/container/container.interfaces.ts b/jsx/entities/container/container.interfaces.ts
new file mode 100644
index 00000000..c0dce81d
--- /dev/null
+++ b/jsx/entities/container/container.interfaces.ts
@@ -0,0 +1,44 @@
+import {
+  ICenter,        
+  IUnit,
+  IShipment
+} from '../';
+
+export type IDimension = {                                                       
+  y: number,                                                                    
+  x: number,                                                                    
+  z: number,                                                                    
+  xNum: boolean,                                                                 
+  yNum: boolean,                                                                 
+  zNum: boolean,                                                                 
+}; 
+
+export type ICapacity = {
+  quantity: number,
+  unit: IUnit,  
+}
+
+export type IContainerType = {
+  label: string,
+  brand: string,
+  productNumber: string,
+  dimension: IDimension,
+  capacity: ICapacity,  
+}
+
+export interface IContainer {                                    
+  id: string,                                                                  
+  barcode: string,                                                             
+  center: Partial<ICenter>,                                                            
+  children?: IContainer[],
+  comments?: string,                                                            
+  coordinate?: number,                                                          
+  dimension: IDimension,                                                         
+  expirationDate?: string,                                                      
+  lotNumber?: string,                                                           
+  parent?: IContainer,                                              
+  shipments?: IShipment[],                                                  
+  status?: string,                                                            
+  temperature: number,                                                         
+  type: IContainerType,                                                              
+};     
diff --git a/jsx/entities/container/index.ts b/jsx/entities/container/index.ts
new file mode 100644
index 00000000..cc1c8cf0
--- /dev/null
+++ b/jsx/entities/container/index.ts
@@ -0,0 +1,4 @@
+export * from './container.interfaces';                                               
+export * from './useContainer';                                                      
+export * from './Container';   
+export * from './ContainerContext';
diff --git a/jsx/entities/container/useContainer.ts b/jsx/entities/container/useContainer.ts
new file mode 100644
index 00000000..ab2baa0e
--- /dev/null
+++ b/jsx/entities/container/useContainer.ts
@@ -0,0 +1,11 @@
+import { useEntity, EntityHook } from '../';
+import { IContainer, Container } from './';
+
+export interface ContainerHook extends EntityHook<Container, IContainer> {
+}
+
+export function useContainer(
+  initContainer: Container
+): ContainerHook {
+  return useEntity<Container, IContainer>(initContainer);
+}
diff --git a/jsx/entities/container/useContainerById.ts b/jsx/entities/container/useContainerById.ts
new file mode 100644
index 00000000..e59e7e6b
--- /dev/null
+++ b/jsx/entities/container/useContainerById.ts
@@ -0,0 +1,37 @@
+import { useState, useEffect } from 'react';
+import { ContainerAPI } from '../APIs'; // Assume this is your API module
+import { useContainer } from '../hooks'; // Your existing useContainer hook
+
+// A custom hook that fetches container data by ID and initializes it with useContainer
+export function useContainerById(barcode) {
+  const [loading, setLoading] = useState(true);
+  const [error, setError] = useState(null);
+  const [data, setData] = useState(null);
+
+  useEffect(() => {
+    async function fetchAndInitializeContainer() {
+      try {
+        setLoading(true);
+        const fetchedData = await new ContainerAPI().getById(barcode);
+        // Assuming fetchedData is directly usable as container state or
+        // perform any transformation if needed
+        setData(fetchedData);
+      } catch (err) {
+        setError(err);
+      } finally {
+        setLoading(false);
+      }
+    }
+
+    if (barcode) {
+      fetchAndInitializeContainer();
+    }
+  }, [barcode]);
+
+  // Use the fetched data to initialize the container state with your useContainer hook
+  // This step assumes useContainer can handle `null` or uninitialized data gracefully
+  // until the actual container data is fetched
+  const [container, containerHandler] = useContainer(new Container(data));
+
+  return { container, containerHandler, loading, error };
+}
diff --git a/jsx/entities/examiner/examiner.interfaces.ts b/jsx/entities/examiner/examiner.interfaces.ts
new file mode 100644
index 00000000..bc120c14
--- /dev/null
+++ b/jsx/entities/examiner/examiner.interfaces.ts
@@ -0,0 +1,4 @@
+export interface IExaminer {                                                            
+  id: number,                                                                   
+  label: string,                                                       
+}; 
diff --git a/jsx/entities/examiner/index.ts b/jsx/entities/examiner/index.ts
new file mode 100644
index 00000000..7062d95e
--- /dev/null
+++ b/jsx/entities/examiner/index.ts
@@ -0,0 +1 @@
+export * from './examiner.interfaces';                                               
diff --git a/jsx/entities/index.ts b/jsx/entities/index.ts
new file mode 100644
index 00000000..e53195ec
--- /dev/null
+++ b/jsx/entities/index.ts
@@ -0,0 +1,14 @@
+export * from './Entity';                                                 
+export * from './useEntity';                                                   
+export * from './useEntities';                                               
+export * from './specimen';                                               
+export * from './container';                                               
+export * from './pool';                                               
+export * from './shipment';                                               
+export * from './session';                                               
+export * from './candidate';                                               
+export * from './center';                                               
+export * from './examiner';                                               
+export * from './project';                                               
+export * from './unit';                                               
+export * from './user';                                               
diff --git a/jsx/entities/pool/Pool.ts b/jsx/entities/pool/Pool.ts
new file mode 100644
index 00000000..51ce6868
--- /dev/null
+++ b/jsx/entities/pool/Pool.ts
@@ -0,0 +1,42 @@
+import { IPool } from './';
+import { Entity } from '../';
+
+export class Pool extends Entity<IPool> {                                         
+  constructor(initialData: Partial<IPool>) {                                              
+    super(initialData);                                                         
+  }                                                                             
+                                                                                
+  validate() {                                          
+    const errors: Partial<Record<keyof IPool, string>> = {};                                  
+    if (!this.data.label) {                                                     
+      errors.label = 'Label is required.';                                      
+    }                                                                           
+    // Add more validations as needed                                           
+    return errors;                                                              
+     //   const stati = options.container.stati;
+ //   const dispensedId = Object.keys(stati)
+ //   .find(
+ //      (key) => stati[key].label === 'Dispensed'
+ //      );
+ //   const update = Object.values(list)
+ //   .reduce((result, item) => {
+ //     item.container.statusId = dispensedId;
+ //     item.specimen.quantity = '0';
+ //     // XXX: By updating the container and specimen after, it's causing issues
+ //     // if they don't meet validation. The error is being thrown only after the
+ //     // pool has already been saved to the atabase! Not sure how to resolve this.
+ //     // return [...result,
+ //     //         () => this.updateContainer(item.container, false),
+ //     //         () => this.updateSpecimen(item.specimen, false),
+ //     //       ];
+ //   }, []);
+
+ //   // const errors = this.validatePool(pool);
+ //   // if (!isEmpty(errors)) {
+ //   //   return Promise.reject(errors);
+ //   // }
+
+ //   const pools = await post(pool, poolAPI, 'POST');
+ //   setPools(pools);
+  }                                                                             
+}  
diff --git a/jsx/entities/pool/PoolContext.tsx b/jsx/entities/pool/PoolContext.tsx
new file mode 100644
index 00000000..dfc3c7be
--- /dev/null
+++ b/jsx/entities/pool/PoolContext.tsx
@@ -0,0 +1,28 @@
+import { createContext, useContext, ReactNode } from 'react';
+import { PoolHook } from './';
+
+const PoolContext = createContext<PoolHook | null>(null);
+
+interface PoolProviderProps {
+  pool: PoolHook;
+  children?: ReactNode;
+}
+
+export const PoolProvider = ({                                                 
+  children,                                                                        
+  pool                                                                         
+}: PoolProviderProps): JSX.Element => {   
+  return (
+    <PoolContext.Provider value={pool}>
+      {children}
+    </PoolContext.Provider>
+  );
+};
+
+export const usePoolContext = (): PoolHook => {
+  const context = useContext(PoolContext);
+  if (context === null) {
+    throw new Error('usePoolContext must be used within a PoolProvider');
+  }
+  return context;
+};
diff --git a/jsx/entities/pool/index.ts b/jsx/entities/pool/index.ts
new file mode 100644
index 00000000..6f17b99a
--- /dev/null
+++ b/jsx/entities/pool/index.ts
@@ -0,0 +1,4 @@
+export * from './pool.interfaces';                                              
+export * from './usePool';                                                 
+export * from './Pool';                                                   
+export * from './PoolContext';                                                   
diff --git a/jsx/entities/pool/pool.interfaces.ts b/jsx/entities/pool/pool.interfaces.ts
new file mode 100644
index 00000000..f91495cc
--- /dev/null
+++ b/jsx/entities/pool/pool.interfaces.ts
@@ -0,0 +1,24 @@
+import {                                                                           
+  ICandidate,                                                                      
+  IProject,                                                                        
+  ICenter,                                                                         
+  ISession,                                                                        
+  IUnit,                                                                           
+  ISpecimen,
+  ISpecimenType,
+} from '../';  
+
+export interface IPool {                                                            
+  id: string,                                                                   
+  label: string,                                                                
+  candidate: ICandidate,                                                       
+  center: ICenter,                                                             
+  session: ISession,                                                            
+  date: string,                                                                 
+  projects: IProject[],                                                         
+  quantity: number,                                                             
+  specimens: ISpecimen[],                                                   
+  time: string,                                                                 
+  type: ISpecimenType,                                                                 
+  unit: IUnit,                                                               
+}; 
diff --git a/jsx/entities/pool/usePool.ts b/jsx/entities/pool/usePool.ts
new file mode 100644
index 00000000..cd0ddac8
--- /dev/null
+++ b/jsx/entities/pool/usePool.ts
@@ -0,0 +1,13 @@
+import { IPool, Pool } from './';
+import { useEntity, EntityHook } from '../';
+
+export interface PoolHook extends EntityHook<Pool, IPool> {
+};
+
+export function usePool(
+  initialPool?: Pool
+): PoolHook {
+  const instance = initialPool || new Pool({});        
+
+  return useEntity<Pool, IPool>(instance);
+}
diff --git a/jsx/entities/project/index.ts b/jsx/entities/project/index.ts
new file mode 100644
index 00000000..781c0fb7
--- /dev/null
+++ b/jsx/entities/project/index.ts
@@ -0,0 +1 @@
+export * from './project.interfaces';                                               
diff --git a/jsx/entities/project/project.interfaces.ts b/jsx/entities/project/project.interfaces.ts
new file mode 100644
index 00000000..928c49e3
--- /dev/null
+++ b/jsx/entities/project/project.interfaces.ts
@@ -0,0 +1,4 @@
+export interface IProject {                                                            
+  id: number,                                                                   
+  label: string,                                                       
+}; 
diff --git a/jsx/entities/session/index.ts b/jsx/entities/session/index.ts
new file mode 100644
index 00000000..63293f4e
--- /dev/null
+++ b/jsx/entities/session/index.ts
@@ -0,0 +1 @@
+export * from './session.interfaces';                                               
diff --git a/jsx/entities/session/session.interfaces.ts b/jsx/entities/session/session.interfaces.ts
new file mode 100644
index 00000000..017f480e
--- /dev/null
+++ b/jsx/entities/session/session.interfaces.ts
@@ -0,0 +1,9 @@
+import {
+  ICenter
+} from '../';
+
+export interface ISession {                                                            
+  id: string,                                                                   
+  label: string,
+  center: Partial<ICenter>,                                                       
+}; 
diff --git a/jsx/entities/shipment/LogContext.tsx b/jsx/entities/shipment/LogContext.tsx
new file mode 100644
index 00000000..8c7fa273
--- /dev/null
+++ b/jsx/entities/shipment/LogContext.tsx
@@ -0,0 +1,28 @@
+import { createContext, useContext, ReactNode } from 'react';
+import { LogHook } from './';
+
+const LogContext = createContext<LogHook | null>(null);
+
+interface LogProviderProps {
+  log: LogHook;
+  children?: ReactNode;
+}
+
+export const LogProvider = ({                                                 
+  children,                                                                        
+  log                                                                         
+}: LogProviderProps): JSX.Element => {   
+  return (
+    <LogContext.Provider value={log}>
+      {children}
+    </LogContext.Provider>
+  );
+};
+
+export const useLogContext = (): LogHook => {
+  const context = useContext(LogContext);
+  if (context === null) {
+    throw new Error('useLogContext must be used within a LogProvider');
+  }
+  return context;
+};
diff --git a/jsx/entities/shipment/Shipment.ts b/jsx/entities/shipment/Shipment.ts
new file mode 100644
index 00000000..0d268638
--- /dev/null
+++ b/jsx/entities/shipment/Shipment.ts
@@ -0,0 +1,49 @@
+import { IShipment, ILog } from './';                                                      
+import { Entity } from '../';                                                      
+                                                                                
+export class Shipment extends Entity<IShipment> {                                         
+  constructor(initialData: Partial<IShipment>) {                                              
+    super(initialData);                                                         
+  }                                                                             
+
+  validate() {                                          
+    const errors: Partial<Record<keyof IShipment, string>> = {};                                  
+
+    return errors;                                                              
+  }                                                                             
+
+  // addLog(log: Partial<ILog> = {}): Partial<ILog>[] {
+  //   return this.addToArray('logs', log);
+  // }
+
+  // setLog(index: number, updatedLog: Partial<ILog>): Partial<ILog>[] {
+  //   return this.updateArray('logs', index, updatedLog);
+  // }
+
+  // removeLog(index: number): Partial<ILog>[] {
+  //   return this.removeFromArray('logs', index);
+  // }
+
+  addLog(log: Partial<ILog> = {}): Partial<ILog>[] {
+    return [...this.data.logs, log];
+  }
+
+  setLog(index: number, updatedLog: Partial<ILog>): Partial<ILog>[] {
+    return this.data.logs.map((log, i) =>
+      i === index ? updatedLog : log
+    );
+  }
+
+  removeLog(index: number): Partial<ILog>[] {
+    return this.data.logs.filter((_, i) => i !== index);
+  }
+}  
+
+export class Log extends Entity<ILog> {
+  validate() {
+    const errors = {};                                  
+
+    return errors;                                                              
+  }
+}
+
diff --git a/jsx/entities/shipment/ShipmentContext.tsx b/jsx/entities/shipment/ShipmentContext.tsx
new file mode 100644
index 00000000..152f82cf
--- /dev/null
+++ b/jsx/entities/shipment/ShipmentContext.tsx
@@ -0,0 +1,28 @@
+import { createContext, useContext, ReactNode } from 'react';
+import { ShipmentHook } from './';
+
+const ShipmentContext = createContext<ShipmentHook | null>(null);
+
+interface ShipmentProviderProps {
+  shipment: ShipmentHook;
+  children?: ReactNode;
+}
+
+export const ShipmentProvider = ({                                                 
+  children,                                                                        
+  shipment                                                                         
+}: ShipmentProviderProps): JSX.Element => {   
+  return (
+    <ShipmentContext.Provider value={shipment}>
+      {children}
+    </ShipmentContext.Provider>
+  );
+};
+
+export const useShipmentContext = (): ShipmentHook => {
+  const context = useContext(ShipmentContext);
+  if (context === null) {
+    throw new Error('useShipmentContext must be used within a ShipmentProvider');
+  }
+  return context;
+};
diff --git a/jsx/entities/shipment/index.ts b/jsx/entities/shipment/index.ts
new file mode 100644
index 00000000..29c6910a
--- /dev/null
+++ b/jsx/entities/shipment/index.ts
@@ -0,0 +1,5 @@
+export * from './shipment.interfaces';                                          
+export * from './useShipment';                                                  
+export * from './Shipment';                                               
+export * from './ShipmentContext';                                               
+export * from './LogContext';                                               
diff --git a/jsx/entities/shipment/shipment.interfaces.ts b/jsx/entities/shipment/shipment.interfaces.ts
new file mode 100644
index 00000000..9de880b1
--- /dev/null
+++ b/jsx/entities/shipment/shipment.interfaces.ts
@@ -0,0 +1,36 @@
+import {
+  ICenter,
+  IContainer,
+  IUser,
+} from '../'
+
+export interface IShipmentType {
+  label: string,        
+}
+
+export interface IShipmentStatus {
+  label: string,
+}
+
+export interface IShipment {                             
+  id: string,                                                                   
+  barcode: string,                                                              
+  type: IShipmentType,                                                                 
+  status: IShipmentStatus,                                                               
+  active: boolean,                                                              
+  originCenter: ICenter,                                                       
+  destinationCenter: ICenter,                                                  
+  logs: Partial<ILog>[],                                                                  
+  containers: IContainer[],                                                  
+}                                                                               
+                                                                                
+export interface ILog {                                                          
+  barcode: string;                                                              
+  center: ICenter;                                                             
+  status: IShipmentStatus;                                                               
+  user: IUser;                                                                 
+  temperature?: number;                                                         
+  date: string;                                                                 
+  time: string;                                                                 
+  comments?: string;                                                            
+}       
diff --git a/jsx/entities/shipment/useShipment.ts b/jsx/entities/shipment/useShipment.ts
new file mode 100644
index 00000000..5b67d062
--- /dev/null
+++ b/jsx/entities/shipment/useShipment.ts
@@ -0,0 +1,47 @@
+import { useCallback } from 'react';
+import { IShipment, ILog, Shipment, Log } from './';
+import { EntityHook, useEntity } from '../';
+
+
+export interface ShipmentHook extends EntityHook<Shipment, IShipment> {                   
+  addLog: (log: Partial<ILog>)  => void,                 
+  setLog: (index: number, log: Partial<ILog>)  => void,                 
+  removeLog: (index: number)  => void,                 
+}  
+
+export function useShipment(
+  initialShipment: Shipment
+): ShipmentHook {
+
+  const shipment = useEntity<Shipment, IShipment>(initialShipment);
+  const shipmentEntity = shipment.getEntity() as Shipment;
+
+  const addLog = useCallback((log: Partial<ILog>) => {
+    shipment.set('logs', shipmentEntity.addLog(log));
+  }, [shipment]);
+
+  const setLog = useCallback((index: number, log: Partial<ILog>) => {
+    shipment.set('logs', shipmentEntity.setLog(index, log));
+  }, [shipment]);
+
+  const removeLog = useCallback((index: number) => {
+    shipment.set('logs', shipmentEntity.removeLog(index));
+  }, [shipment]);
+
+  return {
+    ...shipment,
+    addLog,
+    setLog,
+    removeLog
+  };
+}
+
+export interface LogHook extends EntityHook<Log, ILog> {                   
+}  
+
+export function useLog(
+  initialLog: Log
+): LogHook {
+
+  return useEntity<Log, ILog>(initialLog);
+}
diff --git a/jsx/entities/specimen/Data.ts b/jsx/entities/specimen/Data.ts
new file mode 100644
index 00000000..cc3581d7
--- /dev/null
+++ b/jsx/entities/specimen/Data.ts
@@ -0,0 +1,17 @@
+import { Entity } from '../';
+import { IData } from './';
+
+export class Data extends Entity<IData> {                                     
+  constructor(initialData: Partial<IData>) {                                              
+    super(initialData);                                                         
+  }                                                                             
+                                                                                
+  validate(): Record<string, string> {                                          
+    const errors: Record<string, string> = {};                                  
+    if (!this.data.barcode) {                                                   
+      errors.barcode = 'Barcode is required.';                                  
+    }                                                                           
+    // Add more validations as needed                                           
+    return errors;                                                              
+  }                                                                             
+}     
diff --git a/jsx/entities/specimen/Process.ts b/jsx/entities/specimen/Process.ts
new file mode 100644
index 00000000..189546c6
--- /dev/null
+++ b/jsx/entities/specimen/Process.ts
@@ -0,0 +1,14 @@
+import { Entity } from '../';                                               
+import { IProcess } from './';  
+
+export class Process extends Entity<IProcess> {
+  constructor(initialData: Partial<IProcess>) {
+    super(initialData);
+  }
+
+  validate(): Record<string, string> {
+    const errors: Record<string, string> = {};
+    // Add more validations as needed
+    return errors;
+  }
+}
diff --git a/jsx/entities/specimen/ProcessContext.tsx b/jsx/entities/specimen/ProcessContext.tsx
new file mode 100644
index 00000000..43a01695
--- /dev/null
+++ b/jsx/entities/specimen/ProcessContext.tsx
@@ -0,0 +1,31 @@
+import { createContext, useContext, ReactNode } from 'react';
+import { ProcessHook } from './';
+
+const ProcessContext = createContext<ProcessHook | null>(null);
+
+interface ProcessProviderProps {
+  process: ProcessHook;
+  children?: ReactNode;
+}
+
+export const ProcessProvider = ({
+  process,
+  children,
+}: ProcessProviderProps): JSX.Element => {
+  return (
+    <ProcessContext.Provider value={process}>
+       {children}
+    </ProcessContext.Provider>
+  );
+};
+
+export const useProcessContext = (): ProcessHook => {
+  const context = useContext(ProcessContext);
+
+  if (context === undefined) {
+    console.error('useProcessContext must be used within a BiobankProvider');
+    throw new Error('useProcessContext must be used within a BiobankProvider');
+  }
+
+  return context;
+};
diff --git a/jsx/entities/specimen/Specimen.ts b/jsx/entities/specimen/Specimen.ts
new file mode 100644
index 00000000..edbf922d
--- /dev/null
+++ b/jsx/entities/specimen/Specimen.ts
@@ -0,0 +1,17 @@
+import { Entity } from '../';                                               
+import { ISpecimen } from './';  
+
+export class Specimen extends Entity<ISpecimen> {                             
+  constructor(initialData: Partial<ISpecimen>) {                                          
+    super(initialData);                                                         
+  }                                                                             
+                                                                                
+  validate() {                                          
+    const errors: Partial<Record<keyof ISpecimen, string>> = {};                                  
+    if (!this.data.barcode) {                                                   
+      errors.barcode = 'Barcode is required.';                                  
+    }                                                                           
+    // Add more validations as needed                                           
+    return errors;                                                             
+  }                                                                             
+}                                                                               
diff --git a/jsx/entities/specimen/SpecimenContext.tsx b/jsx/entities/specimen/SpecimenContext.tsx
new file mode 100644
index 00000000..4d5ffcee
--- /dev/null
+++ b/jsx/entities/specimen/SpecimenContext.tsx
@@ -0,0 +1,34 @@
+import { createContext, useContext, ReactNode } from 'react';
+import { SpecimenHook } from './';
+import { ContainerProvider } from '../';
+
+const SpecimenContext = createContext<SpecimenHook | null>(null);
+
+interface SpecimenProviderProps {
+  specimen: SpecimenHook;
+  children?: ReactNode;
+}
+
+export const SpecimenProvider = ({
+  children,
+  specimen
+}: SpecimenProviderProps): JSX.Element => {
+  return (
+    <SpecimenContext.Provider value={specimen}>
+      <ContainerProvider container={specimen.container}>
+        {children}
+      </ContainerProvider>
+    </SpecimenContext.Provider>
+  );
+};
+
+export const useSpecimenContext = (): SpecimenHook => {
+  const context = useContext(SpecimenContext);
+
+  if (context === undefined) {
+    console.error('useSpecimenContext must be used within a BiobankProvider');
+    throw new Error('useSpecimenContext must be used within a BiobankProvider');
+  }
+
+  return context;
+};
diff --git a/jsx/entities/specimen/index.ts b/jsx/entities/specimen/index.ts
new file mode 100644
index 00000000..79ed6831
--- /dev/null
+++ b/jsx/entities/specimen/index.ts
@@ -0,0 +1,7 @@
+export * from './specimen.interfaces';                                               
+export * from './SpecimenContext';
+export * from './ProcessContext';
+export * from './useSpecimen';                                                      
+export * from './Specimen';   
+export * from './Process';   
+export * from './Data';   
diff --git a/jsx/entities/specimen/specimen.interfaces.ts b/jsx/entities/specimen/specimen.interfaces.ts
new file mode 100644
index 00000000..71217eff
--- /dev/null
+++ b/jsx/entities/specimen/specimen.interfaces.ts
@@ -0,0 +1,77 @@
+import {
+  IContainer,
+  ICandidate,
+  IProject,
+  IExaminer,
+  ICenter,
+  ISession,
+  IPool,
+  IUnit,
+  EntityHook,
+  ContainerHook
+} from '../';
+
+export interface IData extends Record<string, any> {};                                         
+
+export interface IAttribute {
+  id: number,
+  label: string,
+  required: boolean,        
+  show: boolean,
+  datatype: string,
+}
+
+export interface IProtocol {
+  label: string,
+  type: ISpecimenType,
+  process: ProcessType,
+  attributes: IAttribute[],
+}
+                                                                                
+export interface IProcess {                                                         
+  center: Partial<ICenter>,                                                            
+  comments?: string,                                                            
+  data?: IData,                                                                  
+  date: string,                                                                
+  examiner: Partial<IExaminer>,                                                          
+  protocol: Partial<IProtocol>,                                                          
+  quantity: number,                                                            
+  time: string,                                                                
+  unit: IUnit,                                                               
+};                                                                              
+
+export interface ISpecimenType {
+  label: string,
+  units: IUnit[]
+};
+                                                                                
+// TODO: maybe change this to an enum later, having trouble currently.
+// export enum ProcessType {                                                       
+//   Collection = 'collection',                                                    
+//   Preparation = 'preparation',                                                  
+//   Analysis = 'analysis',                                                        
+// }                                                                               
+
+export type ProcessType = 'collection' | 'preparation' | 'analysis';
+
+// export type ProcessMap = {                                                             
+//   [K in ProcessType]?: IProcess;                                                 
+// };                                                                              
+                                                                                
+export type ISpecimen = {                                           
+  id: string,                                                                   
+  barcode: string,                                                              
+  candidate: Partial<ICandidate>,                                                          
+  container: Partial<IContainer>,                                                         
+  collection: Partial<IProcess>,
+  preparation?: Partial<IProcess>,
+  analysis?: Partial<IProcess>,
+  fTCycle: number,                                                              
+  parents?: Partial<ISpecimen>[],                                            
+  pool?: Partial<IPool>,                                                              
+  projects: Partial<IProject>[],                                                         
+  quantity: number,                                                             
+  session: Partial<ISession>,                                                            
+  type: ISpecimenType,                                                               
+  unit: IUnit,
+};      
diff --git a/jsx/entities/specimen/useSpecimen.ts b/jsx/entities/specimen/useSpecimen.ts
new file mode 100644
index 00000000..9930a032
--- /dev/null
+++ b/jsx/entities/specimen/useSpecimen.ts
@@ -0,0 +1,74 @@
+import { useEffect } from 'react';
+import {
+  Specimen,
+  Process,
+  Data,
+  ISpecimen,
+  IProcess,
+  IData,
+} from './';
+import { useEntity, EntityHook } from '../';
+import {
+  Container,
+  useContainer,
+  ContainerHook,
+} from '../container';
+
+export interface SpecimenHook extends EntityHook<Specimen, ISpecimen> {
+  container: ContainerHook;
+  collection: ProcessHook;
+  preparation: ProcessHook;
+  analysis: ProcessHook;
+}
+
+export function useSpecimen(
+  initialSpecimen: Specimen
+): SpecimenHook {
+
+  const specimen = useEntity<Specimen, ISpecimen>(initialSpecimen);
+
+  const container = useContainer(new Container(specimen.container));
+  const collection = useProcess(new Process(specimen.collection));
+  const preparation = useProcess(new Process(specimen.preparation));
+  const analysis = useProcess(new Process(specimen.analysis));
+
+  return {
+    ...specimen,
+    container,
+    collection,
+    preparation,
+    analysis,
+  };
+}
+
+export interface ProcessHook extends EntityHook<Process, IProcess> {
+  data: DataHook
+}
+
+export function useProcess(
+  initialProcess: Process
+): ProcessHook {
+
+  const process = useEntity<Process, IProcess>(initialProcess);
+  const data = useData(new Data(process.data));
+
+  // if the protocol changes, the data should be reset
+  useEffect(() => {
+     data.clear();
+  }, [process.protocol]);
+
+  return {
+    ...process,
+    data,
+  };
+}
+
+export interface DataHook extends EntityHook<Data, IData> {
+  // You might add additional methods or properties specific to Data entities
+}
+
+export function useData(
+  initialData: Data
+): DataHook {
+  return useEntity<Data, IData>(initialData);
+}
diff --git a/jsx/entities/unit/index.ts b/jsx/entities/unit/index.ts
new file mode 100644
index 00000000..d176db78
--- /dev/null
+++ b/jsx/entities/unit/index.ts
@@ -0,0 +1 @@
+export * from './unit.interfaces';                                               
diff --git a/jsx/entities/unit/unit.interfaces.ts b/jsx/entities/unit/unit.interfaces.ts
new file mode 100644
index 00000000..f5c8131d
--- /dev/null
+++ b/jsx/entities/unit/unit.interfaces.ts
@@ -0,0 +1,4 @@
+export interface IUnit {                                                            
+  id: number,                                                                   
+  label: string,                                                       
+}; 
diff --git a/jsx/entities/useEntities.ts b/jsx/entities/useEntities.ts
new file mode 100644
index 00000000..ba408137
--- /dev/null
+++ b/jsx/entities/useEntities.ts
@@ -0,0 +1,172 @@
+import { useCallback, useState } from 'react';
+import { Entity } from './';
+import { v4 as uuidv4 } from 'uuid'; // Import UUID generator
+
+export type EntitiesHook<E extends Entity<I>, I extends object> = {                                  
+  entities: Map<string, E>,                                             
+  add: (entityData: Partial<I>) => string,                                          
+  update: (key: string, entity: Partial<I>) => void,                            
+  remove: (key: string) => void,                                                
+  setAll: (property: keyof I, value: any) => void,                              
+  saveAll: (saveFunc: (data: Partial<I>[]) => Promise<any>) => Promise<any>,
+  validateAll: () => boolean,                                                   
+  toArray: () => E[],                                                   
+  getData: () => Partial<I>[],
+  keys: () => string[],
+  isEmpty: () => boolean,                                                       
+}         
+
+export const useEntities = <E extends Entity<I>, I extends object>(
+  entityConstructor: new (data: Partial<I>) => E,
+  initialEntities: Map<string, E> = new Map(),
+): EntitiesHook<E, I> => {
+
+  // XXX: this may later be changed such that useEntities already expects a map
+  // const entitiesMap = new Map<string, E>(
+  //   Object.entries(initialEntities).map(([key, data]) => [key, new entityConstructor(data)])
+  // );
+
+  const [entities, setEntities] = useState(initialEntities);
+
+  const toArray = useCallback(() => Array.from(entities.values()), [entities]);
+
+  const getData = useCallback(() => toArray()
+                              .map(entity => entity.getData()), [toArray]);
+
+  const keys = useCallback(() => Array.from(entities.keys()), [entities]);
+
+  const isEmpty = useCallback(() => entities.size === 0, [entities]);
+
+  const add = useCallback((entityData: Partial<I>) => {
+    const id = uuidv4();
+    const entity = new entityConstructor(entityData);
+    setEntities(prev => new Map(prev).set(id, entity));
+    return id;
+  }, [entityConstructor]);
+                                                                                
+  const update = useCallback((id: string, entityData: Partial<I>) => {
+    setEntities(prev => {
+      const entity = prev.get(id);
+      if (entity) {
+        let updatedEntity = entity;
+        // Update each property in entityData on the entity
+        Object.entries(entityData).forEach(([key, value]) => {
+          // Assume 'set' method exists and is properly typed.
+          // You might need to adjust if 'set' does not directly accept Partial<I> types.
+          updatedEntity = updatedEntity.set(key as keyof I, value as I[keyof I]);
+        });
+
+        // XXX: this was removed to keep 'clone' function as protected.
+        // const updatedEntity = entity.clone({
+        //   ...entity.getData(),
+        //   ...entityData
+        // });
+        return new Map(prev).set(id, updatedEntity);
+      }
+      return prev;
+    });
+  }, []);
+
+  // const update = (id: string, updatedEntity: Entity<I>) => {
+  //   setEntities((prevEntities) => {
+  //     const newEntities = new Map(prevEntities);
+  //     newEntities.set(id, updatedEntity);
+  //     return newEntities;
+  //   });
+  // };
+                                                                                
+  const remove = useCallback((key: string) => {                                 
+    setEntities(prev => {                                               
+      // Clone the map and remove the entity by id                              
+      const newEntities = new Map(prev);                                
+      newEntities.delete(key);                                                  
+      return newEntities;                                                       
+    });                                                                         
+  }, []);                                                                       
+                                                                                
+  const setAll = useCallback((property: keyof I, value: any) => {
+    const updatedEntities = new Map(
+      Array.from(entities.entries()).map(([key, entity]) => {
+        const updatedEntity = entity.set(property, value); // Update the entity
+        return [key, updatedEntity]; // Return the updated entity
+      })
+    );
+    setEntities(updatedEntities); // Update the state
+    return updatedEntities; // Return updated entities so you can use them immediately
+  }, [entities]);
+
+  const validateAll = useCallback(() => {
+    const updatedEntities = new Map(entities); // Clone the entities map
+    let allValid = true;
+  
+    updatedEntities.forEach((entity, id) => {
+      const errors = entity.validate(); // Call the entity's validate method
+      const isValid = Object.keys(errors).length === 0;
+  
+      if (!isValid) {
+        allValid = false; // Set to false if any entity has errors
+      }
+  
+      // Update the entity with errors and store it in the map
+      updatedEntities.set(id, entity.setErrors(errors));
+    });
+
+    setEntities(updatedEntities); // Update the state only once after all iterations
+
+    return allValid;
+  }, [entities]);  
+
+  const saveAll = useCallback(async (saveFunc: (data: Partial<I>[]) => Promise<any>) => {
+    try {
+      const response = await saveFunc(getData());
+
+      console.log(response);
+  
+      if (response.status === 'error' && Array.isArray(response.errors)) {
+        // Handle validation errors
+        const updatedEntities = new Map(entities);
+        const entitiesArray = Array.from(entities.entries());
+
+        entitiesArray.forEach(([id, entity], index) => {
+          const errors = response.errors[index] || {};
+          const formattedErrors: Partial<Record<keyof I, string>> = {};
+        
+          // Iterate over each field in the errors object
+          Object.keys(errors).forEach((field) => {
+            // Concatenate the array of error messages into a single string
+            const messagesArray = errors[field];
+            formattedErrors[field as keyof I] = messagesArray.join(' ');
+          });
+        
+          // Set the concatenated errors on the entity
+          updatedEntities.set(id, entity.setErrors(formattedErrors));
+        });        
+  
+        setEntities(updatedEntities);
+  
+        // Throw an error to prevent the modal from closing
+        throw new Error('Validation errors occurred');
+      } else {
+        // Successful response
+        return response;
+      }
+    } catch (error) {
+      // Re-throw the error to be handled by the modal or higher-level error handlers
+      throw error;
+    }
+  }, [entities, getData, setEntities]);
+                                                                                
+  return {
+    entities,
+    add,
+    update,
+    remove,
+    setAll,
+    validateAll,
+    saveAll,
+    toArray,
+    getData,
+    keys,
+    isEmpty
+  };       
+};    
diff --git a/jsx/entities/useEntity.ts b/jsx/entities/useEntity.ts
new file mode 100644
index 00000000..3322d719
--- /dev/null
+++ b/jsx/entities/useEntity.ts
@@ -0,0 +1,73 @@
+import { useState, useCallback } from 'react';
+import { Entity } from './';
+
+export type EntityHook<E extends Entity<I>, I extends object> = Partial<I> & {                       
+  getEntity: () => E,
+  set: <K extends keyof I>(key: keyof I, value: I[K]) => void,                  
+  remove: (key: keyof I) => void,                                               
+  clear: () => void,                                                            
+  reset: () => void,                                                            
+  replace: (entityData: Partial<I>) => void,
+  validate: () => void,                                                        
+  errors: Partial<Record<keyof I, string>>,                                  
+  getData: () => Partial<I>,
+  setLocked: (locked: boolean) => void,
+  locked: boolean,
+}   
+
+export function useEntity<E extends Entity<I>, I extends object>(                              
+  initEntity: E,
+): EntityHook<E, I> {                                                
+  const [entity, setEntity] = useState(initEntity);                          
+  const [errors, setErrors] = useState(initEntity.getErrors());
+  const [locked, setLocked] = useState(false);
+
+  const set = useCallback(<K extends keyof I>(key: keyof I, value: I[K]) => {
+    setEntity(entity.set(key, value));
+  }, [entity]);
+  
+  const remove = useCallback((key: keyof I) => {
+    setEntity(entity.remove(key));
+  }, [entity]);
+  
+  const clear = useCallback(() => {
+    setEntity(entity.clear());
+  }, [entity]);
+  
+  const reset = useCallback(() => {
+    setEntity(entity.reset());
+  }, [entity]);
+
+  const replace = useCallback((entityData: Partial<I>) => {
+    setEntity(entity.replace(entityData));
+  }, [entity]);
+  
+  const validate = useCallback(() => {
+    const newErrors = entity.validate();
+    setEntity(entity.setErrors(newErrors));
+    setErrors(newErrors);
+  }, [entity]);
+
+  const getData = () => {
+    return entity.getData();
+  }
+
+  const getEntity = () => {
+    return entity;
+  }
+
+  return {
+    ...getData(),
+    getEntity,
+    set,
+    remove,
+    clear,
+    reset,
+    replace,
+    validate,
+    errors,             
+    getData,
+    setLocked,
+    locked,
+  }
+}
diff --git a/jsx/entities/user/index.ts b/jsx/entities/user/index.ts
new file mode 100644
index 00000000..155bfc57
--- /dev/null
+++ b/jsx/entities/user/index.ts
@@ -0,0 +1 @@
+export * from './user.interfaces';                                               
diff --git a/jsx/entities/user/user.interfaces.ts b/jsx/entities/user/user.interfaces.ts
new file mode 100644
index 00000000..2ac8f19f
--- /dev/null
+++ b/jsx/entities/user/user.interfaces.ts
@@ -0,0 +1,4 @@
+export interface IUser {                                                            
+  id: number,                                                                   
+  label: string,                                                       
+}; 
diff --git a/jsx/filter.js b/jsx/filter.js
deleted file mode 100644
index 4cf41d0e..00000000
--- a/jsx/filter.js
+++ /dev/null
@@ -1,107 +0,0 @@
-import React, {Component} from 'react';
-import PropTypes from 'prop-types';
-
-import {Tabs, TabPane} from 'Tabs';
-
-import SpecimenTab from './specimenTab';
-import ContainerTab from './containerTab';
-import PoolTab from './poolTab';
-import ShipmentTab from './shipmentTab';
-
-/**
- * Render a filter in the biobank.
- */
-class BiobankFilter extends Component {
-  /**
-   * Render the component
-   *
-   * @return {JSX}
-   */
-  render() {
-    const specimenTab = (
-      <SpecimenTab
-        data={this.props.data}
-        options={this.props.options}
-        saveBatchEdit={this.props.saveBatchEdit}
-        createPool={this.props.createPool}
-        createSpecimens={this.props.createSpecimens}
-        updateSpecimens={this.props.updateSpecimens}
-        editSpecimens={this.props.editSpecimens}
-        history={this.props.history}
-        increaseCoordinate={this.props.increaseCoordinate}
-        loading={this.props.loading}
-      />
-    );
-
-    const containerTab = (
-      <ContainerTab
-        data={this.props.data}
-        options={this.props.options}
-        createContainers={this.props.createContainers}
-        history={this.props.history}
-        loading={this.props.loading}
-      />
-    );
-
-    const poolTab = (
-      <PoolTab
-        data={this.props.data}
-        options={this.props.options}
-        createSpecimens={this.props.createSpecimens}
-        increaseCoordinate={this.props.increaseCoordinate}
-        loading={this.props.loading}
-      />
-    );
-
-    const shipmentTab = (
-      <ShipmentTab
-        data={this.props.data}
-        setData={this.props.setData}
-        options={this.props.options}
-      />
-    );
-
-    const tabInfo = [];
-    const tabList = [];
-    if (loris.userHasPermission('biobank_specimen_view')) {
-      tabInfo.push({id: 'specimens', content: specimenTab});
-      tabList.push({id: 'specimens', label: 'Specimens'});
-    }
-    if (loris.userHasPermission('biobank_container_view')) {
-      tabInfo.push({id: 'containers', content: containerTab});
-      tabList.push({id: 'containers', label: 'Containers'});
-    }
-    if (loris.userHasPermission('biobank_pool_view')) {
-      tabInfo.push({id: 'pools', content: poolTab});
-      tabList.push({id: 'pools', label: 'Pools'});
-    }
-    tabInfo.push({id: 'shipments', content: shipmentTab});
-    tabList.push({id: 'shipments', label: 'Shipments'});
-
-    const tabContent = Object.keys(tabInfo).map((key) => {
-      return (
-        <TabPane key={key} TabId={tabInfo[key].id}>
-          {tabInfo[key].content}
-        </TabPane>
-      );
-    });
-
-    return (
-      <div id='biobank-page'>
-        <Tabs tabs={tabList} defaultTab={tabList[0].id} updateURL={true}>
-          {tabContent}
-        </Tabs>
-      </div>
-    );
-  }
-}
-
-BiobankFilter.propTypes = {
-  data: PropTypes.object.isRequired,
-  options: PropTypes.object.isRequired,
-};
-
-BiobankFilter.defaultProps = {
-};
-
-export default BiobankFilter;
diff --git a/jsx/forms/BatchProcessForm.tsx b/jsx/forms/BatchProcessForm.tsx
new file mode 100644
index 00000000..6d4bd6fb
--- /dev/null
+++ b/jsx/forms/BatchProcessForm.tsx
@@ -0,0 +1,118 @@
+import React, { useState, ReactElement, useMemo } from 'react';
+import {VerticalTabs, TabPane} from 'Tabs';
+import Modal from 'Modal';
+import { StaticField, ListField, ProcessForm, PoolField, SpecimenField } from '../forms';
+import { useBiobankContext, useEditable } from '../hooks';
+import { IContainer, Specimen, ISpecimen, useProcess, usePool,
+  useEntities, EntitiesHook, Pool, Process
+} from '../entities';
+import Swal, { SweetAlertOptions, SweetAlertResult } from 'sweetalert2';
+import dict from '../i18n/en.json'
+
+/** XXX
+ *  Remember that the specimen type should determine the current type
+ *  When a pool is selected, it should generate specimen list items based on the
+ *  pool
+ *
+ *
+ */
+const BatchProcessForm: React.FC<{
+  show: boolean,
+}> = ({
+  show,
+}) => {
+
+  const context = useBiobankContext();
+  const preparation = useProcess(new Process({}));
+  const pool = usePool(new Pool({}));
+  const specimens = useEntities(Specimen);
+  const { editable, edit, clear } = useEditable();
+  const type = !specimens.isEmpty() ? specimens.toArray()[0].getData().type
+    : null;
+
+  /**
+   * Validates a container in the list.
+   * 
+   * @param {string} container - The ID of the container to validate.
+   * @returns {boolean} - Returns true if validation is successful, false otherwise.
+   */
+  const validateList = (
+    list: { specimen: ISpecimen, container: IContainer }[]
+  ): Promise<typeof list> => {
+    return new Promise((resolve, reject) => {
+      const barcodes = Object.values(list)
+        .filter(item => !!item.specimen.preparation)
+        .map(item => item.container.barcode);
+  
+      if (barcodes.length > 0) {
+        Swal.fire({
+          title: 'Warning!',
+          html: `Preparation for specimen(s) <b>${barcodes.join(', ')}</b> ` +
+                `already exists. By completing this form, the previous ` +
+                `preparation will be overwritten.`,
+          icon: 'warning' as any,
+          showCancelButton: true,
+          confirmButtonText: 'Proceed'
+        } as SweetAlertOptions).then((result: SweetAlertResult) => {
+          // 'result as any' is a temporary bypass because typescript does not
+          // recognized isConfirmed as a property of 'result'.
+          if ((result as any).isConfirmed) {
+            resolve(list);
+          } else {
+            reject();
+          }
+        });
+      } else {
+        resolve(list);
+      }
+    });
+  };
+
+  const editForms = !specimens.isEmpty() && (
+    <div className='form-top'>
+      <VerticalTabs
+        tabs={[{id: 'preparation', label: 'Preparation'}]}
+        onTabChange={(id) => edit(id)}
+        updateURL={false}
+      >
+        <TabPane TabId='preparation'>
+          {editable.preparation ? (
+            <ProcessForm
+              edit={true}
+              process={preparation}
+              processStage='preparation'
+              type={type}
+            />
+          ) : null}
+        </TabPane>
+      </VerticalTabs>
+    </div>
+  );
+
+  return (
+    <Modal
+      title='Process Specimens'
+      show={show}
+      onSubmit={() => Promise.resolve()}
+      onClose={clear}
+      throwWarning={true}
+    >
+      <StaticField label='Processing Note' value={dict.batchProcessNote}/>
+      <SpecimenField property={'type'} isStatic/>
+      <ListField
+        name={'specimens'}
+        label={'Barcode'}
+        onAdd={(barcode) =>
+          specimens.update(barcode, context.specimens.data.find(s => s.container.barcode
+        == barcode))}
+        onRemove={specimens.remove}
+        list={specimens.keys().reduce((acc, item) => ({ ...acc, [item]: item }), {})}
+        options={context.specimens.data.map(specimen =>
+                                            specimen.container.barcode)}
+      />
+      {editForms}
+    </Modal>
+  );
+}
+
+export default BatchProcessForm;
diff --git a/jsx/forms/ContainerField.tsx b/jsx/forms/ContainerField.tsx
new file mode 100644
index 00000000..21648d2b
--- /dev/null
+++ b/jsx/forms/ContainerField.tsx
@@ -0,0 +1,120 @@
+import { FieldConfiguration } from '../types';
+import { IContainer, ContainerHook, useContainerContext } from '../entities';
+import { BiobankContextType } from '../contexts';
+import Utils from '../utils';
+import { DynamicField } from '../forms';
+import { useRequest } from '../hooks';
+import { ContainerAPI, BaseAPI} from '../APIs';
+
+// TODO: find a way to implement this again:                                    
+// const removeChildContainers = (object, id) => {                              
+//   delete object[id];                                                         
+//   for (let key in containers) {                                              
+//     if (id == containers[key].parentContainerBarcode) {                           
+//       object = removeChildContainers(object, key);                           
+//     }                                                                        
+//   }                                                                          
+//   return object;                                                             
+// };                                                                           
+                                                                                
+// TODO: find a way to implement this again:                                    
+// Delete child containers from options if a container is being placed in a     
+// another container.                                                           
+// if (container) {                                                             
+//   containerBarcodesNonPrimary = removeChildContainers(                       
+//     containerBarcodesNonPrimary,                                             
+//     container.label                                                             
+//   );                                                                         
+// }                                                                            
+
+type ContainerFields = Pick<IContainer, 'barcode' | 'center' |
+  'parent' | 'lotNumber' | 'expirationDate' | 'type'>;
+
+const getContainerFieldConfig = (
+  container: ContainerHook
+) : Record<keyof ContainerFields, FieldConfiguration<IContainer, keyof
+ContainerFields>> => ({
+  barcode: {                                                                    
+    label: 'Barcode',                                                           
+    type: 'text',                                                               
+    required: true,                                                             
+  },                                                                            
+  center: {                                                                     
+    label: 'Site',                                                              
+    type: 'select',                                                             
+    required: true,                                                             
+    getOptions: () => Utils.mapLabel(useRequest(() => new
+                                                BaseAPI('centers').get())),
+  },                                                                            
+  parent: {                                                          
+    label: 'Parent Container Barcode',                                          
+    type: 'search',                                                             
+    required: false,                                                            
+    getOptions: (context)  => {
+      return context.containers.data.map(container => {
+        const dimension = container.dimension;
+        const capacity = dimension.x * dimension.y * dimension.z;            
+        const available = capacity - Number(container.children.length);        
+        return container.barcode + ' (' +available + ' Available Spots)';
+      });
+    }
+  },                                                                            
+  lotNumber: {                                                                  
+    label: 'Lot Number',                                                        
+    type: 'text',                                                               
+    required: false,                                                            
+  },                                                                            
+  expirationDate: {                                                             
+    label: 'Expiration Date',                                                   
+    type: 'date',                                                               
+    required: false,                                                            
+  },                                                                            
+  // status: {                                                                   
+  //   label: 'Status',                                                            
+  //   type: 'select',                                                             
+  //   required: true,                                                             
+  //   getOptions: () => {                                                   
+  //     return useRequest(new ContainerAPI().getStatuses());
+  //   },                                                                          
+  // },                                                                            
+  type: {                                                                     
+    label: 'Container Type',                                                    
+    type: 'select',                                                             
+    required: true,                                                             
+    getOptions: () => Utils.mapLabel(useRequest(() => new
+                                                ContainerAPI().getTypes())),
+    // const containerTypes = {};
+    // if (type && options.specimen.typeContainerTypes[typeId]) {
+    //   Object.keys(containerTypesPrimary).forEach((id) => {
+    //     options.specimen.typeContainerTypes[typeId].forEach((i) => {
+    //       if (id == i) {
+    //         containerTypes[id] = containerTypesPrimary[id];
+    //       }
+    //     });
+    //   });
+    // }
+    // const containerTypesPrimary = mapFormOptions(
+    //   options.container.typesPrimary,
+    //   'label',
+    // );
+    
+    // const validContainers = {};
+    // if (specimen.typeId && options.specimen.typeContainerTypes[specimen.typeId]) {
+    //   Object.keys(containerTypesPrimary).forEach((id) => {
+    //     options.specimen.typeContainerTypes[specimen.typeId].forEach((i) => {
+    //       if (id == i) {
+    //         validContainers[id] = containerTypesPrimary[id];
+    //       }
+    //     });
+    //   });
+    // }
+  }                                                                             
+});                                                                              
+                                                                                
+export const ContainerField: React.FC<{                                         
+  property: keyof IContainer,                                                    
+}> = ({ property }) => {                                                                         
+  const container = useContainerContext();
+  const field = getContainerFieldConfig(container)[property];                                 
+  return <DynamicField property={property} hook={container} field={field}/>   
+}    
diff --git a/jsx/forms/ContainerForm.tsx b/jsx/forms/ContainerForm.tsx
new file mode 100644
index 00000000..5ba27cfc
--- /dev/null
+++ b/jsx/forms/ContainerForm.tsx
@@ -0,0 +1,78 @@
+import React, { useState, useCallback, useEffect } from 'react';
+import Modal from 'Modal';
+import { ListForm, ContainerField } from '../forms';
+import { IContainer, Container, useEntities, EntitiesHook, ContainerProvider, useContainer } from '../entities';
+import { useBiobankContext} from '../hooks';
+import { ContainerAPI } from '../APIs';
+
+const ContainerForm: React.FC<{
+  show: boolean,
+  onClose: () => void,
+}> = ({
+  show = false,
+  onClose
+}) => {
+  if (!show) return null; //XXX temporary until Modal does this properly.
+
+  const container = useContainer(new Container({}));
+  const containers = useEntities(Container);
+
+  useEffect(() => {
+    containers.add({});
+  }, [containers.add]);                                 
+
+  useEffect(() => {
+    containers.setAll('center', {label: container.center});
+  }, [container.center, containers.entities.size]);                                 
+
+  const onSubmit = () => {
+    return containers.saveAll(data => new ContainerAPI().create(data));
+  };
+
+  return (
+    <Modal
+      title='Add New Container'
+      show={show}
+      onClose={onClose}
+      onSubmit={onSubmit}
+      throwWarning={true}
+    >
+      <ContainerProvider container={container}>
+        <ContainerField property={'center'}/>
+      </ContainerProvider>
+      <ListForm list={containers} listItemComponent={ContainerListItem}/>
+    </Modal>
+  );
+}
+
+// XXX: I have stacked this with memoization — not sure how much is necessary
+// but for now it works!
+const ContainerListItem: React.FC<{
+  id: string,
+  entity: Container,
+  update: EntitiesHook<Container, IContainer>['update']
+}> = React.memo(({ id, entity, update }) => {
+
+  const container = useContainer(entity);
+
+  // Memoize callback
+  const handleUpdate = useCallback(() => {
+    update(id, container.getData());
+  }, [id, container.getData(), update]);
+
+  // Effect runs only once or when explicitly needed
+  useEffect(() => {
+    handleUpdate();
+  }, [handleUpdate]);
+
+  return (
+    <ContainerProvider container={container}>
+      <ContainerField property={'barcode'}/>
+      <ContainerField property={'type'}/>
+      <ContainerField property={'lotNumber'}/>
+      <ContainerField property={'expirationDate'}/>
+    </ContainerProvider>
+  );
+})
+
+export default ContainerForm;
diff --git a/jsx/forms/ContainerParentForm.tsx b/jsx/forms/ContainerParentForm.tsx
new file mode 100644
index 00000000..53f7d98a
--- /dev/null
+++ b/jsx/forms/ContainerParentForm.tsx
@@ -0,0 +1,51 @@
+import { ReactElement, useState, useEffect } from 'react';
+import { ContainerField } from '../forms';
+import { ContainerDisplay } from '../components';
+import { ContainerHook } from '../entities';
+import { useBiobankContext} from '../hooks';
+
+const ContainerParentForm: React.FC<{
+  container: ContainerHook,
+  display?: boolean,
+}> = ({
+  container,
+  display
+}) => {
+  const { options, containers } = useBiobankContext();
+
+  // when a parent container is selected, the passed container gets updated
+  useEffect(() => {
+    const parent = containers[container.parent.barcode];
+    if (parent) {
+      container.set('coordinate', null);
+      container.set('temperature', parent.temperature);
+      container.set('center', parent.center);
+      container.set('status', parent.status);
+    }
+  }, [container.parent]);
+
+  const renderContainerDisplay = () => {
+    if (!(container.parent && display)) {
+      return;
+    }
+
+    return (
+      <ContainerDisplay
+        container={container}
+        select={true}
+        selectedCoordinate={container.coordinate}
+      />
+    );
+  };
+
+  return (
+    <div className='row'>
+      <div className="col-lg-11">
+        <ContainerField property={'parent'}/>
+      </div>
+      {renderContainerDisplay()}
+    </div>
+  );
+}
+
+export default ContainerParentForm;
diff --git a/jsx/forms/CustomFields.tsx b/jsx/forms/CustomFields.tsx
new file mode 100644
index 00000000..d319ae70
--- /dev/null
+++ b/jsx/forms/CustomFields.tsx
@@ -0,0 +1,108 @@
+import { ReactElement } from 'react';
+import {
+  TextField,
+  DateField,
+  TimeField,
+  CheckboxField,
+} from './';
+import { IAttribute } from '../entities';
+
+type CustomFieldsProps = {
+  attributes: IAttribute[],
+  data: any //TODO: type,
+};
+
+/**
+ * Biobank Custom Attribute Fields
+ * 
+ * @param {CustomFieldsProps} props - The props for the component.
+ * @returns {ReactElement} JSX Element corresponding to each field.
+ */
+const CustomFields = ({
+  attributes,
+  data,
+}: CustomFieldsProps): ReactElement => {
+
+  return (
+    <>
+      {attributes.map((attribute, key) => {
+        const datatype = attribute.datatype;
+        const label = attribute.label;
+        if (datatype === 'text' || datatype === 'number') {
+          return (
+            <TextField
+              key={key}
+              name={String(attribute.id)}
+              label={attribute.label}
+              onChange={data.set}
+              required={attribute.required}
+              value={data[attribute.label]}
+              error={data.errors[attribute.label]}
+            />
+          );
+        }
+
+        if (datatype === 'date') {
+          return (
+            <DateField
+              key={key}
+              name={String(attribute.id)}
+              label={attribute.label}
+              onChange={data.set}
+              required={attribute.required}
+              value={data[attribute.label]}
+              error={data.errors[attribute.label]}
+            />
+          );
+        }
+
+        if (datatype === 'time') {
+          return (
+            <TimeField
+              key={key}
+              name={String(attribute.id)}
+              label={attribute.label}
+              onChange={data.set}
+              required={attribute.required}
+              value={data[attribute.label]}
+              error={data.errors[attribute.label]}
+            />
+          );
+        }
+
+        if (datatype === 'boolean') {
+          return (
+            <CheckboxField
+              key={key}
+              name={String(attribute.id)}
+              label={attribute.label}
+              onChange={data.set}
+              required={attribute.required}
+              value={data[attribute.label]}
+              error={data.errors[attribute.label]}
+            />
+          );
+        }
+
+        // Do not present the possibility of uploading if file is already set
+        // File must instead be deleted or overwritten.
+        // TODO: rethink file uploading to not use current or data.
+        // if (datatype === 'file' && !data[attribute]) {
+        //   return (
+        //     <FileElement
+        //       key={key}
+        //       name={attribute}
+        //       label={fields[attribute].label}
+        //       onUserInput={setData}
+        //       required={fields[attribute].required}
+        //       value={current.files[data[attribute]]}
+        //       errorMessage={errors[attribute]}
+        //     />
+        //   );
+        // }
+      })};
+    </>
+  );
+}
+
+export default CustomFields;
diff --git a/jsx/forms/DynamicField.tsx b/jsx/forms/DynamicField.tsx
new file mode 100644
index 00000000..ca6bfa72
--- /dev/null
+++ b/jsx/forms/DynamicField.tsx
@@ -0,0 +1,76 @@
+import React, { ReactElement } from 'react';
+import { FieldConfiguration } from '../types';
+import { Entity, EntityHook } from '../entities';
+import { useBiobankContext } from '../hooks';
+import Utils from '../utils';
+import Form from './Form';
+
+const fieldComponentMapping: {
+  [key: string]: React.ComponentType<any>;
+} = {
+  text: Form.TextField,
+  date: Form.DateField,
+  time: Form.TimeField,
+  boolean: Form.CheckboxField,
+  select: Form.SelectField,
+  search: Form.SearchField,
+  textarea: Form.TextareaField,
+  input: Form.ListField,
+  number: Form.NumberField,
+  static: Form.StaticField,
+};  
+
+interface DynamicFieldProps<E extends Entity<I>, I extends object> {
+  property: keyof I,
+  hook: EntityHook<E, I>,
+  field: FieldConfiguration<I, keyof I>,
+  isStatic?: boolean,
+};
+
+// Define OptionType with required structure
+interface OptionType {
+  label: string;
+  value: any; // Customize based on the actual value structure you expect
+}
+
+export const DynamicField = <E extends Entity<I>, I extends object>({
+  property,
+  hook,
+  field,
+  isStatic,
+}: DynamicFieldProps<E, I>): ReactElement | null => { 
+  const context = useBiobankContext();
+
+  if (!field) return null; // might not be necessary1
+
+  const fieldType = isStatic || hook.locked ? 'static' : field.type;
+  const Field = fieldComponentMapping[fieldType];
+
+  if (!Field) return null; // might not be necessary
+
+  const value = hook.getData()[property] as any;
+
+  const commonProps = {
+    name: property as string,
+    label: field.label,
+    value: value,
+    required: field.required || false,
+    error: hook.errors[property] || '',
+    disabled: field.disabled || false,
+    onChange: (name: string, value: any) => hook.set(name as keyof I, value),
+  };
+
+  let additionalProps = {};
+
+  // Check if the field type requires handling `select`, `search`, etc.
+  if (['select', 'search', 'input'].includes(field.type)) {
+    additionalProps = {
+      options: field.getOptions(context),
+      value: value,
+      placeholder: field.placeholder || 'Search for a ' + field.label,
+      emptyOption: field.emptyOption || false,
+    };
+  }
+
+  return <Field {...commonProps} {...additionalProps} />;
+};
diff --git a/jsx/forms/EditEntitiesForm.tsx b/jsx/forms/EditEntitiesForm.tsx
new file mode 100644
index 00000000..ab5e3008
--- /dev/null
+++ b/jsx/forms/EditEntitiesForm.tsx
@@ -0,0 +1,71 @@
+import { useState } from 'react';
+import { useSpecimen, ISpecimen, Specimen, useEntities, Entity, EntitiesHook, SpecimenProvider } from '../entities';
+import { useBiobankContext } from '../hooks';
+import { ListField, DynamicField, CheckboxField, Button, SpecimenField} from '../forms';
+
+function createInitialState<T extends object>(): Record<keyof T, boolean> {
+  return {} as Record<keyof T, boolean>;
+}
+
+const EditEntitiesForm = ({
+ 
+}) => {
+  const [selected, select] = useState(createInitialState<ISpecimen>());
+
+  const context = useBiobankContext();
+  const specimen = useSpecimen(new Specimen({}));
+  const specimens = useEntities<Specimen, ISpecimen>(Specimen);
+
+  const handleCheck = (key: keyof ISpecimen, value: boolean) => {
+    select(prev => ({ ...prev, [key]: value }));
+  };
+
+  const handleSubmit = () => {
+    const model = specimen.getData();
+    const selectedProperties = Object.entries(selected)
+      .filter(([, isSelected]) => isSelected)
+      .map(([key]) => key as keyof ISpecimen);
+  
+    selectedProperties.forEach(property => {
+      specimens.setAll(property, model[property]);
+    });
+
+    // specimens.validateAll
+
+    // send via API
+  };  
+
+  return (
+    <>
+      <h3>Select Entities to Edit</h3>
+      <ListField
+        name="specimens"
+        label="Select Specimens"
+        onAdd={(barcode) => specimens
+          .update(barcode, context.specimens.data
+                  .find(specimen => specimen.container.barcode == barcode))}
+        onRemove={specimens.remove}
+        list={specimens.keys().reduce((acc, item) => ({ ...acc, [item]: item }), {})}
+        options={context.specimens.data.map(specimen => specimen.container.barcode)}
+      />
+      <h3>Edit Fields</h3>
+      <SpecimenProvider specimen={specimen}>
+        {Object.keys(specimen.getData()).map((key: string) => (
+          <div key={key}>
+            <label>
+              <SpecimenField property={key as keyof ISpecimen}/>
+              <CheckboxField
+                name={key}
+                value={selected[key as keyof ISpecimen]}
+                onChange={handleCheck}
+              />
+            </label>
+          </div>
+        ))}
+      </SpecimenProvider>
+      <Button label='Submit' onClick={handleSubmit} />
+    </>
+  );
+};
+
+export default EditEntitiesForm;
diff --git a/jsx/forms/Form.tsx b/jsx/forms/Form.tsx
new file mode 100644
index 00000000..c8e75c22
--- /dev/null
+++ b/jsx/forms/Form.tsx
@@ -0,0 +1,534 @@
+import React, { useState, useEffect, ReactNode } from 'react';
+import Utils from '../utils';
+import Styles from '../styles';
+import { useEntities, Entity, EntityHook } from '../entities';
+
+interface MinMaxProps {
+  min?: number;
+  max?: number;
+}
+
+interface FieldProps {
+  name: string;
+  disabled?: boolean;
+  placeholder?: string;
+  autofocus?: boolean;
+  error?: string;
+}
+
+interface ValueProps<T> {
+  value: T | null;
+  onChange: (name: string, value: T | null) => void;
+}
+
+// Common properties for any inlined fields
+interface LabelProps {
+  label?: string;
+  required?: boolean,
+}
+
+interface InlineFieldProps extends LabelProps {
+  children: ReactNode
+}
+
+interface OptionsProps {
+  options: Record<string, string>;
+  emptyOption?: boolean;
+}
+
+// Properties specific to input elements, including handlers and common HTML attributes
+
+interface ListProps extends LabelProps, FieldProps, OptionsProps {
+  list: Record<string, string>;
+  onAdd: (key: string, value: string) => void;
+  onRemove: (key: string) => void;
+}
+
+interface TextProps
+  extends ValueProps<string>, LabelProps, FieldProps{}
+
+interface NumberProps
+  extends ValueProps<number>, LabelProps, FieldProps, MinMaxProps{}
+
+interface BooleanProps
+  extends ValueProps<boolean>, LabelProps, FieldProps {}
+
+interface SelectProps
+  extends TextProps, OptionsProps {}
+
+interface StaticProps
+  extends LabelProps, Omit<ValueProps<any>, 'onChange'> {};
+
+// Properties for button components, focusing on interaction
+interface ButtonProps {
+  onClick: (e: React.MouseEvent<HTMLButtonElement>) => void,
+  label?: string;
+  disabled?: boolean;
+}
+
+interface InputProps<T extends string | number | boolean> extends FieldProps, MinMaxProps, ValueProps<T> {
+  type: 'date' | 'time' | 'text' | 'email' | 'number' | 'checkbox';
+}
+
+interface FormWrapperProps {
+  onSubmit: (event: React.FormEvent<HTMLFormElement>) => void;
+  children: ReactNode;
+  submitLabel?: string;
+  className?: string;
+}
+
+const FormWrapper: React.FC<FormWrapperProps> = ({
+  onSubmit,
+  children,
+  submitLabel = 'Submit',
+  className = '',
+}) => {
+  return (
+    <form onSubmit={onSubmit} className={className}>
+      {children}
+      <div className="form-group mt-3">
+        <Button
+          onClick={(e) => {
+            e.preventDefault();
+            onSubmit(e as unknown as React.FormEvent<HTMLFormElement>);
+          }}
+          label={submitLabel}
+        />
+      </div>
+    </form>
+  );
+};
+
+export const Input = <T extends string | number | boolean>({
+  type,
+  name,
+  placeholder,
+  autofocus,
+  min,
+  max,
+  disabled,
+  error,
+  value,
+  onChange,
+}: InputProps<T>) => {
+  const handleChange = (event: React.ChangeEvent<HTMLInputElement>) => {
+    const newValue = type === 'checkbox' ? event.target.checked : event.target.value;
+    onChange(name, newValue as T);
+  };  
+
+  return (
+    <>
+      <input
+        type={type}
+        className='form-control'
+        name={name}
+        value={type !== 'checkbox' ? (value as string | number) : undefined}
+        checked={type === 'checkbox' ? (value as boolean) : undefined}
+        placeholder={placeholder}
+        autoFocus={autofocus}
+        min={min}
+        max={max}
+        disabled={disabled}
+        onChange={handleChange}
+      />
+      {error && <span className="text-danger">{error}</span>}
+    </>
+  )
+}
+
+const Field = ({
+  label,
+  required,
+  children,
+}: InlineFieldProps): JSX.Element => {  
+
+  return (
+    <Styles.Layout.Field hasLabel={!!label}>
+      {label && (
+        <Styles.Layout.Row justify={'flex-end'}>
+          <label className="control-label">
+            {label}
+            {required && <span className="text-danger">*</span>}
+          </label>
+        </Styles.Layout.Row>
+      )}
+      <Styles.Layout.Row>{children}</Styles.Layout.Row>
+    </Styles.Layout.Field>
+  );
+};
+
+export const DateField = ({
+  required,
+  label,
+  ...props
+}: TextProps): JSX.Element => {  
+
+  const today = new Date().toISOString().split('T')[0];
+  const setToday = () => props.onChange(props.name, today);
+
+  return (
+    <Field required={required} label={label}>
+      <Input type='date' {...props}/>
+      <Button onClick={setToday} label={'Today'}/>
+    </Field>
+  );
+};
+
+export const TimeField: React.FC<TextProps> = ({
+  required,
+  label,
+  ...props
+}) => {
+
+  const handleNow = () => {
+    const date = new Date();
+    const hours = date.getHours();
+    const minutes = date.getMinutes();
+    const timeString = `${hours.toString().padStart(2, '0')}:${minutes.toString().padStart(2, '0')}`;
+    props.onChange(props.name, timeString);
+  };
+
+  return (
+    <Field required={required} label={label}>
+      <Input type="time" {...props}/>
+      <Button onClick={handleNow} label={'Now'}/>
+    </Field>
+  );
+};
+
+export const TextField: React.FC<TextProps> = ({
+  required,
+  label,
+  ...props
+}) => {
+  return <Field required={required} label={label}><Input type='text' {...props}/></Field>;
+};
+
+export const NumberField: React.FC<NumberProps> = ({
+  required,
+  label,
+  ...props
+}) => {
+  return (
+    <Field required={required} label={label}>
+      <Input type='number' {...props}/>
+    </Field>
+  );
+};
+
+export const StaticField: React.FC<StaticProps> = ({
+  label,
+  value,
+}) => {
+  return <Field label={label}>{value}</Field>;
+};
+
+export const CheckboxField: React.FC<BooleanProps> = ({
+  required,
+  label,
+  ...props
+}) => {
+  return (
+    <Field required={required} label={label}>
+      <Input type='checkbox' {...props}/>
+    </Field>
+  );
+};
+
+export const TextareaField: React.FC<TextProps> = ({
+  required,
+  label,
+  onChange,
+  ...props
+}) => {
+  const handleChange = (event: React.ChangeEvent<HTMLTextAreaElement>) => {
+    onChange(event.target.name, event.target.value);
+  };
+
+  return (
+    <Field required={required} label={label}>
+      <textarea className='form-control' onChange={handleChange} {...props} />
+      {props.error && <span className="text-danger">{props.error}</span>}
+    </Field>
+  );
+};
+
+export const SelectField = ({
+  required,
+  label,
+  options,
+  onChange,
+  ...props
+}: SelectProps) => {
+  const handleChange = (event: React.ChangeEvent<HTMLSelectElement>) => {
+    const value = event.target.value === "" ? null : event.target.value;
+    onChange(event.target.name, value);
+  };
+
+  return (
+    <Field required={required} label={label}>
+      <select className='form-control' onChange={handleChange} {...props}>
+        <option value=''>Select an option</option>
+        {Object.keys(options).map((key) => (
+          <option key={key} value={key}>
+            {options[key]}
+          </option>
+        ))}
+      </select>
+      {props.error && <span className="text-danger">{props.error}</span>}
+    </Field>
+  );
+};
+
+export const SearchField = ({
+  required,
+  label,
+  options,
+  onChange,
+  ...props
+}: SelectProps) => {
+  const [searchTerm, setSearchTerm] = useState('');
+  const [filteredOptions, setFilteredOptions] = useState<string[]>([]);
+
+  useEffect(() => {
+    const filtered = Object.keys(options).filter(key =>
+      options[key].toLowerCase().includes(searchTerm.toLowerCase())
+    );
+    setFilteredOptions(filtered);
+  }, [searchTerm, options]);
+
+  const handleChange = (name: string, value: string) => {
+    setSearchTerm(value);
+    const matchedOption = filteredOptions
+    .find(option => option.toLowerCase() === searchTerm.toLowerCase());
+    if (matchedOption) {
+      handleOptionClick(matchedOption);
+    } else {
+      onChange(props.name, null);
+    }
+  };
+
+  const handleOptionClick = (key: string) => {
+    setSearchTerm(key);
+    onChange(props.name, options[key]);
+  };
+
+  return (
+    <Field required={required} label={label}>
+      <Input
+        type='text'
+        value={searchTerm}
+        onChange={handleChange}
+        {...props}
+      />
+      <ul>
+        {filteredOptions.map(key => (
+          <li key={key} onClick={() => handleOptionClick(key)}>
+            {options[key]}
+          </li>
+        ))}
+      </ul>
+    </Field>
+  );
+};
+
+
+// Usage of InlineField and other components
+export const ListField = ({
+  label,
+  onAdd,
+  onRemove,
+  list,
+  ...props
+}: ListProps) => {
+
+  const [input, setInput] = useState<string | null>(null);
+
+  const handleSearch = (name: string, value: string) => {
+    setInput(value);
+  }
+
+  const handleAdd = () => {
+    if (input) {
+      onAdd(input, props.options[input])
+      setInput(null);
+    }
+  }
+
+  return (
+    <Styles.Form.ListContainer>
+      <h4>{label + ' Input'}</h4>
+      <Styles.Form.HorizontalRule />
+      <SearchField
+        value=''
+        onChange={handleSearch}
+        {...props}
+      />
+      <Button label='Add' onClick={handleAdd}/>
+      <h4>{label + ' List'}</h4>
+      <Styles.Form.HorizontalRule />
+      {Object.keys(list).map((key) => (
+        <Styles.Form.ListItem>
+          <div>{list[key]}</div>
+          <Styles.Form.Icon
+            className="glyphicon glyphicon-remove"
+            onClick={() => onRemove(key)}
+          />
+        </Styles.Form.ListItem>
+      ))}
+    </Styles.Form.ListContainer>
+  );
+};
+
+export const Button: React.FC<ButtonProps> = ({
+  label,
+  onClick,
+  disabled,
+}) => {
+
+  return (
+    <button
+      className={'btn btn-primary'}
+      onClick={onClick}
+      disabled={disabled}
+    >
+      {label}
+    </button>
+  );
+}
+
+const Form = {
+ TextField,                                         
+ DateField,                                         
+ TimeField,                                         
+ CheckboxField,                                  
+ SelectField,                                     
+ SearchField,                                     
+ TextareaField,                                 
+ ListField,                                        
+ NumberField,                                     
+ StaticField,        
+ Button,
+}
+
+export default Form;
+
+//                                                                                 
+// /**                                                                             
+//  * Input List                                                                   
+//  *                                                                              
+//  * @return {JSX}                                                                
+//  */                                                                             
+// function ListField({                                                            
+//                      name,                                                      
+//                      label,                                                     
+//                      items,                                                     
+//                      setItems,                                                  
+//                      errorMessage,                                              
+//                      options,                                                   
+//                    }) {                                                         
+//   const [item, setItem] = useState('');                                         
+//                                                                                 
+//   const removeItem = (index) => {                                               
+//     setItems(name, items.filter((item, i) => index != i)); // XXX: added first param
+//   };                                                                            
+//   const addItem = () => {                                                       
+//     const match = Object.keys(options)                                          
+//       .find((key) => options[key][name] == item);                               
+//     // if entry is in list of options and does not already exist in the list.   
+//     if (match && !items.includes(match)) {                                      
+//       setItems(name, [...items, match]); // XXX: added first param              
+//       setItem(name, []); // XXX: added first param                              
+//     }                                                                           
+//   };                                                                            
+//                                                                                 
+//   const listStyle = {                                                           
+//     border: '1px solid #DDD',                                                   
+//     borderRadius: '10px',                                                       
+//     minHeight: '85px',                                                          
+//     padding: '5px',                                                             
+//     marginBottom: '15px',                                                       
+//     display: 'flex',                                                            
+//     flexDirection: 'column',                                                    
+//   };                                                                            
+//                                                                                 
+//   const listItemStyle = {                                                       
+//     width: '100%',                                                              
+//     display: 'flex',                                                            
+//     alignItems: 'flex-start',                                                   
+//     flexDirection: 'row',                                                       
+//     justifyContent: 'space-between',                                            
+//   };                                                                            
+//                                                                                 
+//   const itemsDisplay = items.map((item, i) => {                                 
+//     const style = {                                                             
+//       color: '#DDDDDD',                                                         
+//       marginLeft: 10,                                                           
+//       cursor: 'pointer',                                                        
+//     };                                                                          
+//     return (                                                                    
+//       <div key={i} style={listItemStyle}>                                       
+//         <div>{options[item][name]}</div>                                        
+//         <div                                                                    
+//           className='glyphicon glyphicon-remove'                                
+//           onClick={() => removeItem(i)}                                         
+//           style={style}                                                         
+//         />                                                                      
+//       </div>                                                                    
+//     );                                                                          
+//   });                                                                           
+//                                                                                 
+//   const error = errorMessage instanceof Array ?                                 
+//     errorMessage.join(' ') : errorMessage;                                      
+//   return (                                                                      
+//     <div style={{display: 'flex', justifyContent: 'space-between'}}>            
+//       <div style={{flex: '0.47'}}>                                              
+//         <FormHeader header={label + ' Input'}/>                                 
+//         <InlineField weights={[1, 0]}>                                          
+//           <TextboxElement                                                       
+//             name={name}                                                         
+//             onUserInput={(name, value) => setItem(value)}                       
+//             value={item}                                                        
+//             errorMessage={error}                                                
+//           />                                                                    
+//           <Button                                                               
+//             label='Add'                                                         
+//             onClick={addItem}                                                   
+//           />                                                                    
+//         </InlineField>                                                          
+//       </div>                                                                    
+//       <div style={{flex: '0.47'}}>                                              
+//         <FormHeader header={label + ' List'}/>                                  
+//         <div style={listStyle}>                                                 
+//           {itemsDisplay}                                                        
+//         </div>                                                                  
+//       </div>                                                                    
+//     </div>                                                                      
+//   );                                                                            
+// }                                                                               
+//                                                                                 
+// /**                                                                             
+//  * Inline Field                                                                 
+//  *                                                                              
+//  * @return {JSX}                                                                
+//  */                                                                             
+// function InlineField({children, label = '', weights = []}) {                    
+//   const fields = React.Children.map(children, (child, i) => {                   
+//     return (                                                                    
+//       <div style={{flex: weights[i] || 0}}>                                     
+//         {child}                                                                 
+//       </div>                                                                    
+//     );                                                                          
+//   });                                                                           
+//                                                                                 
+//   const inlineStyle = {                                                         
+//     display: 'flex',                                                            
+//     flexFlow: 'row',                                                            
+//     justifyContent: 'spaceBetween',                                             
+//   };                                                                            
+//   return (                                                                      
+//     <div style={inlineStyle}>                                                   
+//       {fields}                                                                  
+//     </div>                                                                      
+//   );                                                                            
+// }                                                                               
diff --git a/jsx/forms/ListForm.tsx b/jsx/forms/ListForm.tsx
new file mode 100644
index 00000000..8adfd447
--- /dev/null
+++ b/jsx/forms/ListForm.tsx
@@ -0,0 +1,98 @@
+import React, { useState, useCallback, ReactElement } from 'react';
+import { Entity, EntitiesHook } from '../entities';
+import Styles from '../styles';
+import Button from '../styles/button';
+import { Input } from './Form';
+
+const { Grid, Item, Row, ActionTitle} = Styles.Layout;
+
+export const ListForm = <E extends Entity<T>, T extends object>({
+  list,
+  listItemComponent: ListItemComponent
+}: {
+  list: EntitiesHook<E, T>,
+  listItemComponent: React.ComponentType<{
+    id: string,
+    entity: E,
+    update: EntitiesHook<E, T>['update'],
+  }>,
+}): ReactElement => {
+  const { entities, add, remove, update} = list;
+  const [multiplier, setMultiplier] = useState(1);
+  const [collapsedStates, setCollapsedStates] = useState(new Map());
+
+  const toggleCollapse = useCallback((key) => {
+    setCollapsedStates(prevStates => new Map(prevStates).set(key, !prevStates.get(key)));
+  }, []);
+
+  // Duplicate the last subform based on the multiplier
+  const duplicate = useCallback(() => {
+    if (entities.size > 0) {
+      const lastKey = Array.from(entities.keys()).pop(); // Get the last key
+      const lastEntity = entities.get(lastKey);
+      for (let i = 0; i < multiplier; i++) {
+        // Presuming add function creates a new ID automatically and returns it
+        const newKey = add(lastEntity.getData());
+        setCollapsedStates(prevStates => new Map(prevStates).set(newKey, false));
+      }
+    }
+  }, [entities, multiplier, add]);
+
+  return (
+    <>
+      {Array.from(entities.entries()).map(([key, entity]) => (
+        <ListItem
+          id={key}
+          collapsed={collapsedStates.get(key)}
+          removeSelf={() => remove(key)}
+          toggleCollapse={() => toggleCollapse(key)}
+        >
+          <ListItemComponent id={key} entity={entity} update={list.update}/>
+        </ListItem>
+      ))}
+      <Row>
+        <Button.Add onClick={() => add({})}/>
+        <ActionTitle>New Entry</ActionTitle>
+        <Button.Duplicate onClick={duplicate}/>
+        <ActionTitle>
+          <Input
+            name='multiplier'
+            type='number'
+            min={1}
+            max={10}
+            value={multiplier}
+            onChange={(name, value) => setMultiplier(Number(value))}
+          />
+          Copies
+        </ActionTitle>
+      </Row>
+    </>
+  );
+};
+
+const ListItem: React.FC<{
+  id: string;
+  collapsed: boolean;
+  removeSelf: () => void;
+  toggleCollapse: () => void;
+  children: React.ReactNode;
+}> = ({ id, collapsed, removeSelf, toggleCollapse, children }) => {
+                                                                             
+  return (                                                                   
+    <Grid columns="4fr 1fr">
+      <Item column='1 / 2'>Barcode {id}</Item>
+      <Item column='2 / 3'>
+        <Row>
+          <Styles.Form.CollapseButton collapsed={collapsed} onClick={toggleCollapse}/>
+          <Button.Remove onClick={removeSelf}/>                              
+        </Row>
+      </Item>
+      <Item column='1 / 3' row='2'>
+        <Styles.Form.CollapsibleContent collapsed={collapsed}>
+          {children}                                                
+        </Styles.Form.CollapsibleContent>                                                                 
+      </Item>
+    </Grid>
+  );    
+};
+
diff --git a/jsx/forms/PoolField.tsx b/jsx/forms/PoolField.tsx
new file mode 100644
index 00000000..97126d18
--- /dev/null
+++ b/jsx/forms/PoolField.tsx
@@ -0,0 +1,74 @@
+import React, { useState, useEffect } from 'react';
+import { FieldConfiguration } from '../types';
+import { Pool, IPool, PoolHook, usePoolContext } from '../entities';
+import { useRequest } from '../hooks';
+import { BiobankContextType } from '../contexts';
+import { BaseAPI } from '../APIs';
+import { DynamicField } from '../forms';
+import { mapFormOptions } from '../utils';
+
+type PoolFields = Pick<IPool, 'label' | 'quantity' | 'unit' |
+    'type' | 'candidate' | 'session' | 'specimens' | 'date' | 'time'>;
+type PoolConfig = FieldConfiguration<IPool, keyof PoolFields>;
+
+const poolFieldConfig: Record<keyof PoolFields, PoolConfig> = {
+  label: {
+    label: 'Label',
+    type: 'text',
+    required: true,
+  },
+  quantity: {
+    label: 'Quantity',
+    type: 'text',
+    required: true,
+  },
+  unit: {
+    label: 'Units',
+    type: 'text',
+    required: true,
+    getOptions: () => useRequest(new BaseAPI('unit').get()),
+  },
+  type: {
+    label: 'Type',
+    type: 'static',
+  },
+  candidate: {
+    label: 'Candidate',
+    type: 'static',
+  },
+  session: {
+    label: 'Session',
+    type: 'static',
+  },
+  specimens: {
+    label: 'Specimens',
+    type: 'search',
+    required: true,
+    getOptions: (context) => context.specimens.data,
+    format: (specimen) => specimen.container.barcode
+  } as FieldConfiguration<IPool, 'specimens'>, // this is so frustrating and
+  // leads me to believe that each field might have to be split into its own type
+  date: {
+    label: 'Date',
+    type: 'date',
+    required: true,
+  },
+  time: {
+    label: 'Time',
+    type: 'time',
+    required: true,
+  },
+}
+
+export const PoolField: React.FC<{
+  property: keyof IPool,
+  isStatic?: boolean,
+}> = ({
+  property,
+  isStatic,
+}) => {
+  const pool = usePoolContext();
+  const field = poolFieldConfig[property];
+  return <DynamicField property={property} hook={pool} field={field}
+  isStatic={isStatic}/>
+}
diff --git a/jsx/forms/PoolForm.tsx b/jsx/forms/PoolForm.tsx
new file mode 100644
index 00000000..94c88761
--- /dev/null
+++ b/jsx/forms/PoolForm.tsx
@@ -0,0 +1,39 @@
+import Modal from 'Modal';
+import { PoolField, SpecimenField, StaticField} from '../forms';
+import { PoolAPI } from '../APIs';
+import { usePool, PoolProvider } from '../entities';
+import dict from '../i18n/en.json';
+
+const PoolForm = ({
+  onClose,
+  show,
+}: {onClose: () => void, show: boolean}) => {
+  const pool = usePool();
+
+  if (!show) return null;
+
+  return (
+    <Modal
+      title='Pool Specimens'
+      show={show}
+      onClose={onClose}
+      onSubmit={() => new PoolAPI().create(pool)}
+      throwWarning={true}
+    >
+      <PoolProvider pool={pool}>
+        <StaticField label='Pooling Note' value={dict.noteForPools}/>
+        <PoolField property={'type'} isStatic/>
+        <PoolField property={'candidate'} isStatic/>
+        <PoolField property={'session'} isStatic/>
+        <PoolField property={'specimens'}/>
+        <PoolField property={'label'}/>
+        <PoolField property={'quantity'}/>
+        <PoolField property={'unit'}/>
+        <PoolField property={'date'}/>
+        <PoolField property={'time'}/>
+      </PoolProvider>
+    </Modal>
+  );
+}
+
+export default PoolForm;
diff --git a/jsx/forms/ProcessForm.tsx b/jsx/forms/ProcessForm.tsx
new file mode 100644
index 00000000..dd05be09
--- /dev/null
+++ b/jsx/forms/ProcessForm.tsx
@@ -0,0 +1,43 @@
+import { ReactElement } from 'react';
+import { Button, CustomFields, ProcessField } from '../forms';
+import { ISpecimenType, ProcessHook, ProcessProvider} from '../entities';
+
+type ProcessFormProps = {
+  process: ProcessHook,
+  processStage: string,
+  type: ISpecimenType,
+  edit?: boolean,
+  hideProtocol?: boolean,
+};
+
+function ProcessForm({
+  process,
+  processStage,
+  type,
+  edit,
+  hideProtocol,
+}: ProcessFormProps): ReactElement {
+
+  if (!type) return null;
+
+  return (
+    <ProcessProvider process={process}>
+      {!hideProtocol && (
+        <ProcessField property={'protocol'}/>
+      )}
+      <ProcessField property={'examiner'}/>
+      <ProcessField property={'date'}/>
+      <ProcessField property={'time'}/>
+      {processStage === 'collection' && (
+        <>
+          <ProcessField property={'quantity'}/>
+          <ProcessField property={'unit'}/>
+        </>
+      )}
+      <div className='form-top'/>
+      <ProcessField property={'comments'}/>
+    </ProcessProvider>
+  );
+};
+
+export default ProcessForm;
diff --git a/jsx/forms/ShipmentField.tsx b/jsx/forms/ShipmentField.tsx
new file mode 100644
index 00000000..1e0f32e3
--- /dev/null
+++ b/jsx/forms/ShipmentField.tsx
@@ -0,0 +1,118 @@
+import { FieldConfiguration } from '../types';
+import { useShipmentContext, useLogContext, Shipment, IShipment, IUser, ShipmentHook, Log, ILog, LogHook } from '../entities';
+import { BaseAPI, ShipmentAPI } from '../APIs';
+import { DynamicField } from '../forms';
+import { useRequest } from '../hooks';
+
+type ShipmentFields = Pick<IShipment, 'barcode' | 'type' | 'containers' |
+  'originCenter' | 'destinationCenter'>; 
+type ShipmentFieldConfig = FieldConfiguration<IShipment, keyof ShipmentFields>;
+
+const shipmentFieldConfig: Record<keyof ShipmentFields, ShipmentFieldConfig> = {
+  barcode: {                                                                    
+    label: 'Barcode',                                                           
+    type: 'text',                                                               
+    required: true,                                                             
+  },                                                                            
+  type: {                                                                     
+    label: 'Container Type',                                                              
+    type: 'select',                                                             
+    required: true,                                                             
+    getOptions: () => useRequest(new ShipmentAPI().getTypes())
+  },                                                                            
+  containers: {                                                                     
+    label: 'Containers',                                                              
+    type: 'input',                                                             
+    required: true,                                                             
+    getOptions: () => useRequest(new ShipmentAPI().getTypes())
+  },                                                                            
+  originCenter: {                                                                     
+    label: 'Origin Center',                                                              
+    type: 'select',                                                             
+    required: true,                                                             
+    getOptions: () => useRequest(new BaseAPI('centers').get())   
+  },                                                                            
+  destinationCenter: {                                                                     
+    label: 'Destination Center',                                                              
+    type: 'select',                                                             
+    required: true,                                                             
+    getOptions: () => useRequest(new BaseAPI('centers').get())   
+  }                                                                            
+};                                                                              
+                                                                                
+export const ShipmentField: React.FC<{                                         
+  property: keyof IShipment,                                                    
+  isStatic?: boolean
+}> = ({                                                                         
+  property,                                                                     
+  isStatic,
+}) => {                                                                         
+  const shipment = useShipmentContext();                                           
+  const field = logFieldConfig[property];                                 
+  return (
+    <DynamicField
+      property={property}
+      hook={shipment}
+      field={field}
+      isStatic={isStatic}
+     />   
+  );
+};    
+
+
+type LogFields = Pick<ILog, 'center' | 'status' | 'temperature' | 'date' | 'time' | 'user' | 'comments'>;
+type LogFieldConfig = FieldConfiguration<ILog, keyof LogFields>;
+
+const logFieldConfig: Record<keyof LogFields, LogFieldConfig> = {
+  center: {                                                                     
+    label: 'Center',                                                              
+    type: 'select',                                                             
+    required: true,                                                             
+    getOptions: () => useRequest(new BaseAPI('centers').get())   
+  },                                                                            
+  status: {                                                                     
+    label: 'Status',                                                              
+    type: 'select',                                                             
+    required: true,                                                             
+    getOptions: () => useRequest(new BaseAPI('centers').getStatuses())   
+  },                                                                            
+  temperature: {                                                                    
+    label: 'Temperature',                                                           
+    type: 'text',                                                               
+    required: true,                                                             
+  },                                                                            
+  date: {                                                                    
+    label: 'Date',                                                           
+    type: 'date',                                                               
+    required: true,                                                             
+  },                                                                            
+  time: {                                                                    
+    label: 'Time',                                                           
+    type: 'time',                                                               
+    required: true,                                                             
+  },                                                                            
+  user: {                                                                    
+    label: 'Done By',                                                           
+    type: 'select',                                                               
+    required: true,                                                             
+    getOptions: () => useRequest(new BaseAPI('users').get()),
+  },                                                                            
+  comments: {                                                                    
+    label: 'Comments',                                                           
+    type: 'textarea',                                                               
+    required: true,                                                             
+  },                                                                            
+};                                                                              
+
+export const LogField: React.FC<{                                         
+  property: keyof ILog,                                                    
+  isStatic?: boolean,
+}> = ({                                                                         
+  property,                                                                     
+  isStatic,
+}) => {                                                                         
+  const log = useLogContext();
+  const field = logFieldConfig[property];                                 
+  return <DynamicField property={property} hook={log} field={field}
+  isStatic={isStatic}/>   
+}    
diff --git a/jsx/forms/SpecimenField.tsx b/jsx/forms/SpecimenField.tsx
new file mode 100644
index 00000000..fd1bec8d
--- /dev/null
+++ b/jsx/forms/SpecimenField.tsx
@@ -0,0 +1,191 @@
+import React, { useState, useEffect } from 'react';
+import { FieldConfiguration } from '../types';
+import { ISpecimen, SpecimenHook, useSpecimenContext, useProcessContext, IProcess, ProcessHook, IData, DataHook } from '../entities';
+import { DynamicField } from '../forms';
+import { useRequest } from '../hooks';
+import Utils from '../utils';
+import { SpecimenAPI, BaseAPI } from '../APIs';
+import { Operator } from '../APIs/Query';
+import { mapFormOptions } from '../utils';
+
+type SpecimenFields = Pick<ISpecimen, 'candidate' | 'session' | 'type' | 'quantity' | 'unit' | 'fTCycle' |
+  'projects'>;
+
+const getSpecimenFieldConfig = (
+  specimen: SpecimenHook
+): Record<keyof SpecimenFields, FieldConfiguration<ISpecimen, keyof SpecimenFields>> => ({
+  candidate: {
+    label: "PSCID",
+    type: 'search',
+    required: true,
+    placeholder: 'Search for a PSCID',
+    getOptions: () => Utils.mapLabel(useRequest(new BaseAPI('candidates').get())),
+  },
+  session: {
+    label: 'Visit Label',
+    type: 'select',
+    required: true,
+    disabled: !specimen.candidate,
+    // autoSelect: true,
+    getOptions: (context) => {
+      return specimen.candidate ?
+        Utils.mapLabel(useRequest(new BaseAPI('sessions').get({field: 'candidate', value:
+                                    specimen.candidate.label})))
+      : {}
+    },
+  },
+  type: {
+    label: 'Specimen Type',
+    type: 'select',
+    required: true,
+    getOptions: (context) => {
+      // let specimenTypes;
+      if (specimen.parents) {
+        return Utils.mapLabel(useRequest(new SpecimenAPI().getTypes({
+          field: 'parents',
+          value: specimen.parents[0].type.label,
+          operator: Operator.Includes 
+        })));
+      }
+
+      return Utils.mapLabel(useRequest(new SpecimenAPI().getTypes()));
+    }
+  },
+  quantity: {
+    label: 'Quantity',
+    type: 'text',
+    required: true,
+  },
+  unit: {
+    label: 'Units',
+    type: 'text',
+    required: true,
+    disabled: !specimen.type,
+    getOptions: (context) => {
+      return specimen.type ? Utils.mapLabel(specimen.type.units) : {};
+    }
+  },
+  fTCycle: {
+    label: 'Freeze-Thaw Cycle',
+    type: 'number',
+    required: true,
+  },
+  projects: {
+    label: 'Projects',
+    type: 'select',
+    multiple: true,
+    required: true,
+    disabled: !specimen.candidate,
+    getOptions: () => useRequest(new BaseAPI('projects').get()),
+  },
+})
+
+// export const SpecimensField: React.FC<{
+// }> = () => {
+//   const specimens = useSpecimensContext();
+//   const field = {
+//     label: 'Search Specimen',
+//     type: 'input',
+//     getOptions: () => {
+//       const barcodesPrimary = useMemo(() => {
+//         return Object.values(contextSpecimens).reduce((result, specimen: ISpecimen) => {
+//           if (!specimens.entities.has(specimen.id)) {
+//             result[specimen.barcode] = specimen.barcode;
+//           }
+//           return result;
+//         }, {} as Record<string, string>);
+//       }, [contextSpecimens, specimens.entities]);
+//     },
+//   };
+// 
+//   return <DynamicField property={'barcode'} hook={specimens} field={field}/>
+// }
+
+export const SpecimenField: React.FC<{
+  property: keyof ISpecimen,
+  isStatic?: boolean
+}> = ({ property, isStatic }) => {
+  const specimen = useSpecimenContext();
+  const field = getSpecimenFieldConfig(specimen)[property];
+  return <DynamicField property={property} hook={specimen} field={field} isStatic={isStatic}/>
+}
+
+type ProcessFields = Pick<IProcess, 'protocol' | 'quantity' | 'unit' |
+  'examiner' | 'date' | 'time' | 'comments'>;
+type ProcessFieldConfig = FieldConfiguration<IProcess, keyof ProcessFields>;
+
+const getProcessFieldConfig = (
+  specimen: SpecimenHook
+): Record<keyof ProcessFields, ProcessFieldConfig> => ({
+  protocol: {
+    label: 'Protocol',
+    type: 'select',
+    required: true,
+    getOptions: (context)  => {
+       return Utils.mapLabel(useRequest(new SpecimenAPI().getProtocols())
+       .find(protocol => protocol.type.label === specimen.type.label));
+       // TODO: I need to add to this that it matches the current process stage.
+    },
+  },
+  quantity: {
+    label: 'Quantity',
+    type: 'text',
+    required: true,
+  },
+  unit: {
+    label: 'Unit',
+    type: 'select',
+    required: true,
+    getOptions: (context)  => {
+       return Utils.mapLabel(useRequest(new SpecimenAPI().getTypes())
+       .find(type => type.label === specimen.type.label));
+    },
+  },
+  examiner: {
+    label: 'Done By',
+    type: 'text',
+    required: true,
+    getOptions: () => Utils.mapLabel(useRequest(new BaseAPI('examiner').get())),
+  },
+  date: {
+    label: 'Date',
+    type: 'date',
+    required: true,
+  },
+  time: {
+    label: 'Time',
+    type: 'time',
+    required: true,
+  },
+  comments: {
+    label: 'Comments',
+    type: 'textarea',
+    required: true,
+  },
+});
+
+export const ProcessField: React.FC<{
+  property: keyof IProcess,
+}> = ({
+  property,
+}) => {
+  const specimen = useSpecimenContext()
+  const process = useProcessContext();
+  const field = getProcessFieldConfig(specimen)[property];
+  return <DynamicField property={property} hook={process} field={field}/>;
+}
+
+
+const dataFieldConfig: Record<keyof IData, FieldConfiguration<IData, keyof IData>> = {
+};
+
+export const DataField: React.FC<{
+  property: keyof IData,
+  data: DataHook,
+}> = ({
+  property,
+  data
+}) => {
+  const field = dataFieldConfig[property];
+  return <DynamicField property={property} hook={data} field={field}/>
+}
diff --git a/jsx/forms/SpecimenForm.tsx b/jsx/forms/SpecimenForm.tsx
new file mode 100644
index 00000000..f6bf59ad
--- /dev/null
+++ b/jsx/forms/SpecimenForm.tsx
@@ -0,0 +1,177 @@
+import React, { useState, useEffect, ReactElement, useRef} from 'react';
+import { ContainerParentForm, SpecimenField, ContainerField, ProcessForm,
+  ListForm } from '../forms';
+import Modal from 'Modal';
+import { LabelAPI, SpecimenAPI } from '../APIs';
+import { mapFormOptions, clone, padBarcode } from '../utils';
+import { useBiobankContext } from '../hooks';
+import {
+  ISpecimen,
+  Specimen,
+  SpecimenHook,
+  SpecimenProvider,
+  useSpecimen,
+  useContainer,
+  useEntities,
+  EntitiesHook,
+} from '../entities';
+import {
+  CheckboxField,
+  StaticField,
+} from './';
+import dict from '../i18n/en.json';
+declare const loris: any;
+
+type SpecimenFormProps = {
+  parent?: SpecimenHook,
+  show: boolean,
+  onClose: () => void,
+  title: string,
+};
+
+function SpecimenForm({
+  parent,
+  show,
+  onClose,
+  title,
+}: SpecimenFormProps): ReactElement {
+
+  const specimen = useSpecimen(new Specimen({}));
+  const specimens = useEntities<Specimen, ISpecimen>(Specimen);
+  const [printBarcodes, setPrintBarcodes] = useState(false);
+
+  useEffect(() => {
+    // specimen.set('parentSpecimens', Object.values(parent).map((item) => item.specimen.id));
+    if (parent) {
+      specimen.set('candidate', parent.candidate);
+      specimen.set('session', parent.session);
+      specimen.set('type', parent.type);
+      specimen.container.set('center', parent.container.center);
+    }
+
+    // if (parent.length > 1) {
+    //   specimen.set('quantity', 0)
+    // }
+  }, [parent]); // Dependency array, effect runs when `parent` changes
+
+
+  /**
+  * Handle the submission of a form
+  *
+  * @return {Promise}
+  */
+  const handleSubmit = async () => {
+
+    try {
+      if (printBarcodes) {
+        await new LabelAPI().create(specimens);
+      }
+      await new SpecimenAPI().create(specimen);
+      // Handle success (e.g., show a success message, navigate to another page, etc.)
+    } catch (error) {
+      // Handle error (e.g., show an error message, log the error, etc.)
+      console.error(error);
+    }
+  };
+
+  const renderGlobalFields = () => {
+    if (parent && specimen.candidate && specimen.session) {
+      const parentBarcodes = Object.values(parent).map(
+        (item) => item.barcode
+      );
+      const parentBarcodesString = parentBarcodes.join(', ');
+      return (
+        <div>
+          <StaticField
+            label="Parent Specimen(s)"
+            value={parentBarcodesString}/>
+          <SpecimenField property={'candidate'} isStatic/>
+          <SpecimenField property={'session'} isStatic/>
+        </div>
+      );
+    } else {
+      return (
+        <>
+          <SpecimenField property='candidate'/>
+          <SpecimenField property='session'/>
+        </>
+      );
+    }
+  };
+
+
+  return (
+    <Modal
+      title={title}
+      show={show}
+      onClose={() => onClose()}
+      onSubmit={() => new SpecimenAPI().create(specimens)}
+      throwWarning={true}
+    >
+      <SpecimenProvider specimen={specimen}>
+        <div className='row'>
+          <div className="col-xs-11">
+            <StaticField label='Note' value={parent ? dict.noteForAliquots : dict.noteForSpecimens}/>
+            {renderGlobalFields()}
+            <SpecimenField property={'projects'}/>
+            {parent && (
+              <>
+                <SpecimenField property={'quantity'} />
+                <SpecimenField property={'unit'} />
+              </>
+            )}            
+          </div>
+        </div>
+      </SpecimenProvider>
+      <ListForm list={specimens} listItemComponent={SpecimenBarcodeForm}/>
+      <br/>
+      <div className='form-top'/>
+      <ContainerParentForm
+        container={specimen.container}
+        display={true}
+      />
+      <div className='form-top'/>
+      <CheckboxField
+        name='printBarcodes'
+        label='Print Barcodes'
+        onChange={(name, value) => setPrintBarcodes(!!value)}
+        value={printBarcodes}
+      />
+    </Modal>
+  );
+}
+
+const SpecimenBarcodeForm: React.FC<{
+  id: string,
+  entity: Specimen,
+  update: EntitiesHook<Specimen, ISpecimen>['update'],
+}> = ({
+  id,
+  entity,
+  update,
+}) => {
+
+  const specimen = useSpecimen(entity);
+
+  useEffect(() => {
+    update(id, specimen.getData());
+  }, [specimen.getData()]);
+
+  return (
+    <SpecimenProvider specimen={specimen}>
+      <ContainerField property={'barcode'}/>
+      <SpecimenField property={'type'}/>
+      <ContainerField property={'type'}/>
+      <ContainerField property={'lotNumber'}/>
+      <ContainerField property={'expirationDate'}/>
+      <ProcessForm
+        edit={true}
+        process={specimen.collection}
+        processStage='collection'
+        type={specimen.type}
+      />
+    </SpecimenProvider>
+  );
+}
+
+export default SpecimenForm;
diff --git a/jsx/forms/index.ts b/jsx/forms/index.ts
new file mode 100644
index 00000000..c9a09fa4
--- /dev/null
+++ b/jsx/forms/index.ts
@@ -0,0 +1,22 @@
+// components index.js
+// TODO: convert to named exports by removing 'default' here and in component
+// file.
+export * from './Form';
+export { default as EditEntitiesForm } from './EditEntitiesForm';                     
+export { default as BatchProcessForm } from './BatchProcessForm';               
+export { default as ContainerForm } from './ContainerForm';                     
+export { default as ContainerParentForm } from './ContainerParentForm';         
+export { DynamicField } from './DynamicField';
+export { ContainerField } from './ContainerField';
+export { SpecimenField, ProcessField, DataField } from './SpecimenField';
+export { PoolField } from './PoolField';
+export { ShipmentField, LogField } from './ShipmentField';
+export { default as CustomFields } from './CustomFields';                       
+// TODO: update this once I convert List components to functional
+export { ListForm } from './ListForm';                               
+export { default as PoolForm } from './PoolForm';               
+export { default as ProcessForm } from './ProcessForm';                         
+export { default as SpecimenForm } from './SpecimenForm';                       
+
+
+
diff --git a/jsx/forms/oldBatchEditForm.tsx b/jsx/forms/oldBatchEditForm.tsx
new file mode 100644
index 00000000..d4562bd1
--- /dev/null
+++ b/jsx/forms/oldBatchEditForm.tsx
@@ -0,0 +1,351 @@
+import React, { ReactNode, ReactElement, useState, useEffect, useMemo } from 'react';
+import { ProcessForm, SpecimenField, ContainerField, InputList } from '../forms';
+import { VerticalTabs, TabPane } from 'Tabs';
+import Modal from 'Modal';
+import Loader from 'Loader';
+import { mapFormOptions, clone, isEmpty } from '../utils';
+import { useBiobankContext, useEditable } from '../hooks';
+import dict from '../i18n/en.json';
+import {
+  Specimen,
+  ISpecimen,
+  IContainer,
+  EntitiesHook,
+  Entity,
+  useContainer,
+  useSpecimen,
+  usePool,
+  useProcess,
+  useEntities,
+  SpecimenProvider,
+  ContainerProvider,
+} from '../entities';
+import { StaticField, CheckboxField } from './Form';
+import Swal from 'sweetalert2';
+
+const BatchEditForm: React.FC<{
+  show: boolean,
+  onClose: () => void,
+}> = ({
+  show,
+  onClose,
+}) => {
+  const container = useContainer();
+  const specimen = useSpecimen();
+
+  const pool = usePool();
+  const specimens = useEntities(Specimen);
+  const [type, setType] = useState();
+  const collection = useProcess();
+  const preparation = useProcess();
+  const [count, setCount] = useState(0);
+
+  const { options, pools, ...context } = useBiobankContext();
+  const { editable, edit, clear } = useEditable({global: true});
+
+  /**
+   * Add a new list item to a container
+   *
+   * FIXME: SHOULD LIKELY GO INTO A HIGHER LEVEL COMPONENT
+   *
+   * @param {int} container - the container to add an item to
+   */
+  // const addListItem = (containerBarcode) => {
+    // const newList = clone(list);
+    // const newCollection = clone(collection);
+    // const newPreparation = clone(preparation);
+    // const newCount = clone(count) + 1;
+    // const newShow = clone(show);
+
+    // // Set Specimen and Container.
+    // const container = containers[containerId];
+    // const specimen = specimens[container.specimenId];
+
+    // // Set current global values.
+    // const newTypeId = specimen.typeId;
+
+    // // Set list values.
+    // newList[newCount] = {specimen, container};
+
+    // // This determines if every specimen in the list has the same collection
+    // // protocol.
+    // newShow.collection = Object.keys(newList).length > 1 && Object.values(newList)
+    // .every((item, i, listArray) => {
+    //   return item.specimen.collection &&
+    //     item.specimen.collection.protocolId ===
+    //     listArray[0].specimen.collection.protocolId;
+    // });
+
+    // // If so, set the collection protocolId.
+    // if (newShow.collection) {
+    //   newCollection.protocolId = newList[
+    //     Object.keys(newList)[0]
+    //   ].specimen.collection.protocolId;
+    // }
+
+    // // This determines if every specimen in the list has the same preparation
+    // // protocol.
+    // newShow.preparation = Object.keys(newList).length > 1 && Object.values(newList)
+    // .every((item, i, listArray) => {
+    //   return item.specimen.preparation &&
+    //     item.specimen.preparation.protocolId ===
+    //     listArray[0].specimen.preparation.protocolId;
+    // });
+
+    // // If so, set the preparation protocolId.
+    // if (newShow.preparation) {
+    //   newPreparation.protocolId = newList[
+    //     Object.keys(newList)[0]
+    //   ].specimen.preparation.protocolId;
+    // }
+
+    // setList(newList);
+    // setCollection(newCollection);
+    // setPreparation(newPreparation);
+    // setCount(newCount);
+    // setShow(newShow);
+  // }
+
+  /**
+   * Set a pool?
+   *
+   * @param {string} name - the pool name
+   * @param {int} poolId - the pool id
+   */
+  // const setPool = (name, pool) => {
+    // const pool = clone(pools[pool]);
+
+    // // This struture is what allows pools to be loaded and then have the pool
+    // // label disappear once the barcodes have been added to the list.
+    // setLoading(true);
+    // setPool(pool)
+    // .then(() => Promise.all(pool.specimens
+    //   .map((specimen) => Object.values(list)
+    //     .find((item) => item.specimen.id === specimen)
+    //     || addListItem(specimens[specimen].container))
+    //   .map((p) => p instanceof Promise ? p : Promise.resolve(p))))
+    // .then(() => setPoolId(null))
+    // .then(() => setLoading(false));
+  //}
+
+  const globalForm = type ? (
+    <EditForm>
+      <SpecimenProvider specimen={specimen}>
+        <SpecimenField property={'quantity'}/>
+        <SpecimenField property={'unit'}/>
+        {type.freezeThaw == 1 ? (
+          <SpecimenField property={"fTCycle"}/>
+        ) : null}
+        <ContainerField property={'type'}/>
+        <ContainerField property={'lotNumber'}/>
+        <ContainerField property={'status'}/>
+        <SpecimenField property={'projects'}/>
+      </SpecimenProvider>
+    </EditForm>
+  ) : null;
+
+  const collectionForm = editable.collection ? (
+    <div>
+      <StaticField
+        label='Protocol'
+        value={collection.protocol.label}
+      />
+      <EditForm>
+        <ProcessForm
+          edit={true}
+          process={collection}
+          processStage='collection'
+          type={type}
+          hideProtocol={true}
+          />
+      </EditForm>
+    </div>
+  ) : null;
+
+  const preparationForm = editable.preparation ? (
+    <div>
+      <StaticField
+        label='Protocol'
+        value={preparation.protocol.label}
+      />
+      <EditForm>
+        <ProcessForm
+          edit={true}
+          process={preparation}
+          processStage='preparation'
+          type={type}
+          hideProtocol={true}
+          />
+      </EditForm>
+    </div>
+  ) : null;
+
+  // TODO: This should likely be filtered so that only pools that match the
+  // proper criteria are left in the list.
+  const mappedPools = mapFormOptions(pools, 'label');
+  const glyphStyle = {
+    color: '#DDDDDD',
+    marginLeft: 10,
+    cursor: 'pointer',
+  };
+
+  const BarcodeList = ({ specimens }) => {
+    const barcodeList = useMemo(() => {
+      let items = [];
+
+      specimens.forEach((specimen, key) => {
+        const { barcode } = specimen.getData().container;
+        items.push(
+          <div key={key} className='preparation-item'>
+            <div>{barcode}</div>
+            <div
+              className='glyphicon glyphicon-remove'
+              style={glyphStyle}
+              onClick={() => specimens.remove(key)}
+            />
+          </div>
+        );
+      });
+
+      return items;
+    }, [specimens]);
+
+    return <div>{barcodeList}</div>;
+  };    
+
+  const tabList = [{
+    id: 'global',
+    label: 'Global',
+    error: !isEmpty(specimen.errors) || !isEmpty(container.errors),
+    content: globalForm,
+  }];
+  // TODO: replace with show state eventually...
+  if (true) {
+    tabList.push({
+      id: 'collection',
+      label: 'Collection',
+      error: !isEmpty(specimen.collection.errors),
+      content: collectionForm,
+    });
+  }
+  // TODO: replace with show state eventually...
+  if (true) {
+    tabList.push({
+      id: 'preparation',
+      label: 'Preparation',
+      error: !isEmpty(specimen.preparation.errors),
+      content: preparationForm,
+    });
+  }
+  const tabContent = tabList
+  .map((tab, i) => <TabPane key={i} TabId={tab.id}>{tab.content}</TabPane>);
+
+  const handlePoolInput = (name, value) => value && pool.set(name, value);
+  const handleClose = () => onClose;
+  const handleSubmit = async (): Promise<void> => {
+    // Create a list of prepared specimens
+    const prepList = Array.from(specimens.entities.values()).map((specimen) => {
+      // Clone specimen values
+      const clonedSpecimen = { ...specimen };
+  
+      // Clone values from global container
+      const clonedContainer = { ...container };
+  
+      // Clone collection values to specimen
+      clonedSpecimen.collection = { ...specimen.collection, ...collection };
+  
+      // Clone preparation values to specimen
+      clonedSpecimen.preparation = { ...specimen.preparation, ...preparation };
+  
+      return { specimen: clonedSpecimen, container: clonedContainer };
+    });
+  
+    try {
+      // Call the onSubmit function with the prepared list
+      await onSubmit(prepList);
+    } catch (errors) {
+      // Handle errors (you can set errors in state or handle them accordingly)
+      console.error('Error submitting data:', errors);
+    }
+  };
+
+
+  const editForms = specimens.size > 1 ? (
+    <div className='form-top'>
+      <StaticField label='Editing Note' value={dict.noteForEdit}/>
+      <VerticalTabs
+        tabs={tabList}
+        onTabChange={(id) => edit(id)}
+        updateURL={false}
+      >
+        {tabContent}
+      </VerticalTabs>
+    </div>
+  ) : null;
+
+  return (
+    <Modal
+      title='Edit Specimens'
+      show={show}
+      onClose={handleClose}
+      onSubmit={specimens.entities.size > 1 && handleSubmit}
+      throwWarning={true}
+    >
+      <StaticElement
+        label='Editing Note'
+        text="Select or Scan the specimens to be edited. Specimens
+              must share the same Type."
+      /> 
+      <SpecimenField property={'type'} isStatic/>
+      <InputList label={'Barcode'} list={specimens} options={context.specimens}/>
+      {/*{editForms}*/}
+    </Modal>
+  );
+}
+
+interface FieldProps {
+  entity: Entity<any>;
+  property: keyof any;
+}
+
+const EditForm = ({
+  children,
+}: {children: ReactNode}) => {
+  const editForm = React.Children.map(children, (child: ReactElement<FieldProps>) => {
+    // if (!React.isValidElement(child)) return null;
+
+    const handleClick = (name, value) => {
+      if (!value) {
+        child.props.entity.set(name, null);
+      }
+      if (value && child.props.entity[child.props.property] == null) {
+        child.props.entity.set(name, '');
+      }
+    };
+
+    // XXX: need to find a way to make these fields not required because I
+    // remove this line: {React.cloneElement(child, {required: false})}
+    return React.isValidElement(child) && typeof child.type === 'function' && (
+      <div className="row">
+        <div className="col-xs-12">
+          <div className="row">
+            <div className="col-xs-10">
+              {React.cloneElement(child)}
+            </div>
+            <div className="col-xs-2">
+              <CheckboxField
+                name={child.props.property}
+                value={child.props.entity[child.props.property] != null}
+                onUserInput={handleClick}
+              />
+            </div>
+          </div>
+        </div>
+      </div>
+    );
+  });
+
+  return <>{editForm}</>;
+}
+
+export default BatchEditForm;
diff --git a/jsx/globals.js b/jsx/globals.js
deleted file mode 100644
index b94616d3..00000000
--- a/jsx/globals.js
+++ /dev/null
@@ -1,514 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import {Link} from 'react-router-dom';
-import {mapFormOptions} from './helpers.js';
-
-import Modal from 'Modal';
-import Loader from 'Loader';
-import ContainerParentForm from './containerParentForm';
-
-/**
- * Biobank Globals Component
- *
- * @param {object} props
- * @return {*}
- **/
-function Globals(props) {
-  const {current, data, editable, options, specimen, container} = props;
-  const updateContainer = () => props.updateContainer(current.container);
-  const editContainer = () => props.editContainer(container);
-
-  const specimenTypeField = specimen && (
-    <InlineField
-      label='Specimen Type'
-      value={options.specimen.types[specimen.typeId].label}
-    />
-  );
-
-  const edit = loris.userHasPermission('biobank_specimen_alter')
-    && specimen && (
-    () => {
-      props.edit('containerType');
-      editContainer();
-    }
-  );
-  const containerTypes = mapFormOptions(
-    options.container.typesPrimary,
-    'label'
-  );
-  const containerTypeField = (
-    <InlineField
-      loading={props.loading}
-      label={'Container Type'}
-      updateValue={updateContainer}
-      clearAll={props.clearAll}
-      pencil={true}
-      value={options.container.types[container.typeId].label}
-      edit={edit}
-      editable={editable.containerType}
-    >
-      <SelectElement
-        name='typeId'
-        onUserInput={props.setContainer}
-        options={containerTypes}
-        value={current.container.typeId}
-        errorMessage={props.errors.container.typeId}
-      />
-    </InlineField>
-  );
-
-  const poolField = (specimen||{}).poolId ? (
-    <InlineField
-      label='Pool'
-      value={data.pools[specimen.poolId].label}
-    />
-  ) : null;
-
-  const units = specimen ? mapFormOptions(
-    options.specimen.typeUnits[specimen.typeId], 'label'
-  ) : null;
-  const quantityField = specimen ? (
-    <InlineField
-      loading={props.loading}
-      label='Quantity'
-      clearAll={props.clearAll}
-      updateValue={()=>props.updateSpecimen(current.specimen)}
-      edit={() => props.edit('quantity')}
-      editValue={() => props.editSpecimen(specimen)}
-      value={Math.round(specimen.quantity * 100) / 100+
-      ' '+options.specimen.units[specimen.unitId].label}
-      editable={editable.quantity}
-    >
-      <TextboxElement
-        name='quantity'
-        onUserInput={props.setSpecimen}
-        value={props.current.specimen.quantity}
-        errorMessage={props.errors.specimen.quantity}
-      />
-      <SelectElement
-        name='unitId'
-        options={units}
-        onUserInput={props.setSpecimen}
-        value={props.current.specimen.unitId}
-        errorMessage={props.errors.specimen.unitId}
-      />
-    </InlineField>
-  ) : null;
-
-  const fTCycleField = () => {
-    if (specimen
-        && options.specimen.types[specimen.typeId].freezeThaw == 1) {
-      // const changeCycle = (value) => {
-      //   props.editSpecimen(specimen)
-      //   .then(() => {
-      //     let cycle = specimen.fTCycle;
-      //     cycle = cycle+value;
-      //     props.setSpecimen('fTCycle', cycle);
-      //   })
-      //   .then(()=>props.updateSpecimen(props.current.specimen));
-      // };
-      // const increaseCycle = () => changeCycle(1);
-      // const decreaseCycle = () => changeCycle(-1);
-      // const updateFTCycle = loris.userHasPermission('biobank_specimen_update') ? (
-      //   <div>
-      //     {specimen.fTCycle > 0 ? (
-      //       <div className='action' title='Remove Cycle'>
-      //         <span
-      //           className='action-button update'
-      //           onClick={decreaseCycle}
-      //         >
-      //           <span className='glyphicon glyphicon-minus'/>
-      //         </span>
-      //       </div>
-      //     ) : null}
-      //     <div className='action' title='Add Cycle'>
-      //       <span className='action-button update' onClick={increaseCycle}>
-      //         <span className='glyphicon glyphicon-plus'/>
-      //       </span>
-      //     </div>
-      //   </div>
-      // ) : null;
-
-      const editFTCycle = () => props.edit('fTCycle');
-      return (
-        <InlineField
-          loading={props.loading}
-          label={'Freeze-Thaw Cycle'}
-          clearAll={props.clearAll}
-          updateValue={() => props.updateSpecimen(props.current.specimen)}
-          edit={editFTCycle}
-          editValue={() => props.editSpecimen(specimen)}
-          value={specimen.fTCycle || 0}
-          editable={editable.fTCycle}
-        >
-          <NumericElement
-            name='fTCycle'
-            onUserInput={props.setSpecimen}
-            value={props.current.specimen.fTCycle}
-            errorMessage={props.errors.specimen.fTCycle}
-          />
-        </InlineField>
-      );
-    }
-  };
-
-  const editTemperature = () => props.edit('temperature');
-  const temperatureField = (
-    <InlineField
-      loading={props.loading}
-      label={'Temperature'}
-      clearAll={props.clearAll}
-      updateValue={updateContainer}
-      edit={!container.parentContainerId && editTemperature}
-      editValue={editContainer}
-      value={container.temperature + '°'}
-      editable={editable.temperature}
-    >
-      <TextboxElement
-        name='temperature'
-        onUserInput={props.setContainer}
-        value={props.current.container.temperature}
-        errorMessage={props.errors.container.temperature}
-      />
-    </InlineField>
-  );
-
-  const stati = mapFormOptions(options.container.stati, 'label');
-  const renderCommentsField = () => {
-    if (stati[props.current.container.statusId] !== 'Discarded' &&
-        stati[props.current.container.statusId] !== 'Dispensed' &&
-        stati[props.current.container.statusId] !== 'Shipped') {
-      return [];
-    }
-    return (
-      <TextareaElement
-        name='comments'
-        onUserInput={props.setContainer}
-        value={props.current.container.comments}
-        required={true}
-      />
-    );
-  };
-  const statusField = (
-    <InlineField
-      loading={props.loading}
-      label={'Status'}
-      clearAll={props.clearAll}
-      updateValue={updateContainer}
-      edit={() => props.edit('status')}
-      editValue={editContainer}
-      value={options.container.stati[container.statusId].label}
-      subValue={container.comments}
-      editable={editable.status}
-    >
-      <SelectElement
-        name='statusId'
-        options={stati}
-        onUserInput={props.setContainer}
-        value={props.current.container.statusId}
-        errorMessage={props.errors.container.statusId}
-      />
-      {renderCommentsField()}
-    </InlineField>
-  );
-
-  const projectField = (
-    <InlineField
-      loading={props.loading}
-      label='Projects'
-      clearAll={props.clearAll}
-      updateValue={updateContainer}
-      edit={() => props.edit('project')}
-      editValue={editContainer}
-      value={container.projectIds.length !== 0 ?
-       container.projectIds
-         .map((id) => options.projects[id])
-         .join(', ') : 'None'}
-      editable={editable.project}
-    >
-      <SelectElement
-        name='projectIds'
-        options={props.options.projects}
-        onUserInput={props.setContainer}
-        multiple={true}
-        emptyOption={false}
-        value={props.current.container.projectIds}
-        errorMessage={props.errors.container.projectIds}
-      />
-    </InlineField>
-  );
-
-  const drawField = specimen && (
-    <InlineField
-      label='Draw Site'
-      value={options.centers[
-        options.sessionCenters[specimen.sessionId].centerId
-      ]}
-    />
-  );
-
-  const centerField = (
-    <InlineField
-      label='Current Site'
-      value={options.centers[container.centerId]}
-    />
-  );
-
-  const shipmentField = () => {
-    if (container.shipmentBarcodes.length !== 0) {
-      return (
-        <InlineField
-          label='Shipment'
-          value={container.shipmentBarcodes.slice(-1)[0]}
-        />
-      );
-    }
-  };
-
-  const parentSpecimenField = () => {
-    if ((specimen||{}).parentSpecimenIds) {
-      const parentSpecimenBarcodes = Object.values(specimen.parentSpecimenIds)
-      .map((id) => {
-        const barcode = data.containers[data.specimens[id].containerId].barcode;
-        return <Link to={`/barcode=${barcode}`}>{barcode}</Link>;
-      })
-      .reduce((prev, curr) => [prev, ', ', curr], []);
-
-      return (
-        <InlineField
-          label={'Parent Specimen'}
-          value={parentSpecimenBarcodes || 'None'}
-        />
-      );
-    }
-  };
-
-  // TODO: Find a way to make this conform to the GLOBAL ITEM structure.
-  const parentContainerField = () => {
-    if (loris.userHasPermission('biobank_container_view')) {
-      // Set Parent Container Barcode Value if it exists
-      const parentContainerBarcodeValue = () => {
-        if (container.parentContainerId) {
-          const barcode = data.containers[
-                          container.parentContainerId
-                        ].barcode;
-          return <Link to={`/barcode=${barcode}`}>{barcode}</Link>;
-        }
-      };
-
-      const updateParentContainer = () => {
-        if (loris.userHasPermission('biobank_container_update')) {
-          return (
-            <div>
-              <div className='action' title='Move Container'>
-                <span
-                  className='action-button update'
-                  onClick={() => {
-                    props.edit('containerParentForm');
-                    editContainer();
-                  }}
-                >
-                  <span className='glyphicon glyphicon-chevron-right'/>
-                </span>
-              </div>
-              <div>
-                <Modal
-                  title='Update Parent Container'
-                  onClose={props.clearAll}
-                  show={editable.containerParentForm}
-                  onSubmit={props.uC}
-                >
-                  <ContainerParentForm
-                    display={true}
-                    current={current}
-                    container={container}
-                    options={options}
-                    data={data}
-                    setContainer={props.setContainer}
-                    setCurrent={props.setCurrent}
-                  />
-                </Modal>
-              </div>
-            </div>
-          );
-        }
-      };
-
-      let coordinate;
-      if (container.coordinate) {
-        coordinate = props.getCoordinateLabel(container);
-      }
-
-      return (
-        <div className="item">
-          <div className='field'>
-            Parent Container
-            <div className='value'>
-              {parentContainerBarcodeValue() || 'None'}
-            </div>
-            {(parentContainerBarcodeValue && container.coordinate) ?
-            'Coordinate '+ coordinate : null}
-          </div>
-          {updateParentContainer()}
-        </div>
-      );
-    }
-  };
-
-  const candidateSessionField = specimen ? (
-    <div>
-      <InlineField
-        label='PSCID'
-        value={options.candidates[specimen.candidateId].pscid}
-        link={loris.BaseURL+'/'+specimen.candidateId}
-      />
-      <InlineField
-        label='Visit Label'
-        value={options.sessions[specimen.sessionId].label}
-        link={
-            loris.BaseURL+'/instrument_list/?candID='+
-            specimen.candidateId+'&sessionID='+
-            specimen.sessionId
-        }
-      />
-    </div>
-  ) : null;
-
-  return (
-    <div className="globals">
-      <div className='list'>
-        {specimenTypeField}
-        {containerTypeField}
-        {poolField}
-        {quantityField}
-        {fTCycleField()}
-        {temperatureField}
-        {statusField}
-        {projectField}
-        {drawField}
-        {centerField}
-        {shipmentField()}
-        {parentSpecimenField()}
-        {parentContainerField()}
-        {candidateSessionField}
-      </div>
-    </div>
-  );
-}
-
-Globals.propTypes = {
-};
-
-/**
- * Inline Field
- *
- * @param {object} props
- * @return {*}
- **/
-function Item(props) {
-  return <div className="item">{props.children}</div>;
-}
-
-/**
- * Inline Field
- *
- * @param {object} props
- * @return {*}
- **/
-function InlineField(props) {
-  const fields = React.Children.map(props.children, (child) => {
-    return (
-      <div style={{flex: '1 0 25%', minWidth: '90px'}}>
-        {React.cloneElement(child, {inputClass: 'col-lg-11'})}
-      </div>
-    );
-  });
-
-  // loris.userHasPermission('biobank_container_update') should determine if 'edit'
-  // can be passed in the first place.
-  const editButton = props.edit instanceof Function && !props.editable && (
-    <div className='action' title={'Update '+props.label}>
-      <span
-        className={
-            props.pencil
-              ? 'glyphicon glyphicon-pencil'
-              : 'action-button update'
-        }
-        onClick={() => {
-          props.edit();
-          props.editValue();
-        }}
-      >
-        {!props.pencil && <span className='glyphicon glyphicon-chevron-right'/>}
-      </span>
-    </div>
-  );
-
-  const loader = props.loading && (
-    <React.Fragment>
-      <div style={{flex: '0 1 15%', margin: '0 1%'}}>
-        <Loader size={20}/>
-      </div>
-      <div style={{flex: '0 1 15%', margin: '0 1%'}}>
-        <h5 className='animate-flicker'>Saving...</h5>
-      </div>
-    </React.Fragment>
-  );
-
-  const submitButton = !props.loading && (
-    <React.Fragment>
-      <div style={{flex: '0 1 15%', margin: '0 1%'}}>
-        <Button
-          label="Update"
-          onClick={props.updateValue}
-        />
-      </div>
-      <div style={{flex: '0 1 15%', margin: '0 1%'}}>
-        <a onClick={props.clearAll} style={{cursor: 'pointer'}}>
-          Cancel
-        </a>
-      </div>
-    </React.Fragment>
-  );
-
-  const value = props.link ? (
-    <a href={props.link}>{props.value}</a>
-  ) : props.value;
-
-  const renderField = props.editable ? (
-    <div className='field'>
-      {props.label}
-      <div className='inline-field'>
-        {fields}
-        {submitButton}
-        {loader}
-      </div>
-    </div>
-  ) : (
-    <div className="field">
-      {props.label}
-      {props.pencil && editButton}
-      <div className='value'>
-        {value}
-      </div>
-      {props.subValue}
-    </div>
-  );
-
-  return (
-    <Item>
-      {renderField}
-      {!props.pencil && editButton}
-    </Item>
-  );
-}
-
-InlineField.propTypes = {
-  clearAll: PropTypes.func,
-  specimen: PropTypes.object,
-  updateValue: PropTypes.func,
-  subValue: PropTypes.string,
-  className: PropTypes.string,
-};
-
-export default Globals;
diff --git a/jsx/header.js b/jsx/header.js
deleted file mode 100644
index c0d967e8..00000000
--- a/jsx/header.js
+++ /dev/null
@@ -1,212 +0,0 @@
-import React, {Component} from 'react';
-
-import Modal from 'Modal';
-import LifeCycle from './lifeCycle.js';
-import SpecimenForm from './specimenForm.js';
-
-import Swal from 'sweetalert2';
-
-/**
- * React component to display a header.
- */
-class Header extends Component {
-  /**
-   * Render react component
-   *
-   * @return {JSX}
-   */
-  render() {
-    const {options, container, specimen, editable, current} = this.props;
-    const updateContainer = () =>
-        Promise.resolve(
-          this.props.updateContainer(current.container)
-    );
-
-    const status = options.container.stati[container.statusId].label;
-    const renderActionButton = () => {
-      if (status == 'Available' &&
-          specimen.quantity > 0 &&
-          !specimen.poolId) {
-        const openAliquotForm = () => this.props.edit('aliquotForm');
-        return (
-          <div className='action-button add' onClick={openAliquotForm}>
-            +
-          </div>
-        );
-      } else {
-        return <div className='action-button disabled'>+</div>;
-      }
-    };
-    const addAliquotForm = () => {
-      if (specimen && loris.userHasPermission('biobank_specimen_create')) {
-        return (
-          <div>
-            <div className='action' title='Make Aliquots'>
-              {renderActionButton()}
-            </div>
-            <SpecimenForm
-              title='Add Aliquots'
-              parent={[{specimen: specimen, container: container}]}
-              options={this.props.options}
-              data={this.props.data}
-              current={this.props.current}
-              increaseCoordinate={this.props.increaseCoordinate}
-              show={editable.aliquotForm}
-              onClose={this.props.clearAll}
-              setSpecimen={this.props.setSpecimen}
-              onSubmit={this.props.createSpecimens}
-            />
-          </div>
-        );
-      }
-    };
-
-    const alterLotNumber = () => {
-      if (loris.userHasPermission('biobank_specimen_alter')) {
-        return (
-          <div className='action' title='Alter Lot Number'>
-            <span
-              style={{color: 'grey'}}
-              className='glyphicon glyphicon-pencil'
-              onClick={() => {
-                this.props.edit('lotForm');
-                this.props.editContainer(this.props.container);
-              }}
-            />
-          </div>
-        );
-      }
-    };
-
-    const alterExpirationDate = () => {
-      if (loris.userHasPermission('biobank_specimen_alter')) {
-        return (
-          <div className='action' title='Alter Expiration Date'>
-            <span
-              style={{color: 'grey'}}
-              className='glyphicon glyphicon-pencil'
-              onClick={() => {
-                this.props.edit('expirationForm');
-                this.props.editContainer(this.props.container);
-              }}
-            />
-          </div>
-        );
-      }
-    };
-
-    const lotForm = (
-      <Modal
-        title='Edit Lot Number'
-        onClose={this.props.clearAll}
-        show={editable.lotForm}
-        onSubmit={updateContainer}
-      >
-        <FormElement>
-          <TextboxElement
-            name='lotNumber'
-            label='Lot Number'
-            onUserInput={this.props.setContainer}
-            value={current.container.lotNumber}
-          />
-        </FormElement>
-     </Modal>
-    );
-
-    const expirationForm = (
-      <Modal
-        title='Edit Expiration Date'
-        onClose={this.props.clearAll}
-        show={editable.expirationForm}
-        onSubmit={updateContainer}
-      >
-        <FormElement>
-          <DateElement
-            name='expirationDate'
-            label='Expiration Date'
-            onUserInput={this.props.setContainer}
-            value={current.container.expirationDate}
-          />
-        </FormElement>
-     </Modal>
-    );
-
-    const parentBarcodes = this.props.getParentContainerBarcodes(container);
-    const barcodePathDisplay = this.props.getBarcodePathDisplay(parentBarcodes);
-    const printBarcode = () => {
-      const labelParams = [{
-        barcode: container.barcode,
-        type: options.specimen.types[specimen.typeId].label,
-      }];
-      this.props.printLabel(labelParams)
-        .then(() => (Swal.fire('Print Barcode Number: ' + container.barcode)));
-    };
-
-    return (
-      <div className="specimen-header">
-        <div className='specimen-title'>
-          <div className='barcode'>
-            Barcode
-            <div className='value'>
-              <strong>{container.barcode}</strong>
-            </div>
-            <span className='barcodePath'>
-              Address: {barcodePathDisplay} <br/>
-              Lot Number: {container.lotNumber} {alterLotNumber()}<br/>
-              Expiration Date: {container.expirationDate}{alterExpirationDate()}
-            </span>
-            {lotForm}
-            {expirationForm}
-          </div>
-          <div className='action' title='Print Barcode'>
-            <div className='action-button update' onClick={printBarcode}>
-              <span className='glyphicon glyphicon-print'/>
-            </div>
-          </div>
-          {addAliquotForm()}
-          <ContainerCheckout
-            container={container}
-            current={current}
-            editContainer={this.props.editContainer}
-            setContainer={this.props.setContainer}
-            updateContainer={updateContainer}
-          />
-        </div>
-        <LifeCycle
-          specimen={specimen}
-          centers={options.centers}
-        />
-      </div>
-    );
-  }
-}
-
-/**
- * Biobank Container Checkout
- *
- * @param {object} props
- * @return {*}
- **/
-function ContainerCheckout(props) {
-  const checkoutContainer = () => {
-    props.editContainer(props.container)
-    .then(() => props.setContainer('parentContainerId', null))
-    .then(() => props.setContainer('coordinate', null))
-    .then(() => props.updateContainer());
-  };
-
-  return (loris.userHasPermission('biobank_container_update') &&
-      props.container.parentContainerId) ? (
-      <div className='action'>
-      <div
-        className='action-button update'
-        title='Checkout Container'
-        onClick={checkoutContainer}
-      >
-        <span className='glyphicon glyphicon-share'/>
-      </div>
-      </div>
-  ) : null;
-}
-
-export default Header;
diff --git a/jsx/helpers.js b/jsx/helpers.js
deleted file mode 100644
index ebfdc301..00000000
--- a/jsx/helpers.js
+++ /dev/null
@@ -1,190 +0,0 @@
-import Swal from 'sweetalert2';
-
-/**
- * Clone an object
- *
- * @param {object} object - the object to clone
- *
- * @return {object}
- */
-export function clone(object) {
-  return JSON.parse(JSON.stringify(object));
-}
-
-/**
- * Maps an object values
- *
- * @param {object} object - the object to map
- * @param {?} attribute - the mapping
- *
- * @return {object}
- */
-export function mapFormOptions(object, attribute) {
-  return Object.keys(object).reduce((result, id) => {
-    result[id] = object[id][attribute];
-    return result;
-  }, {});
-}
-
-/**
- * Check if an object is either null or an empty object
- *
- * @param {object} object - the variable to check
- *
- * @return {bool}
- */
-export function isEmpty(object) {
-  if (object == null) {
-    return true;
-  }
-
-  for (let prop in object) {
-    if (object.hasOwnProperty(prop)) {
-      return false;
-    }
-  }
-
-  return JSON.stringify(object) === JSON.stringify({});
-}
-
-/**
- * Pad a barcode
- *
- * @param {string} pscid - a pscid?
- * @param {string} increment - the amount of padding
- *
- * @return {string}
- */
-export function padBarcode(pscid, increment) {
-  return pscid+padLeft(increment, 3);
-}
-
-/**
- * Left pad. Without a library.
- *
- * @param {int} nr - the existing string
- * @param {int} n  - the number to pad to
- * @param {string} str - the string for padding
- *
- * @return {string}
- */
-function padLeft(nr, n, str) {
-    return Array(n-String(nr).length+1).join(str||'0')+nr;
-}
-
-/**
- * Get data from a stream
-
- * @param {string} url - the url
- * @param {callback} setProgress - a callback for each chunk
- */
-export async function getStream(url, setProgress) {
-  const response = await fetch(url, {credentials: 'same-origin', method: 'GET'})
-  .catch(
-     (error, errorCode, errorMsg) =>
-        console.error(error, errorCode, errorMsg));
-  const reader = response.body.getReader();
-  const contentLength = response.headers.get('Content-Length');
-
-  // Step 3: read the data
-  let receivedLength = 0; // received that many bytes at the moment
-  let chunks = ''; // array of received binary chunks (comprises the body)
-  let count = 0;
-  let done = false;
-  while (!done) {
-    const {done, value} = await reader.read();
-
-    if (done) {
-      break;
-    }
-
-    let result = new TextDecoder('utf-8').decode(value);
-    chunks += result;
-    receivedLength += value.length;
-    count++;
-
-    // Subtract 1 from the loading calculation to make sure the loading bar
-    // only disappears when the data is completely loaded (not only specimens)
-    if (setProgress instanceof Function &&
-      (count % 25 == 0 || receivedLength == contentLength)
-    ) {
-      setProgress(Math.round((receivedLength/contentLength) * 100)-1);
-    }
-  }
-
-  return JSON.parse(chunks);
-}
-
-/**
- * Post a GET request to a URL and call a callback on success
- *
- * @param {string} url - the url
- * @param {callback} callBack - the success callback
- */
-export async function get(url, callBack) {
-  const response = await fetch(
-     url,
-     {credientials: 'same-origin', method: 'GET'}
-  ).catch(
-     (error, errorCode, errorMsg) =>
-        console.error(error, errorCode, errorMsg)
-  );
-
-  const values = response.json();
-  if (callBack) {
-    callBack(values);
-  }
-
-  return values;
-}
-
-// function parsePartialJson(str) {
-//   let parsed = '';
-//   try {
-//       parsed = JSON.parse(str+'}}');
-//   } catch (e) {
-//     str = str.slice(0, -1);
-//     parsed = parsePartialJson(str);
-//   }
-//
-//   return parsed;
-// }
-
-/**
- * Post a request to a URL, and call a callback on success or
- * raise a swal on error.
- *
- * @param {object} data - the data to post
- * @param {string} url - the url
- * @param {string} method - the method to use
- * @param {callback} onSuccess - the success callback
- *
- * @return {Promise}
- */
-export async function post(data, url, method, onSuccess) {
-  const response = await fetch(url, {
-    credentials: 'same-origin',
-    method: method,
-    body: JSON.stringify(clone(data)),
-  })
-  .catch((error) => console.error(error));
-
-  if (response.ok) {
-    onSuccess instanceof Function && onSuccess();
-    // both then and catch resolve in case the returned data is not in
-    // json format.
-    return response.json()
-    .catch((data) => data);
-  } else {
-    const data = await response.json();
-
-    if (response.status == 403) {
-      Swal.fire('Action is forbidden or session has timed out.', '', 'error');
-    } else if (response.status === 422) {
-      return Promise.reject(data);
-    } else {
-      Swal.fire(data.error, '', 'error');
-      return Promise.reject(data.error);
-    }
-  }
-}
diff --git a/jsx/hooks/index.js b/jsx/hooks/index.js
new file mode 100644
index 00000000..1548875d
--- /dev/null
+++ b/jsx/hooks/index.js
@@ -0,0 +1,6 @@
+// hooks/index.js
+export { useEditable } from './useEditable';
+export { useRequest } from './useRequest';
+export { useStream } from './useStream';
+export { useBiobankContext } from './useBiobankContext';
+export { useBarcodePageContext } from './useBarcodePageContext';
diff --git a/jsx/hooks/useBarcodePageContext.ts b/jsx/hooks/useBarcodePageContext.ts
new file mode 100644
index 00000000..e1454fc7
--- /dev/null
+++ b/jsx/hooks/useBarcodePageContext.ts
@@ -0,0 +1,12 @@
+import React, { useContext } from 'react';
+import { BarcodePageContext } from '../contexts'; // Adjust the path as necessary
+
+export const useBarcodePageContext = () => {
+  const context = useContext(BarcodePageContext);
+
+  if (context === undefined) {
+    throw new Error('useBarcodePageContext must be used within a BarcodePageProvider');
+  }
+
+  return context;
+};
diff --git a/jsx/hooks/useBiobankContext.ts b/jsx/hooks/useBiobankContext.ts
new file mode 100644
index 00000000..9de69b54
--- /dev/null
+++ b/jsx/hooks/useBiobankContext.ts
@@ -0,0 +1,67 @@
+import React, { useContext } from 'react';
+import { BiobankContext, BiobankContextType } from '../contexts'; // Adjust the path as necessary
+
+// Function to wrap the data array with Proxy for lazy loading
+const wrapDataWithProxy = (dataArray, entityType, context) => {
+  return dataArray.map((entity, index) => wrapEntityWithProxy(entity,
+                                                              entityType,
+  context, index ));
+};
+
+// Function to wrap individual entities with Proxy
+const wrapEntityWithProxy = (entity, entityType, context, index) => {
+  return new Proxy(entity, {
+    get(target, prop, receiver) {
+      let value = target[prop];
+
+      // Lazy loading logic: hydrate the entity if a property is accessed and is undefined
+      if (value === undefined && typeof prop === 'string' && context[entityType]) {
+        const fullEntity = context[entityType].data.find(e => e.id === target.id);
+        if (fullEntity) {
+          context[entityType].updateEntity(index, fullEntity);
+          // Update the target (current object) with the hydrated entity's properties
+          Object.assign(target, fullEntity);
+          value = target[prop];  // Re-attempt to access the property after hydration
+        } else {
+          console.warn(`${entityType} with ID ${target.id} not found in the context`);
+          return undefined;
+        }
+      }
+
+      // Recursively wrap nested objects with Proxy
+      if (typeof value === 'object' && value !== null) {
+        return wrapEntityWithProxy(value, entityType, context, index);
+      }
+
+      return value;
+    }
+  });
+};
+
+// Hook to use the BiobankContext and wrap streams for lazy loading
+export const useBiobankContext = (): BiobankContextType => {
+  const context = useContext(BiobankContext);
+
+  if (!context) {
+    console.error('useBiobankContext must be used within a BiobankProvider');
+    throw new Error('useBiobankContext must be used within a BiobankProvider');
+  }
+
+  return context;
+
+  // // Wrap streams' data with Proxy
+  // const wrappedStreams = Object.keys(context).reduce((acc, key) => {
+  //   if (context[key].data) {
+  //     acc[key] = {
+  //       ...context[key],
+  //       data: wrapDataWithProxy(context[key].data, key, context), // Pass the context correctly here
+  //     };
+  //   } else {
+  //     acc[key] = context[key];
+  //   }
+  //   return acc;
+  // }, {} as BiobankContextType);
+
+  // return wrappedStreams;
+};
+
diff --git a/jsx/hooks/useEditable.ts b/jsx/hooks/useEditable.ts
new file mode 100644
index 00000000..71a340b9
--- /dev/null
+++ b/jsx/hooks/useEditable.ts
@@ -0,0 +1,17 @@
+import { useState } from 'react';
+
+export const useEditable = () => {                                              
+  const [editable, setEditable] = useState<Record<string, boolean>>({});        
+                                                                                
+  const edit = (name: string) => {                                              
+    setEditable(prevEditable => ({                                              
+      ...Object.fromEntries(Object.keys(prevEditable).map(key => [key, false])),
+      [name]: !prevEditable[name]                                               
+    }));                                                                        
+  };                                                                            
+                                                                                
+  const clear = () => setEditable({});                                          
+                                                                                
+  // TODO: turn into tuple                                                      
+  return { editable, edit, clear};                                              
+}
diff --git a/jsx/hooks/useFetch.ts b/jsx/hooks/useFetch.ts
new file mode 100644
index 00000000..65b9b5d7
--- /dev/null
+++ b/jsx/hooks/useFetch.ts
@@ -0,0 +1,67 @@
+import { useState, useEffect } from 'react';
+import { BaseAPI } from '../APIs';
+
+interface FetchResponse<T> {
+  data: T | null;
+  isLoading: boolean;
+  error: Error | null;
+}
+
+export const useFetch = <T>(
+  api: BaseAPI<T>, 
+  id: string,
+  dependencies: any[] = []
+): FetchResponse<T> => {
+
+    const cacheKey = JSON.stringify(dependencies);
+
+  if (fetchCache.has(cacheKey)) {
+    const cached = fetchCache.get(cacheKey);
+    if (cached.status === 'success') {
+      return cached.data;
+    } else if (cached.status === 'error') {
+      throw cached.error;
+    } else {
+      // If status is 'pending', re-throw the promise
+      throw cached.promise;
+    }
+  }
+
+  const promise = api.getById(id)
+    .then(data => {
+      fetchCache.set(cacheKey, { status: 'success', data });
+    })
+    .catch(error => {
+      fetchCache.set(cacheKey, { status: 'error', error });
+      throw error;
+    });
+
+  // Store the pending promise in the cache and throw it
+  fetchCache.set(cacheKey, { status: 'pending', promise });
+  throw promise;
+};
+
+//   const [data, setData] = useState<T | null>(null);
+//   const [isLoading, setIsLoading] = useState<boolean>(false);
+//   const [error, setError] = useState<Error | null>(null);
+// 
+//   useEffect(() => {
+//     const fetchData = async () => {
+//       setIsLoading(true);
+//       try {
+//         const result = await api.getById();
+//         setData(result);
+//         setIsLoading(false);
+//         setFormErrors({});
+//       } catch (err) {
+//         const error = err as Error;
+//         setError(error);
+//         setIsLoading(false);
+//       }
+//     };
+// 
+//     fetchData();
+//   }, dependencies);
+// 
+//   return { data, isLoading, error };
+// };
diff --git a/jsx/hooks/useRequest.ts b/jsx/hooks/useRequest.ts
new file mode 100644
index 00000000..c2b02eba
--- /dev/null
+++ b/jsx/hooks/useRequest.ts
@@ -0,0 +1,52 @@
+import { useQuery, UseQueryResult, QueryKey } from 'react-query';
+import { useRef } from 'react';
+                                                                                
+export const useRequest = <T>(
+  requestFunction: () => Promise<T[]>,
+  placeholder: T[] = [],
+  dependencies: any[] = []
+//): UseQueryResult<T, Error> => {
+) => {
+    // Generate a stable unique identifier for the hook's lifetime
+  const uniqueIdRef = useRef(`key-${Math.random().toString(36).substr(2, 9)}`);
+
+  // Generate a unique key based on the request function and dependencies
+  const generatedKey = dependencies.length
+    ? JSON.stringify(dependencies)
+    : requestFunction.name || uniqueIdRef.current;
+
+  // data: The data returned from the query function. If the query is still loading, this will be undefined unless you've set a placeholderData or initialData.
+
+  // error: An error object if the query fails. If there is no error, this will be null.
+  // 
+  // isLoading: A boolean indicating whether the query is in the loading state (i.e., still fetching data).
+  // 
+  // isError: A boolean that is true if there was an error while fetching the data.
+  // 
+  // isSuccess: A boolean that is true if the query was successful and data was fetched.
+  // 
+  // isIdle: A boolean indicating that the query is in an idle state, typically before the query has been executed.
+  // 
+  // status: A string indicating the current status of the query. This can be 'idle', 'loading', 'error', or 'success'.
+  // 
+  // refetch: A function that can be called to manually refetch the query.
+  // 
+  // dataUpdatedAt: A timestamp indicating when the data was last fetched.
+  // 
+  // errorUpdatedAt: A timestamp indicating when the error occurred.
+  const { data, isLoading, error } = useQuery([generatedKey, ...dependencies], requestFunction, {
+    placeholderData: placeholder,
+    refetchOnWindowFocus: false,
+    onError: (error) => {
+      console.error('Error fetching data:', error);
+    },
+
+    // Additional options to customize behavior:
+    // refetchInterval: false, // for periodic refetching
+    // staleTime: 1000 * 60 * 5, // 5 minutes of fresh data
+    // cacheTime: 1000 * 60 * 60 * 24, // cache old data for a day
+    // retry: 1, // Number of retry attempts on failure
+  });
+
+  return data;
+};                                                                              
diff --git a/jsx/hooks/useStream.ts b/jsx/hooks/useStream.ts
new file mode 100644
index 00000000..c2c108eb
--- /dev/null
+++ b/jsx/hooks/useStream.ts
@@ -0,0 +1,73 @@
+import { useState, useEffect, useRef, useCallback } from 'react';
+import { BaseAPI } from '../APIs';
+import { useRequest } from './';
+
+export interface Stream<T> {
+  data: T[];
+  progress: number;
+  error: any;
+  initialize: () => void;
+  initialized: boolean;
+  addEntity: (row: T) => void;
+  updateEntity: (index: number, newEntity: T) => void;
+}
+
+// export const useStream = <T>(api: BaseAPI<T>): Stream<T> => {
+//   const [data, setData] = useState<Record<string, T> | undefined>({});
+//   const [progress, setProgress] = useState(0);
+//   const [initialized, setInitialized] = useState(false);
+//   const abortController = useRef(new AbortController());
+// 
+//   const initialize = useCallback(() => {
+//     if (!initialized) {
+//       api.fetchStream(setProgress, setData, abortController.current.signal)
+//         .then(fetchedData => setData(fetchedData))
+//         .finally(() => setInitialized(true));
+//     }
+//   }, [initialized]);  
+// 
+//   useEffect(() => {
+//     return () => {
+//       abortController.current.abort();
+//     };
+//   }, []);
+// 
+//   return { data, progress, error, initialize, initialized };
+// };
+
+export const useStream = <T>(api: BaseAPI<T>): Stream<T> => {
+  const [data, setData] = useState<T[]>([]);
+  const [progress, setProgress] = useState(0);
+  const [error, setError] = useState<any>(null);
+  const [initialized, setInitialized] = useState(false);
+  const abortController = useRef(new AbortController());
+
+  const addEntity = useCallback((row: T) => {
+    setData(prevRows => [...prevRows, row]);
+  }, []);
+
+  const updateEntity = useCallback((index: number, newEntity: T) => {
+    setData(prevData => {
+      const updatedData = [...prevData];
+      updatedData[index] = newEntity;  // Update the entity at the specific index
+      return updatedData;
+    });
+  }, []);  
+
+  const initialize = useCallback(() => {
+    if (!initialized) {
+      api.fetchStream(addEntity, setProgress, abortController.current.signal)
+        .then(setInitialized(true))
+        .catch(setError);  // Handle potential errors
+    }
+  }, [initialized]);
+
+  useEffect(() => {
+    return () => {
+      abortController.current.abort();
+    };
+  }, []);
+
+  return { data, progress, error, initialize, initialized, addEntity,
+          updateEntity};
+};
diff --git a/jsx/i18n/en.json b/jsx/i18n/en.json
new file mode 100644
index 00000000..421b5047
--- /dev/null
+++ b/jsx/i18n/en.json
@@ -0,0 +1,9 @@
+{
+    "noteForAliquots": "To create new aliquots, enter a Barcode, fill out the corresponding sub-form and press Submit. Press \"New Entry\" button to add another barcode field, or press for the \"Copy\" button to duplicate the previous entry.",
+    "noteForSpecimens": "To create new specimens, first select a PSCID and Visit Label. Then, enter a Barcode, fill out the corresponding sub-form and press submit. Press \"New Entry\" button to add another barcode field, or press for the \"Copy\" button to duplicate the previous entry.",
+    "noteForPools": "Select or Scan the specimens to be pooled. Specimens must have a Status of 'Available', have a Quantity of greater than 0, and share the same Type, PSCID, Visit Label and Current Site. Pooled specimens cannot already belong to a pool. Once pooled, the Status of specimen will be changed to 'Dispensed' and there Quantity set to '0'",
+    "noteForEdit": "Select a form for the list to edit the specimen values. Any previous value associated with a Specimen for a given field will be overwritten if one is added on this form." ,
+    "noteForCreateShipment": "Any container or specimen added to this form will be dissassociated from its parent. Any children of the containers listed will also be added to the shipment.",
+    "batchProcessNote": "Select or Scan the specimens to be prepared. Specimens must have a Status of 'Available', and share the same Type. Any previous value associated with a Specimen will be overwritten if one is added on this form.",
+    "pscid": "PSCID"
+}
diff --git a/jsx/i18n/index.ts b/jsx/i18n/index.ts
new file mode 100644
index 00000000..8b137891
--- /dev/null
+++ b/jsx/i18n/index.ts
@@ -0,0 +1 @@
+
diff --git a/jsx/index.ts b/jsx/index.ts
new file mode 100644
index 00000000..f3bff4fd
--- /dev/null
+++ b/jsx/index.ts
@@ -0,0 +1,8 @@
+export * from './APIs';
+export * from './components';
+export * from './contexts';
+export * from './entities';
+export * from './hooks';
+export * from './forms';
+export * from './i18n';
+export * from './utils';
diff --git a/jsx/lifeCycle.js b/jsx/lifeCycle.js
deleted file mode 100644
index 316973ca..00000000
--- a/jsx/lifeCycle.js
+++ /dev/null
@@ -1,154 +0,0 @@
-/**
- * LifeCycle
- *
- * @author Henri Rabalais
- * @version 1.0.0
- *
- **/
-
-/**
- * LifeCycle component.
- *
- * TODO: revise this component once Shipments are enabled.
- */
-class LifeCycle extends React.Component {
-  /**
-   * Handle a mouse hovering over a collection form.
-   *
-   * @param {event} e - the mouse event
-   */
-  mouseOver(e) {
-    // this isn't a very 'react' way of doing things, so consider revision
-    /*
-      $('.collection').css({
-        'border': '2px solid #093782',
-        'box-shadow': '0 4px 8px 0 rgba(0, 0, 0, 0.2), ' +
-                      '0 6px 20px 0 rgba(0, 0, 0, 0.19)',
-      });
-    */
-  }
-
-  /**
-   * Handle a mouse leaving a collection form.
-   *
-   * @param {event} e - the mouse event
-   */
-  mouseLeave(e) {
-    // this isn't a very 'react' way of doing things, so consider revision
-    /*
-      $('.collection').css({
-        'border': '2px solid #A6D3F5', 'box-shadow': 'none',
-      });
-      */
-  }
-
-  /**
-   * Handle a mouse hovering over a preparation form.
-   *
-   * @param {event} e - the mouse event
-   */
-  mouseOverPreparation(e) {
-    // this isn't a very 'react' way of doing things, so consider revision
-    /*
-      $('.preparation').css({
-        'border': '2px solid #093782',
-        'box-shadow': '0 4px 8px 0 rgba(0, 0, 0, 0.2), ' +
-                      '0 6px 20px 0 rgba(0, 0, 0, 0.19)',
-      });
-      */
-  }
-
-  /**
-   * Handle a mouse leaving a preparation form.
-   *
-   * @param {event} e - the mouse event
-   */
-  mouseLeavePreparation(e) {
-    // this isn't a very 'react' way of doing things, so consider revision
-    /*
-      $('.preparation').css(
-        {'border': '2px solid #A6D3F5', 'box-shadow': 'none'}
-      );
-      */
-  }
-
-  /**
-   * Render the React component
-   *
-   * @return {JSX}
-   */
-  render() {
-    // Create Collection Node
-    let collectionNode;
-    if ((this.props.specimen||{}).collection || this.props.container) {
-      collectionNode = (
-        <div
-          onMouseEnter={(e) => this.mouseOver(e)}
-          onMouseLeave={(e) => this.mouseLeave(e)}
-          className='lifecycle-node collection'
-        >
-          <div className='letter'>
-            C
-          </div>
-        </div>
-      );
-    }
-
-    // Create Preparation Node
-    let preparationNode;
-    if ((this.props.specimen||{}).preparation) {
-      preparationNode = (
-        <div
-          onMouseEnter={this.mouseOverPreparation}
-          onMouseLeave={this.mouseLeavePreparation}
-          className='lifecycle-node preparation'
-        >
-          <div className='letter'>
-            P
-          </div>
-        </div>
-      );
-    }
-
-    // Create Analysis Node
-    let analysisNode;
-    if ((this.props.specimen||{}).analysis) {
-      analysisNode = (
-        <div className='lifecycle-node-container'>
-           <div className='lifecycle-node'>
-             <div className='letter'>A</div>
-           </div>
-        </div>
-      );
-    }
-
-    // Create Lines
-    let line;
-    let nodes = 0;
-    for (let i in this.props.specimen) {
-      if (i === 'collection' || i === 'preparation' || i === 'analysis') {
-        nodes++;
-      }
-    }
-    let lineWidth = nodes > 1 ? 60/(nodes-1) : 0;
-    let lineStyle = {width: lineWidth+'%'};
-    line = (<div className='lifecycle-line' style={lineStyle}/>);
-
-    return (
-      <div className='lifecycle'>
-        <div className='lifecycle-graphic'>
-          {collectionNode}
-          {preparationNode ? line : null}
-          {preparationNode}
-          {analysisNode ? line : null}
-          {analysisNode}
-        </div>
-      </div>
-    );
-  }
-}
-
-LifeCycle.propTypes = {
-};
-
-export default LifeCycle;
diff --git a/jsx/listForm.js b/jsx/listForm.js
deleted file mode 100644
index 174363ca..00000000
--- a/jsx/listForm.js
+++ /dev/null
@@ -1,272 +0,0 @@
-import {clone, isEmpty} from './helpers.js';
-
-/**
- * A form containing a list
- */
-class ListForm extends React.Component {
-  /**
-   * Constructor
-   */
-  constructor() {
-    super();
-    this.state = {
-      count: 0,
-      multiplier: 1,
-      collapsed: {},
-    };
-
-    this.setListItem = this.setListItem.bind(this);
-    this.addListItem = this.addListItem.bind(this);
-    this.copyListItem = this.copyListItem.bind(this);
-    this.removeListItem = this.removeListItem.bind(this);
-    this.toggleCollapse = this.toggleCollapse.bind(this);
-  }
-
-  /**
-   * React lifecycle method
-   */
-  componentDidMount() {
-    this.addListItem();
-  }
-
-  /**
-   * React lifecycle method
-   */
-  componentDidUpdate() {
-    Object.keys(this.props.list).forEach((key) => {
-      if (!isEmpty(this.props.errors[key]) && this.state.collapsed[key]) {
-        this.toggleCollapse(key);
-      }
-    });
-  }
-
-  /**
-   * Set the value of a list item
-   *
-   * @param {string} name - the item name
-   * @param {string} value - the item value
-   * @param {string} key - the key with the item
-   */
-  setListItem(name, value, key) {
-    const list = clone(this.props.list);
-    list[key][name] = value;
-    this.props.setList(list);
-  }
-
-  /**
-   * Add an empty list item
-   */
-  addListItem() {
-    let {count, collapsed} = clone(this.state);
-    const list = clone(this.props.list);
-    count++;
-    collapsed[count] = false;
-    list[count] = this.props.listItem;
-
-    this.setState({count, collapsed});
-    this.props.setList(list);
-  }
-
-  /**
-   * Copy an item in a list
-   *
-   * @param {string} key - the key to copy
-   */
-  copyListItem(key) {
-    let {collapsed, count, multiplier} = clone(this.state);
-    const list = clone(this.props.list);
-    for (let i=1; i<=multiplier; i++) {
-      count++;
-      list[count] = clone(list[key]);
-      // TODO: find a way to exempt certain elements from being copied.
-      (list[count].container||{}).barcode &&
-        delete list[count].container.barcode;
-      list[count].barcode &&
-        delete list[count].barcode;
-      collapsed[count] = true;
-    }
-    this.setState({collapsed, count, multiplier});
-    this.props.setList(list);
-  }
-
-  /**
-   * Remove a list item from the list
-   *
-   * @param {string} key - the key to remove
-   */
-  removeListItem(key) {
-    const list = clone(this.props.list);
-    delete list[key];
-    this.props.setList(list);
-  }
-
-  /**
-   * Toggle whether a key is collapsed
-   *
-   * @param {string} key - the key to toggle
-   */
-  toggleCollapse(key) {
-    const collapsed = clone(this.state.collapsed);
-    collapsed[key] = !collapsed[key];
-    this.setState({collapsed});
-  }
-
-  /**
-   * Render the React component
-   *
-   * @return {JSX}
-   */
-  render() {
-    const {collapsed, multiplier} = this.state;
-    const {errors, list} = this.props;
-
-    return Object.entries(list).map(([key, item], i, list) => {
-      const handleRemoveItem = list.length > 1 ?
-          () => this.removeListItem(key) : null;
-      const handleCopyItem = () => this.copyListItem(key);
-      const handleCollapse = () => this.toggleCollapse(key);
-
-      return React.Children.map(this.props.children, (child) => {
-        const form = React.cloneElement(child, {
-          key: key,
-          itemKey: key,
-          id: (i+1),
-          collapsed: collapsed[key],
-          handleCollapse: handleCollapse,
-          item: (item || {}),
-          removeItem: handleRemoveItem,
-          setListItem: this.setListItem,
-          errors: (errors[key] || {}),
-        });
-
-        const renderAddButtons = () => {
-          if (i+1 == list.length) {
-            return (
-              <div className='row'>
-                <div className='col-xs-12'>
-                  <div className='col-xs-3'/>
-                  <div className='col-xs-4 action'>
-                    <div>
-                      <span className='action'>
-                        <div
-                          className='action-button add'
-                          onClick={this.addListItem}
-                        >
-                          +
-                        </div>
-                      </span>
-                      <span className='action-title'>
-                        New Entry
-                      </span>
-                    </div>
-                  </div>
-                  <div className='col-xs-5 action'>
-                    <div>
-                      <span className='action'>
-                        <div
-                         className='action-button add'
-                         onClick={handleCopyItem}
-                        >
-                          <span className='glyphicon glyphicon-duplicate'/>
-                        </div>
-                      </span>
-                      <span className='action-title'>
-                        <input
-                          className='form-control input-sm'
-                          type='number'
-                          min='1'
-                          max='50'
-                          style={{width: 50, display: 'inline'}}
-                          onChange={(e) => {
-                            this.setState({multiplier: e.target.value});
-                          }}
-                          value={multiplier}
-                        />
-                        Copies
-                      </span>
-                    </div>
-                  </div>
-                </div>
-              </div>
-            );
-          }
-        };
-
-        return (
-          <div>
-            {form}
-            {renderAddButtons()}
-          </div>
-        );
-      });
-    });
-  }
-}
-
-/**
- * Display a list item
- */
-class ListItem extends React.Component {
-  /**
-   * Render the component
-   *
-   * @return {JSX}
-   *
-   */
-  render() {
-    const children = React.Children.toArray(this.props.children);
-    const firstChild = React.cloneElement(children[0], {
-      label: children[0].props.label + ' ' + this.props.id,
-    });
-    const remainingChildren = children.slice(1);
-
-    const glyphStyle = {
-      color: '#808080',
-      marginLeft: 10,
-      cursor: 'pointer',
-      fontSize: 15,
-    };
-    const removeItemButton = (
-      <span
-        className='glyphicon glyphicon-remove'
-        onClick={this.props.removeItem}
-        style={glyphStyle}
-      />
-    );
-
-    return (
-      <div className='row'>
-        <div className='col-xs-11'>
-          {firstChild}
-        </div>
-        <div className='col-xs-1' style={{paddingLeft: 0, marginTop: 10}}>
-          <span
-            className= {
-                this.props.collapsed
-                    ? 'glyphicon glyphicon-chevron-down'
-                    : 'glyphicon glyphicon-chevron-up'
-                }
-            style={{
-                   cursor: 'pointer',
-                   fontSize: 15,
-                   position: 'relative',
-                   right: 40,
-            }}
-            onClick={this.props.handleCollapse}
-          />
-          {this.props.removeItem ? removeItemButton : null}
-        </div>
-        <div className='col-xs-9 col-xs-offset-2'>
-          <div
-            id={'item-' + this.props.itemKey}
-            className={this.props.collapsed ? 'closed' : 'open'}
-          >
-            {remainingChildren}
-          </div>
-        </div>
-      </div>
-    );
-  }
-}
-
-export {ListForm, ListItem};
diff --git a/jsx/poolSpecimenForm.js b/jsx/poolSpecimenForm.js
deleted file mode 100644
index c3a82109..00000000
--- a/jsx/poolSpecimenForm.js
+++ /dev/null
@@ -1,346 +0,0 @@
-import Modal from 'Modal';
-import React, {PureComponent} from 'react';
-import {mapFormOptions, clone, isEmpty} from './helpers.js';
-
-import Swal from 'sweetalert2';
-
-/**
- * Biobank Pool Specimen Form
- *
- * @author Henri Rabalais
- * @version 1.0.0
- *
- **/
-const initialState = {
-  pool: {},
-  list: {},
-  count: 0,
-  current: {},
-  errors: {},
-  containerId: null,
-};
-
-/**
- * React component with form for entering pool specimens
- */
-class PoolSpecimenForm extends React.Component {
-  /**
-   * Constructor
-   */
-  constructor() {
-    super();
-    this.state = initialState;
-    this.setPool = this.setPool.bind(this);
-    this.validateListItem = this.validateListItem.bind(this);
-    this.setPoolList = this.setPoolList.bind(this);
-  }
-
-  /**
-   * Set the current pool.
-   *
-   * @param {string} name  - the pool name
-   * @param {string} value - the pool value
-   */
-  setPool(name, value) {
-    const pool = clone(this.state.pool);
-    pool[name] = value;
-    this.setState({pool});
-  }
-
-  /**
-   * Sets the current pool list being displayed?
-   *
-   * @param {int} containerId - container with pool?
-   */
-  setPoolList(containerId) {
-    let {current, list, pool, count} = clone(this.state);
-
-    // Increase count
-    count++;
-
-    // Set specimen and container
-    const container = this.props.data.containers[containerId];
-    const specimen = this.props.data.specimens[container.specimenId];
-
-    // Set current global values
-    if (isEmpty(list)) {
-      current.candidateId = specimen.candidateId;
-      current.sessionId = specimen.sessionId;
-      current.typeId = specimen.typeId;
-      current.centerId = container.centerId;
-    }
-
-    // Set list values
-    list[count] = {container, specimen};
-
-    // Set current pool values
-    const specimenIds = pool.specimenIds || [];
-    specimenIds.push(specimen.id);
-    pool.centerId = container.centerId;
-    pool.specimenIds = specimenIds;
-
-    this.setState(
-      {pool, list, count, current, containerId},
-      this.setState({containerId: null})
-    );
-  }
-
-  /**
-   * Remove a list item
-   *
-   * @param {string} key - the key to be removed
-   */
-  removeListItem(key) {
-    let {pool, list, current} = clone(this.state);
-    // remove specimenId from pool.
-    pool.specimenIds = pool.specimenIds
-    .filter((id) => id != this.state.list[key].specimen.id);
-
-    // delete list at key.
-    delete list[key];
-
-    // reset current values if list is empty.
-    current = isEmpty(list) ? {} : current;
-
-    // empty barcode input.
-    const containerId = null;
-
-    this.setState({pool, list, current, containerId});
-  }
-
-  /**
-   * Validate a list item for a container
-   *
-   * @param {int} containerId - the container being validated
-   *
-   * @return {Promise} - a resolved or rejected promise
-   */
-  validateListItem(containerId) {
-    const {current, list} = clone(this.state);
-    const container = this.props.data.containers[containerId];
-    const specimen = this.props.data.specimens[container.specimenId];
-
-    // Throw error if new list item does not meet requirements.
-    if (!isEmpty(list) &&
-      (specimen.candidateId !== current.candidateId ||
-      specimen.sessionId !== current.sessionId ||
-      specimen.typeId !== current.typeId ||
-      container.centerId !== current.centerId)
-    ) {
-      Swal.fire({
-        title: 'Oops!',
-        text: 'Specimens must be of the same PSCID, ' +
-              'Visit Label, Type and Center',
-        type: 'warning',
-      });
-      return Promise.reject();
-    }
-    return Promise.resolve();
-  }
-
-  /**
-   * {@inheritDoc}
-   *
-   * @return {DOMObject}
-   */
-  render() {
-    const {data, options} = this.props;
-    const {current, pool, list, containerId, errors} = this.state;
-
-    // generate barcode list from list object.
-    const barcodeList = Object.entries(list)
-    .map(([key, item]) => {
-      const removeItem = () => this.removeListItem(key);
-      // I cannot get this to work in the css file.
-      const style = {
-        color: '#DDDDDD',
-        marginLeft: 10,
-        cursor: 'pointer',
-      };
-      return (
-        <div key={key} className='preparation-item'>
-          <div>{item.container.barcode}</div>
-          <div
-            className='glyphicon glyphicon-remove'
-            onClick={removeItem}
-            style={style}
-          />
-        </div>
-      );
-    });
-
-    // Generate Pool form.
-    const specimenUnits = mapFormOptions(options.specimen.units, 'label');
-    const form = (
-      <FormElement name="poolSpecimenForm">
-        <div className='row'>
-          <div className='col-sm-10 col-sm-offset-1'>
-            <StaticElement
-              label='Pooling Note'
-              text="Select or Scan the specimens to be pooled. Specimens must
-                    have a Status of 'Available', have a Quantity of greater
-                    than 0, and share the same Type, PSCID, Visit Label
-                    and Current Site. Pooled specimens cannot already belong to
-                    a pool. Once pooled, the Status of specimen will be changed
-                    to 'Dispensed' and there Quantity set to '0'"
-            />
-            <StaticElement
-              label='Specimen Type'
-              text={
-                (options.specimen.types[current.typeId]||{}).label || '—'
-              }
-            />
-            <StaticElement
-              label='PSCID'
-              text={
-                (options.candidates[current.candidateId]||{}).pscid || '—'
-              }
-            />
-            <StaticElement
-              label='Visit Label'
-              text={(options.sessions[current.sessionId]||{}).label || '—'}
-            />
-            <div className='row'>
-              <div className='col-xs-6'>
-                <h4>Barcode Input</h4>
-                <div className='form-top'/>
-                <BarcodeInput
-                  list={list}
-                  data={data}
-                  options={options}
-                  errors={errors}
-                  containerId={containerId}
-                  validateListItem={this.validateListItem}
-                  setPoolList={this.setPoolList}
-                />
-              </div>
-              <div className='col-xs-6'>
-                <h4>Barcode List</h4>
-                <div className='form-top'/>
-                <div className='preparation-list'>
-                  {barcodeList}
-                </div>
-              </div>
-            </div>
-            <div className='form-top'/>
-            <TextboxElement
-              name='label'
-              label='Label'
-              onUserInput={this.setPool}
-              required={true}
-              value={pool.label}
-              errorMessage={errors.label}
-            />
-            <TextboxElement
-              name='quantity'
-              label='Quantity'
-              onUserInput={this.setPool}
-              required={true}
-              value={pool.quantity}
-              errorMessage={errors.quantity}
-            />
-            <SelectElement
-              name='unitId'
-              label='Unit'
-              options={specimenUnits}
-              onUserInput={this.setPool}
-              required={true}
-              value={pool.unitId}
-              errorMessage={errors.unitId}
-            />
-            <DateElement
-              name='date'
-              label='Date'
-              onUserInput={this.setPool}
-              required={true}
-              value={pool.date}
-              errorMessage={errors.date}
-            />
-            <TimeElement
-              name='time'
-              label='Time'
-              onUserInput={this.setPool}
-              required={true}
-              value={pool.time}
-              errorMessage={errors.time}
-            />
-          </div>
-        </div>
-      </FormElement>
-    );
-
-    const handleClose = () => this.setState(initialState, this.props.onClose);
-    const handleSubmit = () => {
-      return new Promise((resolve, reject) => {
-        this.props.onSubmit(pool, list)
-        .then(() => resolve(), (errors) => this.setState({errors}, reject()));
-      });
-    };
-    return (
-      <Modal
-        title='Pool Specimens'
-        show={this.props.show}
-        onClose={handleClose}
-        onSubmit={handleSubmit}
-        throwWarning={true}
-      >
-        {form}
-      </Modal>
-    );
-  }
-}
-
-PoolSpecimenForm.propTypes = {
-};
-
-/**
- * React component to read input from a barcode
- */
-class BarcodeInput extends PureComponent {
-  /**
-   * Render react component
-   *
-   * @return {JSX}
-   */
-  render() {
-    const {list, data, options, errors, containerId} = this.props;
-
-    // Restrict list of barcodes to only those that would be valid.
-    const barcodesPrimary = Object.values(data.containers)
-    .reduce((result, container) => {
-      if (options.container.types[container.typeId].primary == 1) {
-        const specimen = data.specimens[container.specimenId];
-        const availableId = Object.keys(options.container.stati).find(
-          (key) => options.container.stati[key].label === 'Available'
-        );
-        const inList = Object.values(list)
-        .find((i) => i.container.id == container.id);
-
-        if (specimen.quantity > 0 &&
-            container.statusId == availableId &&
-            specimen.poolId == null &&
-            !inList) {
-          result[container.id] = container.barcode;
-        }
-      }
-      return result;
-    }, {});
-
-    const handleInput = (name, containerId) => {
-      containerId && this.props.validateListItem(containerId)
-      .then(() => this.props.setPoolList(containerId));
-    };
-    return (
-      <SearchableDropdown
-        name={'containerId'}
-        label={'Specimen'}
-        onUserInput={handleInput}
-        options={barcodesPrimary}
-        value={containerId}
-        errorMessage={errors.total}
-      />
-    );
-  }
-}
-
-export default PoolSpecimenForm;
diff --git a/jsx/poolTab.js b/jsx/poolTab.js
deleted file mode 100644
index dba1abb8..00000000
--- a/jsx/poolTab.js
+++ /dev/null
@@ -1,235 +0,0 @@
-import React, {Component} from 'react';
-import {Link} from 'react-router-dom';
-
-import FilterableDataTable from 'FilterableDataTable';
-import SpecimenForm from './specimenForm';
-
-import {mapFormOptions, clone} from './helpers.js';
-
-/**
- * React component for the Pool tab of the Biobank module.
- */
-class PoolTab extends Component {
-  /**
-   * Constructor
-   */
-  constructor() {
-    super();
-
-    this.state = {editable: {}, poolId: null};
-    this.edit = this.edit.bind(this);
-    this.clearEditable = this.clearEditable.bind(this);
-    this.openAliquotForm = this.openAliquotForm.bind(this);
-    this.mapPoolColumns = this.mapPoolColumns.bind(this);
-    this.formatPoolColumns = this.formatPoolColumns.bind(this);
-  }
-
-  /**
-   * Make the form editable
-   *
-   * @param {string} stateKey - ?
-   *
-   * @return {Promise}
-   */
-  edit(stateKey) {
-    const {editable} = clone(this.state);
-    editable[stateKey] = true;
-    return new Promise((res) => this.setState({editable}, res()));
-  }
-
-  /**
-   * Clear the editable state of this form.
-   */
-  clearEditable() {
-    this.setState({editable: {}});
-  }
-
-  /**
-   * Open the aliquot form for a pool
-   *
-   * @param {int} poolId - the pool id
-   */
-  openAliquotForm(poolId) {
-    this.setState({poolId}, () => this.edit('aliquotForm'));
-  }
-
-  /**
-   * Map IDs in the pool columns to a string value.
-   *
-   * @param {string} column - the column name being mapped
-   * @param {string} value - the column value being mapped
-   *
-   * @return {string}
-   */
-  mapPoolColumns(column, value) {
-    const {data, options} = this.props;
-    switch (column) {
-      case 'Pooled Specimens':
-        return value.map((id) => {
-          return (data.containers[data.specimens[id].containerId]||{}).barcode;
-        });
-      case 'Type':
-        return options.specimen.types[value].label;
-      case 'Site':
-        return options.centers[value];
-      default:
-        return value;
-    }
-  }
-
-  /**
-   * Format a row of columns for the pooled specimen.
-   *
-   * @param {string} column - the column name
-   * @param {string} value - the column value
-   * @param {object} row - all the values from the row
-   *
-   * @return {JSX}
-   */
-  formatPoolColumns(column, value, row) {
-    const {options} = this.props;
-    value = this.mapPoolColumns(column, value);
-    const candId = Object.values(options.candidates)
-      .find((cand) => cand.pscid == row['PSCID']).id;
-    switch (column) {
-      case 'Pooled Specimens':
-        const barcodes = value
-          .map((barcode, i) => {
-            if (loris.userHasPermission('biobank_specimen_view')) {
-              return <Link key={i} to={`/barcode=${barcode}`}>{barcode}</Link>;
-            }
-          })
-          .reduce((prev, curr) => [prev, ', ', curr]);
-        return <td>{barcodes}</td>;
-      case 'PSCID':
-        return <td><a href={loris.BaseURL + '/' + candId}>{value}</a></td>;
-      case 'Visit Label':
-        const ses = Object.values(options.candidateSessions[candId]).find(
-          (sess) => sess.label == value
-        ).id;
-        const visitLabelURL = loris.BaseURL+'/instrument_list/?candID='+candId+
-          '&sessionID='+ses;
-        return <td><a href={visitLabelURL}>{value}</a></td>;
-      case 'Aliquot':
-        const onClick = () => this.openAliquotForm(row['ID']);
-        return <td><CTA label='Aliquot' onUserInput={onClick}/></td>;
-      default:
-        return <td>{value}</td>;
-    }
-  }
-
-
-  /**
-   * Render the aliquot form
-   *
-   * @return {JSX}
-   */
-  renderAliquotForm() {
-    // TODO: This should be fixed. A lot of hacks are being used to initialize
-    // this form and there's definitely better ways to be doing it.
-    const {data, options} = this.props;
-    if (!(loris.userHasPermission('biobank_specimen_create')
-        && this.state.poolId)
-    ) {
-      return;
-    }
-    const specimens = Object.values(data.specimens)
-      .filter((specimen) => specimen.poolId == this.state.poolId);
-    const parents = specimens
-      .map((specimen) => {
-        return {
-            specimen: specimen,
-            container: data.containers[specimen.containerId],
-            };
-      }
-    );
-
-    return (
-      <SpecimenForm
-        title='Aliquot Pool'
-        parent={parents}
-        options={options}
-        data={data}
-        increaseCoordinate={this.props.increaseCoordinate}
-        show={this.state.editable.aliquotForm}
-        onClose={this.clearEditable}
-        onSubmit={this.props.createSpecimens}
-      />
-    );
-  }
-
-  /**
-   * Render the react component
-   *
-   * @return {JSX}
-   */
-  render() {
-    const {data, options} = this.props;
-    const specimenTypes = mapFormOptions(
-      options.specimen.types, 'label'
-    );
-    const poolData = Object.values(data.pools).map((pool) => {
-      return [
-        pool.id,
-        pool.label,
-        Math.round(pool.quantity*100)/100 +
-           ' ' +
-            options.specimen.units[pool.unitId].label,
-        pool.specimenIds,
-        options.candidates[pool.candidateId].pscid,
-        options.sessions[pool.sessionId].label,
-        pool.typeId,
-        pool.centerId,
-        pool.date,
-        pool.time,
-      ];
-    });
-
-    const fields = [
-      {label: 'ID', show: false},
-      {label: 'Label', show: true, filter: {
-        name: 'barcode',
-        type: 'text',
-      }},
-      {label: 'Quantity', show: true},
-      {label: 'Pooled Specimens', show: true},
-      {label: 'PSCID', show: true, filter: {
-        name: 'pscid',
-        type: 'text',
-      }},
-      {label: 'Visit Label', show: true, filter: {
-        name: 'session',
-        type: 'text',
-      }},
-      {label: 'Type', show: true, filter: {
-        name: 'type',
-        type: 'select',
-        options: specimenTypes,
-      }},
-      {label: 'Site', show: true, filter: {
-        name: 'site',
-        type: 'select',
-        options: options.centers,
-      }},
-      {label: 'Date', show: true},
-      {label: 'Time', show: true},
-      {label: 'Aliquot', show: true},
-    ];
-
-    return (
-      <div>
-        <FilterableDataTable
-          name='pool'
-          data={poolData}
-          fields={fields}
-          getFormattedCell={this.formatPoolColumns}
-          getMappedCell={this.mapPoolColumns}
-          progress={this.props.loading}
-        />
-        {this.renderAliquotForm()}
-      </div>
-    );
-  }
-}
-
-export default PoolTab;
diff --git a/jsx/processForm.js b/jsx/processForm.js
deleted file mode 100644
index 6858d172..00000000
--- a/jsx/processForm.js
+++ /dev/null
@@ -1,242 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import {mapFormOptions, clone} from './helpers.js';
-import CustomFields from './customFields';
-
-/**
- * Biobank Specimen Process Form
- *
- * @param {object} props
- * @return {*}
- **/
-const SpecimenProcessForm = (props) => {
-  const setProcess = (name, value) => {
-    let process = clone(props.process);
-    process[name] = value;
-    props.setParent(props.processStage, process);
-  };
-
-  const setProtocol = (name, value) => {
-    let process = clone(props.process);
-    process[name] = value;
-    process.data = {};
-    props.setParent(props.processStage, process);
-  };
-
-  const setData = (name, value) => {
-    const data = clone(props.process.data);
-    if (value instanceof File) {
-      data[name] = value.name;
-      const files = clone(props.current.files);
-      files[value.name] = value;
-      props.setCurrent('files', files);
-    } else {
-      data[name] = value;
-    }
-    setProcess('data', data);
-  };
-
-  const {
-      specimen,
-      process,
-      processStage,
-      typeId,
-      options,
-      errors,
-      edit,
-  } = props;
-
-  const updateButton = specimen && (
-    <ButtonElement
-      label="Update"
-      onUserInput={() => props.updateSpecimen(specimen)}
-    />
-  );
-
-  let specimenProtocols = {};
-  let specimenProtocolAttributes = {};
-  Object.entries(options.specimen.protocols).forEach(([id, protocol]) => {
-    // FIXME: I really don't like 'toLowerCase()' function, but it's the
-    // only way I can get it to work at the moment.
-    if (typeId == protocol.typeId &&
-        options.specimen.processes[protocol.processId].label.toLowerCase() ==
-        processStage) {
-      specimenProtocols[id] = protocol.label;
-      specimenProtocolAttributes[id] = options.specimen.protocolAttributes[id];
-    }
-  });
-
-  const renderProtocolFields = () => {
-    if (specimenProtocolAttributes[process.protocolId]) {
-      if (process.data) {
-        return <CustomFields
-            options={options}
-            errors={errors.data || {}}
-            fields={specimenProtocolAttributes[process.protocolId]}
-            object={process.data}
-            setData={setData} />;
-      } else {
-        setProcess('data', {});
-      }
-    }
-  };
-
-  const specimenTypeUnits = Object.keys(options.specimen.typeUnits[typeId]||{})
-  .reduce((result, id) => {
-    result[id] = options.specimen.typeUnits[typeId][id].label;
-    return result;
-  }, {});
-  const collectionFields = processStage === 'collection' && [
-    <TextboxElement
-      name="quantity"
-      label="Quantity"
-      onUserInput={setProcess}
-      required={true}
-      value={process.quantity}
-      errorMessage={errors.quantity}
-    />,
-    <SelectElement
-      name="unitId"
-      label="Unit"
-      options={specimenTypeUnits}
-      onUserInput={setProcess}
-      required={true}
-      value={process.unitId}
-      errorMessage={errors.unitId}
-      autoSelect={true}
-    />,
-  ];
-
-  const protocolField = !props.hideProtocol && (
-    <SelectElement
-      name="protocolId"
-      label="Protocol"
-      options={specimenProtocols}
-      onUserInput={setProtocol}
-      required={true}
-      value={process.protocolId}
-      errorMessage={errors.protocolId}
-      autoSelect={true}
-    />
-  );
-
-  const examiners = mapFormOptions(options.examiners, 'label');
-  if (typeId && edit === true) {
-    return [
-      protocolField,
-      <SelectElement
-        name="examinerId"
-        label="Done By"
-        options={examiners}
-        onUserInput={setProcess}
-        required={true}
-        value={process.examinerId}
-        errorMessage={errors.examinerId}
-        autoSelect={true}
-      />,
-      <DateElement
-        name="date"
-        label="Date"
-        onUserInput={setProcess}
-        required={true}
-        value={process.date}
-        errorMessage={errors.date}
-      />,
-      <TimeElement
-        name="time"
-        label="Time"
-        onUserInput={setProcess}
-        required={true}
-        value={process.time}
-        errorMessage={errors.time}
-      />,
-      collectionFields,
-      <div className='form-top'/>,
-      renderProtocolFields(),
-      <TextareaElement
-        name="comments"
-        label="Comments"
-        onUserInput={setProcess}
-        value={process.comments}
-        errorMessage={errors.comments}
-      />,
-      updateButton,
-    ];
-  } else if (edit === false) {
-    const protocolStaticFields = process.data &&
-      Object.keys(process.data).map((key) => {
-        let value = process.data[key];
-        if (process.data[key] === true) {
-          value = 'Yes';
-        } else if (process.data[key] === false) {
-          value = 'No';
-        }
-        // FIXME: The label used to be produced in the following way:
-        // label={options.specimen.protocolAttributes[process.protocolId][key].label}
-        // However, causes issues when there is data in the data
-        // object, but the protocolId is not associated with any attributes.
-        // This is a configuration/importing issue that should be fixed.
-        return (
-          <StaticElement
-            key={key}
-            label={options.specimen.attributes[key].label}
-            text={value}
-          />
-        );
-      });
-
-    const collectionStaticFields = (processStage === 'collection') && (
-      <StaticElement
-        label='Quantity'
-        text={process.quantity+' '+options.specimen.units[process.unitId].label}
-      />
-    );
-
-    return [
-      <StaticElement
-        label='Protocol'
-        text={options.specimen.protocols[process.protocolId].label}
-      />,
-      <StaticElement
-        label='Site'
-        text={options.centers[process.centerId]}
-      />,
-      <StaticElement
-        label='Done By'
-        text={options.examiners[process.examinerId].label}
-      />,
-      <StaticElement
-        label='Date'
-        text={process.date}
-      />,
-      <StaticElement
-        label='Time'
-        text={process.time}
-      />,
-      collectionStaticFields,
-      protocolStaticFields,
-      <StaticElement
-        label='Comments'
-        text={process.comments}
-      />,
-    ];
-  }
-
-  return null;
-};
-
-SpecimenProcessForm.propTypes = {
-  setParent: PropTypes.func.isRequired,
-  updateSpecimen: PropTypes.func,
-  specimen: PropTypes.object.isRequired,
-  attributeDatatypes: PropTypes.object.isRequired,
-  attributeOptions: PropTypes.object.isRequired,
-  specimenTypeUnits: PropTypes.object.isRequired,
-  specimenTypeAttributes: PropTypes.object.isRequired,
-};
-
-SpecimenProcessForm.defaultProps = {
-  errors: {},
-};
-
-export default SpecimenProcessForm;
diff --git a/jsx/search.js b/jsx/search.js
deleted file mode 100644
index ba1fdad4..00000000
--- a/jsx/search.js
+++ /dev/null
@@ -1,62 +0,0 @@
-import React, {PureComponent} from 'react';
-import Modal from 'Modal';
-
-/**
- * Provides a modal window that can be used to search barcodes
- */
-class Search extends PureComponent {
-  /**
-   * Constructor
-   */
-  constructor() {
-    super();
-    this.state = {barcode: null};
-  }
-
-  /**
-   * Render React component
-   *
-   * @return {ReactDOM}
-   */
-  render() {
-    const onInput = (name, value) => {
-      this.setState({barcode: value});
-      if (Object.values(this.props.barcodes).find(
-          (barcode) => barcode == value)
-      ) {
-        this.props.history.push(`/barcode=${value}`);
-        this.props.onClose();
-      }
-    };
-    return (
-      <Modal
-        title={this.props.title}
-        show={this.props.show}
-        onClose={this.props.onClose}
-        throwWarning={false}
-      >
-        <FormElement>
-          <TextboxElement
-            name='barcode'
-            label='Barcode'
-            value={this.state.barcode}
-            options={this.props.barcodes}
-            onUserInput={onInput}
-            placeHolder='Please Scan or Type Barcode'
-            autoFocus={true}
-          />
-        </FormElement>
-      </Modal>
-    );
-  }
-}
-
-Search.propTypes = {
-
-};
-
-Search.defaultProps = {
-
-};
-
-export default Search;
diff --git a/jsx/shipmentTab.js b/jsx/shipmentTab.js
deleted file mode 100644
index 0697bed7..00000000
--- a/jsx/shipmentTab.js
+++ /dev/null
@@ -1,463 +0,0 @@
-import React, {useState, useEffect} from 'react';
-import {Link} from 'react-router-dom';
-
-import FilterableDataTable from 'FilterableDataTable';
-import {UseShipment} from './Shipment';
-// import Container from './Container';
-import TriggerableModal from 'TriggerableModal';
-
-import {get} from './helpers.js';
-
-// TODO:
-// - Make sure all subcontainers are loaded into shipment
-// - Make sure all containers change center when shipment is received
-// - Make sure to block all
-
-/**
- * Returns a JSX component for the shipment tab of the module
- *
- * @param {object} data - the data to display
- * @param {callback} setData - a callback to set data
- * @param {object} options - values for select options?
- *
- * @return {ReactDOM}
- */
-function ShipmentTab({
-  data,
-  setData,
-  options,
-}) {
-  const [shipments, setShipments] = useState({});
-  const users = {};
-  // TODO: There has to be a better way to query this!!!
-  Object.values(options.users).forEach((user) => {
-    users[user.label] = user.label;
-  });
-
-  // TODO: Look into this for standardization: https://www.robinwieruch.de/react-hooks-fetch-data
-  useEffect(() => {
-    const fetchData = async () => {
-      setShipments(await get(`${loris.BaseURL}/biobank/shipments/`));
-    };
-    fetchData();
-  }, []);
-
-  const updateShipments = (updatedShipments) => {
-    updatedShipments.forEach((shipment) => {
-      setShipments({
-        ...shipments,
-        [shipment.barcode]: shipment,
-      });
-    });
-  };
-
-  const mapShipmentColumns = (column, value) => {
-    switch (column) {
-      case 'Origin Center':
-        return options.centers[value];
-      case 'Destination Center':
-        return options.centers[value];
-      default:
-        return value;
-    }
-  };
-
-  const formatShipmentColumns = (column, value, row) => {
-    value = mapShipmentColumns(column, value);
-    switch (column) {
-      case 'Barcode':
-        return (
-          <td>
-            <TriggerableModal
-              label={value}
-              title={value+' Information'}
-            >
-              <ShipmentInformation
-                shipment={shipments[value]}
-                containers={data.containers}
-                centers={options.centers}
-              />
-            </TriggerableModal>
-          </td>
-        );
-      case 'Actions':
-        if (row['Status'] !== 'received') {
-          return (
-            <td>
-              <ReceiveShipment
-                shipment={shipments[row['Barcode']]}
-                users={users}
-                updateShipments={updateShipments}
-                setData={setData}
-              />
-            </td>
-          );
-        }
-      default:
-        return <td>{value}</td>;
-    }
-  };
-
-  const shipmentData = Object.values(shipments).map((shipment) => {
-    return [
-      shipment.id,
-      shipment.barcode,
-      shipment.type,
-      shipment.status,
-      shipment.originCenterId,
-      shipment.destinationCenterId,
-    ];
-  });
-
-  const fields = [
-    {label: 'ID', show: false},
-    {label: 'Barcode', show: true, filter: {
-      name: 'barcode',
-      type: 'text',
-    }},
-    {label: 'Type', show: true, filter: {
-      name: 'type',
-      type: 'select',
-      options: options.shipment.types,
-    }},
-    {label: 'Status', show: true, filter: {
-      name: 'status',
-      type: 'select',
-      options: options.shipment.statuses,
-    }},
-    {label: 'Origin Center', show: true, filter: {
-      name: 'originCenterId',
-      type: 'select',
-      options: options.centers,
-    }},
-    {label: 'Destination Center', show: true, filter: {
-      name: 'destinationCenterId',
-      type: 'select',
-      options: options.centers,
-    }},
-    {label: 'Actions', show: true},
-  ];
-
-  const forms = [
-    <CreateShipment
-      data={data}
-      centers={options.centers}
-      types={options.shipment.types}
-      users={users}
-      updateShipments={updateShipments}
-      setData={setData}
-    />,
-  ];
-
-  return (
-    <FilterableDataTable
-      data={shipmentData}
-      fields={fields}
-      forms={forms}
-      getMappedCell={mapShipmentColumns}
-      getFormattedCell={formatShipmentColumns}
-    />
-  );
-}
-
-/**
- * Returns some dom elements with information about a shipment
- *
- * @param {Shipment} shipment - the shipment
- * @param {object} containers - containers
- * @param {object} centers - centers
- *
- * @return {ReactDOM[]}
- */
-function ShipmentInformation({
-  shipment,
-  containers = {},
-  centers,
-}) {
-  const logs = shipment.logs.map((log, i) => {
-    return (
-    <>
-      <h4>Shipment Log {i+1}</h4>
-      <HorizontalRule/>
-      <StaticElement
-        label='Center'
-        text={centers[log.centerId]}
-      />
-      <StaticElement
-        label='Status'
-        text={log.status}
-      />
-      <StaticElement
-        label='Temperature'
-        text={log.temperature}
-      />
-      <StaticElement
-        label='Date'
-        text={log.date}
-      />
-      <StaticElement
-        label='Time'
-        text={log.time}
-      />
-      <StaticElement
-        label='User'
-        text={log.user}
-      />
-      <StaticElement
-        label='Comments'
-        text={log.comments}
-      />
-    </>
-    );
-  });
-
-  const containerBarcodes = shipment.containerIds.map((id, i) => {
-    const barcode = (containers[id] || {}).barcode;
-    return (
-      <Link
-        key={i}
-        to={`/barcode=${barcode}`}
-      >
-        {barcode}
-      </Link>
-    );
-  }).reduce((prev, curr) => [prev, ', ', curr]);
-  return (
-    <>
-      <StaticElement
-        label='Barcode'
-        text={shipment.barcode}
-      />
-      <StaticElement
-        label='Type'
-        text={shipment.type}
-      />
-      <StaticElement
-        label='Containers'
-        text={containerBarcodes}
-      />
-      <StaticElement
-        label='Origin Center'
-        text={centers[shipment.logs[0].centerId]}
-      />
-      <StaticElement
-        label='Destination Center'
-        text={centers[shipment.destinationCenterId]}
-      />
-      {logs}
-    </>
-  );
-}
-
-/**
- * Modal form to create a shipment
- *
- * @param {object} data - the default data
- * @param {object} centers - the centers
- * @param {object} types - the types of shipments
- * @param {object} users - a list of selectable users
- * @param {callback} updateShipments - an update callback
- * @param {callback} setData - an update callback
- *
- * @return {ReactDOM}
- */
-function CreateShipment({
-  data,
-  centers,
-  types,
-  users,
-  updateShipments,
-  setData,
-}) {
-  const logIndex = 0;
-  const handler = new UseShipment();
-  const shipment = handler.getShipment();
-  const errors = handler.getErrors();
-  const onSubmit = async () => {
-    const entities = await handler.post();
-    updateShipments(entities.shipments);
-    await setData('containers', entities.containers);
-  };
-  const onOpen = () => {
-    handler.addLog({status: 'created'});
-  };
-
-  // If the associated shipments containers change, update the site of the log.
-  useEffect(() => {
-    if (shipment.containerIds.length === 1) {
-      const container = data.containers[shipment.containerIds[0]];
-      handler.setLog('centerId', container.centerId, logIndex);
-    }
-  }, [shipment.containerIds]);
-
-  return (
-    <TriggerableModal
-      label='Create Shipment'
-      title='Create Shipment'
-      onUserInput={onOpen}
-      onSubmit={onSubmit}
-      onClose={handler.clear}
-    >
-      <StaticElement
-        label='Note'
-        text='Any container or specimen added to this form will be
-        dissassociated from its parent. Any children of the containers listed
-        will also be added to the shipment.'
-      />
-      <TextboxElement
-        name='barcode'
-        label='Barcode'
-        onUserInput={handler.set}
-        value={shipment.barcode}
-        errorMessage={errors.barcode}
-        required={true}
-      />
-      <SelectElement
-        name='type'
-        label='Container Type'
-        onUserInput={handler.set}
-        value={shipment.type}
-        options={types}
-        errorMessage={errors.type}
-        required={true}
-      />
-      <InputList
-        name='barcode'
-        label="Container"
-        items={shipment.containerIds}
-        setItems={handler.setContainerIds}
-        options={data.containers}
-        errorMessage={errors.containerIds}
-      />
-      <SelectElement
-        name='destinationCenterId'
-        label='Destination Center'
-        onUserInput={handler.set}
-        value={shipment.destinationCenterId}
-        options={centers}
-        errorMessage={errors.destinationCenterId}
-        required={true}
-      />
-      <ShipmentLogForm
-        log={shipment.logs[logIndex]}
-        setLog={(name, value) => handler.setLog(name, value, logIndex)}
-        errors={errors.logs[logIndex]}
-        users={users}
-      />
-    </TriggerableModal>
-  );
-}
-
-/**
- * React Component for a received shipment
- *
- * @param {Shipment} shipment - the shipment
- * @param {object} users - the users for the dropdown
- * @param {callback} updateShipments - an update callback
- * @param {callback} setData - a callback for setting data
- *
- * @return {ReceiveShipment}
- */
-function ReceiveShipment({
-  shipment,
-  users,
-  updateShipments,
-  setData,
-}) {
-  const handler = new UseShipment(shipment);
-  const logIndex = handler.getShipment().logs.length-1;
-  const onSuccess = ({shipments, containers}) => {
-    updateShipments(shipments);
-    setData('containers', containers);
-  };
-
-  const onOpen = () => {
-    handler.addLog(
-      {status: 'received', centerId: shipment.destinationCenterId}
-    );
-  };
-
-  // TODO: At the top of this form, it wouldn't hurt to have a ShipmentSummary
-  // to display the pertinent information from the shipment!
-  return (
-    <TriggerableModal
-      label='Receive Shipment'
-      title={'Receive Shipment '+shipment.barcode}
-      onUserInput={onOpen}
-      onSubmit={handler.post}
-      onSuccess={onSuccess}
-      onClose={handler.clear}
-    >
-      <ShipmentLogForm
-        log={handler.getShipment().logs[logIndex]}
-        setLog={(name, value) => handler.setLog(name, value, logIndex)}
-        errors={handler.getErrors().logs[logIndex]}
-        users={users}
-      />
-    </TriggerableModal>
-  );
-}
-
-/**
- * Return a form for the shipment log
- *
- * @param {object} log - the log
- * @param {callback} setLog - a callback for when the log is set
- * @param {object} errors - a list of errors
- * @param {object} users - a list of selectable users
- *
- * @return {ReactDOM[]}
- */
-function ShipmentLogForm({
-  log,
-  setLog,
-  errors = {},
-  users,
-}) {
-  return (
-    <>
-      <TextboxElement
-        name='temperature'
-        label='Temperature'
-        onUserInput={setLog}
-        value={log.temperature}
-        errorMessage={errors.temperature}
-        required={true}
-      />
-      <DateElement
-        name='date'
-        label='Date'
-        onUserInput={setLog}
-        value={log.date}
-        errorMessage={errors.date}
-        required={true}
-      />
-      <TimeElement
-        name='time'
-        label='Time'
-        onUserInput={setLog}
-        value={log.time}
-        errorMessage={errors.time}
-        required={true}
-      />
-      <SelectElement
-        name='user'
-        label='Done by'
-        onUserInput={setLog}
-        value={log.user}
-        options={users}
-        errorMessage={errors.user}
-        required={true}
-      />
-      <TextareaElement
-        name='comments'
-        label='Comments'
-        onUserInput={setLog}
-        value={log.comments}
-        errorMessage={errors.comments}
-      />
-    </>
-  );
-}
-
-export default ShipmentTab;
diff --git a/jsx/specimen.js b/jsx/specimen.js
deleted file mode 100644
index 9d9ce3e8..00000000
--- a/jsx/specimen.js
+++ /dev/null
@@ -1,174 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import SpecimenProcessForm from './processForm';
-
-import {clone} from './helpers.js';
-
-/**
- * Biobank Specimen
- *
- * @param {object} props the props!
- * @return {*}
- */
-function BiobankSpecimen(props) {
-  const {current, editable, errors, options, specimen, container} = props;
-
-  const addProcess = async (process) => {
-    const newSpecimen = clone(specimen);
-    newSpecimen[process] = {centerId: container.centerId};
-    await props.editSpecimen(newSpecimen);
-    props.edit(process);
-  };
-
-  const alterProcess = (process) => {
-    props.editSpecimen(specimen)
-    .then(() => props.edit(process));
-  };
-
-  return (
-    <div className="processing">
-      <Processes
-        addProcess={addProcess}
-        alterProcess={alterProcess}
-        specimen={specimen}
-        editable={editable}
-        clearAll={props.clearAll}
-        current={current}
-        errors={errors}
-        options={options}
-        setCurrent={props.setCurrent}
-        setSpecimen={props.setSpecimen}
-        updateSpecimen={props.updateSpecimen}
-      >
-        <ProcessPanel process='collection'/>
-        <ProcessPanel process='preparation'/>
-        <ProcessPanel process='analysis'/>
-      </Processes>
-    </div>
-  );
-}
-
-BiobankSpecimen.propTypes = {
-  specimenPageDataURL: PropTypes.string.isRequired,
-};
-
-/**
- * React component to display processes
- *
- * @param {object} props - React props
- *
- * @return {ReactDOM[]}
- */
-function Processes(props) {
-  return React.Children.map(props.children, (child) => {
-    return React.cloneElement(child, {...props});
-  });
-}
-
-/**
- * React component to display a panel of processes
- *
- * @param {object} props - React props
- *
- * @return {ReactDOM}
- */
-function ProcessPanel(props) {
-  const {editable, process, current, specimen, options} = props;
-
-  const alterProcess = () => {
-    if (loris.userHasPermission('biobank_specimen_alter')) {
-      return (
-        <span
-          className={editable[process] ? null : 'glyphicon glyphicon-pencil'}
-          onClick={editable[process] ? null : () => props.alterProcess(process)}
-        />
-      );
-    }
-  };
-
-  const cancelAlterProcess = () => {
-    if (editable[process]) {
-      return (
-        <a
-          className="pull-right"
-          style={{cursor: 'pointer'}}
-          onClick={props.clearAll}
-        >
-          Cancel
-        </a>
-      );
-    }
-  };
-
-  const protocolExists = Object.values(options.specimen.protocols).find(
-    (protocol) => {
-      return protocol.typeId == specimen.typeId &&
-      options.specimen.processes[protocol.processId].label ==
-      process.replace(/^\w/, (c) => c.toUpperCase());
-    }
-  );
-
-  let panel = null;
-  if (protocolExists &&
-      !specimen[process] &&
-      !editable[process] &&
-      loris.userHasPermission('biobank_specimen_update')) {
-    const addProcess = () => props.addProcess(process);
-    panel = (
-      <div className='panel specimen-panel inactive'>
-        <div className='add-process' onClick={addProcess}>
-          <span className='glyphicon glyphicon-plus'/>
-        </div>
-        <div>ADD {process.toUpperCase()}</div>
-      </div>
-    );
-  }
-
-  const form = (
-    <FormElement>
-      <SpecimenProcessForm
-        current={current}
-        errors={props.errors.specimen[process]}
-        edit={editable[process]}
-        specimen={current.specimen}
-        options={options}
-        process={
-          editable[process] ?
-          current.specimen[process] :
-          specimen[process]
-        }
-        processStage={process}
-        setCurrent={props.setCurrent}
-        setParent={props.setSpecimen}
-        typeId={editable[process] ? current.specimen.typeId : specimen.typeId}
-        updateSpecimen={props.updateSpecimen}
-      />
-    </FormElement>
-  );
-
-  if (specimen[process] || editable[process]) {
-    panel = (
-      <div className='panel specimen-panel panel-default'>
-        <div className='panel-heading'>
-          <div className={'lifecycle-node '+process}>
-            <div className='letter'>
-              {process.charAt(0).toUpperCase()}
-            </div>
-          </div>
-          <div className='title'>
-            {process.replace(/^\w/, (c) => c.toUpperCase())}
-          </div>
-          {alterProcess()}
-        </div>
-        <div className='panel-body'>
-          {form}
-          {cancelAlterProcess()}
-        </div>
-      </div>
-    );
-  }
-
-  return panel;
-}
-
-export default BiobankSpecimen;
diff --git a/jsx/specimenForm.js b/jsx/specimenForm.js
deleted file mode 100644
index 5b970ddb..00000000
--- a/jsx/specimenForm.js
+++ /dev/null
@@ -1,556 +0,0 @@
-import SpecimenProcessForm from './processForm';
-import ContainerParentForm from './containerParentForm';
-import {ListForm, ListItem} from './listForm';
-import Modal from 'Modal';
-import {mapFormOptions, clone, padBarcode} from './helpers.js';
-
-const initialState = {
-  list: {},
-  current: {container: {}},
-  printBarcodes: false,
-  errors: {specimen: {}, container: {}, list: {}},
-};
-
-/**
- * Biobank Collection Form
- *
- * Fetches data from Loris backend and displays a form allowing
- * to specimen a biobank file attached to a specific instrument
- *
- * @author Henri Rabalais
- * @version 1.0.0
- *
- * */
-class SpecimenForm extends React.Component {
-  /**
-   * Constructor
-   */
-  constructor() {
-    super();
-
-    this.state = initialState;
-    this.setList = this.setList.bind(this);
-    this.setCurrent = this.setCurrent.bind(this);
-    this.setContainer = this.setContainer.bind(this);
-    this.setProject = this.setProject.bind(this);
-    this.setSession = this.setSession.bind(this);
-    this.generateBarcodes = this.generateBarcodes.bind(this);
-    this.handleSubmit = this.handleSubmit.bind(this);
-  }
-
-  /**
-   * React lifecycle method
-   *
-   * @param {object} prevProps - the prior react props
-   */
-  componentDidUpdate(prevProps) {
-    // If a parent specimen is provided, set the current global values.
-    if (this.props.parent !== prevProps.parent) {
-      const current = clone(this.state.current);
-      const specimen = this.props.parent[0].specimen;
-      const container = this.props.parent[0].container;
-      current.parentSpecimenIds = Object.values(this.props.parent)
-        .map((item) => item.specimen.id);
-      current.candidateId = specimen.candidateId;
-      current.sessionId = specimen.sessionId;
-      current.typeId = specimen.typeId;
-      current.originId = container.originId;
-      current.centerId = container.centerId;
-      if (this.props.parent > 1) {
-        current.quantity = 0;
-      }
-
-      this.setState({current});
-    }
-  }
-
-  /**
-   * Set the current specimen
-   *
-   * @param {string} name - the name
-   * @param {string} value - the value
-   *
-   * @return {Promise}
-   */
-  setCurrent(name, value) {
-    const {current} = clone(this.state);
-    current[name] = value;
-    return new Promise((res) => this.setState({current}, res()));
-  }
-
-  /**
-   * Set the current container
-   *
-   * @param {string} name - container name
-   * @param {string} value - container value
-   *
-   * @return {Promise}
-   */
-  setContainer(name, value) {
-    const {current} = clone(this.state);
-    current.container[name] = value;
-    return new Promise((res) => this.setState({current}, res()));
-  };
-
-  /**
-   * Set a list in the object state?
-   *
-   * @param {object} list - a list of properties to set
-   */
-  setList(list) {
-    this.setState({list});
-  }
-
-  /**
-   * Set the current project
-   *
-   * @param {string} name - project name
-   * @param {string} value - project value
-   *
-   * @return {Promise}
-   */
-  setProject(name, value) {
-    const {current} = clone(this.state);
-    current[name] = [value];
-    return new Promise((res) => this.setState({current}, res()));
-  }
-
-  /**
-   * When a session is selected, set the sessionId, centerId and originId.
-   *
-   * @param {object} session
-   * @param {in} sessionId
-   */
-  setSession(session, sessionId) {
-    const {current} = clone(this.state);
-    current.centerId = this.props.options.sessionCenters[sessionId].centerId;
-    current.originId = current.centerId;
-    current.sessionId = sessionId;
-    this.setState({current});
-  }
-
-  /**
-   * Increment the current barcode
-   *
-   * @param {string} pscid - the PSCID
-   * @param {int} increment - the amount to increment
-   *
-   * @return {int}
-   */
-  incrementBarcode(pscid, increment = 0) {
-    increment++;
-    const barcode = padBarcode(pscid, increment);
-    if (Object.values(this.props.data.containers)
-         .some((container) => container.barcode === barcode)) {
-      increment = this.incrementBarcode(pscid, increment);
-    }
-    if (Object.values(this.state.list)
-         .some((specimen) => specimen.container.barcode === barcode)) {
-      increment = this.incrementBarcode(pscid, increment);
-    }
-    return increment;
-  };
-
-  /**
-   * Generate barcodes and store in the component state.
-   */
-  generateBarcodes() {
-    const {options} = this.props;
-    let {list, current} = this.state;
-    const pscid = options.candidates[current.candidateId].pscid;
-    [list] = Object.keys(list)
-      .reduce(([result, increment], key, i) => {
-        const specimen = this.state.list[key];
-        if (!specimen.container.barcode) {
-          const barcode = padBarcode(pscid, increment);
-          specimen.container.barcode = barcode;
-          increment = this.incrementBarcode(pscid, increment);
-        }
-        result[key] = specimen;
-        return [result, increment];
-    }, [{}, this.incrementBarcode(pscid)]);
-    this.setState({list});
-  };
-
-  /**
-  * Handle the submission of a form
-  *
-  * @return {Promise}
-  */
-  handleSubmit() {
-    const {list, current, printBarcodes} = this.state;
-    return new Promise((resolve, reject) => {
-      this.props.onSubmit(list, current, printBarcodes)
-      .then(() => resolve(), (errors) => this.setState({errors}, reject()));
-    });
-  }
-
-  /**
-   * Render the React component
-   *
-   * @return {ReactDOM}
-   */
-  render() {
-    const {errors, current, list} = this.state;
-    const {options, data, parent} = this.props;
-
-    const renderNote = () => {
-      if (parent) {
-        return (
-          <StaticElement
-            label='Note'
-            text='To create new aliquots, enter a Barcode, fill out the
-            coresponding sub-form and press Submit. Press "New Entry" button
-            to add another barcode field, or press for the "Copy" button to
-                  duplicate the previous entry.'
-          />
-        );
-      } else {
-        return (
-          <StaticElement
-            label='Note'
-            text='To create new specimens, first select a PSCID and Visit Label.
-                  Then, enter a Barcode, fill out the coresponding sub-form and
-                  press submit. Press "New Entry" button to add another barcode
-                  field, or press for the "Copy" button to duplicate the
-                  previous entry.'
-          />
-        );
-      }
-    };
-
-    const renderGlobalFields = () => {
-      if (parent && current.candidateId && current.sessionId) {
-        const parentBarcodes = Object.values(parent).map(
-          (item) => item.container.barcode
-        );
-        const parentBarcodesString = parentBarcodes.join(', ');
-        return (
-          <div>
-            <StaticElement
-              label="Parent Specimen(s)"
-              text={parentBarcodesString}
-            />
-            <StaticElement
-              label="PSCID"
-              text={options.candidates[current.candidateId].pscid}
-            />
-            <StaticElement
-              label="Visit Label"
-              text={options.sessions[current.sessionId].label}
-            />
-          </div>
-        );
-      } else {
-      const sessions = current.candidateId ?
-        mapFormOptions(options.candidateSessions[current.candidateId], 'label')
-        : {};
-      const candidates = mapFormOptions(this.props.options.candidates, 'pscid');
-        return (
-          <div>
-            <SearchableDropdown
-              name="candidateId"
-              label="PSCID"
-              options={candidates}
-              onUserInput={this.setCurrent}
-              required={true}
-              value={current.candidateId}
-              placeHolder='Search for a PSCID'
-              errorMessage={errors.specimen.candidateId}
-            />
-            <SelectElement
-              name='sessionId'
-              label='Visit Label'
-              options={sessions}
-              onUserInput={this.setSession}
-              required={true}
-              value={current.sessionId}
-              disabled={current.candidateId ? false : true}
-              errorMessage={errors.specimen.sessionId}
-              autoSelect={true}
-            />
-          </div>
-        );
-      }
-    };
-
-    const renderRemainingQuantityFields = () => {
-      if (parent) {
-        if (loris.userHasPermission('biobank_specimen_update')
-             && parent.length === 1) {
-          const specimenUnits = mapFormOptions(
-            this.props.options.specimen.units,
-            'label'
-          );
-          return (
-            <div>
-              <TextboxElement
-                name="quantity"
-                label="Remaining Quantity"
-                onUserInput={this.props.setSpecimen}
-                required={true}
-                value={this.props.current.specimen.quantity}
-              />
-              <SelectElement
-                name="unitId"
-                label="Unit"
-                options={specimenUnits}
-                onUserInput={this.props.setSpecimen}
-                required={true}
-                value={this.props.current.specimen.unitId}
-                autoSelect={true}
-              />
-            </div>
-          );
-        }
-      }
-    };
-
-    // Container to be passed to the ContainerParentForm to generate displayed
-    // placeholders for the position of the specimens to be created.
-    const container = clone(current.container);
-    if (container.parentContainerId) {
-      container.coordinate = [];
-      Object.keys(list).reduce((coord, key) => {
-        coord = this.props.increaseCoordinate(
-          coord,
-          container.parentContainerId,
-        );
-        const coordinates = [...container.coordinate, parseInt(coord)];
-        container.coordinate = coordinates;
-        return coord;
-      }, 0);
-    }
-    const placeHolder = {container};
-
-    const handleClose = () => this.setState(initialState, this.props.onClose);
-    return (
-      <Modal
-        title={this.props.title}
-        show={this.props.show}
-        onClose={handleClose}
-        onSubmit={this.handleSubmit}
-        throwWarning={true}
-      >
-        <FormElement>
-          <div className='row'>
-            <div className="col-xs-11">
-              {renderNote()}
-              {renderGlobalFields()}
-              <SelectElement
-                name='projectIds'
-                label='Project'
-                options={this.props.options.projects}
-                onUserInput={this.setProject}
-                required={true}
-                value={current.projectIds}
-                disabled={current.candidateId ? false : true}
-                errorMessage={errors.container.projectIds}
-              />
-              {renderRemainingQuantityFields()}
-            </div>
-          </div>
-          <ListForm
-            list={list}
-            errors={errors.list}
-            setList={this.setList}
-            listItem={{container: {}, collection: {}}}
-          >
-            <SpecimenBarcodeForm
-              typeId={current.typeId}
-              options={options}
-            />
-          </ListForm>
-          <br/>
-          <div className='form-top'/>
-          <ContainerParentForm
-            display={true}
-            data={data}
-            setContainer={this.setContainer}
-            setCurrent={this.setCurrent}
-            current={placeHolder}
-            options={options}
-          />
-          <div className='form-top'/>
-          <ButtonElement
-            name='generate'
-            label='Generate Barcodes'
-            type='button'
-            onUserInput={this.generateBarcodes}
-            disabled={current.candidateId ? false : true}
-          />
-          <CheckboxElement
-            name='printBarcodes'
-            label='Print Barcodes'
-            onUserInput={(name, value) => this.setState({[name]: value})}
-            value={this.state.printBarcodes}
-          />
-        </FormElement>
-      </Modal>
-    );
-  }
-}
-
-SpecimenForm.propTypes = {
-};
-
-SpecimenForm.defaultProps = {
-  specimenList: {},
-};
-
-/**
- * Biobank Barcode Form
- *
- * Acts a subform for BiobankSpecimenForm
- *
- * @author Henri Rabalais
- * @version 1.0.0
- *
- **/
-class SpecimenBarcodeForm extends React.Component {
-  /**
-   * Constructor
-   */
-  constructor() {
-    super();
-    this.setContainer = this.setContainer.bind(this);
-    this.setSpecimen = this.setSpecimen.bind(this);
-  }
-
-  /**
-   * Set the current container.
-   *
-   * @param {string} name - the name
-   * @param {string} value - the value
-   */
-  setContainer(name, value) {
-    let container = this.props.item.container;
-    container[name] = value;
-    this.props.setListItem('container', container, this.props.itemKey);
-  }
-
-  /**
-   * Set the specimen
-   *
-   * @param {string} name - a name
-   * @param {string} value - a value
-   */
-  setSpecimen(name, value) {
-    this.props.setListItem(name, value, this.props.itemKey);
-  }
-
-  /**
-   * Render the React component
-   *
-   * @return {ReactDOM}
-   */
-  render() {
-    const {options, errors, item} = this.props;
-
-    // XXX: Only allow the selection of child types
-    const renderSpecimenTypes = () => {
-      let specimenTypes;
-      if (this.props.typeId) {
-        specimenTypes = Object.entries(options.specimen.types).reduce(
-          (result, [id, type]) => {
-            if (id == this.props.typeId) {
-              result[id] = type;
-            }
-
-            if (type.parentTypeIds) {
-              type.parentTypeIds.forEach((i) => {
-                if (i == this.props.typeId) {
-                  result[id] = type;
-                }
-              });
-            }
-
-            return result;
-          }, {}
-        );
-      } else {
-        specimenTypes = options.specimen.types;
-      }
-
-      return mapFormOptions(specimenTypes, 'label');
-    };
-    const containerTypesPrimary = mapFormOptions(
-      options.container.typesPrimary,
-      'label',
-    );
-
-    const validContainers = {};
-    if (item.typeId && options.specimen.typeContainerTypes[item.typeId]) {
-      Object.keys(containerTypesPrimary).forEach((id) => {
-        options.specimen.typeContainerTypes[item.typeId].forEach((i) => {
-          if (id == i) {
-            validContainers[id] = containerTypesPrimary[id];
-          }
-        });
-      });
-    }
-    return (
-      <ListItem {...this.props}>
-        <TextboxElement
-          name='barcode'
-          label='Barcode'
-          onUserInput={this.setContainer}
-          required={true}
-          value={item.container.barcode}
-          errorMessage={(errors.container||{}).barcode}
-        />
-        <SelectElement
-          name="typeId"
-          label="Specimen Type"
-          options={renderSpecimenTypes()}
-          onUserInput={this.setSpecimen}
-          required={true}
-          value={item.typeId}
-          errorMessage={(errors.specimen||{}).typeId}
-        />
-        <SelectElement
-          name="typeId"
-          label="Container Type"
-          options={item.typeId ? validContainers : containerTypesPrimary}
-          onUserInput={this.setContainer}
-          required={true}
-          value={item.container.typeId}
-          errorMessage={(errors.container||{}).typeId}
-          autoSelect={true}
-        />
-        <TextboxElement
-          name='lotNumber'
-          label='Lot Number'
-          onUserInput={this.setContainer}
-          value={item.container.lotNumber}
-          errorMessage={(errors.container||{}).lotNumber}
-        />
-        <DateElement
-          name='expirationDate'
-          label='Expiration Date'
-          onUserInput={this.setContainer}
-          value={item.container.expirationDate}
-          errorMessage={(errors.container||{}).expirationDate}
-        />
-        <SpecimenProcessForm
-          edit={true}
-          errors={(errors.specimen||{}).collection}
-          options={options}
-          process={item.collection}
-          processStage='collection'
-          setParent={this.setSpecimen}
-          typeId={item.typeId}
-        />
-      </ListItem>
-    );
-  }
-}
-
-SpecimenBarcodeForm.propTypes = {
-};
-
-SpecimenBarcodeForm.defaultProps = {
-  specimen: {},
-};
-
-export default SpecimenForm;
diff --git a/jsx/specimenTab.js b/jsx/specimenTab.js
deleted file mode 100644
index 46c7610f..00000000
--- a/jsx/specimenTab.js
+++ /dev/null
@@ -1,403 +0,0 @@
-import React, {Component} from 'react';
-import {Link} from 'react-router-dom';
-
-import {clone, mapFormOptions} from './helpers.js';
-import FilterableDataTable from 'FilterableDataTable';
-import SpecimenForm from './specimenForm';
-import PoolSpecimenForm from './poolSpecimenForm';
-import BatchProcessForm from './batchProcessForm';
-import BatchEditForm from './batchEditForm';
-import Search from './search';
-
-/**
- * JSX Component representing the specimen tab of the biobank
- * module.
- */
-class SpecimenTab extends Component {
-  /**
-   * Constructor for SpecimenTab
-   */
-  constructor() {
-    super();
-    this.state = {editable: {}};
-    this.edit = this.edit.bind(this);
-    this.clearEditable = this.clearEditable.bind(this);
-    this.mapSpecimenColumns = this.mapSpecimenColumns.bind(this);
-    this.formatSpecimenColumns = this.formatSpecimenColumns.bind(this);
-  }
-
-  /**
-   * Make the form editable
-   *
-   * @param {object} stateKey - the key holding the state
-   *
-   * @return {Promise}
-   */
-  edit(stateKey) {
-    const {editable} = clone(this.state);
-    editable[stateKey] = true;
-    return new Promise((res) => this.setState({editable}, res()));
-  }
-
-  /**
-   * Clear the editable state of this tab.
-   */
-  clearEditable() {
-    this.setState({editable: {}});
-  }
-
-  /**
-   * Map a specimen id to a string value for display.
-   *
-   * @param {string} column - the column name being mapped
-   * @param {string} value - the value being mapped
-   *
-   * @return {string}
-   */
-  mapSpecimenColumns(column, value) {
-    const {options, data} = this.props;
-    switch (column) {
-      case 'Type':
-        return options.specimen.types[value].label;
-      case 'Container Type':
-        return options.container.typesPrimary[value].label;
-      case 'Parent Specimen(s)':
-        if (value instanceof Array) {
-          return value
-          .map((id) => data.containers[data.specimens[id].containerId].barcode);
-        }
-        break;
-      case 'Diagnosis':
-        return value.map((id) => options.diagnoses[id].label);
-      case 'Status':
-        return options.container.stati[value].label;
-      case 'Current Site':
-        return options.centers[value];
-      case 'Draw Site':
-        return options.centers[value];
-      case 'Projects':
-        return value.map((id) => options.projects[id]);
-      default:
-        return value;
-    }
-  }
-
-  /**
-   * Format columns for a specimen row
-   *
-   * @param {string} column - the column name being mapped
-   * @param {string} value - the value being mapped
-   * @param {array} row - an array of the row values
-   *
-   * @return {ReactDOM}
-   */
-  formatSpecimenColumns(column, value, row) {
-    const {options} = this.props;
-    value = this.mapSpecimenColumns(column, value);
-    const candId = Object.values(options.candidates)
-      .find((cand) => cand.pscid == row['PSCID']).id;
-    switch (column) {
-      case 'Barcode':
-        return <td><Link to={`/barcode=${value}`}>{value}</Link></td>;
-      case 'Parent Specimens':
-        const barcodes = value && value.map((id, key) => {
-          return <Link key={key} to={`/barcode=${value}`}>{value}</Link>;
-        }).reduce((prev, curr) => [prev, ', ', curr]);
-        return <td>{barcodes}</td>;
-      case 'PSCID':
-        return <td><a href={loris.BaseURL + '/' + candId}>{value}</a></td>;
-      case 'Visit Label':
-        const ses = Object.values(options.candidateSessions[candId]).find(
-          (sess) => sess.label == value
-        ).id;
-        const visitLabelURL = loris.BaseURL+'/instrument_list/?candID='+candId+
-          '&sessionID='+ses;
-        return <td><a href={visitLabelURL}>{value}</a></td>;
-      case 'Status':
-        const style = {};
-        switch (value) {
-          case 'Available':
-            style.color = 'green';
-            break;
-          case 'Reserved':
-            style.color = 'orange';
-            break;
-          case 'Dispensed':
-            style.color = 'red';
-            break;
-          case 'Discarded':
-            style.color = 'red';
-            break;
-        }
-        return <td style={style}>{value}</td>;
-      case 'Projects':
-        return <td>{value.join(', ')}</td>;
-      case 'Container Barcode':
-        return <td><Link to={`/barcode=${value}`}>{value}</Link></td>;
-      default:
-        return <td>{value}</td>;
-     }
-  }
-
-  /**
-   * Render the React component
-   *
-   * @return {ReactDOM}
-   */
-  render() {
-    const {editable} = this.state;
-    const {data, options} = this.props;
-    const barcodesPrimary = Object.values(data.containers)
-      .reduce((result, container) => {
-        if (options.container.types[container.typeId].primary == 1) {
-          result[container.id] = container.barcode;
-        }
-        return result;
-      }, {});
-    const specimenTypes = mapFormOptions(options.specimen.types, 'label');
-    const containerTypesPrimary = mapFormOptions(
-        options.container.typesPrimary, 'label'
-    );
-    const stati = mapFormOptions(options.container.stati, 'label');
-    const diagnoses = mapFormOptions(options.diagnoses, 'label');
-    const specimenData = Object.values(data.specimens).map((specimen) => {
-      const container = data.containers[specimen.containerId];
-      const pID = container.parentContainerId;
-      const parentContainer = data.containers[pID] || {};
-      let specimenAttributeData = [];
-      Object.keys(options.specimen.processAttributes)
-        .forEach((processId) => {
-          Object.keys(options.specimen.processAttributes[processId])
-            .forEach((attributeId) => {
-              const sopt = options.specimen;
-              const process = sopt.processes[processId].label.toLowerCase();
-              if ((specimen[process]||{}).data) {
-                const processIdStr = specimen[process].protocolId.toString();
-                const attrs = options.specimen.processAttributes;
-                const protocols = attrs[processId][attributeId].protocolIds;
-                if (protocols.includes(processIdStr)) {
-                  const data = specimen[process].data[attributeId];
-                  specimenAttributeData.push(data);
-                } else {
-                  specimenAttributeData.push(null);
-                }
-              }
-            });
-        });
-      return [
-        container.barcode,
-        specimen.typeId,
-        container.typeId,
-        specimen.quantity+' '+options.specimen.units[specimen.unitId].label,
-        specimen.fTCycle || null,
-        specimen.parentSpecimenIds,
-        options.candidates[specimen.candidateId].pscid,
-        options.candidates[specimen.candidateId].sex,
-        specimen.candidateAge,
-        options.candidates[specimen.candidateId].diagnosisIds,
-        options.sessions[specimen.sessionId].label,
-        specimen.poolId ? (data.pools[specimen.poolId]||{}).label : null,
-        container.statusId,
-        container.projectIds,
-        container.centerId,
-        options.sessionCenters[specimen.sessionId].centerId,
-        specimen.collection.date,
-        specimen.collection.time,
-        (specimen.preparation||{}).time,
-        parentContainer.barcode,
-        container.coordinate,
-        ...specimenAttributeData,
-      ];
-    });
-
-    let specimenAttributeFields = [];
-    Object.keys(options.specimen.processAttributes)
-      .forEach((processId) => {
-        Object.keys(options.specimen.processAttributes[processId])
-          .forEach((attributeId) => {
-            specimenAttributeFields.push(
-              {
-                label: options.specimen.attributes[attributeId].label,
-                show: true,
-              },
-            );
-          });
-      });
-    const fields = [
-      {label: 'Barcode', show: true, filter: {
-        name: 'barcode',
-        type: 'text',
-      }},
-      {label: 'Type', show: true, filter: {
-        name: 'type',
-        type: 'select',
-        options: specimenTypes,
-      }},
-      {label: 'Container Type', show: true, filter: {
-        name: 'containerType',
-        type: 'select',
-        options: containerTypesPrimary,
-      }},
-      {label: 'Quantity', show: true},
-      {label: 'F/T Cycle', show: false, filter: {
-        name: 'fTCycle',
-        type: 'text',
-        hide: true,
-      }},
-      {label: 'Parent Specimen(s)', show: false, filter: {
-        name: 'parentSpecimens',
-        type: 'text',
-        hide: true,
-      }},
-      {label: 'PSCID', show: true, filter: {
-        name: 'pscid',
-        type: 'text',
-      }},
-      {label: 'Sex', show: true, filter: {
-        name: 'sex',
-        type: 'select',
-        options: {Male: 'Male', Female: 'Female'},
-      }},
-      {label: 'Age at Collection', show: true, filter: {
-        name: 'age',
-        type: 'number',
-      }},
-      {label: 'Diagnosis', show: true, filter: {
-        name: 'diagnosis',
-        type: 'multiselect',
-        options: diagnoses,
-      }},
-      {label: 'Visit Label', show: true, filter: {
-        name: 'session',
-        type: 'text',
-      }},
-      {label: 'Pool', show: false, filter: {
-        name: 'pool',
-        type: 'text',
-        hide: true,
-      }},
-      {label: 'Status', show: true, filter: {
-        name: 'status',
-        type: 'select',
-        options: stati,
-      }},
-      {label: 'Projects', show: true, filter: {
-        name: 'projects',
-        type: 'multiselect',
-        options: options.projects,
-      }},
-      {label: 'Current Site', show: true, filter: {
-        name: 'currentSite',
-        type: 'select',
-        options: options.centers,
-      }},
-      {label: 'Draw Site', show: true, filter: {
-        name: 'drawSite',
-        type: 'select',
-        options: options.centers,
-      }},
-      {label: 'Collection Date', show: true, filter: {
-        name: 'collectionDate',
-        type: 'date',
-      }},
-      {label: 'Collection Time', show: true, filter: {
-        name: 'collectionTime',
-        type: 'text',
-      }},
-      {label: 'Preparation Time', show: true, filter: {
-        name: 'preparationTime',
-        type: 'text',
-      }},
-      {label: 'Container Barcode', show: true, filter: {
-        name: 'containerBarcode',
-        type: 'text',
-      }},
-      {label: 'Coordinate', show: true},
-      ...specimenAttributeFields,
-    ];
-
-    const openSearchSpecimen = () => this.edit('searchSpecimen');
-    const openSpecimenForm = () => this.edit('specimenForm');
-    const openPoolForm = () => this.edit('poolSpecimenForm');
-    const openBatchProcessForm = () => this.edit('batchProcessForm');
-    const openBatchEditForm = () => this.edit('batchEditForm');
-    const actions = [
-      {
-        name: 'goToSpecimen',
-        label: 'Go To Specimen',
-        action: openSearchSpecimen,
-      },
-      {name: 'addSpecimen', label: 'Add Specimen', action: openSpecimenForm},
-      {name: 'poolSpecimen', label: 'Pool Specimens', action: openPoolForm},
-      {
-        name: 'batchProcess',
-        label: 'Process Specimens',
-        action: openBatchProcessForm,
-      },
-      {name: 'batchEdit', label: 'Edit Specimens', action: openBatchEditForm},
-    ];
-
-    return (
-      <div>
-        <FilterableDataTable
-          name='specimen'
-          data={specimenData}
-          fields={fields}
-          actions={actions}
-          getFormattedCell={this.formatSpecimenColumns}
-          getMappedCell={this.mapSpecimenColumns}
-          progress={this.props.loading}
-        />
-        <Search
-          title='Go To Specimen'
-          show={editable.searchSpecimen}
-          onClose={this.clearEditable}
-          barcodes={barcodesPrimary}
-          history={this.props.history}
-        />
-        {loris.userHasPermission('biobank_specimen_create') ?
-        <SpecimenForm
-          title='Add New Specimen'
-          options={options}
-          data={data}
-          increaseCoordinate={this.props.increaseCoordinate}
-          show={editable.specimenForm}
-          onClose={this.clearEditable}
-          onSubmit={this.props.createSpecimens}
-        /> : null}
-        {loris.userHasPermission('biobank_pool_create') ?
-        <PoolSpecimenForm
-          options={this.props.options}
-          data={this.props.data}
-          show={editable.poolSpecimenForm}
-          onClose={this.clearEditable}
-          onSubmit={this.props.createPool}
-        /> : null}
-        {loris.userHasPermission('biobank_specimen_update') ?
-        <BatchProcessForm
-          show={editable.batchProcessForm}
-          onClose={this.clearEditable}
-          onSubmit={this.props.updateSpecimens}
-          options={this.props.options}
-          data={this.props.data}
-        /> : null}
-        {loris.userHasPermission('biobank_specimen_update') ?
-        <BatchEditForm
-          show={editable.batchEditForm}
-          onClose={this.clearEditable}
-          onSubmit={this.props.editSpecimens}
-          options={this.props.options}
-          data={this.props.data}
-        /> : null}
-      </div>
-    );
-  }
-}
-
-SpecimenTab.propTypes = {
-};
-
-SpecimenTab.defaultProps = {
-};
-
-export default SpecimenTab;
diff --git a/jsx/styles/button.ts b/jsx/styles/button.ts
new file mode 100644
index 00000000..8c9c31fb
--- /dev/null
+++ b/jsx/styles/button.ts
@@ -0,0 +1,113 @@
+import styled from 'styled-components';
+
+// Base action button with common styles
+const BaseButton = styled.button<{onClick: () => void}>`
+  font-size: 30px;
+  color: #FFFFFF;
+  border-radius: 50%;
+  height: 45px;
+  width: 45px;
+  cursor: pointer;
+  user-select: none;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  box-shadow: 0 4px 8px rgba(0, 0, 0, 0.2), 0 6px 20px rgba(0, 0, 0, 0.19);
+  &:hover {
+    box-shadow: 0 6px 10px rgba(0, 0, 0, 0.2), 0 8px 22px rgba(0, 0, 0, 0.19);
+  }
+`;
+// // Applying styles to the glyphicon inside the action buttons
+// const Glyphicon = styled.span`
+//   font-size: 20px;
+//   position: relative;
+//   top: 0;
+// `;
+
+
+// Specific styled action buttons with different background colors and specific glyphicons
+const Add = styled(BaseButton).attrs({
+  className: "glyphicon glyphicon-plus"
+})`
+  background-color: #0f9d58;
+`;
+
+const Duplicate = styled(BaseButton).attrs({
+  className: "glyphicon glyphicon-duplicate"
+})`
+  background-color: #0f9d58;
+`;
+
+const Remove = styled(BaseButton).attrs({
+  className: "glyphicon glyphicon-remove"
+})`
+  background-color: #808080;
+`;
+
+// export const RemoveItemButton = styled.span`
+//   color: #808080;
+//   margin-left: 10px;
+//   cursor: 'pointer';
+//   font-size: 15px;
+// `;
+
+const Pool = styled(BaseButton).attrs({
+  className: "glyphicon glyphicon-tint"
+})`
+  background-color: #96398C;
+`;
+
+const Prepare = styled(BaseButton).attrs({
+  className: "glyphicon glyphicon-scissors"
+})`
+  background-color: #A6D3F5;
+`;
+
+const Search = styled(BaseButton).attrs({
+  className: "glyphicon glyphicon-search"
+})`
+  background-color: #E98430;
+`;
+
+const Update = styled(BaseButton).attrs({
+  className: "glyphicon glyphicon-refresh"
+})`
+  background-color: #FFFFFF;
+  color: #DDDDDD;
+  border: 2px solid #DDDDDD;
+  &:hover {
+    border: none;
+    background-color: #093782;
+    color: #FFFFFF;
+  }
+`;
+
+const Delete = styled(BaseButton).attrs({
+  className: "glyphicon glyphicon-remove"
+})`
+  &:hover {
+    border: none;
+    background-color: #BC1616;
+    color: #FFFFFF;
+  }
+`;
+
+const Disabled = styled(BaseButton).attrs({
+  className: "glyphicon glyphicon-ban-circle"
+})`
+  background-color: #dddddd;
+`;
+
+const Button = {
+  Add,
+  Remove,
+  Duplicate,
+  Pool,
+  Prepare,
+  Search,
+  Update,
+  Delete,
+  Disabled,
+};
+
+export default Button;
diff --git a/jsx/styles/form.ts b/jsx/styles/form.ts
new file mode 100644
index 00000000..ad72560b
--- /dev/null
+++ b/jsx/styles/form.ts
@@ -0,0 +1,104 @@
+import styled from 'styled-components';
+import Layout from './layout';
+
+export const HorizontalRule = styled.hr`
+  border-top: 1.5px solid #DDDDDD;
+  padding-top: 15px;
+  margin-top: 0;
+`;
+
+// Extend FlexBox for ListContainer with specific styles
+export const ListContainer = styled(Layout.Column)`
+  border: 1px solid #DDD;
+  border-radius: 10px;
+  min-height: 85px;
+  padding: 5px;
+  margin-bottom: 15px;
+`;
+
+// Extend FlexBox for ListItem with specific layout tweaks
+export const ListItem = styled(Layout.Row).attrs({
+  justify: 'space-between', // Justify content space-between
+  align: 'flex-start' // Align items to flex-start
+})`
+  width: 100%;
+  &:not(:last-child) {
+    margin-bottom: 10px;
+  }
+`;
+
+// Icon with clickable action
+export const Icon = styled.span<{className?: string, onClick?: () => void}>`
+  color: #DDDDDD;
+  margin-left: 10px;
+  cursor: pointer;
+  font-size: 20px; // Assuming you're using a font icon like FontAwesome or Glyphicons
+`;
+
+export const CollapsibleContent = styled.div<{
+  collapsed: boolean
+  children: React.ReactNode
+}>`
+  transition: max-height 0.3s ease, opacity 0.3s ease;
+  max-height: ${(props) => (props.collapsed ? '0' : '1000px')}; // Adjust as necessary for your content
+  opacity: ${(props) => (props.collapsed ? '0' : '1')};
+  overflow: hidden;
+`;
+
+// display: ${(props) => (props.collapsed ? 'none' : 'inline-block')};
+export const CollapseButton = styled.span<{
+  collapsed: boolean
+  onClick: () => void;
+}>`
+  cursor: pointer;
+  font-size: 15px;
+  position: relative;
+  right: 40px;
+  &::before {
+    content: ${props => props.collapsed ? "'\\e114'" : "'\\e080'"}; // Unicode for glyphicon icons (example)
+    font-family: 'Glyphicons Halflings'; // Assuming glyphicon is in use
+  }
+`;
+
+// const CollapseButton: React.FC<{
+//   collapsed: boolean,
+//   onClick: () => void
+// }> = ({
+//   collapsed,
+//   onClick
+// }) => (
+//   <span
+//     onClick={onClick}
+//     className={'glyphicon '+ collapsed ? 'glyphicon-chevron-down' : 'glyphicon-chevron-up'}
+//     style={{
+//       cursor: 'pointer',
+//       fontSize: 15,
+//       position: 'relative',
+//       right: 40,
+//     }}
+//   />
+// );
+// 
+// const RemoveItemButton: React.FC<{onClick: () => void}> = ({ onClick }) => (
+//   <span
+//     onClick={onClick}
+//     className='glyphicon glyphicon-remove'
+//     style={{
+//       color: '#808080',
+//       marginLeft: 10,
+//       cursor: 'pointer',
+//       fontSize: 15,
+//     }}
+//   />
+// );
+
+const Form = {
+  HorizontalRule,
+  ListContainer,
+  ListItem,
+  Icon,
+  CollapsibleContent,
+  CollapseButton,
+};
+
+export default Form;
diff --git a/jsx/styles/index.ts b/jsx/styles/index.ts
new file mode 100644
index 00000000..4a5676c1
--- /dev/null
+++ b/jsx/styles/index.ts
@@ -0,0 +1,19 @@
+// re-export exports from each file
+export * from './button';
+export * from './form';
+export * from './layout';
+
+// Import default export from each file
+import Button from './button';
+import Form from './form';
+import Layout from './layout';
+
+// Create a combind default export object
+const Styles = {
+    Button,
+    Form,
+    Layout
+};
+
+// Export the object as the default export
+export default Styles;
diff --git a/jsx/styles/layout.ts b/jsx/styles/layout.ts
new file mode 100644
index 00000000..7d899797
--- /dev/null
+++ b/jsx/styles/layout.ts
@@ -0,0 +1,146 @@
+import styled from 'styled-components';
+import { ReactNode } from 'react';
+
+type CSSAlignSelf = 'auto' | 'start' | 'end' | 'center' | 'baseline' | 'stretch';
+type CSSJustifySelf = 'auto' | 'start' | 'end' | 'center' | 'stretch';
+type CSSAlignItems = 'stretch' | 'center' | 'start' | 'end' | 'baseline';
+type CSSJustifyContent = 'start' | 'end' | 'center' | 'space-between' | 'space-around' | 'space-evenly';
+
+const Grid = styled.div<{
+  columns?: string;
+  rows?: string;
+  gap?: string;
+  columnGap?: string;
+  rowGap?: string;
+  align?: CSSAlignItems;
+  justify?: CSSJustifyContent;
+  children?: ReactNode;
+}>`
+  display: grid;
+  grid-template-columns: ${({ columns }) => columns || '1fr'};
+  grid-template-rows: ${({ rows }) => rows || 'auto'};
+  gap: ${({ gap }) => gap || '0'};
+  column-gap: ${({ columnGap }) => columnGap || '0'};
+  row-gap: ${({ rowGap }) => rowGap || '0'};
+  align-items: ${({ align }) => align || 'center'};
+  justify-content: ${({ justify }) => justify || 'center'};
+`;
+
+const Item = styled.div<{
+  column?: string;
+  row?: string;
+  align?: CSSAlignSelf;
+  justify?: CSSJustifySelf;
+  children?: ReactNode;
+}>`
+  grid-column: ${({ column }) => column || 'auto'};
+  grid-row: ${({ row }) => row || 'auto'};
+  align-self: ${({ align }) => align || 'auto'};
+  justify-self: ${({ justify }) => justify || 'auto'};
+`;
+
+// GridBox Styled Component
+const Field = styled(Grid)<{ hasLabel: boolean }>`
+  grid-template-columns: ${({ hasLabel }) => hasLabel ? '2fr 3fr' : '1fr'}; /* Adjust based on label presence */
+  gap: 10px; /* Space between label and children */
+
+  @media (max-width: 600px) { /* Adjust breakpoint as needed */
+    grid-template-columns: 1fr; /* Stack elements vertically on small screens */
+  }
+`;
+
+const Flex = styled.div<{
+  direction?: 'row' | 'column';
+  align?: 'stretch' | 'center' | 'flex-start' | 'flex-end' | 'baseline';
+  justify?: 'flex-start' | 'center' | 'flex-end' | 'space-between' | 'space-around' | 'space-evenly';
+  wrap?: 'nowrap' | 'wrap' | 'wrap-reverse';
+  width?: string;
+  height?: string;
+  children?: ReactNode;
+}>`
+  display: flex;
+  flex-direction: ${({ direction }) => direction || 'row'};
+  align-items: ${({ align }) => align || 'center'};
+  justify-content: ${({ justify }) => justify || 'center'};
+  flex-wrap: ${({ wrap }) => wrap || 'nowrap'};
+  width: ${({ width }) => width || '100%'};
+  height: ${({ height }) => height || 'auto'};
+`;
+
+const Row = styled(Flex)<{
+  flex?: number
+}>`
+  flex-direction: row;
+  flex: ${({flex}) => flex || '1'};
+`;
+
+const Column = styled(Flex)<{
+  flex?: number
+}>`
+  flex-direction: column;
+  flex: ${({flex}) => flex || '1'};
+`;
+
+// const Row = styled(GridBox)`
+//   grid-auto-flow: row; // Makes it behave like a flex row but with grid capabilities
+// `;
+// 
+// const Column = styled.div<{ cols?: string }>`
+//   grid-column: ${({ cols }) => cols || 'auto'};
+//   grid-auto-flow: column; // Makes it behave like a flex column but with grid capabilities
+// `;
+
+const Container = styled.div`
+  width: 100%;
+  max-width: 1200px;
+  margin: 0 auto;
+  padding: 0 15px;
+`;
+
+const Inline = styled.div`
+  display: inline-block;
+
+  // Applying styles to direct children
+  > * {
+    margin: 0 5px;
+  }
+`;
+
+const ActionTitle = styled.div`
+  font-size: 16px;
+  display: inline;
+
+  // Applying styles to direct children
+  > * {
+    margin: 0 5px;
+  }
+`;
+
+// const Input = styled.input`
+//   width: 50px;
+//   display: inline;
+//   margin-right: 10px;
+// `;
+
+
+// export const Input = styled.input.attrs(props => ({
+//   type: 'number',
+//   min: 1,
+//   max: 50
+// }))`
+//   width: 50px;
+//   display: inline;
+//   margin-right: 10px;
+// `;
+
+const Layout = {
+  Grid,
+  Item,
+  Field,
+  Row,
+  Column,
+  Inline,
+  ActionTitle,
+};
+
+export default Layout;
diff --git a/jsx/types/configuration.types.ts b/jsx/types/configuration.types.ts
new file mode 100644
index 00000000..18514180
--- /dev/null
+++ b/jsx/types/configuration.types.ts
@@ -0,0 +1,17 @@
+import { BiobankContextType } from '../contexts';
+
+// Utility type to extract the element type if it's an array, otherwise just use the type itself
+type ElementType<T> = T extends Array<infer U> ? U : T;
+
+export interface FieldConfiguration<I extends object, K extends keyof I> {                                               
+  label: string,                                                                
+  type: 'text' | 'select' | 'date' | 'search' | 'time' | 'textarea' | 'boolean'
+  | 'number' | 'static' | 'input',                                             
+  required?: boolean,                                                            
+  disabled?: boolean,
+  multiple?: boolean,
+  autoSelect?: boolean, 
+  placeholder?: string,
+  emptyOption?: boolean,
+  getOptions?: (context: BiobankContextType) => Record<string, string>,
+}    
diff --git a/jsx/types/index.ts b/jsx/types/index.ts
new file mode 100644
index 00000000..186fead7
--- /dev/null
+++ b/jsx/types/index.ts
@@ -0,0 +1,3 @@
+// NOTE: there is no need to use named exports for types
+export * from './label.types';
+export * from './configuration.types';
diff --git a/jsx/types/label.types.ts b/jsx/types/label.types.ts
new file mode 100644
index 00000000..6fae685a
--- /dev/null
+++ b/jsx/types/label.types.ts
@@ -0,0 +1,6 @@
+// TODO: barcode, type, etc. should probably have their own type that can be
+// defined in a single place
+export type Label = {                                                       
+  barcode: string,                                                                  
+  type: string,                                                             
+};   
diff --git a/jsx/utils/clone.ts b/jsx/utils/clone.ts
new file mode 100644
index 00000000..17dcd931
--- /dev/null
+++ b/jsx/utils/clone.ts
@@ -0,0 +1,9 @@
+/**                                                                             
+ * Clone an object                                                              
+ *                                                                              
+ * @param {T} object - The object to clone                                      
+ * @returns {T} Cloned object                                                   
+ */                                                                             
+export function clone<T>(object: T): T {                                        
+  return JSON.parse(JSON.stringify(object));                                    
+}    
diff --git a/jsx/utils/fetchStream.ts b/jsx/utils/fetchStream.ts
new file mode 100644
index 00000000..ff972b81
--- /dev/null
+++ b/jsx/utils/fetchStream.ts
@@ -0,0 +1,57 @@
+async function fetchStream(url, handleRow, setData, setProgress, signal) {
+    const response = await fetch(url, {
+        method: 'GET',
+        credentials: 'same-origin',
+        signal: signal,
+    });
+
+    const reader = response.body.getReader();
+    const contentLength = response.headers.get('Content-Length');
+
+    let receivedLength = 0; // The total number of bytes received so far
+    let chunks = []; // Array of received binary chunks
+
+    while (true) {
+        const { done, value } = await reader.read();
+
+        if (done) {
+            break; // The stream has been fully read
+        }
+
+        chunks.push(value);
+        receivedLength += value.length;
+
+        // If the total size is known, calculate the progress
+        if (contentLength) {
+            const progress = (receivedLength / contentLength) * 100;
+            setProgress(progress);
+        } else {
+            // If content length is unknown, you can provide feedback based on received length
+            console.log(`Received ${receivedLength} bytes so far`);
+        }
+    }
+
+    // Combine all chunks into a single Uint8Array
+    let chunksAll = new Uint8Array(receivedLength);
+    let position = 0;
+    for (let chunk of chunks) {
+        chunksAll.set(chunk, position);
+        position += chunk.length;
+    }
+
+    // Convert the binary data to a text or JSON object (depends on your use case)
+    const resultText = new TextDecoder("utf-8").decode(chunksAll);
+    const data = JSON.parse(resultText); // Assuming JSON data; adjust as needed
+
+    // Handle each row if the data is an array
+    if (Array.isArray(data)) {
+        data.forEach(row => handleRow(row));
+        setData(data);
+    } else {
+        // Handle different data formats if necessary
+        console.error('Unexpected data format:', data);
+    }
+
+    setProgress(100); // Ensure progress is set to 100% when done
+}
+
diff --git a/jsx/utils/formatOptions.ts b/jsx/utils/formatOptions.ts
new file mode 100644
index 00000000..dd301c54
--- /dev/null
+++ b/jsx/utils/formatOptions.ts
@@ -0,0 +1,11 @@
+import Utils from './';
+
+export const formatOptions = <T>(
+  options: Record<string, T> = {},
+  format: (option: T) => string = (option) => String(option)
+): Record<string, string> => {
+  return Object.entries(options).reduce((acc, [key, option]) => {          
+    acc[key] = format(option); 
+    return acc;
+  }, {}); // Start with an empty object
+};
diff --git a/jsx/utils/index.ts b/jsx/utils/index.ts
new file mode 100644
index 00000000..fb768ac1
--- /dev/null
+++ b/jsx/utils/index.ts
@@ -0,0 +1,27 @@
+// Re-export exports from each file
+export * from './clone';
+export * from './mapFormOptions';
+export * from './formatOptions';
+export * from './isEmpty';
+export * from './padBarcode';
+
+// Import default export from each file
+import { clone } from './clone';
+import { mapFormOptions } from './mapFormOptions';
+import { mapLabel } from './mapFormOptions';
+import { formatOptions } from './formatOptions';
+import { isEmpty } from './isEmpty';
+import { padBarcode } from './padBarcode';
+
+// Create a combind default export object
+const Utils = {
+    clone,
+    mapLabel,
+    mapFormOptions,
+    formatOptions,
+    isEmpty,
+    padBarcode
+};
+
+// Export the object as the default export
+export default Utils;
diff --git a/jsx/utils/isEmpty.ts b/jsx/utils/isEmpty.ts
new file mode 100644
index 00000000..22e15c45
--- /dev/null
+++ b/jsx/utils/isEmpty.ts
@@ -0,0 +1,21 @@
+/**                                                                             
+ * Check if an object is either null or an empty object.                        
+ *                                                                              
+ * @param {object | null} object - The variable to check. It can be any object  
+ * or null.                                                                     
+ * @returns {boolean} True if the object is null or an empty object, false      
+ * otherwise.                                                                   
+ */                                                                             
+export function isEmpty(object: object | null): boolean {                       
+  if (object == null) {                                                         
+    return true;                                                                
+  }                                                                             
+                                                                                
+  for (let prop in object) {                                                    
+    if (object.hasOwnProperty(prop)) {                                          
+      return false;                                                             
+    }                                                                           
+  }                                                                             
+                                                                                
+  return JSON.stringify(object) === JSON.stringify({});                         
+}  
diff --git a/jsx/utils/mapFormOptions.ts b/jsx/utils/mapFormOptions.ts
new file mode 100644
index 00000000..8d79d984
--- /dev/null
+++ b/jsx/utils/mapFormOptions.ts
@@ -0,0 +1,24 @@
+/**                                                                             
+ * Maps an object's values based on a specific attribute.                       
+ *                                                                              
+ * @param {{ [key: string]: any }} object - The object to map. An object with   
+ * string keys and values of any type.                                          
+ * @param {string} attribute - The attribute to map by.                         
+ * @returns {{ [key: string]: any }} Mapped object with the same keys as the    
+ * input object and values derived from the specified attribute.                
+ */                                                                             
+export function mapFormOptions<T>(                                                 
+  entities: T[],                                               
+  attribute: string                                                             
+): Record<string, string> {                                                     
+  return entities.reduce((result, entity) => {                           
+    result[entity[attribute]] = entity[attribute];
+    return result;                                                              
+  }, {});                                                                       
+}   
+
+export function mapLabel<T>(
+  entities: T[],        
+): Record<string, string> {
+  return mapFormOptions(entities, 'label');        
+}
diff --git a/jsx/utils/padBarcode.ts b/jsx/utils/padBarcode.ts
new file mode 100644
index 00000000..b46f2121
--- /dev/null
+++ b/jsx/utils/padBarcode.ts
@@ -0,0 +1,24 @@
+/**                                                                             
+ * Pad a barcode.                                                               
+ *                                                                              
+ * @param {string} pscid - A PSCID, representing a unique identifier.           
+ * @param {number} increment - The numeric value representing the amount of     
+ * padding needed.                                                              
+ * @returns {string} Padded barcode string.                                     
+ */                                                                             
+export function padBarcode(pscid: string, increment: number): string {          
+  return pscid + padLeft(increment, 3);                                         
+}                                                                               
+                                                                                
+/**                                                                             
+ * Left pad a string without using a library.                                   
+ *                                                                              
+ * @param {number} nr - The existing number to be padded.                       
+ * @param {number} n - The total desired length of the string after padding.    
+ * @param {string} str - The string used for padding. Defaults to '0' if not    
+ * provided.                                                                    
+ * @returns {string} The padded string.                                         
+ */                                                                             
+function padLeft(nr: number, n: number, str: string = '0'): string {            
+  return Array(n - String(nr).length + 1).join(str) + nr;                       
+} 
diff --git a/jsx/utils/validation.js b/jsx/utils/validation.js
new file mode 100644
index 00000000..5a304d99
--- /dev/null
+++ b/jsx/utils/validation.js
@@ -0,0 +1,287 @@
+706   /**                                                                           
+707    * Validate a pool of speciments                                              
+708    *                                                                            
+709    * @param {object} pool - The pool to validate                                
+710    *                                                                            
+711    * @return {object} an object of any errors                                   
+712    */                                                                           
+713   validatePool(pool) {                                                          
+714     let regex;                                                                  
+715     const errors = {};                                                          
+716                                                                                 
+717     const required = ['label', 'quantity', 'unitId', 'date', 'time'];           
+718                                                                                 
+719     required.forEach((field) => {                                               
+720       if (!pool[field]) {                                                       
+721         errors[field] = 'This field is required! ';                             
+722       }                                                                         
+723     });                                                                         
+724                                                                                 
+725     if (isNaN(parseInt(pool.quantity)) || !isFinite(pool.quantity)) {           
+726       errors.quantity = 'This field must be a number! ';                        
+727     }                                                                           
+728                                                                                 
+729     // validate date                                                            
+730     regex = /^[12]\d{3}\-(0[1-9]|1[012])\-(0[1-9]|[12][0-9]|3[01])$/;           
+731     if (regex.test(pool.date) === false ) {                                     
+732       errors.date = 'This field must be a valid date! ';                        
+733     }                                                                           
+734                                                                                 
+735     // validate time                                                            
+736     regex = /^([01]\d|2[0-3]):([0-5]\d)$/;                                      
+737     if (regex.test(pool.time) === false) {                                      
+738       errors.time = 'This field must be a valid time! ';                        
+739     }                                                                           
+740                                                                                 
+741     if (pool.specimenIds == null || pool.specimenIds.length < 2) {              
+742       errors.total = 'Pooling requires at least 2 specimens';                   
+743     };                                                                          
+744                                                                                 
+745     return errors;                                                              
+746   }     
+
+661   /**                                                                           
+662    * Validate a container object                                                
+663    *                                                                            
+664    * @param {object} container - the container to validate                      
+665    * @param {string} key - unused?                                              
+666    *                                                                            
+667    * @return {object} - an object full of errors                                
+668    */                                                                           
+669    validateContainer(container) {                                               
+670        const errors = {};                                                       
+671                                                                                 
+672        const required = [                                                       
+673          'barcode',                                                             
+674          'typeId',                                                              
+675          'temperature',                                                         
+676          'statusId',                                                            
+677          'centerId',                                                            
+678        ];                                                                       
+679                                                                                 
+680        const float = [                                                          
+681          'temperature',                                                         
+682        ];                                                                       
+683                                                                                 
+684        required.forEach((field) => {                                            
+685            if (!container[field]?.trim()) {                                     
+686                errors[field] = 'This field is required!';                       
+687            }                                                                    
+688        });                                                                      
+689                                                                                 
+690        float.forEach((field) => {                                               
+691            const value = parseFloat(container[field]);                          
+692            if (isNaN(value) || value === parseInt(value)) {                     
+693                errors[field] = 'This field must be a floating-point number!';   
+694            }                                                                    
+695        });                                                                      
+696                                                                                 
+697        const barcodeSet = new Set(this.state.data.containers.map(c => c.id !== container.id && c.barcode));
+698        if (barcodeSet.has(container.barcode)) {                                 
+699            errors.barcode = 'Barcode must be unique.';                          
+700        }                                                                        
+701                                                                                 
+702        // TODO: Regex barcode check to be added later                           
+703                                                                                 
+704        return errors;                                                           
+705    }  
+
+563    * Validate a process                                                         
+564    *                                                                            
+565    * @param {object} process - the process to validate                          
+566    * @param {object} attributes - the attributes of the process                 
+567    * @param {array} required - the required fields                              
+568    * @param {array} number - an array of fields that must be numbers            
+569    *                                                                            
+570    * @return {object} errors                                                    
+571    */                                                                           
+572   validateProcess(process, attributes, required, number) {                      
+573     let errors = {};                                                            
+574     let regex;                                                                  
+575                                                                                 
+576     // validate required fields                                                 
+577     required && required.map((field) => {                                       
+578       if (!process[field]) {                                                    
+579         errors[field] = 'This field is required! ';                             
+580       }                                                                         
+581     });                                                                         
+582                                                                                 
+583     // validate floats                                                          
+584     number && number.map((field) => {                                           
+585       if (isNaN(parseInt(process[field])) || !isFinite(process[field])) {       
+586         errors[field] = 'This field must be a number! ';                        
+587       }                                                                         
+588     });                                                                         
+589                                                                                 
+590     // validate date                                                            
+591     regex = /^[12]\d{3}\-(0[1-9]|1[012])\-(0[1-9]|[12][0-9]|3[01])$/;           
+592     if (regex.test(process.date) === false ) {                                  
+593       errors.date = 'This field must be a valid date! ';                        
+594     }                                                                           
+595                                                                                 
+596     // validate time                                                            
+597     regex = /^([01]\d|2[0-3]):([0-5]\d)$/;                                      
+598     if (regex.test(process.time) === false) {                                   
+599       errors.time = 'This field must be a valid time! ';                        
+600     }                                                                           
+601                                                                                 
+602     // validate custom attributes                                               
+603     if (!isEmpty(process.data)) {                                               
+604       errors.data = {};                                                         
+605       const specimenopts = this.state.options.specimen;                         
+606       const datatypes = specimenopts.attributeDatatypes;                        
+607                                                                                 
+608       const protocolId = process.protocolId;                                    
+609       const protocolAttributes = specimenopts.protocolAttributes[protocolId];   
+610       // FIXME: This if statement was introduced because certain processes have 
+611       // a data object even though their protocol isn't associated with attributes.
+612       // This is a sign of bad importing/configuration and should be fixed in configuration
+613       // rather than here.                                                      
+614       if (protocolAttributes) {                                                 
+615         Object.keys(protocolAttributes)                                         
+616           .forEach((attributeId) => {                                           
+617           // validate required                                                  
+618           if (protocolAttributes[attributeId].required == 1                     
+619               && !process.data[attributeId]) {                                  
+620             errors.data[attributeId] = 'This field is required!';               
+621           }                                                                     
+622                                                                                 
+623           const dataTypeId= attributes[attributeId].datatypeId;                 
+624           // validate number                                                    
+625           if (datatypes[dataTypeId].datatype === 'number') {                    
+626             if (isNaN(parseInt(process.data[attributeId])) ||                   
+627                 !isFinite(process.data[attributeId])) {                         
+628               errors.data[attributeId] = 'This field must be a number!';        
+629             }                                                                   
+630           }                                                                     
+631                                                                                 
+632           // validate date                                                      
+633           if (datatypes[dataTypeId].datatype === 'date') {                      
+634             regex = /^[12]\d{3}\-(0[1-9]|1[012])\-(0[1-9]|[12][0-9]|3[01])$/;   
+635             if (regex.test(process.data[attributeId]) === false ) {             
+636               errors.data[attributeId] = 'This field must be a valid date! ';   
+637             }                                                                   
+638           }                                                                     
+639                                                                                 
+640           // validate time                                                      
+641           if (datatypes[dataTypeId].datatype === 'time') {                      
+642             regex = /^([01]\d|2[0-3]):([0-5]\d)$/;                              
+643             if (regex.test(process.data[attributeId]) === false) {              
+644               errors.data[attributeId] = 'This field must be a valid time! ';   
+645             }                                                                   
+646           }                                                                     
+647                                                                                 
+648           // TODO: Eventually introduce file validation.                        
+649         });                                                                     
+650       }                                                                         
+651                                                                                 
+652       if (isEmpty(errors.data)) {                                               
+653         delete errors.data;                                                     
+654       }                                                                         
+655     }                                                                           
+656                                                                                 
+657     // Return Errors                                                            
+658     return errors;                                                              
+659   }      
+
+460   /**                                                                           
+461    * Validate a specimen                                                        
+462    *                                                                            
+463    * @param {object} specimen - the specimen to validate                        
+464    * @param {string} key - unused?                                              
+465    *                                                                            
+466    * @return {object} an object of errors                                       
+467    */                                                                           
+468   validateSpecimen(specimen, key) {                                             
+469     const errors = {};                                                          
+470                                                                                 
+471     const required = [                                                          
+472       'typeId',                                                                 
+473       'quantity',                                                               
+474       'unitId',                                                                 
+475       'candidateId',                                                            
+476       'sessionId',                                                              
+477       'projectIds',                                                             
+478       'collection',                                                             
+479     ];                                                                          
+480     const float = ['quantity'];                                                 
+481     const positive = ['quantity', 'fTCycle'];                                   
+482     const integer = ['fTCycle'];                                                
+483                                                                                 
+484     required.map((field) => {                                                   
+485       // TODO: seems like for certain cases it needs to be !== null             
+486       if (!specimen[field]) {                                                   
+487         errors[field] = 'This field is required! ';                             
+488       }                                                                         
+489     });                                                                         
+490                                                                                 
+491     float.map((field) => {                                                      
+492       if (isNaN(parseInt(specimen[field])) || !isFinite(specimen[field])) {     
+493         errors[field] = 'This field must be a number! ';                        
+494       }                                                                         
+495     });                                                                         
+496                                                                                 
+497     positive.map((field) => {                                                   
+498       if (specimen[field] != null && specimen[field] < 0) {                     
+499         errors[field] = 'This field must not be negative!';                     
+500       }                                                                         
+501     });                                                                         
+502                                                                                 
+503     integer.map((field) => {                                                    
+504       if (specimen[field] != null                                               
+505           && !/^\+?(0|[1-9]\d*)$/.test(specimen[field])                         
+506       ) {                                                                       
+507         errors[field] = 'This field must be an integer!';                       
+508       }                                                                         
+509     });                                                                         
+510                                                                                 
+511     const optspecimen = this.state.options.specimen;                            
+512     errors.collection =                                                         
+513       this.validateProcess(                                                     
+514         specimen.collection,                                                    
+515         optspecimen.protocolAttributes[specimen.collection.protocolId],         
+516         [                                                                       
+517           'protocolId',                                                         
+518           'examinerId',                                                         
+519           'quantity',                                                           
+520           'unitId',                                                             
+521           'centerId',                                                           
+522           'date',                                                               
+523           'time',                                                               
+524         ],                                                                      
+525         ['quantity']                                                            
+526       );                                                                        
+527                                                                                 
+528     // collection should only be set if there are errors associated with it.    
+529     if (isEmpty(errors.collection)) {                                           
+530       delete errors.collection;                                                 
+531     }                                                                           
+532                                                                                 
+533     if (specimen.preparation) {                                                 
+534       errors.preparation =                                                      
+535         this.validateProcess(                                                   
+536           specimen.preparation,                                                 
+537           optspecimen.protocolAttributes[specimen.preparation.protocolId],      
+538           ['protocolId', 'examinerId', 'centerId', 'date', 'time']              
+539         );                                                                      
+540     }                                                                           
+541                                                                                 
+542     if (isEmpty(errors.preparation)) {                                          
+543       delete errors.preparation;                                                
+544     }                                                                           
+545                                                                                 
+546     if (specimen.analysis) {                                                    
+547       errors.analysis =                                                         
+548         this.validateProcess(                                                   
+549           specimen.analysis,                                                    
+550           optspecimen.protocolAttributes[specimen.analysis.protocolId],         
+551           ['protocolId', 'examinerId', 'centerId', 'date', 'time']              
+552         );                                                                      
+553     }                                                                           
+554                                                                                 
+555     if (isEmpty(errors.analysis)) {                                             
+556       delete errors.analysis;                                                   
+557     }                                                                           
+558                                                                                 
+559     return errors;                                                              
+560   }      
diff --git a/package.json b/package.json
index 60448450..5c94ab3b 100644
--- a/package.json
+++ b/package.json
@@ -5,10 +5,11 @@
     "main": "biobankIndex.js",
     "dependencies": {
         "partial-json-parser": "^1.2.2",
+        "react-query": "^3.39.3",
         "react-router-dom": "^5.2.0",
-        "transliteration": "^2.1.8"
+        "transliteration": "^2.1.8",
+        "uuid": "^9.0.1"
     },
-    "devDependencies": {},
     "scripts": {
         "test": "echo \"Error: no test specified\" && exit 1"
     },
diff --git a/php/biobank.class.inc b/php/biobank.class.inc
index 924552fe..dfb7e185 100644
--- a/php/biobank.class.inc
+++ b/php/biobank.class.inc
@@ -80,7 +80,7 @@ class Biobank extends \NDB_Menu_Filter
         $deps    = parent::getJSDependencies();
         return array_merge(
             $deps,
-            [$baseURL . "/biobank/js/biobankIndex.js"]
+            [$baseURL . "/biobank/js/components/BiobankIndex.js"],
         );
     }
 
diff --git a/php/collection.class.inc b/php/collection.class.inc
deleted file mode 100644
index d2cfa906..00000000
--- a/php/collection.class.inc
+++ /dev/null
@@ -1,134 +0,0 @@
-<?php declare(strict_types=1);
-/**
- * Collection Object Class
- * This class contains an instance of a database handling that is needed to
- * permanently store and retrieve Collection Object instances.
- *
- * PHP Version 7.2
- *
- * @category   Entity
- * @package    Loris
- * @subpackage Biobank
- * @author     Henri Rabalais <henri.rabalais@mcin.ca>
- * @license    http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
- * @link       https://www.github.com/aces/Loris/
- */
-namespace LORIS\biobank;
-
-/**
- * Collection Object Class
- * This class contains an instance of a database handling that is needed to
- * permanently store and retrieve Collection Object instances.
- *
- * PHP Version 7.2
- *
- * @category   Entity
- * @package    Loris
- * @subpackage Biobank
- * @author     Henri Rabalais <henri.rabalais@mcin.ca>
- * @license    http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
- * @link       https://www.github.com/aces/Loris/
- */
-class Collection extends Process
-{
-    /**
-     * Persistent Instance variables.
-     *
-     * These variables describe a collection instance.
-     *
-     * @var string $quantity
-     * @var int    $unitId
-     */
-    private $quantity;
-    private $unitId;
-
-    /**
-     * Sets the current quantity of specimen available. This associated unit
-     * can be found in the `biobank_unit` using the unit ID.
-     *
-     * @param string $quantity the current amount of specimen available
-     *
-     * @return void
-     */
-    public function setQuantity(string $quantity) : void
-    {
-        $this->quantity = $quantity;
-    }
-
-    /**
-     * Gets the current amount of specimen available
-     *
-     * @return ?string
-     */
-    public function getQuantity() : ?string
-    {
-        return $this->quantity;
-    }
-
-    /**
-     * Sets the ID of the specimen's unit of quantity
-     *
-     * @param int $unitId the ID of the quantity's unit
-     *
-     * @return void
-     */
-    public function setUnitId(int $unitId) : void
-    {
-        $this->unitId = $unitId;
-    }
-
-    /**
-     * Gets the ID of the specimen's unit of quantity
-     *
-     * @return ?int
-     */
-    public function getUnitId() : ?int
-    {
-        return $this->unitId;
-    }
-
-    /**
-     * Instatiates a Collection Object using the values sent from the client-side.
-     *
-     * @param array $data Data to be used to instantiate the Collection Object.
-     *
-     * @return Process
-     */
-    public function fromArray(array $data) : Process
-    {
-        parent::fromArray($data);
-        isset($data['quantity']) && $this->setQuantity((string) $data['quantity']);
-        isset($data['unitId'])   && $this->setUnitId((int) $data['unitId']);
-
-        return $this;
-    }
-
-    /**
-     * A wrapper function for the jsonSerialize method of the Collection Instance
-     * Class. This converts this Specimen Collection into an array
-     *
-     * @return array Collection Array
-     */
-    public function toArray()
-    {
-        return $this->jsonSerialize();
-    }
-
-    /**
-     * Returns an array representing the state of the Collection.
-     *
-     * @return array
-     */
-    public function jsonSerialize() : array
-    {
-        $parent = parent::jsonSerialize();
-        return array_merge(
-            $parent,
-            [
-                'quantity' => $this->quantity,
-                'unitId'   => $this->unitId,
-            ]
-        );
-    }
-}
-
diff --git a/php/container.class.inc b/php/container.class.inc
deleted file mode 100644
index 34e18267..00000000
--- a/php/container.class.inc
+++ /dev/null
@@ -1,561 +0,0 @@
-<?php declare(strict_types=1);
-/**
- * Container Object Class
- * This class contains an instance of a database handling that is needed to
- * permanently store and retrieve Container Object instances.
- *
- * PHP Version 7.2
- *
- * @category   Entity
- * @package    Loris
- * @subpackage Biobank
- * @author     Henri Rabalais <henri.rabalais@mcin.ca>
- * @license    http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
- * @link       https://www.github.com/aces/Loris/
- */
-
-namespace LORIS\biobank;
-
-/**
- * Container Object Class
- * This class contains an instance of a database handling that is needed to
- * permanently store and retrieve Container Object instances.
- *
- * PHP Version 7.2
- *
- * @category Loris
- * @package  Biobank
- * @author   Henri Rabalais <hrabalais.mcin@gmail.com>
- * @license  http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
- * @link     https://www.github.com/aces/Loris/
- */
-
-class Container implements \JsonSerializable, \LORIS\Data\DataInstance, \LORIS\StudyEntities\SiteHaver
-{
-    /**
-     * Persistent Instance variables.
-     *
-     * These properties describe a container entity.
-     *
-     * @var int       $id
-     * @var string    $barcode
-     * @var int       $specimenId
-     * @var int       $typeId
-     * @var int       $dimensionId
-     * @var float     $temperature
-     * @var int       $statusId
-     * @var array     $projectIds
-     * @var array     $shipmentBarocdes
-     * @var \CenterID $centerId
-     * @var int       $parentContainerId
-     * @var array     $childContainerIds
-     * @var int       $coordinate
-     * @var string    $lotNumber
-     * @var \DateTime $expirationDate
-     * @var string    $comments
-     *
-     * @access private
-     */
-    private $id;
-    private $barcode;
-    private $specimenId;
-    private $typeId;
-    private $dimensionId;
-    private $temperature;
-    private $statusId;
-    private $projectIds;
-    private $shipmentBarcodes;
-    private \CenterID $centerId;
-    private $parentContainerId;
-    private $childContainerIds;
-    private $coordinate;
-    private $lotNumber;
-    private $expirationDate;
-    private $comments;
-
-    /**
-     * Initiliazes a new instance of the Container Class
-     */
-    function __construct()
-    {
-    }
-
-    /**
-     * Sets the container's ID
-     *
-     * @param int $id the container's ID
-     *
-     * @return void
-     */
-    public function setId(int $id) : void
-    {
-        if ($id > 0) {
-            $this->id = $id;
-        }
-    }
-
-    /**
-     * Gets the container's ID
-     *
-     * @return ?int
-     */
-    public function getId() : ?int
-    {
-        return $this->id;
-    }
-
-    /**
-     * Sets the container's barcode
-     *
-     * @param string $barcode the container's barcode
-     *
-     * @return void
-     */
-    public function setBarcode(string $barcode) : void
-    {
-        $this->barcode = $barcode;
-    }
-
-    /**
-     * Gets the container's barcode
-     *
-     * @return ?string
-     */
-    public function getBarcode() : ?string
-    {
-        return $this->barcode;
-    }
-
-    /**
-     * Sets the ID of the container specimen
-     *
-     * @param int $specimenId ID of the container specimen
-     *
-     * @return void
-     */
-    public function setSpecimenId(int $specimenId) : void
-    {
-        if ($specimenId > 0) {
-            $this->specimenId = $specimenId;
-        }
-    }
-
-    /**
-     * Gets the ID of the container specimen
-     *
-     * @return ?int
-     */
-    public function getSpecimenId() : ?int
-    {
-        return $this->specimenId;
-    }
-
-    /**
-     * Sets the ID of the container type
-     *
-     * @param int $typeId ID of the container type
-     *
-     * @return void
-     */
-    public function setTypeId(int $typeId) : void
-    {
-        if ($typeId > 0) {
-            $this->typeId = $typeId;
-        }
-    }
-
-    /**
-     * Gets the ID of the container type
-     *
-     * @return ?int
-     */
-    public function getTypeId() : ?int
-    {
-        return $this->typeId;
-    }
-
-    /**
-     * Sets the ID of the container's dimensions
-     *
-     * @param int $dimensionId ID of the container's dimensions
-     *
-     * @return void
-     */
-    public function setDimensionId(int $dimensionId) : void
-    {
-        if ($dimensionId > 0) {
-            $this->dimensionId = $dimensionId;
-        }
-    }
-
-    /**
-     * Gets the ID of the container's dimensions
-     *
-     * @return ?int
-     */
-    public function getDimensionId() : ?int
-    {
-        return $this->dimensionId;
-    }
-
-    /**
-     * Sets the container's temperature in Celsius.
-     *
-     * @param float $temperature the container's temperature.
-     *
-     * @return void
-     */
-    public function setTemperature(float $temperature) : void
-    {
-        $this->temperature = $temperature;
-    }
-
-    /**
-     * Gets the container's temperature in Celsius.
-     *
-     * @return ?float
-     */
-    public function getTemperature() : ?float
-    {
-        return $this->temperature;
-    }
-
-    /**
-     * Sets the ID of the container's current projects
-     *
-     * @param int[] $projectIds the IDs of the container's current projects
-     *
-     * @return void
-     */
-    public function setProjectIds(array $projectIds) : void
-    {
-        $this->projectIds = $projectIds;
-    }
-
-    /**
-     * Gets the ID of the container's current projects
-     *
-     * @return ?array
-     */
-    public function getProjectIds() : ?array
-    {
-        return $this->projectIds;
-    }
-
-    /**
-     * Sets the Barcodes of the container's shipments
-     *
-     * @param array $shipmentBarcodes the IDs of the container's shipments
-     *
-     * @return void
-     */
-    public function setShipmentBarcodes(array $shipmentBarcodes) : void
-    {
-        $this->shipmentBarcodes = $shipmentBarcodes;
-    }
-
-    /**
-     * Gets the Barocdes of the container's shipments
-     *
-     * @return ?array
-     */
-    public function getShipmentBarcodes() : ?array
-    {
-        return $this->shipmentBarcodes;
-    }
-
-    /**
-     * Sets the ID of the container's current status
-     *
-     * @param int $statusId the ID of the container's current status
-     *
-     * @return void
-     */
-    public function setStatusId(int $statusId) : void
-    {
-        if ($statusId > 0) {
-            $this->statusId = $statusId;
-        }
-    }
-
-    /**
-     * Gets the ID of the container's current status
-     *
-     * @return ?int
-     */
-    public function getStatusId() : ?int
-    {
-        return $this->statusId;
-    }
-
-    /**
-     * Sets the ID of the container's current centerId
-     *
-     * @param \CenterID $centerId the ID of the container's current centerId
-     *
-     * @return void
-     */
-    public function setCenterId(\CenterID $centerId) : void
-    {
-        $this->centerId = $centerId;
-    }
-
-    /**
-     * Gets the ID of the container's current centerId
-     *
-     * @return \CenterID
-     */
-    public function getCenterID() : \CenterID
-    {
-        return $this->centerId;
-    }
-
-    /**
-     * Sets the parent container's ID
-     *
-     * @param ?int $parentContainerId the parent container's ID
-     *
-     * @return void
-     */
-    public function setParentContainerId(?int $parentContainerId) : void
-    {
-        $this->parentContainerId = $parentContainerId;
-    }
-
-    /**
-     * Gets the parent container's ID
-     *
-     * @return ?int
-     */
-    public function getParentContainerId() : ?int
-    {
-        return $this->parentContainerId;
-    }
-
-    /**
-     * Sets the IDs of the children containers
-     *
-     * @param array $childContainerIds array of IDs of children container
-     *
-     * @return void
-     */
-    public function setChildContainerIds(array $childContainerIds) : void
-    {
-        $this->childContainerIds = $childContainerIds;
-    }
-
-    /**
-     * Gets the IDs of the children containers
-     *
-     * @return ?array
-     */
-    public function getChildContainerIds() : ?array
-    {
-        return $this->childContainerIds;
-    }
-
-    /**
-     * Sets the container's current coordinate in storage
-     *
-     * @param ?int $coordinate the container's current coordinate
-     *
-     * @return void
-     */
-    public function setCoordinate(?int $coordinate = null) : void
-    {
-        if ($coordinate > 0) {
-            $this->coordinate = intval($coordinate);
-        }
-    }
-
-    /**
-     * Gets the container's current coordinate in storage
-     *
-     * @return ?int
-     */
-    public function getCoordinate() : ?int
-    {
-        return $this->coordinate;
-    }
-
-    /**
-     * Sets the container's lot number
-     *
-     * @param ?string $lotNumber the container's lot number.
-     *
-     * @return void
-     */
-    public function setLotNumber(?string $lotNumber = null) : void
-    {
-        $this->lotNumber = $lotNumber;
-    }
-
-    /**
-     * Gets the container's lot number in storage
-     *
-     * @return ?string
-     */
-    public function getLotNumber() : ?string
-    {
-        return $this->lotNumber;
-    }
-
-    /**
-     * Sets the expiration date
-     *
-     * @param ?\DateTime $date the expiration date
-     *
-     * @return void
-     */
-    public function setExpirationDate(?\DateTime $date = null) : void
-    {
-        $this->expirationDate = $date;
-    }
-
-    /**
-     * Gets the expiration date
-     *
-     * @return ?\DateTime
-     */
-    public function getExpirationDate() : ?\DateTime
-    {
-        return $this->expirationDate;
-    }
-
-    /**
-     * Sets the container's status comments.
-     *
-     * @param string $comments the container's status comments
-     *
-     * @return void
-     */
-    public function setComments(string $comments) : void
-    {
-        $this->comments = $comments;
-    }
-
-    /**
-     * Gets the container's status comments.
-     *
-     * @return ?string
-     */
-    public function getComments() : ?string
-    {
-        return $this->comments;
-    }
-
-    /**
-     * Instatiates a Container Object using the information from the client-side
-     *
-     * @param array $data Data to be used to instantiate the Container Object
-     *
-     * @return Container $container Instantiated Container Object
-     */
-    public function fromArray(array $data) : Container
-    {
-        if (isset($data['id'])) {
-            $this->setId((int) $data['id']);
-        }
-        if (isset($data['barcode'])) {
-            $this->setBarcode((string) $data['barcode']);
-        }
-        if (isset($data['specimenId'])) {
-            $this->setSpecimenId((int) $data['specimenId']);
-        }
-        if (isset($data['typeId'])) {
-            $this->setTypeId((int) $data['typeId']);
-        }
-        if (isset($data['dimensionId'])) {
-            $this->setDimensionId((int) $data['dimensionId']);
-        }
-        if (isset($data['temperature'])) {
-            $this->setTemperature((float) ($data['temperature']));
-        }
-        if (isset($data['statusId'])) {
-            $this->setStatusId((int) $data['statusId']);
-        }
-        if (isset($data['projectIds'])) {
-            $this->setProjectIds($data['projectIds']);
-        }
-        if (isset($data['shipmentBarcodes'])) {
-            $this->setShipmentBarcodes($data['shipmentBarcodes']);
-        }
-        if (isset($data['centerId'])) {
-            $this->setCenterId(new \CenterID(strval($data['centerId'])));
-        }
-        if (isset($data['parentContainerId'])) {
-            $this->setParentContainerId((int) $data['parentContainerId']);
-        }
-        if (isset($data['childContainerIds'])) {
-            $this->setChildContainerIds($data['childContainerIds']);
-        }
-        if (isset($data['coordinate'])) {
-            $this->setCoordinate((int) $data['coordinate']);
-        }
-        if (isset($data['lotNumber'])) {
-            $this->setLotNumber((string) $data['lotNumber']);
-        }
-        if (isset($data['expirationDate'])) {
-            $this->setExpirationDate(new \DateTime($data['expirationDate']));
-        }
-        if (isset($data['comments'])) {
-            $this->setComments((string) $data['comments']);
-        }
-
-        return $this;
-    }
-
-    /**
-     * A wrapper function for the jsonSerialize method of the Container Instance
-     * Class. This converts the Container Instance into an array.
-     *
-     * @return array
-     */
-    public function toArray() : array
-    {
-        return $this->jsonSerialize();
-    }
-
-    /**
-     * Gets an array representing the state of the Container
-     *
-     * @return array
-     */
-    public function jsonSerialize() : array
-    {
-        $expirationDate = $this->expirationDate;
-        if ($expirationDate) {
-            $expirationDate = $this->expirationDate->format('Y-m-d');
-        }
-
-        return [
-            'id'                => $this->id,
-            'barcode'           => $this->barcode,
-            'specimenId'        => $this->specimenId,
-            'typeId'            => $this->typeId,
-            'dimensionId'       => $this->dimensionId,
-            'temperature'       => $this->temperature,
-            'statusId'          => $this->statusId,
-            'projectIds'        => $this->projectIds,
-            'shipmentBarcodes'  => $this->shipmentBarcodes,
-            'centerId'          => $this->centerId->__toString(),
-            'parentContainerId' => $this->parentContainerId,
-            'childContainerIds' => $this->childContainerIds,
-            'coordinate'        => $this->coordinate,
-            'lotNumber'         => $this->lotNumber,
-            'expirationDate'    => $expirationDate,
-            'comments'          => $this->comments,
-        ];
-    }
-
-    /**
-     * Returns a JSON encoded string of the state of the Container
-     *
-     * @return string JSON encoded string of Container data
-     */
-    public function toJSON() : string
-    {
-        return json_encode($this);
-    }
-}
-
diff --git a/php/containercontroller.class.inc b/php/containercontroller.class.inc
deleted file mode 100644
index b9313d2a..00000000
--- a/php/containercontroller.class.inc
+++ /dev/null
@@ -1,567 +0,0 @@
-<?php declare(strict_types=1);
-/**
- * This class features the code that enables access to the containers of the
- * LORIS Biobank Module.
- *
- * PHP Version 8.0
- *
- * @category   Controller
- * @package    Loris
- * @subpackage Biobank
- * @author     Henri Rabalais <henri.rabalais@mcin.ca>
- * @license    http://www.gnu.org/licenses/gpl-3.0.text GPLv3
- * @link       http://www.github.com/aces/Loris/
- */
-namespace LORIS\biobank;
-
-/**
- * This class features the code that enables access to the containers of the
- * LORIS Biobank Module.
- *
- * PHP Version 7.2
- *
- * @category   Controller
- * @package    Loris
- * @subpackage Biobank
- * @author     Henri Rabalais <henri.rabalais@mcin.ca>
- * @license    http://www.gnu.org/licenses/gpl-3.0.text GPLv3
- * @link       http://www.github.com/aces/Loris/
- */
-class ContainerController
-{
-
-    // TODO: These values were decided based on the realm of possible values.
-    // These value should instead be queried from the back end so that they
-    // are Project configurable.
-    const MINTEMP = -273.15;
-    const MAXTEMP = 100;
-
-    /**
-     * Private instances of the Database, User and ContainerDAO classes.
-     *
-     * @var \LORIS\LorisInstance $loris
-     * @var \Database    $db
-     * @var \User        $user
-     * @var ContainerDAO $dao
-     */
-    private $loris;
-    private $db;
-    private $user;
-    public ContainerDAO $dao;        // This should be made private but is being
-                        // used by the specimen controller. A new function should
-                        // be made in the container controller to request
-                        // containers based on parameter values.
-
-    /**
-     * Class Constructor
-     *
-     * @param \LORIS\LorisInstance $loris LORIS Instance.
-     * @param \User                $user  User Instance.
-     */
-    function __construct(\LORIS\LorisInstance $loris, \User $user)
-    {
-        $this->loris = $loris;
-        $this->db    = $loris->getDatabaseConnection();
-        $this->user  = $user;
-        $this->dao   = $this->_getDataProvisioner();
-    }
-
-    /**
-     * Get all Container Objects permitted by the Container Data Provisioner (DAO).
-     *
-     * @return array $specimens All permissable Container Objects
-     */
-    public function getInstances() : array
-    {
-        $this->_validatePermission('view');
-        $containers  = [];
-        $containerIt = $this->dao->execute($this->user);
-        foreach ($containerIt as $id => $container) {
-            $containers[$id] = $container;
-        }
-
-        return $containers;
-    }
-
-    /**
-     * This method takes in a list of container arrays from the front-end,
-     * validates them, instantiates them and then sends them to the DAO to be
-     * saved to the database.
-     *
-     * @param array $list A list of container arrays to be created.
-     *
-     * @return array $containerIds A list of IDs from the containers that were
-     *                             created.
-     */
-    public function createInstances(array $list) : array
-    {
-        $this->_validatePermission('create');
-        $containerList = [];
-        foreach ($list as $item) {
-            $container = (new Container)->fromArray($item);
-            $this->validateInstance($container);
-            $containerList[] = $container;
-        }
-
-        $this->validateInstances($containerList);
-
-        // Save Containers
-        $containers = [];
-        foreach ($containerList as $container) {
-            $containers[] = $this->dao->createInstance($container);
-        }
-
-        return $containers;
-    }
-
-    /**
-     * This method takes in a container array from the front-end,
-     * validates them, instantiates them and then sends them to the DAO to be
-     * saved to the database.
-     *
-     * @param array $containerArray container array to be created
-     *
-     * @return array
-     */
-    public function updateInstance(array $containerArray) : array
-    {
-        $this->_validatePermission('update');
-        $container = (new Container)->fromArray($containerArray);
-
-        $this->validateInstance($container);
-        return $this->dao->updateInstance($container);
-    }
-
-    /**
-     * Get all data associated with the Container Entity. This will be used
-     * for front-end mapping and populating form options.
-     *
-     * @return array Associative array of option data.
-     */
-    public function getOptions() : array
-    {
-        $this->_validatePermission('view');
-        return [
-            'types'           => $this->dao->getTypes(),
-            'typesPrimary'    => $this->dao->getTypes(['Primary' => 1]),
-            'typesNonPrimary' => $this->dao->getTypes(['Primary' => 0]),
-            'dimensions'      => $this->dao->getDimensions(),
-            'stati'           => $this->dao->getStati(),
-        ];
-    }
-
-    /**
-     * Treats the Container DAO as a Provisioner that can be iterated through
-     * to provide the permissable Container Objects for the current User.
-     *
-     * @return ContainerDAO
-     */
-    private function _getDataProvisioner() : ContainerDAO
-    {
-        $dao = new ContainerDAO($this->db);
-        if ($this->user->hasPermission('access_all_profiles') === false) {
-            $dao = $dao->filter(new \LORIS\Data\Filters\UserSiteMatch());
-        }
-        if ($this->user->hasPermission('biobank_container_view') === false) {
-            $dao = $dao->filter(new PrimaryContainerFilter($this->loris, 0));
-        }
-        if ($this->user->hasPermission('biobank_specimen_view') === false) {
-            $dao = $dao->filter(new PrimaryContainerFilter($this->loris, 1));
-        }
-        return $dao;
-    }
-
-    /**
-     * Checks User Permissions for creating or updating Container Objects.
-     *
-     * @param string $method User requested method.
-     *
-     * @return void
-     */
-    private function _validatePermission(string $method) : void
-    {
-        switch ($method) {
-        case 'view':
-            if (!$this->user->hasPermission('biobank_container_view')) {
-                throw new Forbidden('Container: View Permission Denied');
-            }
-            break;
-        case 'update':
-            if (!$this->user->hasPermission('biobank_container_update')) {
-                throw new Forbidden('Container: Update Permission Denied');
-            }
-            break;
-        case 'create':
-            if (!$this->user->hasPermission('biobank_container_create')) {
-                throw new Forbidden('Container: Create Permission Denied');
-            }
-            break;
-        }
-    }
-
-    /**
-     * Validates Container Object before being saved
-     *
-     * @param Container $container Container to be validated
-     *
-     * @return void
-     */
-    public function validateInstance(Container $container) : void
-    {
-        $this->_validateBarcode($container);
-        $this->_validateTypeId($container);
-        $this->_validateTemperature($container);
-        $this->_validateStatusId($container);
-        $this->_validateProjectIds($container);
-        $this->_validateShipmentBarcodes($container);
-        $this->_validateCenterId($container);
-        $this->_validateParentContainerId($container);
-        $this->_validateCoordinate($container);
-        // $this->_validateLotNumber($container);
-        // $this->_validateExpirationDate($container);
-        // $this->_validateComments($container);
-    }
-
-    /**
-     * Validates the container list to ensure that no barcodes are identical
-     *
-     * @param array $containers List of Containers to be validated
-     *
-     * @return void
-     */
-    public function validateInstances(array $containers) : void
-    {
-        $barcode = null;
-        foreach ($containers as $container) {
-            if ($container->getBarcode() === $barcode) {
-                throw new BadRequest('Barcode must be unique for each entry.');
-            }
-            $barcode = $container->getBarcode();
-        }
-    }
-
-    /**
-     * Validates Container Object Barcode
-     *
-     * @param Container $container Container to be checked.
-     *
-     * @throws BadRequest if the provided Container does not meet validation
-     *                    requirements
-     *
-     * @return void
-     */
-    private function _validateBarcode(Container $container) : void
-    {
-        if (is_null($container->getBarcode())) {
-            throw new BadRequest('Barcode value must be set.');
-        }
-
-        $id            = $container->getId();
-        $barcode       = $container->getBarcode();
-        $containerList = $this->dao->selectInstances(
-            [
-                ['column'=>'bc.Barcode', 'value'=>$barcode],
-            ],
-        );
-        if (!empty($containerList)) {
-            foreach ($containerList as $c) {
-                $b = $c->getBarcode();
-                $i = $c->getId();
-                // If the barcodes are identical but the ids are not
-                if ($b === $barcode && $i !== $id) {
-                    throw new BadRequest('Barcode must be unique.');
-                }
-            }
-        }
-
-        if ($id) {
-            $prevContainer = $this->dao->getInstanceFromId($id);
-            if ($prevContainer && ($container->getBarcode() !== $prevContainer->getBarcode())) {
-                throw new BadRequest('Barcode can not be changed.');
-            }
-        }
-
-        // TODO: Regex check on Barcode. Currently, regex has been removed from
-        // the schema. Once it's reintroduced, this can be implemented.
-        //$specimenTypes = $this->dao->getSpecimenTypes();
-        //$regex = $specimenTypes[$specimen['typeId']]['regex'];
-        //if (isset($regex)) {
-        //    if (preg_match($regex, $container['barcode']) !== 1) {
-        //        throw new BadRequest('Barcode is not of proper format for the
-        //                               selected specimen type');
-        //    }
-        //}
-    }
-
-    /**
-     * Validates Container Object Type ID.
-     *
-     * @param Container $container Container to be checked.
-     *
-     * @throws BadRequest if the provided Container does not meet validation
-     *                    requirements
-     *
-     * @return void
-     */
-    private function _validateTypeId(Container $container) : void
-    {
-        if (is_null($container->getTypeId())) {
-            throw new BadRequest('Type value must be set');
-        }
-    }
-
-    /**
-     * Validates Container Object Temperature.
-     *
-     * @param Container $container Container to be checked.
-     *
-     * @throws BadRequest if the provided Container does not meet validation
-     *                    requirements
-     *
-     * @return void
-     */
-    private function _validateTemperature(Container $container) : void
-    {
-        $temperature = $container->getTemperature();
-        if (is_null($temperature)) {
-            throw new BadRequest('Temperature value must be set.');
-        }
-        if (!(is_numeric($temperature) && is_float(floatval($temperature)))) {
-            throw new BadRequest('Temperature must be a number.');
-        }
-        if ($temperature <= self::MINTEMP || $temperature > self::MAXTEMP) {
-            throw new BadRequest(
-                'Temperature must be between '
-                . self::MINTEMP
-                . '°C and '
-                . self::MAXTEMP
-                . '°C.'
-            );
-        }
-    }
-
-    /**
-     * Validates Container Object Status ID.
-     *
-     * @param Container $container Container to be checked.
-     *
-     * @throws BadRequest if the provided Container does not meet validation
-     *                    requirements
-     *
-     * @return void
-     */
-    private function _validateStatusId(Container $container) : void
-    {
-        if ($container->getId()) {
-            $prevContainer = $this->dao->getInstanceFromId($container->getId());
-            if ($prevContainer) {
-                $stati         = $this->dao->getStati();
-                $statusLabel   = $stati[$prevContainer->getStatusId() ?? '']['label'];
-                if ($statusLabel == 'Dispensed') {
-                    // TODO: figure out what else should not be changed if the container
-                    // is dispensed. This should eventually be blocked in the front-end
-                    // as well. These validations can wait until more testing has
-                    // been done on the module.
-
-                    if ($prevContainer->getTemperature()!= $container->getTemperature()
-                    ) {
-                        throw new BadRequest(
-                            "Temperature cannot be changed if Container
-                                               is Dispensed."
-                        );
-                    }
-                }
-            }
-        }
-
-        if (is_null($container->getStatusId())) {
-            throw new BadRequest("Status value must be set.");
-        }
-    }
-
-    /**
-     * Validates Container Object Project ID.
-     *
-     * @param Container $container Container to be checked.
-     *
-     * @throws BadRequest if the provided Container does not meet validation
-     *                    requirements
-     *
-     * @return void
-     */
-    private function _validateProjectIds(Container $container) : void
-    {
-        $projectIds = $container->getProjectIds();
-
-        if (empty($projectIds)) {
-            throw new BadRequest("A Project must be assigned");
-        }
-
-        foreach ($projectIds as $id) {
-            if (empty($id)) {
-                throw new BadRequest("All project values must be valid.");
-            }
-        }
-
-        // Check that current container's projects are a subset of the parent
-        // Container's projects.
-        $parentContainerId = $container->getParentContainerId();
-        if (false) {
-            $parentContainer  = $this->dao->getInstanceFromId($parentContainerId);
-            $parentProjectIds = $parentContainer->getProjectIds();
-            if (array_intersect($projectIds, $parentProjectIds) != $projectIds) {
-                $barcode       = $container->getBarcode();
-                $parentBarcode = $parentContainer->getBarcode();
-                throw new BadRequest(
-                    "The Projects to which $barcode
-                                      belongs must be a subset of the Projects to
-                                      which $parentBarcode
-                                      belongs."
-                );
-            }
-        }
-
-        // Check the current container's projects are a superset of the child
-        // Containers' projects.
-        $childContainerIds = $container->getChildContainerIds();
-        if ($childContainerIds) {
-            forEach ($childContainerIds as $id) {
-                $childContainer  = $this->dao->getInstanceFromId((int) $id);
-                $childProjectIds = $childContainer->getProjectIds();
-                if (array_intersect(
-                    $childProjectIds,
-                    $projectIds
-                ) != $childProjectIds
-                ) {
-                    $barcode = $container->getBarcode();
-                    throw new BadRequest(
-                        "The projects to which $barcode
-                                           belongs must be a superset 
-                                           of it's child Containers' Projects"
-                    );
-                }
-            }
-        }
-    }
-
-    /**
-     * Validates Container Object Shipment Barcodes.
-     *
-     * @param Container $container Container to be checked.
-     *
-     * @throws BadRequest if the provided Container does not meet validation
-     *                    requirements
-     *
-     * @return void
-     */
-    private function _validateShipmentBarcodes(Container $container) : void
-    {
-        $shipmentDAO = new ShipmentDAO($this->db);
-        foreach ($container->getShipmentBarcodes() as $barcode) {
-            $shipment = $shipmentDAO->getInstanceFromBarcode($barcode);
-            if ($shipment->getActive()) {
-                throw new BadRequest(
-                    "Container ".$container->getBarcode()." cannot
-          be manipulated while it is associated with an active shipment."
-                );
-            }
-        }
-    }
-
-    /**
-     * Validates Container Object Center ID.
-     *
-     * @param Container $container Container to be checked.
-     *
-     * @throws BadRequest if the provided Container does not meet validation
-     *                    requirements
-     *
-     * @return void
-     */
-    private function _validateCenterId(Container $container) : void
-    {
-        if (is_null($container->getCenterID())) {
-            throw new BadRequest("Center value must be set.");
-        }
-
-        $parentContainerId = $container->getParentContainerId();
-        if (false) {
-            $parentContainer = $this->dao->getInstanceFromId($parentContainerId);
-            if ($container->getCenterID() !== $parentContainer->getCenterID()) {
-                throw new BadRequest(
-                    $container->getBarcode()." must be at the same location 
-                        as ".$parentContainer->getBarcode()." to execute this
-                        action"
-                );
-            }
-        }
-    }
-
-    /**
-     * Validates Container Object Parent Container ID.
-     *
-     * @param Container $container Container to be checked.
-     *
-     * @return void
-     */
-    private function _validateParentContainerId(Container $container) : void
-    {
-        $parentContainerId = $container->getParentContainerId();
-        if (isset($parentContainerId)) {
-            $childContainerIds = $this->dao->getAllChildContainerIds($container);
-            if ($container->getId() == $parentContainerId
-                || in_array($container->getId(), $childContainerIds)
-            ) {
-                throw new BadRequest(
-                    'A container can not be placed within itself or
-                    within one of its descendant containers.'
-                );
-            }
-        }
-    }
-
-    /**
-     * Validates Container Object Coordinate.
-     *
-     * @param Container $container Container to be checked.
-     *
-     * @throws BadRequest if the provided Container does not meet validation
-     *                    requirements
-     *
-     * @return void
-     */
-    private function _validateCoordinate(Container $container)
-    {
-        $coordinate = $container->getCoordinate();
-        if (!is_null($coordinate)) {
-            if (!((is_int($coordinate) || ctype_digit($coordinate))
-                && (int)$coordinate > 0)
-            ) {
-                throw new BadRequest('Coordinate must be a positive integer.');
-            }
-
-            $parentContainerId = $container->getParentContainerId();
-            if (!isset($parentContainerId)) {
-                throw new BadRequest(
-                    'Coordinate can not be set without a Parent
-                                       Container.'
-                );
-            }
-
-            $parentContainer = $this->dao->getInstanceFromId(
-                $parentContainerId
-            );
-
-            $dimensions = $this->dao->getDimensions()[$parentContainer
-                ->getDimensionId() ?? ''];
-
-            $capacity = $dimensions['x'] * $dimensions['y'] * $dimensions['z'];
-            if ($container->getCoordinate() > $capacity) {
-                throw new BadRequest(
-                    'Coordinate value exceeds the capacity of the Parent Container'
-                );
-            }
-        }
-    }
-
-}
diff --git a/php/containerdao.class.inc b/php/containerdao.class.inc
deleted file mode 100644
index 058846d9..00000000
--- a/php/containerdao.class.inc
+++ /dev/null
@@ -1,736 +0,0 @@
-<?php declare(strict_types=1);
-/**
- * Container Data Access Object (DAO) Class
- * This class contains all database handling that is needed to
- * permanently store and retrieve Container Object instances
- *
- * PHP Version 7.2
- *
- * @category   Data
- * @package    Loris
- * @subpackage Biobank
- * @author     Henri Rabalais <henri.rabalais@mcin.ca>
- * @license    http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
- * @link       https://www.github.com/aces/Loris/
- */
-namespace LORIS\biobank;
-
-/**
- * Container Data Access Object (DAO) Class
- * This class contains all database handling that is needed to
- * permanently store and retrieve Container Object instances
- *
- * PHP Version 7.2
- *
- * @category   Data
- * @package    Loris
- * @subpackage Biobank
- * @author     Henri Rabalais <henri.rabalais@mcin.ca>
- * @license    http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
- * @link       https://www.github.com/aces/Loris/
- */
-class ContainerDAO extends \LORIS\Data\ProvisionerInstance
-{
-    /**
-     * Private instance of the Database class.
-     *
-     * @var \Database $dao
-     */
-    private $db;
-
-    /**
-     * Initializes a new instance of the ContainerDAO Class
-     *
-     * @param \Database $db Instance of the LORIS Database class
-     */
-    function __construct(\Database $db)
-    {
-        $this->db = $db;
-    }
-
-    // XXX: I'm not sure if this function is really necessary since it is only
-    // being used once, and should likely not be accessed outside this class.
-    /**
-     * This method is used when the DAO class needs to create a new Container
-     * instance.
-     *
-     * @return Container
-     */
-    public function getInstance() : Container
-    {
-        return new Container();
-    }
-
-    /**
-     * This will load all container persistence variables from the database
-     * for a given $id into a Container object, and return the object.
-     *
-     * @param int $id Value of the $id for the Container that will be
-     *                instantiated.
-     *
-     * @return ?Container $container Container Instance.
-     */
-    public function getInstanceFromId(int $id) : ?Container
-    {
-        return $this->selectInstances(
-            [
-                ['column'=>'bc.ContainerID', 'value'=>$id],
-            ],
-        )[$id] ?? null;
-    }
-
-    /**
-     * Returns an array of all the Child Container IDs associated with
-     * the given Container ID from the biobank_container_parent table.
-     *
-     * @param ?int $id of Container
-     *
-     * @return array $childContainerIds List of Container IDs that are
-     *                                  children of the Container ID
-     */
-    private function _getChildContainerIds(?int $id) : array
-    {
-         $query = 'SELECT ContainerID
-                   FROM biobank_container_parent
-                   WHERE ParentContainerID=:i';
-         $childContainerIds = $this->db->pselectCol($query, ['i' => $id]);
-
-         return $childContainerIds;
-    }
-
-    /**
-     * Returns an array of all the Project IDs associated with the given
-     * Container ID from the biobank_container_project_rel table.
-     *
-     * @param ?int $id of Container
-     *
-     * @return $projectIds List of Project Ids that are associated with the
-     *                     Container ID.
-     */
-    private function _getProjectIds(?int $id) : array
-    {
-        $query      = 'SELECT ProjectID
-                  FROM biobank_container_project_rel
-                  WHERE ContainerID=:i';
-        $projectIds = $this->db->pselectCol($query, ['i' => $id]);
-
-        return $projectIds;
-    }
-
-    // XXX: Currently this function is never used with any conditions passed as
-    // parameters. Decide if this is a necessary feature. It is likely useful,
-    // but I need to figure out how to integrate it wit the dataprovisioner.
-    /**
-     * This will select all containers from the database that match the
-     * attribute values passed by $conditions and will return an array
-     * of container objects.
-     *
-     * @param ?array $conditions Conditions to be met by the query
-     * @param string $operator   The operator to link the conditions
-     *
-     * @return array $containers List of Container Objects that match the query
-     */
-    public function selectInstances(
-        ?array $conditions = [],
-        string $operator = 'AND'
-    ) : array {
-        $query = 'SELECT bc.ContainerID,
-                     bc.Barcode,
-                     bc.ContainerTypeID,
-                     bs.SpecimenID,
-                     bct.ContainerCapacityID,
-                     bct.ContainerDimensionID,
-                     bc.ContainerStatusID,
-                     GROUP_CONCAT(DISTINCT(bcpr.ProjectID)) as ProjectIDs,
-                     GROUP_CONCAT(DISTINCT(s.Barcode)) as ShipmentBarcodes,
-                     bc.Temperature,
-                     bc.CenterID,
-                     bcp.ParentContainerID,
-                     GROUP_CONCAT(DISTINCT(bcp2.ContainerID)) as ChildContainerIDs,
-                     bcp.Coordinate as Coordinate,
-                     bc.LotNumber,
-                     bc.ExpirationDate,
-                     bc.Comments,
-                     bc.DateTimeUpdate,
-                     bc.DateTimeCreate
-                  FROM biobank_container bc
-                  LEFT JOIN biobank_container_parent bcp
-                    ON bc.ContainerID=bcp.ContainerID
-                  LEFT JOIN biobank_container_parent bcp2
-                    ON bc.ContainerID=bcp2.ParentContainerID
-                  LEFT JOIN biobank_container_type bct
-                    USING (ContainerTypeID)
-                  LEFT JOIN biobank_container_project_rel bcpr
-                    ON bc.ContainerID=bcpr.ContainerID
-                  LEFT JOIN biobank_container_shipment_rel bcsr
-                    ON bc.ContainerID=bcsr.ContainerID
-                  LEFT JOIN shipment s
-                    ON bcsr.ShipmentID=s.ShipmentID
-                  LEFT JOIN biobank_specimen bs
-                    ON bc.ContainerID=bs.ContainerID';
-        if (!empty($conditions)) {
-            $whereClause = [];
-            foreach ($conditions as $condition) {
-                $whereClause[] = $condition['column']
-                    . '='
-                    . '"'
-                    . $condition['value']
-                    . '"';
-            }
-            $query .= ' WHERE '.implode(" $operator ", $whereClause);
-        }
-        $query        .= ' GROUP BY bc.ContainerID';
-        $containerRows = $this->db->pselectWithIndexKey($query, [], 'ContainerID');
-
-        $containers = [];
-        foreach ($containerRows as $id => $containerRow) {
-            // TODO: This whole section needs to be redone more like
-            //       the shipment module
-            $childContainerIds = $containerRow['ChildContainerIDs']
-                ? explode(',', $containerRow['ChildContainerIDs'])
-                : [];
-            $projectIds        = explode(',', $containerRow['ProjectIDs']);
-            $shipmentBarcodes  = $containerRow['ShipmentBarcodes']
-                ? explode(',', $containerRow['ShipmentBarcodes'])
-                : [];
-            $containers[$id]   = $this->_getInstanceFromSQL(
-                $containerRow,
-                $childContainerIds,
-                $projectIds,
-                $shipmentBarcodes
-            );
-        }
-
-        return $containers;
-    }
-
-    /**
-     * Instantiates an ArrayIterator class that is composed of all the Container
-     * Objects.
-     *
-     * @return \Traversable Iterator of Container Objects
-     */
-    protected function getAllInstances() : \Traversable
-    {
-        return new \ArrayIterator($this->selectInstances());
-    }
-
-    // XXX: The conditions parameter is only used to differentiate primary types
-    // from non primary types. Decide if this is a front-end concern.
-    /**
-     * Queries all rows of the biobank_container_type table and returns a nested
-     * array with the ID field as the index. Conditions may be passed to filter
-     * the results
-     *
-     * @param ?array $conditions Conditions to be met by the query
-     *
-     * @return array $containerTypes All data concerning each container type
-     */
-    public function getTypes(?array $conditions = null) : array
-    {
-        $query = 'SELECT ContainerTypeID as id,
-                          Brand as brand,
-                          ProductNumber as productNumber,
-                          Label as label,
-                          `Primary` as `primary`,
-                          ContainerCapacityID as capacityId,
-                          ContainerDimensionID as dimensionId
-                   FROM biobank_container_type';
-        if ($conditions != null) {
-            $query .= $conditions
-                ? ' WHERE ' . $this->db->_implodeWithKeys(' AND ', $conditions)
-                : null;
-        }
-        $types = $this->db->pselectWithIndexKey($query, [], 'id');
-
-        return $types;
-    }
-
-    // XXX: Althought container capacities were at first thought to be important
-    // in the design of this entity, they are not being used in any way
-    // throughout the module. Decide if container capacities are still
-    // important, or if they should be deprecated.
-    /**
-     * Queries all rows of the biobank_container_capacity table and returns a
-     * nested array with the ID field as the index.
-     *
-     * @return array $containerCapacities All data concerning each container
-     *                                    capacity
-     */
-    public function getCapacities() : array
-    {
-        $query      = 'SELECT ContainerCapacityID as id,
-                          Quantity as quantity,
-                          UnitID as unitId 
-                  FROM biobank_container_capacity';
-        $capacities = $this->db->pselectWithIndexKey($query, [], 'id');
-
-        return $capacities;
-    }
-
-    // XXX: Although container units were at first thought to be important
-    // in the design of this entity, they are only being used by Specimen Objects
-    // in this module. Decide if container units are still important, or if they
-    // should be deprecated.
-    /**
-     * Queries all rows of the biobank_unit table and returns a
-     * nested array with the ID field as the index.
-     *
-     * @return array $containerUnits All data concerning each unit
-     */
-    public function getUnits() : array
-    {
-        $query = "SELECT UnitID as id,
-                         Label as unit 
-                  FROM biobank_unit";
-        $units = $this->db->pselectWithIndexKey($query, [], 'id');
-
-        return $units;
-    }
-
-    /**
-     * Queries all rows of the biobank_container_dimension table and returns a
-     * nested array with the ID field as the index.
-     *
-     * @return array $containerDimensions All data concerning each container
-     *                                    dimension
-     */
-    public function getDimensions() : array
-    {
-        $query = "SELECT ContainerDimensionID as id,
-                         X as x,
-                         XNumerical as xNum,
-                         Y as y,
-                         YNumerical as yNum,
-                         Z as z,
-                         ZNumerical as zNum
-                  FROM biobank_container_dimension";
-        return $this->db->pselectWithIndexKey($query, [], 'id');
-    }
-
-    /**
-     * Queries all rows of the biobank_container_status table and returns a
-     * nested array with the ID field as the index.
-     *
-     * @return array $containerStati All data concerning each container status
-     */
-    public function getStati() : array
-    {
-        $query = "SELECT ContainerStatusID as id,
-                         Label as label
-                  FROM biobank_container_status";
-        $stati = $this->db->pselectWithIndexKey($query, [], 'id');
-
-        return $stati;
-    }
-
-    /**
-     * Queries all rows of the biobank_container_parent table and returns a
-     * nested array with the Parent Container ID field as the first index, the
-     * coordinate value as the second index, and the Child Container ID as the
-     * value.
-     *
-     * If there is no coordinate, the string 'Unassigned' serves as the second
-     * index.
-     *
-     * @return array $coordinates A Nested array of Child Container IDs
-     *                            indexed by Parent Container ID and
-     *                            Coordinate value or Unassigned.
-     */
-    public function getCoordinates() : array
-    {
-        $query       = "SELECT ContainerID as childContainerId,
-                         ParentContainerID as parentContainerId,
-                         Coordinate as coordinate
-                        FROM biobank_container_parent";
-        $result      = $this->db->pselect($query, []);
-        $coordinates = [];
-        foreach ($result as $row) {
-            if (!isset($coordinates[$row['parentContainerId']])) {
-                    $coordinates[$row['parentContainerId']] = [];
-            };
-            $container =& $coordinates[$row['parentContainerId']];
-            if (empty($row['coordinate'])) {
-                $container['Unassigned'][] = $row['childContainerId'];
-            } else {
-                $container[$row['coordinate']] = $row['childContainerId'];
-            }
-        }
-
-        return $coordinates;
-    }
-
-    /**
-     * This function receives a Container Object, converts it into a SQL format
-     * and inserts it into all relevant tables in the database. Certain
-     * information is then cascaded to the children of the Container.
-     *
-     * @param Container $container The Container Object to be saved into the
-     *                             database.
-     *
-     * @return Container $container The Container Object that was saved to the
-                                     database.
-     */
-    public function createInstance(Container $container) : Container
-    {
-        // TODO: THIS IS DUPLICATED IN BOTH FUNCTIONS AND COULD PROBABLY BE
-        // DEALT WITH EITHER FRONT END OR SOMEWHERE ELSE.
-        $parentContainerId = $container->getParentContainerId();
-        if ($parentContainerId) {
-            $parentContainer = $this->getInstanceFromId($parentContainerId);
-            $container->setTemperature($parentContainer->getTemperature());
-        }
-
-        $data = $this->_getSQLFromInstance($container);
-        // Inserts or Updates the biobank_container table with given data.
-        $this->db->insertOnDuplicateUpdate(
-            'biobank_container',
-            $data['biobank_container']
-        );
-
-        $container->setId((int) $this->db->getLastInsertId());
-        // set the respective data array index to the value of the new
-        // container ID.
-        $data['biobank_container_parent']['ContainerID'] = $container->getId();
-        foreach ($data['biobank_container_project_rel'] as $id => $insert) {
-            $projdata =& $data['biobank_container_project_rel'][$id];
-            $projdata['ContainerID'] = $container->getId();
-        }
-        $this->saveParentContainer($container, $data);
-        $this->_saveProject($container, $data);
-
-        return $this->getInstanceFromId($container->getId());
-    }
-
-    /**
-     * Update a container on and save on the LORIS SQL database
-     *
-     * @param Container $container the container to save
-     *
-     * @return array
-     */
-    public function updateInstance($container) : array
-    {
-        // TODO: THIS IS DUPLICATED IN BOTH FUNCTIONS AND COULD PROBABLY BE
-        // DEALT WITH EITHER FRONT END OR SOMEWHERE ELSE.
-        $parentContainerId = $container->getParentContainerId();
-        if ($parentContainerId) {
-            $parentContainer = $this->getInstanceFromId($parentContainerId);
-            $container->setTemperature($parentContainer->getTemperature());
-        }
-
-        // Converts Container Object into SQL format.
-        $oldContainer = $this->getInstanceFromId($container->getId());
-        $data         = $this->_getSQLFromInstance($container);
-        $this->db->insertOnDuplicateUpdate(
-            'biobank_container',
-            $data['biobank_container']
-        );
-
-        $updatedContainers = [$container];
-        $this->saveParentContainer($container, $data);
-        $this->_saveProject($container, $data);
-
-        //Cascade changes in temperature, status, and center to all child Containers
-        if ($oldContainer->getParentContainerId()) {
-            $updatedContainers[] = $this->getInstanceFromId(
-                $oldContainer->getParentContainerId()
-            );
-        }
-        if ($container->getParentContainerId()) {
-            $updatedContainers[] = $this->getInstanceFromId(
-                $container->getParentContainerId()
-            );
-        }
-        if ($container->getTemperature() !== $oldContainer->getTemperature()) {
-            $updatedChildren   = $this->_cascadeToChildren(
-                $container,
-                'Temperature',
-                $container->getTemperature()
-            );
-            $updatedContainers = array_merge(
-                $updatedChildren,
-                $updatedContainers
-            );
-        }
-        if ($container->getStatusId() !== $oldContainer->getStatusId()) {
-            $updatedChildren   = $this->_cascadeToChildren(
-                $container,
-                'ContainerStatusID',
-                $container->getStatusId()
-            );
-            $updatedContainers = array_merge($updatedChildren, $updatedContainers);
-        }
-        if ($container->getCenterID() !== $oldContainer->getCenterID()) {
-            $updatedChildren   = $this->_cascadeToChildren(
-                $container,
-                'CenterID',
-                $container->getCenterID()
-            );
-            $updatedContainers = array_merge($updatedChildren, $updatedContainers);
-        }
-
-        return $updatedContainers;
-    }
-
-    /**
-     * Save the parent hierarchy of a container to the database
-     *
-     * @param Container $container The child container
-     * @param array     $data      The child's data
-     *
-     * @return void
-     */
-    public function saveParentContainer($container, $data)
-    {
-        // If there is no longer an associated Parent Container ID, delete
-        // it from the entry from the biobank_container_parent table.
-        $parentContainerId = $container->getParentContainerId();
-        if (!isset($parentContainerId)) {
-            $this->db->delete(
-                'biobank_container_parent',
-                ['ContainerID' => $container->getId()]
-            );
-        }
-
-        // If parent container ID exists, create an association in the
-        // biobank_container_parent rel table
-        if (isset($parentContainerId)) {
-            $this->db->insertOnDuplicateUpdate(
-                'biobank_container_parent',
-                $data['biobank_container_parent']
-            );
-        }
-    }
-
-    /**
-     * Saves the container to the LORIS SQL database.
-     *
-     * @param Container $container The container to save
-     * @param array     $data      The data to save
-     *
-     * @return void
-     */
-    private function _saveProject($container, $data)
-    {
-        // insert on update biobank_container_project_rel with relevant data.
-        $this->db->delete(
-            'biobank_container_project_rel',
-            ['ContainerID' => $container->getId()]
-        );
-        foreach ($data['biobank_container_project_rel'] as $insert) {
-            $this->db->insert(
-                'biobank_container_project_rel',
-                $insert
-            );
-        }
-    }
-
-    /**
-     * This recursive function cascades the $value to the specified $field of
-     * all the children of the $container Object.
-     *
-     * @param Container $container Container Object from which to retrieve children
-     * @param string    $field     The field at which to associate the $value
-     * @param mixed     $value     The value to assigned to the $field in question.
-     *                             It is mixed since it may receive multiple types
-     *                             of data.
-     *
-     * @return array            Array of all child container objects that were
-     *                          updated.
-     */
-    private function _cascadeToChildren(
-        Container $container,
-        string $field,
-        $value
-    ) : array {
-        $childContainerIds = $this->getAllChildContainerIds($container);
-        if (empty($childContainerIds)) {
-            return [];
-        }
-        $query = "UPDATE biobank_container                                      
-                  SET $field=$value                                             
-                  WHERE ContainerID IN (".implode(',', $childContainerIds).");";
-        $this->db->run($query);
-        $conditions = [];
-        foreach ($childContainerIds as $id) {
-            $conditions[] = ['column' => 'bc.ContainerID', 'value' => $id];
-        }
-        return $this->selectInstances($conditions, 'OR');
-    }
-
-    // FIXME: For some reason, this isn't working as intended and is returning
-    // way more ChildContainers than necessary.
-    /**
-     * This function takes a Container Object and retrieves an array of ContainerIDs
-     * representing all the descendant children of the Container.
-     *
-     * @param Container $container Container Object from which to retrieve
-     *                             all children
-     *
-     * @return array  $childContainers Array of child Container Ids
-     */
-    public function getAllChildContainerIds(Container $container) : array
-    {
-        $query = 'WITH recursive cte (ContainerID) as 
-                  (
-                    SELECT ContainerID
-                    FROM biobank_container_parent
-                    WHERE ParentContainerID=:i
-                    UNION ALL 
-                    SELECT child.ContainerID
-                    FROM biobank_container_parent as child
-                    INNER JOIN cte on cte.ContainerID=child.ParentContainerID
-                  )
-                  SELECT ContainerID FROM cte';
-        $childContainerIds = $this->db->pselectCol(
-            $query,
-            ['i' => $container->getId()]
-        );
-
-        return $childContainerIds;
-    }
-
-    // FIXME: Not in use. Delete if not used by November.
-    /**
-     * This function takes a Container Object and retrieves an array of objects
-     * representing the childre of the $container.
-     *
-     * @param object $container Container Object from which to retrieve
-     *                          children
-     *
-     * @return array  $childContainers Array of child container instances
-     */
-    // public function getChildContainers(Container $container) : array
-    // {
-    //     $childContainers   = array();
-    //     $childContainerIds = $this->_getChildContainerIds($container->getId());
-    //     if (!empty($childContainerIds)) {
-    //         foreach ($childContainerIds as $id) {
-    //             $childContainers[$id] = $this->getInstanceFromId((int) $id);
-    //         }
-    //     }
-    //     return $childContainers;
-    // }
-
-    /**
-     * This function takes a Container Object and prepares the data to be
-     * inserted into the database by converting it to a data array. This mapping
-     * is done to enable the update or insertion of data into the database
-     * directly from the resulting arrays.
-     *
-     * @param Container $container Container Object to be converted
-     *
-     * @return array $data Array containing the data to be inserted
-     */
-    private function _getSQLFromInstance(Container $container) : array
-    {
-         $expirationDate = $container->getExpirationDate();
-        if ($expirationDate) {
-            $expirationDate = $expirationDate->format('Y-m-d');
-        }
-         $containerData = [
-             'ContainerID'       => $container->getId(),
-             'Barcode'           => $container->getBarcode(),
-             'ContainerTypeID'   => $container->getTypeId(),
-             'Temperature'       => $container->getTemperature(),
-             'ContainerStatusID' => $container->getStatusId(),
-             'CenterID'          => $container->getCenterID(),
-             'LotNumber'         => $container->getLotNumber(),
-             'ExpirationDate'    => $expirationDate,
-             'Comments'          => $container->getComments(),
-         ];
-
-         $parentData = [
-             'ContainerID'       => $container->getId(),
-             'ParentContainerID' => $container->getParentContainerId(),
-             'Coordinate'        => $container->getCoordinate(),
-         ];
-
-         $containerProjectData = [];
-
-         foreach ($container->getProjectIds() as $id) {
-             $containerProjectData[$id] = [
-                 'ContainerID' => $container->getId(),
-                 'ProjectID'   => $id,
-             ];
-         }
-
-         return [
-             'biobank_container'             => $containerData,
-             'biobank_container_parent'      => $parentData,
-             'biobank_container_project_rel' => $containerProjectData,
-         ];
-    }
-
-    /**
-     * This function takes an array that resulted from an SQL query and
-     * instantiates it as a Container Object
-     *
-     * @param array  $data              Values to be instantiated.
-     * @param ?array $childContainerIds List of child container ids.
-     * @param ?array $projectIds        List of project ids.
-     * @param ?array $shipmentBarcodes  List of barcodes.
-     *
-     * @return Container
-     */
-    private function _getInstanceFromSQL(
-        array $data,
-        ?array $childContainerIds,
-        ?array $projectIds,
-        ?array $shipmentBarcodes
-    ) : Container {
-        $container = $this->getInstance();
-
-        if (isset($data['ContainerID'])) {
-            $container->setId((int) $data['ContainerID']);
-        }
-        if (isset($data['Barcode'])) {
-            $container->setBarcode((string) $data['Barcode']);
-        }
-        if (isset($data['SpecimenID'])) {
-            $container->setSpecimenId((int) $data['SpecimenID']);
-        }
-        if (isset($data['ContainerTypeID'])) {
-            $container->setTypeId((int) $data['ContainerTypeID']);
-        }
-        if (isset($data['ContainerDimensionID'])) {
-            $container->setDimensionId((int) $data['ContainerDimensionID']);
-        }
-        if (isset($data['Temperature'])) {
-            $container->setTemperature((float) $data['Temperature']);
-        }
-        if (isset($data['ContainerStatusID'])) {
-            $container->setStatusId((int) $data['ContainerStatusID']);
-        }
-        if (isset($projectIds)) {
-            $container->setProjectIds($projectIds);
-        }
-        if (isset($shipmentBarcodes)) {
-            $container->setShipmentBarcodes($shipmentBarcodes);
-        }
-        if (isset($data['CenterID'])) {
-            $container->setCenterId(new \CenterID(strval($data['CenterID'])));
-        }
-        if (isset($data['ParentContainerID'])) {
-            $container->setParentContainerId((int) $data['ParentContainerID']);
-        }
-        if (isset($childContainerIds)) {
-            $container->setChildContainerIds($childContainerIds);
-        }
-        if (isset($data['Coordinate'])) {
-            $container->setCoordinate((int) $data['Coordinate']);
-        }
-        if (isset($data['LotNumber'])) {
-            $container->setLotNumber((string) $data['LotNumber']);
-        }
-        if (isset($data['ExpirationDate'])) {
-            $container->setExpirationDate(new \DateTime($data['ExpirationDate']));
-        }
-        if (isset($data['Comments'])) {
-            $container->setComments((string) $data['Comments']);
-        }
-
-        return $container;
-    }
-}
diff --git a/php/containerendpoint.class.inc b/php/containerendpoint.class.inc
deleted file mode 100644
index 01e05d09..00000000
--- a/php/containerendpoint.class.inc
+++ /dev/null
@@ -1,157 +0,0 @@
-<?php declare(strict_types=1);
-/**
- * This implements the Container endpoint class for the Biobank Module.
- *
- * PHP Version 7.2
- *
- * @category   API
- * @package    Loris
- * @subpackage Biobank
- * @author     Henri Rabalais <henri.rabalais@mcin.ca>
- * @license    http://www.gnu.org/licenses/gpl-3.0.text GPLv3
- * @link       http://www.github.com/aces/Loris/
- */
-namespace LORIS\biobank;
-use \Psr\Http\Message\ServerRequestInterface;
-use \Psr\Http\Server\RequestHandlerInterface;
-use \Psr\Http\Message\ResponseInterface;
-
-/**
- * A class for handling the /biobank/containers/ endpoint.
- *
- * PHP Version 7.2
- *
- * @category   API
- * @package    Loris
- * @subpackage Biobank
- * @author     Henri Rabalais <henri.rabalais@mcin.ca>
- * @license    http://www.gnu.org/licenses/gpl-3.0.text GPLv3
- * @link       http://www.github.com/aces/Loris/
- */
-class ContainerEndpoint extends \NDB_Page implements RequestHandlerInterface
-{
-    /**
-     * Returns true if user has access to this endpoint.
-     *
-     * @param \User $user The user whose access is being checked
-     *
-     * @return bool
-     */
-    function _hasAccess(\User $user) : bool
-    {
-        return true;
-    }
-
-    /**
-     * Return which methods are supported by this endpoint.
-     *
-     * @return array supported HTTP methods
-     */
-    protected function allowedMethods() : array
-    {
-        return [
-            'GET',
-            'PUT',
-            'POST',
-            'OPTIONS',
-        ];
-    }
-
-    /**
-     * This function can be overridden in a module's page to load the necessary
-     * resources to check the permissions of a user.
-     *
-     * @param User                   $user    The user to load the resources for
-     * @param ServerRequestInterface $request The PSR15 Request being handled
-     *
-     * @return void
-     */
-    public function loadResources(
-        \User $user, ServerRequestInterface $request
-    ) : void {
-    }
-
-    /**
-     * This function passes the request to the handler. This is necessary since
-     * the Endpoint bypass the Module class.
-     *
-     * XXX: This function should be extracted to a parent class.
-     *
-     * @param ServerRequestInterface  $request The PSR7 request.
-     * @param RequestHandlerInterface $handler The request handler.
-     *
-     * @return ResponseInterface The outgoing PSR7 response.
-     */
-    public function process(
-        ServerRequestInterface $request,
-        RequestHandlerInterface $handler
-    ) : ResponseInterface {
-        return $handler->handle($request);
-    }
-
-    /**
-     * Handles Endpoint requests.
-     *
-     * @param ServerRequestInterface $request The incoming PSR7 request
-     *
-     * @return ResponseInterface The outgoing PSR7 response
-     */
-    public function handle(ServerRequestInterface $request) : ResponseInterface
-    {
-        ini_set('memory_limit', '-1');
-        $db       = $this->loris->getDatabaseConnection();
-        $user     = $request->getAttribute('user');
-        $contCont = new ContainerController($this->loris, $user);
-
-        try {
-            $db->beginTransaction();
-            switch ($request->getMethod()) {
-            case 'GET':
-                $containers = $contCont->getInstances();
-                return new \LORIS\Http\Response\JSON\OK($containers);
-            case 'POST':
-                $containers        = json_decode(
-                    $request->getBody()->getContents(),
-                    true
-                );
-                $createdContainers = $contCont->createInstances($containers);
-                return new \LORIS\Http\Response\JSON\OK($createdContainers);
-            case 'PUT':
-                $container         = json_decode(
-                    $request->getBody()->getContents(),
-                    true
-                );
-                $updatedContainers = $contCont->updateInstance($container);
-                return new \LORIS\Http\Response\JSON\OK($updatedContainers);
-            case 'OPTIONS':
-                return (new \LORIS\Http\Response())
-                    ->withHeader('Allow', $this->allowedMethods());
-            }
-        } catch (BadRequest $e) {
-            $db->rollBack();
-            return new \LORIS\Http\Response\JSON\BadRequest($e->getMessage());
-        } catch (Forbidden $e) {
-            $db->rollBack();
-            return new \LORIS\Http\Response\JSON\Forbidden($e->getMessage());
-        } catch (\TypeError $e) {
-            $db->rollBack();
-            return new \LORIS\Http\Response\JSON\InternalServerError(
-                $e->getMessage()
-            );
-        } catch (\Error $e) {
-            $db->rollBack();
-            return new \LORIS\Http\Response\JSON\InternalServerError(
-                $e->getMessage()
-            );
-        } catch (\DatabaseException $e) {
-            $db->rollBack();
-            return new \LORIS\Http\Response\JSON\InternalServerError(
-                $e->getMessage()
-            );
-        } finally {
-            if ($db->inTransaction()) {
-                $db->commit();
-            }
-        }
-    }
-}
diff --git a/php/controller.class.inc b/php/controller.class.inc
new file mode 100644
index 00000000..e0dd595d
--- /dev/null
+++ b/php/controller.class.inc
@@ -0,0 +1,160 @@
+<?php declare(strict_types=1);
+
+namespace LORIS\biobank;
+
+use LORIS\Http\DataIteratorJSONStream;
+use LORIS\biobank\data\query\QueryParams;
+use \Psr\Http\Message\ServerRequestInterface;
+use \Psr\Http\Message\ResponseInterface;
+use LORIS\Http\Response\JSON as Response;
+
+
+/**
+ * Controller class responsible for handling HTTP requests related to Biobank
+ * services.
+ *
+ * This class provides methods for handling various HTTP requests such as
+ * retrieving resources, updating resources, and uploading files. It interacts
+ * with a Service class to manage the data.
+ *
+ * @package    LORIS
+ * @subpackage Biobank
+ * @author     Henri Rabalais <henri.j.rabalais@gmail.com>
+ * @license    https://www.gnu.org/licenses/gpl-3.0.html GNU General Public
+ *             License
+ */
+class Controller
+{
+    /**
+     * Constructs the Controller with the provided service.
+     *
+     * @param Service $service The service that handles business logic and data
+     *                         manipulation.
+     */    
+    public function __construct(
+        protected Service $service
+    ) {}
+
+    /**
+     * Handles the root request for retrieving models.
+     *
+     * This method handles requests to retrieve a list of models, applying the
+     * specified query parameters and returning the result in JSON format if
+     * requested.
+     *
+     * @param ServerRequestInterface $request    The HTTP request.
+     * @param QueryParams            $queryParams The parameters for querying
+     *                                            the data.
+     * @param ?ResponseInterface     &$cache      Optional reference to a cache
+     *                                            object.
+     * @return ResponseInterface                  The response, either in JSON
+     *                                            format or a default format.
+     */    
+    public function handleRootRequest(
+        ServerRequestInterface $request,
+        QueryParams $queryParams,
+        ?ResponseInterface &$cache
+    ): ResponseInterface {
+        if (isset($cache)) {
+            error_log('CACHE IS SET');
+            return $cache;
+        }
+        $user = $request->getAttribute('user');
+        $models = (new \LORIS\Data\Table())
+            ->withDataFrom($this->service->apply($queryParams));
+        if (($request->getQueryParams()['format'] ?? '') === 'json') {
+            $cache = (new \LORIS\Http\Response())
+                ->withHeader("Content-Type", "application/octet-stream")
+                ->withBody(new DataIteratorJSONStream($models->getRows($user)));
+        } else {
+             $cache = new Response\OK($models->toArray($user));
+        }
+
+        return $cache;
+    }
+
+    /**
+     * Handles a request to retrieve a specific resource by its ID.
+     *
+     * @param ServerRequestInterface $request    The HTTP request.
+     * @param string                 $resourceId The ID of the resource to
+     *                                            retrieve.
+     * @return ResponseInterface                  The response containing the
+     *                                            requested resource data.
+     */    
+    public function handleResourceRequest(
+        ServerRequestInterface $request,
+        string $resourceId
+    ): ResponseInterface {
+        $result = $this->service->getInstanceByLabel($resourceId);
+        return new Response\OK([$result]);
+    }
+
+    /**
+     * Handles a request to update a resource.
+     *
+     * @param ServerRequestInterface $request    The HTTP request containing the
+     *                                            update data.
+     * @param string                 $resourceId The ID of the resource to update.
+     * @return ResponseInterface                  The response containing the
+     *         
+     */
+    public function handleUpdateRequest(
+        ServerRequestInterface $request,
+        string $resourceId
+    ): ResponseInterface {
+        $data = json_decode($request->getBody()->getContents(), true);
+        $result = $this->service->update($resourceId, $data);
+        return new Response\OK($result);
+    }    
+
+    /**
+     * Handles a request to create a new resource.
+     *
+     * @param ServerRequestInterface $request The HTTP request containing the
+     *                                        data to create the resource.
+     * @return ResponseInterface              The response containing the created
+     *                                        resource data.
+     */
+    public function handleCreateRequest(
+        ServerRequestInterface $request
+    ): ResponseInterface {
+        $data = json_decode($request->getBody()->getContents(), true);
+        $result = $this->service->save(...$data);
+        if ($result['status'] === 'error') {
+            // Handle validation errors
+            return new \LORIS\Http\Response\JsonResponse($result, 400);
+        }
+        return new Response\Created($result['data']);
+    }    
+
+    /**
+     * Handles file upload requests for biobank files.
+     *
+     * This method handles file uploads, ensuring the file type is permitted and
+     * saving the file to the configured biobank path.
+     *
+     * @param ServerRequestInterface $request The HTTP request containing the
+     *                                        file upload data.
+     * @return ResponseInterface              The response indicating the
+     *                                        success or failure of the upload.
+     * @throws \NotFound If the biobank file upload path is not configured.
+     */    
+    public function handleFileUploadRequest(
+        ServerRequestInterface $request
+    ): ResponseInterface {
+        $config = \NDB_Config::singleton();
+        $path = $config->getSetting('biobankPath');
+
+        if (!isset($path)) {
+            throw new \NotFound('Biobank File Upload Path is not configured');
+        }
+
+        $targetdir = new \SplFileInfo($path);
+
+        $uploader = (new \LORIS\FilesUploadHandler($targetdir))
+            ->withPermittedMIMETypes('text/plain');
+
+        return $uploader->handle($request);
+    }
+}    
diff --git a/php/data/query/condition.class.inc b/php/data/query/condition.class.inc
new file mode 100644
index 00000000..ddd9a8dd
--- /dev/null
+++ b/php/data/query/condition.class.inc
@@ -0,0 +1,16 @@
+<?php declare(strict_types=1);
+
+namespace LORIS\biobank\data\query;
+
+use LORIS\biobank\data\Schema;
+
+class Condition
+{
+    public function __construct(
+        public string $field,
+        public ?string $value,
+        public ?Operator $operator = Operator::EQUALS,
+        public ?LogicalOperator $logicalOperator = LogicalOperator::AND,
+        public ?Schema $relation = null
+    ) {}
+}
diff --git a/php/data/query/logicaloperator.class.inc b/php/data/query/logicaloperator.class.inc
new file mode 100644
index 00000000..f1001001
--- /dev/null
+++ b/php/data/query/logicaloperator.class.inc
@@ -0,0 +1,10 @@
+<?php declare(strict_types=1);
+
+namespace LORIS\biobank\data\query;
+
+enum LogicalOperator: string
+{
+    case AND = 'AND';
+    case OR = 'OR';
+}
+
diff --git a/php/data/query/operator.class.inc b/php/data/query/operator.class.inc
new file mode 100644
index 00000000..d7bee36f
--- /dev/null
+++ b/php/data/query/operator.class.inc
@@ -0,0 +1,29 @@
+<?php declare(strict_types=1);
+
+namespace LORIS\biobank\data\query;
+
+enum Operator: string
+{
+    case EQUALS = 'eq';                    // Equals
+    case NOT_EQUALS = 'neq';               // Not equals
+    case GREATER_THAN = 'gt';              // Greater than
+    case LESS_THAN = 'lt';                 // Less than
+    case GREATER_THAN_OR_EQUALS = 'gte';   // Greater than or equals
+    case LESS_THAN_OR_EQUALS = 'lte';      // Less than or equals
+    case LIKE = 'like';                    // Like (pattern match)
+    case IN = 'in';                        // In (value in set)
+
+    public function toSql(): string
+    {
+        return match($this) {
+            self::EQUALS => '=',
+            self::NOT_EQUALS => '!=',
+            self::GREATER_THAN => '>',
+            self::LESS_THAN => '<',
+            self::GREATER_THAN_OR_EQUALS => '>=',
+            self::LESS_THAN_OR_EQUALS => '<=',
+            self::LIKE => 'LIKE',
+            self::IN => 'IN',
+        };
+    }
+}
diff --git a/php/data/query/query.class.inc b/php/data/query/query.class.inc
new file mode 100644
index 00000000..afa7a5e5
--- /dev/null
+++ b/php/data/query/query.class.inc
@@ -0,0 +1,22 @@
+<?php declare(strict_types=1);
+
+namespace LORIS\biobank\data\query;
+
+class Query
+{
+    public function __construct(
+        private string $string,
+        private array $params
+    ) {}
+
+
+    public function toString(): string
+    {
+        return $this->string;
+    }
+
+    public function getParams(): array
+    {
+        return $this->params;
+    }
+}
diff --git a/php/data/query/querybuilder.class.inc b/php/data/query/querybuilder.class.inc
new file mode 100644
index 00000000..0bf87476
--- /dev/null
+++ b/php/data/query/querybuilder.class.inc
@@ -0,0 +1,264 @@
+<?php declare(strict_types=1);  
+
+namespace LORIS\biobank\data\query;
+
+use LORIS\biobank\data\Schema;
+use LORIS\biobank\data\DAO;
+use LORIS\biobank\data\schema\JoinType;
+
+/**
+ * Class QueryBuilder
+ *
+ * Builds SQL queries based on schema and query parameters, allowing for
+ * dynamic joins, where clauses, and field selection. It constructs the
+ * necessary SQL commands based on conditions and relations specified in
+ * `QueryParams`.
+ *
+ * @package    LORIS
+ * @subpackage Biobank
+ * @final
+ * @author     Henri Rabalais <henri.j.rabalais@gmail.com>
+ * @license    https://www.gnu.org/licenses/gpl-3.0.html GNU General Public License
+ */
+final class QueryBuilder
+{
+    /**
+     * Stores query parameters to be used in the built SQL query.
+     *
+     * @var array
+     */    
+    protected array $params = [];
+
+    /**
+     * Constructs the QueryBuilder.
+     *
+     * @param Schema      $schema      The schema defining the table and fields.
+     * @param QueryParams $queryParams The query parameters containing conditions
+     *                                 and relations.
+     */    
+    public function __construct(
+        protected Schema $schema,
+        protected QueryParams $queryParams,
+    ) {
+        $this->validateQueryParams();
+    }
+
+    // TODO: NOT WORKING FOR SOME REASON, MAKE SURE THIS GETS SENT TO THE FRONT
+    // END — ALSO, CONSIDER A BETTER LOCATION FOR THIS VALIDATION, SUCH AS IN
+    // THE QUERYPARAMS THEMSELVES, ALTHOUGH I'M NOT CONVINCED.
+    /**
+     * Validates that the query parameters reference valid schema columns and
+     * relations. Throws exceptions for invalid fields or relations.
+     *
+     * @throws \InvalidArgumentException If a field or relation is invalid.
+     * @return void
+     */    // 
+    private function validateQueryParams(): void
+    {
+        foreach ($this->queryParams->conditions as $condition) {
+            if (!isset($this->schema::columns()[$condition->field])) {
+                throw new \InvalidArgumentException("Field '{$condition->field}' does not exist in the schema.");
+            }
+        }
+
+        foreach ($this->queryParams->includes as $include) {
+            if (!isset($this->schema::relations()[$include->name])) {
+                throw new \InvalidArgumentException("Relation '{$include->name}' does not exist in the schema.");
+            }
+        }
+    }
+
+    /**
+     * Builds the SQL query based on the schema and query parameters.
+     *
+     * @return Query The constructed Query object containing the SQL string and
+     *               parameters.
+     */    
+    public function build(): Query
+    {
+        $query = "
+            SELECT
+                {$this->buildFields()}
+            FROM
+                {$this->schema::table()->name} {$this->schema::table()->alias}
+                {$this->buildJoins()}
+                {$this->buildWhere()}
+            " . $this->buildGroupBy() . $this->buildLimitOffset();
+
+        // $this->logQuery($query);
+
+        return new Query(string: $query, params: $this->params);
+    }
+
+    private function logQuery(string $query): void
+    {
+        $chunkSize = 1000; // Set chunk size based on your needs
+        $queryLength = strlen($query);
+
+        for ($i = 0; $i < $queryLength; $i += $chunkSize) {
+            error_log(substr($query, $i, $chunkSize));
+        }
+    }
+    
+    /**
+     * Builds the GROUP BY clause for the query.
+     *
+     * @return string The GROUP BY clause.
+     */    
+    private function buildGroupBy(): string
+    {
+        return "GROUP BY {$this->schema::table()->alias}.{$this->schema::id()}";
+    }    
+
+    /**
+     * Builds the SELECT fields for the query.
+     *
+     * @return string The SELECT fields clause.
+     */
+    public function buildFields(): string                                       
+    {                                                                           
+        $schema = $this->schema;                                                
+        $columns = $schema::columns();                                            
+        $fields = [];                                                           
+                                                                                
+        $fields[] = "{$this->schema::table()->alias}.{$this->schema::id()} AS id";
+        foreach ($columns as $field => $column) {                               
+            $fields[] = "{$column->table->alias}.{$column->name} AS $field";     
+        }                                                                       
+                                                                                
+        foreach ($schema::relations() as $name => $relation) {                    
+            $jsonFields = []; // Reset $jsonFields for each relation
+                                                                                
+            $jsonFields[] = "'id', $name.{$relation->to::id()}";
+            foreach ($relation->to::columns() as $field => $column) {         
+                if ($field == $relation->to::label()) {
+                    $jsonFields[] = "'$field', $name.{$column->name}";
+                }
+            }                                                                   
+                                                                                
+            $fields[] = $relation->many                                   
+                ? "JSON_ARRAYAGG(JSON_OBJECT(" . implode(", ", $jsonFields) . ")) as {$name}"
+                : "JSON_OBJECT(" . implode(", ", $jsonFields) . ") as {$name}";
+        }                                                                       
+                                                                                
+        return implode(", ", $fields);                                          
+    }              
+
+    /**
+     * Builds the JOIN clauses for the query.
+     *
+     * @return string The JOIN clauses.
+     */
+    protected function buildJoins(): string
+    {
+        $schema = $this->schema;
+        $joinClauses = [];
+
+        foreach ($schema::joins() as $join) {
+            $joinClauses[] = " {$join->type->value} JOIN
+                {$join->to->table->name} {$join->to->table->alias} ON
+                {$join->from->table->alias}.{$join->from->key} =
+                {$join->to->table->alias}.{$join->to->key}";
+        }
+
+        foreach ($schema::relations() as $name => $relation) {
+            $joinType = JoinType::LEFT; // Default join type is LEFT JOIN
+
+            $joinClauses[] = " {$joinType->value}
+                JOIN {$relation->to::table()->name} as $name
+                ON {$relation->from->table->alias}.{$relation->from->key} =
+            $name.{$relation->to::id()}
+            ";
+        }
+
+        return implode(' ', $joinClauses);
+    }
+
+    /**
+     * Builds the WHERE clause based on conditions in QueryParams.
+     *
+     * @return string The WHERE clause.
+     */
+    protected function buildWhere(): string
+    {
+        $whereClauses = [];
+    
+        // Function to process a condition and return the SQL clause
+        $processCondition = function($condition, $index, $schema) use (&$whereClauses) {
+            $field = $condition->field;
+            $value = $condition->value;
+
+            if ($value === null) {
+                return;
+            }
+
+            $column = $schema::columns()[$field]->name;
+            $alias = $schema::table()->alias;
+            $comparisonOperator = $condition->operator->toSql();
+
+            // Check if the operator is 'IN' and the value is an array
+            if (is_array($value) && strtoupper($comparisonOperator) === 'IN') {
+                $placeholders = [];
+                foreach ($value as $i => $val) {
+                    $placeholder = ":{$field}{$index}_{$i}";
+                    $placeholders[] = $placeholder;
+                    $this->params[$placeholder] = $val;  // Add the value to the params
+                }
+                $placeholderList = implode(', ', $placeholders);  // Create the placeholder list
+                $clause = "$alias.$column $comparisonOperator ($placeholderList)";
+            } else {
+                // Standard placeholder for non-IN operations
+                $placeholder = ":{$field}{$index}";
+                $clause = "$alias.$column $comparisonOperator $placeholder";
+                $this->params[$placeholder] = $value;
+            }
+
+            if (!empty($whereClauses)) {
+                $logicalOperator = $condition->logicalOperator->value;
+                $clause = "{$logicalOperator} {$clause}";
+            }
+
+            $whereClauses[] = $clause;
+        };        
+    
+        // Process primary conditions
+        foreach ($this->queryParams->conditions as $index => $condition) {
+            $processCondition($condition, $index, $this->schema);
+        }
+    
+        // Process includes conditions with relations
+        foreach ($this->queryParams->includes as $includeIndex => $include) {
+            $schema = $this->schema::relations()[$include->name]->schema;
+    
+            // Iterate over each condition within the includes array
+            foreach ($include->conditions as $conditionIndex => $condition) {
+                $processCondition($condition, "include{$includeIndex}_{$conditionIndex}", $schema);
+            }
+        }
+    
+        // Combine all where clauses
+        $whereClauseStr = ' WHERE ' . implode(' ', $whereClauses);
+        return !empty($whereClauses) ? $whereClauseStr : '';
+    }
+
+    /**
+     * Builds the LIMIT and OFFSET clause for the query.
+     *
+     * @return string The LIMIT and OFFSET clause.
+     */
+    private function buildLimitOffset(): string
+    {
+        // if (is_null($this->queryParams->limit)) {
+        //     return '';
+        // }
+
+        // $limitOffset = " LIMIT " . $this->queryParams->limit;
+        $limitOffset = " LIMIT 50";
+
+        if (!is_null($this->queryParams->offset)) {
+            $limitOffset .= " OFFSET " . $this->queryParams->offset;
+        }
+
+        return $limitOffset;
+    }
+}
diff --git a/php/data/query/querybuilder2.class.inc b/php/data/query/querybuilder2.class.inc
new file mode 100644
index 00000000..16e8e816
--- /dev/null
+++ b/php/data/query/querybuilder2.class.inc
@@ -0,0 +1,279 @@
+<?php declare(strict_types=1);  
+
+namespace LORIS\biobank\data\query;
+
+use LORIS\biobank\data\Schema;
+use LORIS\biobank\data\DAO;
+use LORIS\biobank\data\schema\JoinType;
+
+final class QueryBuilder2
+{
+    protected array $params = [];
+
+    public function __construct(
+        protected Schema $schema,
+        protected QueryParams $queryParams,
+    ) {
+        $this->validateQueryParams();
+    }
+
+    // TODO: NOT WORKING FOR SOME REASON, MAKE SURE THIS GETS SENT TO THE FRONT
+    // END — ALSO, CONSIDER A BETTER LOCATION FOR THIS VALIDATION, SUCH AS IN
+    // THE QUERYPARAMS THEMSELVES, ALTHOUGH I'M NOT CONVINCED.
+    private function validateQueryParams(): void
+    {
+        foreach ($this->queryParams->conditions as $condition) {
+            if (!isset($this->schema->columns[$condition->field])) {
+                throw new \InvalidArgumentException("Field '{$condition->field}' does not exist in the schema.");
+            }
+        }
+
+        foreach ($this->queryParams->includes as $include) {
+            if (!isset($this->schema->relations[$include->name])) {
+                throw new \InvalidArgumentException("Relation '{$include->name}' does not exist in the schema.");
+            }
+        }
+    }
+
+    public function build(): Query
+    {
+        $query = $this->buildWith() .
+           $this->buildCommonTable() .
+           $this->buildLimitOffset();
+
+        //$this->logQuery($query);
+        // error_log(print_r($this->params, true));
+
+        return new Query(string: $query, params: $this->params);
+    }
+
+    private function logQuery(string $query): void
+    {
+        $chunkSize = 1000; // Set chunk size based on your needs
+        $queryLength = strlen($query);
+
+        for ($i = 0; $i < $queryLength; $i += $chunkSize) {
+            error_log(substr($query, $i, $chunkSize));
+        }
+    }
+
+    private function buildWith()
+    {
+        $commonTables = $this->buildCommonTables();
+        if (empty($commonTables)) {
+            return '';
+        }
+
+        $ctes = implode(', ', $commonTables);
+
+        return "WITH $ctes ";
+    }
+
+    private function buildCommonTables(array $commonTables = []): array
+    {
+        foreach ($this->queryParams->includes as $include) {
+
+            $relation = $this->schema->relations[$include->name];
+
+            // Build the schema for the current relation
+            $relation->buildSchema($this->schema->name, $include->name);
+
+            // Prepare QueryParams for the current relation, handling conditions and sub-includes
+            $queryParams = new QueryParams(
+                conditions: $include->conditions,
+                includes: $include->subIncludes
+            );
+
+            // Create a new QueryBuilder instance for the relation's schem
+            $queryBuilder = new QueryBuilder($relation->schema, $queryParams);
+
+            // Recursively build common tables using the new QueryBuilder
+            $nestedCommonTables = $queryBuilder->buildCommonTables($commonTables);
+            $commonTables = array_merge($commonTables, $nestedCommonTables);
+
+            // Add the common table for the current relation
+            $commonTable = $queryBuilder->buildCommonTable();
+            $commonTables[$relation->schema->name] = "{$relation->schema->name} AS ($commonTable)";
+
+            // Merge parameters from the nested query builder back into this one
+            $this->params = array_merge($this->params, $queryBuilder->params);
+        }
+
+        return $commonTables;
+    }
+
+    protected function buildCommonTable(): string
+    {
+        $schema = $this->schema;
+    
+        // Handle the select clause
+        $selectClause = $this->queryParams->countOnly
+            ? "COUNT(*) AS row_count"
+            : $this->buildSelect();
+    
+        // Build the query
+        return "
+            SELECT
+                $selectClause
+            FROM
+                {$schema->table->name}
+                {$this->buildJoins()}
+                {$this->buildWhere()}
+            " . $this->buildGroupBy();
+    }
+    
+    private function buildSelect(): string
+    {
+        $schema = $this->schema;
+    
+        if (empty($this->queryParams->fields)) {
+            return "{$schema->table->name}.{$schema->id->name}, " .
+                   $this->buildFields() . ", " .
+                   $this->buildJson();
+        }
+    
+        return implode(", ", array_map(
+            fn($field) => "{$schema->table->name}.{$schema->columns[$field]->name} AS {$field}",
+            $this->queryParams->fields
+        ));
+    }
+    
+    private function buildGroupBy(): string
+    {
+        return $this->queryParams->countOnly ?
+            "" :
+            "GROUP BY {$this->schema->table->name}.{$this->schema->id->name}";
+    }    
+
+    public function buildFields(): string
+    {
+        $schema = $this->schema;
+        $columns = $schema->columns;
+        $fields = [];
+    
+        foreach ($columns as $field => $column) {
+            $fields[] = "{$schema->table->name}.{$column->name} AS $field";
+        }
+    
+        return implode(", ", $fields);
+    }
+
+    public function buildJson(): string
+    {
+        $schema = $this->schema;
+
+        $columns = $schema->columns;
+
+        // If no selects are specified, select all columns.
+        $selects = empty($this->queryParams->fields)
+            ? array_keys($columns)
+            : $this->queryParams->fields;
+
+        $fields = [];
+
+        foreach ($selects as $select) {
+            if (array_key_exists($select, $columns)) {
+                // Select column from columns
+                $column = $columns[$select]->name;
+                $fields[] = "'{$select}', {$schema->table->name}.{$column}";
+            }
+        }
+
+        foreach ($this->queryParams->includes as $include) {
+            if (array_key_exists($include->name, $schema->relations)) {
+                // Select from relations
+                $relation = $schema->relations[$include->name];
+                $fields[] = $relation->many
+                    ? "'{$include->name}', JSON_ARRAYAGG(DISTINCT {$relation->schema->name}.json)"
+                    : "'{$include->name}', {$relation->schema->name}.json";
+            }
+        }
+    
+        return "JSON_OBJECT(" . implode(", ", $fields) . ") AS json";
+    }
+
+    protected function buildJoins(): string
+    {
+        $joinClauses = [];
+
+        foreach ($this->schema->joins as $join) {
+            $joinClauses[] = " {$join->type->value} JOIN
+                {$join->to->table->name} {$join->to->table->alias} ON
+                {$join->from->table->name}.{$join->from->key->name} =
+                {$join->to->table->alias}.{$join->to->key->name}";
+        }
+
+        foreach ($this->queryParams->includes as $include) {
+            $relation = $this->schema->relations[$include->name];
+            $join = $include->conditions ? JoinType::INNER : JoinType::LEFT; // Default join type is LEFT JOIN
+
+            $joinClauses[] = " {$join->value} JOIN {$relation->schema->name} ON 
+                {$relation->from->table->alias}.{$relation->from->key->name} =
+            {$relation->schema->name}.{$relation->schema->id->name}
+            ";
+        }
+
+        return implode(' ', $joinClauses);
+    }
+
+
+    protected function buildWhere(): string
+    {
+        if (empty($this->queryParams->conditions)) {
+            return '';
+        }
+
+        $whereClauses = [];
+
+        foreach ($this->queryParams->conditions as $index => $condition) {
+            $field = $condition->field;
+            $value = $condition->value;
+
+            // TODO: this should maybe be taken out
+            if ($value === null) {
+                continue;
+            }
+
+            $table = $this->schema->table->name;
+            $column = $this->schema->columns[$field]->name;
+            $comparisonOperator = $condition->operator->toSql();
+            $placeholder = ":{$field}{$index}";
+
+            $clause = "$table.$column $comparisonOperator $placeholder";
+
+            // Add the logical operator for all clauses except the first one
+            if (!empty($whereClauses)) {
+                $logicalOperator = $condition->logicalOperator->value;
+                $clause = "{$logicalOperator} {$clause}";
+            }
+
+            $whereClauses[] = $clause;
+
+            $this->params[$placeholder] = $value;
+        }
+
+
+        // TODO: this extra check for empty where is because of the residual conditions that
+        // shouldn't  reallly be there.
+        $whereClauseStr = ' WHERE '.implode('', $whereClauses);
+
+        return !empty($whereClauses) ? $whereClauseStr : '';
+    }
+
+    private function buildLimitOffset(): string
+    {
+        if (is_null($this->queryParams->limit)) {
+            return '';
+        }
+
+        $limitOffset = " LIMIT " . $this->queryParams->limit;
+        // $limitOffset = " LIMIT 1";
+
+        if (!is_null($this->queryParams->offset)) {
+            $limitOffset .= " OFFSET " . $this->queryParams->offset;
+        }
+
+        return $limitOffset;
+    }
+
+}
diff --git a/php/data/query/queryparams.class.inc b/php/data/query/queryparams.class.inc
new file mode 100644
index 00000000..4521a888
--- /dev/null
+++ b/php/data/query/queryparams.class.inc
@@ -0,0 +1,142 @@
+<?php declare(strict_types=1);
+
+namespace LORIS\biobank\data\query;
+
+/**
+ * Class QueryParams
+ *
+ * Represents the parameters used for building a query, including fields, conditions,
+ * includes, limits, offsets, and order-by clauses. This class is mutable and allows
+ * chaining of methods to build the parameters.
+ *
+ * @package    LORIS
+ * @subpackage Biobank
+ * @author     Henri Rabalais <henri.j.rabalais@gmail.com>
+ * @license    https://www.gnu.org/licenses/gpl-3.0.html GNU General Public License
+ */
+class QueryParams
+{
+    /**
+     * Constructs a QueryParams instance with optional parameters.
+     *
+     * @param ?array $fields           The fields to be selected.
+     * @param ?array $conditions       The conditions to be applied.
+     * @param ?array $excludeConditions The conditions to be excluded.
+     * @param ?array $includes         The related models to include.
+     * @param ?int   $limit            The limit of results to return.
+     * @param ?int   $offset           The offset for the results.
+     * @param ?array $orderBy          The order-by fields for the query.
+     * @param bool   $countOnly        Whether the query should only return a count.
+     */    
+    public function __construct(
+        public ?array $fields = [],
+        public ?array $conditions = [], //Condition[]
+        public ?array $excludeConditions = [],
+        public ?array $includes = [],
+        public ?int $limit = null,
+        public ?int $offset = null,
+        public ?array $orderBy = null,
+        public bool $countOnly = false,
+    ) {}
+
+    /**
+     * Sets the fields to be selected in the query.
+     *
+     * @param string ...$fields The fields to select.
+     * @return self
+     */    
+    public function select(string ...$fields): self
+    {
+        $this->fields = $fields;
+        return $this;
+    }
+
+    /**
+     * Adds conditions to the query.
+     *
+     * @param Condition ...$conditions The conditions to apply.
+     * @return self
+     */    
+    public function where(Condition ...$conditions): self
+    {
+        foreach ($conditions as $condition) {
+            $this->conditions[] = $condition;
+        }
+        return $this;
+    }
+
+    /**
+     * Includes related models in the query.
+     *
+     * @param With ...$includes The related models to include.
+     * @return self
+     */    
+    public function include(With ...$includes): self
+    {
+        $this->includes = array_merge($this->includes, $includes);
+        return $this;
+    }
+
+    /**
+     * Sets the group-by clause for the query.
+     *
+     * @param string $groupBy The field to group by.
+     * @return self
+     */    
+    public function groupBy(string $groupBy): self
+    {
+        $this->groupBy = $groupBy;
+        return $this;
+    }
+
+    /**
+     * Sets the limit for the query results.
+     *
+     * @param ?int $limit The maximum number of results.
+     * @return self
+     */    
+    public function limit(?int $limit): self
+    {
+        $this->limit = $limit;
+        return $this;
+    }
+
+    /**
+     * Sets the offset for the query results.
+     *
+     * @param ?int $offset The offset for the results.
+     * @return self
+     */    
+    public function offset(?int $offset): self
+    {
+        $this->offset = $offset;
+        return $this;
+    }
+
+    /**
+     * Sets whether the query should only return a count of the results.
+     *
+     * @param bool $countOnly Whether to return only a count.
+     * @return self
+     */    
+    public function countOnly(bool $countOnly): self
+    {
+        $this->countOnly = $countOnly;
+        return $this;
+    }
+
+    /**
+     * Checks if any query parameters have been set.
+     *
+     * @return bool True if any parameters are set, false otherwise.
+     */
+    public function hasAnyParamsSet(): bool
+    {
+        return $this->countOnly ||
+               !empty($this->conditions) ||
+               !empty($this->fields) ||
+               !empty($this->includes) ||  // If you consider includes as a meaningful param
+               isset($this->limit) ||
+               isset($this->offset);
+    }
+}
diff --git a/php/data/query/queryparamshandler.class.inc b/php/data/query/queryparamshandler.class.inc
new file mode 100644
index 00000000..91975416
--- /dev/null
+++ b/php/data/query/queryparamshandler.class.inc
@@ -0,0 +1,249 @@
+<?php declare(strict_types=1);
+
+namespace LORIS\biobank\data\query;
+
+/**
+ * Class QueryParamsHandler
+ *
+ * Handles the parsing of query parameters into a `QueryParams` object.
+ * This includes parsing fields, conditions, includes, limits, offsets, and
+ * count-only queries from the provided array of query parameters.
+ *
+ * @package    LORIS
+ * @subpackage Biobank
+ * @final
+ * @author     Henri Rabalais <henri.j.rabalais@gmail.com>
+ * @license    https://www.gnu.org/licenses/gpl-3.0.html GNU General Public License
+ */
+final class QueryParamsHandler
+{
+    /**
+     * Stores the raw query parameters array to be processed.
+     *
+     * @var array
+     */    
+    protected $queryParams;
+
+    /**
+     * Constructs the QueryParamsHandler.
+     *
+     * @param array $queryParams The array of query parameters to parse.
+     */    
+    public function __construct(array $queryParams)
+    {
+        $this->queryParams = $queryParams;
+    }
+
+    /**
+     * Parses the raw query parameters into a QueryParams object.
+     *
+     * @return QueryParams The parsed QueryParams object.
+     */    
+    public function parse(): QueryParams
+    {
+        $queryParams = new QueryParams();
+        $queryParams->select(...$this->parseFields())
+                    ->where(...$this->parseConditions())
+                    ->include(...$this->parseIncludes()) // New include parsingi
+                    ->limit($this->parseLimit())
+                    ->offset($this->parseOffset())
+                    ->countOnly($this->parseCountOnly());  // Handle countOnly
+
+        return $queryParams;        
+        // return new QueryParams(
+        //     fields: $this->parseFields(),
+        //     conditions: $this->parseConditions(),
+        //     excludeConditions: $this->parseExcludeConditions(),
+        //     limit: $this->parseLimit(),
+        //     offset: $this->parseOffset(),
+        //     orderBy: $this->parseOrderBy(),
+        // );
+    }
+
+    /**
+     * Parses the 'fields' query parameter.
+     *
+     * @return array The parsed fields.
+     */    
+    protected function parseFields(): array
+    {
+        return !empty($this->queryParams['fields']) ? 
+            explode(',', $this->queryParams['fields']) :
+            [];
+    }
+
+    /**
+     * Parses the 'include' query parameter for relationships.
+     *
+     * @return array The parsed includes as With objects.
+     */    
+    protected function parseIncludes(): array
+    {
+        $includes = [];
+
+        if (isset($this->queryParams['include'])) {
+            $includes = $this->parseNestedIncludes(explode(',', $this->queryParams['include']));
+        }
+
+        return $includes;
+    }
+
+   /**
+     * Recursively parses nested includes.
+     *
+     * @param array $includes The array of includes to process.
+     * @return array The parsed includes as With objects.
+     */    
+    protected function parseNestedIncludes(array $includes): array
+    {
+        $result = [];
+
+        foreach ($includes as $include) {
+            $result[] = $this->createWithObject($include);
+        }
+
+        return $result;
+    }
+
+    /**
+     * Creates a With object representing an included relation.
+     *
+     * @param string $include The include string representing the relation.
+     * @return With The With object representing the relation.
+     */    
+    protected function createWithObject(string $include): With
+    {
+        // Split the include string into parts
+        $parts = explode('.', $include);
+        $name = array_shift($parts);
+
+        // Recursively build the nested With structure
+        $subIncludes = [];
+        if (!empty($parts)) {
+            $subIncludes[] = $this->createWithObject(implode('.', $parts));
+        }
+
+        // Parse conditions for the include, if any exist (this is a placeholder for actual logic)
+        $conditions = []; // This should be replaced with actual condition parsing
+
+        return new With($name, $conditions, $subIncludes);
+    }    
+
+    /**
+     * Parses the 'conditions' query parameter.
+     *
+     * @return array The parsed conditions.
+     */    
+    protected function parseConditions(): array
+    {
+        return $this->parseComplexConditions('conditions');
+    }
+
+    /**
+     * Parses the 'exclude_conditions' query parameter.
+     *
+     * @return array The parsed exclude conditions.
+     */    
+    protected function parseExcludeConditions(): array
+    {
+        return $this->parseComplexConditions('exclude_conditions');
+    }
+
+    /**
+     * Parses complex conditions from the query parameters.
+     *
+     * @param string $key The key of the query parameter to parse.
+     * @return array The parsed conditions.
+     */    
+    protected function parseComplexConditions(string $key): array
+    {
+        $conditions = [];
+
+        foreach ($this->queryParams[$key] ?? [] as $field => $value) {
+            [$operatorStr, $logicalOperatorStr, $field] = $this->parseFieldWithOperators($field);
+
+            $operator = Operator::from($operatorStr);
+            $logicalOperator = LogicalOperator::from($logicalOperatorStr);
+
+            $conditions[] = new Condition(
+                $field,
+                $value,
+                $operator,
+                $logicalOperator
+            );
+        }
+
+        return $conditions;
+    }
+
+    /**
+     * Parses a field with operator information.
+     *
+     * @param string $field The field string containing operators.
+     * @return array An array containing the operator, logical operator, and field.
+     */    
+    protected function parseFieldWithOperators(string $field): array
+    {
+        $parts = explode('_', $field, 3);
+        $operatorStr = $parts[0];
+        $logicalOperatorStr = $parts[1];
+        $field = $parts[2] ?? '';
+
+        return [$operatorStr, $logicalOperatorStr, $field];
+    }
+
+
+    /**
+     * Parses the 'limit' query parameter.
+     *
+     * @return ?int The parsed limit or null.
+     */
+    protected function parseLimit(): ?int
+    {
+        return isset($this->queryParams['limit']) && is_numeric($this->queryParams['limit'])
+            ? (int) $this->queryParams['limit']
+            : null;
+    }
+
+    /**
+     * Parses the 'offset' query parameter.
+     *
+     * @return ?int The parsed offset or null.
+     */    
+    protected function parseOffset(): ?int
+    {
+        return isset($this->queryParams['offset']) && is_numeric($this->queryParams['offset'])
+            ? (int) $this->queryParams['offset']
+            : null;
+    }
+
+    /**
+     * Parses the 'order_by' query parameter.
+     *
+     * @return array The parsed order by fields.
+     */    
+    protected function parseOrderBy(): array
+    {
+        $orderBy = [];
+
+        foreach (explode(',', $this->queryParams['order_by'] ?? '') as $field) {
+            if (isset($field[0]) && $field[0] === '-') {
+                $orderBy[substr($field, 1)] = 'DESC';
+            } else {
+                $orderBy[$field] = 'ASC';
+            }
+        }
+
+        return $orderBy;
+    }
+
+    /**
+     * Parses the 'countOnly' query parameter.
+     *
+     * @return bool True if only count should be returned, false otherwise.
+     */    
+    protected function parseCountOnly(): bool
+    {
+        return isset($this->queryParams['countOnly']) && $this->queryParams['countOnly'] === 'true';
+    }
+}
diff --git a/php/data/query/with.class.inc b/php/data/query/with.class.inc
new file mode 100644
index 00000000..a7c1064b
--- /dev/null
+++ b/php/data/query/with.class.inc
@@ -0,0 +1,12 @@
+<?php declare(strict_types=1);
+
+namespace LORIS\biobank\data\query;
+
+class With
+{
+    public function __construct(
+        public string $name,
+        public array $conditions = [],
+        public array $subIncludes = []
+    ) {}
+}
diff --git a/php/data/recursivemodeliterator.class.inc b/php/data/recursivemodeliterator.class.inc
new file mode 100644
index 00000000..a78b32ff
--- /dev/null
+++ b/php/data/recursivemodeliterator.class.inc
@@ -0,0 +1,146 @@
+<?php declare(strict_types=1);
+
+namespace LORIS\biobank\data;
+
+use Loris\biobank\Factory;
+use Loris\biobank\Model;
+
+/**
+ * Class RecursiveModelIterator
+ *
+ * Iterates over a set of models using a generator, providing recursive
+ * iteration capabilities. This class works with JSON data and decodes it
+ * into model instances using a factory. It is compatible with recursive
+ * structures, making it suitable for handling hierarchical or nested data.
+ *
+ * @package    LORIS
+ * @subpackage Biobank
+ * @implements \RecursiveIterator
+ * @author     Henri Rabalais <henri.j.rabalais@gmail.com>
+ * @license    https://www.gnu.org/licenses/gpl-3.0.html GNU General Public
+ *             License
+ */
+class RecursiveModelIterator implements \RecursiveIterator
+{
+    /**
+     * Stores the current row of data from the generator.
+     *
+     * @var array|null
+     */    
+    private ?array $currentRow = null;
+
+    /**
+     * Constructs the RecursiveModelIterator.
+     *
+     * @param \Generator $rows    The generator providing the rows of data.
+     * @param Factory    $factory The factory used to create model instances.
+     */    
+    public function __construct(
+        private \Generator $rows,
+        private Factory $factory
+    ) {
+        $this->next(); // Initialize the first row
+    }
+
+    /**
+     * Checks if the current element has children (i.e., if it is a nested
+     * structure).
+     *
+     * @return bool True if the current element contains children, false
+     *              otherwise.
+     */    
+    public function hasChildren(): bool
+    {
+        $data = json_decode($this->current()['json'], true);
+        return is_array($data);
+    }
+
+    /**
+     * Returns an iterator for the current element's children.
+     *
+     * Note: This assumes that the data contains a valid JSON array. If not,
+     * it will generate an error when attempting to decode.
+     *
+     * @return \RecursiveIterator A new RecursiveModelIterator for the
+     *                            children.
+     */    
+    public function getChildren(): \RecursiveIterator
+    {
+        $data = json_decode($this->current()['json'], true);
+        return new self(new \ArrayIterator($data), $this->factory);
+    }
+
+    /**
+     * Returns the current model instance after decoding its data.
+     *
+     * @return ?Model The current model instance, or null if the data cannot
+     *                be decoded or is not valid.
+     */    
+    public function current(): ?Model
+    {
+        $data = json_decode($this->currentRow['json'], true);
+        
+        //error_log(print_r($data, true));
+        if (json_last_error() === JSON_ERROR_NONE && is_array($data)) {
+            return $this->factory->create($data);
+        } else {
+            error_log("JSON decode error or data is not an array: " . json_last_error_msg());
+            return null; // Ensure that this matches your Model return type
+        }
+    }    
+
+    /**
+     * Returns the current key.
+     *
+     * @return mixed|null The key, or null if no key is used.
+     */    
+    public function key(): mixed
+    {
+        return null; // Key can be removed if not necessary
+    }
+
+    /**
+     * Does nothing, as the generator cannot be rewound.
+     */    
+    public function rewind(): void
+    {
+        // Do nothing, as we can't rewind a generator
+    }
+
+    /**
+     * Advances the generator to the next element.
+     */    
+    public function next(): void
+    {
+        if ($this->rows->valid()) {
+            $this->currentRow = $this->rows->current();
+            $this->rows->next();
+        } else {
+            $this->currentRow = null;
+        }
+    }
+
+    /**
+     * Checks if the current row is valid.
+     *
+     * @return bool True if the current row is valid, false otherwise.
+     */    
+    public function valid(): bool
+    {
+        return $this->currentRow !== null;
+    }    
+
+    /**
+     * Streams the models by yielding each valid instance.
+     *
+     * @return \Generator A generator that yields model instances.
+     */    
+    public function stream(): \Generator
+    {
+        while ($this->valid()) {
+            yield $this->current();
+            $this->next();
+        }
+    }
+}
+
diff --git a/php/data/schema.class.inc b/php/data/schema.class.inc
new file mode 100644
index 00000000..5d321bd0
--- /dev/null
+++ b/php/data/schema.class.inc
@@ -0,0 +1,92 @@
+<?php declare(strict_types=1);  
+
+namespace LORIS\biobank\data;
+
+use \LORIS\biobank\data\schema\Table;
+
+/**
+ * Abstract class Schema
+ *
+ * Defines the structure of a schema, including its model, table, columns,
+ * joins, and relationships. Concrete schema classes must implement these
+ * methods to specify how data is mapped and interacted with in the system.
+ *
+ * @package    LORIS
+ * @subpackage Biobank
+ * @abstract
+ * @author     Henri Rabalais <henri.j.rabalais@gmail.com>
+ * @license    https://www.gnu.org/licenses/gpl-3.0.html GNU General Public
+ *             License
+ */
+abstract class Schema
+{
+    /**
+     * Returns the fully qualified class name of the associated model.
+     *
+     * Concrete classes should implement this method to specify the model
+     * that the schema corresponds to.
+     *
+     * @return string The class name of the model.
+     */    
+    abstract public static function model(): string;
+
+    /**
+     * Returns the table associated with the schema.
+     *
+     * Concrete classes should implement this method to return the table
+     * that the schema maps to.
+     *
+     * @return Table The database table object.
+     */    
+    abstract public static function table(): Table;
+
+    /**
+     * Returns the name of the primary key column.
+     *
+     * Concrete classes should implement this method to specify the name of
+     * the primary key field used in the table.
+     *
+     * @return string The primary key column name.
+     */    
+    abstract public static function id(): string;
+
+    /**
+     * Returns the name of the label column.
+     *
+     * Concrete classes should implement this method to specify the label
+     * column, which typically represents a human-readable identifier.
+     *
+     * @return string The label column name.
+     */    
+    abstract public static function label(): string;
+
+    /**
+     * Returns an array of column definitions for the table.
+     *
+     * Concrete classes should implement this method to provide an array of
+     * columns, each defining the fields present in the table.
+     *
+     * @return array The column definitions as an associative array.
+     */    
+    abstract public static function columns(): array;
+
+    /**
+     * Returns an array of join definitions.
+     *
+     * Concrete classes should implement this method to define how this
+     * schema joins with other tables or schemas in the database.
+     *
+     * @return array The join definitions as an associative array.
+     */    
+    abstract public static function joins(): array;
+
+    /**
+     * Returns an array of relation definitions.
+     *
+     * Concrete classes should implement this method to define relationships
+     * between this schema and other models or schemas.
+     *
+     * @return array The relation definitions as an associative array.
+     */    
+    abstract public static function relations(): array;
+}
diff --git a/php/data/schema/column.class.inc b/php/data/schema/column.class.inc
new file mode 100644
index 00000000..eef2f8bd
--- /dev/null
+++ b/php/data/schema/column.class.inc
@@ -0,0 +1,42 @@
+<?php declare(strict_types=1);
+
+namespace LORIS\biobank\data\schema;
+
+/**
+ * Enum ColumnType
+ *
+ * Defines the possible column types for a database schema. These
+ * correspond to common SQL data types used when defining tables.
+ *
+ * @package    LORIS
+ * @subpackage Biobank
+ */
+enum ColumnType: string
+{
+    case INT = 'int';
+    case TINYINT = 'tinyint';
+    case VARCHAR = 'varchar';
+    case LONGTEXT = 'longtext';
+    case DECIMAL = 'decimal';
+    case BOOLEAN = 'boolean';
+    case ENUM = 'enum';
+    case DATE = 'date';
+    case TIME = 'time';
+}
+
+/**
+ * Class Column
+ *
+ * Represents a column in a database table. This class associates the
+ * column with its name and the table it belongs to.
+ *
+ * @package    LORIS
+ * @subpackage Biobank
+ */
+class Column
+{
+    public function __construct(
+        public string $name,
+        public Table $table,
+    ) {}
+}
diff --git a/php/data/schema/join.class.inc b/php/data/schema/join.class.inc
new file mode 100644
index 00000000..a1bb78bb
--- /dev/null
+++ b/php/data/schema/join.class.inc
@@ -0,0 +1,28 @@
+<?php declare(strict_types=1);
+
+namespace LORIS\biobank\data\schema;
+
+/**
+ * Class Join
+ *
+ * Represents a SQL join between two tables, defined by their keys.
+ * By default, the join type is set to `LEFT`, but it can be modified
+ * using the optional `$type` parameter.
+ *
+ * @package    LORIS
+ */
+class Join
+{
+    /**
+     * Constructs a Join instance.
+     *
+     * @param TableKey  $from The key from the source table.
+     * @param TableKey  $to   The key from the target table.
+     * @param ?JoinType $type The type of join, defaulting to a LEFT join.
+     */    
+    public function __construct(
+        public TableKey $from,
+        public TableKey $to,
+        public ?JoinType $type = JoinType::LEFT,
+    ) {}
+}
diff --git a/php/data/schema/jointype.class.inc b/php/data/schema/jointype.class.inc
new file mode 100644
index 00000000..9f70589a
--- /dev/null
+++ b/php/data/schema/jointype.class.inc
@@ -0,0 +1,11 @@
+<?php declare(strict_types=1);
+
+namespace LORIS\biobank\data\schema;
+
+enum JoinType: string                                                              
+{                                                                                  
+    case LEFT = 'LEFT';                                                            
+    case RIGHT = 'RIGHT';                                                          
+    case INNER = 'INNER';                                                          
+    case OUTER = 'OUTER';                                                          
+}    
diff --git a/php/data/schema/key.class.inc b/php/data/schema/key.class.inc
new file mode 100644
index 00000000..f56e8fc9
--- /dev/null
+++ b/php/data/schema/key.class.inc
@@ -0,0 +1,13 @@
+<?php declare(strict_types=1);
+
+namespace LORIS\biobank\data\schema;
+
+class Key extends Column
+{
+    public function __construct(
+        string $name,
+        Table $table,
+    ) {
+        parent::__construct($name, $table);
+    }
+}
diff --git a/php/data/schema/loadingstrategytrait.class.inc b/php/data/schema/loadingstrategytrait.class.inc
new file mode 100644
index 00000000..373b8216
--- /dev/null
+++ b/php/data/schema/loadingstrategytrait.class.inc
@@ -0,0 +1,42 @@
+<?php declare (strict_types=1);
+
+namespace LORIS\biobank\data\schema;
+
+enum LoadingStrategy: string
+{
+    case LAZY = 'LAZY';
+    case EAGER = 'EAGER';
+    case FORCED = 'FORCED';
+}
+
+trait LoadingStrategyTrait {
+    //protected LoadingStrategy $strategy;
+
+    public function getLoadingStrategy(): LoadingStrategy {
+        return $this->strategy;
+    }
+
+    public function isEager(): bool
+    {
+        return $this->strategy === LoadingStrategy::EAGER;
+    }
+
+    public function isForced(): bool
+    {
+        return $this->strategy === LoadingStrategy::FORCED;
+    }
+
+    public function isLazy(): bool
+    {
+        return $this->strategy === LoadingStrategy::LAZY;
+    }
+
+    //public static function eager(): static {
+    //    return new static(LoadingStrategy::EAGER);
+    //    $instance->setLoadingStrategy(LoadingStrategy::EAGER);
+    //}
+
+    //public static function lazy(): static {
+    //    return new static(LoadingStrategy::LAZY);
+    //}
+}
diff --git a/php/data/schema/relation.class.inc b/php/data/schema/relation.class.inc
new file mode 100644
index 00000000..b8692cc1
--- /dev/null
+++ b/php/data/schema/relation.class.inc
@@ -0,0 +1,40 @@
+<?php declare(strict_types=1);
+
+namespace LORIS\biobank\data\schema;
+
+use LORIS\biobank\data\Schema;
+
+enum RelationType: string
+{
+    case OnetoOne = 'OnetoOne';
+    case OnetoMany = 'OnetoMany';
+    case ManytoOne = 'ManytoOne';
+    case ManytoMany = 'ManytoMany';
+}
+
+class Relation
+{
+    public readonly Schema $schema;
+
+    public function __construct(
+        public TableKey $from,
+        public string $to, // schema fully qualified class name
+        public bool $many = false,
+        public ?RelationType $type = null,
+    ) {
+        if (!is_subclass_of($to, Schema::class)) {
+            throw new \InvalidArgumentException(
+                'The "to" parameter must be a subclass of Schema.'
+            );
+        }
+    }
+
+    public function buildSchema(string $parentName, string $fieldName): self
+    {
+        $this->schema = new $this->to(
+            name: $parentName . '_' . $fieldName,
+        );
+        return $this;
+    }
+}
+
diff --git a/php/data/schema/table.class.inc b/php/data/schema/table.class.inc
new file mode 100644
index 00000000..f357b15b
--- /dev/null
+++ b/php/data/schema/table.class.inc
@@ -0,0 +1,13 @@
+<?php declare(strict_types=1);
+
+namespace LORIS\biobank\data\schema;
+
+class Table                                                                       
+{                                                                                  
+    public function __construct(                                                   
+        public string $name,                                                       
+        public ?string $alias = null
+    ) {
+        $this->alias = $alias ?? $name;
+    }
+}  
diff --git a/php/data/schema/tablekey.class.inc b/php/data/schema/tablekey.class.inc
new file mode 100644
index 00000000..4de9d691
--- /dev/null
+++ b/php/data/schema/tablekey.class.inc
@@ -0,0 +1,11 @@
+<?php declare(strict_types=1);
+
+namespace LORIS\biobank\data\schema;
+
+class TableKey
+{
+    public function __construct(
+        public Table $table,
+        public string $key
+    ) {}
+}
diff --git a/php/data/schemas/- b/php/data/schemas/-
new file mode 100644
index 00000000..e69de29b
diff --git a/php/data/schemas/candidateschema.class.inc b/php/data/schemas/candidateschema.class.inc
new file mode 100644
index 00000000..9ec5df9c
--- /dev/null
+++ b/php/data/schemas/candidateschema.class.inc
@@ -0,0 +1,113 @@
+<?php declare(strict_types=1);
+
+namespace LORIS\biobank\data\schemas;
+
+use \LORIS\biobank\data\Schema;
+use \LORIS\biobank\data\schema\Table;
+use \LORIS\biobank\data\schema\TableKey;
+use \LORIS\biobank\data\schema\Column;
+use \LORIS\biobank\data\schema\ColumnType;
+use \LORIS\biobank\data\schema\Join;
+use \LORIS\biobank\data\schema\Relation;
+
+/**
+ * CandidateSchema Class
+ *
+ * This class defines the schema for the `candidate` table. It specifies
+ * the model, table structure, columns, joins, and relationships with
+ * other tables in the biobank system.
+ *
+ * @package    LORIS
+ * @subpackage Biobank
+ * @category   Data
+ * @license    https://www.gnu.org/licenses/gpl-3.0.html GPLv3
+ * @link       https://www.github.com/aces/Loris/
+ */
+class CandidateSchema extends Schema
+{
+    public static function model(): string
+    {
+        return \LORIS\biobank\models\Candidate::class;
+    }
+
+    public static function table(): Table
+    {
+        return new Table(name: 'candidate');
+    }
+
+    public static function id(): string
+    {
+        return 'CandID';
+    }
+
+    public static function label(): string
+    {
+        return 'label';
+    }
+
+    public static function columns(): array
+    {
+        return [
+            'label' => new Column(
+                name: 'PSCID',
+                table: self::table(),
+            ),
+            'dob' => new Column(
+                name: 'DoB',
+                table: self::table(),
+            ),
+            'sex' => new Column(
+                name: 'Sex',
+                table: self::table(),
+            ),
+        ];
+    }
+
+    public static function joins(): array
+    {
+        $tableKey = new TableKey(
+            table: self::table(),
+            key: self::id()
+        );
+        return [
+            'diagnosis' => new Join(
+                from: $tableKey,
+                to: new TableKey(
+                    table: new Table(
+                        name: 'candidate_diagnosis_rel'
+                    ),
+                    key: 'CandID'
+                ),
+            ),
+            'session' => new Join(
+                from: $tableKey,
+                to: new TableKey(
+                    table: new Table(name: 'session'), // to be replaced with call to sesion schema once table name is a static property
+                    key: 'CandID'
+                )
+            ),
+        ];
+    }
+
+    public static function relations(): array
+    {
+        return [
+            'diagnoses' => new Relation(
+                from: new TableKey(
+                    table: self::joins()['diagnosis']->to->table,
+                    key: 'DiagnosisID'
+                ),
+                to: DiagnosisSchema::class,
+                many: true
+            ),
+            'sessions' => new Relation(
+                from: new TableKey(
+                    table: self::joins()['session']->to->table,
+                    key: 'ID'
+                ),
+                to: SessionSchema::class,
+                many: true
+            ),
+        ];
+    }
+}
diff --git a/php/data/schemas/centerschema.class.inc b/php/data/schemas/centerschema.class.inc
new file mode 100644
index 00000000..cb208be9
--- /dev/null
+++ b/php/data/schemas/centerschema.class.inc
@@ -0,0 +1,59 @@
+<?php declare(strict_types=1);
+
+namespace LORIS\biobank\data\schemas;
+
+use \LORIS\biobank\data\schema\Table;
+use \LORIS\biobank\data\schema\Column;
+use \LORIS\biobank\data\schema\ColumnType;
+use \LORIS\biobank\data\Schema;
+
+
+/**
+ * Center Schema Class
+ * 
+ * This class defines the schema for the `psc` table.
+ * 
+ * PHP Version 7.2
+ * 
+ * @category   Data
+ * @package    Loris
+ * @subpackage Biobank
+ * @license    http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
+ * @link       https://www.github.com/aces/Loris/
+ */
+class CenterSchema extends Schema
+{
+    public static function model(): string                                          
+    {                                                                              
+        return \LORIS\biobank\models\Center::class;                              
+    }  
+
+    public static function table(): Table {
+        return new Table(name: 'psc');
+    }
+
+    public static function id(): string {
+        return 'CenterID';
+    }
+
+    public static function label(): string {
+        return 'label';
+    }
+
+    public static function columns(): array {
+        return [
+            'label' => new Column(
+                name: 'Name',
+                table: self::table(),
+            ),
+        ];
+    }
+
+    public static function relations(): array {
+        return []; // Add relation definitions if needed
+    }
+
+    public static function joins(): array {
+        return []; // Add join definitions if needed
+    }
+}
diff --git a/php/data/schemas/container/type/capacityschema.class.inc b/php/data/schemas/container/type/capacityschema.class.inc
new file mode 100644
index 00000000..6704d9ee
--- /dev/null
+++ b/php/data/schemas/container/type/capacityschema.class.inc
@@ -0,0 +1,78 @@
+<?php declare(strict_types=1);
+
+namespace LORIS\biobank\data\schemas\container\type;
+
+use \LORIS\biobank\data\schemas\UnitSchema;
+use \LORIS\biobank\data\schema\Table;
+use \LORIS\biobank\data\schema\Key;
+use \LORIS\biobank\data\schema\TableKey;
+use \LORIS\biobank\data\schema\Column;
+use \LORIS\biobank\data\schema\ColumnType;
+use \LORIS\biobank\data\schema\Relation;
+use \LORIS\biobank\data\schema\RelationType;
+use \LORIS\biobank\data\schema\LoadingStrategy;
+use \LORIS\biobank\data\Schema;
+
+/**
+ * Capacity Schema Class
+ * 
+ * This class defines the schema for the `biobank_container_capacity` table.
+ * 
+ * PHP Version 7.2
+ * 
+ * @category   Data
+ * @package    Loris
+ * @subpackage Biobank
+ * @license    http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
+ * @link       https://www.github.com/aces/Loris/
+ */
+final class CapacitySchema extends Schema
+{
+
+    public static function model(): string
+    {
+        return \LORIS\biobank\models\container\type\Capacity::class;
+    }
+
+    public static function table(): Table
+    {
+        return new Table(name: 'biobank_container_capacity');
+    }
+
+    public static function id(): string
+    {
+        return 'ContainerCapacityID';
+    }
+
+    public static function label(): string
+    {
+        return '';
+    }
+
+    public static function columns(): array
+    {
+        return [
+            'quantity' => new Column(
+                name: 'Quantity',
+                table: self::table()
+            ),
+        ];
+    }
+
+    public static function relations(): array {
+        return [
+            'unit' => new Relation(
+                from: new TableKey(
+                    table: self::table(),
+                    key: 'UnitID'
+                ),
+                to: UnitSchema::class,
+                type: RelationType::ManytoOne,
+            ),
+        ];
+    }
+
+    public static function joins(): array {
+        return []; // Add join definitions if needed
+    }
+}
diff --git a/php/data/schemas/container/type/dimensionschema.class.inc b/php/data/schemas/container/type/dimensionschema.class.inc
new file mode 100644
index 00000000..d7dc6b75
--- /dev/null
+++ b/php/data/schemas/container/type/dimensionschema.class.inc
@@ -0,0 +1,80 @@
+<?php declare(strict_types=1);
+
+namespace LORIS\biobank\data\schemas\container\type;
+
+use \LORIS\biobank\data\schema\Table;
+use \LORIS\biobank\data\schema\Key;
+use \LORIS\biobank\data\schema\Column;
+use \LORIS\biobank\data\schema\ColumnType;
+use \LORIS\biobank\data\Schema;
+
+/**
+ * Dimension Schema Class
+ * 
+ * This class defines the schema for the `biobank_container_dimension` table.
+ * 
+ * PHP Version 7.2
+ * 
+ * @category   Data
+ * @package    Loris
+ * @subpackage Biobank
+ * @license    http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
+ * @link       https://www.github.com/aces/Loris/
+ */
+final class DimensionSchema extends Schema
+{
+    public static function model(): string                                          
+    {                                                                              
+        return \LORIS\biobank\models\container\type\Dimension::class;                          
+    }  
+
+    public static function table(): Table {
+        return new Table(name: 'biobank_container_dimension');
+    }
+
+    public static function id(): string {
+        return 'ContainerDimensionID';
+    }
+
+    public static function label(): string
+    {
+        return '';
+    }
+
+    public static function columns(): array {
+        return [
+            'x' => new Column(
+                name: 'X',
+                table: self::table()
+            ),
+            'xNum' => new Column(
+                name: 'XNumerical',
+                table: self::table()
+            ),
+            'y' => new Column(
+                name: 'Y',
+                table: self::table()
+            ),
+            'yNum' => new Column(
+                name: 'YNumerical',
+                table: self::table()
+            ),
+            'z' => new Column(
+                name: 'Z',
+                table: self::table()
+            ),
+            'zNum' => new Column(
+                name: 'ZNumerical',
+                table: self::table()
+            ),
+        ];
+    }
+
+    public static function relations(): array {
+        return []; // Add relation definitions if needed
+    }
+
+    public static function joins(): array {
+        return []; // Add join definitions if needed
+    }
+}
diff --git a/php/data/schemas/container/typeschema.class.inc b/php/data/schemas/container/typeschema.class.inc
new file mode 100644
index 00000000..9eeaf902
--- /dev/null
+++ b/php/data/schemas/container/typeschema.class.inc
@@ -0,0 +1,95 @@
+<?php declare(strict_types=1);
+
+namespace LORIS\biobank\data\schemas\container;
+
+use \LORIS\biobank\data\schema\Table;
+use \LORIS\biobank\data\schema\Key;
+use \LORIS\biobank\data\schema\TableKey;
+use \LORIS\biobank\data\schema\Column;
+use \LORIS\biobank\data\schema\ColumnType;
+use \LORIS\biobank\data\schema\Relation;
+use \LORIS\biobank\data\schema\RelationType;
+use \LORIS\biobank\data\schemas\container;
+use \LORIS\biobank\data\schema\LoadingStrategy;
+use \LORIS\biobank\data\Schema;
+
+/**
+ * Type Schema Class
+ *
+ * This class defines the schema for the `biobank_container_type` table.
+ *
+ * PHP Version 7.2
+ *
+ * @category   Data
+ * @package    Loris
+ * @subpackage Biobank
+ * @license    http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
+ * @link       https://www.github.com/aces/Loris/
+ */
+final class TypeSchema extends Schema
+{
+    public static function model(): string                                          
+    {                                                                              
+        return \LORIS\biobank\models\container\Type::class;                              
+    }  
+
+    public static function table(): Table
+    {
+        return new Table(name: 'biobank_container_type');
+    }
+
+    public static function id(): string
+    {
+        return 'ContainerTypeID';
+    }
+
+    public static function label(): string
+    {
+        return 'label';
+    }
+
+    public static function columns(): array {
+        return [
+            'label' => new Column(
+                name: 'Label',
+                table: self::table()
+            ),
+            // primary is a reserved word in sql
+            'prime' => new Column( 
+                name: 'Prime',
+                table: self::table()
+            ),
+            'brand' => new Column(
+                name: 'Brand',
+                table: self::table()
+            ),
+            'productNumber' => new Column(
+                name: 'ProductNumber',
+                table: self::table()
+            )
+        ];
+    }
+
+    public static function relations(): array {
+        return [
+            'capacity' => new Relation(
+                from: new TableKey(
+                    table: self::table(),
+                    key: 'ContainerCapacityID'
+                ),
+                to: container\type\CapacitySchema::class,
+            ),
+            'dimension' => new Relation(
+                from: new TableKey(
+                    table: self::table(),
+                    key: 'ContainerDimensionID'
+                ),
+                to: container\type\DimensionSchema::class,
+            )
+        ];
+    }
+
+    public static function joins(): array {
+        return []; // Add join definitions if needed
+    }
+}
diff --git a/php/data/schemas/containerschema.class.inc b/php/data/schemas/containerschema.class.inc
new file mode 100644
index 00000000..f0c5f941
--- /dev/null
+++ b/php/data/schemas/containerschema.class.inc
@@ -0,0 +1,164 @@
+<?php declare(strict_types=1);
+
+namespace LORIS\biobank\data\schemas;
+
+use \LORIS\biobank\data\Schema;
+use \LORIS\biobank\data\schema\Table;
+use \LORIS\biobank\data\schema\TableKey;
+use \LORIS\biobank\data\schema\Column;
+use \LORIS\biobank\data\schema\ColumnType;
+use \LORIS\biobank\data\schema\Join;
+use \LORIS\biobank\data\schema\Relation;
+use \LORIS\biobank\data\schema\RelationType;
+use \LORIS\biobank\data\schema\LoadingStrategy;
+use \LORIS\biobank\data\schemas\container;
+
+/**
+ * Container Schema Class
+ *
+ * This class defines the schema for the `biobank_container` table.
+ *
+ * PHP Version 7.2
+ *
+ * @category   Data
+ * @package    Loris
+ * @subpackage Biobank
+ * @license    http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
+ * @link       https://www.github.com/aces/Loris/
+ */
+
+class ContainerSchema extends Schema
+{
+    public static function model(): string                                          
+    {                                                                              
+        return \LORIS\biobank\models\Container::class;                              
+    }  
+
+    public static function table(): Table
+    {
+        return new Table(name: 'biobank_container');
+    }
+
+    public static function id(): string
+    {
+        return 'ContainerID';
+    }
+
+    public static function label(): string
+    {
+        return 'barcode';
+    }
+
+    public static function columns(): array
+    {
+        return [
+            'id' => new Column(
+                name: 'ContainerID', 
+                table: self::table()
+            ),
+            'barcode' => new Column(
+                name: 'Barcode', 
+                table: self::table()
+            ),
+            'temperature' => new Column(
+                name: 'Temperature', 
+                table: self::table()
+            ),
+            'lotNumber' => new Column(
+                name: 'LotNumber', 
+                table: self::table()
+            ),
+            'expirationDate' => new Column(
+                name: 'ExpirationDate', 
+                table: self::table()
+            ),
+            'comments' => new Column(
+                name: 'Comments', 
+                table: self::table()
+            ),
+        ];
+    }
+
+    public static function joins(): array
+    {
+        $idKey = new TableKey(
+            table: self::table(),
+            key: self::id(),
+        );
+        return [
+            'parent_rel' => new Join(
+                from: $idKey,
+                to: new TableKey(
+                    table: new Table(
+                        name: 'biobank_container_parent', 
+                        alias: 'parent_rel',
+                    ),
+                    key: self::id()
+                )                
+            ),
+            'children_rel' => new Join(
+                from: $idKey,
+                to: new TableKey( 
+                    table: new Table(
+                        name: 'biobank_container_parent', 
+                        alias: 'children_rel'
+                    ),
+                    key: 'ParentContainerID'
+                ),
+            ),
+            'shipments_rel' => new Join(
+                from: $idKey,
+                to: new TableKey(
+                    table: new Table(
+                        name: 'biobank_container_shipment_rel', 
+                        alias: 'shipments_rel'
+                    ),
+                    key: self::id()
+                )                
+            )
+        ];
+    }
+
+    public static function relations(): array
+    {
+        return [
+            'type' => new Relation(
+                from: new TableKey(
+                    table: self::table(), 
+                    key: 'ContainerTypeID'
+                ),
+                to: container\TypeSchema::class,
+            ),
+            'center' => new Relation(
+                from: new TableKey(
+                    table: self::table(),
+                    key: 'CenterID'
+                ),
+                to: CenterSchema::class,
+            ),
+            'parent' => new Relation(
+                from: new TableKey(
+                    table: self::joins()['parent_rel']->to->table, 
+                    key: 'ParentContainerID'
+                ),
+                to: self::class,
+            ),
+            'children' => new Relation(
+                from: new TableKey(
+                    table: self::joins()['children_rel']->to->table, 
+                    key: 'ContainerID'
+                ),
+                to: self::class,
+                many: true,
+            ),
+           'shipments' => new Relation(
+                from: new TableKey(
+                    table: self::joins()['shipments_rel']->to->table, 
+                    key: 'ShipmentID'
+                ),
+                to: ShipmentSchema::class,
+                many: true,
+            )
+        ];
+    }
+}
diff --git a/php/data/schemas/diagnosisschema.class.inc b/php/data/schemas/diagnosisschema.class.inc
new file mode 100644
index 00000000..0ad4cee8
--- /dev/null
+++ b/php/data/schemas/diagnosisschema.class.inc
@@ -0,0 +1,69 @@
+<?php declare(strict_types=1);
+
+namespace LORIS\biobank\data\schemas;
+
+use \LORIS\biobank\data\Schema;
+use \LORIS\biobank\data\schema\Table;
+use \LORIS\biobank\data\schema\TableKey;
+use \LORIS\biobank\data\schema\Column;
+use \LORIS\biobank\data\schema\ColumnType;
+
+/**
+ * Diagnosis Schema Class
+ * 
+ * This class defines the schema for the `diagnosis` table.
+ * 
+ * PHP Version 7.2
+ * 
+ * @category   Data
+ * @package    Loris
+ * @subpackage Biobank
+ * @license    http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
+ * @link       https://www.github.com/aces/Loris/
+ */
+class DiagnosisSchema extends Schema
+{
+    public static function model(): string                                          
+    {                                                                              
+        return \LORIS\biobank\models\Diagnosis::class;                              
+    }  
+
+    public static function table(): Table                                           
+    {                                                                              
+        return new Table(name: 'diagnosis');                                    
+    }      
+
+    public static function id(): string                                                
+    {                                                                              
+        return 'DiagnosisID';                                                  
+    }                                                                              
+                                                                                   
+    public static function label(): string                                          
+    {                                                                              
+        return 'label';                                                            
+    }                                                                              
+                                                                                   
+    public static function columns(): array                                         
+    {                                                                              
+        return [                                                                   
+            'label' => new Column(                                                 
+                name: 'Name',                                                     
+                table: self::table()
+            ),                                                                     
+            'abbreviation' => new Column(
+                name: 'Abbreviation',
+                table: self::table()
+            ),
+        ];                                                                         
+    }                                                                              
+                                                                                   
+    public static function joins(): array                                           
+    {                                                                              
+        return [];                                                                 
+    }                                                                              
+                                                                                   
+    public static function relations(): array                                       
+    {                                                                              
+        return [];                                                                 
+    }       
+}
diff --git a/php/data/schemas/examinerschema.class.inc b/php/data/schemas/examinerschema.class.inc
new file mode 100644
index 00000000..989fca5b
--- /dev/null
+++ b/php/data/schemas/examinerschema.class.inc
@@ -0,0 +1,64 @@
+<?php declare(strict_types=1);
+
+namespace LORIS\biobank\data\schemas;
+
+use \LORIS\biobank\data\Schema;
+use \LORIS\biobank\data\schema\Table;
+use \LORIS\biobank\data\schema\Column;
+use \LORIS\biobank\data\schema\ColumnType;
+
+/**
+ * Examiner Schema Class
+ * 
+ * This class defines the schema for the `examiners` table.
+ * 
+ * PHP Version 7.2
+ * 
+ * @category   Data
+ * @package    Loris
+ * @subpackage Biobank
+ * @license    http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
+ * @link       https://www.github.com/aces/Loris/
+ */
+class ExaminerSchema extends Schema
+{
+    protected function model(): string                                          
+    {                                                                              
+        return \LORIS\biobank\models\Examiner::class;                              
+    }  
+
+    protected function table(): Table
+    {
+        return new Table(name: 'examiners');
+    }
+
+    protected function id(): string
+    {
+        return 'examinerID';
+    }
+
+    protected function label(): string
+    {
+        return 'label';
+    }
+
+    protected function columns(): array
+    {
+        return [
+            'label' => new Column(
+                name: 'full_name',
+                table: self::table(),
+            ),
+        ];
+    }
+
+    protected function joins(): array
+    {
+        return [];
+    }
+
+    protected function relations(): array
+    {
+        return [];
+    }
+}
diff --git a/php/data/schemas/poolschema.class.inc b/php/data/schemas/poolschema.class.inc
new file mode 100644
index 00000000..66a44273
--- /dev/null
+++ b/php/data/schemas/poolschema.class.inc
@@ -0,0 +1,112 @@
+<?php declare(strict_types=1);
+
+namespace LORIS\biobank\data\schemas;
+
+use \LORIS\biobank\data\Schema;
+use \LORIS\biobank\data\schema\Table;
+use \LORIS\biobank\data\schema\Column;
+use \LORIS\biobank\data\schema\ColumnType;
+use \LORIS\biobank\data\schema\TableKey;
+use \LORIS\biobank\data\schema\Join;
+use \LORIS\biobank\data\schema\Relation;
+use \LORIS\biobank\data\schema\RelationType;
+use \LORIS\biobank\data\schema\LoadingStrategy;
+
+/**
+ * Pool Data Access Object (DAO) Class
+ * This class contains all database handling that is needed to
+ * permanently store and retrieve Pool Object instances
+ *
+ * PHP Version 7.2
+ *
+ * @category   DAO
+ * @package    Loris
+ * @subpackage Biobank
+ * @author     Henri Rabalais <henri.rabalais@mcin.ca>
+ * @license    http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
+ * @link       https://www.github.com/aces/Loris/
+ */
+
+class PoolSchema extends Schema
+{
+    public static function model(): string                                          
+    {                                                                              
+        return \LORIS\biobank\models\Pool::class;                              
+    }  
+
+    public static function table(): Table
+    {
+        return new Table(name: 'biobank_pool');
+    }
+
+    public static function id(): string
+    {
+        return 'PoolID';
+    }
+
+    public static function label(): string                                      
+    {                                                                              
+        return 'label';                                                          
+    }   
+
+    public static function columns(): array
+    {
+        return [
+            'label' => new Column(
+                name: 'Label', 
+                table: self::table()
+            ),
+            'quantity' => new Column(
+                name: 'Quantity', 
+                table: self::table()
+            ),
+            'date' => new Column(
+                name: 'Date', 
+                table: self::table()
+            ),
+            'time' => new Column(
+                name: 'Time', 
+                table: self::table()
+            ),
+        ];
+    }
+
+    public static function joins(): array
+    {
+        return [
+            'specimen_rel' => new Join(
+                from: new TableKey(
+                    table: self::table(),
+                    key: self::id(),
+                ),
+                to: new TableKey(
+                    table: new Table(
+                        name: 'biobank_specimen_pool_rel', 
+                    ),
+                    key: self::id()
+                )
+            )
+        ];
+    }
+
+    public static function relations(): array
+    {
+        return [
+            'unit' => new Relation(
+                from: new TableKey(
+                    table: self::table(),
+                    key: 'UnitID'
+                ),
+                to: UnitSchema::class,
+            ),
+            'specimens' => new Relation(
+                from: new TableKey(
+                    table: self::joins()['specimen_rel']->to->table,
+                    key: 'SpecimenID'
+                ),
+                to: SpecimenSchema::class,
+                many: true
+            ),
+        ];
+    }
+}
diff --git a/php/data/schemas/projectschema.class.inc b/php/data/schemas/projectschema.class.inc
new file mode 100644
index 00000000..26da1373
--- /dev/null
+++ b/php/data/schemas/projectschema.class.inc
@@ -0,0 +1,64 @@
+<?php declare(strict_types=1);
+
+namespace LORIS\biobank\data\schemas;
+
+use \LORIS\biobank\data\Schema;
+use \LORIS\biobank\data\schema\Table;
+use \LORIS\biobank\data\schema\Column;
+use \LORIS\biobank\data\schema\ColumnType;
+
+/**
+ * Project Schema Class
+ * 
+ * This class defines the schema for the `projects` table.
+ * 
+ * PHP Version 7.2
+ * 
+ * @category   Data
+ * @package    Loris
+ * @subpackage Biobank
+ * @license    http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
+ * @link       https://www.github.com/aces/Loris/
+ */
+class ProjectSchema extends Schema
+{
+    public static function model(): string                                          
+    {                                                                              
+        return \LORIS\biobank\models\Project::class;                              
+    }  
+
+    public static function table(): Table
+    {
+        return new Table(name: 'Project');
+    }
+
+    public static function id(): string
+    {
+        return 'ProjectID';
+    }
+
+    public static function label(): string
+    {
+        return 'label';
+    }
+
+    public static function columns(): array
+    {
+        return [
+            'label' => new Column(
+                name: 'Alias',
+                table: self::table()
+            ),
+        ];
+    }
+
+    public static function joins(): array
+    {
+        return [];
+    }
+
+    public static function relations(): array
+    {
+        return [];
+    }
+}
diff --git a/php/data/schemas/sessionschema.class.inc b/php/data/schemas/sessionschema.class.inc
new file mode 100644
index 00000000..c36e2dd8
--- /dev/null
+++ b/php/data/schemas/sessionschema.class.inc
@@ -0,0 +1,85 @@
+<?php declare(strict_types=1);
+
+namespace LORIS\biobank\data\schemas;
+
+use \LORIS\biobank\data\schemas;
+use \LORIS\biobank\data\schema\Table;
+use \LORIS\biobank\data\schema\TableKey;
+use \LORIS\biobank\data\schema\Column;
+use \LORIS\biobank\data\schema\ColumnType;
+use \LORIS\biobank\data\schema\Relation;
+use \LORIS\biobank\data\schema\RelationType;
+use \LORIS\biobank\data\schema\LoadingStrategy;
+use \LORIS\biobank\data\Schema;
+
+/**
+ * Session Schema Class
+ * 
+ * This class defines the schema for the `session` table.
+ * 
+ * PHP Version 7.2
+ * 
+ * @category   Data
+ * @package    Loris
+ * @subpackage Biobank
+ * @license    http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
+ * @link       https://www.github.com/aces/Loris/
+ */
+final class SessionSchema extends Schema
+{
+    public static function model(): string                                          
+    {                                                                              
+        return \LORIS\biobank\models\Session::class;                              
+    }  
+
+    public static function table(): Table                                       
+    {                                                                              
+        return new Table(name: 'session');
+    }                                                                              
+                                                                                   
+    public static function id(): string                                            
+    {                                                                              
+        return 'ID';                                                  
+    }                                                                              
+                                                                                   
+    public static function label(): string                                      
+    {                                                                              
+        return 'label';                                                            
+    }                                                                              
+                                                                                   
+    public static function columns(): array                                     
+    {                                                                              
+        return [                                                                   
+            'label' => new Column(
+                name: 'Visit_label',
+                table: self::table()
+            ),
+        ];                                                                         
+    }                                                                              
+                                                                                   
+    public static function joins(): array                                       
+    {                                                                              
+        return [];                                                                 
+    }                                                                              
+                                                                                   
+    public static function relations(): array                                   
+    {                                                                              
+        return [
+            'candidate' => new Relation(
+                from: new TableKey(
+                    table: self::table(),
+                    key: 'CandID'
+                ),
+                to: schemas\CandidateSchema::class,
+                many: true,
+            ),
+            'center' => new schema\Relation(
+                from: new schema\TableKey(
+                    table: self::table(),
+                    key: 'CenterID'
+                ),
+                to: schemas\CenterSchema::class,
+            ),
+        ];
+    }                                                                              
+}    
diff --git a/php/data/schemas/shipment/logschema.class.inc b/php/data/schemas/shipment/logschema.class.inc
new file mode 100644
index 00000000..5f422099
--- /dev/null
+++ b/php/data/schemas/shipment/logschema.class.inc
@@ -0,0 +1,98 @@
+<?php declare(strict_types=1);
+
+namespace LORIS\biobank\data\schemas\shipment;
+
+use \LORIS\biobank\data\schemas;
+use \LORIS\biobank\data\schema\Table;
+use \LORIS\biobank\data\schema\TableKey;
+use \LORIS\biobank\data\schema\Column;
+use \LORIS\biobank\data\schema\ColumnType;
+use \LORIS\biobank\data\schema\Relation;
+use \LORIS\biobank\data\schema\RelationType;
+use \LORIS\biobank\data\schema\Join;
+use \LORIS\biobank\data\schema\LoadingStrategy;
+use \LORIS\biobank\data\Schema;
+
+/**
+ * Log Schema Class
+ * 
+ * This class defines the schema for the `shipment_log` table.
+ * 
+ * PHP Version 7.2
+ * 
+ * @category   Data
+ * @package    Loris
+ * @subpackage Biobank
+ * @license    http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
+ * @link       https://www.github.com/aces/Loris/
+ */
+class LogSchema extends Schema
+{
+    public static function model(): string                                          
+    {                                                                              
+        return \LORIS\biobank\models\shipment\Log::class;                                 
+    }  
+
+    public static function table(): Table {
+        return new Table(name: 'shipment_log');
+    }
+
+    public static function id(): string {
+        return 'ShipmentID';
+    }
+
+    public static function label(): string {
+        return '';
+    }
+
+    public static function columns(): array {
+        return [
+            'temperature' => new Column(
+                name: 'Temperature',
+                table: self::table()
+            ),
+            'date' => new Column(
+                name: 'Date',
+                table: self::table()
+            ),
+            'time' => new Column(
+                name: 'Time',
+                table: self::table()
+            ),
+            'comments' => new Column(
+                name: 'Comments',
+                table: self::table()
+            ),
+        ];
+    }
+
+    public static function relations(): array {
+        return [
+            'center' => new Relation(
+                from: new TableKey(
+                    table: self::table(),
+                    key: 'CenterID'
+                ),
+                to: schemas\CenterSchema::class,
+            ),
+            'status' => new Relation(
+                from: new TableKey(
+                    table: self::table(),
+                    key: 'StatusID'
+                ),
+                to: StatusSchema::class,
+            ),
+            'user' => new Relation(
+                from: new TableKey(
+                    table: self::table(),
+                    key: 'UserID'
+                ),
+                to: schemas\UserSchema::class,
+            ),
+        ];
+    }
+
+    public static function joins(): array {
+        return []; // Add join definitions if needed
+    }
+}
diff --git a/php/data/schemas/shipment/statusschema.class.inc b/php/data/schemas/shipment/statusschema.class.inc
new file mode 100644
index 00000000..03cd51f5
--- /dev/null
+++ b/php/data/schemas/shipment/statusschema.class.inc
@@ -0,0 +1,59 @@
+<?php declare(strict_types=1);
+
+namespace LORIS\biobank\data\schemas\shipment;
+
+use \LORIS\biobank\data\schema\Table;
+use \LORIS\biobank\data\schema\Column;
+use \LORIS\biobank\data\schema\ColumnType;
+use \LORIS\biobank\data\Schema;
+
+/**
+ * Shipment Status Schema Class
+ *
+ * This class defines the schema for the `shipment_status` table.
+ *
+ * PHP Version 7.2
+ *
+ * @category   Data
+ * @package    Loris
+ * @subpackage Biobank
+ * @license    http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
+ * @link       https://www.github.com/aces/Loris/
+ */
+
+class StatusSchema extends Schema
+{
+    public static function model(): string                                          
+    {                                                                              
+        return \LORIS\biobank\models\shipment\Status::class;                            
+    }   
+    
+    public static function table(): Table {
+        return new Table(name: 'shipment_status');
+    }
+
+    public static function id(): string {
+        return 'StatusID';
+    }
+
+    public static function label(): string {
+        return 'label';
+    }
+
+    public static function columns(): array {
+        return [
+            'label' => new Column(
+                name: 'Label',
+                table: self::table()
+            )
+        ];
+    }
+
+    public static function relations(): array {
+        return [];
+    }
+
+    public static function joins(): array {
+        return [];
+    }
+}
diff --git a/php/data/schemas/shipment/typeschema.class.inc b/php/data/schemas/shipment/typeschema.class.inc
new file mode 100644
index 00000000..36733395
--- /dev/null
+++ b/php/data/schemas/shipment/typeschema.class.inc
@@ -0,0 +1,59 @@
+<?php declare(strict_types=1);                                                     
+                                                                                   
+namespace LORIS\biobank\data\schemas\shipment;                                     
+                                                                                   
+use \LORIS\biobank\data\schema\Table;                                               
+use \LORIS\biobank\data\schema\Column;                                              
+use \LORIS\biobank\data\schema\ColumnType;                                          
+use \LORIS\biobank\data\Schema;                                             
+                                                                                   
+/**                                                                                
+ * Shipment Type Schema Class                                                    
+ *                                                                                 
+ * This class defines the schema for the `shipment_type` table.                  
+ *                                                                                 
+ * PHP Version 7.2                                                                 
+ *                                                                                 
+ * @category   Data                                                                
+ * @package    Loris                                                               
+ * @subpackage Biobank                                                             
+ * @license    http://www.gnu.org/licenses/gpl-3.0.txt GPLv3                       
+ * @link       https://www.github.com/aces/Loris/                                  
+ */                                                                                
+                                                                                   
+final class TypeSchema extends Schema                                          
+{                                                                                  
+    public static function model(): string                                          
+    {                                                                              
+        return \LORIS\biobank\models\shipment\Type::class;                            
+    }   
+
+    public static function table(): Table {                                            
+        return new Table(name: 'shipment_type');                                 
+    }                                                                              
+                                                                                   
+    public static function id(): string {                                                 
+        return 'ShipmentTypeID';                                          
+    }                                                                              
+                                                                                   
+    public static function label(): string {                                           
+        return 'label';                                                            
+    }                                                                              
+                                                                                   
+    public static function columns(): array {                                          
+        return [                                                                   
+            'label' => new Column(                                                 
+                name: 'Label',                                                     
+                table: self::table()
+            )                                                                      
+        ];                                                                         
+    }                                                                              
+                                                                                   
+    public static function relations(): array {                                        
+        return [];                                                                 
+    }                                                                              
+                                                                                   
+    public static function joins(): array {                                            
+        return [];                                                                 
+    }                                                                              
+}      
diff --git a/php/data/schemas/shipmentschema.class.inc b/php/data/schemas/shipmentschema.class.inc
new file mode 100644
index 00000000..3595f663
--- /dev/null
+++ b/php/data/schemas/shipmentschema.class.inc
@@ -0,0 +1,122 @@
+<?php declare(strict_types=1);
+
+/**
+ * Shipment Data Access Object (DAO) Class
+ * This class contains all database handling that is needed to
+ * permanently store and retrieve Shipment Object instances
+ *
+ * PHP Version 7.2
+ *
+ * @category   DAO
+ * @package    Loris
+ * @subpackage Biobank
+ * @author     Henri Rabalais <henri.rabalais@mcin.ca>
+ * @license    http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
+ * @link       https://www.github.com/aces/Loris/
+ */
+namespace LORIS\biobank\data\schemas;
+
+use \LORIS\biobank\data\schema\Table;
+use \LORIS\biobank\data\schema\TableKey;
+use \LORIS\biobank\data\schema\Column;
+use \LORIS\biobank\data\schema\ColumnType;
+use \LORIS\biobank\data\schema\Join;
+use \LORIS\biobank\data\schema\Relation;
+use \LORIS\biobank\data\schema\RelationType;
+use \LORIS\biobank\data\schema\LoadingStrategy;
+use \LORIS\biobank\data\schemas\shipment;
+use \LORIS\biobank\data\Schema;
+
+/**
+ * Shipment Data Access Object (DAO) Class
+ * This class contains all database handling that is needed to
+ * permanently store and retrieve Shipment Object instances
+ *
+ * PHP Version 7.2
+ *
+ * @category   DAO
+ * @package    Loris
+ * @subpackage Biobank
+ * @author     Henri Rabalais <henri.rabalais@mcin.ca>
+ * @license    http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
+ * @link       https://www.github.com/aces/Loris/
+ */
+
+class ShipmentSchema extends Schema
+{
+    public static function model(): string                                          
+    {                                                                              
+        return \LORIS\biobank\models\Shipment::class;                              
+    }  
+
+    public static function table(): Table {
+        return new Table(name: 'shipment');
+    }
+
+    public static function id(): string {
+        return 'ShipmentID';
+    }
+
+    public static function label(): string {
+        return 'barcode';
+    }
+
+    public static function columns(): array {
+        return [
+            'barcode' => new Column(
+                name: 'Barcode',
+                table: self::table()
+            ),
+        ];
+    }
+
+    public static function joins(): array {
+        return [
+            'shipment_containers' => new Join(
+                from: new TableKey(
+                    table: self::table(),
+                    key: self::id()
+                ),
+                to: new TableKey(
+                    table: new Table(name: 'biobank_container_shipment_rel'),
+                    key: self::id()
+                )
+            ),
+        ];
+    }
+
+    public static function relations(): array {
+        return [
+            'type' => new Relation(
+                from: new TableKey(
+                    table: self::table(),
+                    key: 'ShipmentTypeID'
+                ),
+                to: shipment\TypeSchema::class,
+            ),
+            'destinationCenter' => new Relation(
+                from: new TableKey(
+                    table: self::table(),
+                    key: 'DestinationCenterID'
+                ),
+                to: CenterSchema::class,
+            ),
+            'logs' => new Relation(
+                from: new TableKey(
+                    table: self::table(),
+                    key: self::id()
+                ),
+                to: shipment\LogSchema::class,
+                many: true,
+            ),
+            'containers' => new Relation(
+                from: new TableKey(
+                    table: self::joins()['shipment_containers']->to->table,
+                    key: 'ContainerID'
+                ),
+                to: ContainerSchema::class,
+                many: true,
+            ),
+        ];
+    }
+}
diff --git a/php/data/schemas/specimen/attribute/datatypeschema.class.inc b/php/data/schemas/specimen/attribute/datatypeschema.class.inc
new file mode 100644
index 00000000..d9d2e574
--- /dev/null
+++ b/php/data/schemas/specimen/attribute/datatypeschema.class.inc
@@ -0,0 +1,51 @@
+<?php
+
+namespace LORIS\biobank\data\schemas\specimen\attribute;
+
+use \LORIS\biobank\data\Schema;
+use \LORIS\biobank\data\schema\Table;
+use \LORIS\biobank\data\schema\Column;
+use \LORIS\biobank\data\schema\ColumnType;
+
+final class DatatypeSchema extends Schema
+{
+    protected function model(): string                                          
+    {                                                                              
+        return \LORIS\biobank\models\specimen\attribute\DataType::class;                            
+    }   
+
+    protected function table(): Table
+    {
+        return new Table(name: 'biobank_specimen_attribute_datatype');
+    }
+
+    protected function id(): string
+    {
+        return 'DatatypeID';
+    }
+
+    protected function label(): string
+    {
+        return 'label';
+    }
+
+    protected function columns(): array
+    {
+        return [
+            'label' => new Column(
+                name: 'Datatype',
+                table: self::table()
+            ),
+        ];
+    }
+
+    protected function joins(): array
+    {
+        return [];
+    }
+
+    protected function relations(): array
+    {
+        return [];
+    }
+}
diff --git a/php/data/schemas/specimen/attributeschema.class.inc b/php/data/schemas/specimen/attributeschema.class.inc
new file mode 100644
index 00000000..0cecfb08
--- /dev/null
+++ b/php/data/schemas/specimen/attributeschema.class.inc
@@ -0,0 +1,60 @@
+<?php
+
+namespace LORIS\biobank\data\schemas\specimen;
+
+use \LORIS\biobank\data\Schema;
+use \LORIS\biobank\data\schema\Table;
+use \LORIS\biobank\data\schema\Column;
+use \LORIS\biobank\data\schema\ColumnType;
+use \LORIS\biobank\data\schema\LoadingStrategy;
+
+final class AttributeSchema extends Schema
+{
+    protected function model(): string                                          
+    {                                                                              
+        return \LORIS\biobank\models\specimen\Attribute::class;                            
+    }   
+
+    protected function table(): Table
+    {
+        return new Table(name: 'biobank_specimen_attribute');
+    }
+
+    protected function id(): string
+    {
+        return 'SpecimenAttributeID';
+    }
+
+    protected function label(): string
+    {
+        return 'label';
+    }
+
+    protected function columns(): array
+    {
+        return [
+            'label' => new Column(
+                name: 'Label',
+                table: self::table()
+            ),
+        ];
+    }
+
+    protected function joins(): array
+    {
+        return [];
+    }
+
+    protected function relations(): array
+    {
+        return [
+            'datatype' => new schema\Relation(
+                from: new schema\TableKey(
+                    table: self::table(),
+                    key: 'DatatypeID'
+                ),
+                to: attribute\DatatypeSchema::class,
+            )
+        ];
+    }
+}
diff --git a/php/data/schemas/specimen/process/analysisschema.class.inc b/php/data/schemas/specimen/process/analysisschema.class.inc
new file mode 100644
index 00000000..8895ba1b
--- /dev/null
+++ b/php/data/schemas/specimen/process/analysisschema.class.inc
@@ -0,0 +1,32 @@
+<?php
+
+namespace LORIS\biobank\data\schemas\specimen\process;
+
+use \LORIS\biobank\data\schema;
+use \LORIS\biobank\data\schemas\specimen\ProcessSchema;
+
+/**
+ * Specimen Analysis Schema Descriptor Class
+ * This class encapsulates the table definitions for specimen analysis 
+ * and provides a map to key values to be used within the business layer.
+ * 
+ * PHP Version 7.2
+ * 
+ * @category   Schema
+ * @package    Loris
+ * @subpackage Biobank
+ * @license    http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
+ * @link       https://www.github.com/aces/Loris/
+ */
+class AnalysisSchema extends ProcessSchema
+{
+    public static function model(): string                                          
+    {                                                                              
+        return \LORIS\biobank\models\specimen\process\Analysis::class;                            
+    }   
+
+    public static function table(): schema\Table
+    {
+        return new schema\Table(name: 'biobank_specimen_analysis');
+    }
+}
diff --git a/php/data/schemas/specimen/process/collectionschema.class.inc b/php/data/schemas/specimen/process/collectionschema.class.inc
new file mode 100644
index 00000000..fefd8958
--- /dev/null
+++ b/php/data/schemas/specimen/process/collectionschema.class.inc
@@ -0,0 +1,56 @@
+<?php
+
+namespace LORIS\biobank\data\schemas\specimen\process;
+
+use \LORIS\biobank\data\schema;
+use \LORIS\biobank\data\schemas;
+use \LORIS\biobank\data\schemas\specimen\ProcessSchema;
+
+/**
+ * Specimen Collection Schema Descriptor Class
+ * This class encapsulates the table definitions for specimen collection 
+ * and provides a map to key values to be used within the business layer.
+ * 
+ * PHP Version 7.2
+ * 
+ * @category   Schema
+ * @package    Loris
+ * @subpackage Biobank
+ * @license    http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
+ * @link       https://www.github.com/aces/Loris/
+ */
+class CollectionSchema extends ProcessSchema
+{
+    public static function model(): string                                          
+    {                                                                              
+        return \LORIS\biobank\models\specimen\process\Collection::class;                                
+    }   
+    
+    public static function table(): schema\Table
+    {
+        return new schema\Table(name: 'biobank_specimen_collection');
+    }
+
+    public static function columns(): array
+    {
+        return parent::columns() + [
+            'quantity' => new schema\Column(
+                name: 'Quantity', 
+                table: self::table()
+            )
+        ];
+    }
+
+    public static function relations(): array
+    {
+        return parent::relations() + [
+            'unit' => new schema\Relation(
+                from: new schema\TableKey(
+                    table: self::table(),
+                    key: 'UnitID'
+                ),
+                to: schemas\UnitSchema::class,
+            )
+        ];
+    }
+}
diff --git a/php/data/schemas/specimen/process/preparationschema.class.inc b/php/data/schemas/specimen/process/preparationschema.class.inc
new file mode 100644
index 00000000..9f8f21d4
--- /dev/null
+++ b/php/data/schemas/specimen/process/preparationschema.class.inc
@@ -0,0 +1,32 @@
+<?php
+
+namespace LORIS\biobank\data\schemas\specimen\process;
+
+use \LORIS\biobank\data\schema;
+use \LORIS\biobank\data\schemas\specimen\ProcessSchema;
+
+/**
+ * Specimen Preparation Schema Descriptor Class
+ * This class encapsulates the table definitions for specimen preparation 
+ * and provides a map to key values to be used within the business layer.
+ * 
+ * PHP Version 7.2
+ * 
+ * @category   Schema
+ * @package    Loris
+ * @subpackage Biobank
+ * @license    http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
+ * @link       https://www.github.com/aces/Loris/
+ */
+class PreparationSchema extends ProcessSchema
+{
+    public static function model(): string                                          
+    {                                                                              
+        return \LORIS\biobank\models\specimen\process\Preparation::class;                                
+    }   
+
+    public static function table(): schema\Table
+    {
+        return new schema\Table(name: 'biobank_specimen_preparation');
+    }
+}
diff --git a/php/data/schemas/specimen/process/typeschema.class.inc b/php/data/schemas/specimen/process/typeschema.class.inc
new file mode 100644
index 00000000..540ca4ac
--- /dev/null
+++ b/php/data/schemas/specimen/process/typeschema.class.inc
@@ -0,0 +1,64 @@
+<?php
+
+namespace LORIS\biobank\data\schemas\specimen\process;
+
+use \LORIS\biobank\data\Schema;
+use \LORIS\biobank\data\schema\Table;
+use \LORIS\biobank\data\schema\Column;
+use \LORIS\biobank\data\schema\ColumnType;
+
+/**
+ * Specimen Process Type Schema Descriptor Class
+ * This class encapsulates the table definitions and provides
+ * a map to key values to be used within the business layer.
+ *
+ * PHP Version 7.2
+ *
+ * @category   Schema
+ * @package    Loris
+ * @subpackage Biobank
+ * @license    http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
+ * @link       https://www.github.com/aces/Loris/
+ */
+final class TypeSchema extends Schema
+{
+    protected function model(): string                                          
+    {                                                                              
+        return \LORIS\biobank\models\specimen\process\Type::class;                                
+    }   
+
+    protected function table(): Table
+    {
+        return new Table(name: 'biobank_specimen_process');
+    }
+
+    protected function id(): string
+    {
+        return 'SpecimenProcessID';
+    }
+
+    protected function label(): string
+    {
+        return 'label';
+    }
+
+    protected function columns(): array
+    {
+        return [
+            'label' => new Column(
+                name: 'Label',
+                table: self::table()
+            ),
+        ];
+    }
+
+    protected function joins(): array
+    {
+        return [];
+    }
+
+    protected function relations(): array
+    {
+        return [];
+    }
+}
diff --git a/php/data/schemas/specimen/processschema.class.inc b/php/data/schemas/specimen/processschema.class.inc
new file mode 100644
index 00000000..a5aef016
--- /dev/null
+++ b/php/data/schemas/specimen/processschema.class.inc
@@ -0,0 +1,84 @@
+<?php
+
+namespace LORIS\biobank\data\schemas\specimen;
+
+use \LORIS\biobank\data\Schema;
+use \LORIS\biobank\data\schemas;
+use \LORIS\biobank\data\schema\Table;
+use \LORIS\biobank\data\schema\TableKey;
+use \LORIS\biobank\data\schema\Column;
+use \LORIS\biobank\data\schema\ColumnType;
+use \LORIS\biobank\data\schema\Relation;
+use \LORIS\biobank\data\schema\RelationType;
+
+abstract class ProcessSchema extends Schema
+{
+    public static function model(): string                                          
+    {                                                                              
+        return \LORIS\biobank\models\specimen\Process::class;                            
+    }   
+
+    public static function id(): string                                            
+    {                                                                              
+        return 'SpecimenID';                                          
+    }              
+
+    public static function label(): string                                      
+    {                                                                              
+        return '';                                                            
+    }            
+
+    public static function columns(): array                                     
+    {    
+        return [
+            'date' => new Column(
+                name: 'Date',
+                table: static::table()
+            ),
+            'time' => new Column(
+                name: 'Time',
+                table: static::table()
+            ),
+            'comments' => new Column(
+                name: 'Comments',
+                table: static::table()
+            ),
+            'data' => new Column(
+                name: 'Data',
+                table: static::table()
+            )
+        ];
+    }
+
+    public static function joins(): array                                     
+    {    
+        return [];
+    }
+
+    public static function relations(): array
+    {
+        return [
+            'protocol' => new Relation(
+                from: new TableKey(
+                    table: static::table(),
+                    key: 'SpecimenProtocolID'
+                ),
+                to: ProtocolSchema::class,
+            ),
+            'center' => new Relation(
+                from: new TableKey(
+                    table: static::table(),
+                    key: 'CenterID'
+                ),
+                to: schemas\CenterSchema::class,
+            ),
+            'examiner' => new Relation(
+                from: new TableKey(
+                    table: static::table(),
+                    key: 'ExaminerID'
+                ),
+                to: schemas\ExaminerSchema::class,
+            )
+        ];
+    }
+}
diff --git a/php/data/schemas/specimen/protocolschema.class.inc b/php/data/schemas/specimen/protocolschema.class.inc
new file mode 100644
index 00000000..430b438d
--- /dev/null
+++ b/php/data/schemas/specimen/protocolschema.class.inc
@@ -0,0 +1,92 @@
+<?php                                                                           
+                                                                                
+namespace LORIS\biobank\data\schemas\specimen;                                  
+                                                                                
+use \LORIS\biobank\data\Schema;                                                 
+use \LORIS\biobank\data\schema\Table;                                           
+use \LORIS\biobank\data\schema\TableKey;                                        
+use \LORIS\biobank\data\schema\Column;                                          
+use \LORIS\biobank\data\schema\ColumnType;                                      
+use \LORIS\biobank\data\schema\Join;                                            
+use \LORIS\biobank\data\schema\Relation;                                        
+use \LORIS\biobank\data\schema\RelationType;                                    
+                                                                                
+final class ProtocolSchema extends Schema                                       
+{                                                                               
+    public static function model(): string                                          
+    {                                                                           
+        return \LORIS\biobank\models\specimen\Protocol::class;                  
+    }                                                                           
+                                                                                
+    public static function table(): Table                                           
+    {                                                                           
+        return new Table(name: 'biobank_specimen_protocol');                    
+    }                                                                           
+                                                                                
+    public static function id(): string                                             
+    {                                                                           
+        return 'SpecimenProtocolID';                                            
+    }                                                                           
+                                                                                
+    public static function label(): string                                          
+    {                                                                           
+        return 'label';                                                         
+    }                                                                           
+                                                                                
+    public static function columns(): array                                         
+    {                                                                           
+        return [                                                                
+            'label' => new Column(                                              
+                name: 'Label',                                                  
+                table: self::table()                                            
+            ),                                                                  
+        ];                                                                      
+    }                                                                           
+                                                                                
+    public static function joins(): array                                           
+    {                                                                           
+        return [                                                                
+            'attribute_rel' => new Join(                                        
+                from: new TableKey(                                             
+                    table: self::table(),                                       
+                    key: self::id()                                             
+                ),                                                              
+                to: new TableKey(                                               
+                    table: new Table(                                           
+                        name: 'biobank_specimen_protocol_attribute_rel',        
+                        alias: 'attribute_rel',                                 
+                    ),                                                          
+                    key: self::id()                                             
+                )                                                               
+            )                                                                   
+        ];                                                                      
+    }                                                                           
+                                                                                
+    public static function relations(): array                                       
+    {                                                                           
+        return [                                                                
+            'attributes' => new Relation(                                       
+                from: new TableKey(                                             
+                    table: self::joins()['attribute_rel']->to->table,           
+                    key: 'SpecimenAttributeID'                                  
+                ),                                                              
+                to: AttributeSchema::class,                                     
+                many: true,                                                     
+            ),                                                                  
+            'type' => new Relation(                                             
+                from: new TableKey(                                             
+                    table: self::table(),                                       
+                    key: 'SpecimenTypeID'                                       
+                ),                                                              
+                to: TypeSchema::class,                                          
+            ),                                                                  
+            'process' => new Relation(                                          
+                from: new TableKey(                                             
+                    table: self::table(),                                       
+                    key: 'SpecimenProcessID'                                    
+                ),                                                              
+                to: process\TypeSchema::class,                                  
+            ),                                                                  
+        ];                                                                      
+    }                                                                           
+}
diff --git a/php/data/schemas/specimen/typeschema.class.inc b/php/data/schemas/specimen/typeschema.class.inc
new file mode 100644
index 00000000..d34a2f65
--- /dev/null
+++ b/php/data/schemas/specimen/typeschema.class.inc
@@ -0,0 +1,130 @@
+<?php
+
+namespace LORIS\biobank\data\schemas\specimen;
+
+use \LORIS\biobank\data\Schema;
+use \LORIS\biobank\data\schemas;
+use \LORIS\biobank\data\schema\Table;
+use \LORIS\biobank\data\schema\TableKey;
+use \LORIS\biobank\data\schema\Column;
+use \LORIS\biobank\data\schema\ColumnType;
+use \LORIS\biobank\data\schema\Join;
+use \LORIS\biobank\data\schema\Relation;
+use \LORIS\biobank\data\schema\RelationType;
+
+class TypeSchema extends Schema
+{
+    public static function model(): string                                          
+    {                                                                              
+        return \LORIS\biobank\models\specimen\Type::class;                            
+    }   
+
+    public static function table(): Table
+    {
+        return new Table(name: 'biobank_specimen_type');
+    }
+
+    public static function id(): string
+    {
+        return 'SpecimenTypeID';
+    }
+
+    public static function label(): string
+    {
+        return 'label';
+    }
+
+    public static function columns(): array
+    {
+        return [
+            'label' => new Column(
+                name: 'Label',
+                table: self::table()
+            ),
+            'freezeThaw' => new Column(
+                name: 'FreezeThaw',
+                table: self::table()
+            ),
+        ];
+    }
+
+    public static function joins(): array                                       
+    {               
+        return [
+            'type_unit' => new Join(
+                from: new TableKey(
+                    table: self::table(),
+                    key: self::id(),
+                ),
+                to: new TableKey(
+                    table: new Table(
+                        name: 'biobank_specimen_type_unit_rel', 
+                    ),
+                    key: self::id()
+                )
+            ),
+            'type_container' => new Join(
+                from: new TableKey(
+                    table: self::table(),
+                    key: self::id(),
+                ),
+                to: new TableKey(
+                    table: new Table(
+                        name: 'biobank_specimen_type_container_type_rel', 
+                    ),
+                    key: self::id()
+                )
+            ),
+            'type_parent' => new Join(
+                from: new TableKey(
+                    table: self::table(),
+                    key: self::id(),
+                ),
+                to: new TableKey(
+                    table: new Table(
+                        name: 'biobank_specimen_type_parent', 
+                    ),
+                    key: self::id()
+                )
+            )
+        ];
+    }
+
+    public static function relations(): array                                   
+    { 
+        return [
+            'units' => new Relation(
+                from: new TableKey(
+                    table: self::joins()['type_unit']->to->table,
+                    key: 'UnitID'
+                ),
+                to: schemas\UnitSchema::class,
+                many: true,
+            ),
+            'containers' => new Relation(
+                from: new TableKey(
+                    table: self::joins()['type_container']->to->table,
+                    key: 'ContainerTypeID'
+                ),
+                to: schemas\container\TypeSchema::class,
+                many: true,
+            ),
+            'parents' => new Relation(
+                from: new TableKey(
+                    table: self::joins()['type_parent']->to->table,
+                    key: 'ParentSpecimenTypeID'
+                ),
+                to: self::class,
+                many: true,
+            ),
+            'protocols' => new Relation(
+                from: new TableKey(
+                    table: self::table(),
+                    key: self::id(),
+                ),
+                to: ProtocolSchema::class,
+                many: true,
+            ),
+        ];
+    }        
+}
diff --git a/php/data/schemas/specimenschema.class.inc b/php/data/schemas/specimenschema.class.inc
new file mode 100644
index 00000000..b45985fe
--- /dev/null
+++ b/php/data/schemas/specimenschema.class.inc
@@ -0,0 +1,267 @@
+<?php declare(strict_types=1);
+/**
+ * Specimen Data Access Object (DAO) Class
+ * This class contains all database handling that is needed to
+ * permanently store and retrieve Specimen Object instances
+ *
+ * PHP Version 7.2
+ *
+ * @category   DAO
+ * @package    Loris
+ * @subpackage Biobank
+ * @author     Henri Rabalais <henri.rabalais@mcin.ca>
+ * @license    http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
+ * @link       https://www.github.com/aces/Loris/
+ */
+namespace LORIS\biobank\data\schemas;
+
+use \LORIS\biobank\data\Schema;
+use \LORIS\biobank\data\schemas\specimen;
+use \LORIS\biobank\data\schema\Table;
+use \LORIS\biobank\data\schema\Column;
+use \LORIS\biobank\data\schema\ColumnType;
+use \LORIS\biobank\data\schema\TableKey;
+use \LORIS\biobank\data\schema\Relation;
+use \LORIS\biobank\data\schema\Join;
+use \LORIS\biobank\data\schema\LoadingStrategy;
+use \LORIS\biobank\data\schema\RelationType;
+
+/**
+ * Specimen Data Access Object (DAO) Class
+ * This class contains all database handling that is needed to
+ * permanently store and retrieve Specimen Object instances
+ *
+ * PHP Version 7.2
+ *
+ * @category   DAO
+ * @package    Loris
+ * @subpackage Biobank
+ * @author     Henri Rabalais <henri.rabalais@mcin.ca>
+ * @license    http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
+ * @link       https://www.github.com/aces/Loris/
+ */
+class SpecimenSchema extends Schema
+{
+    public static function model(): string                                          
+    {                                                                              
+        return \LORIS\biobank\models\Specimen::class;                                 
+    }  
+
+    public static function table(): Table
+    {
+        return new Table(name: 'biobank_specimen', alias: 'specimen');
+    }
+
+    public static function id(): string                                            
+    {                                                                              
+        return 'SpecimenID';                                                  
+    }        
+
+    public static function label(): string                                      
+    {                                                                              
+        return 'barcode';                                                            
+    }   
+
+    public static function columns(): array
+    {
+        return [
+            'id' => new Column(
+                name: 'SpecimenID',
+                table: self::table()
+            ),
+            'containerId' => new Column(
+                name: 'ContainerID',
+                table: self::table()
+            ),
+            'quantity' => new Column(
+                name: 'Quantity',
+                table: self::table()
+            ),
+            'freezethaw' => new Column(
+                name: 'FreezeThawCycle',
+                table: self::joins()['freezethaw_rel']->to->table,
+            ),
+            'sampleNumber' => new Column(
+                name: 'SampleNumber',
+                table: self::table()
+            ),
+        ];
+    }
+
+    public static function joins(): array
+    {
+        return [
+            'freezethaw_rel' => new Join(
+                from: new TableKey(
+                    table: self::table(),
+                    key: self::id(),
+                ),
+                to: new TableKey(
+                    table: new Table(
+                        name: 'biobank_specimen_freezethaw',
+                        alias: 'freezethaw_rel',
+                    ),
+                    key: self::id()
+                )
+            ),
+            'pool_rel' => new Join(
+                from: new TableKey(
+                    table: self::table(),
+                    key: self::id(),
+                ),
+                to: new TableKey(
+                    table: new Table(
+                        name: 'biobank_specimen_pool_rel',
+                        alias: 'pool_rel',
+                    ),
+                    key: self::id()
+                )
+            ),
+            'parents_rel' => new Join(
+                from: new TableKey(
+                    table: self::table(),
+                    key: self::id(),
+                ),
+                to: new TableKey(
+                    table: new Table(
+                        name: 'biobank_specimen_parent',
+                        alias: 'parents_rel',
+                    ),
+                    key: self::id()
+                )
+            ),
+            'children_rel' => new Join(
+                from: new TableKey(
+                    table: self::table(),
+                    key: self::id(),
+                ),
+                to: new TableKey(
+                    table: new Table(
+                        name: 'biobank_specimen_parent',
+                        alias: 'children_rel',
+                    ),
+                    key: 'ParentSpecimenID'
+                )
+            ),
+            'projects_rel' => new Join(
+                from: new TableKey(
+                    table: self::table(),
+                    key: self::id(),
+                ),
+                to: new TableKey(
+                    table: new Table(
+                        name: 'biobank_specimen_project_rel',
+                        alias: 'projects_rel',
+                    ),
+                    key: self::id(),
+                )
+            ),
+            'session_rel' => new Join(
+                from: new TableKey(
+                    table: self::table(),
+                    key: 'SessionID'
+                ),
+                to: new TableKey(
+                    table: new Table(
+                        name: 'session',
+                        alias: 'session_rel'
+                    ),
+                    key: 'ID'
+                )
+            ),
+        ];
+    }
+
+    public static function relations(): array                                   
+    {                                                                              
+        return [
+            'container' => new Relation(
+                from: new TableKey(
+                    table: self::table(),
+                    key: 'ContainerID'
+                ),
+                to: ContainerSchema::class,
+            ),
+            'type' => new Relation(
+                from: new TableKey(
+                    table: self::table(),
+                    key: 'SpecimenTypeID'
+                ),
+                to: specimen\TypeSchema::class,
+            ),
+            'unit' => new Relation(
+                from: new TableKey(
+                    table: self::table(),
+                    key: 'UnitID'
+                ),
+                to: UnitSchema::class,
+            ),
+            'collection' => new Relation(
+                from: new TableKey(
+                    table: self::table(),
+                    key: self::id()
+                ),
+                to: specimen\process\CollectionSchema::class,
+            ),
+            'preparation' => new Relation(
+                from: new TableKey(
+                    table: self::table(),
+                    key: self::id()
+                ),
+                to: specimen\process\PreparationSchema::class,
+            ),
+            'analysis' => new Relation(
+                from: new TableKey(
+                    table: self::table(),
+                    key: self::id()
+                ),
+                to: specimen\process\AnalysisSchema::class,
+            ),
+            'pool' => new Relation(
+                from: new TableKey(
+                    table: self::joins()['pool_rel']->to->table,
+                    key: 'PoolID'
+                ),
+                to: PoolSchema::class,
+            ),
+            'children' => new Relation(
+                from: new TableKey(
+                    table: self::joins()['children_rel']->to->table,
+                    key: self::id()
+                ),
+                to: self::class,
+                many: true
+            ),
+            'parents' => new Relation(
+                from: new TableKey(
+                    table: self::joins()['parents_rel']->to->table,
+                    key: 'ParentSpecimenID'
+                ),
+                to: self::class,
+                many:true,
+            ),
+            'session' => new Relation(
+                from: new TableKey(
+                    table: self::table(),
+                    key: 'SessionID'
+                ),
+                to: SessionSchema::class,
+            ),
+            'candidate' => new Relation(
+                from: new TableKey(
+                    table: self::joins()['session_rel']->to->table,
+                    key: 'CandID'
+                ),
+                to: CandidateSchema::class,
+            ),
+            'projects' => new Relation(
+                from: new TableKey(
+                    table: self::joins()['projects_rel']->to->table,
+                    key: 'ProjectID'
+                ),
+                to: ProjectSchema::class,
+                many: true
+            ),
+        ];
+    }
+}
diff --git a/php/data/schemas/unitschema.class.inc b/php/data/schemas/unitschema.class.inc
new file mode 100644
index 00000000..e6abe1d7
--- /dev/null
+++ b/php/data/schemas/unitschema.class.inc
@@ -0,0 +1,52 @@
+<?php declare(strict_types=1);
+
+namespace LORIS\biobank\data\schemas;
+
+use \LORIS\biobank\data\Schema;
+use \LORIS\biobank\data\schema\Table;
+use \LORIS\biobank\data\schema\Column;
+use \LORIS\biobank\data\schema\ColumnType;
+
+final class UnitSchema extends Schema
+{
+
+    public static function model(): string
+    {
+        return \LORIS\biobank\models\Unit::class;
+    }
+
+    public static function table(): Table
+    {
+        return new Table(name: 'biobank_unit');
+    }
+
+    public static function id(): string
+    {
+        return 'UnitID';
+    }
+
+    public static function label(): string
+    {
+        return 'label';
+    }
+
+    public static function columns(): array
+    {
+        return [
+            'label' => new Column(
+                name: 'Label',
+                table: self::table()
+            ),
+        ];
+    }
+
+    public static function joins(): array
+    {
+        return [];
+    }
+
+    public static function relations(): array                                
+    {                                                                           
+        return [];
+    }
+}
diff --git a/php/data/schemas/userschema.class.inc b/php/data/schemas/userschema.class.inc
new file mode 100644
index 00000000..dd3a52cb
--- /dev/null
+++ b/php/data/schemas/userschema.class.inc
@@ -0,0 +1,61 @@
+<?php declare(strict_types=1);                                                     
+                                                                                   
+namespace LORIS\biobank\data\schemas;                                     
+                                                                                   
+use \LORIS\biobank\data\schema\Table;                                               
+use \LORIS\biobank\data\schema\TableKey;                                            
+use \LORIS\biobank\data\schema\Column;                                              
+use \LORIS\biobank\data\schema\ColumnType;                                          
+use \LORIS\biobank\data\schema\Join;                                                
+use \LORIS\biobank\data\Schema;                                             
+                                                                                   
+/**                                                                                
+ * User Schema Class                                                    
+ *                                                                                 
+ * This class defines the schema for the `users' table.                  
+ *                                                                                 
+ * PHP Version 7.2                                                                 
+ *                                                                                 
+ * @category   Data                                                                
+ * @package    Loris                                                               
+ * @subpackage Biobank                                                             
+ * @license    http://www.gnu.org/licenses/gpl-3.0.txt GPLv3                       
+ * @link       https://www.github.com/aces/Loris/                                  
+ */                                                                                
+                                                                                   
+class UserSchema extends Schema                                          
+{                                                                                  
+    protected function model(): string                                          
+    {                                                                              
+        return \LORIS\biobank\models\User::class;                              
+    }  
+
+    protected function table(): Table {                                            
+        return new Table(name: 'users');                                 
+    }                                                                              
+                                                                                   
+    protected function id(): string {                                                 
+        return 'ID';                                          
+    }                                                                              
+                                                                                   
+    protected function label(): string {                                           
+        return 'name';                                                            
+    }                                                                              
+                                                                                   
+    protected function columns(): array {                                          
+        return [                                                                   
+            'name' => new Column(                                                 
+                name: 'Real_name',                                                     
+                table: self::table()
+            )                                                                      
+        ];                                                                         
+    }                                                                              
+                                                                                   
+    protected function relations(): array {                                        
+        return [];                                                                 
+    }                                                                              
+                                                                                   
+    protected function joins(): array {                                            
+        return [];                                                                 
+    }                                                                              
+}      
diff --git a/php/data/transactions.class.inc b/php/data/transactions.class.inc
new file mode 100644
index 00000000..845390cd
--- /dev/null
+++ b/php/data/transactions.class.inc
@@ -0,0 +1,51 @@
+<?php declare(strict_types=1);
+
+namespace LORIS\biobank\data;
+
+/**
+ * Trait Transactions
+ *
+ * Provides basic transaction management functionality, including
+ * begin, commit, and rollback operations. This trait depends on
+ * the `$db` property being an instance of a database handler
+ * supporting transactions.
+ *
+ * @package    LORIS
+ * @subpackage Biobank
+ */
+trait Transactions
+{
+    /**
+     * The database instance used for transaction management.
+     *
+     * @var \Database
+     */    
+    protected \Database $db;
+
+    /**
+     * Begins a database transaction.
+     *
+     * @return void
+     */    
+    public function begin() {
+        $this->db->beginTransaction();
+    }
+
+    /**
+     * Commits the current transaction.
+     *
+     * @return void
+     */    
+    public function commit() {
+        $this->db->commit();
+    }
+
+    /**
+     * Rolls back the current transaction.
+     *
+     * @return void
+     */    
+    public function rollback() {
+        $this->db->rollback();
+    }
+}
diff --git a/php/endpoint.class.inc b/php/endpoint.class.inc
new file mode 100644
index 00000000..c3bfc9e8
--- /dev/null
+++ b/php/endpoint.class.inc
@@ -0,0 +1,256 @@
+<?php declare(strict_types=1);
+
+namespace LORIS\biobank;
+
+use \Psr\Http\Server\RequestHandlerInterface;                                      
+use \Psr\Http\Message\ServerRequestInterface;
+use \Psr\Http\Message\ResponseInterface;
+use LORIS\Http\Endpoint as LORISEndpoint;
+use LORIS\biobank\data\query\QueryParamsHandler;
+use LORIS\biobank\endpoints\Permission;
+
+/**
+ * Abstract Endpoint class responsible for handling HTTP requests for
+ * Biobank-related operations.
+ *
+ * This class extends the LORIS Endpoint and implements the ETagCalculator
+ * interface. It manages permissions, handles sub-endpoints, and processes
+ * requests based on HTTP methods.
+ *
+ * @package    LORIS
+ * @subpackage Biobank
+ * @author     Henri Rabalais <henri.j.rabalais@gmail.com>
+ * @license    https://www.gnu.org/licenses/gpl-3.0.html GNU General Public
+ *             License
+ */
+abstract class Endpoint
+    extends LORISEndpoint
+    implements \LORIS\Middleware\ETagCalculator
+{
+    /**
+     * Cache for storing intermediate results during request processing.
+     *
+     * @var ResponseInterface|null
+     */    
+    private ? ResponseInterface $_cache = null;
+
+    /**
+     * Controller responsible for handling the business logic of the endpoint.
+     *
+     * @var Controller
+     */    
+    private Controller $controller;
+
+    /**
+     * Constructs the Endpoint class with a Loris instance.
+     *
+     * @param \Loris\LorisInstance $loris The Loris instance.
+     */    
+    public function __construct(\Loris\LorisInstance $loris)
+    {
+        parent::__construct($loris);
+        $this->controller = new Controller($this->getService());
+    }
+
+    /**
+     * Defines the permission required for accessing this endpoint.
+     *
+     * @param Permission $permission The permission object.
+     * @return string                 The name of the required permission.
+     */    
+    abstract protected static function getPermission(
+        Permission $permission
+    ): string;
+    
+    /**
+     * Returns a sub-handler for a given subpath, if any exists.
+     *
+     * @param string $subpath The subpath to check for a sub-handler.
+     * @return ?Endpoint       The sub-handler for the subpath, or null if none.
+     */    
+    abstract protected function getSubHandler(string $subpath): ?Endpoint;
+
+    /**
+     * Defines the allowed HTTP methods for this endpoint.
+     *
+     * @return array The array of allowed HTTP methods.
+     */    
+    protected function allowedMethods() : array
+    {
+        return ['GET', 'PUT', 'POST', 'OPTIONS'];
+    }
+
+    /**
+     * Checks if the user has the required permission to access this endpoint.
+     *
+     * @param \User       $user       The user attempting access.
+     * @param Permission  $permission The required permission for this endpoint.
+     * @throws Forbidden  If the user does not have the required permission.
+     */    
+    protected function checkPermission(
+        \User $user,
+        Permission $permission
+    ) : void
+    {                                                                              
+        if (!$user->hasPermission($this->getPermission($permission))) {
+            throw new Forbidden(
+                get_called_class() . ": {$permission->name()} Permission Denied"
+            );
+        }
+    }     
+
+    /**
+     * Processes incoming requests, routing to sub-handlers if applicable.
+     *
+     * @param ServerRequestInterface   $request The incoming request.
+     * @param RequestHandlerInterface  $handler The request handler.
+     * @return ResponseInterface                 The response to the request.
+     */    
+    public function process(
+        ServerRequestInterface $request,
+        RequestHandlerInterface $handler
+    ): ResponseInterface
+    {
+        $path = trim($request->getURI()->getPath(), "/");
+        $pathparts = explode('/', $path);
+
+        // Determine subendpoint handler based on the subpath
+        if (count($pathparts) > 1) {
+            $subpath = $pathparts[1];
+            $subhandler = $this->getSubHandler($pathparts[1]);
+
+            if ($subhandler !== null) {
+                // Remove the handled part of the path and pass the remainder
+                $remainingPath = implode('/', array_slice($pathparts, 1));
+
+                // Update the request URI path
+                $uri = $request->getUri()->withPath($remainingPath);
+                $request = $request->withUri($uri);
+
+                return $subhandler->process($request, $subhandler);
+            }
+        }
+
+        // Default processing for the main endpoint if no subendpoint matches
+        return parent::process($request, $handler);
+    }
+
+    /**
+     * Handles incoming requests for this endpoint.
+     *
+     * @param ServerRequestInterface $request The incoming PSR7 request.
+     * @return ResponseInterface              The outgoing PSR7 response.
+     */    
+    public function handle(
+        ServerRequestInterface $request
+    ) : ResponseInterface
+    {
+        return match ($request->getMethod()) {
+            'GET' => $this->_handleGET($request),
+            'POST' => $this->_handlePOST($request),
+            'PUT' => $this->_handlePUT($request),
+            'OPTIONS' => (new \LORIS\Http\Response())
+                ->withHeader('Allow', $this->allowedMethods()),
+            default => new \LORIS\Http\Response\JSON\MethodNotAllowed(
+                $this->allowedMethods()
+            ),
+        };
+    }
+
+    /**
+     * Handles GET requests for this endpoint.
+     *
+     * This method checks the user's permission and processes the request to
+     * either retrieve the root data or a specific resource based on the URI path.
+     *
+     * @param ServerRequestInterface $request The incoming PSR7 GET request.
+     * @return ResponseInterface              The response to the GET request.
+     */    
+    private function _handleGET(
+        ServerRequestInterface $request
+    ): ResponseInterface
+    {
+        $this->checkPermission($request->getAttribute('user'), Permission::GET);
+    
+        $path = trim($request->getURI()->getPath(), "/");
+        $pathparts = explode('/', $path);
+    
+        $queryParams = (new QueryParamsHandler(
+            $request->getQueryParams()))->parse();
+    
+        if (count($pathparts) === 1) {
+            return $this->controller->handleRootRequest(
+                $request, $queryParams, $this->_cache);
+        } else {
+            return $this->controller->handleResourceRequest(
+                $request, $pathparts[1]);
+        }
+    }
+
+    /**
+     * Handles PUT requests for this endpoint.
+     *
+     * This method checks the user's permission and processes the request to
+     * update a specific resource based on the URI path.
+     *
+     * @param ServerRequestInterface $request The incoming PSR7 PUT request.
+     * @return ResponseInterface              The response to the PUT request.
+     * @throws \LORIS\Http\Exception\NotFoundException If the path is invalid.
+     */    
+    private function _handlePUT(
+        ServerRequestInterface $request
+    ): ResponseInterface
+    {
+        $this->checkPermission($request->getAttribute('user'), Permission::PUT);
+    
+        $path = trim($request->getURI()->getPath(), "/");
+        $pathparts = explode('/', $path);
+    
+        if (count($pathparts) === 2) {
+            return $this->controller->handleUpdateRequest(
+                $request, $pathparts[1]
+            );
+        } else {
+            throw new \LORIS\Http\Exception\NotFoundException("Invalid path.");
+        }
+    }
+
+    /**
+     * Handles POST requests for this endpoint.
+     *
+     * This method checks the user's permission and processes the request to
+     * either handle file uploads or create a new resource based on the request
+     * content type.
+     *
+     * @param ServerRequestInterface $request The incoming PSR7 POST request.
+     * @return ResponseInterface              The response to the POST request.
+     */    
+    private function _handlePOST(
+        ServerRequestInterface $request
+    ): ResponseInterface
+    {
+        $this->checkPermission($request->getAttribute('user'), Permission::POST);
+    
+        $contentType = $request->getHeaderLine('Content-Type');
+    
+        if (strpos($contentType, 'multipart/form-data') !== false) {
+            $uploadedFiles = $request->getUploadedFiles();
+            return $this->controller->handleFileUploadRequest(
+                $request, $uploadedFiles
+            );
+        } else {
+            return $this->controller->handleCreateRequest($request);
+        }
+    }    
+
+    /**
+     * Implements the ETagCalculator interface.
+     *
+     * @param ServerRequestInterface $request The PSR7 incoming request.
+     * @return string                        The ETag summarizing the request.
+     */    
+    public function ETag(ServerRequestInterface $request) : string
+    {
+        return md5(json_encode($this->_handleGET($request)->getBody()));
+    }
+}
diff --git a/php/endpoints/candidates.class.inc b/php/endpoints/candidates.class.inc
new file mode 100644
index 00000000..ce7f1a9f
--- /dev/null
+++ b/php/endpoints/candidates.class.inc
@@ -0,0 +1,27 @@
+<?php declare(strict_types=1);                                                     
+                                                                                   
+namespace LORIS\biobank\endpoints;                                                 
+
+use LORIS\biobank\Endpoint;                                                        
+use LORIS\biobank\Service;
+use LORIS\biobank\services\CandidateService;                                       
+                                                                                   
+class Candidates extends Endpoint                                                  
+{                                                                                  
+    protected function getService(): Service                                       
+    {                                                                              
+        return new CandidateService();                            
+    }      
+
+    protected static function getPermission(Permission $permission) : string         
+    {                                                                              
+        return match ($permission) {                                               
+            Permission::GET => 'biobank_specimen_view',                            
+        };                                                                         
+    }                                                                              
+
+    protected function getSubHandler(string $subpath): ?Endpoint                   
+    {                                                                              
+        return null;                                                               
+    }    
+}  
diff --git a/php/endpoints/centers.class.inc b/php/endpoints/centers.class.inc
new file mode 100644
index 00000000..d453cadc
--- /dev/null
+++ b/php/endpoints/centers.class.inc
@@ -0,0 +1,27 @@
+<?php declare(strict_types=1);                                                  
+                                                                                
+namespace LORIS\biobank\Endpoints;                                              
+                                                                                
+use LORIS\biobank\Endpoint;                                                     
+use LORIS\biobank\Service;                                     
+use LORIS\biobank\services\CenterService;
+                                                                                
+class Centers extends Endpoint                                                
+{                                                                               
+    protected function getService(): Service                                       
+    {                                                                              
+        return new CenterService();                             
+    }    
+
+    protected static function getPermission(Permission $permission) : string
+    {
+        return match ($permission) {
+            Permission::GET => 'biobank_container_view',
+        };
+    }
+
+    protected function getSubHandler(string $subpath): ?Endpoint
+    {
+        return null;
+    }
+}
diff --git a/php/endpoints/container/types.class.inc b/php/endpoints/container/types.class.inc
new file mode 100644
index 00000000..1eb32e16
--- /dev/null
+++ b/php/endpoints/container/types.class.inc
@@ -0,0 +1,28 @@
+<?php declare(strict_types=1);                                                     
+                                                                                   
+namespace LORIS\biobank\endpoints\container;                                                 
+
+use LORIS\biobank\Endpoint;                                                        
+use LORIS\biobank\Service;                                                   
+use LORIS\biobank\services\container\TypeService;                                       
+use LORIS\biobank\endpoints\Permission;                                              
+                                                                                   
+class Types extends Endpoint                                                  
+{                                                                                  
+    protected function getService(): Service                                       
+    {                                                                              
+        return new TypeService();                             
+    }    
+
+    protected static function getPermission(Permission $permission) : string         
+    {                                                                              
+        return match ($permission) {                                               
+            Permission::GET => 'biobank_container_view',                            
+        };                                                                         
+    }                                                                              
+
+    protected function getSubHandler(string $subpath): ?Endpoint                   
+    {                                                                              
+        return null;                                                               
+    }    
+}  
diff --git a/php/endpoints/containers.class.inc b/php/endpoints/containers.class.inc
new file mode 100644
index 00000000..b478fd2a
--- /dev/null
+++ b/php/endpoints/containers.class.inc
@@ -0,0 +1,34 @@
+<?php declare(strict_types=1);                                                  
+                                                                                
+namespace LORIS\biobank\endpoints;                                              
+                                                                                
+use LORIS\biobank\endpoints\container\Types;                                                     
+use LORIS\biobank\Endpoint;                                                     
+use LORIS\biobank\Service;
+use LORIS\biobank\services\ContainerService;                                     
+use LORIS\Data\Filters;
+                                                                                
+final class Containers extends Endpoint
+{
+    protected function getService(): Service
+    {
+        return new ContainerService();
+    }
+
+    protected function getSubHandler(string $subpath): ?Endpoint
+    {
+        return match ($subpath) {
+            'types' => new Types($this->loris),
+            default => null
+        };
+    }
+
+    protected static function getPermission(Permission $permission) : string
+    {
+        return match ($permission) {
+            Permission::GET => 'biobank_container_view',
+            Permission::PUT => 'biobank_container_update',
+            Permission::POST => 'biobank_container_create',
+        };
+    }
+}
diff --git a/php/endpoints/diagnoses.class.inc b/php/endpoints/diagnoses.class.inc
new file mode 100644
index 00000000..ec181bbd
--- /dev/null
+++ b/php/endpoints/diagnoses.class.inc
@@ -0,0 +1,27 @@
+<?php declare(strict_types=1);                                                     
+                                                                                   
+namespace LORIS\biobank\endpoints;                                                 
+
+use LORIS\biobank\Endpoint;                                                        
+use LORIS\biobank\Service;                                                   
+use LORIS\biobank\services\DiagnosisService;                                       
+                                                                                   
+class Diagnoses extends Endpoint                                                  
+{                                                                                  
+    protected function getService(): Service                                       
+    {                                                                              
+        return new DiagnosisService();                             
+    }    
+
+    protected static function getPermission(Permission $permission) : string         
+    {                                                                              
+        return match ($permission) {                                               
+            Permission::GET => 'biobank_specimen_view',                            
+        };                                                                         
+    }                                                                              
+
+    protected function getSubHandler(string $subpath): ?Endpoint                   
+    {                                                                              
+        return null;                                                               
+    }    
+}  
diff --git a/php/endpoints/examiners.class.inc b/php/endpoints/examiners.class.inc
new file mode 100644
index 00000000..06c2156a
--- /dev/null
+++ b/php/endpoints/examiners.class.inc
@@ -0,0 +1,27 @@
+<?php declare(strict_examiners=1);                                                     
+                                                                                   
+namespace LORIS\biobank\endpoints;                                                 
+
+use LORIS\biobank\Endpoint;                                                        
+use LORIS\biobank\Service;                                                   
+use LORIS\biobank\services\ExaminerService;                                       
+                                                                                   
+class Examiners extends Endpoint                                                  
+{                                                                                  
+    protected function getService(): Service                                       
+    {                                                                              
+        return new ExaminerService();                             
+    }    
+
+    protected static function getPermission(Permission $permission) : string         
+    {                                                                              
+        return match ($permission) {                                               
+            Permission::GET => 'biobank_specimen_view',                            
+        };                                                                         
+    }                                                                              
+
+    protected function getSubHandler(string $subpath): ?Endpoint                   
+    {                                                                              
+        return null;                                                               
+    }    
+}  
diff --git a/php/endpoints/labels.class.inc b/php/endpoints/labels.class.inc
new file mode 100644
index 00000000..526b1687
--- /dev/null
+++ b/php/endpoints/labels.class.inc
@@ -0,0 +1,86 @@
+<?php declare(strict_types=1);
+
+namespace LORIS\biobank\Endpoints;
+
+use LORIS\biobank\Endpoint;
+
+class Labels extends Endpoint
+{
+    public function __construct(\User $user, \Database $db)
+    {
+        $dao = (new SpecimenDAO($db))->filter(new UserProjectMatch());
+        $service = new LabelService($dao);
+        parent::__construct($user, $service);
+    }
+
+    protected function _hasAccess(string $permission) : bool
+    {
+        return true;
+    }
+
+    protected function _handlePOST(ServerRequestInterface $request): ResponseInterface
+    {
+        $params = json_decode($request->getBody()->getContents(), true);
+        if (json_last_error() !== JSON_ERROR_NONE) {
+            return new \LORIS\Http\Response\JSON\BadRequest(['error' => 'Invalid JSON provided']);
+        }
+
+        try {
+            foreach ($params as $param) {
+                $this->printLabel($param);
+            }
+            return new \LORIS\Http\Response\JSON\OK(['message' => 'Labels printed successfully']);
+        } catch (\Exception $e) {
+            return new \LORIS\Http\Response\JSON\InternalServerError(['error' => $e->getMessage()]);
+        }
+    }
+
+    private function printLabel(array $param): void
+    {
+        $barcode   = $param['barcode'];
+        $type      = $param['type'];
+        $pscid     = $param['pscid'];
+        $sampleNum = $param['sampleNumber'];
+
+        // Construct ZPL string
+        $zpl = "^XA"
+             . "^FO330,80"
+             . "^BY1"
+             . "^BCN,100,Y,Y,N"
+             . "^CFA,20"
+             . "^A0N,30,29"
+             . "^BCN,100,Y,Y,N^FD$barcode^FS"
+             . "^FO323,190"
+             . "^CFA,20"
+             . "^A0N,30,29^FD$type^FS"
+             . "^FO323,250"
+             . "^CFA,20"
+             . "^A0N,30,29^FD$pscid $sampleNum^FS"
+             . "^XZ";
+
+        $config  = \NDB_Config::singleton();
+        $path    = $config->getSetting('labelPrintingPath') . 'barcode.zpl';
+
+        // Ensure directory exists
+        $directory = dirname($path);
+        if (!is_dir($directory)) {
+            mkdir($directory, 0777, true);
+        }
+
+        // Write ZPL to file
+        if (false === ($fp = fopen($path, 'w'))) {
+            throw new \RuntimeException("Unable to open file: $path");
+        }
+        if (false === fwrite($fp, $zpl)) {
+            fclose($fp);
+            throw new \RuntimeException("Unable to write to file: $path");
+        }
+        fclose($fp);
+
+        // Send the file to the printer
+        $output = shell_exec('lp -d ZDesigner -o raw ' . escapeshellarg($path));
+        if ($output === null) {
+            throw new \RuntimeException("Failed to send print job to printer");
+        }
+    }
+}
diff --git a/php/endpoints/permission.class.inc b/php/endpoints/permission.class.inc
new file mode 100644
index 00000000..83c52da3
--- /dev/null
+++ b/php/endpoints/permission.class.inc
@@ -0,0 +1,11 @@
+<?php
+
+namespace LORIS\biobank\endpoints;
+
+enum Permission: string
+{
+    case GET = 'GET';
+    case PUT = 'PUT';
+    case DELETE = 'DELETE';
+    case POST = 'POST';
+}
diff --git a/php/endpoints/pools.class.inc b/php/endpoints/pools.class.inc
new file mode 100644
index 00000000..5491fbc5
--- /dev/null
+++ b/php/endpoints/pools.class.inc
@@ -0,0 +1,29 @@
+<?php declare(strict_types=1);                                                  
+                                                                                
+namespace LORIS\biobank\Endpoints;                                              
+                                                                                
+use LORIS\biobank\Endpoint;                                                     
+use LORIS\biobank\Service;                                     
+use LORIS\biobank\services\PoolService;
+use LORIS\Data\Filters;
+                                                                                
+final class Pools extends Endpoint                                                
+{                                                                               
+    protected function getService(): Service                                       
+    {                                                                              
+        return new PoolService();                              
+    }    
+
+    protected static function getPermission(Permission $permission) : string
+    {
+        return match ($permission) {
+            Permission::GET => 'biobank_pool_view',
+            Permission::POST => 'biobank_pool_create',
+        };
+    }
+
+    protected function getSubHandler(string $subpath): ?Endpoint
+    {
+        return null;
+    }
+}
diff --git a/php/endpoints/projects.class.inc b/php/endpoints/projects.class.inc
new file mode 100644
index 00000000..973edef4
--- /dev/null
+++ b/php/endpoints/projects.class.inc
@@ -0,0 +1,27 @@
+<?php declare(strict_types=1);                                                     
+                                                                                   
+namespace LORIS\biobank\endpoints;                                                 
+
+use LORIS\biobank\Endpoint;                                                        
+use LORIS\biobank\Service;                                                   
+use LORIS\biobank\services\ProjectService;                                       
+                                                                                   
+class Projects extends Endpoint                                                  
+{                                                                                  
+    protected function getService(): Service                                       
+    {                                                                              
+        return new ProjectService();                            
+    }     
+
+    protected static function getPermission(Permission $permission) : string         
+    {                                                                              
+        return match ($permission) {                                               
+            Permission::GET => 'biobank_specimen_view',                            
+        };                                                                         
+    }                                                                              
+
+    protected function getSubHandler(string $subpath): ?Endpoint                   
+    {                                                                              
+        return null;                                                               
+    }    
+}  
diff --git a/php/endpoints/shipment/logs.class.inc b/php/endpoints/shipment/logs.class.inc
new file mode 100644
index 00000000..1d1e0307
--- /dev/null
+++ b/php/endpoints/shipment/logs.class.inc
@@ -0,0 +1,28 @@
+<?php declare(strict_types=1);                                                     
+                                                                                   
+namespace LORIS\biobank\endpoints\shipment;                                                 
+                                                                                   
+use LORIS\biobank\Endpoint;                                                        
+use LORIS\biobank\Service;                                                   
+use LORIS\biobank\services\shipment\LogService;                                       
+use LORIS\biobank\endpoints\Permission;                                              
+                                                                                   
+class Logs extends Endpoint                                                  
+{                                                                                  
+    protected function getService(): Service                                       
+    {                                                                              
+        return new LogService();                               
+    }      
+
+    protected static function getPermission(Permission $permission) : string         
+    {                                                                              
+        return match ($permission) {                                               
+            Permission::GET => 'biobank_container_view',                            
+        };                                                                         
+    }                                                                              
+
+    protected function getSubHandler(string $subpath): ?Endpoint                   
+    {                                                                              
+        return null;                                                               
+    }    
+}  
diff --git a/php/endpoints/shipment/statuses.class.inc b/php/endpoints/shipment/statuses.class.inc
new file mode 100644
index 00000000..a4ac551d
--- /dev/null
+++ b/php/endpoints/shipment/statuses.class.inc
@@ -0,0 +1,30 @@
+<?php declare(strict_types=1);                                                     
+                                                                                   
+namespace LORIS\biobank\endpoints\shipment;                                                 
+                                                                                   
+use LORIS\biobank\Endpoint;                                                        
+use LORIS\biobank\Service;                                                   
+use LORIS\biobank\services\shipment\StatusService;                                       
+use LORIS\biobank\endpoints\Permission;                                              
+                                                                                   
+class Statuses extends Endpoint                                                  
+{                                                                                  
+    protected function getService(): Service                                       
+    {                                                                              
+        return new StatusService();                               
+    }      
+
+    protected static function getPermission(Permission $permission) : string         
+    {                                                                              
+        return match ($permission) {                                               
+            Permission::GET => 'biobank_container_view',                            
+            Permission::PUT => 'biobank_container_update',                            
+            Permission::POST => 'biobank_container_create',                          
+        };                                                                         
+    }                                                                              
+
+    protected function getSubHandler(string $subpath): ?Endpoint                   
+    {                                                                              
+        return null;
+    }     
+}  
diff --git a/php/endpoints/shipment/types.class.inc b/php/endpoints/shipment/types.class.inc
new file mode 100644
index 00000000..a91c70d9
--- /dev/null
+++ b/php/endpoints/shipment/types.class.inc
@@ -0,0 +1,30 @@
+<?php declare(strict_types=1);                                                     
+                                                                                   
+namespace LORIS\biobank\endpoints\shipment;                                                 
+
+use LORIS\biobank\Endpoint;                                                        
+use LORIS\biobank\Service;                                                   
+use LORIS\biobank\services\shipment\TypeService;                                       
+use LORIS\biobank\endpoints\Permission;                                              
+                                                                                   
+class Types extends Endpoint                                                  
+{                                                                                  
+    protected function getService(): Service                                       
+    {                                                                              
+        return new TypeService();                               
+    }      
+
+    protected static function getPermission(Permission $permission) : string         
+    {                                                                              
+        return match ($permission) {                                               
+            Permission::GET => 'biobank_container_view',                            
+            Permission::PUT => 'biobank_container_update',                            
+            Permission::POST => 'biobank_container_create',                          
+        };                                                                         
+    }                                                                              
+
+    protected function getSubHandler(string $subpath): ?Endpoint                   
+    {                                                                              
+        return null;                                                               
+    }    
+}  
diff --git a/php/endpoints/shipments.class.inc b/php/endpoints/shipments.class.inc
new file mode 100644
index 00000000..0ae5cf79
--- /dev/null
+++ b/php/endpoints/shipments.class.inc
@@ -0,0 +1,37 @@
+<?php declare(strict_types=1);                                                     
+                                                                                   
+namespace LORIS\biobank\endpoints;                                                 
+
+use LORIS\biobank\Endpoint;                                                        
+use LORIS\biobank\Service;                                                   
+use LORIS\biobank\services\ShipmentService;                                       
+use LORIS\biobank\endpoints\shipment\Types;
+use LORIS\biobank\endpoints\shipment\Logs;
+use LORIS\biobank\endpoints\shipment\Statuses;
+                                                                                   
+class Shipments extends Endpoint                                                  
+{                                                                                  
+    protected function getService(): Service                                       
+    {                                                                              
+        return new ShipmentService();                               
+    }      
+
+    protected function getSubHandler(string $subpath): ?Endpoint
+    {
+        return match ($subpath) {
+            'types' => new Types($this->loris),
+            'logs' => new Logs($this->loris),
+            'statuses' => new Statuses($this->loris),
+            default => null
+        };
+    }
+
+    protected static function getPermission(Permission $permission) : string         
+    {                                                                              
+        return match ($permission) {                                               
+            Permission::GET => 'biobank_container_view',                            
+            Permission::PUT => 'biobank_container_update',                            
+            Permission::POST => 'biobank_container_create',                          
+        };                                                                         
+    }                                                                              
+}  
diff --git a/php/endpoints/specimen/attributes.class.inc b/php/endpoints/specimen/attributes.class.inc
new file mode 100644
index 00000000..66f6516c
--- /dev/null
+++ b/php/endpoints/specimen/attributes.class.inc
@@ -0,0 +1,28 @@
+<?php declare(strict_types=1);                                                     
+                                                                                   
+namespace LORIS\biobank\endpoints\specimen;                                                 
+
+use LORIS\biobank\Endpoint;                                                        
+use LORIS\biobank\Service;                                                   
+use LORIS\biobank\services\specimen\AttributeService;                                       
+use LORIS\biobank\endpoints\Permission;                                              
+                                                                                   
+class Attributes extends Endpoint                                                  
+{                                                                                  
+    protected function getService(): Service                                       
+    {                                                                              
+        return new AttributeService();                               
+    }      
+
+    protected static function getPermission(Permission $permission) : string         
+    {                                                                              
+        return match ($permission) {                                               
+            Permission::GET => 'biobank_specimen_view',                            
+        };                                                                         
+    }                                                                              
+
+    protected function getSubHandler(string $subpath): ?Endpoint                   
+    {                                                                              
+        return null;                                                               
+    }    
+}  
diff --git a/php/endpoints/specimen/protocols.class.inc b/php/endpoints/specimen/protocols.class.inc
new file mode 100644
index 00000000..57ad134f
--- /dev/null
+++ b/php/endpoints/specimen/protocols.class.inc
@@ -0,0 +1,28 @@
+<?php declare(strict_types=1);                                                     
+                                                                                   
+namespace LORIS\biobank\endpoints\specimen;                                                 
+
+use LORIS\biobank\Endpoint;                                                        
+use LORIS\biobank\Service;                                                   
+use LORIS\biobank\services\specimen\ProtocolService;                                       
+use LORIS\biobank\endpoints\Permission;                                              
+                                                                                   
+class Protocols extends Endpoint                                                  
+{                                                                                  
+    protected function getService(): Service                                       
+    {                                                                              
+        return new ProtocolService();                               
+    }      
+
+    protected static function getPermission(Permission $permission) : string         
+    {                                                                              
+        return match ($permission) {                                               
+            Permission::GET => 'biobank_specimen_view',                            
+        };                                                                         
+    }                                                                              
+
+    protected function getSubHandler(string $subpath): ?Endpoint                   
+    {                                                                              
+        return null;                                                               
+    }    
+}  
diff --git a/php/endpoints/specimen/types.class.inc b/php/endpoints/specimen/types.class.inc
new file mode 100644
index 00000000..fb0d4a90
--- /dev/null
+++ b/php/endpoints/specimen/types.class.inc
@@ -0,0 +1,28 @@
+<?php declare(strict_types=1);                                                     
+                                                                                   
+namespace LORIS\biobank\endpoints\specimen;                                                 
+
+use LORIS\biobank\Endpoint;                                                        
+use LORIS\biobank\Service;                                                   
+use LORIS\biobank\services\specimen\TypeService;                                       
+use LORIS\biobank\endpoints\Permission;                                              
+                                                                                   
+class Types extends Endpoint                                                  
+{                                                                                  
+    protected function getService(): Service                                       
+    {                                                                              
+        return new TypeService();                               
+    }      
+
+    protected static function getPermission(Permission $permission) : string         
+    {                                                                              
+        return match ($permission) {                                               
+            Permission::GET => 'biobank_specimen_view',                            
+        };                                                                         
+    }                                                                              
+
+    protected function getSubHandler(string $subpath): ?Endpoint                   
+    {                                                                              
+        return null;                                                               
+    }    
+}  
diff --git a/php/endpoints/specimens.class.inc b/php/endpoints/specimens.class.inc
new file mode 100644
index 00000000..d530ed55
--- /dev/null
+++ b/php/endpoints/specimens.class.inc
@@ -0,0 +1,38 @@
+<?php declare(strict_types=1);
+
+namespace LORIS\biobank\endpoints;                                                 
+                                                                                   
+use LORIS\biobank\endpoints\specimen\Types;
+use LORIS\biobank\endpoints\specimen\Protocols;
+use LORIS\biobank\endpoints\specimen\Attributes;
+use LORIS\biobank\Endpoint;                                                        
+use LORIS\biobank\Service;                                                   
+use LORIS\biobank\services\SpecimenService;                                       
+use LORIS\Data\Filters;
+                                                                                   
+class Specimens extends Endpoint                                                  
+{                                                                                  
+    protected function getService(): Service                                       
+    {                                                                              
+        return new SpecimenService();
+    }      
+
+    protected function getSubHandler(string $subpath): ?Endpoint
+    {
+        return match ($subpath) {
+            'types' => new Types($this->loris),
+            'protocols' => new Protocols($this->loris),
+            'attributes' => new Attributes($this->loris),
+            default => null
+        };
+    }
+                                                                                   
+    protected static function getPermission(Permission $permission) : string         
+    {                                                                              
+        return match ($permission) {                                               
+            Permission::GET => 'biobank_specimen_view',                            
+            Permission::PUT => 'biobank_specimen_update',                            
+            Permission::POST => 'biobank_specimen_create',                          
+        };                                                                         
+    }                                                                              
+}  
diff --git a/php/badrequest.class.inc b/php/exceptions/badrequest.class.inc
similarity index 100%
rename from php/badrequest.class.inc
rename to php/exceptions/badrequest.class.inc
diff --git a/php/forbidden.class.inc b/php/exceptions/forbidden.class.inc
similarity index 100%
rename from php/forbidden.class.inc
rename to php/exceptions/forbidden.class.inc
diff --git a/php/factory.class.inc b/php/factory.class.inc
new file mode 100644
index 00000000..15d7cc1a
--- /dev/null
+++ b/php/factory.class.inc
@@ -0,0 +1,178 @@
+<?php 
+
+namespace LORIS\biobank;
+
+use ReflectionClass;
+use ReflectionNamedType;
+use InvalidArgumentException;
+use LORIS\biobank\Model;
+use LORIS\biobank\Models;
+
+/**
+ * Class Factory
+ *
+ * Handles the creation of model instances from arrays of data.
+ *
+ * @category   Factory
+ * @package    Biobank
+ * @subpackage Services
+ * @author     Henri Rabalais <henri.rabalais@mcgill.ca>
+ * @license    http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
+ */
+class Factory
+{
+    /**
+     * Constructs the Factory with a model class name.
+     *
+     * @param string $model The name of the model class.
+     */    
+    public function __construct(
+        private string $model
+    ) {}
+
+    /**
+     * Creates an instance of the model class with provided data.
+     *
+     * @param array|null $data Data to instantiate the model.
+     * @return object          The instantiated model object.
+     */
+    public function create(?array $data): object
+    {
+        // error_log("Factory::create() called with data: " . print_r($data, true));
+
+        $reflectionClass = new ReflectionClass($this->model);
+        $constructor = $reflectionClass->getConstructor();
+        $parameters = $constructor->getParameters();
+    
+        $args = array_map(function ($parameter) use ($data) {
+            $name = $parameter->getName();
+            $type = $parameter->getType();
+            $typeName = $type ? $type->getName() : null;
+            // error_log("Processing parameter: {$name}, type: {$typeName}");
+    
+            // Type checking and casting
+            if (isset($data[$name])) {
+                // error_log("Data for parameter '{$name}' found: " . print_r($data[$name], true));
+                return $this->handleType($type, $data[$name]);
+            }
+
+            // Use default value if parameter is optional
+            if ($parameter->isOptional()) {
+                // error_log("Parameter '{$name}' is optional, using default value.");
+                return $parameter->getDefaultValue();
+            }
+
+            // Handle nullable parameters explicitly
+            if ($type->allowsNull()) {
+                // error_log("Parameter '{$name}' allows null, returning null.");
+                return null;
+            }
+    
+            throw new InvalidArgumentException("Missing required parameter: {$name}");
+        }, $parameters);
+    
+        return $reflectionClass->newInstanceArgs($args);
+    }    
+
+    /**
+     * Creates multiple instances of the model class from a list of data arrays.
+     *
+     * @param array $dataList List of data arrays to instantiate the model.
+     * @return array          List of instantiated model objects.
+     */    
+    public function createFromList(array $dataList): array
+    {
+        $instances = [];
+
+        foreach ($dataList as $data) {
+            try {
+                $instances[] = $this->create($data);
+            } catch (Exception $e) {
+                // Handle the exception or log it
+                throw new RuntimeException("Error creating instance: " . $e->getMessage());
+            }
+        }
+
+        return $instances;
+    }
+
+    /**
+     * Handles type conversion and instantiation for the provided value.
+     *
+     * @param ReflectionNamedType|null $type  The type of the parameter.
+     * @param mixed                    $value The value to be handled.
+     * @return mixed                          The processed value.
+     */
+    private function handleType(?ReflectionNamedType $type, $value)
+    {
+        // error_log("handleType() called with type: " . ($type ? $type->getName() : 'null') . ", value: " . print_r($value, true));
+        if (!$type) {
+            // error_log("No type provided, returning value as is.");
+            return $value;
+        }
+    
+        $typeName = $type->getName();
+
+        // Special handling for ValidatableIdentifier subclasses
+        // XXX: I don't particularly like this and I think they should accept
+        // ints as valid
+        if (is_subclass_of($typeName, \ValidatableIdentifier::class) && is_int($value)) {
+            // error_log("Type '{$typeName}' is a ValidatableIdentifier subclass and value is int. Converting to string.");
+            return new $typeName((string)$value);
+        }
+    
+        // Handle built-in types
+        if ($type->isBuiltin()) {
+            // error_log("Type '{$typeName}' is built-in. Casting value.");
+            return $this->castToBuiltinType($typeName, $value);
+        }
+    
+        // Handle class types
+        if (!class_exists($typeName)) {
+            throw new InvalidArgumentException("Unable to handle type $typeName: $type");
+        }
+    
+        if (is_subclass_of($typeName, Model::class)) {
+            // error_log("Type '{$typeName}' is a subclass of Model.");
+            $subFactory = new self($typeName);
+            return $subFactory->create($value);
+        }
+    
+        // Handle classes extending Models
+        if (is_subclass_of($typeName, Models::class)) {
+            // error_log("Type '{$typeName}' is a subclass of Models.");
+            $subFactory = new self($typeName::$model);
+            return new $typeName(array_map([$subFactory, 'create'], $value));
+        }
+    
+        // Directly instantiate non-Model classes
+        // error_log("Type '{$typeName}' is not a built-in or Model subclass. Instantiating directly.");
+        return new $typeName($value);        
+    }
+
+    /**
+     * Casts the provided value to the specified built-in type.
+     *
+     * @param string $typeName The name of the type to cast to.
+     * @param mixed  $value    The value to be casted.
+     * @return mixed           The casted value.
+     * @throws InvalidArgumentException If the type is not supported.
+     */    
+    private function castToBuiltinType(string $typeName, $value)
+    {
+        switch ($typeName) {
+            case 'int':
+                return (int) $value;
+            case 'float':
+                return (float) $value;
+            case 'string':
+                return (string) $value;
+            case 'bool':
+                return (bool) $value;
+            case 'array':
+                return (array) $value;
+            default:
+                throw new InvalidArgumentException("Unsupported built-in type: {$typeName}");
+        }
+    }
+}
diff --git a/php/primarycontainerfilter.class.inc b/php/filters/primarycontainerfilter.class.inc
similarity index 100%
rename from php/primarycontainerfilter.class.inc
rename to php/filters/primarycontainerfilter.class.inc
diff --git a/php/labelendpoint.class.inc b/php/labelendpoint.class.inc
deleted file mode 100644
index 159cb47a..00000000
--- a/php/labelendpoint.class.inc
+++ /dev/null
@@ -1,109 +0,0 @@
-<?php declare(strict_types=1);
-/**
- * This implements the Container endpoint class for the Biobank Module.
- *
- * PHP Version 7.2
- *
- * @category   API
- * @package    Loris
- * @subpackage Biobank
- * @author     Henri Rabalais <henri.rabalais@mcin.ca>
- * @license    http://www.gnu.org/licenses/gpl-3.0.text GPLv3
- * @link       http://www.github.com/aces/Loris/
- */
-namespace LORIS\biobank;
-use \Psr\Http\Message\ServerRequestInterface;
-use \Psr\Http\Server\RequestHandlerInterface;
-use \Psr\Http\Message\ResponseInterface;
-
-/**
- * A class for handling the /biobank/containers/ endpoint.
- *
- * PHP Version 7.2
- *
- * @category   API
- * @package    Loris
- * @subpackage Biobank
- * @author     Henri Rabalais <henri.rabalais@mcin.ca>
- * @license    http://www.gnu.org/licenses/gpl-3.0.text GPLv3
- * @link       http://www.github.com/aces/Loris/
- */
-class LabelEndpoint implements RequestHandlerInterface
-{
-    /**
-     * Returns true if user has access to this endpoint.
-     *
-     * @param \User $user The user whose access is being checked
-     *
-     * @return bool
-     */
-    function _hasAccess(\User $user) : bool
-    {
-        return true;
-    }
-
-    /**
-     * Return HTTP methods allowed at this endpoint
-     *
-     * @return string[]
-     */
-    protected function allowedMethods() : array
-    {
-        return [
-            'GET',
-            'PUT',
-            'POST',
-            'OPTIONS',
-        ];
-    }
-
-    /**
-     * This function passes the request to the handler. This is necessary since
-     * the Endpoint bypass the Module class.
-     *
-     * XXX: This function should be extracted to a parent class.
-     *
-     * @param ServerRequestInterface  $request The PSR7 request.
-     * @param RequestHandlerInterface $handler The request handler.
-     *
-     * @return ResponseInterface The outgoing PSR7 response.
-     */
-    public function process(
-        ServerRequestInterface $request,
-        RequestHandlerInterface $handler
-    ) : ResponseInterface {
-        return $handler->handle($request);
-    }
-
-    /**
-     * Handles Endpoint requests.
-     *
-     * @param ServerRequestInterface $request The incoming PSR7 request
-     *
-     * @return ResponseInterface The outgoing PSR7 response
-     */
-    public function handle(ServerRequestInterface $request) : ResponseInterface
-    {
-        // TODO: Place a try catch here in case printing doesn't work for some
-        // reason.
-        switch ($request->getMethod()) {
-        case 'POST':
-            $params = json_decode($request->getBody()->getContents(), true);;
-            foreach ($params as $param) {
-                $barcode = $param['barcode'];
-                $type    = $param['type'];
-                $zpl     = "^XA,^FO330,80^BY1,^BCN,100,Y,Y,N,^CFA,"
-                    . "20^A0N,30,29^BCN,100,Y,Y,N^FD$barcode^FS,"
-                    . "^FO323,190,^CFA,20^A0N,30,29^FD$type^XZ";
-                $config  = \NDB_Config::singleton();
-                $path    = $config->getSetting('labelPrintingPath');
-                $path    = $path.'barcode.zpl';
-                $fp      = fopen($path, 'w');
-                fwrite($fp, $zpl);
-                fclose($fp);
-                shell_exec('lp -d ZDesigner -o raw '.escapeshellarg($path));
-            }
-            return new \LORIS\Http\Response\JSON\OK();
-        }
-    }
-}
diff --git a/php/log.class.inc b/php/log.class.inc
deleted file mode 100644
index 3f09e7e3..00000000
--- a/php/log.class.inc
+++ /dev/null
@@ -1,194 +0,0 @@
-<?php declare(strict_types=1);
-/**
- * Log Class
- * This class contains an instance of a database handling that is needed to
- * permanently store and retrieve Log Object instances.
- *
- * PHP Version 7.2
- *
- * @category   Entity
- * @package    Loris
- * @subpackage Biobank
- * @author     Henri Rabalais <henri.rabalais@mcin.ca>
- * @license    http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
- * @link       https://www.github.com/aces/Loris/
- */
-namespace LORIS\biobank;
-
-/**
- * Log Class
- * This class contains an instance of a database handling that is needed to
- * permanently store and retrieve Log Object instances.
- *
- * PHP Version 7.2
- *
- * @category   Entity
- * @package    Loris
- * @subpackage Biobank
- * @author     Henri Rabalais <henri.rabalais@mcin.ca>
- * @license    http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
- * @link       https://www.github.com/aces/Loris/
- */
-class Log implements \JsonSerializable, \LORIS\Data\DataInstance
-{
-    /**
-     * Persistent Instance variables.
-     *
-     * These properties describe a shipment entity.
-     *
-     * @var string    $barcode
-     * @var string    $centerId
-     * @var string    $status
-     * @var string    $user
-     * @var string    $temperature
-     * @var \DateTime $date
-     * @var \DateTime $time
-     * @var string    $comments
-     */
-    public $barcode;
-    public $centerId;
-    public $status;
-    public $user;
-    public $temperature;
-    public $date;
-    public $time;
-    public $comments;
-
-    /**
-     * Initiliazes a new instance of the Log Class
-     *
-     * @param array $data The data to initialize the log with
-     */
-    function __construct(array $data)
-    {
-        $this->barcode     = $data['barcode'] ?? null;
-        $this->centerId    = $data['centerId'] ?? null;
-        $this->status      = $data['status'] ?? null;
-        $this->user        = $data['user'] ?? null;
-        $this->temperature = $data['temperature'] ?? null;
-        $this->date        = $data['date'] ?? null;
-        $this->time        = $data['time'] ?? null;
-        $this->comments    = $data['comments'] ?? null;
-    }
-
-    /**
-     * Gets the shipment's ID
-     *
-     * @return ?string
-     */
-    public function getBarcode() : ?string
-    {
-        return $this->barcode;
-    }
-
-    /**
-     * Get the center for this log
-     *
-     * @return ?string
-     */
-    public function getCenterId() : ?string
-    {
-        return $this->centerId;
-    }
-
-    /**
-     * Get the status of this shipment log
-     *
-     * @return ?string
-     */
-    public function getStatus() : ?string
-    {
-        return $this->status;
-    }
-
-    /**
-     * Get the user(?)
-     *
-     * @return ?string
-     */
-    public function getUser() : ?string
-    {
-        return $this->user;
-    }
-
-    /**
-     * Get the temperature during this shipment log
-     *
-     * @return ?string
-     */
-    public function getTemperature() : ?string
-    {
-        return $this->temperature;
-    }
-
-    /**
-     * Get the date (without time) for this log
-     *
-     * @return ?\DateTime
-     */
-    public function getDate() : ?\DateTime
-    {
-        return $this->date;
-    }
-
-    /**
-     * Get the time of this log
-     *
-     * @return ?\DateTime
-     */
-    public function getTime() : ?\DateTime
-    {
-        return $this->time;
-    }
-
-    /**
-     * Get the comments for this log
-     *
-     * @return ?string
-     */
-    public function getComments() : ?string
-    {
-        return $this->comments;
-    }
-
-    /**
-     * A wrapper function for the jsonSerialize method of the Log Instance
-     * Class. This converts the Log Instance into an array.
-     *
-     * @return array Log Array.
-     */
-    public function toArray() : array
-    {
-        return $this->jsonSerialize();
-    }
-
-    /**
-     * Returns an array representing the state of the Log
-     *
-     * @return array
-     */
-    public function jsonSerialize() : array
-    {
-        return [
-            'barcode'     => $this->barcode,
-            'centerId'    => $this->centerId,
-            'status'      => $this->status,
-            'user'        => $this->user,
-            'temperature' => $this->temperature,
-            'date'        => $this->date,
-            'time'        => $this->time,
-            'comments'    => $this->comments,
-        ];
-    }
-
-    /**
-     * Returns a JSON encoded string of the state of the Log
-     *
-     * @return string JSON encoded string of Log data
-     */
-    public function toJSON() : string
-    {
-        return json_encode($this);
-    }
-}
-
diff --git a/php/model.class.inc b/php/model.class.inc
new file mode 100644
index 00000000..fcaca77d
--- /dev/null
+++ b/php/model.class.inc
@@ -0,0 +1,97 @@
+<?php declare(strict_types=1);
+
+namespace LORIS\biobank;
+
+use LORIS\biobank\data;
+use ReflectionClass;
+use ReflectionProperty;
+
+/**
+ * Abstract class Model
+ *
+ * Represents a generic model within the Biobank module. This class
+ * implements basic functionality such as extracting data, converting
+ * to arrays, and handling JSON serialization.
+ *
+ * @package    LORIS
+ * @subpackage Biobank
+ * @author     Henri Rabalais <henri.j.rabalais@gmail.com>
+ * @license    https://www.gnu.org/licenses/gpl-3.0.html GNU General Public
+ *             License
+ */
+abstract class Model implements \LORIS\Data\DataInstance
+{
+    /**
+     * Holds an array of properties that have been set in the model.
+     *
+     * @var array
+     */
+    protected array $setProperties = [];
+
+    /**
+     * Get the associated schema for the model.
+     *
+     * @return SchemaInterface The schema associated with this model.
+     */    
+    public function getSchema(): Schema
+    {
+    }
+
+    /**
+     * Converts the current object instance into an array, including the ID.
+     *
+     * @return array The object instance as an associative array.
+     */    
+    public function toArray(): array
+    {
+        return array_merge(['id' => $this->id], $this->extract());
+    }
+
+    /**
+     * Serializes the object to a JSON-serializable array.
+     *
+     * @return array The object instance as a JSON-serializable array.
+     */    
+    public function jsonSerialize(): array {
+        return array_merge($this->extract(), $this->toJSON());
+    }
+
+    /**
+     * Returns additional properties to be included in JSON serialization.
+     *
+     * Child classes should override this method to add extra properties for
+     * JSON serialization.
+     *
+     * @return array Additional properties for JSON serialization.
+     */    
+    protected function toJSON(): array {
+        return [];
+    }
+
+    /**
+     * Extracts properties from the current object instance into an array.
+     *
+     * This method will include only public properties and can optionally
+     * include the object's ID.
+     *
+     * @param bool $includeId Whether to include the ID in the extracted array.
+     * @return array          The extracted properties as an associative array.
+     */    
+    protected function extract(): array
+    {
+        $data = [];
+        $reflect = new ReflectionClass($this);
+        $props = $reflect->getProperties(ReflectionProperty::IS_PUBLIC);
+    
+        foreach ($props as $prop) {
+            $key = $prop->getName();
+            $value = $prop->getValue($this);
+
+            if (!is_null($value)) {
+                $data[$key] = $value;
+            }
+        }
+    
+        return $data;
+    }
+}
diff --git a/php/modelprovisioner.class.inc b/php/modelprovisioner.class.inc
new file mode 100644
index 00000000..88b01adc
--- /dev/null
+++ b/php/modelprovisioner.class.inc
@@ -0,0 +1,205 @@
+<?php
+
+namespace LORIS\biobank;
+
+use \LORIS\biobank\data\query\Query;
+use \LORIS\biobank\data\query\With;
+use \LORIS\biobank\data\query\Condition;
+use \LORIS\biobank\data\query\QueryParams;
+use \LORIS\biobank\data\query\QueryBuilder;
+use \LORIS\biobank\data\Schema;
+
+/**
+ * Abstract class ModelProvisioner
+ *
+ * Provides methods to manage the retrieval and processing of models
+ * based on database queries. Handles preloading, post-processing, and
+ * the fetching of model instances with customizable query parameters.
+ *
+ * @package    LORIS
+ * @subpackage Biobank
+ * @author     Henri Rabalais <henri.j.rabalais@gmail.com>
+ * @license    https://www.gnu.org/licenses/gpl-3.0.html GNU General Public
+ *             License
+ */
+abstract class ModelProvisioner extends \LORIS\Data\ProvisionerInstance
+{
+    /**
+     * Stores relationships to be loaded with the models.
+     *
+     * @var array
+     */    
+    private array $withs = [];
+
+    /**
+     * Stores the query parameters to be applied when fetching models.
+     *
+     * @var QueryParams|null
+     */
+    private ?QueryParams $queryparams = null;
+
+    /**
+     * Constructs the ModelProvisioner with a schema.
+     *
+     * @param Schema $schema The schema that defines the returned objects.
+     */    
+    public function __construct(
+        private Schema $schema
+    ) {
+        $this->db = (\NDB_Factory::singleton())->database();
+    }
+
+    /**
+     * Pre-loads data for the query based on query parameters.
+     *
+     * @param QueryParams $queryparams The query parameters to apply.
+     * @return array                   Preloaded data.
+     */    
+    abstract protected function preLoad(QueryParams $queryparams): array;
+
+    /**
+     * Post-processes the loaded model instance after preloading.
+     *
+     * @param Model $specimen  The model to post-process.
+     * @param array $preload   Preloaded data for further processing.
+     * @return Model           The post-processed model.
+     */    
+    abstract protected function postLoad(Model $specimen, array $preload): Model;
+
+    /**
+     * Applies query parameters to this provisioner.
+     *
+     * @param QueryParams|null $queryparams The query parameters to apply.
+     * @return self                         The current instance.
+     */    
+    public function apply(?QueryParams $queryparams): self
+    {
+        $this->queryparams = $queryparams;
+        return $this;
+    }
+
+    /**
+     * Retrieves a model by its ID.
+     *
+     * @param int|null $id The ID of the model to retrieve.
+     * @return Model       The retrieved model instance.
+     */    
+    public function getById(?int $id): Model
+    {
+        $params = (new QueryParams())
+            ->where(new Condition(field: 'id', value: $id));
+
+        return $this->apply($params)->getInstance();
+    }
+
+    /**
+     * Retrieves a model by its label.
+     *
+     * @param string|null $label The label of the model to retrieve.
+     * @return Model             The retrieved model instance.
+     */    
+    public function getByLabel(?string $label): Model
+    {
+        $params = (new QueryParams())
+            ->where(new Condition(field: $this->schema::label(), value: $label));
+        return $this->apply($params)->getInstance();
+    }
+
+    /**
+     * Retrieves a single instance of the model.
+     *
+     * @return Model|null The first retrieved model instance, or null.
+     */    
+    public function getInstance(): ?Model
+    {
+        $generator = $this->get();
+        foreach ($generator as $modelId => $model) {
+            return $model; // Return the first (and only) model
+        }
+        return null;
+    }
+
+    /**
+     * Specifies relationships to be loaded with the models.
+     *
+     * @param With ...$relations The relationships to load.
+     * @return self              The current instance.
+     */    
+    public function with(With ...$relations): self
+    {
+        // Append new relations to the existing $withs array
+        $this->withs = array_merge($this->withs, $relations);
+        return $this;
+    }
+
+    /**
+     * Retrieves models without additional processing.
+     *
+     * @return \Traversable The models as a traversable object.
+     */    
+    public function get(): \Traversable
+    {
+        return $this->fetchModels(function($model) {
+            return $model;
+        });
+    }
+    
+    /**
+     * Retrieves all instances with preloading and post-processing.
+     *
+     * @return \Traversable The processed models as a traversable object.
+     */    
+    public function getAllInstances(): \Traversable
+    {
+        $queryparams = $this->queryparams ?? new QueryParams();
+        $preload = $this->preLoad($queryparams);
+    
+        return $this->fetchModels(function($model) use ($preload) {
+            return $this->postLoad($model, $preload);
+        });
+    }
+    
+    /**
+     * Fetches models from the database and processes them using a callback.
+     *
+     * @param callable $processModel A callback to process each model.
+     * @return \Traversable          The processed models as a traversable object.
+     */    
+    private function fetchModels(callable $processModel): \Traversable
+    {
+        $factory = new Factory($this->schema::model());
+    
+        foreach ($this->fetchData() as $row) {
+            $data = [];
+    
+            foreach ($row as $columnName => $columnValue) {
+                if (array_key_exists($columnName, $this->schema::relations())) {
+                    $columnValue = json_decode($columnValue, true);
+                }
+                $data[$columnName] = $columnValue;
+            }
+    
+            $model = $factory->create($data);
+            $processedModel = $processModel($model);
+            yield $processedModel->id => $processedModel;
+        }
+    }    
+
+    /**
+     * Fetches raw data from the database based on query parameters.
+     *
+     * @return \Traversable An iterator of associative arrays representing each
+     *                      row.
+     */    
+    private function fetchData(): \Traversable
+    {
+        $queryparams = $this->queryparams ?? new QueryParams();
+        $query = (new QueryBuilder($this->schema, $queryparams))->build();
+        $stmt = $this->db->prepare($query->toString());
+        $stmt->execute($query->getParams());
+    
+        while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
+            yield $row;
+        }
+    }
+}
diff --git a/php/models.class.inc b/php/models.class.inc
new file mode 100644
index 00000000..2f39196f
--- /dev/null
+++ b/php/models.class.inc
@@ -0,0 +1,124 @@
+<?php declare(strict_types=1);
+
+namespace LORIS\biobank;
+
+use ArrayObject;
+use InvalidArgumentException;
+
+/**
+ * Abstract class Models
+ *
+ * Represents a collection of model instances, extending ArrayObject to
+ * provide custom type validation, JSON serialization, and management
+ * of model data.
+ *
+ * @package    LORIS
+ * @subpackage Biobank
+ * @author     Henri Rabalais <henri.j.rabalais@gmail.com>
+ * @license    https://www.gnu.org/licenses/gpl-3.0.html GNU General Public
+ *             License
+ */
+abstract class Models extends ArrayObject implements \JsonSerializable
+{
+    /**
+     * The name of the model class to validate against.
+     *
+     * Note: This is a static property, which means all instances of 
+     * extending classes will share the same model type. This could 
+     * lead to issues with inheritance if different model types are 
+     * expected across subclasses.
+     *
+     * @var string
+     */    
+    public static string $model;
+
+    /**
+     * Constructs the Models collection.
+     *
+     * Initializes an empty ArrayObject and populates it with the given 
+     * items, validating that each item is of the correct model type.
+     *
+     * @param array $items The initial items to populate the collection.
+     */    
+    public function __construct(array $items = [])
+    {
+        parent::__construct([], ArrayObject::ARRAY_AS_PROPS);
+
+        foreach ($items as $item) {
+            $this->validateType($item);
+            $this[] = $item;
+        }
+    }
+
+    /**
+     * Sets a value at the specified offset, with type validation.
+     *
+     * @param mixed $key   The key at which to set the value.
+     * @param mixed $value The value to set, validated against the model type.
+     * @throws InvalidArgumentException If the value is not an instance of
+     *                                  the expected model.
+     */    
+    public function offsetSet($key, $value): void
+    {
+        $this->validateType($value);
+        parent::offsetSet($key, $value);
+    }
+
+    /**
+     * Appends a value to the collection, with type validation.
+     *
+     * @param mixed $value The value to append, validated against the model
+     *                     type.
+     * @throws InvalidArgumentException If the value is not an instance of
+     *                                  the expected model.
+     */    
+    public function append($value): void
+    {
+        $this->validateType($value);
+        parent::append($value);
+    }
+
+    /**
+     * Retrieves an array of IDs from the model instances.
+     *
+     * Casts the collection to an array and applies a callback to extract 
+     * the `id` property from each model.
+     *
+     * @return array An array of model IDs.
+     */    
+    public function getIds(): array
+    {
+        return array_map(function ($model) {
+            return $model->id;
+        }, (array) $this); // Cast to array to use array_map
+    }
+
+    /**
+     * Serializes the collection to a JSON-serializable array.
+     *
+     * @return array The collection as an array.
+     */    
+    public function jsonSerialize(): array
+    {
+        return $this->getArrayCopy();
+    }
+
+    /**
+     * Validates that a value is an instance of the expected model type.
+     *
+     * Checks that the given value is an instance of the class specified 
+     * by the `$model` static property. Throws an exception if validation fails.
+     *
+     * @param mixed $value The value to validate.
+     * @throws InvalidArgumentException If the value is not an instance of
+     *                                  the expected model.
+     */    
+    protected function validateType($value): void
+    {
+        if (!$value instanceof static::$model) {
+            throw new InvalidArgumentException(
+                "Expected instance of " . static::$model
+            );
+        }
+    }
+}
diff --git a/php/models/candidate.class.inc b/php/models/candidate.class.inc
new file mode 100644
index 00000000..52fce841
--- /dev/null
+++ b/php/models/candidate.class.inc
@@ -0,0 +1,17 @@
+<?php declare(strict_types=1);   
+
+namespace LORIS\biobank\models;                                                    
+
+use LORIS\biobank\Model;
+                                                                                   
+final class Candidate extends Model                                                           
+{                                                                                  
+    public function __construct(                                                   
+        public readonly ?string $label,                                                      
+        public readonly ?string $dob,
+        public readonly ?string $sex,
+        public readonly ?Sessions $sessions,
+        public readonly ?Diagnoses $diagnoses,
+        private readonly ?int $id,                                                           
+    ) {}                                                                           
+}   
diff --git a/php/models/center.class.inc b/php/models/center.class.inc
new file mode 100644
index 00000000..62ed5adc
--- /dev/null
+++ b/php/models/center.class.inc
@@ -0,0 +1,13 @@
+<?php declare(strict_types=1);  
+
+namespace LORIS\biobank\models;                                                 
+
+use LORIS\biobank\Model;
+                                                                                
+class Center extends Model
+{                                                                               
+    public function __construct(                                                
+        public string $label,                                                 
+        public ?\CenterID $id,                                                         
+    ) {}                                                                        
+}  
diff --git a/php/models/container.class.inc b/php/models/container.class.inc
new file mode 100644
index 00000000..62323a67
--- /dev/null
+++ b/php/models/container.class.inc
@@ -0,0 +1,58 @@
+<?php declare(strict_types=1);
+/**
+ * Container Object Class
+ * This class contains an instance of a database handling that is needed to
+ * permanently store and retrieve Container Object instances.
+ *
+ * PHP Version 7.2
+ *
+ * @category   Entity
+ * @package    Loris
+ * @subpackage Biobank
+ * @author     Henri Rabalais <henri.rabalais@mcin.ca>
+ * @license    http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
+ * @link       https://www.github.com/aces/Loris/
+ */
+
+namespace LORIS\biobank\models;
+
+use LORIS\biobank\Model;
+use LORIS\biobank\models\container\Type;
+use LORIS\biobank\types\Date;
+
+/**
+ * Container Object Class
+ * This class contains an instance of a database handling that is needed to
+ * permanently store and retrieve Container Object instances.
+ *
+ * PHP Version 7.2
+ *
+ * @category Loris
+ * @package  Biobank
+ * @author   Henri Rabalais <hrabalais.mcin@gmail.com>
+ * @license  http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
+ * @link     https://www.github.com/aces/Loris/
+ */
+
+class Container extends Model implements \LORIS\StudyEntities\SiteHaver
+{
+    public function __construct(
+        public ?int $id,
+        public ?string $barcode,
+        public ?float $temperature,
+        public ?Type $type,
+        public ?Center $center,
+        public ?Shipments $shipments, //Shipments[]
+        public ?Container $parent,
+        public ?Containers $children, //Containers[]
+        public ?int $coordinate,
+        public ?string $lotNumber,
+        public ?Date $expirationDate,
+        public ?string $comments,
+    ) {}
+
+    public function getCenterID(): \CenterID
+    {
+        return $this->center->id;
+    }
+}
diff --git a/php/models/container/type.class.inc b/php/models/container/type.class.inc
new file mode 100644
index 00000000..0ae35db4
--- /dev/null
+++ b/php/models/container/type.class.inc
@@ -0,0 +1,20 @@
+<?php declare(strict_types=1);
+
+namespace LORIS\biobank\models\container;
+
+use LORIS\biobank\Model;
+use LORIS\biobank\models\container\type\Dimension;
+use LORIS\biobank\models\container\type\Capacity;
+
+class Type extends Model
+{
+    public function __construct(
+        public ?string $label,
+        public ?string $brand,
+        public ?string $productNumber,
+        public ?bool $prime,
+        public ?Dimension $dimension,
+        public ?Capacity $capacity,
+        public ?int $id,
+    ) {}
+}
diff --git a/php/models/container/type/capacity.class.inc b/php/models/container/type/capacity.class.inc
new file mode 100644
index 00000000..5972288b
--- /dev/null
+++ b/php/models/container/type/capacity.class.inc
@@ -0,0 +1,15 @@
+<?php declare(strict_types=1);
+
+namespace LORIS\biobank\models\container\type;
+
+use LORIS\biobank\Model;
+use LORIS\biobank\models\Unit;
+
+class Capacity extends Model
+{
+    public function __construct(
+        public ?float $quantity,
+        public ?Unit $unit,
+        private ?int $id,
+    ) {}
+}
diff --git a/php/models/container/type/dimension.class.inc b/php/models/container/type/dimension.class.inc
new file mode 100644
index 00000000..21ad672f
--- /dev/null
+++ b/php/models/container/type/dimension.class.inc
@@ -0,0 +1,18 @@
+<?php
+
+namespace LORIS\biobank\models\container\type;
+
+use LORIS\biobank\Model;
+
+class Dimension extends Model
+{
+    public function __construct(
+        public ?int $x,
+        public ?bool $xNum,
+        public ?int $y,
+        public ?bool $yNum,
+        public ?int $z,
+        public ?bool $zNum,
+        public ?int $id,
+    ) {}
+}
diff --git a/php/models/container/types.class.inc b/php/models/container/types.class.inc
new file mode 100644
index 00000000..d0e6fcc5
--- /dev/null
+++ b/php/models/container/types.class.inc
@@ -0,0 +1,10 @@
+<?php declare(strict_types=1);                                                     
+                                                                                   
+namespace LORIS\biobank\models\container;                                                    
+                                                                                   
+use LORIS\biobank\Models;                                                          
+                                                                                   
+final class Types extends Models
+{
+    public static string $model = Type::class;
+}
diff --git a/php/models/containers.class.inc b/php/models/containers.class.inc
new file mode 100644
index 00000000..23892402
--- /dev/null
+++ b/php/models/containers.class.inc
@@ -0,0 +1,10 @@
+<?php declare(strict_types=1); 
+
+namespace LORIS\biobank\models;
+
+use LORIS\biobank\Models;
+
+class Containers extends Models
+{
+    public static string $model = Container::class;    
+}
diff --git a/php/models/diagnoses.class.inc b/php/models/diagnoses.class.inc
new file mode 100644
index 00000000..cfb64653
--- /dev/null
+++ b/php/models/diagnoses.class.inc
@@ -0,0 +1,10 @@
+<?php declare(strict_types=1); 
+
+namespace LORIS\biobank\models;
+
+use LORIS\biobank\Models;
+
+final class Diagnoses extends Models
+{
+    public static string $model = Diagnosis::class;
+}
diff --git a/php/models/diagnosis.class.inc b/php/models/diagnosis.class.inc
new file mode 100644
index 00000000..fee57e86
--- /dev/null
+++ b/php/models/diagnosis.class.inc
@@ -0,0 +1,14 @@
+<?php declare(strict_types=1);   
+
+namespace LORIS\biobank\models;                                                    
+
+use LORIS\biobank\Model;
+                                                                                   
+final class Diagnosis extends Model                                                           
+{                                                                                  
+    public function __construct(                                                   
+        public readonly ?string $abbreviation,                                                      
+        public readonly ?string $label,                                                      
+        public readonly ?int $id,                                                           
+    ) {}                                                                           
+}   
diff --git a/php/models/examiner.class.inc b/php/models/examiner.class.inc
new file mode 100644
index 00000000..16059832
--- /dev/null
+++ b/php/models/examiner.class.inc
@@ -0,0 +1,13 @@
+<?php declare(strict_types=1);  
+
+namespace LORIS\biobank\models;                                                 
+
+use LORIS\biobank\Model;
+                                                                                
+class Examiner extends Model
+{                                                                               
+    public function __construct(                                                
+        public string $label,                                                 
+        private ?int $id,                                                         
+    ) {}                                                                        
+}  
diff --git a/php/models/pool.class.inc b/php/models/pool.class.inc
new file mode 100644
index 00000000..ab1d0a97
--- /dev/null
+++ b/php/models/pool.class.inc
@@ -0,0 +1,80 @@
+<?php declare(strict_types=1);
+/**
+ * Pool Class
+ * This class contains an instance of a database handling that is needed to
+ * permanently store and retrieve Pool Object instances.
+ *
+ * PHP Version 7.2
+ *
+ * @category   Entity
+ * @package    Loris
+ * @subpackage Biobank
+ * @author     Henri Rabalais <henri.rabalais@mcin.ca>
+ * @license    http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
+ * @link       https://www.github.com/aces/Loris/
+ */
+namespace LORIS\biobank\models;
+
+use LORIS\biobank\Model;
+use LORIS\biobank\models\specimen\Type;
+use LORIS\biobank\types\Date;
+use LORIS\biobank\types\Time;
+
+/**
+ * Pool Class
+ * This class contains an instance of a database handling that is needed to
+ * permanently store and retrieve Pool Object instances.
+ *
+ * PHP Version 7.2
+ *
+ * @category   Entity
+ * @package    Loris
+ * @subpackage Biobank
+ * @author     Henri Rabalais <henri.rabalais@mcin.ca>
+ * @license    http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
+ * @link       https://www.github.com/aces/Loris/
+ */
+final class Pool extends Model implements \LORIS\StudyEntities\SiteHaver
+{
+     public function __construct(
+        public readonly ?string $label,
+        public readonly ?float $quantity,
+        public readonly ?Date $date,
+        public readonly ?Time $time,
+        public readonly ?int $id,
+        public readonly ?Unit $unit,
+        public readonly ?Specimens $specimens,
+        public ?Projects $projects,
+        public ?Center $center,
+        public ?Candidate $candidate,
+        public ?Session $session,
+        public ?Type $type,
+    ) {}
+
+    public function getCenterID(): \CenterID
+    {
+        return $this->center->id;
+    }
+
+    public function getProjectIDs(): array
+    {
+        return $this->projects->getIds();
+    }
+
+
+    /**
+     * Returns additional properties to be included in JSON serialization.
+     * Child classes should override this method to add extra properties.
+     *
+     * @return array
+     */
+    // protected function toJSON(): array
+    // {
+    //     return [
+    //       'center' => $this->specimens[0]->center,,
+    //       'candidate' => $this->specimens[0]->candidate,
+    //       'session' => $this->specimens[0]->candidate,
+    //       'type' => $this->specimens[0]->type,
+    //     ];
+    // }
+}
diff --git a/php/models/project.class.inc b/php/models/project.class.inc
new file mode 100644
index 00000000..bb0fde1a
--- /dev/null
+++ b/php/models/project.class.inc
@@ -0,0 +1,13 @@
+<?php declare(strict_types=1);   
+
+namespace LORIS\biobank\models;                                                    
+
+use LORIS\biobank\Model;
+                                                                                   
+final class Project extends Model                                                           
+{                                                                                  
+    public function __construct(                                                   
+        public readonly \ProjectID $id,                                                           
+        public readonly ?string $label,                                                      
+    ) {}                                                                           
+}   
diff --git a/php/models/projects.class.inc b/php/models/projects.class.inc
new file mode 100644
index 00000000..d3fc24ac
--- /dev/null
+++ b/php/models/projects.class.inc
@@ -0,0 +1,10 @@
+<?php declare(strict_types=1);                                                     
+                                                                                   
+namespace LORIS\biobank\models;                                                    
+                                                                                   
+use LORIS\biobank\Models;   
+
+final class Projects extends Models
+{
+    public static string $model = Project::class;
+}
diff --git a/php/models/session.class.inc b/php/models/session.class.inc
new file mode 100644
index 00000000..c3f5b62c
--- /dev/null
+++ b/php/models/session.class.inc
@@ -0,0 +1,13 @@
+<?php declare(strict_types=1);   
+
+namespace LORIS\biobank\models;                                                    
+
+use LORIS\biobank\Model;
+                                                                                   
+final class Session extends Model                                                           
+{                                                                                  
+    public function __construct(                                                   
+        public readonly ?string $label,                                                      
+        private readonly ?int $id,                                                           
+    ) {}                                                                           
+}   
diff --git a/php/models/sessions.class.inc b/php/models/sessions.class.inc
new file mode 100644
index 00000000..82beabcc
--- /dev/null
+++ b/php/models/sessions.class.inc
@@ -0,0 +1,10 @@
+<?php declare(strict_types=1); 
+
+namespace LORIS\biobank\models;
+
+use LORIS\biobank\Models;
+
+final class Sessions extends Models
+{
+    public static string $model = Session::class;
+}
diff --git a/php/models/shipment.class.inc b/php/models/shipment.class.inc
new file mode 100644
index 00000000..70615c81
--- /dev/null
+++ b/php/models/shipment.class.inc
@@ -0,0 +1,88 @@
+<?php declare(strict_types=1);
+/**
+ * Shipment Class
+ * This class contains an instance of a database handling that is needed to
+ * permanently store and retrieve Shipment Object instances.
+ *
+ * PHP Version 7.2
+ *
+ * @category   Entity
+ * @package    Loris
+ * @subpackage Biobank
+ * @author     Henri Rabalais <henri.rabalais@mcin.ca>
+ * @license    http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
+ * @link       https://www.github.com/aces/Loris/
+ */
+namespace LORIS\biobank\models;
+
+use LORIS\biobank\Model;
+use LORIS\biobank\models\Center;
+use LORIS\biobank\models\Containers;
+use LORIS\biobank\models\shipment\Logs;
+use LORIS\biobank\models\shipment\Type;
+
+/**
+ * Shipment Class
+ * This class contains an instance of a database handling that is needed to
+ * permanently store and retrieve Shipment Object instances.
+ *
+ * PHP Version 7.2
+ *
+ * @category   Entity
+ * @package    Loris
+ * @subpackage Biobank
+ * @author     Henri Rabalais <henri.rabalais@mcin.ca>
+ * @license    http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
+ * @link       https://www.github.com/aces/Loris/
+ */
+class Shipment extends Model implements \LORIS\StudyEntities\MultiSiteHaver
+{
+    public function __construct(
+        private ?int $id,
+        public ?string $barcode,
+        public ?Type $type,
+        public ?Center $destinationCenter,
+        public ?Containers $containers,
+        public ?Logs $logs,
+    ) {}
+
+    public function getOriginCenter(): ?Center
+    {
+        return !empty($this->logs) ? $this->logs[0]->center : null;
+    }
+
+    public function getStatus(): ?string
+    {
+        return !empty($this->logs) ? $this->logs[array_key_last($this->logs)]->status : null;
+    }
+
+    public function isActive(): bool
+    {
+        return $this->getStatus() !== 'received';
+    }
+
+    public function getCenterIds(): array
+    {
+        switch ($this->getStatus()) {
+       // TODO: Instead of checking for strings, this ideally would check for
+       // boolean values from functions such as getActive(). This way, the
+       // strings will be relegated to singular functions that then serve
+       // functional purposes.
+            case 'received':
+                return [$this->destinationCenter->id];
+            case 'shipped':
+                return [$this->getOriginCenter()->id, $this->destinationCenter->id];
+            default:
+                return [$this->getOriginCenter()->id];
+        }
+    }
+
+    public function toJSON(): array 
+    {
+        return [
+            'originCenter' => $this->getOriginCenter(),
+            'status' => $this->getStatus(),
+            'active' => $this->isActive(),
+        ];
+    }
+}
diff --git a/php/models/shipment/log.class.inc b/php/models/shipment/log.class.inc
new file mode 100644
index 00000000..20739ce8
--- /dev/null
+++ b/php/models/shipment/log.class.inc
@@ -0,0 +1,51 @@
+<?php declare(strict_types=1);
+/**
+ * Log Class
+ * This class contains an instance of a database handling that is needed to
+ * permanently store and retrieve Log Object instances.
+ *
+ * PHP Version 7.2
+ *
+ * @category   Entity
+ * @package    Loris
+ * @subpackage Biobank
+ * @author     Henri Rabalais <henri.rabalais@mcin.ca>
+ * @license    http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
+ * @link       https://www.github.com/aces/Loris/
+ */
+namespace LORIS\biobank\models\shipment;
+
+use LORIS\biobank\Model;
+use LORIS\biobank\models\Shipment;
+use LORIS\biobank\models\Center;
+use LORIS\biobank\models\User;
+use LORIS\biobank\type\Date;
+use LORIS\biobank\type\Time;
+
+/**
+ * Log Class
+ * This class contains an instance of a database handling that is needed to
+ * permanently store and retrieve Log Object instances.
+ *
+ * PHP Version 7.2
+ *
+ * @category   Entity
+ * @package    Loris
+ * @subpackage Biobank
+ * @author     Henri Rabalais <henri.rabalais@mcin.ca>
+ * @license    http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
+ * @link       https://www.github.com/aces/Loris/
+ */
+class Log extends Model
+{
+    public function __construct(
+        protected Shipment $shipment,
+        protected Center $center,
+        protected Status $status,
+        protected User $user,
+        protected float $temperature,
+        protected Date $date,
+        protected Time $time,
+        protected string $comments
+    ) {}
+}
diff --git a/php/models/shipment/status.class.inc b/php/models/shipment/status.class.inc
new file mode 100644
index 00000000..759fc285
--- /dev/null
+++ b/php/models/shipment/status.class.inc
@@ -0,0 +1,13 @@
+<?php declare(strict_types=1);  
+
+namespace LORIS\biobank\models\shipment;                                                 
+
+use LORIS\biobank\Model;
+                                                                                
+class Status extends Model
+{                                                                               
+    public function __construct(                                                
+        public string $label,                                                 
+        public ?int $id = null,                                                         
+    ) {}                                                                        
+}  
diff --git a/php/models/shipment/type.class.inc b/php/models/shipment/type.class.inc
new file mode 100644
index 00000000..c2c02100
--- /dev/null
+++ b/php/models/shipment/type.class.inc
@@ -0,0 +1,13 @@
+<?php declare(strict_types=1);  
+
+namespace LORIS\biobank\models\shipment;                                                 
+
+use LORIS\biobank\Model;
+                                                                                
+class Type extends Model
+{                                                                               
+    public function __construct(                                                
+        public string $label,                                                 
+        public ?int $id = null,                                                         
+    ) {}                                                                        
+}  
diff --git a/php/models/shipments.class.inc b/php/models/shipments.class.inc
new file mode 100644
index 00000000..993afc8b
--- /dev/null
+++ b/php/models/shipments.class.inc
@@ -0,0 +1,10 @@
+<?php declare(strict_types=1); 
+
+namespace LORIS\biobank\models;
+
+use LORIS\biobank\Models;
+
+final class Shipments extends Models
+{
+    public static string $model = Shipment::class;
+}
diff --git a/php/models/specimen.class.inc b/php/models/specimen.class.inc
new file mode 100644
index 00000000..3e044b4b
--- /dev/null
+++ b/php/models/specimen.class.inc
@@ -0,0 +1,66 @@
+<?php declare(strict_types=1);
+/**
+ * Specimen Object Class
+ * This class contains an instance of a database handling that is needed to
+ * permanently store and retrieve Specimen Object instances.
+ *
+ * PHP Version 7.2
+ *
+ * @category   Entity
+ * @package    Loris
+ * @subpackage Biobank
+ * @author     Henri Rabalais <henri.rabalais@mcin.ca>
+ * @license    http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
+ * @link       https://www.github.com/aces/Loris/
+ */
+namespace LORIS\biobank\models;
+
+use LORIS\biobank\Model;
+use LORIS\biobank\models\specimen\Type;
+use LORIS\biobank\models\specimen\process\Collection;
+use LORIS\biobank\models\specimen\process\Preparation;
+use LORIS\biobank\models\specimen\process\Analysis;
+
+/**
+ * Specimen Object Class
+ * This class contains an instance of a database handling that is needed to
+ * permanently store and retrieve Specimen Object instances.
+ *
+ * PHP Version 7.2
+ *
+ * @category   Entity
+ * @package    Loris
+ * @subpackage Biobank
+ * @author     Henri Rabalais <henri.rabalais@mcin.ca>
+ * @license    http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
+ * @link       https://www.github.com/aces/Loris/
+ */
+final class Specimen extends Model implements \LORIS\StudyEntities\SiteHaver
+{
+    public function __construct(
+        public readonly ?int $id,
+        public readonly ?float $quantity,
+        public readonly ?int $fTCycle,
+        public readonly ?Unit $unit,
+        public readonly ?Type $type,
+        public readonly ?Projects $projects,
+        public readonly ?Specimens $parents,
+        public readonly ?Candidate $candidate,
+        public readonly ?Session $session,
+        public readonly ?Pool $pool,
+        public readonly ?Collection $collection,
+        public readonly ?Preparation $preparation,
+        public readonly ?Analysis $analysis,
+        public ?Container $container,
+    ) {}
+
+    public function getCenterID(): \CenterID
+    {
+        return $this->container->center->id;
+    }
+
+    public function getProjectIDs(): ?array
+    {
+        return $this->projects->getIds();
+    }
+}
diff --git a/php/models/specimen/attribute.class.inc b/php/models/specimen/attribute.class.inc
new file mode 100644
index 00000000..1af66672
--- /dev/null
+++ b/php/models/specimen/attribute.class.inc
@@ -0,0 +1,15 @@
+<?php declare(strict_types=1); 
+
+namespace LORIS\biobank\models\specimen;
+
+use LORIS\biobank\Model;
+use LORIS\biobank\models\specimen\attribute\Datatype;
+
+final class Attribute extends Model
+{
+    public function __construct(
+        public ?string $label,
+        public ?DataType $datatype,
+        private ?int $id = null,
+    ) {}
+}
diff --git a/php/models/specimen/attribute/datatype.class.inc b/php/models/specimen/attribute/datatype.class.inc
new file mode 100644
index 00000000..8fdc0bc1
--- /dev/null
+++ b/php/models/specimen/attribute/datatype.class.inc
@@ -0,0 +1,13 @@
+<?php declare(strict_types=1);
+
+namespace LORIS\biobank\models\specimen\attribute;
+
+use LORIS\biobank\Model;
+
+final class DataType extends Model
+{
+    public function __construct(
+        public readonly ?string $label,
+        private readonly ?int $id = null,
+    ) {}
+}
diff --git a/php/models/specimen/process.class.inc b/php/models/specimen/process.class.inc
new file mode 100644
index 00000000..bde9fda5
--- /dev/null
+++ b/php/models/specimen/process.class.inc
@@ -0,0 +1,23 @@
+<?php declare(strict_types=1);
+
+namespace LORIS\biobank\models\specimen;
+
+use LORIS\biobank\Model;
+use LORIS\biobank\models\Center;
+use LORIS\biobank\models\Examiner;
+use LORIS\biobank\types\Date;
+use LORIS\biobank\types\Time;
+
+abstract class Process extends Model
+{
+    public function __construct(
+        private ?int $id = null,
+        public ?Center $center = null,
+        public ?Examiner $examiner = null,
+        public ?Date $date = null,
+        public ?Time $time = null,
+        public ?string $comments = null,
+        public ?array $data = null,
+        public ?Protocol $protocol = null,
+    ) {}
+}
diff --git a/php/analysis.class.inc b/php/models/specimen/process/analysis.class.inc
similarity index 59%
rename from php/analysis.class.inc
rename to php/models/specimen/process/analysis.class.inc
index 41331d8c..5829ceaf 100644
--- a/php/analysis.class.inc
+++ b/php/models/specimen/process/analysis.class.inc
@@ -14,7 +14,9 @@
  * @link       https://www.github.com/aces/Loris/
  */
 
-namespace LORIS\biobank;
+namespace LORIS\biobank\models\specimen\process;
+
+use LORIS\biobank\models\specimen\Process;
 
 /**
  * Specimen Analysis Class
@@ -31,31 +33,7 @@ namespace LORIS\biobank;
  * @link       https://www.github.com/aces/Loris/
  */
 
-class Analysis extends Process
+final class Analysis extends Process
 {
-    /**
-     * A wrapper function for the jsonSerialize method of the Analysis Instance
-     * Class. This converts this Specimen Analysis into an array
-     *
-     * @return array Specimen Array
-     */
-    public function toArray()
-    {
-        return $this->jsonSerialize();
-    }
-
-    /**
-     * Returns an array representing the state of the Specimen.
-     *
-     * @return array
-     */
-    public function jsonSerialize() : array
-    {
-        $parent = parent::jsonSerialize();
-        return array_merge(
-            $parent,
-            []
-        );
-    }
 }
 
diff --git a/php/models/specimen/process/collection.class.inc b/php/models/specimen/process/collection.class.inc
new file mode 100644
index 00000000..92a77f98
--- /dev/null
+++ b/php/models/specimen/process/collection.class.inc
@@ -0,0 +1,57 @@
+<?php declare(strict_types=1);
+/**
+ * Collection Object Class
+ * This class contains an instance of a database handling that is needed to
+ * permanently store and retrieve Collection Object instances.
+ *
+ * PHP Version 7.2
+ *
+ * @category   Entity
+ * @package    Loris
+ * @subpackage Biobank
+ * @author     Henri Rabalais <henri.rabalais@mcin.ca>
+ * @license    http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
+ * @link       https://www.github.com/aces/Loris/
+ */
+namespace LORIS\biobank\models\specimen\process;
+
+use LORIS\biobank\types\Time;
+use LORIS\biobank\types\Date;
+use LORIS\biobank\models\Unit;
+use LORIS\biobank\models\Center;
+use LORIS\biobank\models\Examiner;
+use LORIS\biobank\models\specimen\Protocol;
+use LORIS\biobank\models\specimen\Process;
+
+/**
+ * Collection Object Class
+ * This class contains an instance of a database handling that is needed to
+ * permanently store and retrieve Collection Object instances.
+ *
+ * PHP Version 7.2
+ *
+ * @category   Entity
+ * @package    Loris
+ * @subpackage Biobank
+ * @author     Henri Rabalais <henri.rabalais@mcin.ca>
+ * @license    http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
+ * @link       https://www.github.com/aces/Loris/
+ */
+
+final class Collection extends Process
+{
+    public function __construct(
+        public readonly ?float $quantity,
+        public readonly ?Unit $unit,
+        public ?int $id,
+        public ?Center $center,
+        public ?Examiner $examiner,
+        public ?Date $date,
+        public ?Time $time,
+        public ?string $comments,
+        public ?array $data,
+        public ?Protocol $protocol
+    ) {
+        parent::__construct($id, $center, $examiner, $date, $time, $comments, $data, $protocol);
+    }
+}
diff --git a/php/models/specimen/process/preparation.class.inc b/php/models/specimen/process/preparation.class.inc
new file mode 100644
index 00000000..e959b7f5
--- /dev/null
+++ b/php/models/specimen/process/preparation.class.inc
@@ -0,0 +1,37 @@
+<?php declare(strict_types=1);
+/**
+ * Preparation Object Class
+ * This class contains an instance of a database handling that is needed to
+ * permanently store and retrieve Preparation Object instances.
+ *
+ * PHP Version 7.2
+ *
+ * @category Entity
+ * @package  Biobank
+ * @author   Henri Rabalais <henri.rabalais@mcin.ca>
+ * @license  http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
+ * @link     https://www.github.com/aces/Loris/
+ */
+
+namespace LORIS\biobank\models\specimen\process;
+
+use LORIS\biobank\models\specimen\Process;
+
+/**
+ * Preparation Object Class
+ * This class contains an instance of a database handling that is needed to
+ * permanently store and retrieve Preparation Object instances.
+ *
+ * PHP Version 7.2
+ *
+ * @category   Entity
+ * @package    Loris
+ * @subpackage Biobank
+ * @author     Henri Rabalais <henri.rabalais@mcin.ca>
+ * @license    http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
+ * @link       https://www.github.com/aces/Loris/
+ */
+final class Preparation extends Process
+{
+}
+
diff --git a/php/models/specimen/process/type.class.inc b/php/models/specimen/process/type.class.inc
new file mode 100644
index 00000000..90ba87e3
--- /dev/null
+++ b/php/models/specimen/process/type.class.inc
@@ -0,0 +1,13 @@
+<?php declare(strict_types=1);
+
+namespace LORIS\biobank\models\specimen\process;
+
+use LORIS\biobank\Model;
+
+final class Type extends Model
+{
+    public function __construct(
+        public readonly ?string $label,
+        private readonly ?int $id,
+    ) {}
+}
diff --git a/php/models/specimen/protocol.class.inc b/php/models/specimen/protocol.class.inc
new file mode 100644
index 00000000..e2f6f91b
--- /dev/null
+++ b/php/models/specimen/protocol.class.inc
@@ -0,0 +1,17 @@
+<?php declare(strict_types=1);
+
+namespace LORIS\biobank\models\specimen;
+
+use LORIS\biobank\Model;
+use LORIS\biobank\models\specimen\Type;
+use LORIS\biobank\models\specimen\process;
+
+final class Protocol extends Model
+{
+    public function __construct(
+        public readonly ?string $label,
+        public readonly ?Type $type = null,
+        public readonly ?process\Type $process = null,
+        private readonly ?int $id = null,
+    ) {}
+}
diff --git a/php/models/specimen/protocols.class.inc b/php/models/specimen/protocols.class.inc
new file mode 100644
index 00000000..0770a5ec
--- /dev/null
+++ b/php/models/specimen/protocols.class.inc
@@ -0,0 +1,10 @@
+<?php declare(strict_types=1);                                                     
+                                                                                   
+namespace LORIS\biobank\models\specimen;                                                    
+                                                                                   
+use LORIS\biobank\Models;                                                          
+                                                                                   
+final class Protocols extends Models
+{
+    public static string $model = Protocol::class;
+}
diff --git a/php/models/specimen/type.class.inc b/php/models/specimen/type.class.inc
new file mode 100644
index 00000000..2ed01d98
--- /dev/null
+++ b/php/models/specimen/type.class.inc
@@ -0,0 +1,20 @@
+<?php declare(strict_types=1);
+
+namespace LORIS\biobank\models\specimen;
+
+use LORIS\biobank\Model;
+use LORIS\biobank\models\Units;
+use LORIS\biobank\models\container\Types as ContainerTypes;
+
+final class Type extends Model
+{
+    public function __construct(
+        public readonly ?string $label,
+        public readonly ?bool $freezeThaw,
+        public readonly ?Units $units,
+        public readonly ?ContainerTypes $containers,
+        public readonly ?Types $parents,
+        public readonly ?Protocols $protocols,
+        public readonly ?int $id = null,
+    ) {}
+}
diff --git a/php/models/specimen/types.class.inc b/php/models/specimen/types.class.inc
new file mode 100644
index 00000000..933e6f42
--- /dev/null
+++ b/php/models/specimen/types.class.inc
@@ -0,0 +1,10 @@
+<?php declare(strict_types=1);                                                     
+                                                                                   
+namespace LORIS\biobank\models\specimen;                                                    
+                                                                                   
+use LORIS\biobank\Models;                                                          
+                                                                                   
+final class Types extends Models
+{
+    public static string $model = Type::class;
+}
diff --git a/php/models/specimens.class.inc b/php/models/specimens.class.inc
new file mode 100644
index 00000000..89a9e87d
--- /dev/null
+++ b/php/models/specimens.class.inc
@@ -0,0 +1,10 @@
+<?php declare(strict_types=1);                                                     
+                                                                                   
+namespace LORIS\biobank\models;                                                    
+                                                                                   
+use LORIS\biobank\Models;                                                          
+                                                                                   
+final class Specimens extends Models
+{
+    public static string $model = Specimen::class;
+}
diff --git a/php/models/unit.class.inc b/php/models/unit.class.inc
new file mode 100644
index 00000000..bdad2a11
--- /dev/null
+++ b/php/models/unit.class.inc
@@ -0,0 +1,13 @@
+<?php declare(strict_types=1);  
+
+namespace LORIS\biobank\models;                                                 
+
+use LORIS\biobank\Model;
+                                                                                
+class Unit extends Model
+{                                                                               
+    public function __construct(                                                
+        public ?string $label,                                                 
+        public ?int $id,                                                         
+    ) {}                                                                        
+}  
diff --git a/php/models/units.class.inc b/php/models/units.class.inc
new file mode 100644
index 00000000..46c2788b
--- /dev/null
+++ b/php/models/units.class.inc
@@ -0,0 +1,10 @@
+<?php declare(strict_types=1);                                                     
+                                                                                   
+namespace LORIS\biobank\models;                                                    
+                                                                                   
+use LORIS\biobank\Models;                                                          
+                                                                                   
+final class Units extends Models
+{
+    public static string $model = Unit::class;
+}
diff --git a/php/module.class.inc b/php/module.class.inc
index 59fdc3b1..28885676 100644
--- a/php/module.class.inc
+++ b/php/module.class.inc
@@ -3,7 +3,7 @@
  * This serves as a hint to LORIS that this module is a real module.
  * It does nothing but implement the module class in the module's namespace.
  *
- * PHP Version 7.2
+ * PHP Version 8.3
  *
  * @category   Module
  * @package    Main
@@ -13,8 +13,10 @@
  * @link       https://www.github.com/aces/Loris-Trunk/
  */
 namespace LORIS\biobank;
+
 use \Psr\Http\Message\ServerRequestInterface;
 use \Psr\Http\Message\ResponseInterface;
+use \LORIS\biobank\endpoints;
 
 /**
  * Class module implements the basic LORIS module functionality
@@ -47,7 +49,6 @@ class Module extends \Module
             );
     }
 
-
     /**
      * The default handler for a module routes to a page of the first component of
      * the URL's name, or the same name as the module if serving the root of the
@@ -59,195 +60,48 @@ class Module extends \Module
      *
      * @param ServerRequestInterface $request The incoming PSR7 request
      *
-     * @return ResponseInterface the outgoing PSR7 response
+     * @return ResponseInterface The outgoing PSR7 response
      */
     public function handle(ServerRequestInterface $request) : ResponseInterface
     {
-        $this->logger->debug("Module handle function called");
-        $resp = parent::handle($request);
-        if ($resp->getStatusCode() != 404) {
-            $path = $request->getURI()->getPath();
-            if (preg_match('/(\.css)$/', $path) == 1) {
-                $resp = $resp->withHeader(
-                    "Content-Type",
-                    "text/css"
-                );
-            }
-            if (preg_match('/(\.js)$/', $path) == 1) {
-                $resp = $resp->withHeader(
-                    "Content-Type",
-                    "application/javascript"
-                );
-            }
-            return $resp;
-        }
+        // Set the session variable for group_concat_max_len
+        ini_set('memory_limit', '-1');
+        ini_set('max_execution_time', 200);
+        ini_set('display_errors', 1);
+        ini_set('display_startup_errors', 1);
+        error_reporting(E_ALL);
 
-        $this->lorisinstance = $request->getAttribute("loris");
-        $pagename            = $this->getName();
+        $this->loris->getDatabaseConnection()->run("SET SESSION group_concat_max_len = 536870912;");
+
+        // Get the stripped path from the request URI
         $path = trim($request->getURI()->getPath(), "/");
-        if ($path == 'optionsendpoint'
-            || $path == 'poolendpoint'
-            || $path == 'containerendpoint'
-            || $path == 'specimenendpoint'
-        ) {
-            // There is a subpage
-            $pagename = explode("/", $path)[0];
-        }
+        $pathparts = explode('/', $path);
 
-        $user  = $request->getAttribute("user") ?? new \LORIS\AnonymousUser();
-        $loris = $request->getAttribute("loris");
+        // Determine the handler based on the stripped path
+        $handler = match ($pathparts[0]) {
+            'specimens' => new endpoints\Specimens($this->loris),
+            'containers' => new endpoints\Containers($this->loris),
+            'shipments' => new endpoints\Shipments($this->loris),
+            'pools' => new endpoints\Pools($this->loris),
+            'centers' => new endpoints\Centers($this->loris),
+            'diagnoses' => new endpoints\Diagnoses($this->loris),
+            'examiners' => new endpoints\Examiners($this->loris),
+            'candidates' => new endpoints\Candidates($this->loris),
+            'projects' => new endpoints\Projects($this->loris),
+            'users' => new endpoints\Users($this->loris),
+            'session' => new endpoints\Sessions($this->loris),
+            default => null
+        };
 
-        try {
-            $page = $this->loadPage($loris, $pagename);
-        } catch (\NotFound $e) {
-            $this->logger->debug("Page $pagename not found");
-            return $resp->withStatus(404);
-        }
-        // FIXME: Hack required for breadcrumbs. This should be removed,
-        // but some tests depend on it.
-        if ($this->getName() === $pagename) {
-            $_REQUEST['test_name'] = $pagename;
-        } else {
-            $_REQUEST['subtest'] = $pagename;
-        }
 
-        $page->loadResources($user, $request);
-        if ($page->_hasAccess($user) !== true) {
-            return (new \LORIS\Middleware\PageDecorationMiddleware(
-                $user
-            ))->process(
-                $request,
-                new \LORIS\Router\NoopResponder(
-                    new \LORIS\Http\Error(
-                        $request,
-                        403,
-                        "You do not have access to this page."
-                    )
-                )
-            );
+        // If handler is a ResponseInterface, return it directly
+        if ($handler === null) {
+            return parent::handle($request);
         }
-        return $page->process($request, $page);
-    }
 
-//
-//    /**
-//     * The default handler for a module routes to a page of the first component of
-//     * the URL's name, or the same name as the module if serving the root of the
-//     * module.
-//     *
-//     * Modules extend PrefixRouter, so that the parent handler knows that the
-//     * css, static, and js routes should be routed through the file system to
-//     * retrieve the files before trying to load any specific pages.
-//     *
-//     * @param ServerRequestInterface $request The incoming PSR7 request
-//     *
-//     * @return ResponseInterface the outgoing PSR7 response
-//     */
-//    public function handle(ServerRequestInterface $request) : ResponseInterface
-//    {
-//        $resp = parent::handle($request);
-//        if ($resp->getStatusCode() != 404) {
-//            $path = $request->getURI()->getPath();
-//            if (preg_match('/(\.css)$/', $path) == 1) {
-//                $resp = $resp->withHeader(
-//                    "Content-Type",
-//                    "text/css"
-//                );
-//            }
-//            if (preg_match('/(\.js)$/', $path) == 1) {
-//                $resp = $resp->withHeader(
-//                    "Content-Type",
-//                    "application/javascript"
-//                );
-//            }
-//            return $resp;
-//        }
-//
-//        $pagename = $this->getName();
-//        $path     = trim($request->getURI()->getPath(), "/");
-//        if ($path == 'optionsendpoint'
-//            || $path == 'poolendpoint'
-//            || $path == 'containerendpoint'
-//            || $path == 'specimenendpoint'
-//        ) {
-//            // There is a subpage
-//            $pagename = explode("/", $path)[0];
-//        }
-//
-//        try {
-//            $page = $this->loadPage($this->loris, $pagename);
-//            // FIXME: Hack required for breadcrumbs. This should be removed,
-//            // but some tests depend on it.
-//            if ($this->getName() === $pagename) {
-//                $_REQUEST['test_name'] = $pagename;
-//            } else {
-//                $_REQUEST['subtest'] = $pagename;
-//            }
-//
-//            $user = $request->getAttribute("user") ?? new \LORIS\AnonymousUser();
-//            if ($page->_hasAccess($user) !== true) {
-//                return (new \LORIS\Middleware\PageDecorationMiddleware(
-//                    $user
-//                ))->process(
-//                    $request,
-//                    new \LORIS\Router\NoopResponder(
-//                        new \LORIS\Http\Error(
-//                            $request,
-//                            403,
-//                            "You do not have access to this page."
-//                        )
-//                    )
-//                );
-//            }
-//        } catch (\NotFound $e) {
-//            return (new \LORIS\Middleware\PageDecorationMiddleware(
-//                $user
-//            ))->process(
-//                $request,
-//                new \LORIS\Router\NoopResponder(
-//                    new \LORIS\Http\Error(
-//                        $request,
-//                        404,
-//                        "File not found: " . $request->getURI()->__toString()
-//                    )
-//                )
-//            );
-//            /* The order of these catch statements matter and should go from
-//             * most to least specific. Otherwise all Exceptions will be caught
-//             * as their more generic parent class which reduces precision.
-//             */
-//        } catch (\DatabaseException $e) {
-//            error_log($e->getMessage());
-//            return $this->responseStatus500(
-//                $request,
-//                $user,
-//                self::GENERIC_500_ERROR
-//            );
-//        } catch (\ConfigurationException $e) {
-//            error_log($e->getMessage());
-//            return $this->responseStatus500(
-//                $request,
-//                $user,
-//                self::CONFIGURATION_ERROR
-//            );
-//        } catch (\LorisException $e) {
-//            error_log($e->getMessage());
-//            return $this->responseStatus500(
-//                $request,
-//                $user,
-//                self::GENERIC_500_ERROR
-//            );
-//        } catch (\Exception $e) {
-//            error_log($e->getMessage());
-//            return $this->responseStatus500(
-//                $request,
-//                $user,
-//                self::GENERIC_500_ERROR
-//            );
-//        }
-//
-//        return $page->process($request, $page);
-//    }
+        // Process the request with the determined handler
+        return $handler->process($request, $handler);
+    }
 
     /**
      * {@inheritDoc}
@@ -256,7 +110,7 @@ class Module extends \Module
      */
     public function getMenuCategory() : string
     {
-        return "Biospecimens";
+        return "Biobank";
     }
 
     /**
@@ -268,4 +122,14 @@ class Module extends \Module
     {
         return "Biobank";
     }
+
+        /**
+     * {@inheritDoc}
+     *
+     * @return bool Whether an api schema is available fro this module.
+     */
+    public function hasAPISpecification(): bool
+    {
+        return false;
+    }
 }
diff --git a/php/optionsendpoint.class.inc b/php/optionsendpoint.class.inc
deleted file mode 100644
index c1aa3e94..00000000
--- a/php/optionsendpoint.class.inc
+++ /dev/null
@@ -1,248 +0,0 @@
-<?php declare(strict_types=1);
-/**
- * This implements the Options endpoint class for the Biobank Module.
- *
- * PHP Version 7.2
- *
- * @category   API
- * @package    Loris
- * @subpackage Biobank
- * @author     Henri Rabalais <henri.rabalais@mcin.ca>
- * @license    http://www.gnu.org/licenses/gpl-3.0.text GPLv3
- * @link       http://www.github.com/aces/Loris
- */
-namespace LORIS\biobank;
-use \Psr\Http\Message\ServerRequestInterface;
-use \Psr\Http\Server\RequestHandlerInterface;
-use \Psr\Http\Message\ResponseInterface;
-
-/**
- * A class for handling the /biobank/options/ endpoint.
- *
- * PHP Version 7.2
- *
- * @category   API
- * @package    Loris
- * @subpackage Biobank
- * @author     Henri Rabalais <henri.rabalais@mcin.ca>
- * @license    http://www.gnu.org/licenses/gpl-3.0.text GPLv3
- * @link       http://www.github.com/aces/Loris/
- */
-class OptionsEndpoint extends \NDB_Page implements RequestHandlerInterface
-{
-    /**
-     * Returns true if user has access to this endpoint.
-     *
-     * @param \User $user The user whose access is being checked.
-     *
-     * @return bool
-     */
-    function _hasAccess(\User $user) : bool
-    {
-        return true;
-    }
-
-    /**
-     * Return which methods are supported by this endpoint.
-     *
-     * @return array supported HTTP methods
-     */
-    protected function allowedMethods() : array
-    {
-        return [
-            'GET',
-            'OPTIONS',
-        ];
-    }
-
-    /**
-     * This function can be overridden in a module's page to load the necessary
-     * resources to check the permissions of a user.
-     *
-     * @param User                   $user    The user to load the resources for
-     * @param ServerRequestInterface $request The PSR15 Request being handled
-     *
-     * @return void
-     */
-    public function loadResources(
-        \User $user, ServerRequestInterface $request
-    ) : void {
-    }
-
-    /**
-     * This function passes the request to the handler. This is necessary since
-     * the Endpoint bypass the Module class.
-     *
-     * XXX: This function should be extracted to a parent class.
-     *
-     * @param ServerRequestInterface  $request The PSR7 request.
-     * @param RequestHandlerInterface $handler The request handler.
-     *
-     * @return ResponseInterface The outgoing PSR7 response.
-     */
-    public function process(
-        ServerRequestInterface $request,
-        RequestHandlerInterface $handler
-    ) : ResponseInterface {
-        return $handler->handle($request);
-    }
-
-    /**
-     * Handles endpoint requests.
-     *
-     * @param ServerRequestInterface $request The incoming PSR7 request
-     *
-     * @return ResponseInterface The outgoing PSR7 response
-     */
-    public function handle(ServerRequestInterface $request) : ResponseInterface
-    {
-        ini_set('memory_limit', '-1');
-        $db   = $this->loris->getDatabaseConnection();
-        $user = $request->getAttribute('user');
-
-        try {
-            switch ($request->getMethod()) {
-            case 'GET':
-                $options = $this->getOptions($db, $user);
-                return new \LORIS\Http\Response\JSON\OK($options);
-            case 'OPTIONS':
-                return (new \LORIS\Http\Response())
-                    ->withHeader('Allow', $this->allowedMethods());
-            }
-        } catch (Forbidden $e) {
-            return new \LORIS\Http\Response\JSON\Forbidden($e->getMessage());
-        }
-    }
-
-    /**
-     * Retrieves all options for populating forms and mapping front-end data.
-     *
-     * @param \Database $db   Database instance
-     * @param \User     $user User instance
-     *
-     * @return array All options required by the Biobank Module
-     */
-    function getOptions(\Database $db, \User $user)
-    {
-        $contCont = new ContainerController($this->loris, $user);
-        $specCont = new SpecimenController($this->loris, $user);
-        $shipDAO  = new ShipmentDAO($db);
-
-        $userCenters = implode(',',$user->getCenterIDs());
-        // XXX: This should eventually be replaced by a call directly to a
-        // Candidate endpoint or Candidate controller that will be able to
-        // provide Candidate Objects.
-        $query      = "SELECT c.CandID as id,
-                            PSCID as pscid,
-                            Sex as sex,
-                            GROUP_CONCAT(DISTINCT DiagnosisID) as diagnosisIds
-                       FROM candidate c
-                            LEFT JOIN session s USING (CandID)
-                            LEFT JOIN biobank_specimen bs ON (s.Id = bs.SessionID)
-                            LEFT JOIN biobank_container bc USING (ContainerID)
-                            LEFT JOIN biobank_specimen_pool_rel bspr USING (SpecimenID)
-                            LEFT JOIN biobank_pool bp USING (PoolID)
-                            LEFT JOIN candidate_diagnosis_rel USING (CandID)";
-        $where = ' ';
-        if (!$user->hasPermission('access_all_profiles')) {
-            $where = " WHERE s.CenterID IN ($userCenters)
-                            OR bc.CenterID IN ($userCenters)
-                            OR bp.CenterID IN ($userCenters)";
-        }
-        $group      =   " GROUP BY CandID";
-        $candidates = $db->pselectWithIndexKey($query.$where.$group, array(), 'id');
-        foreach ($candidates as $id => $candidate) {
-            $candidate['diagnosisIds'] = $candidate['diagnosisIds']
-                ? explode(',', $candidate['diagnosisIds'])
-                : [];
-            $candidates[$id]           = $candidate;
-        }
-
-        // XXX: This should eventually be replaced by a call directly to a
-        // Candidate endpoint or Candidate controller that will be able to provide
-        // Diagnosis Options.
-        $query     = 'SELECT DiagnosisID as id, Name as label FROM diagnosis';
-        $diagnoses = $db->pselectWithIndexKey($query, [], 'id');
-
-        // XXX: This should eventually be replaced by a call directly to a
-        // Session endpoint or Session controller that will be able to provide
-        // Session Objects.
-        $query    = 'SELECT ID as id, Visit_label as label FROM session';
-        $sessions = $db->pselectWithIndexKey($query, [], 'id');
-
-        // XXX: This should eventually be replaced by a call directly to a
-        // Examiner endpoint or Examiner controller that will be able to provide
-        // Examiner Objects.
-        $query     = 'SELECT examinerID as id, full_name as label FROM examiners';
-        $examiners = $db->pselectWithIndexKey($query, [], 'id');
-
-        // XXX: This should eventually be replaced by a call directly to a
-        // User endpoint or Examiner controller that will be able to provide
-        // User Objects.
-        $query = 'SELECT ID as id, Real_name as label FROM users';
-        $users = $db->pselectWithIndexKey($query, [], 'id');
-
-        // XXX: This should eventually be replaced by a call directly to a
-        // Center Endpoint or Center Controller that will be able to provide
-        // Center Objects.
-        $centers = \Utility::getSiteList();
-        foreach ($centers as $id => $center) {
-            if ($user->hasCenter(new \CenterID(strval($id))) === false) {
-                unset($centers[$id]);
-            }
-        }
-
-        // XXX: This should eventually be replaced by a call directly to a
-        // Session Controller or Session Options endpoint that will be able to
-        // provide these options.
-        $query  = "SELECT c.CandID as candidateId,
-                         s.ID sessionId,
-                         s.Visit_label as label,
-                         s.CenterID as centerId
-                 FROM candidate c
-                        LEFT JOIN session s USING(CandID)
-                        LEFT JOIN biobank_specimen bs ON (s.Id = bs.SessionID)
-                        LEFT JOIN biobank_container bc USING (ContainerID)
-                        LEFT JOIN biobank_specimen_pool_rel bspr USING (SpecimenID)
-                        LEFT JOIN biobank_pool bp USING (PoolID)";
-        $where = ' ';
-        if (!$user->hasPermission('access_all_profiles')) {
-            $where = " WHERE s.CenterID IN ($userCenters)
-                            OR bc.CenterID IN ($userCenters)
-                            OR bp.CenterID IN ($userCenters)";
-        }
-        $result = $db->pselect($query.$where, array());
-        $candidateSessions = [];
-        $sessionCenters    = [];
-        foreach ($result as $row) {
-            if (!isset($candidateSessions[$row['candidateId']][$row['sessionId']])) {
-                    $candidateSessions[$row['candidateId']][$row['sessionId']] = [];
-            };
-            $ses =& $candidateSessions[$row['candidateId']][$row['sessionId']];
-            $ses['id'] = $row['sessionId'];
-            $ses['label'] = $row['label'];
-
-            $sessionCenters[$row['sessionId']]['centerId'] = $row['centerId'];
-        }
-
-        $shipment = [
-            'statuses' => $shipDAO->getStatuses(),
-            'types'    => $shipDAO->getTypes(),
-        ];
-
-        return [
-            'candidates'        => $candidates,
-            'diagnoses'         => $diagnoses,
-            'sessions'          => $sessions,
-            'projects'          => \Utility::getProjectList(),
-            'centers'           => $centers,
-            'examiners'         => $examiners,
-            'users'             => $users,
-            'candidateSessions' => $candidateSessions,
-            'sessionCenters'    => $sessionCenters,
-            'container'         => $contCont->getOptions(),
-            'specimen'          => $specCont->getOptions(),
-            'shipment'          => $shipment,
-        ];
-    }
-}
diff --git a/php/persistor.class.inc b/php/persistor.class.inc
new file mode 100644
index 00000000..d1bcac24
--- /dev/null
+++ b/php/persistor.class.inc
@@ -0,0 +1,188 @@
+<?php declare(strict_types=1);                                                     
+                                                                                   
+namespace LORIS\biobank;                                                      
+                                                                                   
+use LORIS\biobank\data\query\QueryBuilder;                                         
+use LORIS\biobank\data\query\QueryParams;                                          
+use LORIS\biobank\data\query\Condition;                                            
+use LORIS\Data\ProvisionerInstance;                                                
+use LORIS\biobank\data\Transactions;
+
+/**
+ * Class Persistor
+ *
+ * Handles the persistence of models to the database, including the insertion,
+ * updating, and managing of related entities.
+ *
+ * @package    LORIS
+ * @subpackage Biobank
+ * @author     Henri Rabalais <henri.j.rabalais@gmail.com>
+ * @license    https://www.gnu.org/licenses/gpl-3.0.html GNU General Public
+ *             License
+ */
+class Persistor
+{
+    use Transactions;                                                              
+
+    /**
+     * Constructs the Persistor with a database connection.
+     *
+     * @param \Database $db The database connection used for persistence
+     *                      operations.
+     */    
+    public function __construct(
+        protected \Database $db
+    ) {}
+
+    /**
+     * Saves a model to the database.
+     *
+     * This method handles both insertion and updates. It also manages
+     * related models by verifying their existence and ensuring proper
+     * relationships are maintained in the database.
+     *
+     * Note: The nested loops and logic for handling related models may
+     * introduce performance issues when processing large datasets.
+     * Refactoring for efficiency is recommended.
+     *
+     * Related entities must already exist in the database; otherwise,
+     * an exception is thrown, which halts the operation.
+     *
+     * @param Model $model The model to be saved.
+     * @return Model       The saved model with any modifications applied.
+     * @throws \Exception  If there are issues with related entities or
+     *                     database operations.
+     */    
+    public function save(Model $model): Model
+    {
+        $schema = $model->getSchema();
+        $table = $schema->getTable()->getName();
+        $columns = $schema->getColumns();
+
+        // Extract data from the model based on schema columns
+        $data = $this->extractData($model, $columns);
+
+        // Perform insert or update using the database handler
+        $this->db->insertOnDuplicateUpdate($table, $data);
+
+        if (!isset($model->id)) {
+            $model->id = $this->db->getLastInsertId();
+        }
+
+        // Handle related models
+        foreach ($schema->getRelations() as $relationName => $relation) {
+            $relatedModel = $model->$relationName;
+
+            if ($relatedModel instanceof ModelInterface) {
+                $relatedSchema = $relatedModel->getSchema();
+                $relatedData = $this->extractData($relatedModel, $relatedSchema->getColumns());
+
+                // Retrieve the label value from related data
+                $label = $relatedData[$relatedSchema->getLabel()];
+
+                // Attempt to find existing related record based on label
+                $existingId = $this->getIdByLabel($relatedSchema, $label);
+
+                if ($existingId) {
+                    // Use existing ID in the main model's data
+                    $data[$relation->from->key] = $existingId;
+                } else {
+                    // Related ID does not exist; throw exception to drop the insert
+                    throw new \Exception("Related entity with label '{$label}' does not exist.");
+                }
+            }
+
+            // Handle many-to-many relations
+            if ($relation->many && is_array($relatedModel)) {
+                foreach ($relatedModel as $item) {
+                    if ($item instanceof ModelInterface) {
+                        $relatedSchema = $item->getSchema();
+                        $relatedData = $this->extractData($item, $relatedSchema->getColumns());
+
+                        // Retrieve the label value from related data
+                        $label = $relatedData[$relatedSchema->getLabel()];
+
+                        // Attempt to find existing related record based on label
+                        $existingId = $this->getIdByLabel($relatedSchema, $label);
+
+                        if ($existingId) {
+                            // Insert association into the relation table
+                            $relationTable = $relation->from->table->getName();
+                            $relationData = [
+                                $relation->from->key => $data[$schema->getId()],
+                                $relation->to->key => $existingId,
+                            ];
+
+                            $insertSuccess = $this->db->insertOnDuplicateUpdate($relationTable, $relationData);
+
+                            if (!$insertSuccess) {
+                                throw new \Exception("Failed to associate related entity with ID '{$existingId}' in relation table '{$relationTable}'.");
+                            }
+                        } else {
+                            // Related ID does not exist; throw exception to drop the insert
+                            throw new \Exception("Related entity with label '{$label}' does not exist.");
+                        }
+                    }
+                }
+            }
+        }
+
+        return $model;
+    }
+
+    /**
+     * Extracts data from the model based on schema columns.
+     *
+     * This method maps the model properties to the database columns defined
+     * in the schema. It assumes that the model contains the properties
+     * specified in the schema.
+     *
+     * Note: There is no error handling for missing or unexpected model
+     * properties. This can lead to silent failures if a property is
+     * missing. Consider adding validation to ensure model consistency.
+     *
+     * @param ModelInterface $model   The model to extract data from.
+     * @param array          $columns The schema columns to extract.
+     * @return array                  The extracted data as an associative
+     *                                array.
+     */    
+    protected function extractData(ModelInterface $model, array $columns): array
+    {
+        $data = [];
+        foreach ($columns as $property => $column) {
+            if (property_exists($model, $property)) {
+                $value = $model->$property;
+                // Optionally, handle nulls or defaults here
+                $data[$column->getName()] = $value;
+            }
+        }
+
+        return $data;
+    }
+
+    /**
+     * Retrieves the ID of a record based on its unique label.
+     *
+     * This method searches the database for a related entity using its
+     * unique label and returns the corresponding ID if found.
+     *
+     * Note: This method assumes that the label is unique. If multiple
+     * records share the same label, this can result in incorrect
+     * associations. Ensure that labels are unique, or update this method
+     * to handle duplicates more explicitly.
+     *
+     * @param Schema $schema The schema of the related model.
+     * @param string $label  The unique label to search for.
+     * @return ?string       The ID of the related entity, or null if not
+     *                       found.
+     */    
+    protected function getIdByLabel(Schema $schema, string $label): ?string
+    {
+        $condition = new Condition(field: $schema->getLabel(), value: $label);
+        $params = (new QueryParams())->where($condition);
+        $query = (new QueryBuilder($schema))->build();
+
+        // Use the existing pselectOne function to execute the query
+        return $this->db->pselectOne($query->toString(), $query->getParams());
+    }
+}
diff --git a/php/pool.class.inc b/php/pool.class.inc
deleted file mode 100644
index 41d06f21..00000000
--- a/php/pool.class.inc
+++ /dev/null
@@ -1,413 +0,0 @@
-<?php declare(strict_types=1);
-/**
- * Pool Class
- * This class contains an instance of a database handling that is needed to
- * permanently store and retrieve Pool Object instances.
- *
- * PHP Version 7.2
- *
- * @category   Entity
- * @package    Loris
- * @subpackage Biobank
- * @author     Henri Rabalais <henri.rabalais@mcin.ca>
- * @license    http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
- * @link       https://www.github.com/aces/Loris/
- */
-namespace LORIS\biobank;
-
-/**
- * Pool Class
- * This class contains an instance of a database handling that is needed to
- * permanently store and retrieve Pool Object instances.
- *
- * PHP Version 7.2
- *
- * @category   Entity
- * @package    Loris
- * @subpackage Biobank
- * @author     Henri Rabalais <henri.rabalais@mcin.ca>
- * @license    http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
- * @link       https://www.github.com/aces/Loris/
- */
-class Pool implements \JsonSerializable, \LORIS\Data\DataInstance, \LORIS\StudyEntities\SiteHaver
-{
-    /**
-     * Persistent Instance variables.
-     *
-     * These properties describe a pool entity.
-     *
-     * @var ?int      $id
-     * @var string    $label
-     * @var float     $quantity
-     * @var int       $unitId
-     * @var array     $specimenIds
-     * @var int       $candidateId
-     * @var int       $sessionId
-     * @var int       $typeId
-     * @var \CenterID $centerId
-     * @var \DateTime $date
-     * @var \DateTime $time
-     */
-    private $id;
-    private $label;
-    private $quantity;
-    private $unitId;
-    private $specimenIds;
-    private $candidateId;
-    private $sessionId;
-    private $typeId;
-    private \CenterID $centerId;
-    private $date;
-    private $time;
-
-    /**
-     * Initiliazes a new instance of the Pool Class
-     */
-    function __construct()
-    {
-    }
-
-    /**
-     * Sets the pool's ID
-     *
-     * @param int $id the pool's ID
-     *
-     * @return void
-     */
-    public function setId(int $id) : void
-    {
-        if ($id > 0) {
-            $this->id = $id;
-        }
-    }
-
-    /**
-     * Gets the pool's ID
-     *
-     * @return ?int
-     */
-    public function getId() : ?int
-    {
-        return $this->id;
-    }
-
-    /**
-     * Sets the label of the pool
-     *
-     * @param string $label the pool's label
-     *
-     * @return void
-     */
-    public function setLabel(string $label) : void
-    {
-        $this->label = $label;
-    }
-
-    /**
-     * Gets the label of the pool
-     *
-     * @return string
-     */
-    public function getLabel() : string
-    {
-        return $this->label;
-    }
-
-    /**
-     * Sets the quantity of the pool
-     *
-     * @param float $quantity the pool's quantity
-     *
-     * @return void
-     */
-    public function setQuantity(float $quantity) : void
-    {
-        $this->quantity = $quantity;
-    }
-
-    /**
-     * Gets the quantity of the pool
-     *
-     * @return float
-     */
-    public function getQuantity() : float
-    {
-        return $this->quantity;
-    }
-
-    /**
-     * Sets the Unit ID of the pool
-     *
-     * @param int $unitId Unit ID of the pool
-     *
-     * @return void
-     */
-    public function setUnitId(int $unitId) : void
-    {
-        if ($unitId > 0) {
-            $this->unitId = $unitId;
-        }
-    }
-
-    /**
-     * Gets the Unit ID of the pool
-     *
-     * @return ?int
-     */
-    public function getUnitId() : ?int
-    {
-        return $this->unitId;
-    }
-
-    /**
-     * Sets the Specimen IDs of the pool
-     *
-     * @param array $specimenIds Specimen IDs of the pool
-     *
-     * @return void
-     */
-    public function setSpecimenIds(array $specimenIds) : void
-    {
-        $this->specimenIds = $specimenIds;
-    }
-
-    /**
-     * Gets the Specimen IDs of the pool
-     *
-     * @return array
-     */
-    public function getSpecimenIds() : array
-    {
-        return $this->specimenIds;
-    }
-
-    /**
-     * Sets the Candidate ID of the pool
-     *
-     * @param int $candidateId Candidate ID of the pool
-     *
-     * @return void
-     */
-    public function setCandidateId(int $candidateId) : void
-    {
-        if ($candidateId > 0) {
-            $this->candidateId = $candidateId;
-        }
-    }
-
-    /**
-     * Gets the Candidate ID of the pool
-     *
-     * @return ?int
-     */
-    public function getCandidateId() : ?int
-    {
-        return $this->candidateId;
-    }
-
-    /**
-     * Sets the Session ID of the pool
-     *
-     * @param ?int $sessionId Session ID of the pool
-     *
-     * @return void
-     */
-    public function setSessionId(?int $sessionId) : void
-    {
-        if ($sessionId > 0) {
-            $this->sessionId = $sessionId;
-        }
-    }
-
-    /**
-     * Gets the Session ID of the pool
-     *
-     * @return ?int
-     */
-    public function getSessionId() : ?int
-    {
-        return $this->sessionId;
-    }
-
-    /**
-     * Sets the Type ID of the pool
-     *
-     * @param ?int $typeId Type ID of the pool
-     *
-     * @return void
-     */
-    public function setTypeId(?int $typeId) : void
-    {
-        if ($typeId > 0) {
-            $this->typeId = $typeId;
-        }
-    }
-
-    /**
-     * Gets the Type ID of the pool
-     *
-     * @return ?int
-     */
-    public function getTypeId() : ?int
-    {
-        return $this->typeId;
-    }
-
-    /**
-     * Sets the Center ID of the pool
-     *
-     * @param \CenterID $centerId Center ID of the pool
-     *
-     * @return void
-     */
-    public function setCenterId(\CenterID $centerId) : void
-    {
-        $this->centerId = $centerId;
-    }
-
-    /**
-     * Gets the Center ID of the pool
-     *
-     * @return \CenterID
-     */
-    public function getCenterID() : \CenterID
-    {
-        return $this->centerId;
-    }
-
-    /**
-     * Sets the date at which the pool was created.
-     *
-     * @param \DateTime $date the date of the pool
-     *
-     * @return void
-     */
-    public function setDate(\DateTime $date) : void
-    {
-        $this->date = $date;
-    }
-
-    /**
-     * Gets the date that the pool was created.
-     *
-     * @return \DateTime
-     */
-    public function getDate() : \DateTime
-    {
-        return $this->date;
-    }
-
-    /**
-     * Sets the time at which the pool was created.
-     *
-     * @param \DateTime $time the time of the pool
-     *
-     * @return void
-     */
-    public function setTime(\DateTime $time) : void
-    {
-        $this->time = $time;
-    }
-
-    /**
-     * Gets the time of pool at which the pool was created.
-     *
-     * @return \DateTime
-     */
-    public function getTime() : \DateTime
-    {
-        return $this->time;
-    }
-
-    /**
-     * Loads a Pool Object from an array.
-     *
-     * @param array $data Data to be used to load the Pool Object.
-     *
-     * @return Pool
-     */
-    public function fromArray(array $data) : Pool
-    {
-        if (isset($data['id'])) {
-            $this->setId((int) ($data['id']));
-        }
-        if (isset($data['label'])) {
-            $this->setLabel((string) $data['label']);
-        }
-        if (isset($data['quantity'])) {
-            $this->setQuantity((float) $data['quantity']);
-        }
-        if (isset($data['unitId'])) {
-            $this->setUnitId((int) $data['unitId']);
-        }
-        if (isset($data['specimenIds'])) {
-            $this->setSpecimenIds($data['specimenIds']);
-        }
-        if (isset($data['candidateId'])) {
-            $this->setCandidateId((int) $data['candidateId']);
-        }
-        if (isset($data['sessionId'])) {
-            $this->setSessionId((int) $data['sessionId']);
-        }
-        if (isset($data['typeId'])) {
-            $this->setTypeId((int) $data['typeId']);
-        }
-        if (isset($data['centerId'])) {
-            $this->setCenterId(new \CenterID(strval($data['centerId'])));
-        }
-        if (isset($data['date'])) {
-            $this->setDate(new \DateTime($data['date']));
-        }
-        if (isset($data['time'])) {
-            $this->setTime(new \DateTime($data['time']));
-        }
-
-        return $this;
-    }
-
-    /**
-     * A wrapper function for the jsonSerialize method of the Pool Instance
-     * Class. This converts the Pool Instance into an array.
-     *
-     * @return array Pool Array.
-     */
-    public function toArray() : array
-    {
-        return $this->jsonSerialize();
-    }
-
-    /**
-     * Returns an array representing the state of the Pool.
-     *
-     * @return array
-     */
-    public function jsonSerialize() : array
-    {
-        // TODO: Date and Time formats should be gotten from some sort of
-        // config setting.
-        return [
-            'id'          => $this->id,
-            'label'       => $this->label,
-            'quantity'    => $this->quantity,
-            'unitId'      => $this->unitId,
-            'specimenIds' => $this->specimenIds,
-            'candidateId' => $this->candidateId,
-            'sessionId'   => $this->sessionId,
-            'typeId'      => $this->typeId,
-            'centerId'    => $this->centerId->__toString(),
-            'date'        => $this->date->format('d-m-Y'),
-            'time'        => $this->time->format('H:i'),
-        ];
-    }
-
-    /**
-     * Returns a JSON encoded string of the state of the Pool
-     *
-     * @return string JSON encoded string of Pool data
-     */
-    public function toJSON() : string
-    {
-        return json_encode($this);
-    }
-}
-
diff --git a/php/poolcontroller.class.inc b/php/poolcontroller.class.inc
deleted file mode 100644
index c10f4b74..00000000
--- a/php/poolcontroller.class.inc
+++ /dev/null
@@ -1,257 +0,0 @@
-<?php declare(strict_types=1);
-/**
- * This class features the code that enables access to the Pools of the
- * LORIS Biobank Module.
- *
- * PHP Version 7.2
- *
- * @category   Controller
- * @package    Loris
- * @subpackage Biobank
- * @author     Henri Rabalais <henri.rabalais@mcin.ca>
- * @license    http://www.gnu.org/licenses/gpl-3.0.text GPLv3
- * @link       http://www.github.com/aces/Loris/
- */
-namespace LORIS\biobank;
-
-/**
- * This class features the code that enables access to the Pools of the
- * LORIS Biobank Module.
- *
- * PHP Version 7.2
- *
- * @category   Controller
- * @package    Loris
- * @subpackage Biobank
- * @author     Henri Rabalais <henri.rabalais@mcin.ca>
- * @license    http://www.gnu.org/licenses/gpl-3.0.text GPLv3
- * @link       http://www.github.com/aces/Loris/
- */
-class PoolController
-{
-    /**
-     * Private instances of the Database, User and PoolDAO classes.
-     *
-     * @var \Database $db
-     * @var \User     $user
-     * @var PoolDAO   $dao
-     * @var \LORIS\LorisInstance $loris
-     */
-    private $db, $user, $dao, $loris;
-
-    /**
-     * Pool Controller Class constructor.
-     *
-     * @param \LORIS\LorisInstance $loris LORIS Instance.
-     * @param \User                $user  User Instance.
-     */
-    function __construct(\LORIS\LorisInstance $loris, \User $user)
-    {
-        $this->loris = $loris;
-        $this->db    = $loris->getDatabaseConnection();
-        $this->user  = $user;
-        $this->dao   = $this->_getDataProvisioner();
-    }
-
-    /**
-     * Get all Pool Objects permitted by the Pool Data Provisioner.
-     *
-     * @return array of all permissable Pool Objects
-     */
-    public function getInstances() : array
-    {
-        $this->_validatePermission('view');
-        $pools  = [];
-        $poolIt = $this->dao->execute($this->user);
-        foreach ($poolIt as $id => $pool) {
-            $pools[$id] = $pool;
-        }
-
-        return $pools;
-    }
-
-    // TODO: Decide if this should be able to handle a list of pools rather
-    // than a singular pool array.
-    /**
-     * Takes a list of pool arrays from the client-side, validates them,
-     * instantiates them and sends them to the DAO to be saved to the database.
-     *
-     * @param array $poolArray pool array to be created.
-     *
-     * @return string a json encoded string of all permissable Pool Objects.
-     */
-    public function createInstance(array $poolArray)
-    {
-        $this->_validatePermission('create');
-        $pool = (new Pool())->fromArray($poolArray);
-        $this->validateInstance($pool);
-        return $this->dao->saveInstance($pool);
-    }
-
-    /**
-     * Treats the Pool DAO as a Provisioner that can be iterated through to
-     * provide the permissible Pool Objects for the current User
-     *
-     * @return \LORIS\Data\Provisioner
-     */
-    private function _getDataProvisioner() : \LORIS\Data\Provisioner
-    {
-        $dao = new PoolDAO($this->loris);
-        if ($this->user->hasPermission('access_all_profiles') == false) {
-            $dao = $dao->filter(new \LORIS\Data\Filters\UserSiteMatch());
-        }
-        return $dao;
-    }
-
-    /**
-     * Checks user Permissions for given requested action.
-     *
-     * @param string $method to be executed.
-     *
-     * @return void
-     */
-    private function _validatePermission(string $method) : void
-    {
-        switch ($method) {
-        case 'view':
-            if (!$this->user->hasPermission('biobank_pool_view')) {
-                throw new Forbidden('Pool: View Permission Denied');
-            }
-            break;
-        case 'create':
-            if (!$this->user->hasPermission('biobank_pool_create')) {
-                throw new Forbidden('Pool: Create Permission Denied');
-            }
-            break;
-        }
-    }
-
-    /**
-     * Validates Pool Object before being saved
-     *
-     * @param Pool $pool Pool to be validated
-     *
-     * @return void
-     */
-    function validateInstance(Pool $pool) : void
-    {
-        $this->_validateLabel($pool);
-        // $this->_validateQuantity($pool);
-        // $this->_validateUnitId($pool);
-        $this->_validateSpecimenIds($pool);
-        $this->_validateCenterId($pool);
-        // $this->_validateDate($pool);
-        // $this->_validateTime($pool);
-    }
-
-    /**
-     * Validates Pool Object Label
-     *
-     * @param Pool $pool Pool to be checked.
-     *
-     * @throws BadRequest if the provided Pool does not meet validation requirements
-     *
-     * @return void
-     */
-    private function _validateLabel(Pool $pool) : void
-    {
-        $poolList = $this->dao->selectInstances(
-            [
-                ['column' => 'bp.Label', 'value' => $pool->getLabel()],
-            ],
-        );
-        if (!empty($poolList)) {
-            throw new BadRequest('Pool Label must be unique');
-        }
-        // TODO: Validate Label with Regex and required
-    }
-
-
-    /**
-     * Validates Pool Object Specimen IDs
-     *
-     * @param Pool $pool Pool to be checked.
-     *
-     * @throws BadRequest if the provided Pool does not meet validation requirements
-     *
-     * @return void
-     */
-    private function _validateSpecimenIds(Pool $pool) : void
-    {
-        $specimenIds = $pool->getSpecimenIds();
-        if (count($specimenIds) < 2) {
-            throw new BadRequest(
-                'At least 2 specimens must be provided to create a Pool'
-            );
-        }
-
-        $specimenDAO   = new SpecimenDAO($this->loris);
-        $containerDAO  = new ContainerDAO($this->loris->getDatabaseConnection());
-        $baseSpecimen  = $specimenDAO->getInstanceFromId($specimenIds[0]);
-        $baseContainer = $containerDAO->getInstanceFromId(
-            $baseSpecimen->getContainerId()
-        );
-
-        foreach ($specimenIds as $specimenId) {
-            $specimen  = $specimenDAO->getInstanceFromId($specimenId);
-            $container = $containerDAO->getInstanceFromId(
-                $specimen->getContainerId()
-            );
-            $barcode   = $container->getBarcode();
-
-            if ($baseSpecimen->getCandidateId() !== $specimen->getCandidateId()) {
-                throw new BadRequest(
-                    'Pooled specimens must belong to the same Candidate'
-                );
-            }
-
-            if ($baseSpecimen->getSessionId() !== $specimen->getSessionId()) {
-                throw new BadRequest(
-                    'Pooled specimens must belong to the same Session'
-                );
-            }
-
-            if ($baseSpecimen->getTypeId() !== $specimen->getTypeId()) {
-                throw new BadRequest('Pooled specimens must be of the same Type');
-            }
-
-            if ($baseContainer->getCenterID() != $container->getCenterID()) {
-                throw new BadRequest('Pooled specimens must be at the same Site');
-            }
-
-            if ($specimen->getQuantity() === 0 ) {
-                throw new BadRequest(
-                    "Quantity of '$barcode' must be greater than '0'"
-                );
-            }
-
-            if ($specimen->getPoolId() !== null) {
-                throw new BadRequest(
-                    "Specimen '$barcode' already belongs to a Pool"
-                );
-            }
-
-            $stati    = $containerDAO->getStati();
-            $statusId = $container->getStatusId() ?? '';
-            if ($stati[$statusId]['label'] !== 'Available') {
-                throw new BadRequest("Specimen '$barcode' is not 'Available'");
-            }
-        }
-    }
-
-    /**
-     * Validates Pool Object Center ID
-     *
-     * @param Pool $pool Pool to be checked.
-     *
-     * @throws BadRequest if the provided Pool does not meet validation requirements
-     *
-     * @return void
-     */
-    private function _validateCenterId(Pool $pool) : void
-    {
-        if (is_null($pool->getCenterID())) {
-            throw new BadRequest('Pool Center must be set');
-        }
-    }
-}
diff --git a/php/pooldao.class.inc b/php/pooldao.class.inc
deleted file mode 100644
index 8ae0877b..00000000
--- a/php/pooldao.class.inc
+++ /dev/null
@@ -1,277 +0,0 @@
-<?php declare(strict_types=1);
-/**
- * Pool Data Access Object (DAO) Class
- * This class contains all database handling that is needed to
- * permanently store and retrieve Pool Object instances
- *
- * PHP Version 7.2
- *
- * @category   DAO
- * @package    Loris
- * @subpackage Biobank
- * @author     Henri Rabalais <henri.rabalais@mcin.ca>
- * @license    http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
- * @link       https://www.github.com/aces/Loris/
- */
-
-namespace LORIS\biobank;
-
-/**
- * Pool Data Access Object (DAO) Class
- * This class contains all database handling that is needed to
- * permanently store and retrieve Pool Object instances
- *
- * PHP Version 7.2
- *
- * @category   DAO
- * @package    Loris
- * @subpackage Biobank
- * @author     Henri Rabalais <henri.rabalais@mcin.ca>
- * @license    http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
- * @link       https://www.github.com/aces/Loris/
- */
-
-class PoolDAO extends \LORIS\Data\ProvisionerInstance
-{
-    /**
-     * Private instance of the Database class.
-     *
-     * @var \LORIS\LorisInstance $loris
-     * @var \Database $db
-     */
-    private $loris;
-    private $db;
-
-    /**
-     * Initializes a new instance of the PoolDAO Class
-     *
-     * @param \LORIS\LorisInstance $loris LORIS instance object
-     */
-    function __construct(\LORIS\LorisInstance $loris)
-    {
-        $this->loris = $loris;
-        $this->db    = $loris->getDatabaseConnection();
-    }
-
-    /**
-     * This will load all pool persistence variables from the database for a
-     * given $id into a Pool object, and return the object.
-     *
-     * @param int $id Value of the $id for the Pool that will be
-     *                instantiated.
-     *
-     * @return Pool $pool Pool Instance.
-     */
-    public function getInstanceFromId(int $id) : Pool
-    {
-        return $this->selectInstances([['column' => 'PoolID', 'value'=>$id]])[$id];
-    }
-
-    // XXX: Currently this function is never used with any conditions passed as
-    // paramters. Decide if this is a necessary feature.
-    /**
-     * This will select all pools from the database that match the
-     * attribute values passed through $poolData and will return an array
-     * of pool objects.
-     *
-     * @param ?array $conditions Conditions to be met by the query
-     * @param string $operator   Operator to link conditions with
-     *
-     * @return array $pools      List of Pool Objects that match the query
-     */
-    public function selectInstances(
-        ?array $conditions = [],
-        $operator = 'AND'
-    ) : array {
-        $query = "SELECT bp.PoolID,
-                         bp.Label,
-                         bp.Quantity,
-                         bp.UnitID,
-                         GROUP_CONCAT(bspr.SpecimenID) as SpecimenIDs,
-                         bp.CenterID,
-                         bp.Date,
-                         DATE_FORMAT(bp.Time, '%H:%i') as Time
-                  FROM   biobank_pool bp
-                  LEFT JOIN biobank_specimen_pool_rel bspr
-                    USING (PoolID)";
-        if (!empty($conditions)) {
-            $whereClause = [];
-            foreach ($conditions as $condition) {
-                $whereClause[] = $condition['column']
-                    . '='
-                    . '"'
-                    . $condition['value']
-                    . '"';
-            }
-            $query .= ' WHERE '.implode(" $operator ", $whereClause);
-        }
-        $query   .= ' GROUP BY bp.PoolID';
-        $poolRows = $this->db->pselectWithIndexKey($query, [], 'PoolID');
-
-        $pools       = [];
-        $specimenDAO = new SpecimenDAO($this->loris);
-        if (!empty($poolRows)) {
-            foreach ($poolRows as $id => $poolRow) {
-                $specimenIds = explode(',', $poolRow['SpecimenIDs']);
-                $specimenId  = (int) $specimenIds[0];
-                $specimen    = $specimenDAO->selectInstances(
-                    [
-                        ['column'=>'SpecimenID', 'value'=>$specimenId],
-                    ],
-                )[$specimenId];
-                $poolRow['CandidateID'] = $specimen->getCandidateId();
-                $poolRow['SessionID']   = $specimen->getSessionId();
-                $poolRow['TypeID']      = $specimen->getTypeId();
-
-                $pools[$id] = $this->_getInstanceFromSQL($poolRow, $specimenIds);
-            }
-        }
-
-        return $pools;
-    }
-
-    /**
-     * Instantiates an ArrayIterator class that is composed of all the Pool
-     * Objects
-     *
-     * @return \Traversable Iterator of Pool Objects
-     */
-    protected function getAllInstances() : \Traversable
-    {
-        return new \ArrayIterator($this->selectInstances());
-    }
-
-    /**
-     * This function recieves a Pool Object, converts it into an SQL format
-     * and inserts it into all relevant tables in the database. Certain
-     * information is then cascaded to the children of the Pool.
-     *
-     * @param Pool $pool The Pool to be inserted into the database.
-     *
-     * @return Pool The pool that was inserted into the database
-     */
-    public function saveInstance(Pool $pool) : Pool
-    {
-        //Convert Pool to SQL format.
-        $data = $this->_getSQLFromInstance($pool);
-
-        $this->db->insertOnDuplicateUpdate(
-            'biobank_pool',
-            $data['biobank_pool']
-        );
-
-        $poolId = $pool->getId();
-        if (isset($poolId)) {
-            // If update:
-            // Do nothing.
-        } else {
-            // If insert:
-            $pool->setId((int) $this->db->getLastInsertId());
-            // set the respective data array index to the value of the new
-            // pool ID
-            $specimenIds = $pool->getSpecimenIds();
-            foreach ($specimenIds as $id) {
-                $data['biobank_specimen_pool_rel'][$id]['PoolID'] = $pool->getId();
-            }
-        }
-
-        // insert or update biobank_specimen_pool_rel with relevant data.
-        foreach ($data['biobank_specimen_pool_rel'] as $insert) {
-            $this->db->insertOnDuplicateUpdate(
-                'biobank_specimen_pool_rel',
-                $insert
-            );
-        }
-
-        // XXX: decide if quantity of all pooled specimens should go to 0.
-        // XXX: logic for adding preparations to pools will likely go here as well.
-
-        return $this->getInstanceFromId($pool->getId());
-    }
-
-    /**
-     * This function takes a Pool array and prepares the data to be inserted
-     * into the database by converting it to a data array. This mapping is done
-     * to enable the update or insertion of data into the database directly from
-     * the resuling array.
-     *
-     * @param Pool $pool Pool array to be converted
-     *
-     * @return array $data Array containing the data to be inserted
-     */
-    private function _getSQLFromInstance(Pool $pool) : array
-    {
-        $poolData = [
-            'PoolID'   => $pool->getId(),
-            'Label'    => $pool->getLabel(),
-            'Quantity' => $pool->getQuantity(),
-            'UnitID'   => $pool->getUnitId(),
-            'CenterID' => $pool->getCenterID(),
-            'Date'     => $pool->getDate()->format('Y-m-d'),
-            'Time'     => $pool->getTime()->format('H:i'),
-        ];
-
-        $specimenIds = $pool->getSpecimenIds();
-        foreach ($specimenIds as $id) {
-            $specimenPoolData[$id] = [
-                'PoolID'     => $pool->getId(),
-                'SpecimenID' => $id,
-            ];
-        }
-
-        return [
-            'biobank_pool'              => $poolData,
-            'biobank_specimen_pool_rel' => $specimenPoolData ?? '',
-        ];
-    }
-
-    /**
-     * This function takes an array that resulted from an SQL query and
-     * instantiates it as a Pool Object
-     *
-     * @param array $data        Values to be reassigned.
-     * @param array $specimenIds List of specimen IDs associated with the given
-     *                           Pool.
-     *
-     * @return Pool
-     */
-    private function _getInstanceFromSQL(array $data, array $specimenIds) : Pool
-    {
-        $pool = new Pool();
-        if (isset($data['PoolID'])) {
-            $pool->setId((int) $data['PoolID']);
-        }
-        if (isset($data['Label'])) {
-            $pool->setLabel((string) $data['Label']);
-        }
-        if (isset($data['Quantity'])) {
-            $pool->setQuantity((float) $data['Quantity']);
-        }
-        if (isset($data['UnitID'])) {
-            $pool->setUnitId((int) $data['UnitID']);
-        }
-        if (!empty($specimenIds)) {
-            $pool->setSpecimenIds($specimenIds);
-        }
-        if (isset($data['CandidateID'])) {
-            $pool->setCandidateId((int) $data['CandidateID']);
-        }
-        if (isset($data['SessionID'])) {
-            $pool->setSessionId((int) $data['SessionID']);
-        }
-        if (isset($data['TypeID'])) {
-            $pool->setTypeId((int) $data['TypeID']);
-        }
-        if (isset($data['CenterID'])) {
-            $pool->setCenterId(new \CenterID(strval($data['CenterID'])));
-        }
-        if (isset($data['Date'])) {
-            $pool->setDate(new \DateTime($data['Date']));
-        }
-        if (isset($data['Time'])) {
-            $pool->setTime(new \DateTime($data['Time']));
-        }
-
-        return $pool;
-    }
-}
diff --git a/php/poolendpoint.class.inc b/php/poolendpoint.class.inc
deleted file mode 100644
index bfbe85e5..00000000
--- a/php/poolendpoint.class.inc
+++ /dev/null
@@ -1,140 +0,0 @@
-<?php declare(strict_types=1);
-/**
- * This implements the Pool endpoint class for the Biobank Module.
- *
- * PHP Version 7.2
- *
- * @category   API
- * @package    Loris
- * @subpackage Biobank
- * @author     Henri Rabalais <henri.rabalais@mcin.ca>
- * @license    http://www.gnu.org/licenses/gpl-3.0.text GPLv3
- * @link       http://www.github.com/aces/Loris
- */
-namespace LORIS\biobank;
-use \Psr\Http\Message\ServerRequestInterface;
-use \Psr\Http\Server\RequestHandlerInterface;
-use \Psr\Http\Message\ResponseInterface;
-
-/**
- * A class for handling the /biobank/pool/ endpoint.
- *
- * PHP Version 7.2
- *
- * @category   API
- * @package    Loris
- * @subpackage Biobank
- * @author     Henri Rabalais <henri.rabalais@mcin.ca>
- * @license    http://www.gnu.org/licenses/gpl-3.0.text GPLv3
- * @link       http://www.github.com/aces/Loris/
- */
-class PoolEndpoint extends \NDB_Page implements RequestHandlerInterface
-{
-    /**
-     * Returns true if user has access to this endpoint.
-     *
-     * @param \User $user The user whose access is being checked.
-     *
-     * @return bool
-     */
-    function _hasAccess(\User $user) : bool
-    {
-        return true;
-    }
-
-    /**
-     * Return which methods are supported by this endpoint.
-     *
-     * @return array supported HTTP methods
-     */
-    protected function allowedMethods() : array
-    {
-        return [
-            'GET',
-            'POST',
-            'OPTIONS',
-        ];
-    }
-
-    /**
-     * This function can be overridden in a module's page to load the necessary
-     * resources to check the permissions of a user.
-     *
-     * @param User                   $user    The user to load the resources for
-     * @param ServerRequestInterface $request The PSR15 Request being handled
-     *
-     * @return void
-     */
-    public function loadResources(
-        \User $user, ServerRequestInterface $request
-    ) : void {
-    }
-
-    /**
-     * This function passes the request to the handler. This is necessary since
-     * the Endpoint bypass the Module class.
-     *
-     * XXX: This function should be extracted to a parent class.
-     *
-     * @param ServerRequestInterface  $request The PSR7 request.
-     * @param RequestHandlerInterface $handler The request handler.
-     *
-     * @return ResponseInterface The outgoing PSR7 response.
-     */
-    public function process(
-        ServerRequestInterface $request,
-        RequestHandlerInterface $handler
-    ) : ResponseInterface {
-        return $handler->handle($request);
-    }
-
-    /**
-     * Handles endpoint requests.
-     *
-     * @param ServerRequestInterface $request The incoming PSR7 request
-     *
-     * @return ResponseInterface The outgoing PSR7 response
-     */
-    public function handle(ServerRequestInterface $request) : ResponseInterface
-    {
-        $db       = $this->loris->getDatabaseConnection();
-        $user     = $request->getAttribute('user');
-        $poolCont = new PoolController($this->loris, $user);
-
-        try {
-            $db->beginTransaction();
-            switch ($request->getMethod()) {
-            case 'GET':
-                $pools = $poolCont->getInstances();
-                return new \LORIS\Http\Response\JSON\OK($pools);
-            case 'POST':
-                $pool  = json_decode($request->getBody()->getContents(), true);
-                $pools = $poolCont->createInstance($pool);
-                return new \LORIS\Http\Response\JSON\OK([$pools]);
-            case 'OPTIONS':
-                return (new \LORIS\Http\Response())
-                    ->withHeader('Allow', $this->allowedMethods());
-            }
-        } catch (BadRequest $e) {
-            $db->rollBack();
-            return new \LORIS\Http\Response\JSON\BadRequest($e->getMessage());
-        } catch (Forbidden $e) {
-            $db->rollBack();
-            return new \LORIS\Http\Response\JSON\Forbidden($e->getMessage());
-        } catch (\TypeError $e) {
-            $db->rollback();
-            return new \LORIS\Http\Response\JSON\InternalServerError(
-                $e->getMessage()
-            );
-        } catch (\DatabaseException $e) {
-            $db->rollBack();
-            return new \LORIS\Http\Response\JSON\InternalServerError(
-                $e->getMessage()
-            );
-        } finally {
-            if ($db->inTransaction()) {
-                $db->commit();
-            }
-        }
-    }
-}
diff --git a/php/preparation.class.inc b/php/preparation.class.inc
deleted file mode 100644
index 97c340fc..00000000
--- a/php/preparation.class.inc
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php declare(strict_types=1);
-/**
- * Preparation Object Class
- * This class contains an instance of a database handling that is needed to
- * permanently store and retrieve Preparation Object instances.
- *
- * PHP Version 7.2
- *
- * @category Entity
- * @package  Biobank
- * @author   Henri Rabalais <henri.rabalais@mcin.ca>
- * @license  http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
- * @link     https://www.github.com/aces/Loris/
- */
-
-namespace LORIS\biobank;
-
-/**
- * Preparation Object Class
- * This class contains an instance of a database handling that is needed to
- * permanently store and retrieve Preparation Object instances.
- *
- * PHP Version 7.2
- *
- * @category   Entity
- * @package    Loris
- * @subpackage Biobank
- * @author     Henri Rabalais <henri.rabalais@mcin.ca>
- * @license    http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
- * @link       https://www.github.com/aces/Loris/
- */
-class Preparation extends Process
-{
-    /**
-     * Instatiates a Preparation Object using the values sent from the client-side.
-     *
-     * @param array $data Data to be used to instantiate the Preparation Object.
-     *
-     * @return Process
-     */
-    public function fromArray(array $data) : Process
-    {
-        parent::fromArray($data);
-
-        return $this;
-    }
-
-    /**
-     * A wrapper function for the jsonSerialize method of the Preparation Instance
-     * Class. This converts this Specimen Preparation into an array
-     *
-     * @return array Specimen Array
-     */
-    public function toArray()
-    {
-        return $this->jsonSerialize();
-    }
-
-    /**
-     * Returns an array representing the state of the Specimen.
-     *
-     * @return array
-     */
-    public function jsonSerialize() : array
-    {
-        $parent = parent::jsonSerialize();
-        return array_merge(
-            $parent,
-            []
-        );
-    }
-}
-
diff --git a/php/preparations.class.inc b/php/preparations.class.inc
deleted file mode 100644
index f83c45c8..00000000
--- a/php/preparations.class.inc
+++ /dev/null
@@ -1,141 +0,0 @@
-<?php declare(strict_types=1);
-/**
- * This implements the Preparation endpoint class for the Biobank Module.
- *
- * PHP Version 7.2
- *
- * @category   API
- * @package    Loris
- * @subpackage Biobank
- * @author     Henri Rabalais <henri.rabalais@mcin.ca>
- * @license    http://www.gnu.org/licenses/gpl-3.0.text GPLv3
- * @link       http://www.github.com/aces/Loris
- */
-namespace LORIS\biobank;
-use \Psr\Http\Message\ServerRequestInterface;
-use \Psr\Http\Server\RequestHandlerInterface;
-use \Psr\Http\Message\ResponseInterface;
-
-/**
- * A class for handling the /biobank/pool/ endpoint.
- *
- * PHP Version 7.2
- *
- * @category   API
- * @package    Loris
- * @subpackage Biobank
- * @author     Henri Rabalais <henri.rabalais@mcin.ca>
- * @license    http://www.gnu.org/licenses/gpl-3.0.text GPLv3
- * @link       http://www.github.com/aces/Loris/
- */
-class Preparations implements RequestHandlerInterface
-{
-    private \LORIS\LorisInstance $loris;
-    /**
-     * Returns true if user has access to this endpoint.
-     *
-     * @param \User $user The user whose access is being checked.
-     *
-     * @return bool
-     */
-    function _hasAccess(\User $user) : bool
-    {
-        return true;
-    }
-
-    /**
-     * Return which methods are supported by this endpoint.
-     *
-     * @return array supported HTTP methods
-     */
-    protected function allowedMethods() : array
-    {
-        return [
-            'DELETE',
-        ];
-    }
-
-    /**
-     * This function passes the request to the handler. This is necessary since
-     * the Endpoint bypass the Module class.
-     *
-     * XXX: This function should be extracted to a parent class.
-     *
-     * @param ServerRequestInterface  $request The PSR7 request.
-     * @param RequestHandlerInterface $handler The request handler.
-     *
-     * @return ResponseInterface The outgoing PSR7 response.
-     */
-    public function process(
-        ServerRequestInterface $request,
-        RequestHandlerInterface $handler
-    ) : ResponseInterface {
-        return $handler->handle($request);
-    }
-
-    /**
-     * Handles endpoint requests.
-     *
-     * @param ServerRequestInterface $request The incoming PSR7 request
-     *
-     * @return ResponseInterface The outgoing PSR7 response
-     */
-    public function handle(ServerRequestInterface $request) : ResponseInterface
-    {
-        $this->loris = $request->getAttribute("loris");
-        $db          = $this->loris->getDatabaseConnection();
-
-        try {
-            $db->beginTransaction();
-            switch ($request->getMethod()) {
-            case 'DELETE':
-                return $this->_handleDELETE($request);
-            case 'OPTIONS':
-                return (new \LORIS\Http\Response())
-                    ->withHeader('Allow', $this->allowedMethods());
-            }
-        } catch (BadRequest $e) {
-            $db->rollBack();
-            return new \LORIS\Http\Response\JSON\BadRequest($e->getMessage());
-        } catch (Forbidden $e) {
-            $db->rollBack();
-            return new \LORIS\Http\Response\JSON\Forbidden($e->getMessage());
-        } catch (\TypeError $e) {
-            $db->rollback();
-            return new \LORIS\Http\Response\JSON\InternalServerError(
-                $e->getMessage()
-            );
-        } catch (\DatabaseException $e) {
-            $db->rollBack();
-            return new \LORIS\Http\Response\JSON\InternalServerError(
-                $e->getMessage()
-            );
-        } finally {
-            if ($db->inTransaction()) {
-                $db->commit();
-            }
-        }
-    }
-
-    /**
-     * Delete Preparation from specified specimen.
-     *
-     * @param ServerRequestInterface $request The incoming PSR7 request
-     *
-     * @return ResponseInterface The outgoing PSR7 response
-     */
-    private function _handleDELETE(
-        ServerRequestInterface $request
-    ) : ResponseInterface {
-        $this->loris = $request->getAttribute("loris");
-
-        $db        = $this->loris->getDatabaseConnection();
-        $endpoint  = $request->getURI()->getPath();
-        $pathparts = explode('/', $endpoint);
-        $db->delete(
-            'biobank_specimen_preparation',
-            ['SpecimenID' => $pathparts[2]]
-        );
-        return new \LORIS\Http\Response\JSON\OK($pathparts);
-    }
-}
diff --git a/php/process.class.inc b/php/process.class.inc
deleted file mode 100644
index dcefddae..00000000
--- a/php/process.class.inc
+++ /dev/null
@@ -1,278 +0,0 @@
-<?php declare(strict_types=1);
-/**
- * Process Object Class
- * This class contains an instance of a database handling that is needed to
- * permanently store and retrieve Process Object instances.
- *
- * PHP Version 7.2
- *
- * @category   Entity
- * @package    Loris
- * @subpackage Biobank
- * @author     Henri Rabalais <henri.rabalais@mcin.ca>
- * @license    http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
- * @link       https://www.github.com/aces/Loris/
- */
-namespace LORIS\biobank;
-
-/**
- * Process Object Class
- * This class contains an instance of a database handling that is needed to
- * permanently store and retrieve Process Object instances.
- *
- * PHP Version 7.2
- *
- * @category   Entity
- * @package    Loris
- * @subpackage Biobank
- * @author     Henri Rabalais <henri.rabalais@mcin.ca>
- * @license    http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
- * @link       https://www.github.com/aces/Loris/
- */
-abstract class Process implements \JsonSerializable
-{
-    /**
-     * Persistent Instance variables.
-     *
-     * These variables describe a process instance.
-     *
-     * @var int       $protocolId
-     * @var int       $centerId
-     * @var int       $examinerId
-     * @var \DateTime $date
-     * @var \DateTime $time
-     * @var string    $comments
-     * @var array     $data
-     */
-    private $protocolId;
-    private $centerId;
-    private $examinerId;
-    private $date;
-    private $time;
-    private $comments;
-    private $data;
-
-    /**
-     * Initiliazes a new instance of the Process Class
-     */
-    function __construct()
-    {
-    }
-
-    /**
-     * Sets the ID of the specimen's processing protocol.
-     *
-     * @param int $protocolId the ID of the processing protocol
-     *
-     * @return void
-     */
-    public function setProtocolId(int $protocolId) : void
-    {
-        if ($protocolId > 0) {
-            $this->protocolId = $protocolId;
-        }
-    }
-
-    /**
-     * Gets the ID of the specimen's processing protocol.
-     *
-     * @return int
-     */
-    public function getProtocolId() : int
-    {
-        return $this->protocolId;
-    }
-
-    /**
-     * Sets the ID of the specimen's center at time of processing.
-     *
-     * @param int $centerId the ID of the processing center
-     *
-     * @return void
-     */
-    public function setCenterId(int $centerId) : void
-    {
-        if ($centerId > 0) {
-            $this->centerId = $centerId;
-        }
-    }
-
-    /**
-     * Gets the ID of the specimen's processing center
-     *
-     * @return int
-     */
-    public function getCenterId() : int
-    {
-        return $this->centerId;
-    }
-
-    /**
-     * Sets the ID of the specimen's examiner at time of processing.
-     *
-     * @param int $examinerId the ID of the processing center
-     *
-     * @return void
-     */
-    public function setExaminerId(int $examinerId) : void
-    {
-        if ($examinerId > 0) {
-            $this->examinerId = $examinerId;
-        }
-    }
-
-    /**
-     * Gets the ID of the specimen's processing examiner
-     *
-     * @return ?int
-     */
-    public function getExaminerId() : ?int
-    {
-        return $this->examinerId ?? null;
-    }
-
-    /**
-     * Sets the date of collection
-     *
-     * @param \DateTime $date the date of processing
-     *
-     * @return void
-     */
-    public function setDate(\DateTime $date) : void
-    {
-        $this->date = $date;
-    }
-
-    /**
-     * Gets the date of processing
-     *
-     * @return \DateTime
-     */
-    public function getDate() : \DateTime
-    {
-        return $this->date;
-    }
-
-    /**
-     * Sets the time of processing
-     *
-     * @param \DateTime $time the time of processing
-     *
-     * @return void
-     */
-    public function setTime(\DateTime $time) : void
-    {
-        $this->time = $time;
-    }
-
-    /**
-     * Gets the time of processing
-     *
-     * @return \DateTime
-     */
-    public function getTime() : \DateTime
-    {
-        return $this->time;
-    }
-
-    /**
-     * Sets processing comments
-     *
-     * @param string $comments comments relating to processing
-     *
-     * @return void
-     */
-    public function setComments(string $comments) : void
-    {
-        $this->comments = $comments;
-    }
-
-    /**
-     * Gets the processing comments
-     *
-     * @return ?string
-     */
-    public function getComments() : ?string
-    {
-        return $this->comments;
-    }
-
-    /**
-     * Sets the Data array that contains custom attributes and values.
-     *
-     * @param array $data of custom attributes and values.
-     *
-     * @return void
-     */
-    public function setData(array $data) : void
-    {
-        $this->data = $data;
-    }
-
-    /**
-     * Gets the Data array that contains custom attributes and values.
-     *
-     * @return ?array
-     */
-    public function getData() : ?array
-    {
-        return $this->data;
-    }
-
-    /**
-     * Instatiates a Process Object using the values sent from the client-side.
-     *
-     * @param array $data Data to be used to instantiate the Process Object.
-     *
-     * @return Process
-     */
-    public function fromArray(array $data) : Process
-    {
-        if (isset($data['protocolId'])) {
-            $this->setProtocolId((int) $data['protocolId']);
-        }
-        if (isset($data['centerId'])) {
-            $this->setCenterId((int) $data['centerId']);
-        }
-
-        if (isset($data['examinerId'])) {
-            $this->setExaminerId((int) $data['examinerId']);
-        }
-        if (isset($data['date'])) {
-            $this->setDate(new \DateTime($data['date']));
-        }
-        if (isset($data['time'])) {
-            $this->setTime(new \DateTime($data['time']));
-        }
-        if (isset($data['data'])) {
-            $this->setData($data['data']);
-        }
-        if (isset($data['comments'])) {
-            $this->setComments((string) $data['comments']);
-        }
-
-        return $this;
-    }
-
-
-    /**
-     * Returns an array representing the state of the Process.
-     *
-     * @return array
-     */
-    public function jsonSerialize() : array
-    {
-        // TODO: Date and Time formats should be gotten from some sort of config
-        // setting.
-        return [
-            'protocolId' => $this->protocolId,
-            'centerId'   => $this->centerId,
-            'examinerId' => $this->examinerId,
-            'date'       => $this->date->format('Y-m-d'),
-            'time'       => $this->time->format('H:i'),
-            'comments'   => $this->comments,
-            'data'       => $this->data,
-        ];
-    }
-}
-
diff --git a/php/provisioners/candidateprovisioner.class.inc b/php/provisioners/candidateprovisioner.class.inc
new file mode 100644
index 00000000..b4627cab
--- /dev/null
+++ b/php/provisioners/candidateprovisioner.class.inc
@@ -0,0 +1,38 @@
+<?php 
+
+namespace LORIS\biobank\provisioners;
+
+use \LORIS\biobank\Model;
+use \LORIS\biobank\ModelProvisioner;
+use \LORIS\biobank\data\schemas\CandidateSchema;
+use \LORIS\biobank\data\query\QueryParams;
+use \LORIS\biobank\services\SpecimenService;
+
+final class CandidateProvisioner extends ModelProvisioner
+{
+    public function __construct()
+    {
+        parent::__construct(new CandidateSchema('candidate'));
+    }
+
+    /**
+     * Preload the necessary relations based on specimen IDs.
+     *
+     * @param array $specimenIds The IDs of the specimens whose relations should be preloaded.
+     */
+    protected function preLoad(QueryParams $queryparams): array
+    {
+        return [];
+    }
+
+    /**
+     * Post-process each specimen to attach preloaded relations.
+     *
+     * @param object $specimen The specimen to modify.
+     * @return object Modified specimen with attached relations.
+     */
+    public function postLoad(Model $candidate, array $relations) : Model
+    {
+        return $candidate;
+    }
+}
diff --git a/php/provisioners/centerprovisioner.class.inc b/php/provisioners/centerprovisioner.class.inc
new file mode 100644
index 00000000..346358a2
--- /dev/null
+++ b/php/provisioners/centerprovisioner.class.inc
@@ -0,0 +1,38 @@
+<?php 
+
+namespace LORIS\biobank\provisioners;
+
+use \LORIS\biobank\Model;
+use \LORIS\biobank\ModelProvisioner;
+use \LORIS\biobank\data\schemas\CenterSchema;
+use \LORIS\biobank\data\query\QueryParams;
+use \LORIS\biobank\services\SpecimenService;
+
+final class CenterProvisioner extends ModelProvisioner
+{
+    public function __construct()
+    {
+        parent::__construct(new CenterSchema('center'));
+    }
+
+    /**
+     * Preload the necessary relations based on specimen IDs.
+     *
+     * @param array $specimenIds The IDs of the specimens whose relations should be preloaded.
+     */
+    protected function preLoad(QueryParams $queryparams): array
+    {
+        return [];
+    }
+
+    /**
+     * Post-process each specimen to attach preloaded relations.
+     *
+     * @param object $specimen The specimen to modify.
+     * @return object Modified specimen with attached relations.
+     */
+    public function postLoad(Model $center, array $relations) : Model
+    {
+        return $center;
+    }
+}
diff --git a/php/provisioners/container/typeprovisioner.class.inc b/php/provisioners/container/typeprovisioner.class.inc
new file mode 100644
index 00000000..0ff677c0
--- /dev/null
+++ b/php/provisioners/container/typeprovisioner.class.inc
@@ -0,0 +1,41 @@
+<?php 
+
+namespace LORIS\biobank\provisioners\container;
+
+use \LORIS\biobank\Model;
+use \LORIS\biobank\ModelProvisioner;
+use \LORIS\biobank\data\schemas\container\TypeSchema;
+use \LORIS\biobank\data\query\QueryParams;
+
+final class TypeProvisioner extends ModelProvisioner
+{
+    public function __construct()
+    {
+        parent::__construct(new TypeSchema('type'));
+    }
+
+    /**
+     * Prepares data or modifies query parameters before loading types.
+     * 
+     * @param QueryParams $queryparams The query parameters for fetching type data.
+     * 
+     * @return array An array of prepared data, currently returns an empty array.
+     */
+    protected function preLoad(QueryParams $queryparams): array
+    {
+        return [];
+    }
+
+    /**
+     * Processes a type model after it has been loaded, handling relations if necessary.
+     *
+     * @param Model $type The type model that has been loaded.
+     * @param array $relations An array of related data to be processed with the type.
+     *
+     * @return Model The processed type model, currently returned unchanged.
+     */
+    public function postLoad(Model $type, array $relations) : Model
+    {
+        return $type;
+    }
+}
diff --git a/php/provisioners/containerprovisioner.class.inc b/php/provisioners/containerprovisioner.class.inc
new file mode 100644
index 00000000..a98db8ec
--- /dev/null
+++ b/php/provisioners/containerprovisioner.class.inc
@@ -0,0 +1,41 @@
+<?php 
+
+namespace LORIS\biobank\provisioners;
+
+use \LORIS\biobank\Model;
+use \LORIS\biobank\ModelProvisioner;
+use \LORIS\biobank\data\schemas\ContainerSchema;
+use \LORIS\biobank\data\query\QueryParams;
+
+final class ContainerProvisioner extends ModelProvisioner
+{
+    public function __construct()
+    {
+        parent::__construct(new ContainerSchema('container'));
+    }
+
+    /**
+     * Prepares data or modifies query parameters before loading containers.
+     * 
+     * @param QueryParams $queryparams The query parameters for fetching container data.
+     * 
+     * @return array An array of prepared data, currently returns an empty array.
+     */
+    protected function preLoad(QueryParams $queryparams): array
+    {
+        return [];
+    }
+
+    /**
+     * Processes a container model after it has been loaded, handling relations if necessary.
+     *
+     * @param Model $container The container model that has been loaded.
+     * @param array $relations An array of related data to be processed with the container.
+     *
+     * @return Model The processed container model, currently returned unchanged.
+     */
+    public function postLoad(Model $container, array $relations) : Model
+    {
+        return $container;
+    }
+}
diff --git a/php/provisioners/diagnosisprovisioner.class.inc b/php/provisioners/diagnosisprovisioner.class.inc
new file mode 100644
index 00000000..04457c1a
--- /dev/null
+++ b/php/provisioners/diagnosisprovisioner.class.inc
@@ -0,0 +1,38 @@
+<?php 
+
+namespace LORIS\biobank\provisioners;
+
+use \LORIS\biobank\Model;
+use \LORIS\biobank\ModelProvisioner;
+use \LORIS\biobank\data\schemas\DiagnosisSchema;
+use \LORIS\biobank\data\query\QueryParams;
+use \LORIS\biobank\services\SpecimenService;
+
+final class DiagnosisProvisioner extends ModelProvisioner
+{
+    public function __construct()
+    {
+        parent::__construct(new DiagnosisSchema('diagnosis'));
+    }
+
+    /**
+     * Preload the necessary relations based on specimen IDs.
+     *
+     * @param array $specimenIds The IDs of the specimens whose relations should be preloaded.
+     */
+    protected function preLoad(QueryParams $queryparams): array
+    {
+        return [];
+    }
+
+    /**
+     * Post-process each specimen to attach preloaded relations.
+     *
+     * @param object $specimen The specimen to modify.
+     * @return object Modified specimen with attached relations.
+     */
+    public function postLoad(Model $diagnosis, array $relations) : Model
+    {
+        return $diagnosis;
+    }
+}
diff --git a/php/provisioners/examinerprovisioner.class.inc b/php/provisioners/examinerprovisioner.class.inc
new file mode 100644
index 00000000..33eeb29a
--- /dev/null
+++ b/php/provisioners/examinerprovisioner.class.inc
@@ -0,0 +1,38 @@
+<?php 
+
+namespace LORIS\biobank\provisioners;
+
+use \LORIS\biobank\Model;
+use \LORIS\biobank\ModelProvisioner;
+use \LORIS\biobank\data\schemas\ExaminerSchema;
+use \LORIS\biobank\data\query\QueryParams;
+use \LORIS\biobank\services\SpecimenService;
+
+final class ExaminerProvisioner extends ModelProvisioner
+{
+    public function __construct()
+    {
+        parent::__construct(new ExaminerSchema('examiner'));
+    }
+
+    /**
+     * Preload the necessary relations based on specimen IDs.
+     *
+     * @param array $specimenIds The IDs of the specimens whose relations should be preloaded.
+     */
+    protected function preLoad(QueryParams $queryparams): array
+    {
+        return [];
+    }
+
+    /**
+     * Post-process each specimen to attach preloaded relations.
+     *
+     * @param object $specimen The specimen to modify.
+     * @return object Modified specimen with attached relations.
+     */
+    public function postLoad(Model $examiner, array $relations) : Model
+    {
+        return $examiner;
+    }
+}
diff --git a/php/provisioners/poolprovisioner.class.inc b/php/provisioners/poolprovisioner.class.inc
new file mode 100644
index 00000000..10ffcf10
--- /dev/null
+++ b/php/provisioners/poolprovisioner.class.inc
@@ -0,0 +1,46 @@
+<?php 
+
+namespace LORIS\biobank\provisioners;
+
+use \LORIS\biobank\Model;
+use \LORIS\biobank\ModelProvisioner;
+use \LORIS\biobank\data\schemas\PoolSchema;
+use \LORIS\biobank\data\query\QueryParams;
+
+final class PoolProvisioner extends ModelProvisioner
+{
+    public function __construct()
+    {
+        parent::__construct(new PoolSchema('pool'));
+    }
+
+    /**
+     * Preload the necessary relations based on specimen IDs.
+     *
+     * @param array $specimenIds The IDs of the specimens whose relations should be preloaded.
+     */
+    protected function preLoad(QueryParams $queryparams): array
+    {
+        return [];
+    }
+
+    /**
+     * Post-process each specimen to attach preloaded relations.
+     *
+     * @param object $specimen The specimen to modify.
+     * @return object Modified specimen with attached relations.
+     */
+    public function postLoad(Model $pool, array $relations) : Model
+    {
+        $specimen = (new SpecimenProvisioner())->getById($pool->specimens[0]->id);
+        $container = (new ContainerProvisioner())->getById($specimen->container->id);
+
+        $pool->center = $container->center;
+        $pool->candidate = $specimen->candidate;
+        $pool->session = $specimen->session;
+        $pool->projects = $specimen->projects;
+        $pool->type = $specimen->type;
+
+        return $pool;
+    }
+}
diff --git a/php/provisioners/projectprovisioner.class.inc b/php/provisioners/projectprovisioner.class.inc
new file mode 100644
index 00000000..5d3e3e54
--- /dev/null
+++ b/php/provisioners/projectprovisioner.class.inc
@@ -0,0 +1,38 @@
+<?php 
+
+namespace LORIS\biobank\provisioners;
+
+use \LORIS\biobank\Model;
+use \LORIS\biobank\ModelProvisioner;
+use \LORIS\biobank\data\schemas\ProjectSchema;
+use \LORIS\biobank\data\query\QueryParams;
+use \LORIS\biobank\services\SpecimenService;
+
+final class ProjectProvisioner extends ModelProvisioner
+{
+    public function __construct()
+    {
+        parent::__construct(new ProjectSchema('project'));
+    }
+
+    /**
+     * Preload the necessary relations based on specimen IDs.
+     *
+     * @param array $specimenIds The IDs of the specimens whose relations should be preloaded.
+     */
+    protected function preLoad(QueryParams $queryparams): array
+    {
+        return [];
+    }
+
+    /**
+     * Post-process each specimen to attach preloaded relations.
+     *
+     * @param object $specimen The specimen to modify.
+     * @return object Modified specimen with attached relations.
+     */
+    public function postLoad(Model $project, array $relations) : Model
+    {
+        return $project;
+    }
+}
diff --git a/php/provisioners/shipment/logprovisioner.class.inc b/php/provisioners/shipment/logprovisioner.class.inc
new file mode 100644
index 00000000..8aebc1b6
--- /dev/null
+++ b/php/provisioners/shipment/logprovisioner.class.inc
@@ -0,0 +1,41 @@
+<?php 
+
+namespace LORIS\biobank\provisioners\shipment;
+
+use \LORIS\biobank\Model;
+use \LORIS\biobank\ModelProvisioner;
+use \LORIS\biobank\data\schemas\shipment\LogSchema;
+use \LORIS\biobank\data\query\QueryParams;
+
+final class LogProvisioner extends ModelProvisioner
+{
+    public function __construct()
+    {
+        parent::__construct(new LogSchema('log'));
+    }
+
+    /**
+     * Prepares data or modifies query parameters before loading logs.
+     * 
+     * @param QueryParams $queryparams The query parameters for fetching log data.
+     * 
+     * @return array An array of prepared data, currently returns an empty array.
+     */
+    protected function preLoad(QueryParams $queryparams): array
+    {
+        return [];
+    }
+
+    /**
+     * Processes a log model after it has been loaded, handling relations if necessary.
+     *
+     * @param Model $log The log model that has been loaded.
+     * @param array $relations An array of related data to be processed with the log.
+     *
+     * @return Model The processed log model, currently returned unchanged.
+     */
+    public function postLoad(Model $log, array $relations) : Model
+    {
+        return $log;
+    }
+}
diff --git a/php/provisioners/shipment/statusprovisioner.class.inc b/php/provisioners/shipment/statusprovisioner.class.inc
new file mode 100644
index 00000000..d18b4d40
--- /dev/null
+++ b/php/provisioners/shipment/statusprovisioner.class.inc
@@ -0,0 +1,41 @@
+<?php 
+
+namespace LORIS\biobank\provisioners\shipment;
+
+use \LORIS\biobank\Model;
+use \LORIS\biobank\ModelProvisioner;
+use \LORIS\biobank\data\schemas\shipment\StatusSchema;
+use \LORIS\biobank\data\query\QueryParams;
+
+final class StatusProvisioner extends ModelProvisioner
+{
+    public function __construct()
+    {
+        parent::__construct(new StatusSchema('status'));
+    }
+
+    /**
+     * Prepares data or modifies query parameters before loading statuss.
+     * 
+     * @param QueryParams $queryparams The query parameters for fetching status data.
+     * 
+     * @return array An array of prepared data, currently returns an empty array.
+     */
+    protected function preLoad(QueryParams $queryparams): array
+    {
+        return [];
+    }
+
+    /**
+     * Processes a status model after it has been loaded, handling relations if necessary.
+     *
+     * @param Model $status The status model that has been loaded.
+     * @param array $relations An array of related data to be processed with the status.
+     *
+     * @return Model The processed status model, currently returned unchanged.
+     */
+    public function postLoad(Model $status, array $relations) : Model
+    {
+        return $status;
+    }
+}
diff --git a/php/provisioners/shipment/typeprovisioner.class.inc b/php/provisioners/shipment/typeprovisioner.class.inc
new file mode 100644
index 00000000..3df86ad5
--- /dev/null
+++ b/php/provisioners/shipment/typeprovisioner.class.inc
@@ -0,0 +1,41 @@
+<?php 
+
+namespace LORIS\biobank\provisioners\shipment;
+
+use \LORIS\biobank\Model;
+use \LORIS\biobank\ModelProvisioner;
+use \LORIS\biobank\data\schemas\shipment\TypeSchema;
+use \LORIS\biobank\data\query\QueryParams;
+
+final class TypeProvisioner extends ModelProvisioner
+{
+    public function __construct()
+    {
+        parent::__construct(new TypeSchema('type'));
+    }
+
+    /**
+     * Prepares data or modifies query parameters before loading types.
+     * 
+     * @param QueryParams $queryparams The query parameters for fetching type data.
+     * 
+     * @return array An array of prepared data, currently returns an empty array.
+     */
+    protected function preLoad(QueryParams $queryparams): array
+    {
+        return [];
+    }
+
+    /**
+     * Processes a type model after it has been loaded, handling relations if necessary.
+     *
+     * @param Model $type The type model that has been loaded.
+     * @param array $relations An array of related data to be processed with the type.
+     *
+     * @return Model The processed type model, currently returned unchanged.
+     */
+    public function postLoad(Model $type, array $relations) : Model
+    {
+        return $type;
+    }
+}
diff --git a/php/provisioners/shipmentprovisioner.class.inc b/php/provisioners/shipmentprovisioner.class.inc
new file mode 100644
index 00000000..f103a567
--- /dev/null
+++ b/php/provisioners/shipmentprovisioner.class.inc
@@ -0,0 +1,41 @@
+<?php 
+
+namespace LORIS\biobank\provisioners;
+
+use \LORIS\biobank\Model;
+use \LORIS\biobank\ModelProvisioner;
+use \LORIS\biobank\data\schemas\ShipmentSchema;
+use \LORIS\biobank\data\query\QueryParams;
+
+final class ShipmentProvisioner extends ModelProvisioner
+{
+    public function __construct()
+    {
+        parent::__construct(new ShipmentSchema('shipment'));
+    }
+
+    /**
+     * Prepares data or modifies query parameters before loading shipments.
+     * 
+     * @param QueryParams $queryparams The query parameters for fetching shipment data.
+     * 
+     * @return array An array of prepared data, currently returns an empty array.
+     */
+    protected function preLoad(QueryParams $queryparams): array
+    {
+        return [];
+    }
+
+    /**
+     * Processes a shipment model after it has been loaded, handling relations if necessary.
+     *
+     * @param Model $shipment The shipment model that has been loaded.
+     * @param array $relations An array of related data to be processed with the shipment.
+     *
+     * @return Model The processed shipment model, currently returned unchanged.
+     */
+    public function postLoad(Model $shipment, array $relations) : Model
+    {
+        return $shipment;
+    }
+}
diff --git a/php/provisioners/specimen/attributeprovisioenr.class.inc b/php/provisioners/specimen/attributeprovisioenr.class.inc
new file mode 100644
index 00000000..4a8f6f49
--- /dev/null
+++ b/php/provisioners/specimen/attributeprovisioenr.class.inc
@@ -0,0 +1,41 @@
+<?php 
+
+namespace LORIS\biobank\provisioners\specimen;
+
+use \LORIS\biobank\Model;
+use \LORIS\biobank\ModelProvisioner;
+use \LORIS\biobank\data\schemas\specimen\AttributeSchema;
+use \LORIS\biobank\data\query\QueryParams;
+
+final class AttributeProvisioner extends ModelProvisioner
+{
+    public function __construct()
+    {
+        parent::__construct(new AttributeSchema('attribute'));
+    }
+
+    /**
+     * Prepares data or modifies query parameters before loading attributes.
+     * 
+     * @param QueryParams $queryparams The query parameters for fetching attribute data.
+     * 
+     * @return array An array of prepared data, currently returns an empty array.
+     */
+    protected function preLoad(QueryParams $queryparams): array
+    {
+        return [];
+    }
+
+    /**
+     * Processes a attribute model after it has been loaded, handling relations if necessary.
+     *
+     * @param Model $attribute The attribute model that has been loaded.
+     * @param array $relations An array of related data to be processed with the attribute.
+     *
+     * @return Model The processed attribute model, currently returned unchanged.
+     */
+    public function postLoad(Model $attribute, array $relations) : Model
+    {
+        return $attribute;
+    }
+}
diff --git a/php/provisioners/specimen/protocolprovisioner.class.inc b/php/provisioners/specimen/protocolprovisioner.class.inc
new file mode 100644
index 00000000..f1ce29a4
--- /dev/null
+++ b/php/provisioners/specimen/protocolprovisioner.class.inc
@@ -0,0 +1,41 @@
+<?php 
+
+namespace LORIS\biobank\provisioners\specimen;
+
+use \LORIS\biobank\Model;
+use \LORIS\biobank\ModelProvisioner;
+use \LORIS\biobank\data\schemas\specimen\ProtocolSchema;
+use \LORIS\biobank\data\query\QueryParams;
+
+final class ProtocolProvisioner extends ModelProvisioner
+{
+    public function __construct()
+    {
+        parent::__construct(new ProtocolSchema('protocol'));
+    }
+
+    /**
+     * Prepares data or modifies query parameters before loading protocols.
+     * 
+     * @param QueryParams $queryparams The query parameters for fetching protocol data.
+     * 
+     * @return array An array of prepared data, currently returns an empty array.
+     */
+    protected function preLoad(QueryParams $queryparams): array
+    {
+        return [];
+    }
+
+    /**
+     * Processes a protocol model after it has been loaded, handling relations if necessary.
+     *
+     * @param Model $protocol The protocol model that has been loaded.
+     * @param array $relations An array of related data to be processed with the protocol.
+     *
+     * @return Model The processed protocol model, currently returned unchanged.
+     */
+    public function postLoad(Model $protocol, array $relations) : Model
+    {
+        return $protocol;
+    }
+}
diff --git a/php/provisioners/specimen/typeprovisioner.class.inc b/php/provisioners/specimen/typeprovisioner.class.inc
new file mode 100644
index 00000000..4366297c
--- /dev/null
+++ b/php/provisioners/specimen/typeprovisioner.class.inc
@@ -0,0 +1,41 @@
+<?php 
+
+namespace LORIS\biobank\provisioners\specimen;
+
+use \LORIS\biobank\Model;
+use \LORIS\biobank\ModelProvisioner;
+use \LORIS\biobank\data\schemas\specimen\TypeSchema;
+use \LORIS\biobank\data\query\QueryParams;
+
+final class TypeProvisioner extends ModelProvisioner
+{
+    public function __construct()
+    {
+        parent::__construct(new TypeSchema('type'));
+    }
+
+    /**
+     * Prepares data or modifies query parameters before loading types.
+     * 
+     * @param QueryParams $queryparams The query parameters for fetching type data.
+     * 
+     * @return array An array of prepared data, currently returns an empty array.
+     */
+    protected function preLoad(QueryParams $queryparams): array
+    {
+        return [];
+    }
+
+    /**
+     * Processes a type model after it has been loaded, handling relations if necessary.
+     *
+     * @param Model $type The type model that has been loaded.
+     * @param array $relations An array of related data to be processed with the type.
+     *
+     * @return Model The processed type model, currently returned unchanged.
+     */
+    public function postLoad(Model $type, array $relations) : Model
+    {
+        return $type;
+    }
+}
diff --git a/php/provisioners/specimenprovisioner.class.inc b/php/provisioners/specimenprovisioner.class.inc
new file mode 100644
index 00000000..f4746d07
--- /dev/null
+++ b/php/provisioners/specimenprovisioner.class.inc
@@ -0,0 +1,66 @@
+<?php 
+
+namespace LORIS\biobank\provisioners;
+
+use \LORIS\biobank\Model;
+use \LORIS\biobank\ModelProvisioner;
+use \LORIS\biobank\data\schemas\SpecimenSchema;
+use \LORIS\biobank\data\query\QueryParams;
+use \LORIS\biobank\data\query\Condition;
+use \LORIS\biobank\data\query\Operator;
+
+final class SpecimenProvisioner extends ModelProvisioner
+{
+    public function __construct()
+    {
+        parent::__construct(new SpecimenSchema('specimen'));
+    }
+
+    /**
+     * Prepares data or modifies query parameters before loading specimens.
+     * 
+     * @param QueryParams $queryparams The query parameters for fetching specimen data.
+     * 
+     * @return array An array of prepared data, currently returns an empty array.
+     */
+    protected function preLoad(QueryParams $queryparams): array
+    {
+        // $query = $this->apply($queryparams->select('containerId'));
+        // $query = 'SELECT ContainerID FROM biobank_specimen';
+        // $containerIds = $this->db->pselectCol($query, []);
+        // //$this->apply($queryparams->select('containerId'))->get());
+
+        // error_log(print_r($containerIds, true));
+
+        // $containerparams = (new QueryParams())
+        //     ->where(new Condition(
+        //         field: 'id', value: $containerIds, operator: Operator::IN
+        //     ));
+
+        // error_log(print_r($containerparams, true));
+
+        // $containers = iterator_to_array((new ContainerProvisioner())->get(), true);
+        // $collections = iterator_to_array((new ProcessProvisioner())->get(), true);
+
+        // return [
+        //     'containers' => $containers,
+        // ];
+        return [];
+    }
+
+    /**
+     * Processes a specimen model after it has been loaded, handling relations if necessary.
+     *
+     * @param Model $specimen The specimen model that has been loaded.
+     * @param array $relations An array of related data to be processed with the specimen.
+     *
+     * @return Model The processed specimen model, currently returned unchanged.
+     */
+    public function postLoad(Model $specimen, array $relations) : Model
+    {
+        $specimen->container = (new ContainerProvisioner())
+            ->getById($specimen->container->id);
+
+        return $specimen;
+    }
+}
diff --git a/php/service.class.inc b/php/service.class.inc
new file mode 100644
index 00000000..bb154f89
--- /dev/null
+++ b/php/service.class.inc
@@ -0,0 +1,177 @@
+<?php  
+
+namespace LORIS\biobank;
+
+use LORIS\biobank\data\query\QueryParams;
+use \LORIS\Http\Response\JSON\BadRequest;
+
+/**
+ * Abstract class Service
+ *
+ * This class provides core service methods such as retrieving models by ID
+ * or label, applying query parameters, and saving models to the database.
+ * It includes transaction management and validation for models before
+ * persistence.
+ *
+ * @package    LORIS
+ * @subpackage Biobank
+ * @author     Henri Rabalais <henri.j.rabalais@gmail.com>
+ * @license    https://www.gnu.org/licenses/gpl-3.0.html GNU General Public
+ *             License
+ */
+abstract class Service
+{
+    /**
+     * Constructs the Service with a provisioner, factory, and optional
+     * validator.
+     *
+     * Note: A validator is required when saving instances. If omitted, 
+     * saving will throw a LogicException.
+     *
+     * @param ModelProvisioner  $provisioner The provisioner instance.
+     * @param Factory           $factory     The factory for creating models.
+     * @param ?Validator        $validator   The validator for model validation.
+     */    
+    public function __construct(
+        protected ModelProvisioner $provisioner,
+        protected Factory $factory,
+        protected ?Validator $validator = null
+    ) {}
+
+    /**
+     * Abstract method to handle post-save logic.
+     *
+     * Child classes should implement this to perform additional actions
+     * after saving a model.
+     *
+     * @param Model $instance The saved model instance.
+     */    
+    abstract protected function handlePostSave(Model $instance): void;
+
+    /**
+     * Retrieves a model by its ID.
+     *
+     * @param ?int $id The ID of the model to retrieve.
+     * @return Model   The retrieved model.
+     */    
+    public function getById(?int $id): Model
+    {
+        return $this->provisioner->getById($id);
+    }
+
+    /**
+     * Retrieves a model by its label.
+     *
+     * @param ?string $label The label of the model to retrieve.
+     * @return Model         The retrieved model.
+     */    
+    public function getByLabel(?string $label): Model
+    {
+        return $this->provisioner->getByLabel($label);
+    }
+
+    /**
+     * Applies query parameters to the provisioner.
+     *
+     * @param QueryParams $queryparams The query parameters to apply.
+     * @return ModelProvisioner        The provisioner instance with the
+     *                                 applied parameters.
+     */    
+    public function apply(QueryParams $queryparams): ModelProvisioner
+    {
+        return $this->provisioner->apply($queryparams);
+    }
+
+    /**
+     * Saves one or more models to the database.
+     *
+     * The instances are validated before saving. If validation fails, the
+     * operation is rolled back, and an error response is returned.
+     *
+     * Note: The validator is required for saving. If it is not provided, a
+     * LogicException is thrown.
+     *
+     * The `handlePostSave` method is called after each model is saved to
+     * perform any post-processing logic.
+     *
+     * @param array ...$instances The instances to be saved.
+     * @return array              The response with the status and saved data.
+     * @throws \Exception         If an error occurs during the transaction or
+     *                            validation.
+     */    
+    public function save(array ...$instances): array {
+
+        // XXX this is here so that I can omit validators for current services
+        // that live in the biobank but shouldn't long term (i.e. centers,
+        // projects, candidates, etc.)
+        if ($this->validator === null) {
+            throw new \LogicException("Validator is required for saving instances.");
+        }
+
+        error_log(print_r($instances, true));
+
+        $db = (\NDB_Factory::singleton())->database();
+        $persistor = new Persistor($db);
+        $persistor->begin();
+
+        try {
+            $models = [];
+            foreach($instances as $instance) {
+                $models[] = $this->factory->create($instance);
+            }
+
+            $this->validator->validateInstances($models);
+
+            if ($this->validator->hasErrors()) {
+                $persistor->rollback();
+                return [
+                    'status' => 'error',
+                    'errors' => $this->validator->getErrors()
+                ];
+            }
+
+            $savedInstances = [];
+            foreach ($models as $model) {
+                $savedInstance = $persistor->save($model);
+                $this->handlePostSave($savedInstance);
+                $savedInstances[] = $savedInstance;
+            }
+
+            $persistor->commit();
+            // Return a success response with saved data
+            return [
+                'status' => 'success',
+                'data' => $savedInstances
+            ];
+        } catch (\Exception $e) {
+            $persistor->rollback();
+            throw $e;
+        }
+    }
+
+    /**
+     * Deletes a model by its ID.
+     *
+     * This method begins a transaction, retrieves the model by ID, and
+     * deletes it. If the model is not found, an exception is thrown.
+     *
+     * @param string $id The ID of the model to delete.
+     * @throws \Exception If the model is not found or a deletion error
+     *                    occurs.
+     */    
+    public function delete(string $id) : void
+    {
+        $this->persistor->begin();
+        try {
+            $instance = $this->provisioner->find($id);
+            if (!$instance) {
+                throw new Exception("Instance not found");
+            }
+            $this->persistor->delete($id);
+            $this->persistor->commit();
+        } catch (Exception $e) {
+            $this->persistor->rollback();
+            throw $e;
+        }
+    }
+}
diff --git a/php/services/candidateservice.class.inc b/php/services/candidateservice.class.inc
new file mode 100644
index 00000000..7ebec1b2
--- /dev/null
+++ b/php/services/candidateservice.class.inc
@@ -0,0 +1,31 @@
+<?php declare(strict_types=1);
+
+namespace LORIS\biobank\services;
+
+use LORIS\biobank\Model;
+use LORIS\biobank\Service;
+use LORIS\biobank\provisioners\CandidateProvisioner;
+
+/**
+ * Service class for handling Candidate operations.
+ *
+ * This class initializes the necessary components for Candidate operations
+ * and provides specific implementations for handling post-save actions.
+ */
+class CandidateService extends Service
+{
+    function __construct()
+    {
+        parent::__construct(
+            new CandidateProvisioner(),
+            new LORIS\biobank\Factory(LORIS\biobank\models\Candidate::class)
+        );
+    }
+
+    /**
+     * Handles actions to be performed after saving a Candidate.
+     *
+     * @param Model $candidate The saved Candidate instance.
+     */
+    public function handlePostSave(Model $Candidate): void {}
+}
diff --git a/php/services/centerservice.class.inc b/php/services/centerservice.class.inc
new file mode 100644
index 00000000..9a340325
--- /dev/null
+++ b/php/services/centerservice.class.inc
@@ -0,0 +1,31 @@
+<?php declare(strict_types=1);
+
+namespace LORIS\biobank\services;
+
+use LORIS\biobank\Service;
+use LORIS\biobank\Model;
+use LORIS\biobank\provisioners\CenterProvisioner;
+
+/**
+ * Service class for handling Center operations.
+ *
+ * This class initializes the necessary components for Center operations
+ * and provides specific implementations for handling post-save actions.
+ */
+class CenterService extends Service
+{
+    function __construct()                                                         
+    {                                                                              
+        parent::__construct(                                                       
+            new CenterProvisioner(),                                                      
+            new \LORIS\biobank\Factory(LORIS\biobank\models\Center::class)
+        );                                                                         
+    }          
+
+    /**
+     * Handles actions to be performed after saving a Center.
+     *
+     * @param Model $center The saved Center instance.
+     */
+    public function handlePostSave(Model $Center): void {}
+}
diff --git a/php/services/container/typeservice.class.inc b/php/services/container/typeservice.class.inc
new file mode 100644
index 00000000..b3a13376
--- /dev/null
+++ b/php/services/container/typeservice.class.inc
@@ -0,0 +1,35 @@
+<?php declare(strict_types=1);
+
+namespace LORIS\biobank\services\container;
+
+use LORIS\biobank\provisioners\container\TypeProvisioner;
+use LORIS\biobank\Service;
+use LORIS\biobank\Model;
+use LORIS\biobank\Factory;
+use LORIS\biobank\models\container\Type;
+use LORIS\biobank\validators\container\TypeValidator;
+
+/**
+ * Service class for handling Type operations.
+ *
+ * This class initializes the necessary components for Type operations
+ * and provides specific implementations for handling post-save actions.
+ */
+class TypeService extends Service
+{
+    public function __construct()                                                         
+    {                                                                              
+        parent::__construct(                                                       
+            new TypeProvisioner(),                                                      
+            new Factory(Type::class),
+            new TypeValidator($this),                                         
+        );                                                                         
+    }          
+
+    /**
+     * Handles actions to be performed after saving a Type.
+     *
+     * @param Model $type The saved Type instance.
+     */
+    public function handlePostSave(Model $type): void {}
+}
diff --git a/php/services/containerservice.class.inc b/php/services/containerservice.class.inc
new file mode 100644
index 00000000..2b66c0e2
--- /dev/null
+++ b/php/services/containerservice.class.inc
@@ -0,0 +1,46 @@
+<?php declare(strict_types=1);
+
+namespace LORIS\biobank\services;
+
+
+use LORIS\Data\Filters\UserSiteMatch;
+use LORIS\biobank\Model;
+use LORIS\biobank\Service;
+use LORIS\biobank\Factory;
+use LORIS\biobank\provisioners\ContainerProvisioner;
+use LORIS\biobank\validators\ContainerValidator;
+use LORIS\biobank\models\Container;
+
+/**
+ * Service class for handling Container operations.
+ *
+ * This class initializes the necessary components for Container operations
+ * and provides specific implementations for handling post-save actions.
+ */
+class ContainerService extends Service
+{
+    function __construct()
+    {
+        parent::__construct(
+            (new ContainerProvisioner())
+                ->filter(new UserSiteMatch()),
+            new Factory(Container::class),
+            new ContainerValidator($this),
+        );
+    }
+
+   /**
+     * Handles actions to be performed after saving a Container.
+     *
+     * @param Model $instance The saved Container instance.
+     * @throws \InvalidArgumentException If the provided instance is not a Container.
+     */
+    protected function handlePostSave(Model $instance): void
+    {
+        //TODO: add a post save here that handles the parent association...
+        // If there is no longer an associated Parent Container ID, delete
+        // it from the entry from the biobank_container_parent table.
+        // If parent container ID exists, create an association in the
+        // biobank_container_parent rel table
+    }
+}
diff --git a/php/services/diagnosisservice.class.inc b/php/services/diagnosisservice.class.inc
new file mode 100644
index 00000000..d7127f5e
--- /dev/null
+++ b/php/services/diagnosisservice.class.inc
@@ -0,0 +1,33 @@
+<?php declare(strict_types=1);
+
+namespace LORIS\biobank\services;
+
+use LORIS\biobank\provisioners\DiagnosisProvisioner;
+use LORIS\biobank\Service;
+use LORIS\biobank\Model;
+use LORIS\biobank\Factory;
+use LORIS\biobank\models\Diagnosis;
+
+/**
+ * Service class for handling Diagnosis operations.
+ *
+ * This class initializes the necessary components for Diagnosis operations
+ * and provides specific implementations for handling post-save actions.
+ */
+class DiagnosisService extends Service
+{
+    function __construct()
+    {
+        parent::__construct(
+            new DiagnosisProvisioner(),
+            new Factory(Diagnosis::class)
+        );
+    }
+
+    /**
+     * Handles actions to be performed after saving a Diagnosis.
+     *
+     * @param Model $diagnosis The saved Diagnosis instance.
+     */
+    public function handlePostSave(Model $Diagnosis): void {}
+}
diff --git a/php/services/examinerservice.class.inc b/php/services/examinerservice.class.inc
new file mode 100644
index 00000000..9245958c
--- /dev/null
+++ b/php/services/examinerservice.class.inc
@@ -0,0 +1,33 @@
+<?php declare(strict_types=1);
+
+namespace LORIS\biobank\services;
+
+use LORIS\biobank\provisioners\ExaminerProvisioner;
+use LORIS\biobank\Service;
+use LORIS\biobank\Model;
+use LORIS\biobank\Factory;
+use LORIS\biobank\models\Examiner;
+
+/**
+ * Service class for handling Examiner operations.
+ *
+ * This class initializes the necessary components for Examiner operations
+ * and provides specific implementations for handling post-save actions.
+ */
+class ExaminerService extends Service
+{
+    function __construct()
+    {
+        parent::__construct(
+            new ExaminerProvisioner(),
+            new LORIS\biobank\Factory(LORIS\biobank\models\Examiner::class)
+        );
+    }
+
+    /**
+     * Handles actions to be performed after saving a Examiner.
+     *
+     * @param Model $examiner The saved Examiner instance.
+     */
+    public function handlePostSave(Model $examiner): void {}
+}
diff --git a/php/services/poolservice.class.inc b/php/services/poolservice.class.inc
new file mode 100644
index 00000000..7eeb1041
--- /dev/null
+++ b/php/services/poolservice.class.inc
@@ -0,0 +1,65 @@
+<?php declare(strict_types=1);
+/**
+ * This class features the code that enables access to the Pools of the
+ * LORIS Biobank Module.
+ *
+ * PHP Version 7.2
+ *
+ * @category   Service
+ * @package    Loris
+ * @subpackage Biobank
+ * @author     Henri Rabalais <henri.rabalais@mcin.ca>
+ * @license    http://www.gnu.org/licenses/gpl-3.0.text GPLv3
+ * @link       http://www.github.com/aces/Loris/
+ */
+namespace LORIS\biobank\services;
+
+use LORIS\biobank\provisioners\PoolProvisioner;
+use LORIS\biobank\Service;
+use LORIS\biobank\Model;
+use LORIS\biobank\Factory;
+use LORIS\biobank\validators\PoolValidator;
+use LORIS\biobank\models\Pool;
+use LORIS\Data\Filters; 
+
+/**
+ * This class features the code that enables access to the Pools of the
+ * LORIS Biobank Module.
+ *
+ * PHP Version 7.2
+ *
+ * @category   Service
+ * @package    Loris
+ * @subpackage Biobank
+ * @author     Henri Rabalais <henri.rabalais@mcin.ca>
+ * @license    http://www.gnu.org/licenses/gpl-3.0.text GPLv3
+ * @link       http://www.github.com/aces/Loris/
+ */
+class PoolService extends Service
+{
+    function __construct()                                                         
+    {                                                                              
+        parent::__construct(                                                       
+            (new PoolProvisioner())
+                ->filter(new Filters\UserSiteMatch())                                  
+                ->filter(new Filters\UserProjectMatch()),
+            new Factory(Pool::class),
+            new PoolValidator($this),                                         
+        );                                                                         
+    }          
+
+    /**
+     * Handles actions to be performed after saving a Container.
+     *
+     * @param Model $instance The saved Container instance.
+     */
+    protected function handlePostSave(Model $instance): void
+    {
+        if (!$instance instanceof Pool) {
+            throw new \InvalidArgumentException('Expected instance of Pool');
+        }
+
+        // TODO: Implement post-save logic specific to Container
+        // Example: Handle parent association changes
+    }
+}
diff --git a/php/services/projectservice.class.inc b/php/services/projectservice.class.inc
new file mode 100644
index 00000000..d3f6e708
--- /dev/null
+++ b/php/services/projectservice.class.inc
@@ -0,0 +1,35 @@
+<?php declare(strict_types=1);
+
+namespace LORIS\biobank\services;
+
+use LORIS\biobank\provisioners\ProjectProvisioner;
+use LORIS\biobank\Service;
+use LORIS\biobank\Model;
+use LORIS\biobank\Factory;
+use LORIS\biobank\data\schemas\ProjectSchema;
+use LORIS\biobank\data\schema\LoadingStrategy;
+use LORIS\biobank\models\Project;
+
+/**
+ * Service class for handling Project operations.
+ *
+ * This class initializes the necessary components for Project operations
+ * and provides specific implementations for handling post-save actions.
+ */
+class ProjectService extends Service
+{
+    function __construct()                                                         
+    {                                                                              
+        parent::__construct(                                                       
+            new ProjectProvisioner(),
+            new Factory(Project::class)
+        );                                                                         
+    }          
+
+    /**
+     * Handles actions to be performed after saving a Project.
+     *
+     * @param Model $project The saved Project instance.
+     */
+    public function handlePostSave(Model $Project): void {}
+}
diff --git a/php/services/shipment/logservice.class.inc b/php/services/shipment/logservice.class.inc
new file mode 100644
index 00000000..b13ac3df
--- /dev/null
+++ b/php/services/shipment/logservice.class.inc
@@ -0,0 +1,35 @@
+<?php declare(strict_types=1);
+
+namespace LORIS\biobank\services\shipment;
+
+use LORIS\biobank\provisioners\shipment\LogProvisioner;
+use LORIS\biobank\Service;
+use LORIS\biobank\Model;
+use LORIS\biobank\Factory;
+use LORIS\biobank\models\shipment\Log;
+use LORIS\biobank\validators\shipment\LogValidator;
+
+/**
+ * Service class for handling Log operations.
+ *
+ * This class initializes the necessary components for Log operations
+ * and provides specific implementations for handling post-save actions.
+ */
+class LogService extends Service
+{
+    function __construct()                                                         
+    {                                                                              
+        parent::__construct(                                                       
+            new LogProvisioner(),
+            new Factory(Log::class),
+            new LogValidator($this),                                         
+        );                                                                         
+    }          
+
+    /**
+     * Handles actions to be performed after saving a Log.
+     *
+     * @param Model $log The saved Log instance.
+     */
+    public function handlePostSave(Model $Log): void {}
+}
diff --git a/php/services/shipment/statusservice.class.inc b/php/services/shipment/statusservice.class.inc
new file mode 100644
index 00000000..e489ea3c
--- /dev/null
+++ b/php/services/shipment/statusservice.class.inc
@@ -0,0 +1,35 @@
+<?php declare(strict_types=1);
+
+namespace LORIS\biobank\services\shipment;
+
+use LORIS\biobank\provisioners\shipment\StatusProvisioner;
+use LORIS\biobank\Service;
+use LORIS\biobank\Model;
+use LORIS\biobank\Factory;
+use LORIS\biobank\models\shipment\Status;
+use LORIS\biobank\validators\shipment\StatusValidator;
+
+/**
+ * Service class for handling Status operations.
+ *
+ * This class initializes the necessary components for Status operations
+ * and provides specific implementations for handling post-save actions.
+ */
+class StatusService extends Service
+{
+    function __construct()                                                         
+    {                                                                              
+        parent::__construct(                                                       
+            new StatusProvisioner(),
+            new Factory(Status::class),
+            new StatusValidator($this),                                         
+        );                                                                         
+    }          
+
+    /**
+     * Handles actions to be performed after saving a Status.
+     *
+     * @param Model $status The saved Status instance.
+     */
+    public function handlePostSave(Model $status): void {}
+}
diff --git a/php/services/shipment/typeservice.class.inc b/php/services/shipment/typeservice.class.inc
new file mode 100644
index 00000000..fbc9b2ab
--- /dev/null
+++ b/php/services/shipment/typeservice.class.inc
@@ -0,0 +1,35 @@
+<?php declare(strict_types=1);
+
+namespace LORIS\biobank\services\shipment;
+
+use LORIS\biobank\provisioners\shipment\TypeProvisioner;
+use LORIS\biobank\Service;
+use LORIS\biobank\Model;
+use LORIS\biobank\Factory;
+use LORIS\biobank\models\shipment\Type;
+use LORIS\biobank\validators\shipment\TypeValidator;
+
+/**
+ * Service class for handling Type operations.
+ *
+ * This class initializes the necessary components for Type operations
+ * and provides specific implementations for handling post-save actions.
+ */
+class TypeService extends Service
+{
+    function __construct()                                                         
+    {                                                                              
+        parent::__construct(                                                       
+            new TypeProvisioner(),                                      
+            new Factory(Type::class),
+            new TypeValidator($this),                                         
+        );                                                                         
+    }          
+
+    /**
+     * Handles actions to be performed after saving a Type.
+     *
+     * @param Model $type The saved Type instance.
+     */
+    public function handlePostSave(Model $type): void {}
+}
diff --git a/php/services/shipmentservice.class.inc b/php/services/shipmentservice.class.inc
new file mode 100644
index 00000000..2c1f2445
--- /dev/null
+++ b/php/services/shipmentservice.class.inc
@@ -0,0 +1,61 @@
+<?php declare(strict_types=1);
+
+namespace LORIS\biobank\services;
+
+use \LORIS\biobank\Service;
+use \LORIS\biobank\Model;
+use \LORIS\biobank\provisioners\ShipmentProvisioner;
+use \LORIS\biobank\validators\ShipmentValidator;
+
+/**
+ * Service class for handling Container operations.
+ *
+ * This class initializes the necessary components for Container operations
+ * and provides specific implementations for handling post-save actions.
+ */
+class ShipmentService extends Service
+{
+    function __construct()                                                         
+    {                                                                              
+        parent::__construct(                                                       
+            new ShipmentProvisioner(),
+            new \LORIS\biobank\Factory(\LORIS\biobank\models\Shipment::class),
+            new ShipmentValidator($this),                                         
+        );                                                                         
+    }          
+
+    /**
+     * Handles actions to be performed after saving a Container.
+     *
+     * @param Model $instance The saved Container instance.
+     */
+    public function handlePostSave(Model $shipment): void
+    {
+        $this->saveLogs($shipment);
+        $this->saveContainers($shipment);
+    }
+
+    public function saveLogs(Shipment $shipment): void
+    {
+        
+        // $logDAO = new DAO($dao->db);
+        // foreach ($shipment->getLogs() as $log) {
+        //     $log->setShipmentId($shipment->getId());
+        //     $logDAO->save($log);
+        // }
+    }
+
+    public function saveContainers(Shipment $shipment): void
+    {
+        //$containerDAO = new ContainerDAO($dao->db);
+        //foreach ($shipment->getContainerIds() as $containerId) {
+        //    $container = $containerDAO->getInstanceById((int) $containerId);
+        //    if (!$shipment->getId()) {
+        //        $container->setParentContainerId(null);
+        //    } else {
+        //        $container->setCenterId(new \CenterID(strval($shipment->getDestinationCenterId())));
+        //    }
+        //    $containerDAO->save($container);
+        //}
+    }
+}
diff --git a/php/services/specimen/attributeservice.class.inc b/php/services/specimen/attributeservice.class.inc
new file mode 100644
index 00000000..e0a9239c
--- /dev/null
+++ b/php/services/specimen/attributeservice.class.inc
@@ -0,0 +1,35 @@
+<?php declare(strict_types=1);
+
+namespace LORIS\biobank\services\specimen;
+
+use LORIS\biobank\provisioners\specimen\AttributeProvisioner;
+use LORIS\biobank\Service;
+use LORIS\biobank\Model;
+use LORIS\biobank\Factory;
+use LORIS\biobank\models\specimen\Attribute;
+use LORIS\biobank\validators\specimen\AttributeValidator;
+
+/**
+ * Service class for handling Attribute operations.
+ *
+ * This class initializes the necessary components for Attribute operations
+ * and provides specific implementations for handling post-save actions.
+ */
+class AttributeService extends Service
+{
+    function __construct()                                                         
+    {                                                                              
+        parent::__construct(                                                       
+            new AttributeProvisioner(),
+            new Factory(Attribute::class),
+            new AttributeValidator($this),                                         
+        );                                                                         
+    }          
+
+    /**
+     * Handles actions to be performed after saving a Attribute.
+     *
+     * @param Model $attribute The saved Attribute instance.
+     */
+    public function handlePostSave(Model $type): void {}
+}
diff --git a/php/services/specimen/protocolservice.class.inc b/php/services/specimen/protocolservice.class.inc
new file mode 100644
index 00000000..b314d82c
--- /dev/null
+++ b/php/services/specimen/protocolservice.class.inc
@@ -0,0 +1,35 @@
+<?php declare(strict_types=1);
+
+namespace LORIS\biobank\services\specimen;
+
+use LORIS\biobank\provisioners\specimen\ProtocolProvisioner;
+use LORIS\biobank\Service;
+use LORIS\biobank\Model;
+use LORIS\biobank\Factory;
+use LORIS\biobank\models\specimen\Protocol;
+use LORIS\biobank\validators\specimen\ProtocolValidator;
+
+/**
+ * Service class for handling Protocol operations.
+ *
+ * This class initializes the necessary components for Protocol operations
+ * and provides specific implementations for handling post-save actions.
+ */
+class ProtocolService extends Service
+{
+    function __construct()                                                         
+    {                                                                              
+        parent::__construct(                                                       
+            new ProtocolProvisioner(),
+            new Factory(Protocol::class),
+            new ProtocolValidator($this),                                         
+        );                                                                         
+    }          
+
+    /**
+     * Handles actions to be performed after saving a Protocol.
+     *
+     * @param Model $protocol The saved Protocol instance.
+     */
+    public function handlePostSave(Model $protocol): void {}
+}
diff --git a/php/services/specimen/typeservice.class.inc b/php/services/specimen/typeservice.class.inc
new file mode 100644
index 00000000..ef486899
--- /dev/null
+++ b/php/services/specimen/typeservice.class.inc
@@ -0,0 +1,35 @@
+<?php declare(strict_types=1);
+
+namespace LORIS\biobank\services\specimen;
+
+use LORIS\biobank\provisioners\specimen\TypeProvisioner;
+use LORIS\biobank\Service;
+use LORIS\biobank\Model;
+use LORIS\biobank\Factory;
+use LORIS\biobank\models\specimen\Type;
+use LORIS\biobank\validators\specimen\TypeValidator;
+
+/**
+ * Service class for handling Type operations.
+ *
+ * This class initializes the necessary components for Type operations
+ * and provides specific implementations for handling post-save actions.
+ */
+class TypeService extends Service
+{
+    function __construct()                                                         
+    {                                                                              
+        parent::__construct(                                                       
+            new TypeProvisioner(),
+            new Factory(Type::class),
+            new TypeValidator($this),                                         
+        );                                                                         
+    }          
+
+    /**
+     * Handles actions to be performed after saving a Type.
+     *
+     * @param Model $type The saved Type instance.
+     */
+    public function handlePostSave(Model $type): void {}
+}
diff --git a/php/services/specimenservice.class.inc b/php/services/specimenservice.class.inc
new file mode 100644
index 00000000..929ec9ca
--- /dev/null
+++ b/php/services/specimenservice.class.inc
@@ -0,0 +1,50 @@
+<?php declare(strict_types=1);                                                     
+                                                                                   
+namespace LORIS\biobank\services;                                                  
+                                                                                   
+use LORIS\biobank\provisioners\SpecimenProvisioner;
+use LORIS\biobank\Service;                                                         
+use LORIS\biobank\Model;                                                           
+use LORIS\biobank\Factory;
+use LORIS\biobank\models\Specimen;                                                
+use LORIS\biobank\validators\SpecimenValidator;                                   
+use LORIS\Data\Filters;                                              
+                                                                                   
+/**                                                                                
+ * Service class for handling Container operations.                                
+ *                                                                                 
+ * This class initializes the necessary components for Container operations        
+ * and provides specific implementations for handling post-save actions.           
+ */                                                                                
+class SpecimenService extends Service                                             
+{                                                                                  
+    function __construct()                                                         
+    {                                                                              
+        parent::__construct(                                                       
+            (new SpecimenProvisioner())
+                ->filter(new Filters\UserSiteMatch())
+                ->filter(new Filters\UserProjectMatch()),
+            new Factory(Specimen::class),
+            new SpecimenValidator($this),                                         
+        );                                                                         
+    }          
+
+                                                                                   
+    /**                                                                            
+     * Handles actions to be performed after saving a Container.                   
+     *                                                                             
+     * @param Model $instance The saved Container instance.                        
+     */                                                                            
+    protected function handlePostSave(Model $specimen): void                       
+    {                                                                              
+        $specimen->collection->id = $specimen->id;
+        $specimen->preparation->id = $specimen->id;
+        $specimen->analysis->id = $specimen->id;
+
+        (new ContainerService)->save($specimen->container);
+        (new ProcessService)
+            ->save($specimen->collection)
+            ->save($specimen->preparation)
+            ->save($specimen->analysis);
+    }                                                                              
+}    
diff --git a/php/shipment.class.inc b/php/shipment.class.inc
deleted file mode 100644
index 11dde717..00000000
--- a/php/shipment.class.inc
+++ /dev/null
@@ -1,245 +0,0 @@
-<?php declare(strict_types=1);
-/**
- * Shipment Class
- * This class contains an instance of a database handling that is needed to
- * permanently store and retrieve Shipment Object instances.
- *
- * PHP Version 7.2
- *
- * @category   Entity
- * @package    Loris
- * @subpackage Biobank
- * @author     Henri Rabalais <henri.rabalais@mcin.ca>
- * @license    http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
- * @link       https://www.github.com/aces/Loris/
- */
-namespace LORIS\biobank;
-
-/**
- * Shipment Class
- * This class contains an instance of a database handling that is needed to
- * permanently store and retrieve Shipment Object instances.
- *
- * PHP Version 7.2
- *
- * @category   Entity
- * @package    Loris
- * @subpackage Biobank
- * @author     Henri Rabalais <henri.rabalais@mcin.ca>
- * @license    http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
- * @link       https://www.github.com/aces/Loris/
- */
-class Shipment implements \JsonSerializable, \LORIS\Data\DataInstance
-{
-    /**
-     * Persistent Instance variables.
-     *
-     * These properties describe a shipment entity.
-     *
-     * @var string  $id
-     * @var string  $barcode
-     * @var string  $type
-     * @var string  $destinationCenterId
-     * @var array   $containerIds
-     * @var array   $logs
-     */
-    public ?string $id;
-    public ?string $barcode;
-    public ?string $type;
-    public ?string $destinationCenterId;
-    public ?array $containerIds;
-    public ?array $logs;
-
-    /**
-     * Initiliazes a new instance of the Shipment Class
-     *
-     * @param array $data The data for the shipment in array format.
-     */
-    function __construct(array $data)
-    {
-        $this->id      = $data['id'] ?? null;
-        $this->barcode = $data['barcode'] ?? null;
-        $this->type    = $data['type'] ?? null;
-        $this->destinationCenterId = $data['destinationCenterId'] ?? null;
-        $this->containerIds        = $data['containerIds'] ?? null;
-        $this->_setLogs($data['logs']) ?? null;
-    }
-
-    /**
-     * Sets the shipment's ID
-     *
-     * @param string $id the shipment's ID
-     *
-     * @return void
-     */
-    private function _setId(string $id) : void
-    {
-        $this->id = $id;
-    }
-
-    /**
-     * Gets the shipment's ID
-     *
-     * @return ?string
-     */
-    public function getId() : ?string
-    {
-        return $this->id;
-    }
-
-    /**
-     * Gets the tracking number of the shipment
-     *
-     * @return ?string
-     */
-    public function getBarcode() : ?string
-    {
-        return $this->barcode;
-    }
-
-    /**
-     * Gets the type of the shipment
-     *
-     * @return ?string
-     */
-    public function getType() : ?string
-    {
-        return $this->type;
-    }
-
-    /**
-     * Gets the origin center of the shipment
-     *
-     * @return ?string
-     */
-    public function getOriginCenterId() : ?string
-    {
-        if (!empty($this->getLogs())) {
-            return $this->getLogs()[0]->centerId;
-        }
-    }
-
-    /**
-     * Gets the destination center of the shipment
-     *
-     * @return ?string
-     */
-    public function getDestinationCenterId() : ?string
-    {
-        return $this->destinationCenterId;
-    }
-
-    /**
-     * Gets the status of the shipment
-     *
-     * @return ?string
-     */
-    public function getStatus() : ?string
-    {
-        if (!empty($this->getLogs())) {
-            $latestLog = $this->getLogs()[array_key_last($this->getLogs())];
-            return $latestLog->status;
-        }
-    }
-
-    /**
-     * Returns true if the shipment is not received.
-     *
-     * @return bool
-     */
-    public function getActive() : bool
-    {
-        return $this->getStatus() !== 'received';
-    }
-
-    /**
-     * Gets the containers of the shipment
-     *
-     * @return ?array
-     */
-    public function getContainerIds() : ?array
-    {
-        return $this->containerIds;
-    }
-
-    /**
-     * Sets the logs for the shipment
-     *
-     * @param array $logs the shipment's logs
-     *
-     * @return void
-     */
-    private function _setLogs(array $logs) : void
-    {
-        // TODO: THis should maybe go in the SHipment Handler.
-        foreach ($logs as $i => $log) {
-            $this->logs[$i] = new Log($log);
-        }
-    }
-
-    /**
-     * Gets the logs of the shipment
-     *
-     * @return array
-     */
-    public function getLogs() : array
-    {
-        return $this->logs;
-    }
-
-    /**
-     * Return Center ID of affiliated specimen container.
-     *
-     * @return int
-     */
-    // NOTE: this function was added for reasons relating to permissions. I do
-    // find this an ideal solution, given that the centerId and the
-    // destinationCenterId should not be equated. Rather, this should
-    // ideally return a value dependent on the current status of the shipment
-    public function getCenterId()
-    {
-        return $this->getDestinationCenterId();
-    }
-
-    /**
-     * A wrapper function for the jsonSerialize method of the Shipment Instance
-     * Class. This converts the Shipment Instance into an array.
-     *
-     * @return array Shipment Array.
-     */
-    public function toArray() : array
-    {
-        return $this->jsonSerialize();
-    }
-
-    /**
-     * Returns an array representing the state of the Shipment
-     *
-     * @return array
-     */
-    public function jsonSerialize() : array
-    {
-        return [
-            'id'                  => $this->id,
-            'barcode'             => $this->barcode,
-            'type'                => $this->type,
-            'originCenterId'      => $this->getOriginCenterId(),
-            'destinationCenterId' => $this->destinationCenterId,
-            'containerIds'        => $this->containerIds,
-            'status'              => $this->getStatus(),
-            'active'              => $this->getActive(),
-            'logs'                => $this->logs,
-        ];
-    }
-
-    /**
-     * Returns a JSON encoded string of the state of the Shipment
-     *
-     * @return string JSON encoded string of Shipment data
-     */
-    public function toJSON() : string
-    {
-        return json_encode($this);
-    }
-}
-
diff --git a/php/shipmentdao.class.inc b/php/shipmentdao.class.inc
deleted file mode 100644
index 1a6eb8d8..00000000
--- a/php/shipmentdao.class.inc
+++ /dev/null
@@ -1,369 +0,0 @@
-<?php declare(strict_types=1);
-/**
- * Shipment Data Access Object (DAO) Class
- * This class contains all database handling that is needed to
- * permanently store and retrieve Shipment Object instances
- *
- * PHP Version 7.2
- *
- * @category   DAO
- * @package    Loris
- * @subpackage Biobank
- * @author     Henri Rabalais <henri.rabalais@mcin.ca>
- * @license    http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
- * @link       https://www.github.com/aces/Loris/
- */
-namespace LORIS\biobank;
-
-/**
- * Shipment Data Access Object (DAO) Class
- * This class contains all database handling that is needed to
- * permanently store and retrieve Shipment Object instances
- *
- * PHP Version 7.2
- *
- * @category   DAO
- * @package    Loris
- * @subpackage Biobank
- * @author     Henri Rabalais <henri.rabalais@mcin.ca>
- * @license    http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
- * @link       https://www.github.com/aces/Loris/
- */
-class ShipmentDAO extends \LORIS\Data\ProvisionerInstance
-{
-    /**
-     * Private instance of the Database class.
-     *
-     * @var \Database $dao
-     */
-    private $db;
-
-    /**
-     * Initializes a new instance of the ShipmentDAO Class
-     *
-     * @param \Database $db Instance of the LORIS Database class
-     */
-    function __construct(\Database $db)
-    {
-        $this->db = $db;
-    }
-
-    /**
-     * This method is used when the DAO class needs to create a new Shipment
-     * instance.
-     *
-     * @param array $shipmentArray Data to initialize the shipment with
-     *
-     * @return Shipment
-     */
-    private function _getInstance($shipmentArray) : Shipment
-    {
-        return new Shipment($shipmentArray);
-    }
-
-    /**
-     * This will load all shipment persistence variables from the database for a
-     * given $id into a Shipment object, and return the object.
-     *
-     * @param string $barcode Value of the $barocde for the Shipment that will be
-     *                        instantiated
-     *
-     * @return Shipment $shipment Shipment Instance.
-     */
-    public function getInstanceFromBarcode(string $barcode) : Shipment
-    {
-        return $this->selectInstances(
-            [
-                ['column'=>'s.Barcode', 'value'=>$barcode],
-            ],
-        )[$barcode];
-    }
-
-    /**
-     * This will select all shipments from the database that match the
-     * attribute values passed by $conditions and will return an array
-     * of shipment objects.
-     *
-     * @param ?array $conditions Conditions to be met by the query
-     * @param string $operator   The operator to use to link the conditions
-     *
-     * @return array $shipments List of Shipment Objects that match the query
-     */
-    public function selectInstances(
-        ?array $conditions = [],
-        $operator = 'AND'
-    ) : array {
-        $query = "SELECT s.ShipmentID as id,
-                         s.Barcode as barcode,
-                         st.Label as type,
-                         s.DestinationCenterID as destinationCenterId,
-                         GROUP_CONCAT(bc.ContainerId) as containerIds
-                  FROM shipment s
-                  LEFT JOIN shipment_type st
-                    USING (ShipmentTypeID)
-                  LEFT JOIN psc psc
-                    ON (s.DestinationCenterID=psc.CenterID)
-                  LEFT JOIN biobank_container_shipment_rel bcsr
-                    ON (s.ShipmentID=bcsr.ShipmentID)
-                  LEFT JOIN biobank_container bc
-                    ON (bcsr.ContainerID=bc.ContainerID)";
-        if (!empty($conditions)) {
-            $whereClause = [];
-            foreach ($conditions as $condition) {
-                $whereClause[] = $condition['column']
-                    . '='
-                    . '"'
-                    . $condition['value']
-                    . '"';
-            }
-            $query .= ' WHERE '.implode(" $operator ", $whereClause);
-        }
-        $query .= " GROUP BY s.ShipmentID";
-
-        $shipments    = [];
-        $shipmentRows = $this->db->pselectWithIndexKey($query, [], 'barcode');
-        $logs         = $this->getLogs();
-        foreach ($shipmentRows as $barcode => $shipmentRow) {
-            $shipmentRow['containerIds'] = $shipmentRow['containerIds'] ?
-              explode(',', $shipmentRow['containerIds']) : [];
-            $shipmentRow['logs']         = $logs[$barcode];
-            $shipment            = new Shipment($shipmentRow);
-            $shipments[$barcode] = $shipment;
-        }
-
-        return $shipments;
-    }
-
-    /**
-     * Get a list of all shipment logs
-     *
-     * @return array
-     */
-    public function getLogs() : array
-    {
-        $query   = "SELECT s.Barcode as barcode,
-                         sl.CenterID as centerId,
-                         u.Real_name as user,
-                         ss.Label as status,
-                         sl.Temperature as temperature,
-                         sl.Date as date,
-                         sl.Time as time,
-                         sl.Comments as comments
-                  FROM shipment_log sl
-                  LEFT JOIN shipment s
-                    ON (sl.ShipmentID=s.ShipmentID)
-                  LEFT JOIN psc
-                    ON (sl.CenterID=psc.CenterID)
-                  LEFT JOIN users u
-                    ON (sl.UserID=u.ID)
-                  LEFT JOIN shipment_status ss
-                    ON (sl.StatusID=ss.StatusID)
-                  ORDER BY date, time";
-        $logRows = $this->db->pselect($query, []);
-
-        $logs = [];
-        foreach ($logRows as $logRow) {
-            $logs[$logRow['barcode']][] = $logRow;
-        }
-        return $logs;
-    }
-
-    /**
-     * Instantiates an ArrayIterator class that is composed of all the Shipment
-     * Objects.
-     *
-     * @return \Traversable Iterator of Shipment Objects
-     */
-    protected function getAllInstances() : \Traversable
-    {
-        return new \ArrayIterator($this->selectInstances());
-    }
-
-    /**
-     * Get a list of all existing shipment statuses.
-     *
-     * @return string[]
-     */
-    public function getStatuses() : array
-    {
-        $query = "SELECT Label as label, Label FROM shipment_status";
-        return $this->db->pselectColWithIndexKey($query, [], 'label');
-    }
-
-    /**
-     * Get a list of all existing shipment types.
-     *
-     * @return string[]
-     */
-    public function getTypes() : array
-    {
-        $query = "SELECT Label as label, Label FROM shipment_type";
-        return $this->db->pselectColWithIndexKey($query, [], 'label');
-    }
-
-    /**
-     * This function receives a Shipment Object, converts it into a SQL format
-     * and inserts it into all relevant tables in the database.
-     *
-     * @param Shipment $shipment The Shipment Object to be saved the
-     *                           database.
-     *
-     * @return array The Shipment Objects that were saved
-     *               to the database.
-     */
-    public function saveInstance(Shipment $shipment) : array
-    {
-        //TODO: This should probably have a try catch block of sorts.
-        // Converts Shipment Object into SQL format and inserts into database.
-        $shipmentSQL = $this->_getSQLFromInstance($shipment);
-        $this->db->insertOnDuplicateUpdate(
-            'shipment',
-            $shipmentSQL
-        );
-
-        $shipmentId = $shipment->id ?? $this->db->getLastInsertID();
-
-        foreach ($shipment->logs as $log) {
-            $logSQL = $this->_getLogSQLFromInstance($log, $shipmentId);
-            $this->db->insertOnDuplicateUpdate(
-                'shipment_log',
-                $logSQL
-            );
-        }
-
-        // XXX: This following commands should perhaps be moved to the handler
-        // instead of the dao.
-        $containerDAO = new ContainerDAO($this->db);
-
-        // XXX: Most of this will likely go into the controller instead of the DAO.
-        // Checks out each listed container from their respective parent, if it
-        // exists
-        $updatedContainers = [];
-        // TODO: Change to if "First".
-        if (!$shipment->getId()) {
-            foreach ($shipment->containerIds as $containerId) {
-                $container = $containerDAO->getInstanceFromId((int) $containerId);
-                $container->setParentContainerId(null);
-                $updatedContainers = array_merge(
-                    $updatedContainers,
-                    $containerDAO->updateInstance($container)
-                );
-            }
-        }
-        // TODO: This will later need to be replaced by a more robust system
-        // that relies on the log type, such as active, locked, final, etc.
-
-        $containerIds = $this->_getAllContainerIds($shipment);
-        foreach ($containerIds as $containerId) {
-            // TODO: Change to if "Final"
-            if ($shipment->getId()) {
-                // places all containers at destination center
-                $container = $containerDAO->getInstanceFromId((int) $containerId);
-                $container->setCenterId(new \CenterID(strval($shipment->destinationCenterId)));
-                $updatedContainers = array_merge(
-                    $updatedContainers,
-                    $containerDAO->updateInstance($container)
-                );
-            }
-            // TODO: Change to if "First"
-            if (!$shipment->getId()) {
-                $this->db->insertOnDuplicateUpdate(
-                    'biobank_container_shipment_rel',
-                    ['ShipmentID' => $shipmentId, 'ContainerID' => $containerId]
-                );
-                $updatedContainers[] = $containerDAO->getInstanceFromId(
-                    (int) $containerId
-                );
-            }
-        }
-
-        return [
-            'shipments'  => [$this->getInstanceFromBarcode($shipment->barcode)],
-            'containers' => $updatedContainers,
-        ];
-    }
-
-    /**
-     * Get a list of all containers contained in a a shipment.
-     *
-     * @param Shipment $shipment The shipment
-     *
-     * @return array
-     */
-    private function _getAllContainerIds(Shipment $shipment) : array
-    {
-        $containerDAO      = new ContainerDAO($this->db);
-        $childContainerIds = [];
-        foreach ($shipment->containerIds as $containerId) {
-            $container = $containerDAO->getInstanceFromId((int) $containerId);
-            $containerDAO->updateInstance($container)[0];
-
-            $childContainerIds = array_merge(
-                $childContainerIds,
-                $containerDAO->getAllChildContainerIds($container)
-            );
-        }
-        $allContainerIds = array_merge(
-            $childContainerIds,
-            $shipment->containerIds
-        );
-        return array_unique($allContainerIds);
-    }
-
-    /**
-     * This function takes a Shipment Instance and prepares the data to be
-     * inserted into the database by converting it to a data array. This one to
-     * one mapping is done to enable the update or insertion of data into the
-     * database directly from the resulting arrays.
-     *
-     * @param Shipment $shipment Shipment Instance to be converted
-     *
-     * @return array $data Array containing the data to be inserted
-     */
-    private function _getSQLFromInstance(Shipment $shipment) : array
-    {
-        $typeId = $this->db->pselectOne(
-            'SELECT ShipmentTypeID from shipment_type WHERE Label=:l',
-            ['l' => $shipment->type]
-        );
-        return [
-            'ShipmentID'          => $shipment->id,
-            'Barcode'             => $shipment->barcode,
-            'ShipmentTypeID'      => $typeId,
-            'DestinationCenterID' => $shipment->destinationCenterId,
-        ];
-    }
-
-    /**
-     * Get the shipment logs from the SQL database for an instance
-     *
-     * @param Log    $log        The shipment log to retrieve
-     * @param string $shipmentId The shipment id with the log
-     *
-     * @return array
-     */
-    private function _getLogSQLFromInstance(Log $log, string $shipmentId) : array
-    {
-        // TODO: These queries feel clumsy. There is likely a better way to get
-        // the ID.
-        $statusId = $this->db->pselectOne(
-            'SELECT StatusID from shipment_status WHERE Label=:l',
-            ['l' => $log->status]
-        );
-        $userId   = $this->db->pselectOne(
-            'SELECT ID FROM users WHERE Real_name=:u',
-            ['u' => $log->user]
-        );
-
-        return [
-            'ShipmentID'  => $shipmentId,
-            'CenterID'    => $log->centerId,
-            'StatusID'    => $statusId,
-            'UserID'      => $userId,
-            'Temperature' => $log->temperature,
-            'Date'        => (new \DateTime($log->date))->format('Y-m-d H:i'),
-            'Time'        => (new \DateTime($log->time))->format('Y-m-d H:i'),
-            'Comments'    => $log->comments,
-        ];
-    }
-}
diff --git a/php/shipmenthandler.class.inc b/php/shipmenthandler.class.inc
deleted file mode 100644
index f04b70ac..00000000
--- a/php/shipmenthandler.class.inc
+++ /dev/null
@@ -1,465 +0,0 @@
-<?php declare(strict_types=1);
-/**
- * This class features the code that enables access to the Shipments of the LORIS
- * Biobank Module.
- *
- * PHP Version 7.2
- *
- * @category   Handler
- * @package    Loris
- * @subpackage Biobank
- * @author     Henri Rabalais <henri.rabalais@mcin.ca>
- * @license    http://www.gnu.org/licenses/gpl-3.0.text GPLv3
- * @link       http://www.github.com/aces/Lors/
- */
-namespace LORIS\biobank;
-
-/**
- * This class features the code that enables access to the Shipments of the LORIS
- * Biobank Module.
- *
- * PHP Version 7.2
- *
- * @category   Handler
- * @package    Loris
- * @subpackage Biobank
- * @author     Henri Rabalais <henri.rabalais@mcin.ca>
- * @license    http://www.gnu.org/licenses/gpl-3.0.text GPLv3
- * @link       http://www.github.com/aces/Lors/
- */
-class ShipmentHandler
-{
-    private array $errors;
-
-    /**
-     * Private instances of the Database, User and ContainerDAO classes
-     *
-     * @var Shipment   $shipment
-     * @var \Database   $db
-     * @var \User       $user
-     * @var ShipmentDAO $dao
-     */
-    private $shipment;
-    private $db;
-    private $user;
-    private ShipmentDAO $dao;
-
-    /**
-     * Shipment Handler Class constructor
-     *
-     * @param array     $data An array of data to initialize the instance with
-     * @param \Database $db   Database Instance.
-     * @param \User     $user User Instance.
-     */
-    function __construct(array $data, \Database $db, \User $user)
-    {
-        $this->db       = $db;
-        $this->user     = $user;
-        $this->dao      = $this->_getDataProvisioner();
-        $this->shipment = new Shipment($data);
-        $this->_validate($this->shipment);
-    }
-
-    /**
-     * This method creates a new, empty instance of a shipment.
-     *
-     * @return array a list of shipment objects that were created.
-     */
-    public function createInstance() : array
-    {
-        $this->_validatePermission('create');
-        return $this->dao->saveInstance($this->shipment);
-    }
-
-    /**
-     * This method takes in a shipment array from the front-end, validates it,
-     * instantiates it and then sends it to the DAO to be saved to the
-     * database.
-     *
-     * @param array $shipmentArray shipment array to be created
-     *
-     * @return array a list of shipments objects that were created
-     */
-    public function updateInstance(array $shipmentArray) : array
-    {
-        $this->_validatePermission('update');
-        return $this->dao->saveInstance($this->shipment);
-    }
-
-    /**
-     * Treats the Shipment DAO as a Provisioner that can be iteratated
-     * through to provide the permissable Shipment Objects for the current User.
-     *
-     * @return \LORIS\Data\Provisioner
-     */
-    private function _getDataProvisioner() : \LORIS\Data\Provisioner
-    {
-        $dao = new ShipmentDAO($this->db);
-
-        if ($this->user->hasPermission('access_all_profiles') === false) {
-            $dao = $dao->filter(new \LORIS\Data\Filters\UserSiteMatch());
-        }
-        return $dao;
-    }
-
-    /**
-     * Checks User Permissions for creating or updating Shipment Objects.
-     *
-     * @return void
-     */
-    private function _validatePermission() : void
-    {
-        // switch($method) {
-        // case 'view':
-        //     if (!$this->user->hasPermission('biobank_shipment_view')) {
-        //         throw new \Forbidden('Shipment: View Permission Denied');
-        //     }
-        //     break;
-        // case 'update':
-        //     if (!$this->user->hasPermission('biobank_shipment_update')) {
-        //         throw new \Forbidden('Shipment: Update Permission Denied');
-        //     }
-        //     break;
-        // case 'create':
-        //     if (!$this->user->hasPermission('biobank_shipment_create')) {
-        //         throw new \Forbidden('Shipment: Create Permission Denied');
-        //     }
-        //     break;
-        // }
-    }
-
-    /**
-     * Check if there's any validation errors for this shipment
-     *
-     * @return bool
-     */
-    public function isValid() : bool
-    {
-        return empty($this->errors);
-    }
-
-    /**
-     * Get list of validation errors
-     *
-     * @return array
-     */
-    public function getErrors()
-    {
-        return $this->errors;
-    }
-
-    /**
-     * Validates Shipment Data before being saved
-     *
-     * @param Shipment $shipment The shipment to validate
-     *
-     * @return void
-     */
-    private function _validate(Shipment $shipment) : void
-    {
-        $errors       = [];
-        $errors       = $this->_validateBarcode($shipment, $errors);
-        $errors       = $this->_validateType($shipment, $errors);
-        $errors       = $this->_validateDestinationCenterId($shipment, $errors);
-        $errors       = $this->_validateLogs($shipment, $errors);
-        $errors       = $this->_validateContainers($shipment, $errors);
-        $this->errors = $errors;
-    }
-
-    /**
-     * Validates Shipment Object Barcode.
-     *
-     * @param Shipment $shipment Shipment to validate
-     * @param array    $errors   List of errors to add to
-     *
-     * @return array
-     */
-    private function _validateBarcode(Shipment $shipment, array $errors) : array
-    {
-        $error = '';
-        if (empty($shipment->barcode)) {
-            $error .= 'Barcode is required. ';
-        }
-        if (!$shipment->id) {
-            foreach ($this->dao->selectInstances() as $shipmentComp) {
-                if ($shipment->barcode === $shipmentComp->barcode) {
-                    $error .= 'A shipment with this Barcode already exists. ';
-                }
-            }
-        }
-        if (!empty($error)) {
-            $errors['barcode'] = $error;
-        }
-        return $errors;
-    }
-
-    /**
-     * Validates Shipment Object Type Id.
-     *
-     * @param Shipment $shipment Shipment to validate
-     * @param array    $errors   List of errors to add to
-     *
-     * @return array
-     */
-    private function _validateType(Shipment $shipment, array $errors) : array
-    {
-        $error = '';
-        if (empty($shipment->type)) {
-            $error .= 'Shipment Type is required. ';
-        }
-        if (!empty($error)) {
-            $errors['type'] = $error;
-        }
-        return $errors;
-    }
-
-    /**
-     * Validates Shipment Object Destination Center.
-     *
-     * @param Shipment $shipment Shipment to validate
-     * @param array    $errors   List of errors to add to
-     *
-     * @return array
-     */
-    private function _validateDestinationCenterId(
-        Shipment $shipment,
-        array $errors
-    ) : array {
-        $error = '';
-        if (empty($shipment->destinationCenterId)) {
-            $error .= 'Destination Center is required.';
-        }
-
-        // TODO: Check that Destination Center is an actual center.
-
-        if (!empty($error)) {
-            $errors['destinationCenterId'] = $error;
-        }
-        return $errors;
-    }
-
-    /**
-     * Validates Shipment Object Containers and store any failures
-     * in $errors.
-     *
-     * @param Shipment $shipment The shipment to validate
-     * @param array    $errors   The existing error list to add to
-     *
-     * @return array
-     */
-    private function _validateContainers(Shipment $shipment, array $errors) : array
-    {
-        $error = '';
-        $field = 'containerIds';
-
-        // Check that there is atleast one container in the shipment.
-        $containerIds = $shipment->containerIds;
-        if (empty($containerIds)) {
-            $errors[$field] = 'Atleast 1 container must be selected.';
-            return $errors;
-        }
-        $containerDAO = new ContainerDAO($this->db);
-        //$container1   = $containerDAO->getInstanceFromId(
-        //    (int) $containerIds[0]
-        //);
-
-        foreach ($shipment->containerIds as $containerId) {
-            $container = $containerDAO->getInstanceFromId(
-                (int) $containerId
-            );
-
-            // TODO: Re-Implement once integrity of Centers of Containers is
-            // established in CBIGR. Currently, child containers are permitted
-            // at a different site than the parent. This should NOT be the case.
-
-            /* Check that containers are all at the same center.*/
-            // if ($container->getCenterID() != $container1->getCenterID()) {
-            //     $errors[$field] = $container->getBarcode().' and '
-            //     .$container1->getBarcode().' are not at the same Center. All
-            //     Containers must be at the same Center.';
-            //     return $errors;
-            // }
-
-            // Check that containers are not already associated with an active
-            // shipment.
-            if (!$shipment->id) {
-                foreach ($container->getShipmentBarcodes() as $shipmentBarcode) {
-                    $containerShipment = $this->dao->getInstanceFromBarcode(
-                        $shipmentBarcode
-                    );
-                    if ($containerShipment->getActive()) {
-                        $errors[$field] = $container->getBarcode().' is already
-                  associated with an active shipment';
-                    }
-                };
-            }
-        }
-
-        // TODO: this could maybe be improved since it only checks 1 shipment.
-        // TODO: This check needs to be reworked because it will only apply for
-        // the shipment creation.
-        // Check that the containers are at the same center as the shipment.
-        // if ($shipment->logs[0]->centerId !== $container1->getCenterID()) {
-        //     $error .= 'Containers must be at the same site as the shipment. ';
-        // }
-
-        // shipment
-
-        if (!empty($error)) {
-            $errors[$field] = $error;
-        }
-
-        return $errors;
-    }
-
-    /**
-     * Validates Shipment Object Logs.
-     *
-     * @param Shipment $shipment The shipment to validate.
-     * @param array    $errors   List of errors to add to.
-     *
-     * @return array
-     */
-    private function _validateLogs(Shipment $shipment, array $errors) : array
-    {
-        $logsErrors = [];
-        foreach ($shipment->logs as $i=>$log) {
-            $logErrors = [];
-            $logErrors = $this->_validateCenter($log, $logErrors);
-            $logErrors = $this->_validateStatus($log, $logErrors);
-            $logErrors = $this->_validateUser($log, $logErrors);
-            $logErrors = $this->_validateTemperature($log, $logErrors);
-            $logErrors = $this->_validateDate($log, $logErrors);
-            $logErrors = $this->_validateTime($log, $logErrors);
-            if (!empty($logErrors)) {
-                $logsErrors[$i] = $logErrors;
-            }
-        }
-
-        if (!empty($logsErrors)) {
-            $errors['logs'] = $logsErrors;
-        }
-
-        return $errors;
-    }
-
-    /**
-     * Validates Shipment Log Center.
-     *
-     * @param Log   $log    Log to be validated.
-     * @param array $errors list of errors to add to
-     *
-     * @return array
-     */
-    private function _validateCenter(Log $log, array $errors) : array
-    {
-        $error = '';
-        if (empty($log->centerId)) {
-            $error .= 'Center is required';
-        }
-        if (!empty($error)) {
-            $errors['centerId'] = $error;
-        }
-        return $errors;
-    }
-
-    /**
-     * Validates Shipment Log Status.
-     *
-     * @param Log   $log    Log to be validated.
-     * @param array $errors List of errors to add to.
-     *
-     * @return array
-     */
-    private function _validateStatus(Log $log, array $errors) : array
-    {
-        $error = '';
-        if (empty($log->status)) {
-            $error .= 'Status is required.';
-        }
-        if (!empty($error)) {
-            $errors['status'] = $error;
-        }
-        return $errors;
-    }
-
-    /**
-     * Validates Shipment Log Center.
-     *
-     * @param Log   $log    Log to be validated.
-     * @param array $errors List of errors to add to
-     *
-     * @return array
-     */
-    private function _validateUser(Log $log, array $errors) : array
-    {
-        $error = '';
-        if (empty($log->user)) {
-            $error .= 'User is required.';
-        }
-        if (!empty($error)) {
-            $errors['user'] = $error;
-        }
-        return $errors;
-    }
-
-    /**
-     * Validates Shipment Log Temperature.
-     *
-     * @param Log   $log    Log to be validated.
-     * @param array $errors List of errors to add to
-     *
-     * @return array
-     */
-    private function _validateTemperature(Log $log, array $errors) : array
-    {
-        $error = '';
-        if (empty($log->temperature)) {
-            $error .= 'Temperature is required.';
-        }
-        if (!empty($error)) {
-            $errors['temperature'] = $error;
-        }
-        return $errors;
-    }
-
-    /**
-     * Validates Shipment Log Date.
-     *
-     * @param Log   $log    Log to be validated.
-     * @param array $errors list of errors to add to
-     *
-     * @return array
-     */
-    private function _validateDate(Log $log, array $errors) : array
-    {
-        $error = '';
-        if (empty($log->date)) {
-            $error .= 'Date is required.';
-        }
-        if (!empty($error)) {
-            $errors['date'] = $error;
-        }
-        return $errors;
-    }
-
-    /**
-     * Validates Shipment Log Time.
-     *
-     * @param Log   $log    Log to be validated.
-     * @param array $errors list of errors to add to
-     *
-     * @return array
-     */
-    private function _validateTime(Log $log, array $errors) : array
-    {
-        $error = '';
-        if (empty($log->time)) {
-            $error .= 'Time is required.';
-        }
-        if (!empty($error)) {
-            $errors['time'] = $error;
-        }
-        return $errors;
-    }
-}
diff --git a/php/shipments.class.inc b/php/shipments.class.inc
deleted file mode 100644
index 296bdba7..00000000
--- a/php/shipments.class.inc
+++ /dev/null
@@ -1,216 +0,0 @@
-<?php declare(strict_types=1);
-/**
- * This implement the Shipment endpoint class for the Biobank Module.
- *
- * PHP Version 7.2
- *
- * @category   API
- * @package    Loris
- * @subpackage Biobank
- * @author     Henri Rabalais <henri.rabalais@mcin.ca>
- * @license    http://www.gnu.org/licenses/gpl-3.0.text GPLv3
- * @link       http://www.github.com/aces/Loris/
- */
-namespace LORIS\biobank;
-use \Psr\Http\Message\ServerRequestInterface;
-use \Psr\Http\Server\RequestHandlerInterface;
-use \Psr\Http\Message\ResponseInterface;
-
-/**
- * A class for handling the /biobank/shipments/ endpoint.
- *
- * PHP Version 7.2
- *
- * @category   Biobank
- * @package    Main
- * @subpackage Biobank
- * @author     Henri Rabalais <henri.rabalais@mcin.ca>
- * @license    http://www.gnu.org/licenses/gpl-3.0.text GPLv3
- * @link       http://www.github.com/aces/Lors/
- */
-class Shipments implements RequestHandlerInterface
-{
-
-    private \LORIS\LorisInstance $loris;
-    private \Database $db;
-    private \User $user;
-
-    /**
-     * Returns true if user has acces to this Endpoint.
-     *
-     * @param \User $user The user whose access is being checked
-     *
-     * @return bool
-     */
-    function _hasAccess(\User $user) : bool
-    {
-        return true;
-    }
-
-    /**
-     * Return which methods are supported by this endpoint.
-     *
-     * @return array supported HTTP methods
-     */
-    protected function allowedMethods() : array
-    {
-        return [
-            'GET',
-            'PUT',
-            'POST',
-            'OPTIONS',
-        ];
-    }
-
-    /**
-     * This function can be overridden in a module's page to load the necessary
-     * resources to check the permissions of a user.
-     *
-     * @param User                   $user    The user to load the resources for
-     * @param ServerRequestInterface $request The PSR15 Request being handled
-     *
-     * @return void
-     */
-    public function loadResources(
-        \User $user, ServerRequestInterface $request
-    ) : void {
-    }
-
-    /**
-     * This function passes the request to the handler. This is necessary since
-     * the Endpoint bypass the Module class.
-     *
-     * TODO: This function should be extracted to a parent class.
-     *
-     * @param ServerRequestInterface  $request The PSR7 request.
-     * @param RequestHandlerInterface $handler The request handler.
-     *
-     * @return ResponseInterface The outgoing PSR7 response.
-     */
-    public function process(
-        ServerRequestInterface $request,
-        RequestHandlerInterface $handler
-    ) : ResponseInterface {
-        return $handler->handle($request);
-    }
-
-    /**
-     * Handles Endpoint requests
-     *
-     * @param ServerRequestInterface $request The incoming PSR7 request
-     *
-     * @return ResponseInterface The outgoing PSR7 response
-     */
-    public function handle(ServerRequestInterface $request) : ResponseInterface
-    {
-        $this->loris = $request->getAttribute('loris');
-        $this->db    = $this->loris->getDatabaseConnection();
-        $this->user  = $request->getAttribute('user');
-
-        // TODO: This entire thing NEEDS to have a try block wrapped around it!
-        try {
-            $this->db->beginTransaction();
-            switch ($request->getMethod()) {
-            case 'GET':
-                return $this->_handleGET($request);
-            case 'POST':
-                return $this->_handlePOST($request);
-            case 'PUT':
-                return $this->_handlePUT($request);
-            case 'OPTIONS':
-                return (new \LORIS\Http\Response())
-                    ->withHeader('Allow', $this->allowedMethods());
-            }
-        } finally {
-            if ($this->db->inTransaction()) {
-                $this->db->commit();
-            }
-        }
-    }
-
-    /**
-     * Handle the logic of an incoming HTTP GET request
-     *
-     * @return ResponseInterface
-     */
-    private function _handleGET() : ResponseInterface
-    {
-        // TODO: This needs to be checked but should probably go somewhere else...
-        // if (!$this->user->hasPermission('biobank_shipment_view')) {
-        //     throw new \Forbidden('Shipment: View Permission Denied');
-        // }
-        $shipments = [];
-        $dao       = new ShipmentDAO($this->db);
-        if ($this->user->hasPermission('access_all_profiles') === false) {
-            $dao = $dao->filter(new \LORIS\Data\Filters\UserSiteMatch());
-        }
-        $shipmentIterator = $dao->execute($this->user);
-        foreach ($shipmentIterator as $barcode=>$shipment) {
-            $shipments[$barcode] = $shipment;
-        }
-        return new \LORIS\Http\Response\JSON\OK($shipments);
-    }
-
-    /**
-     * Handle the logic of an incoming HTTP POST request
-     *
-     * @param ServerRequestInterface $request The PSR7 request
-     *
-     * @return ResponseInterface
-     */
-    private function _handlePOST(ServerRequestInterface $request) : ResponseInterface
-    {
-        $shipmentArray   = json_decode($request->getBody()->getContents(), true);
-        $shipmentHandler = new ShipmentHandler(
-            $shipmentArray,
-            $this->db,
-            $this->user,
-        );
-
-        // TODO: A lot of what the handler does should ACTUALLY be done here.
-        // Handlers should not know how operate multiple shipments, only 1 each!
-        if (!$shipmentHandler->isValid()) {
-            return new \LORIS\Http\Response\JsonResponse(
-                $shipmentHandler->getErrors(),
-                422
-            );
-        }
-
-        return new \LORIS\Http\Response\JsonResponse(
-            $shipmentHandler->createInstance(),
-            200
-        );
-    }
-
-    /**
-     * Logic to handle an incoming HTTP PUT request
-     *
-     * @param ServerRequestInterface $request the PSR7 request
-     *
-     * @return ResponseInterface
-     */
-    private function _handlePUT(
-        ServerRequestInterface $request
-    ) : ResponseInterface {
-        $shipmentArray   = json_decode($request->getBody()->getContents(), true);
-        $shipmentHandler = new ShipmentHandler(
-            $shipmentArray,
-            $this->db,
-            $this->user,
-        );
-
-        // TODO: A lot of what the handler does should ACTUALLY be done here.
-        // Handlers should not know how operate multiple shipments, only 1 each!
-        if (!$shipmentHandler->isValid()) {
-            return new \LORIS\Http\Response\JsonResponse(
-                $shipmentHandler->getErrors(),
-                422,
-            );
-        }
-
-        return new \LORIS\Http\Response\JsonResponse(
-            $shipmentHandler->createInstance(),
-            200,
-        );
-    }
-}
diff --git a/php/specimen.class.inc b/php/specimen.class.inc
deleted file mode 100644
index a5f8a506..00000000
--- a/php/specimen.class.inc
+++ /dev/null
@@ -1,558 +0,0 @@
-<?php declare(strict_types=1);
-/**
- * Specimen Object Class
- * This class contains an instance of a database handling that is needed to
- * permanently store and retrieve Specimen Object instances.
- *
- * PHP Version 7.2
- *
- * @category   Entity
- * @package    Loris
- * @subpackage Biobank
- * @author     Henri Rabalais <henri.rabalais@mcin.ca>
- * @license    http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
- * @link       https://www.github.com/aces/Loris/
- */
-namespace LORIS\biobank;
-
-/**
- * Specimen Object Class
- * This class contains an instance of a database handling that is needed to
- * permanently store and retrieve Specimen Object instances.
- *
- * PHP Version 7.2
- *
- * @category   Entity
- * @package    Loris
- * @subpackage Biobank
- * @author     Henri Rabalais <henri.rabalais@mcin.ca>
- * @license    http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
- * @link       https://www.github.com/aces/Loris/
- */
-class Specimen implements \JsonSerializable, \LORIS\Data\DataInstance, \LORIS\StudyEntities\SiteHaver
-{
-    /**
-     * Persistent Instance variables.
-     *
-     * These properties describe a specimen entity.
-     *
-     * @var int         $id
-     * @var int         $containerId
-     * @var int         $typeId
-     * @var string      $quantity
-     * @var int         $unitId
-     * @var \CenterID   $containerCenterId
-     * @var int         $fTCycle
-     * @var array       $parentSpecimenIds
-     * @var int         $candidateId
-     * @var int         $candidateAge
-     * @var int         $sessionId
-     * @var int         $poolId
-     * @var Collection  $collection
-     * @var Preparation $preparation
-     * @var Analysis    $analysis
-     */
-    private $id;
-    private $containerId;
-    private $typeId;
-    private $quantity;
-    private $unitId;
-    private $fTCycle;
-    private \CenterID $containerCenterId;
-    private $parentSpecimenIds;
-    private $candidateId;
-    private $candidateAge;
-    private $sessionId;
-    private $poolId;
-    private $collection;
-    private $preparation;
-    private $analysis;
-
-    private $loris;
-    /**
-     * Initiliazes a new instance of the Specimen Class
-     *
-     * @param \LORIS\LorisInstance $loris The LORIS instance with the specimen
-     */
-    function __construct(\LORIS\LorisInstance $loris)
-    {
-        $this->loris = $loris;
-    }
-
-    /**
-     * Sets the specimen's ID.
-     *
-     * @param int $id the specimen's ID
-     *
-     * @return void
-     */
-    public function setId(int $id) : void
-    {
-        if ($id > 0) {
-            $this->id = $id;
-        }
-    }
-
-    /**
-     * Gets the specimen's ID
-     *
-     * @return ?int
-     */
-    public function getId() : ?int
-    {
-        return $this->id;
-    }
-
-    /**
-     * Sets the ID of the specimen's container
-     *
-     * @param int $containerId the ID of the specimen's container
-     *
-     * @return void
-     */
-    public function setContainerId($containerId) : void
-    {
-        if ($containerId > 0) {
-            $this->containerId = $containerId;
-        }
-    }
-
-    /**
-     * Gets the ID of the specimen's container
-     *
-     * @return ?int
-     */
-    public function getContainerId() : ?int
-    {
-        return $this->containerId;
-    }
-
-    /**
-     * Sets the ID of the specimen type
-     *
-     * @param int $typeId ID of the specimen type
-     *
-     * @return void
-     */
-    public function setTypeId(int $typeId) : void
-    {
-        if ($typeId > 0) {
-            $this->typeId = $typeId;
-        }
-    }
-
-    /**
-     * Gets the ID of the specimen type
-     *
-     * @return int
-     */
-    public function getTypeId() : int
-    {
-        return $this->typeId;
-    }
-
-    /**
-     * Sets the current amount of specimen available
-     *
-     * @param string $quantity the current amount of specimen available
-     *
-     * @return void
-     */
-    public function setQuantity(string $quantity) : void
-    {
-        $this->quantity = $quantity;
-    }
-
-    /**
-     * Gets the current amount of specimen available
-     *
-     * @return ?string
-     */
-    public function getQuantity() : ?string
-    {
-        return $this->quantity;
-    }
-
-    /**
-     * Sets the ID of the specimen's unit of quantity
-     *
-     * @param int $unitId the ID of the quantity's unit
-     *
-     * @return void
-     */
-    public function setUnitId(int $unitId) : void
-    {
-        if ($unitId > 0) {
-            $this->unitId = $unitId;
-        }
-    }
-
-    /**
-     * Gets the ID of the specimen's unit of quantity
-     *
-     * @return ?int
-     */
-    public function getUnitId() : ?int
-    {
-        return $this->unitId;
-    }
-
-    /**
-     * Sets the specimen's current Freeze-Thaw cycle.
-     *
-     * @param int $fTCycle the specimen's current F-T cycle
-     *
-     * @return void
-     */
-    public function setFTCycle(int $fTCycle) : void
-    {
-        if ($fTCycle >= 0) {
-            $this->fTCycle = $fTCycle;
-        }
-    }
-
-    /**
-     * Gets the specimen's current Freeze-Thaw cycle
-     *
-     * @return ?int
-     */
-    public function getFTCycle() : ?int
-    {
-        return $this->fTCycle;
-    }
-
-    /**
-     * Sets the parent specimen's ID.
-     *
-     * @param array $parentSpecimenIds the parent specimen's IDs
-     *
-     * @return void
-     */
-    public function setParentSpecimenIds(array $parentSpecimenIds) : void
-    {
-        $this->parentSpecimenIds = $parentSpecimenIds;
-    }
-
-    /**
-     * Gets the parent specimen's ID
-     *
-     * @return ?array
-     */
-    public function getParentSpecimenIds() : ?array
-    {
-        return $this->parentSpecimenIds;
-    }
-
-    /**
-     * Sets the ID of the candidate to which the specimen belongs
-     *
-     * @param int $candidateId ID of the specimen's donor
-     *
-     * @return void
-     */
-    public function setCandidateId(int $candidateId) : void
-    {
-        if ($candidateId > 0) {
-            $this->candidateId = $candidateId;
-        }
-    }
-
-    /**
-     * Gets the ID of the candidate to which the specimen belongs
-     *
-     * @return ?int
-     */
-    public function getCandidateId() : ?int
-    {
-        return $this->candidateId;
-    }
-
-    /**
-     * Sets the Age of the candidate when the specimen was created
-     *
-     * @param int $candidateAge Age of the candidate at specimen creation
-     *
-     * @return void
-     */
-    public function setCandidateAge(int $candidateAge) : void
-    {
-        if ($candidateAge > 0) {
-            $this->candidateAge = $candidateAge;
-        }
-    }
-
-    /**
-     * Gets the Age of the candidate when the specimen was created.
-     *
-     * @return ?int
-     */
-    public function getCandidateAge() : ?int
-    {
-        return $this->candidateAge;
-    }
-
-    /**
-     * Sets the ID of the candidate's session/timepoint in which the specimen
-     * was collected.
-     *
-     * @param int $sessionId the ID of the specimen's session of collection
-     *
-     * @return void
-     */
-    public function setSessionId(int $sessionId) : void
-    {
-        if ($sessionId > 0) {
-            $this->sessionId = $sessionId;
-        }
-    }
-
-    /**
-     * Gets the ID of the candidate's session/timepoint in which the specimen
-     * was collected.
-     *
-     * @return ?int
-     */
-    public function getSessionId() : ?int
-    {
-        return $this->sessionId;
-    }
-
-    /**
-     * Sets the ID of the specimen's pool group, if it exists.
-     *
-     * @param int $poolId the ID of the specimen's pool group
-     *
-     * @return void
-     */
-    public function setPoolId(int $poolId) : void
-    {
-        if ($poolId > 0) {
-            $this->poolId = $poolId;
-        }
-    }
-
-    /**
-     * Gets the ID of the specimen's pool group.
-     *
-     * @return ?int
-     */
-    public function getPoolId() : ?int
-    {
-        return $this->poolId;
-    }
-
-    /**
-     * Sets a Collection object for the Specimen.
-     *
-     * @param Collection $collection A collection instance
-     *
-     * @return void
-     */
-    public function setCollection(Collection $collection) : void
-    {
-        $this->collection = $collection;
-    }
-
-    /**
-     * Gets an associative array of data stored for the specimen's collection stage
-     *
-     * @return ?Collection
-     */
-    public function getCollection() : ?Collection
-    {
-        return $this->collection;
-    }
-
-    /**
-     * Sets a Preparation object for the Specimen.
-     *
-     * @param Preparation $preparation A Preparation Instance
-     *
-     * @return void
-     */
-    public function setPreparation(Preparation $preparation) : void
-    {
-        $this->preparation = $preparation;
-    }
-
-    /**
-     * Gets an associative array of data stored for the specimen's preparation
-     * stage.
-     *
-     * @return Preparation|null
-     */
-    public function getPreparation() : ?Preparation
-    {
-        return $this->preparation;
-    }
-
-    /**
-     * Sets an Analysis object for the Specimen.
-     *
-     * @param Analysis $analysis An Analysis Instance.
-     *
-     * @return void
-     */
-    public function setAnalysis(Analysis $analysis) : void
-    {
-        $this->analysis = $analysis;
-    }
-
-    /**
-     * Gets an associative array of data stored for the specimen's analysis stage
-     *
-     * @return Analysis|null
-     */
-    public function getAnalysis() : ?Analysis
-    {
-        return $this->analysis;
-    }
-
-    public function setContainerCenterId(\CenterID $containerCenterId)
-    {
-        $this->containerCenterId = $containerCenterId;
-    }
-
-    // FIXME: THIS IS A MASSIVE HACK. Specimens should not be provisioned if
-    // their Container is not provisioned. Therefore, a check must be made that
-    // the Container's Center ID is accesibile by the current User. This function
-    // allows this check to happen upon provisioner filtering.
-    /**
-     * Return Center ID of affiliated specimen container.
-     *
-     * @return \CenterID
-     */
-    public function getCenterID() : \CenterID
-    {
-        // NOTE: with the introduction of setContainerCenterId, this has been
-        // temporarily disabled to fix performance issues. A more permanent
-        // fix should be issued that considers container and specimen object
-        // design
-
-        // $db           = \Database::singleton();
-        // $containerDAO = new ContainerDAO($db);
-        // $containerId  = $this->getContainerId();
-        // $container    = $containerDAO->getInstanceFromId($containerId);
-        // return $container->getCenterId();
-
-        return $this->containerCenterId;
-    }
-
-    /**
-     * Instatiates a Specimen Object using the values sent from the front-end.
-     *
-     * @param array $data Data to be used to instantiate the Specimen Object.
-     *
-     * @return Specimen $specimen Instantiated Specimen Object
-     */
-    public function fromArray(array $data) : Specimen
-    {
-        if (isset($data['id'])) {
-            $this->setId((int) $data['id']);
-        }
-        if (isset($data['containerId'])) {
-            $this->setContainerId((int) $data['containerId']);
-        }
-        if (isset($data['typeId'])) {
-            $this->setTypeId((int) $data['typeId']);
-        }
-        if (isset($data['quantity'])) {
-            $this->setQuantity((string) $data['quantity']);
-        }
-        if (isset($data['unitId'])) {
-            $this->setUnitId((int) $data['unitId']);
-        }
-        if (isset($data['containerCenterId'])) {
-            $this->setContainerCenterId(new \CenterID(strval($data['containerCenterId'])));
-        }
-        if (isset($data['fTCycle'])) {
-            $this->setFTCycle((int) $data['fTCycle']);
-        }
-        if (isset($data['parentSpecimenIds'])) {
-            $this->setParentSpecimenIds($data['parentSpecimenIds']);
-        }
-        if (isset($data['candidateId'])) {
-            $this->setCandidateId((int) $data['candidateId']);
-        }
-        if (isset($data['candidateAge'])) {
-            $this->setCandidateAge((int) $data['candidateAge']);
-        }
-        if (isset($data['sessionId'])) {
-            $this->setSessionId((int) $data['sessionId']);
-        }
-        if (isset($data['poolId'])) {
-            $this->setPoolId((int) $data['poolId']);
-        }
-
-        if (isset($data['collection'])) {
-            $collection = (new Collection())->fromArray($data['collection']);
-            assert($collection instanceof Collection);
-            $this->setCollection($collection);
-        }
-
-        if (isset($data['preparation'])) {
-            $preparation = (new Preparation())->fromArray($data['preparation']);
-            assert($preparation instanceof Preparation);
-            $this->setPreparation($preparation);
-        }
-        if (isset($data['analysis'])) {
-            $analysis = (new Analysis())->fromArray($data['analysis']);
-            assert($analysis instanceof Analysis);
-            $this->setAnalysis($analysis);
-        }
-
-        return $this;
-    }
-
-    /**
-     * A wrapper function for the jsonSerialize method of the Specimen Instance
-     * Class. This converts this Specimen Instance into an array
-     *
-     * @return array
-     */
-    public function toArray() : array
-    {
-        return $this->jsonSerialize();
-    }
-
-    /**
-     * Returns an array representing the state of the Specimen.
-     *
-     * @return array
-     */
-    public function jsonSerialize() : array
-    {
-        $array = [
-            'id'                => $this->id,
-            'containerId'       => $this->containerId,
-            'typeId'            => $this->typeId,
-            'quantity'          => $this->quantity,
-            'unitId'            => $this->unitId,
-            'containerCenterId' => $this->containerCenterId->__toString(),
-            'fTCycle'           => $this->fTCycle,
-            'parentSpecimenIds' => $this->parentSpecimenIds,
-            'candidateId'       => $this->candidateId,
-            'candidateAge'      => $this->candidateAge,
-            'sessionId'         => $this->sessionId,
-            'poolId'            => $this->poolId,
-            'collection'        => $this->collection->jsonSerialize(),
-        ];
-        if ($this->preparation) {
-            $array['preparation'] = $this->preparation->jsonSerialize();
-        }
-        if ($this->analysis) {
-            $array['analysis'] = $this->analysis->jsonSerialize();
-        }
-        return $array;
-    }
-
-    /**
-     * Returns a JSON encoded string of the state of the Specimen
-     *
-     * @return string JSON encoded string of Specimen data
-     */
-    public function toJSON() : string
-    {
-        return json_encode($this);
-    }
-}
diff --git a/php/specimencontroller.class.inc b/php/specimencontroller.class.inc
deleted file mode 100644
index fcc18645..00000000
--- a/php/specimencontroller.class.inc
+++ /dev/null
@@ -1,626 +0,0 @@
-<?php declare(strict_types=1);
-/**
- * This class features the code that enables access to the Specimens of the LORIS
- * Biobank Module.
- *
- * PHP Version 7.2
- *
- * @category   Controller
- * @package    Loris
- * @subpackage Biobank
- * @author     Henri Rabalais <henri.rabalais@mcin.ca>
- * @license    http://www.gnu.org/licenses/gpl-3.0.text GPLv3
- * @link       http://www.github.com/aces/Lors/
- */
-namespace LORIS\biobank;
-
-/**
- * This class features the code that enables access to the Specimens of the LORIS
- * Biobank Module.
- *
- * PHP Version 7.2
- *
- * @category   Controller
- * @package    Loris
- * @subpackage Biobank
- * @author     Henri Rabalais <henri.rabalais@mcin.ca>
- * @license    http://www.gnu.org/licenses/gpl-3.0.text GPLv3
- * @link       http://www.github.com/aces/Lors/
- */
-class SpecimenController
-{
-    /**
-     * Private instances of the Database, User and ContainerDAO classes
-     *
-     * @var \LORIS\LorisInstance $loris
-     * @var \Database   $db
-     * @var \User       $user
-     * @var SpecimenDAO $dao
-     */
-    private $loris;
-    private $db;
-    private $user;
-    private SpecimenDAO $dao;
-
-    /**
-     * Specimen Controller Class constructor
-     *
-     * @param \LORIS\LorisInstance $loris Loris instance
-     * @param \User                $user  User Instance.
-     */
-    function __construct(\LORIS\LorisInstance $loris, \User $user)
-    {
-        $this->loris = $loris;
-        $this->db    = $loris->getDatabaseConnection();
-        $this->user  = $user;
-        $this->dao   = $this->_getDataProvisioner();
-    }
-
-    /**
-     * Get all Specimen Objects permitted by the Specimen Data Provisioner (DAO).
-     *
-     * @return array
-     */
-    public function getInstances() : array
-    {
-        $this->_validatePermission('view');
-        $specimens  = [];
-        $specimenIt = $this->dao->execute($this->user);
-        foreach ($specimenIt as $id => $specimen) {
-            $specimens[$id] = $specimen;
-        }
-
-        return $specimens;
-    }
-
-    /**
-     * This method takes in a list of specimen and container arrays from the
-     * front-end. The specimens are validated while the containers are
-     * sent to their respective controller to be validated and saved. The ids of
-     * the saved containers are set to the specimen instances which are then
-     * sent to the DAO to be saved.
-     *
-     * @param array $list a list of specimen and container arrays to be created.
-     *
-     * @return array $specimen a list of specimen objects that were created.
-     */
-    public function createInstances(array $list) : array
-    {
-        $this->_validatePermission('create');
-
-        $containerList = [];
-        $specimenList  = [];
-        foreach (array_values($list) as $specimen) {
-            $containerList[] = $specimen['container'];
-            $specimenList[]  = $this->_prepare($specimen);
-        }
-
-        $contController = new ContainerController($this->loris, $this->user);
-        $containers     = $contController->createInstances($containerList);
-        if ($containers[0]->getParentContainerId()) {
-            $containers[] = $contController->dao->getInstanceFromId(
-                $containers[0]->getParentContainerId()
-            );
-        }
-
-        $specimens = [];
-        foreach ($specimenList as $i => $specimen) {
-            $specimen->setContainerId($containers[$i]->getId());
-            $specimens[] = $this->dao->saveInstance($specimen);
-            $containers[$i]->setSpecimenId($specimen->getId());
-        }
-
-        return ['specimens' => $specimens, 'containers' => $containers];
-    }
-
-    /**
-     * This method takes in a specimen array from the front-end, validates it,
-     * instantiates it and then sends it to the DAO to be saved to the
-     * database.
-     *
-     * @param array $specimenArray specimen array to be created
-     *
-     * @return Specimen updated Specimen
-     */
-    public function updateInstance(array $specimenArray) : Specimen
-    {
-        $this->_validatePermission('update');
-        $specimen = $this->_prepare($specimenArray);
-        return $this->dao->saveInstance($specimen);
-    }
-
-    /**
-     * Converts data into a specimen intance validates the specimen.
-     *
-     * @param array $specimenArray Specimen data to be instantiated
-     *
-     * @return Specimen $specimen to be submitted
-     */
-    private function _prepare(array $specimenArray) : Specimen
-    {
-        $specimen = (new Specimen($this->loris))->fromArray($specimenArray);
-        $this->_validateInstance($specimen);
-
-        return $specimen;
-    }
-
-    /**
-     * Get all data associated with the Specimen entity. This is used for
-     * front-end mapping and populating form options.
-     *
-     * @return array Associative array of option data.
-     */
-    public function getOptions() : array
-    {
-        $this->_validatePermission('view');
-        return [
-            'types'              => $this->dao->getTypes(),
-            'typeUnits'          => $this->dao->getTypeUnits(),
-            'typeContainerTypes' => $this->dao->getTypeContainerTypes(),
-            'protocols'          => $this->dao->getProtocols(),
-            'processes'          => $this->dao->getProcesses(),
-            'protocolAttributes' => $this->dao->getProtocolAttributes(),
-            'processAttributes'  => $this->dao->getProcessAttributes(),
-            'units'              => $this->dao->getUnits(),
-            'attributes'         => $this->dao->getAttributes(),
-            'attributeDatatypes' => $this->dao->getAttributeDatatypes(),
-        ];
-    }
-
-    /**
-     * Treats the Specimen DAO as a Provisioner that can be iteratated
-     * through to provide the permissable Specimen Objects for the current User.
-     *
-     * @return SpecimenDAO
-     */
-    private function _getDataProvisioner() : SpecimenDAO
-    {
-        $dao = new SpecimenDAO($this->loris);
-
-        if ($this->user->hasPermission('access_all_profiles') === false) {
-            $dao = $dao->filter(new \LORIS\Data\Filters\UserSiteMatch());
-        }
-        return $dao;
-    }
-
-    /**
-     * Checks User Permissions for creating or updating Specimen Objects.
-     *
-     * @param string $method User requested action
-     *
-     * @return void
-     */
-    private function _validatePermission(string $method) : void
-    {
-        switch ($method) {
-        case 'view':
-            if (!$this->user->hasPermission('biobank_specimen_view')) {
-                throw new Forbidden('Specimen: View Permission Denied');
-            }
-            break;
-        case 'update':
-            if (!$this->user->hasPermission('biobank_specimen_update')) {
-                throw new Forbidden('Specimen: Update Permission Denied');
-            }
-            break;
-        case 'create':
-            if (!$this->user->hasPermission('biobank_specimen_create')) {
-                throw new Forbidden('Specimen: Create Permission Denied');
-            }
-            break;
-        }
-    }
-
-    /**
-     * Validates Specimen Data before being saved
-     *
-     * @param Specimen $specimen Specimen to be validated.
-     *
-     * @return void
-     */
-    private function _validateInstance(Specimen $specimen) : void
-    {
-        $this->_validateTypeId($specimen);
-        $this->_validateQuantity($specimen);
-        $this->_validateUnitId($specimen);
-        $this->_validateFTCycle($specimen);
-        $this->_validateParentSpecimenIds($specimen);
-        $this->_validateCandidateId($specimen);
-        $this->_validateSessionId($specimen);
-        $this->_validateCollection($specimen);
-        $this->_validatePreparation($specimen);
-        $this->_validateAnalysis($specimen);
-    }
-
-    /**
-     * Validates Specimen Object Type ID.
-     *
-     * @param Specimen $specimen Specimen to be validated.
-     *
-     * @throws BadRequest if the provided Specimen does not meet validation
-     *                    requirements.
-     *
-     * @return void
-     */
-    private function _validateTypeId(Specimen $specimen) : void
-    {
-        if (is_null($specimen->getTypeId())) {
-            throw new BadRequest("Specimen Type value must be set");
-        }
-    }
-
-    /**
-     * Validates Specimen Object Quantity.
-     *
-     * @param Specimen|Process $object Object to be validated.
-     *
-     * @throws BadRequest if the provided object does not meet validation
-     *                    requirements.
-     *
-     * @return void
-     */
-    private function _validateQuantity(object $object) : void
-    {
-        $quantity = $object->getQuantity();
-        if (is_null($quantity)) {
-            throw new BadRequest('Specimen Quantity value must be set');
-        }
-        if (!(is_numeric($quantity) && is_float(floatval($quantity)))) {
-            throw new BadRequest('Specimen Quantity value must be a number');
-        }
-        //TODO: This is where a capacity check would go, i.e. $quantity > $capacity.
-        if ($quantity < 0) {
-            throw new BadRequest('Specimen Quantity cannot be less than 0');
-        }
-    }
-
-    /**
-     * Validates Specimen Object Unit ID.
-     *
-     * @param Specimen|Process $object Object to be validated.
-     *
-     * @throws BadRequest if the provided object does not meet validation
-     *                    requirements.
-     *
-     * @return void
-     */
-    private function _validateUnitId(object $object) : void
-    {
-        if (is_null($object->getUnitId())) {
-            throw new BadRequest("Specimen Unit value must be set");
-        }
-    }
-
-    /**
-     * Validates Specimen Object FT Cycle.
-     *
-     * @param Specimen $specimen Specimen to be validated.
-     *
-     * @throws BadRequest if the provided Specimen does not meet validation
-     *                    requirements.
-     *
-     * @return void
-     */
-    private function _validateFTCycle(Specimen $specimen) : void
-    {
-        $fTCycle = $specimen->getFTCycle();
-        if (isset($fTCycle)) {
-            if (strval($fTCycle) !== strval(intval($fTCycle))
-                || intval($fTCycle) < 0
-            ) {
-                throw new BadRequest("F/T Cycle must be 0 or more");
-            }
-
-            if ($fTCycle > 100) {
-                throw new BadRequest("F/T Cycle value is too large");
-            }
-        }
-    }
-
-    /**
-     * Validates Specimen Object Parent Specimen IDs.
-     *
-     * @param Specimen $specimen Specimen to be validated.
-     *
-     * @throws BadRequest if the provided Specimen does not meet validation
-                          requirements.
-     *
-     * @return void
-     */
-    private function _validateParentSpecimenIds(Specimen $specimen) : void
-    {
-        $parentSpecimenIds = $specimen->getParentSpecimenIds();
-        if ($parentSpecimenIds) {
-            $baseParentSpecimen = $this->dao->getInstanceFromId(
-                (int) $parentSpecimenIds[0]
-            );
-        }
-        $specimenTypes = $this->dao->getTypes();
-
-        if (empty($parentSpecimeIds)) {
-            return;
-        }
-        if (empty($baseParentSpecimen)) {
-            return;
-        }
-        foreach ($parentSpecimenIds as $parentSpecimenId) {
-            $parentSpecimen = $this->dao->getInstanceFromId((int) $parentSpecimenId);
-
-            $pSpecimenCandId = $parentSpecimen->getCandidateId();
-
-            if ($baseParentSpecimen->getCandidateId() != $pSpecimenCandId) {
-                throw new BadRequest(
-                    'Parent Specimens must be from the same Candidate'
-                );
-            }
-
-            if ($baseParentSpecimen->getSessionId()!= $parentSpecimen->getSessionId()
-            ) {
-                throw new BadRequest(
-                    'Parent Specimens must be from the same Session'
-                );
-            }
-
-            if ($baseParentSpecimen->getTypeId() != $parentSpecimen->getTypeId()) {
-                throw new BadRequest('Parent Specimens must be of the same Type');
-            }
-
-            if ($parentSpecimen->getTypeId() != $specimen->getTypeId()) {
-                if (empty($specimenTypes[$specimen->getTypeId()]['parentTypeIds'])) {
-                    $parentTypeId = $parentSpecimen->getTypeId();
-
-                    $childType  = $specimenTypes[$specimen->getTypeId()]['label'];
-                    $parentType = $specimenTypes[$parentTypeId]['label'];
-                    throw new BadRequest(
-                        "A specimen of type '$childType' cannot be derived
-                                           from a parent of type '$parentType'"
-                    );
-                }
-                if (!in_array(
-                    $parentSpecimen->getTypeId(),
-                    $specimenTypes[$specimen->getTypeId()]['parentTypeIds']
-                )
-                ) {
-                    throw new BadRequest(
-                        'Parent Specimens must be of a type that
-                                           is a parent to the current Specimen type'
-                    );
-                }
-            }
-        }
-    }
-
-    /**
-     * Validates Specimen Object Candidate ID.
-     *
-     * @param Specimen $specimen Specimen to be validated.
-     *
-     * @throws BadRequest if the provided Specimen does not meet validation
-     *                    requirements.
-     *
-     * @return void
-     */
-    private function _validateCandidateId(Specimen $specimen) : void
-    {
-        if (is_null($specimen->getCandidateId())) {
-            throw new BadRequest("PSCID value must be set");
-        }
-    }
-
-    /**
-     * Validates Specimen Object Session ID.
-     *
-     * @param Specimen $specimen Specimen to be validated.
-     *
-     * @throws BadRequest if the provided Specimen does not meet validation
-     *                    requirements.
-     *
-     * @return void
-     */
-    private function _validateSessionId(Specimen $specimen) : void
-    {
-        if (is_null($specimen->getSessionId())) {
-            throw new BadRequest("Visit Label value must be set");
-        }
-    }
-
-    /**
-     * Validates Specimen Object Collection.
-     *
-     * @param Specimen $specimen Specimen to be validated.
-     *
-     * @throws BadRequest if the provided Specimen does not meet validation
-     *                    requirements.
-     *
-     * @return void
-     */
-    private function _validateCollection(Specimen $specimen) : void
-    {
-        $collection = $specimen->getCollection();
-        $this->_validateProtocolId($collection);
-        $this->_validateExaminerId($collection);
-        $this->_validateQuantity($collection);
-        $this->_validateUnitId($collection);
-        $this->_validateCenterId($collection);
-        // $this->_validateDate($collection);
-        // $this->_validateTime($collection);
-        $this->_validateData($collection);
-    }
-
-    /**
-     * Validates Specimen Object Preparation.
-     *
-     * @param Specimen $specimen Specimen to be validated.
-     *
-     * @throws BadRequest if the provided Specimen does not meet validation
-     *                    requirements.
-     *
-     * @return void
-     */
-    private function _validatePreparation(Specimen $specimen) : void
-    {
-        $preparation = $specimen->getPreparation();
-        if (isset($preparation)) {
-            $this->_validateProtocolId($preparation);
-            $this->_validateExaminerId($preparation);
-            $this->_validateCenterId($preparation);
-            // $this->_validateDate($preparation);
-            // $this->_validateTime($preparation);
-            $this->_validateData($preparation);
-        }
-    }
-
-    /**
-     * Validates Specimen Object Type ID.
-     *
-     * @param Specimen $specimen Specimen to be validated.
-     *
-     * @throws BadRequest if the provided Specimen does not meet validation
-     *                    requirements.
-     *
-     * @return void
-     */
-    private function _validateAnalysis(Specimen $specimen) : void
-    {
-        // Validate Analysis
-        $analysis = $specimen->getAnalysis();
-        if (isset($analysis)) {
-            $this->_validateProtocolId($analysis);
-            $this->_validateExaminerId($analysis);
-            $this->_validateCenterId($analysis);
-            // $this->_validateDate($analysis);
-            // $this->_validateTime($analysis);
-            $this->_validateData($analysis);
-        }
-    }
-
-    /**
-     * Validates Specimen Process Protocol ID.
-     *
-     * @param Process $process Process to be validated.
-     *
-     * @throws BadRequest if the provided Specimen does not meet validation
-     *                    requirements.
-     *
-     * @return void
-     */
-    private function _validateProtocolId(Process $process) : void
-    {
-        if (is_null($process->getProtocolId())) {
-            throw new BadRequest('Specimen Processing Protocol must be set');
-        }
-    }
-
-    /**
-     * Validates Specimen Process Examiner ID.
-     *
-     * @param Process $process Process to be validated.
-     *
-     * @throws BadRequest if the provided Specimen does not meet validation
-     *                    requirements.
-     *
-     * @return void
-     */
-    private function _validateExaminerId(Process $process) : void
-    {
-        if (is_null($process->getProtocolId())) {
-            throw new BadRequest('Specimen Processing Examiner must be set');
-        }
-        // TODO: Potentially check that examinerId is within the set of possible
-        // values. I.e. an ID of the examiner table.
-    }
-
-    /**
-     * Validates Specimen Process Center ID.
-     *
-     * @param Process $process Process to be validated.
-     *
-     * @throws BadRequest if the provided Process does not meet validation
-     *                    requirements.
-     *
-     * @return void
-     */
-    private function _validateCenterId(Process $process) : void
-    {
-        if (is_null($process->getCenterId())) {
-            throw new BadRequest('Specimen Processing Center must be set');
-        }
-    }
-
-    /**
-     * Validates Specimen Process Data.
-     *
-     * @param Process $process Process to be validated.
-     *
-     * @throws BadRequest if the provided Process does not meet validation
-     *                    requirements.
-     *
-     * @return void
-     */
-    private function _validateData(Process $process) : void
-    {
-        $protocolAttributes = $this->dao->getProtocolAttributes();
-        $attributeDatatypes = $this->dao->getAttributeDatatypes();
-        $protocolId         = $process->getProtocolId();
-        $attributes         = $protocolAttributes[$protocolId] ?? [];
-        $data = $process->getData() ?? [];
-
-        foreach ($attributes as $id => $attribute) {
-            if ($attribute['required'] == true && !isset($data[$id])) {
-                throw new BadRequest(
-                    "The attribute "
-                    . $attribute['label']
-                    . " is required. Protocol "
-                    . $protocolId
-                );
-            }
-        }
-
-        foreach ($data as $attributeId => $value) {
-            $attribute = $attributes[$attributeId];
-
-            if (!isset($attribute)) {
-                $wrongAttribute = $this->dao->getAttributes()[$attributeId];
-                throw new BadRequest(
-                    "The attribute '"
-                    . $wrongAttribute['label']
-                    . "' does not belong to this protocol"
-                );
-            }
-
-            $datatype = $attributeDatatypes[$attribute['datatypeId']]['datatype'];
-            if ($datatype === 'boolean' && !is_bool($value)) {
-                throw new BadRequest(
-                    "The attribute '"
-                    . $attribute['label']
-                    . "' must be a boolean"
-                );
-            }
-
-            if ($datatype === 'number' && !is_numeric($value)) {
-                throw new BadRequest(
-                    "The attribute '"
-                    . $attribute['label']
-                    . "' must be a number"
-                );
-            }
-
-            // TODO: This validation may not be necessary, but it may be good to
-            // leave this if statement here just as a reminder that it exists.
-            if ($datatype === 'text') {
-            }
-
-            // TODO: This can likely be validated through the DateTime Object.
-            if ($datatype === 'date') {
-            }
-
-            // TODO: This can likely be validated through the DateTime Object.
-            if ($datatype === 'time') {
-            }
-
-            // TODO: Set this validate when files start to get uploaded.
-            if ($datatype === 'file') {
-            }
-        }
-    }
-}
diff --git a/php/specimendao.class.inc b/php/specimendao.class.inc
deleted file mode 100644
index 49b9949e..00000000
--- a/php/specimendao.class.inc
+++ /dev/null
@@ -1,788 +0,0 @@
-<?php declare(strict_types=1);
-/**
- * Specimen Data Access Object (DAO) Class
- * This class contains all database handling that is needed to
- * permanently store and retrieve Specimen Object instances
- *
- * PHP Version 7.2
- *
- * @category   DAO
- * @package    Loris
- * @subpackage Biobank
- * @author     Henri Rabalais <henri.rabalais@mcin.ca>
- * @license    http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
- * @link       https://www.github.com/aces/Loris/
- */
-namespace LORIS\biobank;
-
-/**
- * Specimen Data Access Object (DAO) Class
- * This class contains all database handling that is needed to
- * permanently store and retrieve Specimen Object instances
- *
- * PHP Version 7.2
- *
- * @category   DAO
- * @package    Loris
- * @subpackage Biobank
- * @author     Henri Rabalais <henri.rabalais@mcin.ca>
- * @license    http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
- * @link       https://www.github.com/aces/Loris/
- */
-class SpecimenDAO extends \LORIS\Data\ProvisionerInstance
-{
-    /**
-     * The LORIS instance
-     *
-     * @var \LORIS\LORISInstance $loris
-     * @var \Database $db
-     */
-    private $loris;
-    private $db;
-
-    /**
-     * Initializes a new instance of the SpecimenDAO Class
-     *
-     * @param \LORIS\LorisInstance $loris Instance of the LORIS Database class
-     */
-    function __construct(\LORIS\LORISInstance $loris)
-    {
-        $this->loris = $loris;
-        $this->db    = $loris->getDatabaseConnection();
-    }
-
-    /**
-     * This will load all specimen persistence variables from the database for a
-     * given $id into a Specimen object, and return the object.
-     *
-     * @param int $id Value of the $id for the Specimen that will be
-     *                instantiated
-     *
-     * @return Specimen $specimen Specimen Instance.
-     */
-    public function getInstanceFromId(int $id) : Specimen
-    {
-        return $this->selectInstances([['column'=>'SpecimenID', 'value'=>$id]])[$id];
-    }
-
-    /**
-     * This function returns an array of all the Parent Specimen IDs that are
-     * associated with the given Specimen ID in the biobank_specimen_parent
-     * table.
-     *
-     * @param int $id of Specimen
-     *
-     * @return array $parentSpecimenIds List of Specimen IDs that are
-     *                                  parents of the given Specimen ID
-     */
-    public function getParentSpecimenIdsFromId(int $id) : array
-    {
-        $query = 'SELECT ParentSpecimenID
-                  FROM biobank_specimen_parent
-                  WHERE SpecimenID=:i';
-        return $this->db->pselectcol($query, ['i' => $id]);
-    }
-
-    /**
-     * This will select all specimens from the database that match the
-     * attribute values passed by $conditions and will return an array
-     * of specimen objects.
-     *
-     * @param ?array $conditions Conditions to be met by the query
-     * @param string $operator   Operator to link the conditions. "AND" or "OR".
-     *
-     * @return array $specimens List of Specimen Objects that match the query
-     */
-    public function selectInstances(
-        ?array $conditions = [],
-        string $operator = 'AND'
-    ) : array {
-        $query = "SELECT bs.SpecimenID,
-                      bs.ContainerID,
-                      bs.SpecimenTypeID,
-                      bs.Quantity,
-                      bs.UnitID,
-                      bc.CenterID as ContainerCenterID,
-                      bsf.FreezeThawCycle,
-                      GROUP_CONCAT(bspa.ParentSpecimenID) as ParentSpecimenIDs,
-                      s.CandID as CandidateID,
-                      bs.SessionID,
-                      (
-                        SELECT FLOOR(DATEDIFF(s.Date_visit, c.DoB)/365.25)
-                      ) as CandidateAge,
-                      bspr.PoolID,
-                      bsc.SpecimenProtocolID as CollectionProtocolID,
-                      bsc.Quantity as CollectionQuantity,
-                      bsc.UnitID as CollectionUnitID,
-                      bsc.CenterID as CollectionCenterID,
-                      bsc.ExaminerID as CollectionExaminerID,
-                      bsc.Date as CollectionDate,
-                      bsc.Time as CollectionTime,
-                      bsc.Comments as CollectionComments,
-                      bsc.Data as CollectionData,
-                      bsp.SpecimenProtocolID as PreparationProtocolID,
-                      bsp.CenterID as PreparationCenterID,
-                      bsp.ExaminerID as PreparationExaminerID,
-                      bsp.Date as PreparationDate,
-                      bsp.Time as PreparationTime,
-                      bsp.Comments as PreparationComments,
-                      bsp.Data as PreparationData,
-                      bsa.SpecimenProtocolID as AnalysisProtocolID,
-                      bsa.CenterID as AnalysisCenterID,
-                      bsa.ExaminerID as AnalysisExaminerID,
-                      bsa.Date as AnalysisDate,
-                      bsa.Time as AnalysisTime,
-                      bsa.Comments as AnalysisComments,
-                      bsa.Data as AnalysisData
-               FROM biobank_specimen bs
-               JOIN biobank_container bc USING (ContainerID)
-               LEFT JOIN biobank_specimen_freezethaw bsf
-                 USING (SpecimenID)
-               LEFT JOIN session s
-                 ON bs.SessionID=s.ID
-               LEFT JOIN candidate c
-                 ON s.CandID=c.CandID
-               LEFT JOIN biobank_specimen_pool_rel bspr
-                 USING (SpecimenID)
-               LEFT JOIN biobank_specimen_collection bsc
-                 USING (SpecimenID)
-               LEFT JOIN biobank_specimen_preparation bsp
-                 USING (SpecimenID)
-               LEFT JOIN biobank_specimen_analysis bsa
-                 USING (SpecimenID)
-               LEFT JOIN biobank_specimen_parent bspa
-                 USING (SpecimenID)";
-        if (!empty($conditions)) {
-            $whereClause = [];
-            foreach ($conditions as $condition) {
-                $whereClause[] = $condition['column']
-                    . '='
-                    . '"'
-                    . $condition['value']
-                    . '"';
-            }
-            $query .= ' WHERE '.implode(" $operator ", $whereClause);
-        }
-        $query       .= " GROUP BY bs.SpecimenID";
-        $specimenRows = $this->db->pselectWithIndexKey($query, [], 'SpecimenID');
-
-        $specimens = [];
-        if (!empty($specimenRows)) {
-            foreach ($specimenRows as $id => $specimenRow) {
-                $parentSpecimenIds = $specimenRow['ParentSpecimenIDs']
-                    ? explode(',', $specimenRow['ParentSpecimenIDs'])
-                    : [];
-
-                $specimen = $this->_getInstanceFromSQL(
-                    $specimenRow,
-                    $parentSpecimenIds
-                );
-
-                $specimens[$id] = $specimen;
-            }
-        }
-
-        return $specimens;
-    }
-
-    /**
-     * Instantiates an ArrayIterator class that is composed of all the Specimen
-     * Objects.
-     *
-     * @return \Traversable Iterator of Specimen Objects
-     */
-    protected function getAllInstances() : \Traversable
-    {
-        return new \ArrayIterator($this->selectInstances());
-    }
-
-
-    /**
-     * Queries all rows of the biobank_specimen_type table and returns a nested
-     * array with the ID field as the index.
-     *
-     * @return array $types All data concerning each specimen type
-     */
-    public function getTypes() : array
-    {
-        $query = "SELECT SpecimenTypeID as id,
-                         Label as label,
-                         FreezeThaw as freezeThaw
-                  FROM biobank_specimen_type";
-        $types = $this->db->pselectWithIndexKey($query, [], 'id');
-
-        $query  = "SELECT SpecimenTypeID as id,
-                         ParentSpecimenTypeID as parentId
-                  FROM biobank_specimen_type_parent";
-        $result = $this->db->pselect($query, []);
-        foreach ($result as $row) {
-            $types[$row['id']]['parentTypeIds'][] = $row['parentId'];
-        }
-
-        return $types;
-    }
-
-    /**
-     * Queries all rows of the biobank_specimen_protocol table and returns a
-     * nested array with the ID field as the index.
-     *
-     * @return array $protocols All data concerning each specimen
-     *                          protocol.
-     */
-    public function getProtocols() : array
-    {
-        $query     = "SELECT SpecimenProtocolID as id,
-                         Label as label,
-                         SpecimenProcessID as processId,
-                         SpecimenTypeID as typeId
-                  FROM biobank_specimen_protocol";
-        $protocols = $this->db->pselectWithIndexKey($query, [], 'id');
-
-        return $protocols;
-    }
-
-    /**
-     * Queries all rows of the biobank_specimen_process table and returns a
-     * nested array with the ID field as the index.
-     *
-     * @return array $processes All data concerning each specimen
-     *                          process.
-     */
-    public function getProcesses() : array
-    {
-        $query     = "SELECT SpecimenProcessID as id,
-                         Label as label
-                      FROM biobank_specimen_process";
-        $processes = $this->db->pselectWithIndexKey($query, [], 'id');
-
-        return $processes;
-    }
-
-    /**
-     * Queries all rows of the biobank_specimen_attribute table and returns an
-     * array with the ID field as the index
-     *
-     * @return array $attributes All data concerning each attribute
-     */
-    public function getAttributes() : array
-    {
-        $query      = 'SELECT SpecimenAttributeID as id,
-                         Label as label,
-                         DatatypeId as datatypeId
-                  FROM biobank_specimen_attribute';
-        $attributes = $this->db->pselectWithIndexKey($query, [], 'id');
-
-        return $attributes;
-    }
-
-    /**
-     * Queries all rows of the biobank_datatype table and returns a nested array
-     * with the ID field as the index
-     *
-     * @return array $attributeDatatypes All data concerning each attribute datatype
-     */
-    public function getAttributeDatatypes() : array
-    {
-        $query = 'SELECT DatatypeID as id,
-                         Datatype as datatype
-                  FROM biobank_specimen_attribute_datatype';
-        $attributeDatatypes = $this->db->pselectWithIndexKey($query, [], 'id');
-
-        return $attributeDatatypes;
-    }
-
-    // XXX: This should potentially be queried from a table called
-    // `biobank_specimen_units` since containers are not currently using units.
-    // Discussions need to be had with Rida regarding this.
-    /**
-     * Queries all rows of the biobank_unit table and returns a nested
-     * array with the ID field as the index.
-     *
-     * @return array $specimenUnits All data concerning each unit
-     */
-    public function getUnits() : array
-    {
-        $query = "SELECT UnitID as id,
-                         Label as label
-                  FROM biobank_unit";
-        $units = $this->db->pselectWithIndexKey($query, [], 'id');
-
-        return $units;
-    }
-
-    /**
-     * Queries all rows of the biobank_specimen_type_unit_rel table and returns
-     * a nested array of specimen unit values, with the Type ID as the first index,
-     * and the Unit ID as the second index.
-     *
-     * @return array $typeUnits A nested array of unit values index by
-     *                                  Type ID and Unit ID
-     */
-    public function getTypeUnits() : array
-    {
-        $query     = "SELECT bst.SpecimenTypeID as typeId,
-                          bu.UnitID as unitId,
-                          bu.Label as label
-                  FROM biobank_specimen_type_unit_rel bstu
-                  JOIN biobank_specimen_type bst USING (SpecimenTypeID)
-                  JOIN biobank_unit bu USING (UnitID)";
-        $result    = $this->db->pselect($query, []);
-        $typeUnits = [];
-        foreach ($result as $row) {
-            $typeUnits[$row['typeId']][$row['unitId']]['label'] = $row['label'];
-        }
-
-        return $typeUnits;
-    }
-
-    /**
-     * Queries all rows of the biobank_specimen_type_container_type_rel table
-     * and returns a nested array of container type value, with the specimen
-     * Type ID as the index.
-     *
-     * @return array $typeContainerTypes A nested array of container type values
-     *                                   indexex by Specimen Type ID.
-     */
-    public function getTypeContainerTypes() : array
-    {
-        $query  = "SELECT SpecimenTypeID as specimenTypeId,
-                          ContainerTypeID as containerTypeId
-                  FROM biobank_specimen_type_container_type_rel";
-        $result = $this->db->pselect($query, []);
-        $typeContainerTypes = [];
-        foreach ($result as $row) {
-            $typeContainerTypes[$row['specimenTypeId']][] = $row['containerTypeId'];
-        }
-
-        return $typeContainerTypes;
-    }
-
-    /**
-     * Queries all rows from the biobank_specimen_protocol_attribute_rel table
-     * and returns a nested array of specimen-protocol-specific attribute data
-     * with the Protocol ID as the first index, and the Attribute ID as the
-     * second index.
-     *
-     * @return array $pA A nested array of attribute data indexed by Protocol
-     *                    ID and Attribute ID
-     */
-    public function getProtocolAttributes() : array
-    {
-        $query  = "SELECT bsp.SpecimenProtocolID as protocolId,
-                         bsa.SpecimenAttributeID as attributeId,
-                         bsa.Label as label,
-                         bsa.DatatypeID as datatypeId,
-                         bspa.Required as required,
-                         bspa.ShowInDataTable as showInDataTable
-                  FROM biobank_specimen_protocol_attribute_rel bspa
-                  LEFT JOIN biobank_specimen_protocol bsp
-                    USING (SpecimenProtocolID)
-                  LEFT JOIN biobank_specimen_attribute bsa
-                    USING (SpecimenAttributeID)";
-        $result = $this->db->pselect($query, []);
-        $pA     = []; //protocolAttributes
-        foreach ($result as $row) {
-            if (!isset($pA[$row['protocolId']][$row['attributeId']])) {
-                $pA[$row['protocolId']][$row['attributeId']] = [];
-            }
-            $attrib =& $pA[$row['protocolId']][$row['attributeId']];
-
-            $attrib['label']           = $row['label'];
-            $attrib['datatypeId']      = $row['datatypeId'];
-            $attrib['required']        = (int) $row['required'];
-            $attrib['showInDataTable'] = (int) $row['showInDataTable'];
-        }
-
-        return $pA;
-    }
-
-    /**
-     * Queries all rows from the biobank_specimen_protocol_attribute_rel table
-     * and returns a nested array of specimen-protocol-specific attribute data
-     * with the Protocol ID as the first index, and the Attribute ID as the
-     * second index.
-     *
-     * @return array $pA A nested array of attribute data indexed by Protocol
-     *                    ID and Attribute ID
-     */
-    public function getProcessAttributes() : array
-    {
-        $query  = "SELECT bsp.SpecimenProtocolID as protocolId,
-                          bsp.SpecimenProcessID as processId,
-                         bsa.SpecimenAttributeID as attributeId,
-                         bsa.Label as label,
-                         bsa.DatatypeID as datatypeId,
-                         bspa.Required as required,
-                         bspa.ShowInDataTable as showInDataTable
-                  FROM biobank_specimen_protocol_attribute_rel bspa
-                  LEFT JOIN biobank_specimen_protocol bsp
-                    USING (SpecimenProtocolID)
-                  LEFT JOIN biobank_specimen_attribute bsa
-                    USING (SpecimenAttributeID)";
-        $result = $this->db->pselect($query, []);
-        $pA     = []; //processAttributes
-        foreach ($result as $row) {
-            if ($row['showInDataTable']) {
-                if (!isset($pA[$row['processId']][$row['attributeId']])) {
-                    $pA[$row['processId']][$row['attributeId']] = [];
-                }
-                $attrib =& $pA[$row['processId']][$row['attributeId']] ?? [];
-                $attrib['protocolIds'][] = $row['protocolId'];
-            }
-        }
-
-        return $pA;
-    }
-
-    /**
-     * This function receives a Specimen Object, converts it into a SQL format
-     * and inserts it into all relevant tables in the database.
-     *
-     * @param Specimen $specimen The Specimen Object to be saved the
-     *                           database.
-     *
-     * @return Specimen $specimen The Specimen Object that was saved
-                                  to the database.
-     */
-    public function saveInstance(Specimen $specimen) : Specimen
-    {
-        // Converts Specimen Object into SQL format.
-        $data = $this->_getSQLFromInstance($specimen);
-
-        // Inserts or Updates the biobank_specimen table with respective data.
-        $this->db->insertOnDuplicateUpdate(
-            'biobank_specimen',
-            $data['biobank_specimen']
-        );
-
-        $specimenId = $specimen->getId();
-        if (isset($specimenId)) {
-            // If update:
-            // Do nothing.
-        } else {
-            // If insert:
-            $specimen->setId((int) $this->db->getLastInsertId());
-            // set the respective data array index to the value of the new
-            // specimen ID
-            $parentSpecimenIds = $specimen->getParentSpecimenIds();
-            if (!empty($parentSpecimenIds)) {
-                foreach ($parentSpecimenIds as $id) {
-                    $data['biobank_specimen_parent'][$id] = [
-                        'SpecimenID'       => $specimen->getId(),
-                        'ParentSpecimenID' => $id,
-                    ];
-                }
-            }
-            $data['biobank_specimen_freezethaw']['SpecimenID']  = $specimen->getId();
-            $data['biobank_specimen_collection']['SpecimenID']  = $specimen->getId();
-            $data['biobank_specimen_preparation']['SpecimenID'] = $specimen->getId();
-            $data['biobank_specimen_analysis']['SpecimenID']    = $specimen->getId();
-        }
-
-        // Insert or update biobank_specimen_collection with respective data.
-        $this->db->unsafeInsertOnDuplicateUpdate(
-            'biobank_specimen_collection',
-            $data['biobank_specimen_collection']
-        );
-
-        // If protocol exists, insert or update biobank_specimen_preparation
-        // with respective data.
-        if (isset($data['biobank_specimen_preparation']['SpecimenProtocolID'])) {
-            $this->db->unsafeInsertOnDuplicateUpdate(
-                'biobank_specimen_preparation',
-                $data['biobank_specimen_preparation']
-            );
-        }
-
-        // If method exists, insert or update biobank_specimen_analysis
-        // with respective data.
-        if (isset($data['biobank_specimen_analysis']['SpecimenProtocolID'])) {
-            $this->db->unsafeInsertOnDuplicateUpdate(
-                'biobank_specimen_analysis',
-                $data['biobank_specimen_analysis']
-            );
-        }
-
-        // If parent exists, insert or update biobank_specimen_parent
-        // with respective data.
-        if (isset($data['biobank_specimen_parent'])) {
-            foreach ($data['biobank_specimen_parent'] as $insert) {
-                $this->db->insertOnDuplicateUpdate(
-                    'biobank_specimen_parent',
-                    $insert
-                );
-            }
-        }
-
-        // If F/T Cycle exists, insert or update biobank_specimen_freezethaw
-        // with respective data.
-        $fTCycle = $specimen->getFTCycle();
-        if (isset($fTCycle)) {
-            $this->db->insertOnDuplicateUpdate(
-                'biobank_specimen_freezethaw',
-                $data['biobank_specimen_freezethaw']
-            );
-        }
-
-        return $this->getInstanceFromId($specimen->getId());
-    }
-
-    /**
-     * This function takes a Specimen Instance and prepares the data to be
-     * inserted into the database by converting it to a data array. This one to
-     * one mapping is done to enable the update or insertion of data into the
-     * database directly from the resulting arrays.
-     *
-     * @param Specimen $specimen Specimen Instance to be converted
-     *
-     * @return array $data Array containing the data to be inserted
-     */
-    private function _getSQLFromInstance(Specimen $specimen) : array
-    {
-        $specimenData = [
-            'SpecimenID'     => $specimen->getId(),
-            'ContainerID'    => $specimen->getContainerId(),
-            'SpecimenTypeID' => $specimen->getTypeId(),
-            'Quantity'       => $specimen->getQuantity(),
-            'UnitID'         => $specimen->getUnitId(),
-            'SessionID'      => $specimen->getSessionId(),
-        ];
-
-        $freezeThawData = [
-            'SpecimenID'      => $specimen->getId(),
-            'FreezeThawCycle' => $specimen->getFTCycle(),
-        ];
-
-        $collection     = $specimen->getCollection();
-        $collectionData = [
-            'SpecimenID'         => $specimen->getId(),
-            'SpecimenProtocolID' => $collection->getProtocolId(),
-            'Quantity'           => $collection->getQuantity(),
-            'UnitID'             => $collection->getUnitId(),
-            'CenterID'           => $collection->getCenterId(),
-            'ExaminerID'         => $collection->getExaminerId(),
-            'Date'               => $collection->getDate()->format('Y-m-d H:i'),
-            'Time'               => $collection->getTime()->format('Y-m-d H:i'),
-            'Comments'           => $collection->getComments(),
-        ];
-        $collectionData['Data'] = !empty($collection->getData()) ?
-            json_encode($collection->getData()) : null;
-
-        $preparation     = $specimen->getPreparation();
-        $preparationData = [];
-        if (isset($preparation)) {
-            $preparationData = [
-                'SpecimenID'         => $specimen->getId(),
-                'SpecimenProtocolID' => $preparation->getProtocolId(),
-                'CenterID'           => $preparation->getCenterId(),
-                'ExaminerID'         => $preparation->getExaminerId(),
-                'Date'               => $preparation->getDate()->format('Y-m-d H:i'),
-                'Time'               => $preparation->getTime()->format('Y-m-d H:i'),
-                'Comments'           => $preparation->getComments(),
-            ];
-
-            $preparationData['Data'] = !empty($preparation->getData()) ?
-                json_encode($preparation->getData()) : null;
-        }
-
-        $analysis     = $specimen->getAnalysis();
-        $analysisData = [];
-        if (isset($analysis)) {
-            $analysisData = [
-                'SpecimenID'         => $specimen->getId(),
-                'SpecimenProtocolID' => $analysis->getProtocolId(),
-                'CenterID'           => $analysis->getCenterId(),
-                'ExaminerID'         => $analysis->getExaminerId(),
-                'Date'               => $analysis->getDate()->format('Y-m-d H:i'),
-                'Time'               => $analysis->getTime()->format('Y-m-d H:i'),
-                'Comments'           => $analysis->getComments(),
-            ];
-
-            if ($analysis->getData()) {
-                $analysisData['Data'] = json_encode($analysis->getData());
-            }
-            $analysisData['Data'] = !empty($analysis->getData()) ?
-                json_encode($analysis->getData()) : null;
-        }
-
-        return [
-            'biobank_specimen'             => $specimenData,
-            'biobank_specimen_freezethaw'  => $freezeThawData,
-            'biobank_specimen_collection'  => $collectionData,
-            'biobank_specimen_preparation' => $preparationData,
-            'biobank_specimen_analysis'    => $analysisData,
-        ];
-    }
-
-    /**
-     * This function takes an array that resulted from an SQL query and
-     * instantiates it as a Specimen Object.
-     *
-     * @param array $data              Values to be converted to array.
-     * @param array $parentSpecimenIds IDs of the parent Specimen.
-     *
-     * @return Specimen
-     */
-    private function _getInstanceFromSQL(
-        array $data,
-        array $parentSpecimenIds
-    ) : Specimen {
-        $specimen = new Specimen($this->loris);
-        if (isset($data['SpecimenID'])) {
-            $specimen->setId((int) $data['SpecimenID']);
-        }
-        if (isset($data['ContainerID'])) {
-            $specimen->setContainerId((int) $data['ContainerID']);
-        }
-        if (isset($data['SpecimenTypeID'])) {
-            $specimen->setTypeId((int) $data['SpecimenTypeID']);
-        }
-
-        if (isset($data['Quantity'])) {
-            $specimen->setQuantity((string) $data['Quantity']);
-        }
-
-        if (isset($data['UnitID'])) {
-            $specimen->setUnitId((int) $data['UnitID']);
-        }
-        if (isset($data['ContainerCenterID'])) {
-            $specimen->setContainerCenterId(new \CenterID(strval($data['ContainerCenterID'])));
-        }
-        if (isset($data['FreezeThawCycle'])) {
-            $specimen->setFTCycle((int) $data['FreezeThawCycle']);
-        }
-
-        if (!empty($parentSpecimenIds)) {
-            $specimen->setParentSpecimenIds($parentSpecimenIds);
-        } else {
-            $specimen->setParentSpecimenIds([]);
-        }
-
-        if (isset($data['CandidateID'])) {
-            $specimen->setCandidateId((int) $data['CandidateID']);
-        }
-
-        if (isset($data['CandidateAge'])) {
-            $specimen->setCandidateAge((int) $data['CandidateAge']);
-        }
-        if (isset($data['SessionID'])) {
-            $specimen->setSessionId((int) $data['SessionID']);
-        }
-        if (isset($data['PoolID'])) {
-            $specimen->setPoolId((int) $data['PoolID']);
-        }
-
-        $collection = new Collection();
-        if (isset($data['CollectionProtocolID'])) {
-            $collection->setProtocolId(
-                (int) $data['CollectionProtocolID']
-            );
-        }
-        if (isset($data['CollectionQuantity'])) {
-            $collection->setQuantity(
-                (string) $data['CollectionQuantity']
-            );
-        }
-        if (isset($data['CollectionUnitID'])) {
-            $collection->setUnitId(
-                (int) $data['CollectionUnitID']
-            );
-        }
-        if (isset($data['CollectionCenterID'])) {
-            $collection->setCenterId((int) $data['CollectionCenterID']);
-        }
-        if (isset($data['CollectionExaminerID'])) {
-            $collection->setExaminerId((int) $data['CollectionExaminerID']);
-        }
-        if (isset($data['CollectionDate'])) {
-            $collection->setDate(new \DateTime($data['CollectionDate']));
-        }
-        if (isset($data['CollectionTime'])) {
-            $collection->setTime(
-                new \DateTime($data['CollectionTime'])
-            );
-        }
-        if (isset($data['CollectionComments'])) {
-            $collection->setComments(
-                (string) $data['CollectionComments']
-            );
-        }
-        if (isset($data['CollectionData'])) {
-            $collection->setData(
-                json_decode($data['CollectionData'], true)
-            );
-        }
-        $specimen->setCollection($collection);
-
-        // XXX: These checks for instantiating $prepartion and $analysis are not
-        // the best. Perhaps they should be queried separately and it should be
-        // checked whether or not the array itself exists.
-        $preparation = new Preparation();
-        if ($data['PreparationProtocolID']) {
-            if (isset($data['PreparationProtocolID'])) {
-                $preparation->setProtocolId(
-                    (int) $data['PreparationProtocolID']
-                );
-            }
-            if (isset($data['PreparationCenterID'])) {
-                $preparation->setCenterId(
-                    (int) $data['PreparationCenterID']
-                );
-            }
-            if (isset($data['PreparationExaminerID'])) {
-                $preparation->setExaminerId(
-                    (int) $data['PreparationExaminerID']
-                );
-            }
-            if (isset($data['PreparationDate'])) {
-                $preparation->setDate(
-                    new \DateTime($data['PreparationDate'])
-                );
-            }
-            if (isset($data['PreparationTime'])) {
-                $preparation->setTime(
-                    new \DateTime($data['PreparationTime'])
-                );
-            }
-            if (isset($data['PreparationComments'])) {
-                $preparation->setComments(
-                    (string) $data['PreparationComments']
-                );
-            }
-            if (isset($data['PreparationData'])) {
-                $preparation->setData(
-                    json_decode($data['PreparationData'], true)
-                );
-            }
-            $specimen->setPreparation($preparation);
-        }
-
-        if ($data['AnalysisProtocolID']) {
-            $analysis = new Analysis();
-            if (isset($data['AnalysisProtocolID'])) {
-                $analysis->setProtocolId((int) $data['AnalysisProtocolID']);
-            }
-            if (isset($data['AnalysisCenterID'])) {
-                $analysis->setCenterId((int) $data['AnalysisCenterID']);
-            }
-            if (isset($data['AnalysisExaminerID'])) {
-                $analysis->setExaminerId((int) $data['AnalysisExaminerID']);
-            }
-            if (isset($data['AnalysisDate'])) {
-                $analysis->setDate(new \DateTime($data['AnalysisDate']));
-            }
-            if (isset($data['AnalysisTime'])) {
-                $analysis->setTime(new \DateTime($data['AnalysisTime']));
-            }
-            if (isset($data['AnalysisComments'])) {
-                $analysis->setComments((string) $data['AnalysisComments']);
-            }
-            if (isset($data['AnalysisData'])) {
-                $analysis->setData(json_decode($data['AnalysisData'], true));
-            }
-            $specimen->setAnalysis($analysis);
-        }
-
-        return $specimen;
-    }
-}
diff --git a/php/specimenendpoint.class.inc b/php/specimenendpoint.class.inc
deleted file mode 100644
index 8dc8fead..00000000
--- a/php/specimenendpoint.class.inc
+++ /dev/null
@@ -1,194 +0,0 @@
-<?php declare(strict_types=1);
-/**
- * This implement the Specimen endpoint class for the Biobank Module.
- *
- * PHP Version 7.2
- *
- * @category   API
- * @package    Loris
- * @subpackage Biobank
- * @author     Henri Rabalais <henri.rabalais@mcin.ca>
- * @license    http://www.gnu.org/licenses/gpl-3.0.text GPLv3
- * @link       http://www.github.com/aces/Loris/
- */
-namespace LORIS\biobank;
-use \Psr\Http\Message\ServerRequestInterface;
-use \Psr\Http\Server\RequestHandlerInterface;
-use \Psr\Http\Message\ResponseInterface;
-
-/**
- * A class for handling the /biobank/specimens/ endpoint.
- *
- * PHP Version 7.2
- *
- * @category   Biobank
- * @package    Main
- * @subpackage Biobank
- * @author     Henri Rabalais <henri.rabalais@mcin.ca>
- * @license    http://www.gnu.org/licenses/gpl-3.0.text GPLv3
- * @link       http://www.github.com/aces/Lors/
- */
-class SpecimenEndpoint extends \NDB_Page implements RequestHandlerInterface
-{
-    /**
-     * Returns true if user has acces to this Endpoint.
-     *
-     * @param \User $user The user whose access is being checked
-     *
-     * @return bool
-     */
-    function _hasAccess(\User $user) : bool
-    {
-        return true;
-    }
-
-    /**
-     * Return which methods are supported by this endpoint.
-     *
-     * @return array supported HTTP methods
-     */
-    protected function allowedMethods() : array
-    {
-        return [
-            'GET',
-            'PUT',
-            'POST',
-            'OPTIONS',
-        ];
-    }
-
-    /**
-     * This function can be overridden in a module's page to load the necessary
-     * resources to check the permissions of a user.
-     *
-     * @param User                   $user    The user to load the resources for
-     * @param ServerRequestInterface $request The PSR15 Request being handled
-     *
-     * @return void
-     */
-    public function loadResources(
-        \User $user, ServerRequestInterface $request
-    ) : void {
-    }
-
-    /**
-     * This function passes the request to the handler. This is necessary since
-     * the Endpoint bypass the Module class.
-     *
-     * TODO: This function should be extracted to a parent class.
-     *
-     * @param ServerRequestInterface  $request The PSR7 request.
-     * @param RequestHandlerInterface $handler The request handler.
-     *
-     * @return ResponseInterface The outgoing PSR7 response.
-     */
-    public function process(
-        ServerRequestInterface $request,
-        RequestHandlerInterface $handler
-    ) : ResponseInterface {
-        return $handler->handle($request);
-    }
-
-    /**
-     * Handles Endpoint requests
-     *
-     * @param ServerRequestInterface $request The incoming PSR7 request
-     *
-     * @return ResponseInterface The outgoing PSR7 response
-     */
-    public function handle(ServerRequestInterface $request) : ResponseInterface
-    {
-        ini_set('memory_limit', '-1');
-        $db       = $this->loris->getDatabaseConnection();
-        $user     = $request->getAttribute('user');
-        $specCont = new SpecimenController($this->loris, $user);
-
-        try {
-            $db->beginTransaction();
-            switch ($request->getMethod()) {
-            case 'GET':
-                $specimens = $specCont->getInstances();
-                return new \LORIS\Http\Response\JSON\OK($specimens);
-            case 'POST':
-                $specimenArray = json_decode(
-                    $request->getBody()->getContents(),
-                    true
-                );
-                $specimens     = $specCont->createInstances($specimenArray);
-
-                if (!empty($request->getUploadedFiles())) {
-                    $response = $this->uploadFiles($request);
-                    if ($response->getStatusCode() !== 200) {
-                        $db->rollBack();
-                        return $response;
-                    }
-                }
-                return new \LORIS\Http\Response\JSON\OK($specimens);
-            case 'PUT':
-                $specimenArray = json_decode(
-                    $request->getBody()->getContents(),
-                    true
-                );
-                $specimen      = $specCont->updateInstance($specimenArray);
-                return new \LORIS\Http\Response\JSON\OK([$specimen]);
-            case 'OPTIONS':
-                return (new \LORIS\Http\Response())
-                    ->withHeader('Allow', $this->allowedMethods());
-            }
-        } catch (\NotFound $e) {
-            $db->rollBack();
-            return new \LORIS\Http\Response\JSON\NotFound($e->getMessage());
-        } catch (\DatabaseException $e) {
-            $db->rollBack();
-            $message = $e->getMessage().'. If this error occurs again, please
-                contact your administrator.';
-            return new \LORIS\Http\Response\JSON\InternalServerError($message);
-        } catch (\TypeError $e) {
-            $db->rollBack();
-            $message = $e->getMessage().'. If this error occurs again, please
-                contact your administrator.';
-            return new \LORIS\Http\Response\JSON\InternalServerError($message);
-        } catch (\Error $e) {
-            $db->rollBack();
-            $message = $e->getMessage().'. If this error occurs again, please
-                contact your administrator.';
-            return new \LORIS\Http\Response\JSON\InternalServerError($message);
-        } catch (\Exception $e) {
-            $db->rollBack();
-            // PUT SOMETHING HERE LATER
-            return new \LORIS\Http\Response\JSON\InternalServerError(
-                $e->getMessage()
-            );
-        } finally {
-            if ($db->inTransaction()) {
-                $db->commit();
-            }
-        }
-    }
-
-    /**
-     * Validates and Uploades files
-     *
-     * @param ServerRequestInterface $request The incoming PSR7 request
-     *                                        containg the files to be uploaded.
-     *
-     * @return ResponseInterface
-     */
-    public function uploadFiles(ServerRequestInterface $request) : ResponseInterface
-    {
-        $config = \NDB_Config::singleton();
-        $path   = $config->getSetting('biobankPath');
-
-        if (!isset($path)) {
-            throw new \NotFound('Biobank File Upload Path is not configured');
-        }
-        $targetdir = new \SplFileInfo($path);
-
-        $uploader = (new \LORIS\FilesUploadHandler($targetdir))
-            ->withPermittedMIMETypes(
-                'text/plain'
-            );
-
-        return $uploader->handle($request);
-    }
-}
diff --git a/php/types/date.class.inc b/php/types/date.class.inc
new file mode 100644
index 00000000..d2e1b57a
--- /dev/null
+++ b/php/types/date.class.inc
@@ -0,0 +1,19 @@
+<?php declare(strict_types=1); 
+
+namespace LORIS\biobank\types;
+
+class Date implements \JsonSerializable {
+    private \DateTime $date;
+
+    public function __construct(string $dateStr) {
+        $this->date = new \DateTime($dateStr);
+    }
+
+    public function format(string $format): string {
+        return $this->date->format($format);
+    }
+
+    public function jsonSerialize(): string {
+        return $this->format('Y-m-d'); // Date format
+    }
+}
diff --git a/php/types/time.class.inc b/php/types/time.class.inc
new file mode 100644
index 00000000..db3f7bcf
--- /dev/null
+++ b/php/types/time.class.inc
@@ -0,0 +1,19 @@
+<?php declare(strict_types=1);  
+
+namespace LORIS\biobank\types;
+
+class Time implements \JsonSerializable {
+    private \DateTime $time;
+
+    public function __construct(string $timeStr) {
+        $this->time = new \DateTime($timeStr);
+    }
+
+    public function format(string $format): string {
+        return $this->time->format($format);
+    }
+
+    public function jsonSerialize(): string {
+        return $this->format('H:i'); // Time format
+    }
+}
diff --git a/php/validator.class.inc b/php/validator.class.inc
new file mode 100644
index 00000000..cde0dfa9
--- /dev/null
+++ b/php/validator.class.inc
@@ -0,0 +1,226 @@
+<?php declare(strict_types=1); 
+
+namespace LORIS\biobank;
+
+/**
+ * Abstract class Validator
+ *
+ * This class provides the core structure for validating models. It
+ * manages required fields, field types, and uniqueness constraints,
+ * while allowing concrete classes to define specific validation rules.
+ *
+ * @package    LORIS
+ * @subpackage Biobank
+ * @author     Henri Rabalais <henri.j.rabalais@gmail.com>
+ * @license    https://www.gnu.org/licenses/gpl-3.0.html GNU General Public
+ *             License
+ */
+abstract class Validator
+{
+    /**
+     * Holds validation errors for each model instance.
+     *
+     * @var array
+     */    
+    private array $errors = [];
+    /**
+     * Index of the current model instance being validated.
+     *
+     * @var int
+     */    
+    private int $currentIndex;
+
+    /**
+     * Constructs the Validator with a service instance.
+     *
+     * @param Service $service The service associated with this validator.
+     */    
+    public function __construct(
+        protected Service $service
+    ) {}
+
+    /**
+     * Returns the required fields for validation.
+     *
+     * @return array An array of required field names.
+     */    
+    abstract protected function getRequiredFields(): array;
+
+    /**
+     * Returns conditionally required fields.
+     *
+     * @return array An array of field names that are required conditionally.
+     */    
+    abstract protected function getRequiredIfFields(): array;
+
+    /**
+     * Returns the field types for validation.
+     *
+     * @return array An associative array of field names and their types.
+     */
+    abstract protected function getFieldTypes(): array;
+
+    /**
+     * Returns the fields that must be unique across instances.
+     *
+     * @return array An array of unique field names.
+     */    
+    abstract protected function getUniqueFields(): array;
+
+    /**
+     * Validates custom fields specific to the model.
+     *
+     * @param Model $instance The model instance to validate.
+     */    
+    abstract protected function validateFields(Model $instance) : void;
+
+    /**
+     * Adds an error message for a specific field.
+     *
+     * @param string $field   The field name associated with the error.
+     * @param string $message The error message to add.
+     */    
+    public function addError(string $field, string $message): void
+    {
+        $index = $this->currentIndex;
+        if (!isset($this->errors[$index])) {
+            $this->errors[$index] = [];
+        }
+        if (!isset($this->errors[$index][$field])) {
+            $this->errors[$index][$field] = [];
+        }
+        $this->errors[$index][$field][] = $message;
+    }
+
+    /**
+     * Checks if any validation errors exist.
+     *
+     * @return bool True if errors exist, false otherwise.
+     */    
+    public function hasErrors() : bool
+    {
+        return !empty($this->errors);
+    }
+
+    /**
+     * Retrieves all validation errors.
+     *
+     * @return array An array of errors grouped by field and instance.
+     */    
+    public function getErrors() : array
+    {
+        return $this->errors;
+    }
+
+    /**
+     * Validates a single model instance.
+     *
+     * The instance is checked for required fields, correct field types,
+     * and any custom validations.
+     *
+     * Note: This method resets the errors array before validation.
+     *
+     * @param Model $instance The model instance to validate.
+     */    
+    public function validate(Model $instance) : void 
+    {
+        $this->errors = [];
+        $this->validateRequiredFields($instance);
+        $this->validateFieldTypes($instance);
+        $this->validateFields($instance);
+    }
+
+    /**
+     * Validates multiple model instances.
+     *
+     * Each instance is validated for uniqueness, required fields, and
+     * field types. The current index is tracked to associate errors with
+     * specific instances.
+     *
+     * Note: The uniqueness validation assumes that the fields specified
+     * in `getUniqueFields()` are always present in each instance.
+     *
+     * @param array $instances The array of model instances to validate.
+     */    
+    public function validateInstances(array $instances) : void
+    {
+        $this->errors = [];
+        $this->validateUniqueFields($instances);
+        // $this->validateAllFields($instances); // to be implemented
+
+        foreach ($instances as $index => $instance) {
+            $this->currentIndex = $index;
+            $this->validateRequiredFields($instance);
+            // $this->validateRequiredIf($instance); // to be implement
+            $this->validateFieldTypes($instance);
+            $this->validateFields($instance);
+        }
+    }
+
+    /**
+     * Validates that all required fields are present.
+     *
+     * Fields are validated based on the list provided by
+     * `getRequiredFields()`. Fields must be present and not empty.
+     *
+     * @param Model $instance The model instance to validate.
+     */    
+    protected function validateRequiredFields($instance): void
+    {
+        foreach ($this->getRequiredFields() as $field) {
+            if (!isset($instance->$field) ||
+                (is_array($instance->$field) 
+                && empty($instance->$field))
+                || (!is_array($instance->$field)
+                && trim($instance->$field) === '')) {
+                $this->addError($field, "$field is required.");
+            }
+        }
+    }
+
+    /**
+     * Validates that fields have the correct types.
+     *
+     * Each field is checked to ensure it matches the expected type
+     * provided by `getFieldTypes()`.
+     *
+     * Note: If a field exists but its type does not match, an error is
+     * added. There is no type coercion.
+     *
+     * @param Model $instance The model instance to validate.
+     */    
+    protected function validateFieldTypes($instance) : void
+    {
+        foreach ($this->getFieldTypes() as $field => $type) {
+            if (isset($instance->$field) && gettype($instance->$field) !== $type) {
+                $this->addError($field, "$field must be of type $type.");
+            }
+        }
+    }
+
+    /**
+     * Validates that fields marked as unique are unique across instances.
+     *
+     * Fields specified in `getUniqueFields()` are checked for duplicates
+     * across all instances. An error is added if any duplicates are found.
+     *
+     * @param array $instances The array of model instances to validate.
+     */    
+    protected function validateUniqueFields(array $instances): void
+    {
+        $uniqueFields = $this->getUniqueFields();
+        $fieldValues = [];
+
+        foreach ($instances as $instance) {
+            foreach ($uniqueFields as $field) {
+                $fieldValues[$field][] = $instance->$field;
+            }
+        }
+
+        foreach ($fieldValues as $field => $values) {
+            if (count($values) !== count(array_unique($values))) {
+                $this->addError($field, ucfirst($field) . ' must be unique for each entry.');
+            }
+        }
+    }
+}
diff --git a/php/validators/container/typevalidator.class.inc b/php/validators/container/typevalidator.class.inc
new file mode 100644
index 00000000..c44da025
--- /dev/null
+++ b/php/validators/container/typevalidator.class.inc
@@ -0,0 +1,31 @@
+<?php declare(strict_types=1); 
+
+namespace LORIS\biobank\validators\container;
+
+use LORIS\biobank\Model;
+use LORIS\biobank\Validator;
+
+class TypeValidator extends Validator
+{
+
+    protected function getUniqueFields(): array {
+        return [];
+    }
+
+    protected function getRequiredFields() : array {
+        return [];
+    }
+
+    protected function getFieldTypes() : array {
+        return [];
+    }
+
+    protected function getRequiredIfFields(): array
+    {
+        return [];
+    }
+
+    protected function validateFields(Model $type) : void
+    {
+    }
+}
diff --git a/php/validators/containervalidator.class.inc b/php/validators/containervalidator.class.inc
new file mode 100644
index 00000000..b929d2dd
--- /dev/null
+++ b/php/validators/containervalidator.class.inc
@@ -0,0 +1,206 @@
+<?php declare(strict_types=1); 
+
+namespace LORIS\biobank\validators;
+
+use LORIS\biobank\Validator;
+use LORIS\biobank\Model;
+use LORIS\biobank\models\Container;
+
+class ContainerValidator extends Validator
+{
+
+    protected function getUniqueFields(): array {
+        return ['barcode'];
+    }
+
+    protected function getRequiredFields() : array {
+        return ['barcode', 'type', 'temperature', 'status'];
+    }
+
+    protected function getRequiredIfFields() : array
+    {
+        return [];
+    }
+
+    protected function getFieldTypes() : array {
+        return [
+            'barcode' => 'string',
+            'type' => 'string',
+            'temperature' => 'float',
+            'status' => 'string',
+        ];
+    }
+
+    protected function validateFields(Model $container) : void
+    {
+        $this->validateBarcode($container);
+        $this->validateType($container);
+        $this->validateTemperature($container);
+        // $this->validateStatusId($container);
+        // $this->validateShipmentBarcodes($container);
+        $this->validateCenter($container);
+        $this->validateParent($container);
+        $this->validateCoordinate($container);
+        // $this->_validateLotNumber($container);
+        // $this->_validateExpirationDate($container);
+        // $this->_validateComments($container);
+    }
+
+    private function validateBarcode(Container $container) : void
+    {
+        $id            = $container->id;
+        $barcode       = $container->barcode;
+        $prevContainer = $this->service->getByLabel($barcode);
+
+        if (!is_null($prevContainer)) {
+            // If the barcodes are identical but the ids are not
+            if ($prevContainer->barcode === $barcode && $preContainer->id !== $id) {
+                $this->addError('barcode', 'Barcode must be unique.');
+            }
+
+            if ($id && ($barcode !== $prevContainer->barcode)) {
+                $this->addError('barcode', 'Barcode can not be changed.');
+            }
+        }
+
+        // TODO: Regex check on Barcode. Currently, regex has been removed from
+        // the schema. Once it's reintroduced, this can be implemented.
+        //$specimenTypes = $this->dao->getSpecimenTypes();
+        //$regex = $specimenTypes[$specimen['typeId']]['regex'];
+        //if (isset($regex)) {
+        //    if (preg_match($regex, $container['barcode']) !== 1) {
+        //        throw new BadRequest('Barcode is not of proper format for the
+        //                               selected specimen type');
+        //    }
+        //}
+    }
+
+    private function validateType(Container $container) : void
+    {
+    }
+
+    private function validateTemperature(Container $container) : void
+    {
+        $temperature = $container->temperature;
+        if (!(is_numeric($temperature) && is_float(floatval($temperature)))) {
+            $this->addError('temperature', 'Temperature must be a number.');
+        }
+    }
+
+    // private function validateStatus(Container $container) : void
+    // {
+    //     if (is_null($container->getStatus())) {
+    //         $this->addError('statusId', 'Status value must be set.');
+    //     }
+    //     if ($container->getId()) {
+    //         $prevContainer = $this->service->getInstanceFromId($container->getId());
+    //         if ($prevContainer) {
+    //             $stati         = $this->service->getStati();
+    //             $statusLabel   = $stati[$prevContainer->getStatusId() ?? '']['label'];
+    //             if ($statusLabel == 'Dispensed') {
+    //                 // TODO: figure out what else should not be changed if the container
+    //                 // is dispensed. This should eventually be blocked in the front-end
+    //                 // as well. These validations can wait until more testing has
+    //                 // been done on the module.
+
+    //                 if ($prevContainer->getTemperature()!= $container->getTemperature()
+    //                 ) {
+    //                     $this->addError('temperature',
+    //                         "Temperature cannot be changed if Container
+    //                                            is Dispensed."
+    //                     );
+    //                 }
+    //             }
+    //         }
+    //     }
+
+    //     if (is_null($container->getStatusId())) {
+    //         $this->addError('status', "Status value must be set.");
+    //     }
+    // }
+
+    // private function validateShipmentBarcodes(Container $container) : void
+    // {
+    //     if (empty($container->shipments) {
+    //         return;
+    //     }
+
+    //     $shipmentDAO = new ShipmentDAO($this->db);
+    //     foreach ($container->shipments as $barcode) {
+    //         error_log($barcode);
+    //         $shipment = $shipmentDAO->getInstanceFromBarcode($barcode);
+    //         if ($shipment->getActive()) {
+    //             $this->addError('shipments',
+    //                 "Container ".$container->getBarcode()." cannot
+    //       be manipulated while it is associated with an active shipment."
+    //             );
+    //         }
+    //     }
+
+    //     // Additional shipment barcodes validation logic...
+    // }
+
+    private function validateCenter(Container $container) : void
+    {
+        if (false) {
+            $parent = $this->service->getByLabel($container->parent);
+            if ($container->center !== $parent->center) {
+                $this->addError('centers',
+                    $container->barcode." must be at the same location
+                        as ".$parentContainer->barcode." to execute this
+                        action"
+                );
+            }
+        }
+    }
+
+    private function validateParent(Container $container) : void
+    {
+        $parent = $container->parent;
+        if (isset($parent)) {
+            $childContainerIds = $this->service->getAllChildContainerIds($container);
+            if ($container->id == $parentContainerId
+                || in_array($container->id, $childContainerIds)
+            ) {
+                $this->addError('parentContainers',
+                    'A container can not be placed within itself or
+                    within one of its descendant containers.'
+                );
+            }
+        }
+    }
+
+    private function validateCoordinate(Container $container) : void
+    {
+        $coordinate = $container->coordinate;
+        if (!is_null($coordinate)) {
+            if (!((is_int($coordinate) || ctype_digit($coordinate))
+                && (int)$coordinate > 0)
+            ) {
+                $this->addError('coordinate', 'Coordinate must be a positive integer.');
+            }
+
+            $parentContainerId = $container->parent->id;
+            if (!isset($parentContainerId)) {
+                $this->addError('coordinate',
+                    'Coordinate can not be set without a Parent
+                                       Container.'
+                );
+            }
+
+            $parentContainer = $this->service->getById(
+                $parentContainerId
+            );
+
+            $dimensions = $this->service->getDimensions()[$parentContainer
+                ->getDimensionId() ?? ''];
+
+            $capacity = $dimensions['x'] * $dimensions['y'] * $dimensions['z'];
+            if ($container->coordinate > $capacity) {
+                $this->addError('coordinate',
+                    'Coordinate value exceeds the capacity of the Parent Container'
+                );
+            }
+        }
+    }
+}
diff --git a/php/validators/poolvalidator.class.inc b/php/validators/poolvalidator.class.inc
new file mode 100644
index 00000000..b9d2adf4
--- /dev/null
+++ b/php/validators/poolvalidator.class.inc
@@ -0,0 +1,110 @@
+<?php declare(strict_types=1); 
+
+namespace LORIS\biobank\validators;
+
+use LORIS\biobank\Validator;
+use LORIS\biobank\Model;
+use LORIS\biobank\models\Pool;
+
+class PoolValidator extends Validator
+{
+
+    protected function getUniqueFields(): array {
+        return ['label'];
+    }
+
+    protected function getRequiredFields() : array {
+        return ['label', '', 'temperature', 'status'];
+    }
+
+    protected function getRequiredIfFields(): array {
+        return [];
+    }
+
+    protected function getFieldTypes() : array {
+        return [
+            'label' => 'string',
+        ];
+    }
+
+    public function validateFields(Model $pool) : void
+    {
+        $this->validateLabel($pool);
+        $this->validateSpecimens($pool);
+    }
+
+    private function validateLabel(Pool $pool) : void
+    {
+        $poolList = $this->service->findByLabel($pool->label);
+
+        if (!empty($poolList)) {
+            $this->addError('Pool Label must be unique');
+        }
+    }
+
+
+    private function validateSpecimens(Pool $pool) : void
+    {
+        $specimenIds = $pool->specimenIds;
+        if (count($specimenIds) < 2) {
+            $this->addError(
+                'At least 2 specimens must be provided to create a Pool'
+            );
+        }
+
+        // XXX: not sure why a loris oobject is being passed to instatiate the
+        // DAO. Maybe this is right, but I'm not sure why.
+        $specimenDAO   = new SpecimenDAO($this->loris);
+        $containerDAO  = new ContainerDAO($this->db);
+        $baseSpecimen  = $specimenDAO->getInstanceFromId($specimenIds[0]);
+        $baseContainer = $containerDAO->getInstanceFromId(
+            $baseSpecimen->containerId
+        );
+
+        foreach ($specimenIds as $specimenId) {
+            $specimen  = $specimenDAO->getInstanceFromId($specimenId);
+            $container = $containerDAO->findById(
+                $specimen->containerId
+            );
+            $barcode   = $container->barcode;
+
+            if ($baseSpecimen->candidateId !== $specimen->candidateId) {
+                $this->addError('specimens',
+                    'Pooled specimens must belong to the same Candidate'
+                );
+            }
+
+            if ($baseSpecimen->sessionId !== $specimen->sessionId) {
+                $this->addError('specimens',
+                    'Pooled specimens must belong to the same Session'
+                );
+            }
+
+            if ($baseSpecimen->typeId !== $specimen->typeId) {
+                $this->addError('specimens', 'Pooled specimens must be of the same Type');
+            }
+
+            if ($baseContainer->centerId != $container->centerId) {
+                $this->addError('specimens', 'Pooled specimens must be at the same Site');
+            }
+
+            if ($specimen->quantity === 0 ) {
+                $this->addError('specimens',
+                    "Quantity of '$barcode' must be greater than '0'"
+                );
+            }
+
+            if ($specimen->poolId !== null) {
+                $this->addError('specimens',
+                    "Specimen '$barcode' already belongs to a Pool"
+                );
+            }
+
+            $stati    = $containerDAO->stati;
+            $statusId = $container->statusId ?? '';
+            if ($stati[$statusId]['label'] !== 'Available') {
+                $this->addError('specimens', "Specimen '$barcode' is not 'Available'");
+            }
+        }
+    }
+}
diff --git a/php/validators/processvalidator.class.inc b/php/validators/processvalidator.class.inc
new file mode 100644
index 00000000..28fef520
--- /dev/null
+++ b/php/validators/processvalidator.class.inc
@@ -0,0 +1,85 @@
+<?php declare(strict_types=1); 
+
+namespace LORIS\biobank\validators;
+
+use LORIS\biobank\Validator;
+use LORIS\biobank\models\Process;
+
+class ProcessValidator extends Validator
+{
+    protected function getRequiredFields() : array {
+        return ['protocol', 'center', 'examiner'];
+    }
+
+    protected function validateFields(Process $process) : void
+    {
+        $this->validateData($process);
+    }
+
+    private function _validateData(Process $process) : void
+    {
+        $protocolAttributes = $this->service->getProtocolAttributes();
+        $attributeDatatypes = $this->service->getAttributeDatatypes();
+        $protocolId         = $process->getProtocolId();
+        $attributes         = $protocolAttributes[$protocolId] ?? [];
+        $data = $process->getData() ?? [];
+
+        foreach ($attributes as $id => $attribute) {
+            if ($attribute['required'] == true && !isset($data[$id])) {
+                $this->addError($wrongAttribute['label'],
+                    "The attribute "
+                    . $attribute['label']
+                    . " is required. Protocol "
+                    . $protocolId
+                );
+            }
+        }
+
+        foreach ($data as $attributeId => $value) {
+            $attribute = $attributes[$attributeId];
+
+            if (!isset($attribute)) {
+                $wrongAttribute = $this->service->getAttributes()[$attributeId];
+                $this->addError($wrongAttribute['label'],
+                    "The attribute '"
+                    . $wrongAttribute['label']
+                    . "' does not belong to this protocol"
+                );
+            }
+
+            $datatype = $attributeDatatypes[$attribute['datatypeId']]['datatype'];
+            if ($datatype === 'boolean' && !is_bool($value)) {
+                $this->addError($wrongAttribute['label'],
+                    "The attribute '"
+                    . $attribute['label']
+                    . "' must be a boolean"
+                );
+            }
+
+            if ($datatype === 'number' && !is_numeric($value)) {
+                $this->addError($wrongAttribute['label'],
+                    "The attribute '"
+                    . $attribute['label']
+                    . "' must be a number"
+                );
+            }
+
+            // TODO: This validation may not be necessary, but it may be good to
+            // leave this if statement here just as a reminder that it exists.
+            if ($datatype === 'text') {
+            }
+
+            // TODO: This can likely be validated through the DateTime Object.
+            if ($datatype === 'date') {
+            }
+
+            // TODO: This can likely be validated through the DateTime Object.
+            if ($datatype === 'time') {
+            }
+
+            // TODO: Set this validate when files start to get uploaded.
+            if ($datatype === 'file') {
+            }
+        }
+    }
+}
diff --git a/php/validators/shipment/logvalidator.class.inc b/php/validators/shipment/logvalidator.class.inc
new file mode 100644
index 00000000..398d67af
--- /dev/null
+++ b/php/validators/shipment/logvalidator.class.inc
@@ -0,0 +1,31 @@
+<?php declare(strict_types=1); 
+
+namespace LORIS\biobank\validators\shipment;
+
+use LORIS\biobank\Model;
+use LORIS\biobank\Validator;
+
+class LogValidator extends Validator
+{
+
+    protected function getUniqueFields(): array {
+        return [];
+    }
+
+    protected function getRequiredFields() : array {
+        return [];
+    }
+
+    protected function getFieldTypes() : array {
+        return [];
+    }
+
+    protected function getRequiredIfFields(): array
+    {
+        return [];
+    }
+
+    protected function validateFields(Model $log) : void
+    {
+    }
+}
diff --git a/php/validators/shipment/statusvalidator.class.inc b/php/validators/shipment/statusvalidator.class.inc
new file mode 100644
index 00000000..bf0ed530
--- /dev/null
+++ b/php/validators/shipment/statusvalidator.class.inc
@@ -0,0 +1,31 @@
+<?php declare(strict_types=1); 
+
+namespace LORIS\biobank\validators\shipment;
+
+use LORIS\biobank\Model;
+use LORIS\biobank\Validator;
+
+class StatusValidator extends Validator
+{
+
+    protected function getUniqueFields(): array {
+        return [];
+    }
+
+    protected function getRequiredFields() : array {
+        return [];
+    }
+
+    protected function getFieldTypes() : array {
+        return [];
+    }
+
+    protected function getRequiredIfFields(): array
+    {
+        return [];
+    }
+
+    protected function validateFields(Model $log) : void
+    {
+    }
+}
diff --git a/php/validators/shipment/typevalidator.class.inc b/php/validators/shipment/typevalidator.class.inc
new file mode 100644
index 00000000..8c04502d
--- /dev/null
+++ b/php/validators/shipment/typevalidator.class.inc
@@ -0,0 +1,31 @@
+<?php declare(strict_types=1); 
+
+namespace LORIS\biobank\validators\shipment;
+
+use LORIS\biobank\Model;
+use LORIS\biobank\Validator;
+
+class TypeValidator extends Validator
+{
+
+    protected function getUniqueFields(): array {
+        return [];
+    }
+
+    protected function getRequiredFields() : array {
+        return [];
+    }
+
+    protected function getFieldTypes() : array {
+        return [];
+    }
+
+    protected function getRequiredIfFields(): array
+    {
+        return [];
+    }
+
+    protected function validateFields(Model $type) : void
+    {
+    }
+}
diff --git a/php/validators/shipmentvalidator.class.inc b/php/validators/shipmentvalidator.class.inc
new file mode 100644
index 00000000..a4aa58ad
--- /dev/null
+++ b/php/validators/shipmentvalidator.class.inc
@@ -0,0 +1,105 @@
+<?php declare(strict_types=1); 
+
+namespace LORIS\biobank\validators;
+
+use LORIS\biobank\Model;
+use LORIS\biobank\Validator;
+use LORIS\biobank\models\Shipment;
+
+class ShipmentValidator extends Validator
+{
+
+    protected function getUniqueFields(): array {
+        return ['barcode'];
+    }
+
+    protected function getRequiredFields() : array {
+        return ['barcode', 'type', 'destinationCenter', 'containers', 'logs'];
+    }
+
+    protected function getFieldTypes() : array {
+        return [
+            'barcode' => 'string',
+            'type' => 'string',
+            'destinationCenter' => 'string',
+            'containers' => 'array',
+            'logs' => 'array'
+        ];
+    }
+
+    protected function getRequiredIfFields(): array
+    {
+        return [];
+    }
+
+    protected function validateFields(Model $shipment) : void
+    {
+        $this->validateBarcode($shipment);
+        $this->validateLogs($shipment);
+        $this->validateContainers($shipment);
+    }
+
+    private function validateBarcode($shipment): void {
+        if (!$shipment->id) {
+            foreach ($this->service->selectInstances() as $shipmentComp) {
+                if ($shipment->barcode === $shipmentComp->barcode) {
+                    $this->addError('barcode', 'A shipment with this Barcode already exists.');
+                }
+            }
+        }
+    }
+
+    private function validateLogs($shipment): void {
+        $logValidator = new LogValidator($this->service);
+        foreach ($shipment->logs as $log) {
+            $logValidator->validate($log);
+            if ($logValidator->hasErrors()) {
+                $this->errors = array_merge($this->errors, $logValidator->getErrors());
+            }
+        }
+    }
+
+    private function validateContainers(Shipment $shipment) : array
+    {
+        foreach ($shipment->containerIds as $containerId) {
+            $container = $containerDAO->getInstanceFromId(
+                (int) $containerId
+            );
+
+            // TODO: Re-Implement once integrity of Centers of Containers is
+            // established in CBIGR. Currently, child containers are permitted
+            // at a different site than the parent. This should NOT be the case.
+
+            /* Check that containers are all at the same center.*/
+            // if ($container->getCenterID() != $container1->getCenterID()) {
+            //     $errors[$field] = $container->getBarcode().' and '
+            //     .$container1->getBarcode().' are not at the same Center. All
+            //     Containers must be at the same Center.';
+            //     return $errors;
+            // }
+
+            // Check that containers are not already associated with an active
+            // shipment.
+            if (!$shipment->id) {
+                foreach ($container->getShipmentBarcodes() as $shipmentBarcode) {
+                    $containerShipment = $this->service->getInstanceFromBarcode(
+                        $shipmentBarcode
+                    );
+                    if ($containerShipment->getActive()) {
+                        $errors[$field] = $container->getBarcode().' is already
+                  associated with an active shipment';
+                    }
+                };
+            }
+        }
+
+        // TODO: this could maybe be improved since it only checks 1 shipment.
+        // TODO: This check needs to be reworked because it will only apply for
+        // the shipment creation.
+        // Check that the containers are at the same center as the shipment.
+        // if ($shipment->logs[0]->centerId !== $container1->getCenterID()) {
+        //     $error .= 'Containers must be at the same site as the shipment. ';
+        // }
+
+    }
+}
diff --git a/php/validators/specimen/attributevalidator.class.inc b/php/validators/specimen/attributevalidator.class.inc
new file mode 100644
index 00000000..5a205131
--- /dev/null
+++ b/php/validators/specimen/attributevalidator.class.inc
@@ -0,0 +1,31 @@
+<?php declare(strict_types=1); 
+
+namespace LORIS\biobank\validators\specimen;
+
+use LORIS\biobank\Model;
+use LORIS\biobank\Validator;
+
+class AttributeValidator extends Validator
+{
+
+    protected function getUniqueFields(): array {
+        return [];
+    }
+
+    protected function getRequiredFields() : array {
+        return [];
+    }
+
+    protected function getFieldTypes() : array {
+        return [];
+    }
+
+    protected function getRequiredIfFields(): array
+    {
+        return [];
+    }
+
+    protected function validateFields(Model $attribute) : void
+    {
+    }
+}
diff --git a/php/validators/specimen/protocolvalidator.class.inc b/php/validators/specimen/protocolvalidator.class.inc
new file mode 100644
index 00000000..620e11fe
--- /dev/null
+++ b/php/validators/specimen/protocolvalidator.class.inc
@@ -0,0 +1,31 @@
+<?php declare(strict_types=1); 
+
+namespace LORIS\biobank\validators\specimen;
+
+use LORIS\biobank\Model;
+use LORIS\biobank\Validator;
+
+class ProtocolValidator extends Validator
+{
+
+    protected function getUniqueFields(): array {
+        return [];
+    }
+
+    protected function getRequiredFields() : array {
+        return [];
+    }
+
+    protected function getFieldTypes() : array {
+        return [];
+    }
+
+    protected function getRequiredIfFields(): array
+    {
+        return [];
+    }
+
+    protected function validateFields(Model $protocol) : void
+    {
+    }
+}
diff --git a/php/validators/specimen/typevalidator.class.inc b/php/validators/specimen/typevalidator.class.inc
new file mode 100644
index 00000000..698ea7b2
--- /dev/null
+++ b/php/validators/specimen/typevalidator.class.inc
@@ -0,0 +1,31 @@
+<?php declare(strict_types=1); 
+
+namespace LORIS\biobank\validators\specimen;
+
+use LORIS\biobank\Model;
+use LORIS\biobank\Validator;
+
+class TypeValidator extends Validator
+{
+
+    protected function getUniqueFields(): array {
+        return [];
+    }
+
+    protected function getRequiredFields() : array {
+        return [];
+    }
+
+    protected function getFieldTypes() : array {
+        return [];
+    }
+
+    protected function getRequiredIfFields(): array
+    {
+        return [];
+    }
+
+    protected function validateFields(Model $type) : void
+    {
+    }
+}
diff --git a/php/validators/specimenvalidator.class.inc b/php/validators/specimenvalidator.class.inc
new file mode 100644
index 00000000..e5f13a9a
--- /dev/null
+++ b/php/validators/specimenvalidator.class.inc
@@ -0,0 +1,148 @@
+<?php declare(strict_types=1); 
+
+namespace LORIS\biobank\validators;
+
+use LORIS\biobank\Validator;
+use LORIS\biobank\Model;
+use LORIS\biobank\models\Specimen;
+
+class SpecimenValidator extends Validator
+{
+
+    protected function getUniqueFields(): array {
+        return ['barcode'];
+    }
+
+    protected function getRequiredFields() : array {
+        return ['type', 'quantity', 'unit', 'candidate', 'session', 'collection'];
+    }
+
+    protected function getFieldTypes() : array {
+        return [
+            'barcode' => 'string',
+            'type' => 'string',
+            'temperature' => 'float',
+            'status' => 'string',
+        ];
+    }
+
+    protected function getRequiredIfFields() : array
+    {
+        return [];
+    }
+
+    protected function validateFields(Model $specimen) : void
+    {
+        $this->validateTypeId($specimen);
+        $this->validateQuantity($specimen);
+        $this->validateUnitId($specimen);
+        $this->validateFTCycle($specimen);
+        $this->validateParentSpecimenIds($specimen);
+        $this->validateCollection($specimen);
+        $this->validatePreparation($specimen);
+        $this->validateAnalysis($specimen);
+    }
+
+    private function validateQuantity(Specimen $specimen) : void
+    {
+        $quantity = $specimen->quantity;
+        if (!(is_numeric($quantity) && is_float(floatval($quantity)))) {
+            $this->addError('quantity', 'Specimen Quantity value must be a number');
+        }
+        //TODO: This is where a capacity check would go, i.e. $quantity > $capacity.
+        if ($quantity < 0) {
+            $this->addError('quantity', 'Specimen Quantity cannot be less than 0');
+        }
+    }
+
+    private function validateFTCycle(Specimen $specimen) : void
+    {
+        $fTCycle = $specimen->fTCycle();
+        if (isset($fTCycle)) {
+            if (strval($fTCycle) !== strval(intval($fTCycle))
+                || intval($fTCycle) < 0
+            ) {
+                $this->addError('fTCycle', "F/T Cycle must be 0 or more");
+            }
+
+            if ($fTCycle > 100) {
+                $this->addError('ftCycle', "F/T Cycle value is too large");
+            }
+        }
+    }
+
+    /**
+     * Validates Specimen Object Parent Specimen IDs.
+     *
+     * @param Specimen $specimen Specimen to be validated.
+     *
+     * @throws BadRequest if the provided Specimen does not meet validation
+                          requirements.
+     *
+     * @return void
+     */
+    private function validateParents(Specimen $specimen) : void
+    {
+        $parents = $specimen->parents;
+        if ($parents) {
+            $baseParentSpecimen = $this->service->getInstanceFromId(
+                (int) $parents[0]
+            );
+        }
+        $specimenTypes = $this->service->getTypes();
+
+        if (empty($parents)) {
+            return;
+        }
+        if (empty($baseParentSpecimen)) {
+            return;
+        }
+        foreach ($parents as $parent) {
+            $parent = $this->service->getInstanceFromId((int) $parent);
+
+            $pSpecimenCandId = $parent->getCandidateId();
+
+            if ($baseParentSpecimen->getCandidateId() != $pSpecimenCandId) {
+                $this->addError(
+                    'parents',
+                    'Parent Specimens must be from the same Candidate'
+                );
+            }
+
+            if ($baseParentSpecimen->getSessionId()!= $parent->getSessionId()
+            ) {
+                $this->addError(
+                    'parents',
+                    'Parent Specimens must be from the same Session'
+                );
+            }
+
+            if ($baseParentSpecimen->getTypeId() != $parent->getTypeId()) {
+                $this->addError('parents', 'Parent Specimens must be of the same Type');
+            }
+
+            if ($parent->getTypeId() != $specimen->getTypeId()) {
+                if (empty($specimenTypes[$specimen->getTypeId()]['parentTypeIds'])) {
+                    $parentTypeId = $parent->getTypeId();
+
+                    $childType  = $specimenTypes[$specimen->getTypeId()]['label'];
+                    $parentType = $specimenTypes[$parentTypeId]['label'];
+                    $this->addError(
+                        "A specimen of type '$childType' cannot be derived
+                                           from a parent of type '$parentType'"
+                    );
+                }
+                if (!in_array(
+                    $parent->getTypeId(),
+                    $specimenTypes[$specimen->getTypeId()]['parentTypeIds']
+                )
+                ) {
+                    $this->addError(
+                        'Parent Specimens must be of a type that
+                                           is a parent to the current Specimen type'
+                    );
+                }
+            }
+        }
+    }
+}
diff --git a/sql/2023-08-10_DropCenterfromPoolandTransferProjectsfromContainerstoSpecimens.sql b/sql/2023-08-10_DropCenterfromPoolandTransferProjectsfromContainerstoSpecimens.sql
new file mode 100644
index 00000000..802da700
--- /dev/null
+++ b/sql/2023-08-10_DropCenterfromPoolandTransferProjectsfromContainerstoSpecimens.sql
@@ -0,0 +1,28 @@
+
+-- DROP Center From Pools
+ALTER TABLE biobank_pool
+DROP FOREIGN KEY FK_biobank_pool_CenterID,
+DROP COLUMN CenterID;
+
+-- Add new specimen project relational table
+CREATE TABLE `biobank_specimen_project_rel` (
+    `SpecimenID` integer unsigned NOT NULL,
+    `ProjectID` int(10) unsigned NOT NULL,
+    CONSTRAINT `PK_biobank_specimen_project_rel` PRIMARY KEY (`SpecimenID`, `ProjectID`),
+    CONSTRAINT `FK_biobank_specimen_project_rel_SpecimenID`
+        FOREIGN KEY (`SpecimenID`) REFERENCES `biobank_specimen`(`SpecimenID`)
+        ON UPDATE RESTRICT ON DELETE RESTRICT,
+    CONSTRAINT `FK_biobank_specimen_project_rel_ProjectID`
+        FOREIGN KEY (`ProjectID`) REFERENCES `Project`(`ProjectID`)
+        ON UPDATE RESTRICT ON DELETE RESTRICT
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- Insert projects and specimens
+INSERT INTO biobank_specimen_project_rel (SpecimenID, ProjectID)
+SELECT bsp.SpecimenID, rcp.ProjectID
+FROM biobank_container_project_rel rcp
+LEFT JOIN biobank_container bc ON rcp.ContainerID = bc.ContainerID
+RIGHT JOIN biobank_specimen bsp ON bc.ContainerID = bsp.ContainerID;
+
+-- Drop old table
+DROP TABLE biobank_container_project_rel;
diff --git a/sql/patches/2024-05-01_makeProtocolLabelNonNullable.sql b/sql/patches/2024-05-01_makeProtocolLabelNonNullable.sql
new file mode 100644
index 00000000..b4d53cc6
--- /dev/null
+++ b/sql/patches/2024-05-01_makeProtocolLabelNonNullable.sql
@@ -0,0 +1,2 @@
+ALTER TABLE biobank_specimen_protocol
+MODIFY Label varchar(100) NOT NULL;