diff --git a/handlers/admin-post/doAddFee.d.ts b/handlers/admin-post/doAddFee.d.ts
new file mode 100644
index 00000000..9621c611
--- /dev/null
+++ b/handlers/admin-post/doAddFee.d.ts
@@ -0,0 +1,3 @@
+import type { RequestHandler } from "express";
+export declare const handler: RequestHandler;
+export default handler;
diff --git a/handlers/admin-post/doAddFee.js b/handlers/admin-post/doAddFee.js
new file mode 100644
index 00000000..fd592402
--- /dev/null
+++ b/handlers/admin-post/doAddFee.js
@@ -0,0 +1,14 @@
+import { addFee } from "../../helpers/lotOccupancyDB/addFee.js";
+import { getFeeCategories } from "../../helpers/lotOccupancyDB/getFeeCategories.js";
+export const handler = async (request, response) => {
+    const feeId = addFee(request.body, request.session);
+    const feeCategories = getFeeCategories({}, {
+        includeFees: true
+    });
+    response.json({
+        success: true,
+        feeId,
+        feeCategories
+    });
+};
+export default handler;
diff --git a/handlers/admin-post/doAddFee.ts b/handlers/admin-post/doAddFee.ts
new file mode 100644
index 00000000..e104edf6
--- /dev/null
+++ b/handlers/admin-post/doAddFee.ts
@@ -0,0 +1,31 @@
+import type {
+    RequestHandler
+} from "express";
+
+import {
+    addFee
+} from "../../helpers/lotOccupancyDB/addFee.js";
+
+import {
+    getFeeCategories
+} from "../../helpers/lotOccupancyDB/getFeeCategories.js";
+
+
+
+export const handler: RequestHandler = async (request, response) => {
+
+    const feeId = addFee(request.body, request.session);
+
+    const feeCategories = getFeeCategories({}, {
+        includeFees: true
+    });
+
+    response.json({
+        success: true,
+        feeId,
+        feeCategories
+    });
+};
+
+
+export default handler;
\ No newline at end of file
diff --git a/handlers/admin-post/doDeleteFee.d.ts b/handlers/admin-post/doDeleteFee.d.ts
new file mode 100644
index 00000000..9621c611
--- /dev/null
+++ b/handlers/admin-post/doDeleteFee.d.ts
@@ -0,0 +1,3 @@
+import type { RequestHandler } from "express";
+export declare const handler: RequestHandler;
+export default handler;
diff --git a/handlers/admin-post/doDeleteFee.js b/handlers/admin-post/doDeleteFee.js
new file mode 100644
index 00000000..1895f21b
--- /dev/null
+++ b/handlers/admin-post/doDeleteFee.js
@@ -0,0 +1,13 @@
+import { deleteFee } from "../../helpers/lotOccupancyDB/deleteFee.js";
+import { getFeeCategories } from "../../helpers/lotOccupancyDB/getFeeCategories.js";
+export const handler = async (request, response) => {
+    const success = deleteFee(request.body.feeId, request.session);
+    const feeCategories = getFeeCategories({}, {
+        includeFees: true
+    });
+    response.json({
+        success,
+        feeCategories
+    });
+};
+export default handler;
diff --git a/handlers/admin-post/doDeleteFee.ts b/handlers/admin-post/doDeleteFee.ts
new file mode 100644
index 00000000..b5ce4442
--- /dev/null
+++ b/handlers/admin-post/doDeleteFee.ts
@@ -0,0 +1,30 @@
+import type {
+    RequestHandler
+} from "express";
+
+import {
+    deleteFee
+} from "../../helpers/lotOccupancyDB/deleteFee.js";
+
+import {
+    getFeeCategories
+} from "../../helpers/lotOccupancyDB/getFeeCategories.js";
+
+
+
+export const handler: RequestHandler = async (request, response) => {
+
+    const success = deleteFee(request.body.feeId, request.session);
+
+    const feeCategories = getFeeCategories({}, {
+        includeFees: true
+    });
+
+    response.json({
+        success,
+        feeCategories
+    });
+};
+
+
+export default handler;
\ No newline at end of file
diff --git a/handlers/admin-post/doDeleteFeeCategory.d.ts b/handlers/admin-post/doDeleteFeeCategory.d.ts
new file mode 100644
index 00000000..9621c611
--- /dev/null
+++ b/handlers/admin-post/doDeleteFeeCategory.d.ts
@@ -0,0 +1,3 @@
+import type { RequestHandler } from "express";
+export declare const handler: RequestHandler;
+export default handler;
diff --git a/handlers/admin-post/doDeleteFeeCategory.js b/handlers/admin-post/doDeleteFeeCategory.js
new file mode 100644
index 00000000..65e6ed94
--- /dev/null
+++ b/handlers/admin-post/doDeleteFeeCategory.js
@@ -0,0 +1,13 @@
+import { deleteFeeCategory } from "../../helpers/lotOccupancyDB/deleteFeeCategory.js";
+import { getFeeCategories } from "../../helpers/lotOccupancyDB/getFeeCategories.js";
+export const handler = async (request, response) => {
+    const success = deleteFeeCategory(request.body.feeCategoryId, request.session);
+    const feeCategories = getFeeCategories({}, {
+        includeFees: true
+    });
+    response.json({
+        success,
+        feeCategories
+    });
+};
+export default handler;
diff --git a/handlers/admin-post/doDeleteFeeCategory.ts b/handlers/admin-post/doDeleteFeeCategory.ts
new file mode 100644
index 00000000..e82af450
--- /dev/null
+++ b/handlers/admin-post/doDeleteFeeCategory.ts
@@ -0,0 +1,30 @@
+import type {
+    RequestHandler
+} from "express";
+
+import {
+    deleteFeeCategory
+} from "../../helpers/lotOccupancyDB/deleteFeeCategory.js";
+
+import {
+    getFeeCategories
+} from "../../helpers/lotOccupancyDB/getFeeCategories.js";
+
+
+
+export const handler: RequestHandler = async (request, response) => {
+
+    const success = deleteFeeCategory(request.body.feeCategoryId, request.session);
+
+    const feeCategories = getFeeCategories({}, {
+        includeFees: true
+    });
+
+    response.json({
+        success,
+        feeCategories
+    });
+};
+
+
+export default handler;
\ No newline at end of file
diff --git a/handlers/admin-post/doUpdateFee.d.ts b/handlers/admin-post/doUpdateFee.d.ts
new file mode 100644
index 00000000..9621c611
--- /dev/null
+++ b/handlers/admin-post/doUpdateFee.d.ts
@@ -0,0 +1,3 @@
+import type { RequestHandler } from "express";
+export declare const handler: RequestHandler;
+export default handler;
diff --git a/handlers/admin-post/doUpdateFee.js b/handlers/admin-post/doUpdateFee.js
new file mode 100644
index 00000000..8bc3ca6f
--- /dev/null
+++ b/handlers/admin-post/doUpdateFee.js
@@ -0,0 +1,13 @@
+import { updateFee } from "../../helpers/lotOccupancyDB/updateFee.js";
+import { getFeeCategories } from "../../helpers/lotOccupancyDB/getFeeCategories.js";
+export const handler = async (request, response) => {
+    const success = updateFee(request.body, request.session);
+    const feeCategories = getFeeCategories({}, {
+        includeFees: true
+    });
+    response.json({
+        success,
+        feeCategories
+    });
+};
+export default handler;
diff --git a/handlers/admin-post/doUpdateFee.ts b/handlers/admin-post/doUpdateFee.ts
new file mode 100644
index 00000000..a91bbb1e
--- /dev/null
+++ b/handlers/admin-post/doUpdateFee.ts
@@ -0,0 +1,30 @@
+import type {
+    RequestHandler
+} from "express";
+
+import {
+    updateFee
+} from "../../helpers/lotOccupancyDB/updateFee.js";
+
+import {
+    getFeeCategories
+} from "../../helpers/lotOccupancyDB/getFeeCategories.js";
+
+
+
+export const handler: RequestHandler = async (request, response) => {
+
+    const success = updateFee(request.body, request.session);
+
+    const feeCategories = getFeeCategories({}, {
+        includeFees: true
+    });
+
+    response.json({
+        success,
+        feeCategories
+    });
+};
+
+
+export default handler;
\ No newline at end of file
diff --git a/helpers/lotOccupancyDB/addFee.d.ts b/helpers/lotOccupancyDB/addFee.d.ts
new file mode 100644
index 00000000..937be70a
--- /dev/null
+++ b/helpers/lotOccupancyDB/addFee.d.ts
@@ -0,0 +1,18 @@
+import type * as recordTypes from "../../types/recordTypes";
+interface AddFeeForm {
+    feeCategoryId: string;
+    feeName: string;
+    feeDescription: string;
+    occupancyTypeId?: string;
+    lotTypeId?: string;
+    feeAmount?: string;
+    feeFunction?: string;
+    taxAmount?: string;
+    taxPercentage?: string;
+    includeQuantity: "" | "1";
+    quantityUnit?: string;
+    isRequired: "" | "1";
+    orderNumber?: number;
+}
+export declare const addFee: (feeForm: AddFeeForm, requestSession: recordTypes.PartialSession) => number;
+export default addFee;
diff --git a/helpers/lotOccupancyDB/addFee.js b/helpers/lotOccupancyDB/addFee.js
new file mode 100644
index 00000000..f0d96923
--- /dev/null
+++ b/helpers/lotOccupancyDB/addFee.js
@@ -0,0 +1,21 @@
+import sqlite from "better-sqlite3";
+import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
+export const addFee = (feeForm, requestSession) => {
+    const database = sqlite(databasePath);
+    const rightNowMillis = Date.now();
+    const result = database
+        .prepare("insert into Fees (" +
+        "feeCategoryId, feeName, feeDescription," +
+        " occupancyTypeId, lotTypeId," +
+        " feeAmount, feeFunction," +
+        " taxAmount, taxPercentage," +
+        " includeQuantity, quantityUnit," +
+        " isRequired, orderNumber," +
+        " recordCreate_userName, recordCreate_timeMillis," +
+        " recordUpdate_userName, recordUpdate_timeMillis)" +
+        " values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)")
+        .run(feeForm.feeCategoryId, feeForm.feeName, feeForm.feeDescription, (feeForm.occupancyTypeId || undefined), (feeForm.lotTypeId || undefined), (feeForm.feeAmount || undefined), (feeForm.feeFunction || undefined), (feeForm.taxAmount || undefined), (feeForm.taxPercentage || undefined), (feeForm.includeQuantity ? 1 : 0), feeForm.quantityUnit, (feeForm.isRequired ? 1 : 0), (feeForm.orderNumber || 0), requestSession.user.userName, rightNowMillis, requestSession.user.userName, rightNowMillis);
+    database.close();
+    return result.lastInsertRowid;
+};
+export default addFee;
diff --git a/helpers/lotOccupancyDB/addFee.ts b/helpers/lotOccupancyDB/addFee.ts
new file mode 100644
index 00000000..4d8d7454
--- /dev/null
+++ b/helpers/lotOccupancyDB/addFee.ts
@@ -0,0 +1,66 @@
+import sqlite from "better-sqlite3";
+import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
+
+import type * as recordTypes from "../../types/recordTypes";
+
+
+interface AddFeeForm {
+    feeCategoryId: string;
+    feeName: string;
+    feeDescription: string;
+    occupancyTypeId?: string;
+    lotTypeId?: string;
+    feeAmount?: string;
+    feeFunction?: string;
+    taxAmount?: string;
+    taxPercentage?: string;
+    includeQuantity: "" | "1";
+    quantityUnit?: string;
+    isRequired: "" | "1";
+    orderNumber?: number;
+}
+
+
+export const addFee =
+    (feeForm: AddFeeForm, requestSession: recordTypes.PartialSession): number => {
+
+        const database = sqlite(databasePath);
+
+        const rightNowMillis = Date.now();
+
+        const result = database
+            .prepare("insert into Fees (" +
+                "feeCategoryId, feeName, feeDescription," +
+                " occupancyTypeId, lotTypeId," +
+                " feeAmount, feeFunction," +
+                " taxAmount, taxPercentage," +
+                " includeQuantity, quantityUnit," +
+                " isRequired, orderNumber," +
+                " recordCreate_userName, recordCreate_timeMillis," +
+                " recordUpdate_userName, recordUpdate_timeMillis)" +
+                " values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)")
+            .run(feeForm.feeCategoryId,
+                feeForm.feeName,
+                feeForm.feeDescription,
+                (feeForm.occupancyTypeId || undefined),
+                (feeForm.lotTypeId || undefined),
+                (feeForm.feeAmount || undefined),
+                (feeForm.feeFunction || undefined),
+                (feeForm.taxAmount || undefined),
+                (feeForm.taxPercentage || undefined),
+                (feeForm.includeQuantity ? 1 : 0),
+                feeForm.quantityUnit,
+                (feeForm.isRequired ? 1 : 0),
+                (feeForm.orderNumber || 0),
+                requestSession.user.userName,
+                rightNowMillis,
+                requestSession.user.userName,
+                rightNowMillis);
+
+        database.close();
+
+        return result.lastInsertRowid as number;
+    };
+
+
+export default addFee;
\ No newline at end of file
diff --git a/helpers/lotOccupancyDB/deleteFee.d.ts b/helpers/lotOccupancyDB/deleteFee.d.ts
new file mode 100644
index 00000000..48bcdd3b
--- /dev/null
+++ b/helpers/lotOccupancyDB/deleteFee.d.ts
@@ -0,0 +1,3 @@
+import type * as recordTypes from "../../types/recordTypes";
+export declare const deleteFee: (feeId: number | string, requestSession: recordTypes.PartialSession) => boolean;
+export default deleteFee;
diff --git a/helpers/lotOccupancyDB/deleteFee.js b/helpers/lotOccupancyDB/deleteFee.js
new file mode 100644
index 00000000..763e0591
--- /dev/null
+++ b/helpers/lotOccupancyDB/deleteFee.js
@@ -0,0 +1,15 @@
+import sqlite from "better-sqlite3";
+import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
+export const deleteFee = (feeId, requestSession) => {
+    const database = sqlite(databasePath);
+    const rightNowMillis = Date.now();
+    const result = database
+        .prepare("update Fees" +
+        " set recordDelete_userName = ?," +
+        " recordDelete_timeMillis = ?" +
+        " where feeId = ?")
+        .run(requestSession.user.userName, rightNowMillis, feeId);
+    database.close();
+    return (result.changes > 0);
+};
+export default deleteFee;
diff --git a/helpers/lotOccupancyDB/deleteFee.ts b/helpers/lotOccupancyDB/deleteFee.ts
new file mode 100644
index 00000000..ee7a9cc5
--- /dev/null
+++ b/helpers/lotOccupancyDB/deleteFee.ts
@@ -0,0 +1,33 @@
+import sqlite from "better-sqlite3";
+
+import {
+    lotOccupancyDB as databasePath
+} from "../../data/databasePaths.js";
+
+import type * as recordTypes from "../../types/recordTypes";
+
+
+export const deleteFee =
+    (feeId: number | string,
+        requestSession: recordTypes.PartialSession): boolean => {
+
+        const database = sqlite(databasePath);
+
+        const rightNowMillis = Date.now();
+
+        const result = database
+            .prepare("update Fees" +
+                " set recordDelete_userName = ?," +
+                " recordDelete_timeMillis = ?" +
+                " where feeId = ?")
+            .run(requestSession.user.userName,
+                rightNowMillis,
+                feeId);
+
+        database.close();
+
+        return (result.changes > 0);
+    };
+
+
+export default deleteFee;
\ No newline at end of file
diff --git a/helpers/lotOccupancyDB/deleteFeeCategory.d.ts b/helpers/lotOccupancyDB/deleteFeeCategory.d.ts
new file mode 100644
index 00000000..f5536fb1
--- /dev/null
+++ b/helpers/lotOccupancyDB/deleteFeeCategory.d.ts
@@ -0,0 +1,3 @@
+import type * as recordTypes from "../../types/recordTypes";
+export declare const deleteFeeCategory: (feeCategoryId: number | string, requestSession: recordTypes.PartialSession) => boolean;
+export default deleteFeeCategory;
diff --git a/helpers/lotOccupancyDB/deleteFeeCategory.js b/helpers/lotOccupancyDB/deleteFeeCategory.js
new file mode 100644
index 00000000..93cae785
--- /dev/null
+++ b/helpers/lotOccupancyDB/deleteFeeCategory.js
@@ -0,0 +1,15 @@
+import sqlite from "better-sqlite3";
+import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
+export const deleteFeeCategory = (feeCategoryId, requestSession) => {
+    const database = sqlite(databasePath);
+    const rightNowMillis = Date.now();
+    const result = database
+        .prepare("update FeeCategories" +
+        " set recordDelete_userName = ?," +
+        " recordDelete_timeMillis = ?" +
+        " where feeCategoryId = ?")
+        .run(requestSession.user.userName, rightNowMillis, feeCategoryId);
+    database.close();
+    return (result.changes > 0);
+};
+export default deleteFeeCategory;
diff --git a/helpers/lotOccupancyDB/deleteFeeCategory.ts b/helpers/lotOccupancyDB/deleteFeeCategory.ts
new file mode 100644
index 00000000..19820265
--- /dev/null
+++ b/helpers/lotOccupancyDB/deleteFeeCategory.ts
@@ -0,0 +1,33 @@
+import sqlite from "better-sqlite3";
+
+import {
+    lotOccupancyDB as databasePath
+} from "../../data/databasePaths.js";
+
+import type * as recordTypes from "../../types/recordTypes";
+
+
+export const deleteFeeCategory =
+    (feeCategoryId: number | string,
+        requestSession: recordTypes.PartialSession): boolean => {
+
+        const database = sqlite(databasePath);
+
+        const rightNowMillis = Date.now();
+
+        const result = database
+            .prepare("update FeeCategories" +
+                " set recordDelete_userName = ?," +
+                " recordDelete_timeMillis = ?" +
+                " where feeCategoryId = ?")
+            .run(requestSession.user.userName,
+                rightNowMillis,
+                feeCategoryId);
+
+        database.close();
+
+        return (result.changes > 0);
+    };
+
+
+export default deleteFeeCategory;
\ No newline at end of file
diff --git a/helpers/lotOccupancyDB/getFeeCategories.js b/helpers/lotOccupancyDB/getFeeCategories.js
index 263eedab..b14a965d 100644
--- a/helpers/lotOccupancyDB/getFeeCategories.js
+++ b/helpers/lotOccupancyDB/getFeeCategories.js
@@ -26,26 +26,30 @@ export const getFeeCategories = (filters, options) => {
         " order by orderNumber, feeCategory")
         .all(sqlParameters);
     if (options.includeFees) {
-        sql = "select feeId, feeName, feeDescription," +
-            " occupancyTypeId, lotTypeId," +
-            " feeAmount, feeFunction, taxAmount, taxPercentage," +
-            " isRequired" +
-            " from Fees" +
-            " where recordDelete_timeMillis is null" +
-            " and feeCategoryId = ?";
-        sqlParameters = [];
         for (const feeCategory of feeCategories) {
+            sql = "select f.feeId, f.feeName, f.feeDescription," +
+                " f.occupancyTypeId, o.occupancyType," +
+                " f.lotTypeId, l.lotType," +
+                " f.feeAmount, f.feeFunction, f.taxAmount, f.taxPercentage," +
+                " f.includeQuantity, f.quantityUnit," +
+                " f.isRequired" +
+                " from Fees f" +
+                " left join OccupancyTypes o on f.occupancyTypeId = o.occupancyTypeId" +
+                " left join LotTypes l on f.lotTypeId = l.lotTypeId" +
+                " where f.recordDelete_timeMillis is null" +
+                " and f.feeCategoryId = ?";
+            sqlParameters = [];
             sqlParameters.push(feeCategory.feeCategoryId);
             if (filters.occupancyTypeId) {
-                sql += " and (occupancyTypeId is null or occupancyTypeId = ?)";
+                sql += " and (f.occupancyTypeId is null or f.occupancyTypeId = ?)";
                 sqlParameters.push(filters.occupancyTypeId);
             }
             if (filters.lotTypeId) {
-                sql += " and (lotTypeId is null or lotTypeId = ?)";
+                sql += " and (f.lotTypeId is null or f.lotTypeId = ?)";
                 sqlParameters.push(filters.lotTypeId);
             }
             feeCategory.fees = database.prepare(sql +
-                " order by orderNumber, feeName")
+                " order by f.orderNumber, f.feeName")
                 .all(sqlParameters);
         }
     }
diff --git a/helpers/lotOccupancyDB/getFeeCategories.ts b/helpers/lotOccupancyDB/getFeeCategories.ts
index f707501c..8bc66666 100644
--- a/helpers/lotOccupancyDB/getFeeCategories.ts
+++ b/helpers/lotOccupancyDB/getFeeCategories.ts
@@ -52,35 +52,39 @@ export const getFeeCategories = (filters ? : GetFeeCategoriesFilters, options ?
         .all(sqlParameters);
 
     if (options.includeFees) {
-
-        sql = "select feeId, feeName, feeDescription," +
-            " occupancyTypeId, lotTypeId," +
-            " feeAmount, feeFunction, taxAmount, taxPercentage," +
-            " isRequired" +
-            " from Fees" +
-            " where recordDelete_timeMillis is null" +
-            " and feeCategoryId = ?";
-
-        sqlParameters = [];
-
+        
         for (const feeCategory of feeCategories) {
 
+            sql = "select f.feeId, f.feeName, f.feeDescription," +
+                " f.occupancyTypeId, o.occupancyType," +
+                " f.lotTypeId, l.lotType," +
+                " f.feeAmount, f.feeFunction, f.taxAmount, f.taxPercentage," +
+                " f.includeQuantity, f.quantityUnit," +
+                " f.isRequired" +
+                " from Fees f" +
+                " left join OccupancyTypes o on f.occupancyTypeId = o.occupancyTypeId" +
+                " left join LotTypes l on f.lotTypeId = l.lotTypeId" +
+                " where f.recordDelete_timeMillis is null" +
+                " and f.feeCategoryId = ?";
+    
+            sqlParameters = [];
+
             sqlParameters.push(feeCategory.feeCategoryId);
 
             if (filters.occupancyTypeId) {
-                sql += " and (occupancyTypeId is null or occupancyTypeId = ?)";
+                sql += " and (f.occupancyTypeId is null or f.occupancyTypeId = ?)";
 
                 sqlParameters.push(filters.occupancyTypeId);
             }
 
             if (filters.lotTypeId) {
-                sql += " and (lotTypeId is null or lotTypeId = ?)";
+                sql += " and (f.lotTypeId is null or f.lotTypeId = ?)";
 
                 sqlParameters.push(filters.lotTypeId);
             }
 
             feeCategory.fees = database.prepare(sql +
-                    " order by orderNumber, feeName")
+                    " order by f.orderNumber, f.feeName")
                 .all(sqlParameters);
         }
     }
diff --git a/helpers/lotOccupancyDB/updateFee.d.ts b/helpers/lotOccupancyDB/updateFee.d.ts
new file mode 100644
index 00000000..a9b58165
--- /dev/null
+++ b/helpers/lotOccupancyDB/updateFee.d.ts
@@ -0,0 +1,18 @@
+import type * as recordTypes from "../../types/recordTypes";
+interface UpdateFeeForm {
+    feeId: string;
+    feeCategoryId: string;
+    feeName: string;
+    feeDescription: string;
+    occupancyTypeId?: string;
+    lotTypeId?: string;
+    feeAmount?: string;
+    feeFunction?: string;
+    taxAmount?: string;
+    taxPercentage?: string;
+    includeQuantity: "" | "1";
+    quantityUnit?: string;
+    isRequired: "" | "1";
+}
+export declare const updateFee: (feeForm: UpdateFeeForm, requestSession: recordTypes.PartialSession) => boolean;
+export default updateFee;
diff --git a/helpers/lotOccupancyDB/updateFee.js b/helpers/lotOccupancyDB/updateFee.js
new file mode 100644
index 00000000..b9ada7cb
--- /dev/null
+++ b/helpers/lotOccupancyDB/updateFee.js
@@ -0,0 +1,28 @@
+import sqlite from "better-sqlite3";
+import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
+export const updateFee = (feeForm, requestSession) => {
+    const database = sqlite(databasePath);
+    const rightNowMillis = Date.now();
+    const result = database
+        .prepare("update Fees" +
+        " set feeCategoryId = ?," +
+        " feeName = ?," +
+        " feeDescription = ?," +
+        " occupancyTypeId = ?," +
+        " lotTypeId = ?," +
+        " feeAmount = ?," +
+        " feeFunction = ?," +
+        " taxAmount = ?," +
+        " taxPercentage = ?," +
+        " includeQuantity = ?," +
+        " quantityUnit = ?," +
+        " isRequired = ?," +
+        " recordUpdate_userName = ?," +
+        " recordUpdate_timeMillis = ?" +
+        " where recordDelete_timeMillis is null" +
+        " and feeId = ?")
+        .run(feeForm.feeCategoryId, feeForm.feeName, feeForm.feeDescription, (feeForm.occupancyTypeId || undefined), (feeForm.lotTypeId || undefined), (feeForm.feeAmount || undefined), (feeForm.feeFunction || undefined), (feeForm.taxAmount || undefined), (feeForm.taxPercentage || undefined), (feeForm.includeQuantity ? 1 : 0), feeForm.quantityUnit, (feeForm.isRequired ? 1 : 0), requestSession.user.userName, rightNowMillis, feeForm.feeId);
+    database.close();
+    return result.changes > 0;
+};
+export default updateFee;
diff --git a/helpers/lotOccupancyDB/updateFee.ts b/helpers/lotOccupancyDB/updateFee.ts
new file mode 100644
index 00000000..3f40f0c0
--- /dev/null
+++ b/helpers/lotOccupancyDB/updateFee.ts
@@ -0,0 +1,71 @@
+import sqlite from "better-sqlite3";
+import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
+
+import type * as recordTypes from "../../types/recordTypes";
+
+
+interface UpdateFeeForm {
+    feeId: string;
+    feeCategoryId: string;
+    feeName: string;
+    feeDescription: string;
+    occupancyTypeId?: string;
+    lotTypeId?: string;
+    feeAmount?: string;
+    feeFunction?: string;
+    taxAmount?: string;
+    taxPercentage?: string;
+    includeQuantity: "" | "1";
+    quantityUnit?: string;
+    isRequired: "" | "1";
+}
+
+
+export const updateFee =
+    (feeForm: UpdateFeeForm, requestSession: recordTypes.PartialSession): boolean => {
+
+        const database = sqlite(databasePath);
+
+        const rightNowMillis = Date.now();
+
+        const result = database
+            .prepare("update Fees" +
+                " set feeCategoryId = ?," +
+                " feeName = ?," +
+                " feeDescription = ?," +
+                " occupancyTypeId = ?," +
+                " lotTypeId = ?," +
+                " feeAmount = ?," +
+                " feeFunction = ?," +
+                " taxAmount = ?," +
+                " taxPercentage = ?," +
+                " includeQuantity = ?," +
+                " quantityUnit = ?," +
+                " isRequired = ?," +
+                " recordUpdate_userName = ?," +
+                " recordUpdate_timeMillis = ?" +
+                " where recordDelete_timeMillis is null" +
+                " and feeId = ?")
+            .run(feeForm.feeCategoryId,
+                feeForm.feeName,
+                feeForm.feeDescription,
+                (feeForm.occupancyTypeId || undefined),
+                (feeForm.lotTypeId || undefined),
+                (feeForm.feeAmount || undefined),
+                (feeForm.feeFunction || undefined),
+                (feeForm.taxAmount || undefined),
+                (feeForm.taxPercentage || undefined),
+                (feeForm.includeQuantity ? 1 : 0),
+                feeForm.quantityUnit,
+                (feeForm.isRequired ? 1 : 0),
+                requestSession.user.userName,
+                rightNowMillis,
+                feeForm.feeId);
+
+        database.close();
+
+        return result.changes > 0;
+    };
+
+
+export default updateFee;
\ No newline at end of file
diff --git a/public-typescript/adminFees.js b/public-typescript/adminFees.js
index 6a794668..1c3253d3 100644
--- a/public-typescript/adminFees.js
+++ b/public-typescript/adminFees.js
@@ -5,6 +5,150 @@ Object.defineProperty(exports, "__esModule", { value: true });
     const urlPrefix = document.querySelector("main").dataset.urlPrefix;
     const feeCategoriesContainerElement = document.querySelector("#container--feeCategories");
     let feeCategories = exports.feeCategories;
+    const renderFeeCategories = () => {
+        if (feeCategories.length === 0) {
+            feeCategoriesContainerElement.innerHTML = "<div class=\"message is-warning\">" +
+                "<p class=\"message-body\">There are no available fees.</p>" +
+                "</div>";
+            return;
+        }
+        feeCategoriesContainerElement.innerHTML = "";
+        for (const feeCategory of feeCategories) {
+            const feeCategoryContainerElement = document.createElement("section");
+            feeCategoryContainerElement.className = "container--feeCategory mb-5";
+            feeCategoryContainerElement.dataset.feeCategoryId = feeCategory.feeCategoryId.toString();
+            feeCategoryContainerElement.insertAdjacentHTML("beforeend", "<div class=\"level is-mobile\">" +
+                ("<div class=\"level-left\">" +
+                    "<div class=\"level-item\">" +
+                    "<h2 class=\"title is-4\">" + cityssm.escapeHTML(feeCategory.feeCategory) + "</h2>" +
+                    "</div>" +
+                    "</div>") +
+                ("<div class=\"level-right\">" +
+                    (feeCategory.fees.length === 0 ?
+                        "<div class=\"level-item\">" +
+                            "<button class=\"button is-small is-danger button--deleteFeeCategory\" type=\"button\">" +
+                            "<span class=\"icon is-small\"><i class=\"fas fa-trash\" aria-hidden=\"true\"></i></span>" +
+                            "<span>Delete Category</span>" +
+                            "</button>" +
+                            "</div>" :
+                        "") +
+                    "<div class=\"level-item\">" +
+                    "<button class=\"button is-small is-primary button--editFeeCategory\" type=\"button\">" +
+                    "<span class=\"icon is-small\"><i class=\"fas fa-pencil-alt\" aria-hidden=\"true\"></i></span>" +
+                    "<span>Edit Category</span>" +
+                    "</button>" +
+                    "</div>" +
+                    "<div class=\"level-item\">" +
+                    "<button class=\"button is-small is-success button--addFee\" type=\"button\">" +
+                    "<span class=\"icon is-small\"><i class=\"fas fa-plus\" aria-hidden=\"true\"></i></span>" +
+                    "<span>Add Fee</span>" +
+                    "</button>" +
+                    "</div>" +
+                    "</div>") +
+                "</div>");
+            if (feeCategory.fees.length === 0) {
+                feeCategoryContainerElement.insertAdjacentHTML("beforeend", "<div class=\"message is-info\">" +
+                    "<p class=\"message-body\">There are no fees in the \"" + cityssm.escapeHTML(feeCategory.feeCategory) + "\" category.</p>" +
+                    "</div>");
+            }
+            else {
+                const panelElement = document.createElement("div");
+                panelElement.className = "panel";
+                for (const fee of feeCategory.fees) {
+                    const panelBlockElement = document.createElement("a");
+                    panelBlockElement.className = "panel-block is-block container--fee";
+                    panelBlockElement.dataset.feeId = fee.feeId.toString();
+                    panelBlockElement.innerHTML = "<div class=\"columns\">" +
+                        ("<div class=\"column is-half\">" +
+                            "<p>" +
+                            "<strong>" + cityssm.escapeHTML(fee.feeName) + "</strong><br />" +
+                            "<small>" + cityssm.escapeHTML(fee.feeDescription).replace(/\n/g, "<br />") + "</small>" +
+                            "</p>" +
+                            "<p class=\"tags\">" +
+                            (fee.isRequired ?
+                                "<span class=\"tag is-warning\">Required</span>" :
+                                "") +
+                            (fee.occupancyTypeId ?
+                                " <span class=\"tag has-tooltip-bottom\" data-tooltip=\"" + cityssm.escapeHTML(exports.aliases.occupancy) + " Type Filter\">" +
+                                    cityssm.escapeHTML(fee.occupancyType) + "</span>" :
+                                "") +
+                            (fee.lotTypeId ?
+                                " <span class=\"tag has-tooltip-bottom\" data-tooltip=\"" + cityssm.escapeHTML(exports.aliases.lot) + " Type Filter\">" +
+                                    cityssm.escapeHTML(fee.lotType) + "</span>" :
+                                "") +
+                            "</p>" +
+                            "</div>") +
+                        ("<div class=\"column has-text-centered\">" +
+                            (fee.feeFunction ?
+                                cityssm.escapeHTML(fee.feeFunction) + "<br />" +
+                                    "<small>Fee Function</small>" :
+                                "$" + fee.feeAmount.toFixed(2) + "<br />" +
+                                    "<small>Fee</small>") +
+                            "</div>") +
+                        ("<div class=\"column has-text-centered\">" +
+                            (fee.taxPercentage ?
+                                fee.taxPercentage + "%" :
+                                "$" + fee.taxAmount.toFixed(2)) +
+                            "<br /><small>Tax</small>" +
+                            "</div>") +
+                        ("<div class=\"column has-text-centered\">" +
+                            (fee.includeQuantity ?
+                                cityssm.escapeHTML(fee.quantityUnit) + "<br />" +
+                                    "<small>Quantity</small>" :
+                                "") +
+                            "</div>") +
+                        "</div>";
+                    panelBlockElement.addEventListener("click", openEditFee);
+                    panelElement.append(panelBlockElement);
+                }
+                feeCategoryContainerElement.append(panelElement);
+            }
+            feeCategoriesContainerElement.append(feeCategoryContainerElement);
+        }
+        const deleteCategoryButtonElements = feeCategoriesContainerElement.querySelectorAll(".button--deleteFeeCategory");
+        for (const deleteCategoryButtonElement of deleteCategoryButtonElements) {
+            deleteCategoryButtonElement.addEventListener("click", confirmDeleteFeeCategory);
+        }
+        const editCategoryButtonElements = feeCategoriesContainerElement.querySelectorAll(".button--editFeeCategory");
+        for (const editCategoryButtonElement of editCategoryButtonElements) {
+            editCategoryButtonElement.addEventListener("click", openEditFeeCategory);
+        }
+        const addFeeButtonElements = feeCategoriesContainerElement.querySelectorAll(".button--addFee");
+        for (const addFeeButtonElement of addFeeButtonElements) {
+            addFeeButtonElement.addEventListener("click", openAddFee);
+        }
+    };
+    document.querySelector("#button--addFeeCategory").addEventListener("click", () => {
+        let addCloseModalFunction;
+        const doAddFeeCategory = (submitEvent) => {
+            submitEvent.preventDefault();
+            cityssm.postJSON(urlPrefix + "/admin/doAddFeeCategory", submitEvent.currentTarget, (responseJSON) => {
+                if (responseJSON.success) {
+                    feeCategories = responseJSON.feeCategories;
+                    addCloseModalFunction();
+                    renderFeeCategories();
+                }
+                else {
+                    bulmaJS.alert({
+                        title: "Error Creating Fee Category",
+                        message: responseJSON.errorMessage,
+                        contextualColorName: "danger"
+                    });
+                }
+            });
+        };
+        cityssm.openHtmlModal("adminFees-addFeeCategory", {
+            onshown: (modalElement, closeModalFunction) => {
+                bulmaJS.toggleHtmlClipped();
+                modalElement.querySelector("#feeCategoryAdd--feeCategory").focus();
+                addCloseModalFunction = closeModalFunction;
+                modalElement.querySelector("form").addEventListener("submit", doAddFeeCategory);
+            },
+            onremoved: () => {
+                bulmaJS.toggleHtmlClipped();
+            }
+        });
+    });
     const openEditFeeCategory = (clickEvent) => {
         const feeCategoryId = Number.parseInt(clickEvent.currentTarget.closest(".container--feeCategory").dataset.feeCategoryId, 10);
         const feeCategory = feeCategories.find((currentFeeCategory) => {
@@ -43,11 +187,54 @@ Object.defineProperty(exports, "__esModule", { value: true });
             }
         });
     };
+    const confirmDeleteFeeCategory = (clickEvent) => {
+        const feeCategoryId = Number.parseInt(clickEvent.currentTarget.closest(".container--feeCategory").dataset.feeCategoryId, 10);
+        const doDelete = () => {
+            cityssm.postJSON(urlPrefix + "/admin/doDeleteFeeCategory", {
+                feeCategoryId
+            }, (responseJSON) => {
+                if (responseJSON.success) {
+                    feeCategories = responseJSON.feeCategories;
+                    renderFeeCategories();
+                }
+                else {
+                    bulmaJS.alert({
+                        title: "Error Updating Fee Category",
+                        message: responseJSON.errorMessage,
+                        contextualColorName: "danger"
+                    });
+                }
+            });
+        };
+        bulmaJS.confirm({
+            title: "Delete Fee Category?",
+            message: "Are you sure you want to delete this fee category?",
+            contextualColorName: "warning",
+            okButton: {
+                text: "Yes, Delete the Fee Category",
+                callbackFunction: doDelete
+            }
+        });
+    };
     const openAddFee = (clickEvent) => {
         const feeCategoryId = Number.parseInt(clickEvent.currentTarget.closest(".container--feeCategory").dataset.feeCategoryId, 10);
         let addCloseModalFunction;
         const doAddFee = (submitEvent) => {
             submitEvent.preventDefault();
+            cityssm.postJSON(urlPrefix + "/admin/doAddFee", submitEvent.currentTarget, (responseJSON) => {
+                if (responseJSON.success) {
+                    feeCategories = responseJSON.feeCategories;
+                    addCloseModalFunction();
+                    renderFeeCategories();
+                }
+                else {
+                    bulmaJS.alert({
+                        title: "Error Adding Fee",
+                        message: responseJSON.errorMessage,
+                        contextualColorName: "danger"
+                    });
+                }
+            });
         };
         cityssm.openHtmlModal("adminFees-addFee", {
             onshow: (modalElement) => {
@@ -75,102 +262,209 @@ Object.defineProperty(exports, "__esModule", { value: true });
                     optionElement.textContent = lotType.lotType;
                     lotTypeElement.append(optionElement);
                 }
+                modalElement.querySelector("#feeAdd--taxPercentage").value = exports.taxPercentageDefault.toString();
                 los.populateAliases(modalElement);
             },
             onshown: (modalElement, closeModalFunction) => {
                 bulmaJS.toggleHtmlClipped();
                 addCloseModalFunction = closeModalFunction;
                 modalElement.querySelector("form").addEventListener("submit", doAddFee);
+                modalElement.querySelector("#feeAdd--feeFunction").addEventListener("change", () => {
+                    const feeAmountElement = modalElement.querySelector("#feeAdd--feeAmount");
+                    const feeFunctionElement = modalElement.querySelector("#feeAdd--feeFunction");
+                    if (feeFunctionElement.value === "") {
+                        feeFunctionElement.closest(".select").classList.remove("is-success");
+                        feeAmountElement.classList.add("is-success");
+                        feeAmountElement.disabled = false;
+                    }
+                    else {
+                        feeFunctionElement.closest(".select").classList.add("is-success");
+                        feeAmountElement.classList.remove("is-success");
+                        feeAmountElement.disabled = true;
+                    }
+                });
+                modalElement.querySelector("#feeAdd--taxPercentage").addEventListener("keyup", () => {
+                    const taxAmountElement = modalElement.querySelector("#feeAdd--taxAmount");
+                    const taxPercentageElement = modalElement.querySelector("#feeAdd--taxPercentage");
+                    if (taxPercentageElement.value === "") {
+                        taxPercentageElement.classList.remove("is-success");
+                        taxAmountElement.classList.add("is-success");
+                        taxAmountElement.disabled = false;
+                    }
+                    else {
+                        taxPercentageElement.classList.add("is-success");
+                        taxAmountElement.classList.remove("is-success");
+                        taxAmountElement.disabled = true;
+                    }
+                });
+                modalElement.querySelector("#feeAdd--includeQuantity").addEventListener("change", () => {
+                    modalElement.querySelector("#feeAdd--quantityUnit").disabled =
+                        modalElement.querySelector("#feeAdd--includeQuantity").value === "";
+                });
             },
             onremoved: () => {
                 bulmaJS.toggleHtmlClipped();
             }
         });
     };
-    const renderFeeCategories = () => {
-        if (feeCategories.length === 0) {
-            feeCategoriesContainerElement.innerHTML = "<div class=\"message is-warning\">" +
-                "<p class=\"message-body\">There are no available fees.</p>" +
-                "</div>";
-            return;
-        }
-        feeCategoriesContainerElement.innerHTML = "";
-        for (const feeCategory of feeCategories) {
-            const feeCategoryContainerElement = document.createElement("section");
-            feeCategoryContainerElement.className = "container--feeCategory";
-            feeCategoryContainerElement.dataset.feeCategoryId = feeCategory.feeCategoryId.toString();
-            feeCategoryContainerElement.insertAdjacentHTML("beforeend", "<div class=\"level is-mobile\">" +
-                ("<div class=\"level-left\">" +
-                    "<div class=\"level-item\">" +
-                    "<h2 class=\"title is-4\">" + cityssm.escapeHTML(feeCategory.feeCategory) + "</h2>" +
-                    "</div>" +
-                    "</div>") +
-                ("<div class=\"level-right\">" +
-                    "<div class=\"level-item\">" +
-                    "<button class=\"button is-small is-primary button--editFeeCategory\" type=\"button\">" +
-                    "<span class=\"icon is-small\"><i class=\"fas fa-pencil-alt\" aria-hidden=\"true\"></i></span>" +
-                    "<span>Edit Category</span>" +
-                    "</button>" +
-                    "</div>" +
-                    "<div class=\"level-item\">" +
-                    "<button class=\"button is-small is-success button--addFee\" type=\"button\">" +
-                    "<span class=\"icon is-small\"><i class=\"fas fa-plus\" aria-hidden=\"true\"></i></span>" +
-                    "<span>Add Fee</span>" +
-                    "</button>" +
-                    "</div>" +
-                    "</div>") +
-                "</div>");
-            if (feeCategory.fees.length === 0) {
-                feeCategoryContainerElement.insertAdjacentHTML("beforeend", "<div class=\"message is-info\">" +
-                    "<p class=\"message-body\">There are no fees in the \"" + cityssm.escapeHTML(feeCategory.feeCategory) + "\" category.</p>" +
-                    "</div>");
-            }
-            else {
-                const panelElement = document.createElement("div");
-                panelElement.className = "panel";
-                feeCategoryContainerElement.append(panelElement);
-            }
-            feeCategoriesContainerElement.append(feeCategoryContainerElement);
-        }
-        const editCategoryButtonElements = feeCategoriesContainerElement.querySelectorAll(".button--editFeeCategory");
-        for (const editCategoryButtonElement of editCategoryButtonElements) {
-            editCategoryButtonElement.addEventListener("click", openEditFeeCategory);
-        }
-        const addFeeButtonElements = feeCategoriesContainerElement.querySelectorAll(".button--addFee");
-        for (const addFeeButtonElement of addFeeButtonElements) {
-            addFeeButtonElement.addEventListener("click", openAddFee);
-        }
-    };
-    renderFeeCategories();
-    document.querySelector("#button--addFeeCategory").addEventListener("click", () => {
-        let addCloseModalFunction;
-        const doAddFeeCategory = (submitEvent) => {
+    const openEditFee = (clickEvent) => {
+        clickEvent.preventDefault();
+        const feeId = Number.parseInt(clickEvent.currentTarget.dataset.feeId, 10);
+        const feeCategoryId = Number.parseInt(clickEvent.currentTarget.closest(".container--feeCategory").dataset.feeCategoryId);
+        const feeCategory = feeCategories.find((currentFeeCategory) => {
+            return currentFeeCategory.feeCategoryId === feeCategoryId;
+        });
+        const fee = feeCategory.fees.find((currentFee) => {
+            return currentFee.feeId === feeId;
+        });
+        let editCloseModalFunction;
+        let editModalElement;
+        const doUpdateFee = (submitEvent) => {
             submitEvent.preventDefault();
-            cityssm.postJSON(urlPrefix + "/admin/doAddFeeCategory", submitEvent.currentTarget, (responseJSON) => {
+            cityssm.postJSON(urlPrefix + "/admin/doUpdateFee", submitEvent.currentTarget, (responseJSON) => {
                 if (responseJSON.success) {
                     feeCategories = responseJSON.feeCategories;
-                    addCloseModalFunction();
+                    editCloseModalFunction();
                     renderFeeCategories();
                 }
                 else {
                     bulmaJS.alert({
-                        title: "Error Creating Fee Category",
+                        title: "Error Updating Fee",
                         message: responseJSON.errorMessage,
                         contextualColorName: "danger"
                     });
                 }
             });
         };
-        cityssm.openHtmlModal("adminFees-addFeeCategory", {
+        const confirmDeleteFee = (clickEvent) => {
+            clickEvent.preventDefault();
+            const doDelete = () => {
+                cityssm.postJSON(urlPrefix + "/admin/doDeleteFee", {
+                    feeId
+                }, (responseJSON) => {
+                    if (responseJSON.success) {
+                        feeCategories = responseJSON.feeCategories;
+                        editCloseModalFunction();
+                        renderFeeCategories();
+                    }
+                    else {
+                        bulmaJS.alert({
+                            title: "Error Deleting Fee",
+                            message: responseJSON.errorMessage,
+                            contextualColorName: "danger"
+                        });
+                    }
+                });
+            };
+            bulmaJS.confirm({
+                title: "Delete Fee?",
+                message: "Are you sure you want to delete this fee?",
+                contextualColorName: "warning",
+                okButton: {
+                    text: "Yes, Delete the Fee",
+                    callbackFunction: doDelete
+                }
+            });
+        };
+        const toggleFeeFields = () => {
+            const feeAmountElement = editModalElement.querySelector("#feeEdit--feeAmount");
+            const feeFunctionElement = editModalElement.querySelector("#feeEdit--feeFunction");
+            if (feeFunctionElement.value === "") {
+                feeFunctionElement.closest(".select").classList.remove("is-success");
+                feeAmountElement.classList.add("is-success");
+                feeAmountElement.disabled = false;
+            }
+            else {
+                feeFunctionElement.closest(".select").classList.add("is-success");
+                feeAmountElement.classList.remove("is-success");
+                feeAmountElement.disabled = true;
+            }
+        };
+        const toggleTaxFields = () => {
+            const taxAmountElement = editModalElement.querySelector("#feeEdit--taxAmount");
+            const taxPercentageElement = editModalElement.querySelector("#feeEdit--taxPercentage");
+            if (taxPercentageElement.value === "") {
+                taxPercentageElement.classList.remove("is-success");
+                taxAmountElement.classList.add("is-success");
+                taxAmountElement.disabled = false;
+            }
+            else {
+                taxPercentageElement.classList.add("is-success");
+                taxAmountElement.classList.remove("is-success");
+                taxAmountElement.disabled = true;
+            }
+        };
+        const toggleQuantityFields = () => {
+            editModalElement.querySelector("#feeEdit--quantityUnit").disabled =
+                editModalElement.querySelector("#feeEdit--includeQuantity").value === "";
+        };
+        cityssm.openHtmlModal("adminFees-editFee", {
+            onshow: (modalElement) => {
+                editModalElement = modalElement;
+                modalElement.querySelector("#feeEdit--feeId").value = fee.feeId.toString();
+                const feeCategoryElement = modalElement.querySelector("#feeEdit--feeCategoryId");
+                for (const feeCategory of feeCategories) {
+                    const optionElement = document.createElement("option");
+                    optionElement.value = feeCategory.feeCategoryId.toString();
+                    optionElement.textContent = feeCategory.feeCategory;
+                    if (feeCategory.feeCategoryId === feeCategoryId) {
+                        optionElement.selected = true;
+                    }
+                    feeCategoryElement.append(optionElement);
+                }
+                modalElement.querySelector("#feeEdit--feeName").value = fee.feeName;
+                modalElement.querySelector("#feeEdit--feeDescription").value = fee.feeDescription;
+                const occupancyTypeElement = modalElement.querySelector("#feeEdit--occupancyTypeId");
+                for (const occupancyType of exports.occupancyTypes) {
+                    const optionElement = document.createElement("option");
+                    optionElement.value = occupancyType.occupancyTypeId.toString();
+                    optionElement.textContent = occupancyType.occupancyType;
+                    if (occupancyType.occupancyTypeId === fee.occupancyTypeId) {
+                        optionElement.selected = true;
+                    }
+                    occupancyTypeElement.append(optionElement);
+                }
+                const lotTypeElement = modalElement.querySelector("#feeEdit--lotTypeId");
+                for (const lotType of exports.lotTypes) {
+                    const optionElement = document.createElement("option");
+                    optionElement.value = lotType.lotTypeId.toString();
+                    optionElement.textContent = lotType.lotType;
+                    if (lotType.lotTypeId === fee.lotTypeId) {
+                        optionElement.selected = true;
+                    }
+                    lotTypeElement.append(optionElement);
+                }
+                modalElement.querySelector("#feeEdit--feeAmount").value = fee.feeAmount ? fee.feeAmount.toFixed(2) : "";
+                modalElement.querySelector("#feeEdit--feeFunction").addEventListener("change", toggleFeeFields);
+                toggleFeeFields();
+                modalElement.querySelector("#feeEdit--taxAmount").value = fee.taxAmount ? fee.taxAmount.toFixed(2) : "";
+                const taxPercentageElement = modalElement.querySelector("#feeEdit--taxPercentage");
+                taxPercentageElement.value = fee.taxPercentage ? fee.taxPercentage.toString() : "";
+                taxPercentageElement.addEventListener("keyup", toggleTaxFields);
+                toggleTaxFields();
+                const includeQuantityElement = modalElement.querySelector("#feeEdit--includeQuantity");
+                if (fee.includeQuantity) {
+                    includeQuantityElement.value = "1";
+                }
+                includeQuantityElement.addEventListener("change", toggleQuantityFields);
+                modalElement.querySelector("#feeEdit--quantityUnit").value = fee.quantityUnit || "";
+                toggleQuantityFields();
+                if (fee.isRequired) {
+                    modalElement.querySelector("#feeEdit--isRequired").value = "1";
+                }
+                los.populateAliases(modalElement);
+            },
             onshown: (modalElement, closeModalFunction) => {
                 bulmaJS.toggleHtmlClipped();
-                modalElement.querySelector("#feeCategoryAdd--feeCategory").focus();
-                addCloseModalFunction = closeModalFunction;
-                modalElement.querySelector("form").addEventListener("submit", doAddFeeCategory);
+                editCloseModalFunction = closeModalFunction;
+                modalElement.querySelector("form").addEventListener("submit", doUpdateFee);
+                bulmaJS.init(modalElement);
+                modalElement.querySelector(".button--deleteFee").addEventListener("click", confirmDeleteFee);
             },
             onremoved: () => {
                 bulmaJS.toggleHtmlClipped();
             }
         });
-    });
+    };
+    renderFeeCategories();
 })();
diff --git a/public-typescript/adminFees.ts b/public-typescript/adminFees.ts
index e4260d41..96b93940 100644
--- a/public-typescript/adminFees.ts
+++ b/public-typescript/adminFees.ts
@@ -24,6 +24,189 @@ declare const bulmaJS: BulmaJS;
 
     let feeCategories: recordTypes.FeeCategory[] = exports.feeCategories;
 
+    const renderFeeCategories = () => {
+
+        if (feeCategories.length === 0) {
+            feeCategoriesContainerElement.innerHTML = "<div class=\"message is-warning\">" +
+                "<p class=\"message-body\">There are no available fees.</p>" +
+                "</div>";
+
+            return;
+        }
+
+        feeCategoriesContainerElement.innerHTML = "";
+
+        for (const feeCategory of feeCategories) {
+
+            const feeCategoryContainerElement = document.createElement("section");
+            feeCategoryContainerElement.className = "container--feeCategory mb-5";
+            feeCategoryContainerElement.dataset.feeCategoryId = feeCategory.feeCategoryId.toString();
+
+            feeCategoryContainerElement.insertAdjacentHTML("beforeend",
+                "<div class=\"level is-mobile\">" +
+                ("<div class=\"level-left\">" +
+                    "<div class=\"level-item\">" +
+                    "<h2 class=\"title is-4\">" + cityssm.escapeHTML(feeCategory.feeCategory) + "</h2>" +
+                    "</div>" +
+                    "</div>") +
+                ("<div class=\"level-right\">" +
+                    (feeCategory.fees.length === 0 ?
+                        "<div class=\"level-item\">" +
+                        "<button class=\"button is-small is-danger button--deleteFeeCategory\" type=\"button\">" +
+                        "<span class=\"icon is-small\"><i class=\"fas fa-trash\" aria-hidden=\"true\"></i></span>" +
+                        "<span>Delete Category</span>" +
+                        "</button>" +
+                        "</div>" :
+                        "") +
+                    "<div class=\"level-item\">" +
+                    "<button class=\"button is-small is-primary button--editFeeCategory\" type=\"button\">" +
+                    "<span class=\"icon is-small\"><i class=\"fas fa-pencil-alt\" aria-hidden=\"true\"></i></span>" +
+                    "<span>Edit Category</span>" +
+                    "</button>" +
+                    "</div>" +
+                    "<div class=\"level-item\">" +
+                    "<button class=\"button is-small is-success button--addFee\" type=\"button\">" +
+                    "<span class=\"icon is-small\"><i class=\"fas fa-plus\" aria-hidden=\"true\"></i></span>" +
+                    "<span>Add Fee</span>" +
+                    "</button>" +
+                    "</div>" +
+                    "</div>") +
+                "</div>");
+
+            if (feeCategory.fees.length === 0) {
+                feeCategoryContainerElement.insertAdjacentHTML("beforeend",
+                    "<div class=\"message is-info\">" +
+                    "<p class=\"message-body\">There are no fees in the \"" + cityssm.escapeHTML(feeCategory.feeCategory) + "\" category.</p>" +
+                    "</div>");
+            } else {
+
+                const panelElement = document.createElement("div");
+                panelElement.className = "panel";
+
+                for (const fee of feeCategory.fees) {
+
+                    const panelBlockElement = document.createElement("a");
+                    panelBlockElement.className = "panel-block is-block container--fee";
+                    panelBlockElement.dataset.feeId = fee.feeId.toString();
+
+                    panelBlockElement.innerHTML = "<div class=\"columns\">" +
+                        ("<div class=\"column is-half\">" +
+                            "<p>" +
+                            "<strong>" + cityssm.escapeHTML(fee.feeName) + "</strong><br />" +
+                            "<small>" + cityssm.escapeHTML(fee.feeDescription).replace(/\n/g, "<br />") + "</small>" +
+                            "</p>" +
+                            "<p class=\"tags\">" +
+                            (fee.isRequired ?
+                                "<span class=\"tag is-warning\">Required</span>" :
+                                "") +
+                            (fee.occupancyTypeId ?
+                                " <span class=\"tag has-tooltip-bottom\" data-tooltip=\"" + cityssm.escapeHTML(exports.aliases.occupancy) + " Type Filter\">" +
+                                cityssm.escapeHTML(fee.occupancyType) + "</span>" :
+                                "") +
+                            (fee.lotTypeId ?
+                                " <span class=\"tag has-tooltip-bottom\" data-tooltip=\"" + cityssm.escapeHTML(exports.aliases.lot) + " Type Filter\">" +
+                                cityssm.escapeHTML(fee.lotType) + "</span>" :
+                                "") +
+                            "</p>" +
+                            "</div>") +
+                        ("<div class=\"column has-text-centered\">" +
+                            (fee.feeFunction ?
+                                cityssm.escapeHTML(fee.feeFunction) + "<br />" +
+                                "<small>Fee Function</small>" :
+                                "$" + fee.feeAmount.toFixed(2) + "<br />" +
+                                "<small>Fee</small>") +
+                            "</div>") +
+                        ("<div class=\"column has-text-centered\">" +
+                            (fee.taxPercentage ?
+                                fee.taxPercentage + "%" :
+                                "$" + fee.taxAmount.toFixed(2)) +
+                            "<br /><small>Tax</small>" +
+                            "</div>") +
+                        ("<div class=\"column has-text-centered\">" +
+                            (fee.includeQuantity ?
+                                cityssm.escapeHTML(fee.quantityUnit) + "<br />" +
+                                "<small>Quantity</small>" :
+                                "") +
+                            "</div>") +
+                        "</div>";
+
+                    panelBlockElement.addEventListener("click", openEditFee);
+
+                    panelElement.append(panelBlockElement);
+                }
+
+                feeCategoryContainerElement.append(panelElement);
+            }
+
+            feeCategoriesContainerElement.append(feeCategoryContainerElement);
+        }
+
+        const deleteCategoryButtonElements = feeCategoriesContainerElement.querySelectorAll(".button--deleteFeeCategory");
+
+        for (const deleteCategoryButtonElement of deleteCategoryButtonElements) {
+            deleteCategoryButtonElement.addEventListener("click", confirmDeleteFeeCategory);
+        }
+
+        const editCategoryButtonElements = feeCategoriesContainerElement.querySelectorAll(".button--editFeeCategory");
+
+        for (const editCategoryButtonElement of editCategoryButtonElements) {
+            editCategoryButtonElement.addEventListener("click", openEditFeeCategory);
+        }
+
+        const addFeeButtonElements = feeCategoriesContainerElement.querySelectorAll(".button--addFee");
+
+        for (const addFeeButtonElement of addFeeButtonElements) {
+            addFeeButtonElement.addEventListener("click", openAddFee);
+        }
+    };
+
+
+    /*
+     * Fee Categories
+     */
+
+    document.querySelector("#button--addFeeCategory").addEventListener("click", () => {
+
+        let addCloseModalFunction: () => void;
+
+        const doAddFeeCategory = (submitEvent: SubmitEvent) => {
+            submitEvent.preventDefault();
+
+            cityssm.postJSON(urlPrefix + "/admin/doAddFeeCategory",
+                submitEvent.currentTarget,
+                (responseJSON: {
+                    success: boolean;errorMessage ? : string;feeCategories: recordTypes.FeeCategory[];
+                }) => {
+
+                    if (responseJSON.success) {
+                        feeCategories = responseJSON.feeCategories;
+                        addCloseModalFunction();
+                        renderFeeCategories();
+                    } else {
+                        bulmaJS.alert({
+                            title: "Error Creating Fee Category",
+                            message: responseJSON.errorMessage,
+                            contextualColorName: "danger"
+                        });
+                    }
+                });
+        };
+
+        cityssm.openHtmlModal("adminFees-addFeeCategory", {
+
+            onshown: (modalElement, closeModalFunction) => {
+                bulmaJS.toggleHtmlClipped();
+                (modalElement.querySelector("#feeCategoryAdd--feeCategory") as HTMLInputElement).focus();
+
+                addCloseModalFunction = closeModalFunction;
+                modalElement.querySelector("form").addEventListener("submit", doAddFeeCategory);
+            },
+            onremoved: () => {
+                bulmaJS.toggleHtmlClipped();
+            }
+        });
+    });
+
     const openEditFeeCategory = (clickEvent: Event) => {
 
         const feeCategoryId = Number.parseInt(((clickEvent.currentTarget as HTMLElement).closest(".container--feeCategory") as HTMLElement).dataset.feeCategoryId, 10);
@@ -77,6 +260,45 @@ declare const bulmaJS: BulmaJS;
         });
     };
 
+    const confirmDeleteFeeCategory = (clickEvent: Event) => {
+
+        const feeCategoryId = Number.parseInt(((clickEvent.currentTarget as HTMLElement).closest(".container--feeCategory") as HTMLElement).dataset.feeCategoryId, 10);
+
+        const doDelete = () => {
+
+            cityssm.postJSON(urlPrefix + "/admin/doDeleteFeeCategory", {
+                feeCategoryId
+            },
+            (responseJSON: {success: boolean; errorMessage?: string; feeCategories?: recordTypes.FeeCategory[];}) => {
+
+                if (responseJSON.success) {
+                    feeCategories = responseJSON.feeCategories;
+                    renderFeeCategories();
+                } else {
+                    bulmaJS.alert({
+                        title: "Error Updating Fee Category",
+                        message: responseJSON.errorMessage,
+                        contextualColorName: "danger"
+                    });
+                }
+            });
+        };
+
+        bulmaJS.confirm({
+            title: "Delete Fee Category?",
+            message: "Are you sure you want to delete this fee category?",
+            contextualColorName: "warning",
+            okButton: {
+                text: "Yes, Delete the Fee Category",
+                callbackFunction: doDelete
+            }
+        })
+    };
+
+    /*
+     * Fees
+     */
+
     const openAddFee = (clickEvent: Event) => {
 
         const feeCategoryId = Number.parseInt(((clickEvent.currentTarget as HTMLElement).closest(".container--feeCategory") as HTMLElement).dataset.feeCategoryId, 10);
@@ -85,6 +307,25 @@ declare const bulmaJS: BulmaJS;
 
         const doAddFee = (submitEvent: SubmitEvent) => {
             submitEvent.preventDefault();
+
+            cityssm.postJSON(urlPrefix + "/admin/doAddFee",
+                submitEvent.currentTarget,
+                (responseJSON: {
+                    success: boolean;errorMessage ? : string;feeCategories: recordTypes.FeeCategory[];
+                }) => {
+
+                    if (responseJSON.success) {
+                        feeCategories = responseJSON.feeCategories;
+                        addCloseModalFunction();
+                        renderFeeCategories();
+                    } else {
+                        bulmaJS.alert({
+                            title: "Error Adding Fee",
+                            message: responseJSON.errorMessage,
+                            contextualColorName: "danger"
+                        });
+                    }
+                });
         };
 
         cityssm.openHtmlModal("adminFees-addFee", {
@@ -125,14 +366,61 @@ declare const bulmaJS: BulmaJS;
                     lotTypeElement.append(optionElement);
                 }
 
+                (modalElement.querySelector("#feeAdd--taxPercentage") as HTMLInputElement).value = (exports.taxPercentageDefault as number).toString();
+
                 los.populateAliases(modalElement);
             },
             onshown: (modalElement, closeModalFunction) => {
 
                 bulmaJS.toggleHtmlClipped();
+
                 addCloseModalFunction = closeModalFunction;
 
                 modalElement.querySelector("form").addEventListener("submit", doAddFee);
+
+                modalElement.querySelector("#feeAdd--feeFunction").addEventListener("change", () => {
+
+                    const feeAmountElement = modalElement.querySelector("#feeAdd--feeAmount") as HTMLInputElement;
+                    const feeFunctionElement = modalElement.querySelector("#feeAdd--feeFunction") as HTMLSelectElement;
+
+                    if (feeFunctionElement.value === "") {
+                        feeFunctionElement.closest(".select").classList.remove("is-success");
+
+                        feeAmountElement.classList.add("is-success");
+                        feeAmountElement.disabled = false;
+
+                    } else {
+                        feeFunctionElement.closest(".select").classList.add("is-success");
+
+                        feeAmountElement.classList.remove("is-success");
+                        feeAmountElement.disabled = true;
+                    }
+                });
+
+                modalElement.querySelector("#feeAdd--taxPercentage").addEventListener("keyup", () => {
+
+                    const taxAmountElement = modalElement.querySelector("#feeAdd--taxAmount") as HTMLInputElement;
+                    const taxPercentageElement = modalElement.querySelector("#feeAdd--taxPercentage") as HTMLInputElement;
+
+                    if (taxPercentageElement.value === "") {
+                        taxPercentageElement.classList.remove("is-success");
+
+                        taxAmountElement.classList.add("is-success");
+                        taxAmountElement.disabled = false;
+
+                    } else {
+                        taxPercentageElement.classList.add("is-success");
+
+                        taxAmountElement.classList.remove("is-success");
+                        taxAmountElement.disabled = true;
+                    }
+                });
+
+                modalElement.querySelector("#feeAdd--includeQuantity").addEventListener("change", () => {
+
+                    (modalElement.querySelector("#feeAdd--quantityUnit") as HTMLInputElement).disabled =
+                        (modalElement.querySelector("#feeAdd--includeQuantity") as HTMLSelectElement).value === "";
+                });
             },
             onremoved: () => {
                 bulmaJS.toggleHtmlClipped();
@@ -140,102 +428,41 @@ declare const bulmaJS: BulmaJS;
         });
     };
 
-    const renderFeeCategories = () => {
+    const openEditFee = (clickEvent: Event) => {
+        clickEvent.preventDefault();
 
-        if (feeCategories.length === 0) {
-            feeCategoriesContainerElement.innerHTML = "<div class=\"message is-warning\">" +
-                "<p class=\"message-body\">There are no available fees.</p>" +
-                "</div>";
+        const feeId = Number.parseInt((clickEvent.currentTarget as HTMLElement).dataset.feeId, 10);
+        const feeCategoryId = Number.parseInt(((clickEvent.currentTarget as HTMLElement).closest(".container--feeCategory") as HTMLElement).dataset.feeCategoryId);
 
-            return;
-        }
+        const feeCategory = feeCategories.find((currentFeeCategory) => {
+            return currentFeeCategory.feeCategoryId === feeCategoryId;
+        });
 
-        feeCategoriesContainerElement.innerHTML = "";
+        const fee = feeCategory.fees.find((currentFee) => {
+            return currentFee.feeId === feeId;
+        });
 
-        for (const feeCategory of feeCategories) {
+        let editCloseModalFunction: () => void;
+        let editModalElement: HTMLElement;
 
-            const feeCategoryContainerElement = document.createElement("section");
-            feeCategoryContainerElement.className = "container--feeCategory";
-            feeCategoryContainerElement.dataset.feeCategoryId = feeCategory.feeCategoryId.toString();
-
-            feeCategoryContainerElement.insertAdjacentHTML("beforeend",
-                "<div class=\"level is-mobile\">" +
-                ("<div class=\"level-left\">" +
-                    "<div class=\"level-item\">" +
-                    "<h2 class=\"title is-4\">" + cityssm.escapeHTML(feeCategory.feeCategory) + "</h2>" +
-                    "</div>" +
-                    "</div>") +
-                ("<div class=\"level-right\">" +
-                    "<div class=\"level-item\">" +
-                    "<button class=\"button is-small is-primary button--editFeeCategory\" type=\"button\">" +
-                    "<span class=\"icon is-small\"><i class=\"fas fa-pencil-alt\" aria-hidden=\"true\"></i></span>" +
-                    "<span>Edit Category</span>" +
-                    "</button>" +
-                    "</div>" +
-                    "<div class=\"level-item\">" +
-                    "<button class=\"button is-small is-success button--addFee\" type=\"button\">" +
-                    "<span class=\"icon is-small\"><i class=\"fas fa-plus\" aria-hidden=\"true\"></i></span>" +
-                    "<span>Add Fee</span>" +
-                    "</button>" +
-                    "</div>" +
-                    "</div>") +
-                "</div>");
-
-            if (feeCategory.fees.length === 0) {
-                feeCategoryContainerElement.insertAdjacentHTML("beforeend",
-                    "<div class=\"message is-info\">" +
-                    "<p class=\"message-body\">There are no fees in the \"" + cityssm.escapeHTML(feeCategory.feeCategory) + "\" category.</p>" +
-                    "</div>");
-            } else {
-
-                const panelElement = document.createElement("div");
-                panelElement.className = "panel";
-
-                feeCategoryContainerElement.append(panelElement);
-            }
-
-            feeCategoriesContainerElement.append(feeCategoryContainerElement);
-        }
-
-        const editCategoryButtonElements = feeCategoriesContainerElement.querySelectorAll(".button--editFeeCategory");
-
-        for (const editCategoryButtonElement of editCategoryButtonElements) {
-            editCategoryButtonElement.addEventListener("click", openEditFeeCategory);
-        }
-        
-        const addFeeButtonElements = feeCategoriesContainerElement.querySelectorAll(".button--addFee");
-
-        for (const addFeeButtonElement of addFeeButtonElements) {
-            addFeeButtonElement.addEventListener("click", openAddFee);
-        }
-    };
-
-    renderFeeCategories();
-
-    /*
-     * Fee Categories
-     */
-
-    document.querySelector("#button--addFeeCategory").addEventListener("click", () => {
-
-        let addCloseModalFunction: () => void;
-
-        const doAddFeeCategory = (submitEvent: SubmitEvent) => {
+        const doUpdateFee = (submitEvent: SubmitEvent) => {
             submitEvent.preventDefault();
 
-            cityssm.postJSON(urlPrefix + "/admin/doAddFeeCategory",
+            cityssm.postJSON(urlPrefix + "/admin/doUpdateFee",
                 submitEvent.currentTarget,
                 (responseJSON: {
-                    success: boolean;errorMessage ? : string;feeCategories: recordTypes.FeeCategory[];
+                    success: boolean;
+                    errorMessage ? : string;
+                    feeCategories ? : recordTypes.FeeCategory[];
                 }) => {
 
                     if (responseJSON.success) {
                         feeCategories = responseJSON.feeCategories;
-                        addCloseModalFunction();
+                        editCloseModalFunction();
                         renderFeeCategories();
                     } else {
                         bulmaJS.alert({
-                            title: "Error Creating Fee Category",
+                            title: "Error Updating Fee",
                             message: responseJSON.errorMessage,
                             contextualColorName: "danger"
                         });
@@ -243,18 +470,196 @@ declare const bulmaJS: BulmaJS;
                 });
         };
 
-        cityssm.openHtmlModal("adminFees-addFeeCategory", {
+        const confirmDeleteFee = (clickEvent: Event) => {
+            clickEvent.preventDefault();
 
+            const doDelete = () => {
+
+                cityssm.postJSON(urlPrefix + "/admin/doDeleteFee", {
+                        feeId
+                    },
+                    (responseJSON: {
+                        success: boolean;
+                        errorMessage ? : string;
+                        feeCategories ? : recordTypes.FeeCategory[];
+                    }) => {
+
+                        if (responseJSON.success) {
+                            feeCategories = responseJSON.feeCategories;
+                            editCloseModalFunction();
+                            renderFeeCategories();
+                        } else {
+                            bulmaJS.alert({
+                                title: "Error Deleting Fee",
+                                message: responseJSON.errorMessage,
+                                contextualColorName: "danger"
+                            });
+                        }
+                    });
+            };
+
+            bulmaJS.confirm({
+                title: "Delete Fee?",
+                message: "Are you sure you want to delete this fee?",
+                contextualColorName: "warning",
+                okButton: {
+                    text: "Yes, Delete the Fee",
+                    callbackFunction: doDelete
+                }
+            });
+        };
+
+        const toggleFeeFields = () => {
+
+            const feeAmountElement = editModalElement.querySelector("#feeEdit--feeAmount") as HTMLInputElement;
+            const feeFunctionElement = editModalElement.querySelector("#feeEdit--feeFunction") as HTMLSelectElement;
+
+            if (feeFunctionElement.value === "") {
+                feeFunctionElement.closest(".select").classList.remove("is-success");
+
+                feeAmountElement.classList.add("is-success");
+                feeAmountElement.disabled = false;
+
+            } else {
+                feeFunctionElement.closest(".select").classList.add("is-success");
+
+                feeAmountElement.classList.remove("is-success");
+                feeAmountElement.disabled = true;
+            }
+        };
+
+        const toggleTaxFields = () => {
+
+            const taxAmountElement = editModalElement.querySelector("#feeEdit--taxAmount") as HTMLInputElement;
+            const taxPercentageElement = editModalElement.querySelector("#feeEdit--taxPercentage") as HTMLInputElement;
+
+            if (taxPercentageElement.value === "") {
+                taxPercentageElement.classList.remove("is-success");
+
+                taxAmountElement.classList.add("is-success");
+                taxAmountElement.disabled = false;
+
+            } else {
+                taxPercentageElement.classList.add("is-success");
+
+                taxAmountElement.classList.remove("is-success");
+                taxAmountElement.disabled = true;
+            }
+        };
+
+        const toggleQuantityFields = () => {
+
+            (editModalElement.querySelector("#feeEdit--quantityUnit") as HTMLInputElement).disabled =
+                (editModalElement.querySelector("#feeEdit--includeQuantity") as HTMLSelectElement).value === "";
+        };
+
+        cityssm.openHtmlModal("adminFees-editFee", {
+            onshow: (modalElement) => {
+
+                editModalElement = modalElement;
+
+                (modalElement.querySelector("#feeEdit--feeId") as HTMLInputElement).value = fee.feeId.toString();
+
+                const feeCategoryElement = modalElement.querySelector("#feeEdit--feeCategoryId") as HTMLSelectElement;
+
+                for (const feeCategory of feeCategories) {
+
+                    const optionElement = document.createElement("option");
+                    optionElement.value = feeCategory.feeCategoryId.toString();
+                    optionElement.textContent = feeCategory.feeCategory;
+
+                    if (feeCategory.feeCategoryId === feeCategoryId) {
+                        optionElement.selected = true;
+                    }
+
+                    feeCategoryElement.append(optionElement);
+                }
+
+                (modalElement.querySelector("#feeEdit--feeName") as HTMLInputElement).value = fee.feeName;
+                (modalElement.querySelector("#feeEdit--feeDescription") as HTMLTextAreaElement).value = fee.feeDescription;
+
+                const occupancyTypeElement = modalElement.querySelector("#feeEdit--occupancyTypeId") as HTMLSelectElement;
+
+                for (const occupancyType of exports.occupancyTypes as recordTypes.OccupancyType[]) {
+
+                    const optionElement = document.createElement("option");
+                    optionElement.value = occupancyType.occupancyTypeId.toString();
+                    optionElement.textContent = occupancyType.occupancyType;
+
+                    if (occupancyType.occupancyTypeId === fee.occupancyTypeId) {
+                        optionElement.selected = true;
+                    }
+
+                    occupancyTypeElement.append(optionElement);
+                }
+
+                const lotTypeElement = modalElement.querySelector("#feeEdit--lotTypeId") as HTMLSelectElement;
+
+                for (const lotType of exports.lotTypes as recordTypes.LotType[]) {
+
+                    const optionElement = document.createElement("option");
+                    optionElement.value = lotType.lotTypeId.toString();
+                    optionElement.textContent = lotType.lotType;
+
+                    if (lotType.lotTypeId === fee.lotTypeId) {
+                        optionElement.selected = true;
+                    }
+
+                    lotTypeElement.append(optionElement);
+                }
+
+                (modalElement.querySelector("#feeEdit--feeAmount") as HTMLInputElement).value = fee.feeAmount ? fee.feeAmount.toFixed(2) : "";
+                modalElement.querySelector("#feeEdit--feeFunction").addEventListener("change", toggleFeeFields);
+
+                toggleFeeFields();
+
+                (modalElement.querySelector("#feeEdit--taxAmount") as HTMLInputElement).value = fee.taxAmount ? fee.taxAmount.toFixed(2) : "";
+
+                const taxPercentageElement = modalElement.querySelector("#feeEdit--taxPercentage") as HTMLInputElement;
+                taxPercentageElement.value = fee.taxPercentage ? fee.taxPercentage.toString() : "";
+                taxPercentageElement.addEventListener("keyup", toggleTaxFields);
+
+                toggleTaxFields();
+
+                const includeQuantityElement = modalElement.querySelector("#feeEdit--includeQuantity") as HTMLSelectElement;
+
+                if (fee.includeQuantity) {
+                    includeQuantityElement.value = "1";
+                }
+
+                includeQuantityElement.addEventListener("change", toggleQuantityFields);
+
+                (modalElement.querySelector("#feeEdit--quantityUnit") as HTMLInputElement).value = fee.quantityUnit || "";
+
+                toggleQuantityFields();
+
+                if (fee.isRequired) {
+                    (modalElement.querySelector("#feeEdit--isRequired") as HTMLSelectElement).value = "1";
+                }
+
+                los.populateAliases(modalElement);
+            },
             onshown: (modalElement, closeModalFunction) => {
-                bulmaJS.toggleHtmlClipped();
-                (modalElement.querySelector("#feeCategoryAdd--feeCategory") as HTMLInputElement).focus();
 
-                addCloseModalFunction = closeModalFunction;
-                modalElement.querySelector("form").addEventListener("submit", doAddFeeCategory);
+                bulmaJS.toggleHtmlClipped();
+
+                editCloseModalFunction = closeModalFunction;
+
+                modalElement.querySelector("form").addEventListener("submit", doUpdateFee);
+
+                bulmaJS.init(modalElement);
+
+                modalElement.querySelector(".button--deleteFee").addEventListener("click", confirmDeleteFee);
             },
             onremoved: () => {
                 bulmaJS.toggleHtmlClipped();
             }
         });
-    });
+    };
+
+    /*
+     * Initialize
+     */
+
+    renderFeeCategories();
 })();
\ No newline at end of file
diff --git a/public/html/adminFees-addFee.html b/public/html/adminFees-addFee.html
index a3ef9bfe..9fcd269f 100644
--- a/public/html/adminFees-addFee.html
+++ b/public/html/adminFees-addFee.html
@@ -18,7 +18,7 @@
                     </div>
                 </div>
                 <div class="field">
-                    <label class="label" for="feeAdd--feeName">Fee</label>
+                    <label class="label" for="feeAdd--feeName">Fee Name</label>
                     <div class="control">
                         <input class="input" id="feeAdd--feeName" name="feeName" maxlength="100" required />
                     </div>
@@ -29,6 +29,16 @@
                         <textarea class="textarea" id="feeAdd--feeDescription" name="feeDescription"></textarea>
                     </div>
                 </div>
+                <div class="message is-info is-small">
+                    <p class="message-body">
+                        Filters can be used to show or hide available filters depending on the
+                        <span class="alias" data-alias="occupancy"></span> type and
+                        <span class="alias" data-alias="lot"></span> type selected
+                        when creating the
+                        <span class="alias" data-alias="lot"></span> <span class="alias" data-alias="occupancy"></span>
+                        record.
+                    </p>
+                </div>
                 <div class="columns">
                     <div class="column">
                         <div class="field">
@@ -55,12 +65,20 @@
                         </div>
                     </div>
                 </div>
+                <div class="message is-info is-small">
+                    <p class="message-body">
+                        Fees can be simply flat amounts,
+                        or calculated by functions defined by the application administrator.
+                        Note that if both an amount and a function are set,
+                        <strong>the function will be used.</strong>
+                    </p>
+                </div>
                 <div class="columns">
                     <div class="column">
                         <div class="field">
                             <label class="label" for="feeAdd--feeAmount">Fee Amount</label>
                             <div class="control has-icons-left">
-                                <input class="input has-text-right" id="feeAdd--feeAmount" name="feeAmount" type="number" step="0.01" min="0" max="9999.99" value="0" onwheel="return false" />
+                                <input class="input has-text-right is-success" id="feeAdd--feeAmount" name="feeAmount" type="number" step="0.01" min="0" max="9999.99" value="0" onwheel="return false" />
                                 <span class="icon is-small is-left">
                                     <i class="fas fa-dollar-sign" aria-hidden="true"></i>
                                 </span>
@@ -72,18 +90,29 @@
                             <label class="label" for="feeAdd--feeFunction">Fee Function</label>
                             <div class="control">
                                 <div class="select is-fullwidth">
-                                    <select id="feeAdd--feeFunction" name="feeFunction"></select>
+                                    <select id="feeAdd--feeFunction" name="feeFunction">
+                                        <option value="">(No Function Selected)</option>
+                                        <option value="t">test</option>
+                                    </select>
                                 </div>
                             </div>
                         </div>
                     </div>
                 </div>
+                <div class="message is-info is-small">
+                    <p class="message-body">
+                        Taxes can be defined as flat amounts,
+                        or as percentages of the fee amount.
+                        Note that if both an amount and a percentage are set,
+                        <strong>the percentage will be used.</strong>
+                    </p>
+                </div>
                 <div class="columns">
                     <div class="column">
                         <div class="field">
                             <label class="label" for="feeAdd--taxAmount">Tax Amount</label>
                             <div class="control has-icons-left">
-                                <input class="input has-text-right" id="feeAdd--taxAmount" name="taxAmount" type="number" step="0.01" min="0" max="9999.99" onwheel="return false" />
+                                <input class="input has-text-right" id="feeAdd--taxAmount" name="taxAmount" type="number" step="0.01" min="0" max="9999.99" onwheel="return false" disabled />
                                 <span class="icon is-small is-left">
                                     <i class="fas fa-dollar-sign" aria-hidden="true"></i>
                                 </span>
@@ -94,7 +123,7 @@
                         <div class="field">
                             <label class="label" for="feeAdd--taxPercentage">Tax Percentage</label>
                             <div class="control has-icons-right">
-                                <input class="input has-text-right" id="feeAdd--taxPercentage" name="taxPercentage" type="number" step="0.01" min="0" max="100" value="0" onwheel="return false" />
+                                <input class="input has-text-right is-success" id="feeAdd--taxPercentage" name="taxPercentage" type="number" step="0.01" min="0" max="100" value="0" onwheel="return false" />
                                 <span class="icon is-small is-right">
                                     <i class="fas fa-percent" aria-hidden="true"></i>
                                 </span>
@@ -102,6 +131,40 @@
                         </div>
                     </div>
                 </div>
+                <div class="columns">
+                    <div class="column">
+                        <div class="field">
+                            <label class="label" for="feeAdd--includeQuantity">Include Quantity</label>
+                            <div class="control">
+                                <div class="select is-fullwidth">
+                                    <select id="feeAdd--includeQuantity" name="includeQuantity">
+                                        <option value="" selected>No Quantity</option>
+                                        <option value="1">Quantity Available</option>
+                                    </select>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="column">
+                        <div class="field">
+                            <label class="label" for="feeAdd--quantityUnit">Quantity Unit</label>
+                            <div class="control">
+                                <input class="input" id="feeAdd--quantityUnit" name="quantityUnit" maxlength="30" disabled required />
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="field">
+                    <label class="label" for="feeAdd--isRequired">Fee Is Required</label>
+                    <div class="control">
+                        <div class="select is-fullwidth">
+                            <select id="feeAdd--isRequired" name="isRequired">
+                                <option value="" selected>No, Fee is Optional</option>
+                                <option value="1">Yes, Fee is Required</option>
+                            </select>
+                        </div>
+                    </div>
+                </div>
             </form>
         </section>
         <footer class="modal-card-foot justify-right">
diff --git a/public/html/adminFees-editFee.html b/public/html/adminFees-editFee.html
new file mode 100644
index 00000000..18683c36
--- /dev/null
+++ b/public/html/adminFees-editFee.html
@@ -0,0 +1,196 @@
+<div class="modal">
+    <div class="modal-background"></div>
+    <div class="modal-card" style="width:900px">
+        <header class="modal-card-head">
+            <h3 class="modal-card-title">
+                Update Fee
+            </h3>
+            <button class="delete is-close-modal-button" aria-label="close" type="button"></button>
+        </header>
+        <section class="modal-card-body">
+            <form id="form--feeEdit">
+                <input id="feeEdit--feeId" name="feeId" type="hidden" />
+                <div class="field">
+                    <label class="label" for="feeEdit--feeCategoryId">Fee Category</label>
+                    <div class="control">
+                        <div class="select is-fullwidth">
+                            <select id="feeEdit--feeCategoryId" name="feeCategoryId" required></select>
+                        </div>
+                    </div>
+                </div>
+                <div class="field">
+                    <label class="label" for="feeEdit--feeName">Fee Name</label>
+                    <div class="control">
+                        <input class="input" id="feeEdit--feeName" name="feeName" maxlength="100" required />
+                    </div>
+                </div>
+                <div class="field">
+                    <label class="label" for="feeEdit--feeDescription">Fee Description</label>
+                    <div class="control">
+                        <textarea class="textarea" id="feeEdit--feeDescription" name="feeDescription"></textarea>
+                    </div>
+                </div>
+                <div class="message is-info is-small">
+                    <p class="message-body">
+                        Filters can be used to show or hide available filters depending on the
+                        <span class="alias" data-alias="occupancy"></span> type and
+                        <span class="alias" data-alias="lot"></span> type selected
+                        when creating the
+                        <span class="alias" data-alias="lot"></span> <span class="alias" data-alias="occupancy"></span>
+                        record.
+                    </p>
+                </div>
+                <div class="columns">
+                    <div class="column">
+                        <div class="field">
+                            <label class="label" for="feeEdit--occupancyTypeId"><span class="alias" data-alias="Occupancy"></span> Type Filter</label>
+                            <div class="control">
+                                <div class="select is-fullwidth">
+                                    <select id="feeEdit--occupancyTypeId" name="occupancyTypeId">
+                                        <option value="">(All Types)</option>
+                                    </select>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="column">
+                        <div class="field">
+                            <label class="label" for="feeEdit--lotTypeId"><span class="alias" data-alias="Lot"></span> Type Filter</label>
+                            <div class="control">
+                                <div class="select is-fullwidth">
+                                    <select id="feeEdit--lotTypeId" name="lotTypeId">
+                                        <option value="">(All Types)</option>
+                                    </select>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="message is-info is-small">
+                    <p class="message-body">
+                        Fees can be simply flat amounts,
+                        or calculated by functions defined by the application administrator.
+                        Note that if both an amount and a function are set,
+                        <strong>the function will be used.</strong>
+                    </p>
+                </div>
+                <div class="columns">
+                    <div class="column">
+                        <div class="field">
+                            <label class="label" for="feeEdit--feeAmount">Fee Amount</label>
+                            <div class="control has-icons-left">
+                                <input class="input has-text-right" id="feeEdit--feeAmount" name="feeAmount" type="number" step="0.01" min="0" max="9999.99" value="0" onwheel="return false" />
+                                <span class="icon is-small is-left">
+                                    <i class="fas fa-dollar-sign" aria-hidden="true"></i>
+                                </span>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="column">
+                        <div class="field">
+                            <label class="label" for="feeEdit--feeFunction">Fee Function</label>
+                            <div class="control">
+                                <div class="select is-fullwidth">
+                                    <select id="feeEdit--feeFunction" name="feeFunction">
+                                        <option value="">(No Function Selected)</option>
+                                    </select>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="message is-info is-small">
+                    <p class="message-body">
+                        Taxes can be defined as flat amounts,
+                        or as percentages of the fee amount.
+                        Note that if both an amount and a percentage are set,
+                        <strong>the percentage will be used.</strong>
+                    </p>
+                </div>
+                <div class="columns">
+                    <div class="column">
+                        <div class="field">
+                            <label class="label" for="feeEdit--taxAmount">Tax Amount</label>
+                            <div class="control has-icons-left">
+                                <input class="input has-text-right" id="feeEdit--taxAmount" name="taxAmount" type="number" step="0.01" min="0" max="9999.99" onwheel="return false" />
+                                <span class="icon is-small is-left">
+                                    <i class="fas fa-dollar-sign" aria-hidden="true"></i>
+                                </span>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="column">
+                        <div class="field">
+                            <label class="label" for="feeEdit--taxPercentage">Tax Percentage</label>
+                            <div class="control has-icons-right">
+                                <input class="input has-text-right" id="feeEdit--taxPercentage" name="taxPercentage" type="number" step="0.01" min="0" max="100" value="0" onwheel="return false" />
+                                <span class="icon is-small is-right">
+                                    <i class="fas fa-percent" aria-hidden="true"></i>
+                                </span>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="columns">
+                    <div class="column">
+                        <div class="field">
+                            <label class="label" for="feeEdit--includeQuantity">Include Quantity</label>
+                            <div class="control">
+                                <div class="select is-fullwidth">
+                                    <select id="feeEdit--includeQuantity" name="includeQuantity">
+                                        <option value="" selected>No Quantity</option>
+                                        <option value="1">Quantity Available</option>
+                                    </select>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="column">
+                        <div class="field">
+                            <label class="label" for="feeEdit--quantityUnit">Quantity Unit</label>
+                            <div class="control">
+                                <input class="input" id="feeEdit--quantityUnit" name="quantityUnit" maxlength="30" required />
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="field">
+                    <label class="label" for="feeEdit--isRequired">Fee Is Required</label>
+                    <div class="control">
+                        <div class="select is-fullwidth">
+                            <select id="feeEdit--isRequired" name="isRequired">
+                                <option value="" selected>No, Fee is Optional</option>
+                                <option value="1">Yes, Fee is Required</option>
+                            </select>
+                        </div>
+                    </div>
+                </div>
+            </form>
+        </section>
+        <footer class="modal-card-foot justify-right">
+            <button class="button is-success" type="submit" form="form--feeEdit">
+                <span class="icon"><i class="fas fa-plus" aria-hidden="true"></i></span>
+                <span>Update Fee</span>
+            </button>
+            <div class="dropdown is-up is-right mr-2">
+                <div class="dropdown-trigger">
+                    <button class="button" type="button">
+                        <span>More Options</span>
+                        <span class="icon is-small">
+                            <i class="fas fa-angle-down" aria-hidden="true"></i>
+                        </span>
+                    </button>
+                </div>
+                <div class="dropdown-menu">
+                    <div class="dropdown-content">
+                        <a class="dropdown-item button--deleteFee" href="#">
+                            <span class="icon is-small"><i class="fas fa-trash has-text-danger" aria-hidden="true"></i></span>
+                            <span>Delete Fee</span>
+                        </a>
+                    </div>
+                </div>
+            </div>
+            <button class="button is-close-modal-button" type="button">Cancel</button>
+        </footer>
+    </div>
+</div>
\ No newline at end of file
diff --git a/public/javascripts/adminFees.min.js b/public/javascripts/adminFees.min.js
index c0a1ff3e..b6e0e00d 100644
--- a/public/javascripts/adminFees.min.js
+++ b/public/javascripts/adminFees.min.js
@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),(()=>{const e=exports.los,t=document.querySelector("main").dataset.urlPrefix,o=document.querySelector("#container--feeCategories");let s=exports.feeCategories;const a=e=>{const o=Number.parseInt(e.currentTarget.closest(".container--feeCategory").dataset.feeCategoryId,10),a=s.find(e=>e.feeCategoryId===o);let r;const l=e=>{e.preventDefault(),cityssm.postJSON(t+"/admin/doUpdateFeeCategory",e.currentTarget,e=>{e.success?(s=e.feeCategories,r(),n()):bulmaJS.alert({title:"Error Updating Fee Category",message:e.errorMessage,contextualColorName:"danger"})})};cityssm.openHtmlModal("adminFees-editFeeCategory",{onshow:e=>{e.querySelector("#feeCategoryEdit--feeCategoryId").value=a.feeCategoryId.toString(),e.querySelector("#feeCategoryEdit--feeCategory").value=a.feeCategory},onshown:(e,t)=>{bulmaJS.toggleHtmlClipped(),r=t,e.querySelector("form").addEventListener("submit",l)},onremoved:()=>{bulmaJS.toggleHtmlClipped()}})},r=t=>{const o=Number.parseInt(t.currentTarget.closest(".container--feeCategory").dataset.feeCategoryId,10);let a;const r=e=>{e.preventDefault()};cityssm.openHtmlModal("adminFees-addFee",{onshow:t=>{const a=t.querySelector("#feeAdd--feeCategoryId");for(const e of s){const t=document.createElement("option");t.value=e.feeCategoryId.toString(),t.textContent=e.feeCategory,e.feeCategoryId===o&&(t.selected=!0),a.append(t)}const r=t.querySelector("#feeAdd--occupancyTypeId");for(const e of exports.occupancyTypes){const t=document.createElement("option");t.value=e.occupancyTypeId.toString(),t.textContent=e.occupancyType,r.append(t)}const n=t.querySelector("#feeAdd--lotTypeId");for(const e of exports.lotTypes){const t=document.createElement("option");t.value=e.lotTypeId.toString(),t.textContent=e.lotType,n.append(t)}e.populateAliases(t)},onshown:(e,t)=>{bulmaJS.toggleHtmlClipped(),a=t,e.querySelector("form").addEventListener("submit",r)},onremoved:()=>{bulmaJS.toggleHtmlClipped()}})},n=()=>{if(0===s.length)return void(o.innerHTML='<div class="message is-warning"><p class="message-body">There are no available fees.</p></div>');o.innerHTML="";for(const e of s){const t=document.createElement("section");if(t.className="container--feeCategory",t.dataset.feeCategoryId=e.feeCategoryId.toString(),t.insertAdjacentHTML("beforeend",'<div class="level is-mobile"><div class="level-left"><div class="level-item"><h2 class="title is-4">'+cityssm.escapeHTML(e.feeCategory)+'</h2></div></div><div class="level-right"><div class="level-item"><button class="button is-small is-primary button--editFeeCategory" type="button"><span class="icon is-small"><i class="fas fa-pencil-alt" aria-hidden="true"></i></span><span>Edit Category</span></button></div><div class="level-item"><button class="button is-small is-success button--addFee" type="button"><span class="icon is-small"><i class="fas fa-plus" aria-hidden="true"></i></span><span>Add Fee</span></button></div></div></div>'),0===e.fees.length)t.insertAdjacentHTML("beforeend",'<div class="message is-info"><p class="message-body">There are no fees in the "'+cityssm.escapeHTML(e.feeCategory)+'" category.</p></div>');else{const e=document.createElement("div");e.className="panel",t.append(e)}o.append(t)}const e=o.querySelectorAll(".button--editFeeCategory");for(const t of e)t.addEventListener("click",a);const t=o.querySelectorAll(".button--addFee");for(const e of t)e.addEventListener("click",r)};n(),document.querySelector("#button--addFeeCategory").addEventListener("click",()=>{let e;const o=o=>{o.preventDefault(),cityssm.postJSON(t+"/admin/doAddFeeCategory",o.currentTarget,t=>{t.success?(s=t.feeCategories,e(),n()):bulmaJS.alert({title:"Error Creating Fee Category",message:t.errorMessage,contextualColorName:"danger"})})};cityssm.openHtmlModal("adminFees-addFeeCategory",{onshown:(t,s)=>{bulmaJS.toggleHtmlClipped(),t.querySelector("#feeCategoryAdd--feeCategory").focus(),e=s,t.querySelector("form").addEventListener("submit",o)},onremoved:()=>{bulmaJS.toggleHtmlClipped()}})})})();
\ No newline at end of file
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),(()=>{const e=exports.los,t=document.querySelector("main").dataset.urlPrefix,s=document.querySelector("#container--feeCategories");let a=exports.feeCategories;const o=()=>{if(0===a.length)return void(s.innerHTML='<div class="message is-warning"><p class="message-body">There are no available fees.</p></div>');s.innerHTML="";for(const e of a){const t=document.createElement("section");if(t.className="container--feeCategory mb-5",t.dataset.feeCategoryId=e.feeCategoryId.toString(),t.insertAdjacentHTML("beforeend",'<div class="level is-mobile"><div class="level-left"><div class="level-item"><h2 class="title is-4">'+cityssm.escapeHTML(e.feeCategory)+'</h2></div></div><div class="level-right">'+(0===e.fees.length?'<div class="level-item"><button class="button is-small is-danger button--deleteFeeCategory" type="button"><span class="icon is-small"><i class="fas fa-trash" aria-hidden="true"></i></span><span>Delete Category</span></button></div>':"")+'<div class="level-item"><button class="button is-small is-primary button--editFeeCategory" type="button"><span class="icon is-small"><i class="fas fa-pencil-alt" aria-hidden="true"></i></span><span>Edit Category</span></button></div><div class="level-item"><button class="button is-small is-success button--addFee" type="button"><span class="icon is-small"><i class="fas fa-plus" aria-hidden="true"></i></span><span>Add Fee</span></button></div></div></div>'),0===e.fees.length)t.insertAdjacentHTML("beforeend",'<div class="message is-info"><p class="message-body">There are no fees in the "'+cityssm.escapeHTML(e.feeCategory)+'" category.</p></div>');else{const s=document.createElement("div");s.className="panel";for(const t of e.fees){const e=document.createElement("a");e.className="panel-block is-block container--fee",e.dataset.feeId=t.feeId.toString(),e.innerHTML='<div class="columns"><div class="column is-half"><p><strong>'+cityssm.escapeHTML(t.feeName)+"</strong><br /><small>"+cityssm.escapeHTML(t.feeDescription).replace(/\n/g,"<br />")+'</small></p><p class="tags">'+(t.isRequired?'<span class="tag is-warning">Required</span>':"")+(t.occupancyTypeId?' <span class="tag has-tooltip-bottom" data-tooltip="'+cityssm.escapeHTML(exports.aliases.occupancy)+' Type Filter">'+cityssm.escapeHTML(t.occupancyType)+"</span>":"")+(t.lotTypeId?' <span class="tag has-tooltip-bottom" data-tooltip="'+cityssm.escapeHTML(exports.aliases.lot)+' Type Filter">'+cityssm.escapeHTML(t.lotType)+"</span>":"")+'</p></div><div class="column has-text-centered">'+(t.feeFunction?cityssm.escapeHTML(t.feeFunction)+"<br /><small>Fee Function</small>":"$"+t.feeAmount.toFixed(2)+"<br /><small>Fee</small>")+'</div><div class="column has-text-centered">'+(t.taxPercentage?t.taxPercentage+"%":"$"+t.taxAmount.toFixed(2))+'<br /><small>Tax</small></div><div class="column has-text-centered">'+(t.includeQuantity?cityssm.escapeHTML(t.quantityUnit)+"<br /><small>Quantity</small>":"")+"</div></div>",e.addEventListener("click",l),s.append(e)}t.append(s)}s.append(t)}const e=s.querySelectorAll(".button--deleteFeeCategory");for(const t of e)t.addEventListener("click",r);const t=s.querySelectorAll(".button--editFeeCategory");for(const e of t)e.addEventListener("click",n);const o=s.querySelectorAll(".button--addFee");for(const e of o)e.addEventListener("click",c)};document.querySelector("#button--addFeeCategory").addEventListener("click",()=>{let e;const s=s=>{s.preventDefault(),cityssm.postJSON(t+"/admin/doAddFeeCategory",s.currentTarget,t=>{t.success?(a=t.feeCategories,e(),o()):bulmaJS.alert({title:"Error Creating Fee Category",message:t.errorMessage,contextualColorName:"danger"})})};cityssm.openHtmlModal("adminFees-addFeeCategory",{onshown:(t,a)=>{bulmaJS.toggleHtmlClipped(),t.querySelector("#feeCategoryAdd--feeCategory").focus(),e=a,t.querySelector("form").addEventListener("submit",s)},onremoved:()=>{bulmaJS.toggleHtmlClipped()}})});const n=e=>{const s=Number.parseInt(e.currentTarget.closest(".container--feeCategory").dataset.feeCategoryId,10),n=a.find(e=>e.feeCategoryId===s);let r;const c=e=>{e.preventDefault(),cityssm.postJSON(t+"/admin/doUpdateFeeCategory",e.currentTarget,e=>{e.success?(a=e.feeCategories,r(),o()):bulmaJS.alert({title:"Error Updating Fee Category",message:e.errorMessage,contextualColorName:"danger"})})};cityssm.openHtmlModal("adminFees-editFeeCategory",{onshow:e=>{e.querySelector("#feeCategoryEdit--feeCategoryId").value=n.feeCategoryId.toString(),e.querySelector("#feeCategoryEdit--feeCategory").value=n.feeCategory},onshown:(e,t)=>{bulmaJS.toggleHtmlClipped(),r=t,e.querySelector("form").addEventListener("submit",c)},onremoved:()=>{bulmaJS.toggleHtmlClipped()}})},r=e=>{const s=Number.parseInt(e.currentTarget.closest(".container--feeCategory").dataset.feeCategoryId,10);bulmaJS.confirm({title:"Delete Fee Category?",message:"Are you sure you want to delete this fee category?",contextualColorName:"warning",okButton:{text:"Yes, Delete the Fee Category",callbackFunction:()=>{cityssm.postJSON(t+"/admin/doDeleteFeeCategory",{feeCategoryId:s},e=>{e.success?(a=e.feeCategories,o()):bulmaJS.alert({title:"Error Updating Fee Category",message:e.errorMessage,contextualColorName:"danger"})})}}})},c=s=>{const n=Number.parseInt(s.currentTarget.closest(".container--feeCategory").dataset.feeCategoryId,10);let r;const c=e=>{e.preventDefault(),cityssm.postJSON(t+"/admin/doAddFee",e.currentTarget,e=>{e.success?(a=e.feeCategories,r(),o()):bulmaJS.alert({title:"Error Adding Fee",message:e.errorMessage,contextualColorName:"danger"})})};cityssm.openHtmlModal("adminFees-addFee",{onshow:t=>{const s=t.querySelector("#feeAdd--feeCategoryId");for(const e of a){const t=document.createElement("option");t.value=e.feeCategoryId.toString(),t.textContent=e.feeCategory,e.feeCategoryId===n&&(t.selected=!0),s.append(t)}const o=t.querySelector("#feeAdd--occupancyTypeId");for(const e of exports.occupancyTypes){const t=document.createElement("option");t.value=e.occupancyTypeId.toString(),t.textContent=e.occupancyType,o.append(t)}const r=t.querySelector("#feeAdd--lotTypeId");for(const e of exports.lotTypes){const t=document.createElement("option");t.value=e.lotTypeId.toString(),t.textContent=e.lotType,r.append(t)}t.querySelector("#feeAdd--taxPercentage").value=exports.taxPercentageDefault.toString(),e.populateAliases(t)},onshown:(e,t)=>{bulmaJS.toggleHtmlClipped(),r=t,e.querySelector("form").addEventListener("submit",c),e.querySelector("#feeAdd--feeFunction").addEventListener("change",()=>{const t=e.querySelector("#feeAdd--feeAmount"),s=e.querySelector("#feeAdd--feeFunction");""===s.value?(s.closest(".select").classList.remove("is-success"),t.classList.add("is-success"),t.disabled=!1):(s.closest(".select").classList.add("is-success"),t.classList.remove("is-success"),t.disabled=!0)}),e.querySelector("#feeAdd--taxPercentage").addEventListener("keyup",()=>{const t=e.querySelector("#feeAdd--taxAmount"),s=e.querySelector("#feeAdd--taxPercentage");""===s.value?(s.classList.remove("is-success"),t.classList.add("is-success"),t.disabled=!1):(s.classList.add("is-success"),t.classList.remove("is-success"),t.disabled=!0)}),e.querySelector("#feeAdd--includeQuantity").addEventListener("change",()=>{e.querySelector("#feeAdd--quantityUnit").disabled=""===e.querySelector("#feeAdd--includeQuantity").value})},onremoved:()=>{bulmaJS.toggleHtmlClipped()}})},l=s=>{s.preventDefault();const n=Number.parseInt(s.currentTarget.dataset.feeId,10),r=Number.parseInt(s.currentTarget.closest(".container--feeCategory").dataset.feeCategoryId),c=a.find(e=>e.feeCategoryId===r).fees.find(e=>e.feeId===n);let l,i;const d=e=>{e.preventDefault(),cityssm.postJSON(t+"/admin/doUpdateFee",e.currentTarget,e=>{e.success?(a=e.feeCategories,l(),o()):bulmaJS.alert({title:"Error Updating Fee",message:e.errorMessage,contextualColorName:"danger"})})},u=e=>{e.preventDefault();bulmaJS.confirm({title:"Delete Fee?",message:"Are you sure you want to delete this fee?",contextualColorName:"warning",okButton:{text:"Yes, Delete the Fee",callbackFunction:()=>{cityssm.postJSON(t+"/admin/doDeleteFee",{feeId:n},e=>{e.success?(a=e.feeCategories,l(),o()):bulmaJS.alert({title:"Error Deleting Fee",message:e.errorMessage,contextualColorName:"danger"})})}}})},y=()=>{const e=i.querySelector("#feeEdit--feeAmount"),t=i.querySelector("#feeEdit--feeFunction");""===t.value?(t.closest(".select").classList.remove("is-success"),e.classList.add("is-success"),e.disabled=!1):(t.closest(".select").classList.add("is-success"),e.classList.remove("is-success"),e.disabled=!0)},m=()=>{const e=i.querySelector("#feeEdit--taxAmount"),t=i.querySelector("#feeEdit--taxPercentage");""===t.value?(t.classList.remove("is-success"),e.classList.add("is-success"),e.disabled=!1):(t.classList.add("is-success"),e.classList.remove("is-success"),e.disabled=!0)},p=()=>{i.querySelector("#feeEdit--quantityUnit").disabled=""===i.querySelector("#feeEdit--includeQuantity").value};cityssm.openHtmlModal("adminFees-editFee",{onshow:t=>{i=t,t.querySelector("#feeEdit--feeId").value=c.feeId.toString();const s=t.querySelector("#feeEdit--feeCategoryId");for(const e of a){const t=document.createElement("option");t.value=e.feeCategoryId.toString(),t.textContent=e.feeCategory,e.feeCategoryId===r&&(t.selected=!0),s.append(t)}t.querySelector("#feeEdit--feeName").value=c.feeName,t.querySelector("#feeEdit--feeDescription").value=c.feeDescription;const o=t.querySelector("#feeEdit--occupancyTypeId");for(const e of exports.occupancyTypes){const t=document.createElement("option");t.value=e.occupancyTypeId.toString(),t.textContent=e.occupancyType,e.occupancyTypeId===c.occupancyTypeId&&(t.selected=!0),o.append(t)}const n=t.querySelector("#feeEdit--lotTypeId");for(const e of exports.lotTypes){const t=document.createElement("option");t.value=e.lotTypeId.toString(),t.textContent=e.lotType,e.lotTypeId===c.lotTypeId&&(t.selected=!0),n.append(t)}t.querySelector("#feeEdit--feeAmount").value=c.feeAmount?c.feeAmount.toFixed(2):"",t.querySelector("#feeEdit--feeFunction").addEventListener("change",y),y(),t.querySelector("#feeEdit--taxAmount").value=c.taxAmount?c.taxAmount.toFixed(2):"";const l=t.querySelector("#feeEdit--taxPercentage");l.value=c.taxPercentage?c.taxPercentage.toString():"",l.addEventListener("keyup",m),m();const d=t.querySelector("#feeEdit--includeQuantity");c.includeQuantity&&(d.value="1"),d.addEventListener("change",p),t.querySelector("#feeEdit--quantityUnit").value=c.quantityUnit||"",p(),c.isRequired&&(t.querySelector("#feeEdit--isRequired").value="1"),e.populateAliases(t)},onshown:(e,t)=>{bulmaJS.toggleHtmlClipped(),l=t,e.querySelector("form").addEventListener("submit",d),bulmaJS.init(e),e.querySelector(".button--deleteFee").addEventListener("click",u)},onremoved:()=>{bulmaJS.toggleHtmlClipped()}})};o()})();
\ No newline at end of file
diff --git a/routes/admin.js b/routes/admin.js
index c6f4c414..7010e47c 100644
--- a/routes/admin.js
+++ b/routes/admin.js
@@ -3,8 +3,16 @@ import * as permissionHandlers from "../handlers/permissions.js";
 import handler_fees from "../handlers/admin-get/fees.js";
 import handler_doAddFeeCategory from "../handlers/admin-post/doAddFeeCategory.js";
 import handler_doUpdateFeeCategory from "../handlers/admin-post/doUpdateFeeCategory.js";
+import handler_doDeleteFeeCategory from "../handlers/admin-post/doDeleteFeeCategory.js";
+import handler_doAddFee from "../handlers/admin-post/doAddFee.js";
+import handler_doUpdateFee from "../handlers/admin-post/doUpdateFee.js";
+import handler_doDeleteFee from "../handlers/admin-post/doDeleteFee.js";
 export const router = Router();
 router.get("/fees", permissionHandlers.adminGetHandler, handler_fees);
 router.post("/doAddFeeCategory", permissionHandlers.adminPostHandler, handler_doAddFeeCategory);
 router.post("/doUpdateFeeCategory", permissionHandlers.adminPostHandler, handler_doUpdateFeeCategory);
+router.post("/doDeleteFeeCategory", permissionHandlers.adminPostHandler, handler_doDeleteFeeCategory);
+router.post("/doAddFee", permissionHandlers.adminPostHandler, handler_doAddFee);
+router.post("/doUpdateFee", permissionHandlers.adminPostHandler, handler_doUpdateFee);
+router.post("/doDeleteFee", permissionHandlers.adminPostHandler, handler_doDeleteFee);
 export default router;
diff --git a/routes/admin.ts b/routes/admin.ts
index 550d0811..717dd08b 100644
--- a/routes/admin.ts
+++ b/routes/admin.ts
@@ -7,6 +7,11 @@ import * as permissionHandlers from "../handlers/permissions.js";
 import handler_fees from "../handlers/admin-get/fees.js";
 import handler_doAddFeeCategory from "../handlers/admin-post/doAddFeeCategory.js";
 import handler_doUpdateFeeCategory from "../handlers/admin-post/doUpdateFeeCategory.js";
+import handler_doDeleteFeeCategory from "../handlers/admin-post/doDeleteFeeCategory.js";
+
+import handler_doAddFee from "../handlers/admin-post/doAddFee.js";
+import handler_doUpdateFee from "../handlers/admin-post/doUpdateFee.js";
+import handler_doDeleteFee from "../handlers/admin-post/doDeleteFee.js";
 
 
 export const router = Router();
@@ -26,5 +31,21 @@ router.post("/doUpdateFeeCategory",
     permissionHandlers.adminPostHandler,
     handler_doUpdateFeeCategory);
 
+router.post("/doDeleteFeeCategory",
+    permissionHandlers.adminPostHandler,
+    handler_doDeleteFeeCategory);
+
+router.post("/doAddFee",
+    permissionHandlers.adminPostHandler,
+    handler_doAddFee);
+
+router.post("/doUpdateFee",
+    permissionHandlers.adminPostHandler,
+    handler_doUpdateFee);
+
+router.post("/doDeleteFee",
+    permissionHandlers.adminPostHandler,
+    handler_doDeleteFee);
+
 
 export default router;
\ No newline at end of file
diff --git a/types/recordTypes.d.ts b/types/recordTypes.d.ts
index f56e1dcb..6290d728 100644
--- a/types/recordTypes.d.ts
+++ b/types/recordTypes.d.ts
@@ -109,7 +109,9 @@ export interface Fee extends Record {
     feeName?: string;
     feeDescription?: string;
     occupancyTypeId?: number;
+    occupancyType?: string;
     lotTypeId?: number;
+    lotType?: string;
     includeQuantity?: boolean;
     quantityUnit?: string;
     feeAmount?: number;
@@ -141,7 +143,7 @@ export interface LotOccupancyOccupant extends Record {
     lotOccupancyId?: number;
     lotOccupantIndex?: number;
     lotOccupantTypeId?: number;
-    lotOccupantType?: string | LotOccupantType;
+    lotOccupantType?: string;
     occupantName?: string;
     occupantAddress1?: string;
     occupantAddress2?: string;
@@ -167,7 +169,7 @@ export interface LotOccupancyField extends OccupancyTypeField, Record {
 export interface LotOccupancy extends Record {
     lotOccupancyId?: number;
     occupancyTypeId?: number;
-    occupancyType?: OccupancyType | string;
+    occupancyType?: string;
     lotId?: number;
     lotName?: string;
     mapId?: number;
diff --git a/types/recordTypes.ts b/types/recordTypes.ts
index a372b91a..4f7cfd09 100644
--- a/types/recordTypes.ts
+++ b/types/recordTypes.ts
@@ -156,7 +156,10 @@ export interface Fee extends Record {
     feeDescription ? : string;
 
     occupancyTypeId ? : number;
+    occupancyType ? : string;
+
     lotTypeId ? : number;
+    lotType ? : string;
 
     includeQuantity ? : boolean;
     quantityUnit ? : string;
@@ -173,7 +176,7 @@ export interface Fee extends Record {
 
 export interface LotOccupancyFee extends Fee, Record {
     lotOccupancyId ? : number;
-    
+
     feeId ? : number;
     feeName ? : string;
 
@@ -201,7 +204,7 @@ export interface LotOccupancyOccupant extends Record {
     lotOccupantIndex ? : number;
 
     lotOccupantTypeId ? : number;
-    lotOccupantType ? : string | LotOccupantType;
+    lotOccupantType ? : string;
 
     occupantName ? : string;
     occupantAddress1 ? : string;
@@ -238,7 +241,7 @@ export interface LotOccupancy extends Record {
     lotOccupancyId ? : number;
 
     occupancyTypeId ? : number;
-    occupancyType ? : OccupancyType | string;
+    occupancyType ? : string;
 
     lotId ? : number;
     lotName ? : string;
diff --git a/views/admin-fees.ejs b/views/admin-fees.ejs
index f84bb5d8..6e70d3bb 100644
--- a/views/admin-fees.ejs
+++ b/views/admin-fees.ejs
@@ -44,6 +44,8 @@
     exports.feeCategories = <%- JSON.stringify(feeCategories) %>;
     exports.occupancyTypes = <%- JSON.stringify(occupancyTypes) %>;
     exports.lotTypes = <%- JSON.stringify(lotTypes) %>;
+
+    exports.taxPercentageDefault = <%= configFunctions.getProperty("settings.fees.taxPercentageDefault") %>;
 </script>
 
 <script src="<%= urlPrefix %>/javascripts/adminFees.min.js"></script>