diff --git a/helpers/initializer.database.js b/helpers/initializer.database.js
index 8202b2b1..429b87bf 100644
--- a/helpers/initializer.database.js
+++ b/helpers/initializer.database.js
@@ -189,6 +189,7 @@ export const initializeDatabase = () => {
             " occupantPhoneNumber varchar(30)," +
             " occupantEmailAddress varchar(200)," +
             " lotOccupantTypeId integer not null," +
+            " occupantComment text not null default ''," +
             recordColumns +
             "," +
             " primary key (lotOccupancyId, lotOccupantIndex)," +
diff --git a/helpers/initializer.database.ts b/helpers/initializer.database.ts
index 3bec06f0..9953082f 100644
--- a/helpers/initializer.database.ts
+++ b/helpers/initializer.database.ts
@@ -256,6 +256,7 @@ export const initializeDatabase = (): boolean => {
                     " occupantPhoneNumber varchar(30)," +
                     " occupantEmailAddress varchar(200)," +
                     " lotOccupantTypeId integer not null," +
+                    " occupantComment text not null default ''," +
                     recordColumns +
                     "," +
                     " primary key (lotOccupancyId, lotOccupantIndex)," +
diff --git a/helpers/lotOccupancyDB/addLotOccupancyOccupant.d.ts b/helpers/lotOccupancyDB/addLotOccupancyOccupant.d.ts
index 5a574e6d..197a601e 100644
--- a/helpers/lotOccupancyDB/addLotOccupancyOccupant.d.ts
+++ b/helpers/lotOccupancyDB/addLotOccupancyOccupant.d.ts
@@ -11,6 +11,7 @@ interface AddLotOccupancyOccupantForm {
     occupantPostalCode: string;
     occupantPhoneNumber: string;
     occupantEmailAddress: string;
+    occupantComment?: string;
 }
 export declare const addLotOccupancyOccupant: (lotOccupancyOccupantForm: AddLotOccupancyOccupantForm, requestSession: recordTypes.PartialSession, connectedDatabase?: sqlite.Database) => number;
 export default addLotOccupancyOccupant;
diff --git a/helpers/lotOccupancyDB/addLotOccupancyOccupant.js b/helpers/lotOccupancyDB/addLotOccupancyOccupant.js
index e17f7dec..3df97fe5 100644
--- a/helpers/lotOccupancyDB/addLotOccupancyOccupant.js
+++ b/helpers/lotOccupancyDB/addLotOccupancyOccupant.js
@@ -21,11 +21,12 @@ export const addLotOccupancyOccupant = (lotOccupancyOccupantForm, requestSession
         " occupantAddress1, occupantAddress2," +
         " occupantCity, occupantProvince, occupantPostalCode," +
         " occupantPhoneNumber, occupantEmailAddress," +
+        " occupantComment," +
         " lotOccupantTypeId," +
         " recordCreate_userName, recordCreate_timeMillis," +
         " recordUpdate_userName, recordUpdate_timeMillis)" +
-        " values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)")
-        .run(lotOccupancyOccupantForm.lotOccupancyId, lotOccupantIndex, lotOccupancyOccupantForm.occupantName, lotOccupancyOccupantForm.occupantAddress1, lotOccupancyOccupantForm.occupantAddress2, lotOccupancyOccupantForm.occupantCity, lotOccupancyOccupantForm.occupantProvince, lotOccupancyOccupantForm.occupantPostalCode, lotOccupancyOccupantForm.occupantPhoneNumber, lotOccupancyOccupantForm.occupantEmailAddress, lotOccupancyOccupantForm.lotOccupantTypeId, requestSession.user.userName, rightNowMillis, requestSession.user.userName, rightNowMillis);
+        " values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)")
+        .run(lotOccupancyOccupantForm.lotOccupancyId, lotOccupantIndex, lotOccupancyOccupantForm.occupantName, lotOccupancyOccupantForm.occupantAddress1, lotOccupancyOccupantForm.occupantAddress2, lotOccupancyOccupantForm.occupantCity, lotOccupancyOccupantForm.occupantProvince, lotOccupancyOccupantForm.occupantPostalCode, lotOccupancyOccupantForm.occupantPhoneNumber, lotOccupancyOccupantForm.occupantEmailAddress, lotOccupancyOccupantForm.occupantComment || "", lotOccupancyOccupantForm.lotOccupantTypeId, requestSession.user.userName, rightNowMillis, requestSession.user.userName, rightNowMillis);
     if (!connectedDatabase) {
         database.close();
     }
diff --git a/helpers/lotOccupancyDB/addLotOccupancyOccupant.ts b/helpers/lotOccupancyDB/addLotOccupancyOccupant.ts
index 7ccf2d5e..7a47751a 100644
--- a/helpers/lotOccupancyDB/addLotOccupancyOccupant.ts
+++ b/helpers/lotOccupancyDB/addLotOccupancyOccupant.ts
@@ -15,6 +15,7 @@ interface AddLotOccupancyOccupantForm {
     occupantPostalCode: string;
     occupantPhoneNumber: string;
     occupantEmailAddress: string;
+    occupantComment?: string;
 }
 
 export const addLotOccupancyOccupant = (
@@ -50,10 +51,11 @@ export const addLotOccupancyOccupant = (
                 " occupantAddress1, occupantAddress2," +
                 " occupantCity, occupantProvince, occupantPostalCode," +
                 " occupantPhoneNumber, occupantEmailAddress," +
+                " occupantComment," +
                 " lotOccupantTypeId," +
                 " recordCreate_userName, recordCreate_timeMillis," +
                 " recordUpdate_userName, recordUpdate_timeMillis)" +
-                " values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"
+                " values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"
         )
         .run(
             lotOccupancyOccupantForm.lotOccupancyId,
@@ -66,6 +68,7 @@ export const addLotOccupancyOccupant = (
             lotOccupancyOccupantForm.occupantPostalCode,
             lotOccupancyOccupantForm.occupantPhoneNumber,
             lotOccupancyOccupantForm.occupantEmailAddress,
+            lotOccupancyOccupantForm.occupantComment || "",
             lotOccupancyOccupantForm.lotOccupantTypeId,
             requestSession.user.userName,
             rightNowMillis,
diff --git a/helpers/lotOccupancyDB/getLotOccupancyOccupants.js b/helpers/lotOccupancyDB/getLotOccupancyOccupants.js
index 673f15a9..3a18f2ca 100644
--- a/helpers/lotOccupancyDB/getLotOccupancyOccupants.js
+++ b/helpers/lotOccupancyDB/getLotOccupancyOccupants.js
@@ -9,7 +9,7 @@ export const getLotOccupancyOccupants = (lotOccupancyId, connectedDatabase) => {
         .prepare("select o.lotOccupancyId, o.lotOccupantIndex," +
         " o.occupantName, o.occupantAddress1, o.occupantAddress2," +
         " o.occupantCity, o.occupantProvince, o.occupantPostalCode," +
-        " o.occupantPhoneNumber, o.occupantEmailAddress," +
+        " o.occupantPhoneNumber, o.occupantEmailAddress, o.occupantComment," +
         " o.lotOccupantTypeId, t.lotOccupantType" +
         " from LotOccupancyOccupants o" +
         " left join LotOccupantTypes t on o.lotOccupantTypeId = t.lotOccupantTypeId" +
diff --git a/helpers/lotOccupancyDB/getLotOccupancyOccupants.ts b/helpers/lotOccupancyDB/getLotOccupancyOccupants.ts
index 3667af90..85811c45 100644
--- a/helpers/lotOccupancyDB/getLotOccupancyOccupants.ts
+++ b/helpers/lotOccupancyDB/getLotOccupancyOccupants.ts
@@ -19,7 +19,7 @@ export const getLotOccupancyOccupants = (
             "select o.lotOccupancyId, o.lotOccupantIndex," +
                 " o.occupantName, o.occupantAddress1, o.occupantAddress2," +
                 " o.occupantCity, o.occupantProvince, o.occupantPostalCode," +
-                " o.occupantPhoneNumber, o.occupantEmailAddress," +
+                " o.occupantPhoneNumber, o.occupantEmailAddress, o.occupantComment," +
                 " o.lotOccupantTypeId, t.lotOccupantType" +
                 " from LotOccupancyOccupants o" +
                 " left join LotOccupantTypes t on o.lotOccupantTypeId = t.lotOccupantTypeId" +
diff --git a/helpers/lotOccupancyDB/updateLotOccupancyOccupant.d.ts b/helpers/lotOccupancyDB/updateLotOccupancyOccupant.d.ts
index c618d1b4..77cdec4c 100644
--- a/helpers/lotOccupancyDB/updateLotOccupancyOccupant.d.ts
+++ b/helpers/lotOccupancyDB/updateLotOccupancyOccupant.d.ts
@@ -11,6 +11,7 @@ interface UpdateLotOccupancyOccupantForm {
     occupantPostalCode: string;
     occupantPhoneNumber: string;
     occupantEmailAddress: string;
+    occupantComment: string;
 }
 export declare const updateLotOccupancyOccupant: (lotOccupancyOccupantForm: UpdateLotOccupancyOccupantForm, requestSession: recordTypes.PartialSession) => boolean;
 export default updateLotOccupancyOccupant;
diff --git a/helpers/lotOccupancyDB/updateLotOccupancyOccupant.js b/helpers/lotOccupancyDB/updateLotOccupancyOccupant.js
index 8f613ce0..e5bcb26e 100644
--- a/helpers/lotOccupancyDB/updateLotOccupancyOccupant.js
+++ b/helpers/lotOccupancyDB/updateLotOccupancyOccupant.js
@@ -13,13 +13,14 @@ export const updateLotOccupancyOccupant = (lotOccupancyOccupantForm, requestSess
         " occupantPostalCode = ?," +
         " occupantPhoneNumber = ?," +
         " occupantEmailAddress = ?," +
+        " occupantComment = ?," +
         " lotOccupantTypeId = ?," +
         " recordUpdate_userName = ?," +
         " recordUpdate_timeMillis = ?" +
         " where recordDelete_timeMillis is null" +
         " and lotOccupancyId = ?" +
         " and lotOccupantIndex = ?")
-        .run(lotOccupancyOccupantForm.occupantName, lotOccupancyOccupantForm.occupantAddress1, lotOccupancyOccupantForm.occupantAddress2, lotOccupancyOccupantForm.occupantCity, lotOccupancyOccupantForm.occupantProvince, lotOccupancyOccupantForm.occupantPostalCode, lotOccupancyOccupantForm.occupantPhoneNumber, lotOccupancyOccupantForm.occupantEmailAddress, lotOccupancyOccupantForm.lotOccupantTypeId, requestSession.user.userName, rightNowMillis, lotOccupancyOccupantForm.lotOccupancyId, lotOccupancyOccupantForm.lotOccupantIndex);
+        .run(lotOccupancyOccupantForm.occupantName, lotOccupancyOccupantForm.occupantAddress1, lotOccupancyOccupantForm.occupantAddress2, lotOccupancyOccupantForm.occupantCity, lotOccupancyOccupantForm.occupantProvince, lotOccupancyOccupantForm.occupantPostalCode, lotOccupancyOccupantForm.occupantPhoneNumber, lotOccupancyOccupantForm.occupantEmailAddress, lotOccupancyOccupantForm.occupantComment, lotOccupancyOccupantForm.lotOccupantTypeId, requestSession.user.userName, rightNowMillis, lotOccupancyOccupantForm.lotOccupancyId, lotOccupancyOccupantForm.lotOccupantIndex);
     database.close();
     return results.changes > 0;
 };
diff --git a/helpers/lotOccupancyDB/updateLotOccupancyOccupant.ts b/helpers/lotOccupancyDB/updateLotOccupancyOccupant.ts
index c9eb9142..ada87ef2 100644
--- a/helpers/lotOccupancyDB/updateLotOccupancyOccupant.ts
+++ b/helpers/lotOccupancyDB/updateLotOccupancyOccupant.ts
@@ -16,6 +16,7 @@ interface UpdateLotOccupancyOccupantForm {
     occupantPostalCode: string;
     occupantPhoneNumber: string;
     occupantEmailAddress: string;
+    occupantComment: string;
 }
 
 export const updateLotOccupancyOccupant = (
@@ -37,6 +38,7 @@ export const updateLotOccupancyOccupant = (
                 " occupantPostalCode = ?," +
                 " occupantPhoneNumber = ?," +
                 " occupantEmailAddress = ?," +
+                " occupantComment = ?," +
                 " lotOccupantTypeId = ?," +
                 " recordUpdate_userName = ?," +
                 " recordUpdate_timeMillis = ?" +
@@ -53,6 +55,7 @@ export const updateLotOccupancyOccupant = (
             lotOccupancyOccupantForm.occupantPostalCode,
             lotOccupancyOccupantForm.occupantPhoneNumber,
             lotOccupancyOccupantForm.occupantEmailAddress,
+            lotOccupancyOccupantForm.occupantComment,
             lotOccupancyOccupantForm.lotOccupantTypeId,
             requestSession.user.userName,
             rightNowMillis,
diff --git a/public-typescript/lotOccupancyEdit.js b/public-typescript/lotOccupancyEdit.js
index b189e5c8..4f78bca9 100644
--- a/public-typescript/lotOccupancyEdit.js
+++ b/public-typescript/lotOccupancyEdit.js
@@ -145,7 +145,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
                             okButton: {
                                 text: "Yes, Open the Work Order",
                                 callbackFunction: () => {
-                                    window.location.href = los.urlPrefix + "/workOrders/" + responseJSON.workOrderId + "/edit";
+                                    window.location.href =
+                                        los.urlPrefix +
+                                            "/workOrders/" +
+                                            responseJSON.workOrderId +
+                                            "/edit";
                                 }
                             }
                         });
@@ -522,6 +526,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
                     modalElement.querySelector("#lotOccupancyOccupantEdit--occupantPostalCode").value = lotOccupancyOccupant.occupantPostalCode;
                     modalElement.querySelector("#lotOccupancyOccupantEdit--occupantPhoneNumber").value = lotOccupancyOccupant.occupantPhoneNumber;
                     modalElement.querySelector("#lotOccupancyOccupantEdit--occupantEmailAddress").value = lotOccupancyOccupant.occupantEmailAddress;
+                    modalElement.querySelector("#lotOccupancyOccupantEdit--occupantComment").value = lotOccupancyOccupant.occupantComment;
                 },
                 onshown: (modalElement, closeModalFunction) => {
                     bulmaJS.toggleHtmlClipped();
@@ -584,14 +589,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
             tableElement.className = "table is-fullwidth is-striped is-hoverable";
             tableElement.innerHTML =
                 "<thead><tr>" +
-                    "<th>" +
-                    exports.aliases.occupant +
-                    " Type</th>" +
-                    "<th>" +
-                    exports.aliases.occupant +
-                    "</th>" +
+                    ("<th>" + exports.aliases.occupant + "</th>") +
                     "<th>Address</th>" +
                     "<th>Other Contact</th>" +
+                    "<th>Comment</th>" +
                     '<th class="is-hidden-print"><span class="is-sr-only">Options</span></th>' +
                     "</tr></thead>" +
                     "<tbody></tbody>";
@@ -601,11 +602,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
                     lotOccupancyOccupant.lotOccupantIndex.toString();
                 tableRowElement.innerHTML =
                     "<td>" +
+                        cityssm.escapeHTML(lotOccupancyOccupant.occupantName || "(No Name)") +
+                        "<br />" +
+                        '<span class="tag">' +
                         cityssm.escapeHTML(lotOccupancyOccupant.lotOccupantType) +
+                        "</span>" +
                         "</td>" +
-                        ("<td>" +
-                            cityssm.escapeHTML(lotOccupancyOccupant.occupantName || "") +
-                            "</td>") +
                         ("<td>" +
                             (lotOccupancyOccupant.occupantAddress1
                                 ? cityssm.escapeHTML(lotOccupancyOccupant.occupantAddress1) + "<br />"
@@ -629,6 +631,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
                                 ? cityssm.escapeHTML(lotOccupancyOccupant.occupantEmailAddress)
                                 : "") +
                             "</td>") +
+                        ("<td>" + cityssm.escapeHTML(lotOccupancyOccupant.occupantComment) + "</td>") +
                         ('<td class="is-hidden-print">' +
                             '<div class="buttons are-small is-justify-content-end">' +
                             ('<button class="button is-primary button--edit" type="button">' +
diff --git a/public-typescript/lotOccupancyEdit.ts b/public-typescript/lotOccupancyEdit.ts
index c0d9c21a..187f848a 100644
--- a/public-typescript/lotOccupancyEdit.ts
+++ b/public-typescript/lotOccupancyEdit.ts
@@ -185,35 +185,43 @@ declare const bulmaJS: BulmaJS;
                 let createCloseModalFunction: () => void;
 
                 const doCreate = (formEvent: SubmitEvent) => {
-
                     formEvent.preventDefault();
 
-                    cityssm.postJSON(los.urlPrefix + "/workOrders/doCreateWorkOrder",
-                    formEvent.currentTarget,
-                    (responseJSON: {success: boolean; errorMessage?: string; workOrderId?: number}) => {
+                    cityssm.postJSON(
+                        los.urlPrefix + "/workOrders/doCreateWorkOrder",
+                        formEvent.currentTarget,
+                        (responseJSON: {
+                            success: boolean;
+                            errorMessage?: string;
+                            workOrderId?: number;
+                        }) => {
+                            if (responseJSON.success) {
+                                createCloseModalFunction();
 
-                        if (responseJSON.success) {
-                            createCloseModalFunction();
-
-                            bulmaJS.confirm({
-                                title: "Work Order Created Successfully",
-                                message: "Would you like to open the work order now?",
-                                contextualColorName: "success",
-                                okButton: {
-                                    text: "Yes, Open the Work Order",
-                                    callbackFunction: () => {
-                                        window.location.href = los.urlPrefix + "/workOrders/" + responseJSON.workOrderId + "/edit";
+                                bulmaJS.confirm({
+                                    title: "Work Order Created Successfully",
+                                    message: "Would you like to open the work order now?",
+                                    contextualColorName: "success",
+                                    okButton: {
+                                        text: "Yes, Open the Work Order",
+                                        callbackFunction: () => {
+                                            window.location.href =
+                                                los.urlPrefix +
+                                                "/workOrders/" +
+                                                responseJSON.workOrderId +
+                                                "/edit";
+                                        }
                                     }
-                                }
-                            })
-                        } else {
-                            bulmaJS.alert({
-                                title: "Error Creating Work Order",
-                                message: responseJSON.errorMessage as string,
-                                contextualColorName: "danger"
-                            });
+                                });
+                            } else {
+                                bulmaJS.alert({
+                                    title: "Error Creating Work Order",
+                                    message: responseJSON.errorMessage as string,
+                                    contextualColorName: "danger"
+                                });
+                            }
                         }
-                    });
+                    );
                 };
 
                 cityssm.openHtmlModal("lotOccupancy-createWorkOrder", {
@@ -223,18 +231,22 @@ declare const bulmaJS: BulmaJS;
                                 "#workOrderCreate--lotOccupancyId"
                             ) as HTMLInputElement
                         ).value = lotOccupancyId;
-                        
+
                         (
                             modalElement.querySelector(
                                 "#workOrderCreate--workOrderOpenDateString"
                             ) as HTMLInputElement
                         ).value = cityssm.dateToString(new Date());
 
-                        const workOrderTypeSelectElement = modalElement.querySelector("#workOrderCreate--workOrderTypeId") as HTMLSelectElement;
+                        const workOrderTypeSelectElement = modalElement.querySelector(
+                            "#workOrderCreate--workOrderTypeId"
+                        ) as HTMLSelectElement;
 
-                        for (const workOrderType of (exports.workOrderTypes as recordTypes.WorkOrderType[])) {
+                        for (const workOrderType of exports.workOrderTypes as recordTypes.WorkOrderType[]) {
                             const optionElement = document.createElement("option");
-                            optionElement.value = (workOrderType.workOrderTypeId as number).toString();
+                            optionElement.value = (
+                                workOrderType.workOrderTypeId as number
+                            ).toString();
                             optionElement.textContent = workOrderType.workOrderType as string;
                             workOrderTypeSelectElement.append(optionElement);
                         }
@@ -819,6 +831,12 @@ declare const bulmaJS: BulmaJS;
                             "#lotOccupancyOccupantEdit--occupantEmailAddress"
                         ) as HTMLInputElement
                     ).value = lotOccupancyOccupant.occupantEmailAddress!;
+
+                    (
+                        modalElement.querySelector(
+                            "#lotOccupancyOccupantEdit--occupantComment"
+                        ) as HTMLTextAreaElement
+                    ).value = lotOccupancyOccupant.occupantComment!;
                 },
                 onshown: (modalElement, closeModalFunction) => {
                     bulmaJS.toggleHtmlClipped();
@@ -907,14 +925,10 @@ declare const bulmaJS: BulmaJS;
 
             tableElement.innerHTML =
                 "<thead><tr>" +
-                "<th>" +
-                exports.aliases.occupant +
-                " Type</th>" +
-                "<th>" +
-                exports.aliases.occupant +
-                "</th>" +
+                ("<th>" + exports.aliases.occupant + "</th>") +
                 "<th>Address</th>" +
                 "<th>Other Contact</th>" +
+                "<th>Comment</th>" +
                 '<th class="is-hidden-print"><span class="is-sr-only">Options</span></th>' +
                 "</tr></thead>" +
                 "<tbody></tbody>";
@@ -926,11 +940,12 @@ declare const bulmaJS: BulmaJS;
 
                 tableRowElement.innerHTML =
                     "<td>" +
-                    cityssm.escapeHTML(lotOccupancyOccupant.lotOccupantType as string) +
+                    cityssm.escapeHTML(lotOccupancyOccupant.occupantName || "(No Name)") +
+                    "<br />" +
+                    '<span class="tag">' +
+                    cityssm.escapeHTML(lotOccupancyOccupant.lotOccupantType!) +
+                    "</span>" +
                     "</td>" +
-                    ("<td>" +
-                        cityssm.escapeHTML(lotOccupancyOccupant.occupantName || "") +
-                        "</td>") +
                     ("<td>" +
                         (lotOccupancyOccupant.occupantAddress1
                             ? cityssm.escapeHTML(lotOccupancyOccupant.occupantAddress1) + "<br />"
@@ -954,6 +969,7 @@ declare const bulmaJS: BulmaJS;
                             ? cityssm.escapeHTML(lotOccupancyOccupant.occupantEmailAddress)
                             : "") +
                         "</td>") +
+                    ("<td>" + cityssm.escapeHTML(lotOccupancyOccupant.occupantComment!) + "</td>") +
                     ('<td class="is-hidden-print">' +
                         '<div class="buttons are-small is-justify-content-end">' +
                         ('<button class="button is-primary button--edit" type="button">' +
diff --git a/public/html/lotOccupancy-addOccupant.html b/public/html/lotOccupancy-addOccupant.html
index 0162a07a..61171856 100644
--- a/public/html/lotOccupancy-addOccupant.html
+++ b/public/html/lotOccupancy-addOccupant.html
@@ -97,6 +97,12 @@
                                 </div>
                             </div>
                         </div>
+                        <div class="field">
+                            <label class="label" for="lotOccupancyOccupantAdd--occupantComment">Comment</label>
+                            <div class="control">
+                                <textarea class="textarea" id="lotOccupancyOccupantAdd--occupantComment" name="occupantComment"></textarea>
+                            </div>
+                        </div>
                         <div class="has-text-right">
                             <button class="button is-success" type="submit">
                                 <span class="icon"><i class="fas fa-plus" aria-hidden="true"></i></span>
@@ -136,7 +142,7 @@
             
         </section>
         <footer class="modal-card-foot justify-right">
-            <button class="button is-close-modal-button" type="button">Close</button>
+            <button class="button is-close-modal-button" type="button">Cancel</button>
         </footer>
     </div>
 </div>
\ No newline at end of file
diff --git a/public/html/lotOccupancy-editOccupant.html b/public/html/lotOccupancy-editOccupant.html
index 0923b63b..23ef4d4f 100644
--- a/public/html/lotOccupancy-editOccupant.html
+++ b/public/html/lotOccupancy-editOccupant.html
@@ -80,7 +80,12 @@
                         </div>
                     </div>
                 </div>
-                
+                <div class="field">
+                    <label class="label" for="lotOccupancyOccupantEdit--occupantComment">Comment</label>
+                    <div class="control">
+                        <textarea class="textarea" id="lotOccupancyOccupantEdit--occupantComment" name="occupantComment"></textarea>
+                    </div>
+                </div>
             </form>
         </section>
         <footer class="modal-card-foot justify-right">
diff --git a/public/javascripts/lotOccupancyEdit.min.js b/public/javascripts/lotOccupancyEdit.min.js
index 18e302aa..36bd53fb 100644
--- a/public/javascripts/lotOccupancyEdit.min.js
+++ b/public/javascripts/lotOccupancyEdit.min.js
@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),(()=>{var e,t,c;const a=exports.los,o=document.querySelector("#lotOccupancy--lotOccupancyId").value,n=""===o;let s=!1,l=n;const r=()=>{s||(s=!0,cityssm.enableNavBlocker())},i=document.querySelector("#form--lotOccupancy");i.addEventListener("submit",e=>{e.preventDefault(),cityssm.postJSON(a.urlPrefix+"/lotOccupancies/"+(n?"doCreateLotOccupancy":"doUpdateLotOccupancy"),i,e=>{e.success?(s=!1,cityssm.disableNavBlocker(),n||l?window.location.href=a.urlPrefix+"/lotOccupancies/"+e.lotOccupancyId+"/edit?t="+Date.now():bulmaJS.alert({message:exports.aliases.occupancy+" Updated Successfully",contextualColorName:"success"})):bulmaJS.alert({title:"Error Saving "+exports.aliases.occupancy,message:e.errorMessage||"",contextualColorName:"danger"})})});const u=i.querySelectorAll("input, select");for(const e of u)e.addEventListener("change",r);if(!n){const n=()=>{cityssm.postJSON(a.urlPrefix+"/lotOccupancies/doCopyLotOccupancy",{lotOccupancyId:o},e=>{var t;e.success?(cityssm.disableNavBlocker(),window.location.href=a.urlPrefix+"/lotOccupancies/"+(null===(t=e.lotOccupancyId)||void 0===t?void 0:t.toString())+"/edit"):bulmaJS.alert({title:"Error Copying Record",message:e.errorMessage||"",contextualColorName:"danger"})})};null===(e=document.querySelector("#button--copyLotOccupancy"))||void 0===e||e.addEventListener("click",e=>{e.preventDefault(),s?bulmaJS.alert({title:"Unsaved Changes",message:"Please save all unsaved changes before continuing.",contextualColorName:"warning"}):bulmaJS.confirm({title:"Copy "+exports.aliases.occupancy+" Record as New",message:"Are you sure you want to copy this record to a new record?",contextualColorName:"info",okButton:{text:"Yes, Copy",callbackFunction:n}})}),null===(t=document.querySelector("#button--deleteLotOccupancy"))||void 0===t||t.addEventListener("click",e=>{e.preventDefault();bulmaJS.confirm({title:"Delete "+exports.aliases.occupancy+" Record",message:"Are you sure you want to delete this record?",contextualColorName:"warning",okButton:{text:"Yes, Delete",callbackFunction:()=>{cityssm.postJSON(a.urlPrefix+"/lotOccupancies/doDeleteLotOccupancy",{lotOccupancyId:o},e=>{e.success?(cityssm.disableNavBlocker(),window.location.href=a.urlPrefix+"/lotOccupancies?t="+Date.now()):bulmaJS.alert({title:"Error Deleting Record",message:e.errorMessage||"",contextualColorName:"danger"})})}}})}),null===(c=document.querySelector("#button--createWorkOrder"))||void 0===c||c.addEventListener("click",e=>{let t;e.preventDefault();const c=e=>{e.preventDefault(),cityssm.postJSON(a.urlPrefix+"/workOrders/doCreateWorkOrder",e.currentTarget,e=>{e.success?(t(),bulmaJS.confirm({title:"Work Order Created Successfully",message:"Would you like to open the work order now?",contextualColorName:"success",okButton:{text:"Yes, Open the Work Order",callbackFunction:()=>{window.location.href=a.urlPrefix+"/workOrders/"+e.workOrderId+"/edit"}}})):bulmaJS.alert({title:"Error Creating Work Order",message:e.errorMessage,contextualColorName:"danger"})})};cityssm.openHtmlModal("lotOccupancy-createWorkOrder",{onshow:e=>{e.querySelector("#workOrderCreate--lotOccupancyId").value=o,e.querySelector("#workOrderCreate--workOrderOpenDateString").value=cityssm.dateToString(new Date);const t=e.querySelector("#workOrderCreate--workOrderTypeId");for(const e of exports.workOrderTypes){const c=document.createElement("option");c.value=e.workOrderTypeId.toString(),c.textContent=e.workOrderType,t.append(c)}},onshown:(e,a)=>{var o;t=a,null===(o=e.querySelector("form"))||void 0===o||o.addEventListener("submit",c)}})})}const d=document.querySelector("#lotOccupancy--occupancyTypeId");if(n){const e=document.querySelector("#container--lotOccupancyFields");d.addEventListener("change",()=>{""!==d.value?cityssm.postJSON(a.urlPrefix+"/lotOccupancies/doGetOccupancyTypeFields",{occupancyTypeId:d.value},t=>{if(0===t.occupancyTypeFields.length)return void(e.innerHTML='<div class="message is-info"><p class="message-body">There are no additional fields for this '+exports.aliases.occupancy.toLowerCase()+" type.</p></div>");e.innerHTML="";let c="";for(const a of t.occupancyTypeFields){c+=","+a.occupancyTypeFieldId;const t="lotOccupancyFieldValue_"+a.occupancyTypeFieldId,o="lotOccupancy--"+t,n=document.createElement("div");if(n.className="field",n.innerHTML='<label class="label" for="'+o+'"></label><div class="control"></div>',n.querySelector("label").textContent=a.occupancyTypeField,""===a.occupancyTypeFieldValues){const e=document.createElement("input");e.className="input",e.id=o,e.name=t,e.type="text",e.required=a.isRequired,e.minLength=a.minimumLength,e.maxLength=a.maximumLength,a.pattern&&""!==a.pattern&&(e.pattern=a.pattern),n.querySelector(".control").append(e)}else{n.querySelector(".control").innerHTML='<div class="select is-fullwidth"><select id="'+o+'" name="'+t+'"><option value="">(Not Set)</option></select></div>';const e=n.querySelector("select");e.required=a.isRequired;const c=a.occupancyTypeFieldValues.split("\n");for(const t of c){const c=document.createElement("option");c.value=t,c.textContent=t,e.append(c)}}e.append(n)}e.insertAdjacentHTML("beforeend",'<input name="occupancyTypeFieldIds" type="hidden" value="'+c.slice(1)+'" />')}):e.innerHTML='<div class="message is-info"><p class="message-body">Select the '+exports.aliases.occupancy.toLowerCase()+" type to load the available fields.</p></div>"})}else{const e=d.value;d.addEventListener("change",()=>{d.value!==e&&bulmaJS.confirm({title:"Confirm Change",message:"Are you sure you want to change the "+exports.aliases.occupancy.toLowerCase()+" type?\nThis change affects the additional fields associated with this record, and may also affect the available fees.",contextualColorName:"warning",okButton:{text:"Yes, Keep the Change",callbackFunction:()=>{l=!0}},cancelButton:{text:"Revert the Change",callbackFunction:()=>{d.value=e}}})})}const p=document.querySelector("#lotOccupancy--lotName");if(p.addEventListener("click",e=>{const t=e.currentTarget.value;let c,o,n,s;const l=(e,t)=>{document.querySelector("#lotOccupancy--lotId").value=e.toString(),document.querySelector("#lotOccupancy--lotName").value=t,r(),c()},i=e=>{e.preventDefault();const t=e.currentTarget;l(t.dataset.lotId,t.dataset.lotName)},u=()=>{s.innerHTML='<p class="has-text-centered"><i class="fas fa-3x fa-pulse fa-spinner" aria-hidden="true"></i><br />Searching...</p>',cityssm.postJSON(a.urlPrefix+"/lots/doSearchLots",n,e=>{if(0===e.count)return void(s.innerHTML='<div class="message is-info"><p class="message-body">No results.</p></div>');const t=document.createElement("div");t.className="panel";for(const c of e.lots){const e=document.createElement("a");e.className="panel-block is-block",e.href="#",e.dataset.lotId=c.lotId.toString(),e.dataset.lotName=c.lotName,e.innerHTML='<div class="columns"><div class="column">'+cityssm.escapeHTML(c.lotName||"")+'<br /><span class="is-size-7">'+cityssm.escapeHTML(c.mapName||"")+'</span></div><div class="column">'+cityssm.escapeHTML(c.lotStatus)+'<br /><span class="is-size-7">'+(c.lotOccupancyCount>0?"Currently Occupied":"")+"</span></div></div>",e.addEventListener("click",i),t.append(e)}s.innerHTML="",s.append(t)})},d=e=>{e.preventDefault();const t=o.querySelector("#lotCreate--lotName").value;cityssm.postJSON(a.urlPrefix+"/lots/doCreateLot",e.currentTarget,e=>{e.success?l(e.lotId,t):bulmaJS.alert({title:"Error Creating "+exports.aliases.lot,message:e.errorMessage||"",contextualColorName:"danger"})})};cityssm.openHtmlModal("lotOccupancy-selectLot",{onshow:e=>{a.populateAliases(e)},onshown:(e,a)=>{bulmaJS.toggleHtmlClipped(),o=e,c=a,bulmaJS.init(e);const l=e.querySelector("#lotSelect--lotName");""!==document.querySelector("#lotOccupancy--lotId").value&&(l.value=t),l.focus(),l.addEventListener("change",u);const r=e.querySelector("#lotSelect--occupancyStatus");if(r.addEventListener("change",u),""!==t&&(r.value=""),n=e.querySelector("#form--lotSelect"),s=e.querySelector("#resultsContainer--lotSelect"),n.addEventListener("submit",e=>{e.preventDefault()}),u(),exports.lotNamePattern){const t=exports.lotNamePattern;e.querySelector("#lotCreate--lotName").pattern=t.source}const i=e.querySelector("#lotCreate--lotTypeId");for(const e of exports.lotTypes){const t=document.createElement("option");t.value=e.lotTypeId.toString(),t.textContent=e.lotType,i.append(t)}const p=e.querySelector("#lotCreate--lotStatusId");for(const e of exports.lotStatuses){const t=document.createElement("option");t.value=e.lotStatusId.toString(),t.textContent=e.lotStatus,p.append(t)}const m=e.querySelector("#lotCreate--mapId");for(const e of exports.maps){const t=document.createElement("option");t.value=e.mapId.toString(),t.textContent=e.mapName||"(No Name)",m.append(t)}e.querySelector("#form--lotCreate").addEventListener("submit",d)},onremoved:()=>{bulmaJS.toggleHtmlClipped()}})}),document.querySelector(".is-lot-view-button").addEventListener("click",()=>{const e=document.querySelector("#lotOccupancy--lotId").value;e?window.open(a.urlPrefix+"/lots/"+e):bulmaJS.alert({message:"No "+exports.aliases.lot.toLowerCase()+" selected.",contextualColorName:"info"})}),document.querySelector(".is-clear-lot-button").addEventListener("click",()=>{p.disabled?bulmaJS.alert({message:"You need to unlock the field before clearing it.",contextualColorName:"info"}):(p.value="(No "+exports.aliases.lot+")",document.querySelector("#lotOccupancy--lotId").value="",r())}),a.initializeDatePickers(i),document.querySelector("#lotOccupancy--occupancyStartDateString").addEventListener("change",()=>{const e=document.querySelector("#lotOccupancy--occupancyEndDateString").bulmaCalendar.datePicker;e.min=document.querySelector("#lotOccupancy--occupancyStartDateString").value,e.refresh()}),a.initializeUnlockFieldButtons(i),!n){let e=exports.lotOccupancyOccupants;delete exports.lotOccupancyOccupants;const t=t=>{const c=Number.parseInt(t.currentTarget.closest("tr").dataset.lotOccupantIndex,10),s=e.find(e=>e.lotOccupantIndex===c);let l,r;const i=t=>{t.preventDefault(),cityssm.postJSON(a.urlPrefix+"/lotOccupancies/doUpdateLotOccupancyOccupant",l,t=>{t.success?(e=t.lotOccupancyOccupants,r(),n()):bulmaJS.alert({title:"Error Updating "+exports.aliases.occupant,message:t.errorMessage||"",contextualColorName:"danger"})})};cityssm.openHtmlModal("lotOccupancy-editOccupant",{onshow:e=>{a.populateAliases(e),e.querySelector("#lotOccupancyOccupantEdit--lotOccupancyId").value=o,e.querySelector("#lotOccupancyOccupantEdit--lotOccupantIndex").value=c.toString();const t=e.querySelector("#lotOccupancyOccupantEdit--lotOccupantTypeId");let n=!1;for(const e of exports.lotOccupantTypes){const c=document.createElement("option");c.value=e.lotOccupantTypeId.toString(),c.textContent=e.lotOccupantType,e.lotOccupantTypeId===s.lotOccupantTypeId&&(c.selected=!0,n=!0),t.append(c)}if(!n){const e=document.createElement("option");e.value=s.lotOccupantTypeId.toString(),e.textContent=s.lotOccupantType,e.selected=!0,t.append(e)}e.querySelector("#lotOccupancyOccupantEdit--occupantName").value=s.occupantName,e.querySelector("#lotOccupancyOccupantEdit--occupantAddress1").value=s.occupantAddress1,e.querySelector("#lotOccupancyOccupantEdit--occupantAddress2").value=s.occupantAddress2,e.querySelector("#lotOccupancyOccupantEdit--occupantCity").value=s.occupantCity,e.querySelector("#lotOccupancyOccupantEdit--occupantProvince").value=s.occupantProvince,e.querySelector("#lotOccupancyOccupantEdit--occupantPostalCode").value=s.occupantPostalCode,e.querySelector("#lotOccupancyOccupantEdit--occupantPhoneNumber").value=s.occupantPhoneNumber,e.querySelector("#lotOccupancyOccupantEdit--occupantEmailAddress").value=s.occupantEmailAddress},onshown:(e,t)=>{bulmaJS.toggleHtmlClipped(),e.querySelector("#lotOccupancyOccupantEdit--lotOccupantTypeId").focus(),(l=e.querySelector("form")).addEventListener("submit",i),r=t},onremoved:()=>{bulmaJS.toggleHtmlClipped()}})},c=t=>{const c=t.currentTarget.closest("tr").dataset.lotOccupantIndex;bulmaJS.confirm({title:"Remove "+exports.aliases.occupant+"?",message:"Are you sure you want to remove this "+exports.aliases.occupant.toLowerCase()+"?",okButton:{text:"Yes, Remove "+exports.aliases.occupant,callbackFunction:()=>{cityssm.postJSON(a.urlPrefix+"/lotOccupancies/doDeleteLotOccupancyOccupant",{lotOccupancyId:o,lotOccupantIndex:c},t=>{t.success?(e=t.lotOccupancyOccupants,n()):bulmaJS.alert({title:"Error Removing "+exports.aliases.occupant,message:t.errorMessage||"",contextualColorName:"danger"})})}},contextualColorName:"warning"})},n=()=>{const a=document.querySelector("#container--lotOccupancyOccupants");if(cityssm.clearElement(a),0===e.length)return void(a.innerHTML='<div class="message is-warning"><p class="message-body">There are no '+exports.aliases.occupants.toLowerCase()+" associated with this record.</p></div>");const o=document.createElement("table");o.className="table is-fullwidth is-striped is-hoverable",o.innerHTML="<thead><tr><th>"+exports.aliases.occupant+" Type</th><th>"+exports.aliases.occupant+'</th><th>Address</th><th>Other Contact</th><th class="is-hidden-print"><span class="is-sr-only">Options</span></th></tr></thead><tbody></tbody>';for(const a of e){const e=document.createElement("tr");e.dataset.lotOccupantIndex=a.lotOccupantIndex.toString(),e.innerHTML="<td>"+cityssm.escapeHTML(a.lotOccupantType)+"</td><td>"+cityssm.escapeHTML(a.occupantName||"")+"</td><td>"+(a.occupantAddress1?cityssm.escapeHTML(a.occupantAddress1)+"<br />":"")+(a.occupantAddress2?cityssm.escapeHTML(a.occupantAddress2)+"<br />":"")+(a.occupantCity?cityssm.escapeHTML(a.occupantCity)+", ":"")+cityssm.escapeHTML(a.occupantProvince||"")+"<br />"+cityssm.escapeHTML(a.occupantPostalCode||"")+"</td><td>"+(a.occupantPhoneNumber?cityssm.escapeHTML(a.occupantPhoneNumber)+"<br />":"")+(a.occupantEmailAddress?cityssm.escapeHTML(a.occupantEmailAddress):"")+'</td><td class="is-hidden-print"><div class="buttons are-small is-justify-content-end"><button class="button is-primary button--edit" type="button"><span class="icon is-small"><i class="fas fa-pencil-alt" aria-hidden="true"></i></span> <span>Edit</span></button><button class="button is-light is-danger button--delete" data-tooltip="Delete '+cityssm.escapeHTML(exports.aliases.occupant)+'" type="button" aria-label="Delete"><i class="fas fa-trash" aria-hidden="true"></i></button></div></td>',e.querySelector(".button--edit").addEventListener("click",t),e.querySelector(".button--delete").addEventListener("click",c),o.querySelector("tbody").append(e)}a.append(o)};document.querySelector("#button--addOccupant").addEventListener("click",()=>{let t,c,s,l;const r=c=>{cityssm.postJSON(a.urlPrefix+"/lotOccupancies/doAddLotOccupancyOccupant",c,c=>{c.success?(e=c.lotOccupancyOccupants,t(),n()):bulmaJS.alert({title:"Error Adding "+exports.aliases.occupant,message:c.errorMessage||"",contextualColorName:"danger"})})},i=e=>{e.preventDefault(),r(c)};let u=[];const d=e=>{e.preventDefault();const t=e.currentTarget,c=u[Number.parseInt(t.dataset.index,10)],a=t.closest(".modal").querySelector("#lotOccupancyOccupantCopy--lotOccupantTypeId").value;""===a?bulmaJS.alert({title:"No "+exports.aliases.occupant+" Type Selected",message:"Select a type to apply to the newly added "+exports.aliases.occupant.toLowerCase()+".",contextualColorName:"warning"}):(c.lotOccupantTypeId=Number.parseInt(a,10),c.lotOccupancyId=Number.parseInt(o,10),r(c))},p=e=>{e.preventDefault(),""!==s.querySelector("#lotOccupancyOccupantCopy--searchFilter").value?(l.innerHTML='<div class="has-text-grey has-text-centered"><i class="fas fa-5x fa-circle-notch fa-spin" aria-hidden="true"></i><br />Searching...</div>',cityssm.postJSON(a.urlPrefix+"/lotOccupancies/doSearchPastOccupants",s,e=>{u=e.occupants;const t=document.createElement("div");t.className="panel";for(const[e,c]of u.entries()){const a=document.createElement("a");a.className="panel-block is-block",a.dataset.index=e.toString(),a.innerHTML="<strong>"+cityssm.escapeHTML(c.occupantName||"")+'</strong><br /><div class="columns"><div class="column">'+cityssm.escapeHTML(c.occupantAddress1||"")+"<br />"+(c.occupantAddress2?cityssm.escapeHTML(c.occupantAddress2)+"<br />":"")+cityssm.escapeHTML(c.occupantCity||"")+", "+cityssm.escapeHTML(c.occupantProvince||"")+"<br />"+cityssm.escapeHTML(c.occupantPostalCode||"")+'</div><div class="column">'+(c.occupantPhoneNumber?cityssm.escapeHTML(c.occupantPhoneNumber)+"<br />":"")+cityssm.escapeHTML(c.occupantEmailAddress||"")+"<br /></div></div>",a.addEventListener("click",d),t.append(a)}l.innerHTML="",l.append(t)})):l.innerHTML='<div class="message is-info"><p class="message-body">Enter a partial name or address in the search field above.</p></div>'};cityssm.openHtmlModal("lotOccupancy-addOccupant",{onshow:e=>{a.populateAliases(e),e.querySelector("#lotOccupancyOccupantAdd--lotOccupancyId").value=o;const t=e.querySelector("#lotOccupancyOccupantAdd--lotOccupantTypeId"),c=e.querySelector("#lotOccupancyOccupantCopy--lotOccupantTypeId");for(const e of exports.lotOccupantTypes){const a=document.createElement("option");a.value=e.lotOccupantTypeId.toString(),a.textContent=e.lotOccupantType,t.append(a),c.append(a.cloneNode(!0))}e.querySelector("#lotOccupancyOccupantAdd--occupantCity").value=exports.occupantCityDefault,e.querySelector("#lotOccupancyOccupantAdd--occupantProvince").value=exports.occupantProvinceDefault},onshown:(e,a)=>{bulmaJS.toggleHtmlClipped(),bulmaJS.init(e),e.querySelector("#lotOccupancyOccupantAdd--lotOccupantTypeId").focus(),(c=e.querySelector("#form--lotOccupancyOccupantAdd")).addEventListener("submit",i),l=e.querySelector("#lotOccupancyOccupantCopy--searchResults"),(s=e.querySelector("#form--lotOccupancyOccupantCopy")).addEventListener("submit",e=>{e.preventDefault()}),e.querySelector("#lotOccupancyOccupantCopy--searchFilter").addEventListener("change",p),t=a},onremoved:()=>{bulmaJS.toggleHtmlClipped()}})}),n()}if(!n){let e=exports.lotOccupancyComments;delete exports.lotOccupancyComments;const t=t=>{const c=Number.parseInt(t.currentTarget.closest("tr").dataset.lotOccupancyCommentId,10),s=e.find(e=>e.lotOccupancyCommentId===c);let l,r;const i=t=>{t.preventDefault(),cityssm.postJSON(a.urlPrefix+"/lotOccupancies/doUpdateLotOccupancyComment",l,t=>{t.success?(e=t.lotOccupancyComments,r(),n()):bulmaJS.alert({title:"Error Updating Comment",message:t.errorMessage||"",contextualColorName:"danger"})})};cityssm.openHtmlModal("lotOccupancy-editComment",{onshow:e=>{a.populateAliases(e),e.querySelector("#lotOccupancyCommentEdit--lotOccupancyId").value=o,e.querySelector("#lotOccupancyCommentEdit--lotOccupancyCommentId").value=c.toString(),e.querySelector("#lotOccupancyCommentEdit--lotOccupancyComment").value=s.lotOccupancyComment;const t=e.querySelector("#lotOccupancyCommentEdit--lotOccupancyCommentDateString");t.value=s.lotOccupancyCommentDateString;const n=cityssm.dateToString(new Date);t.max=s.lotOccupancyCommentDateString<=n?n:s.lotOccupancyCommentDateString,e.querySelector("#lotOccupancyCommentEdit--lotOccupancyCommentTimeString").value=s.lotOccupancyCommentTimeString},onshown:(e,t)=>{bulmaJS.toggleHtmlClipped(),a.initializeDatePickers(e),a.initializeTimePickers(e),e.querySelector("#lotOccupancyCommentEdit--lotOccupancyComment").focus(),(l=e.querySelector("form")).addEventListener("submit",i),r=t},onremoved:()=>{bulmaJS.toggleHtmlClipped()}})},c=t=>{const c=Number.parseInt(t.currentTarget.closest("tr").dataset.lotOccupancyCommentId,10);bulmaJS.confirm({title:"Remove Comment?",message:"Are you sure you want to remove this comment?",okButton:{text:"Yes, Remove Comment",callbackFunction:()=>{cityssm.postJSON(a.urlPrefix+"/lotOccupancies/doDeleteLotOccupancyComment",{lotOccupancyId:o,lotOccupancyCommentId:c},t=>{t.success?(e=t.lotOccupancyComments,n()):bulmaJS.alert({title:"Error Removing Comment",message:t.errorMessage||"",contextualColorName:"danger"})})}},contextualColorName:"warning"})},n=()=>{const a=document.querySelector("#container--lotOccupancyComments");if(0===e.length)return void(a.innerHTML='<div class="message is-info"><p class="message-body">There are no comments associated with this record.</p></div>');const o=document.createElement("table");o.className="table is-fullwidth is-striped is-hoverable",o.innerHTML='<thead><tr><th>Commentor</th><th>Comment Date</th><th>Comment</th><th class="is-hidden-print"><span class="is-sr-only">Options</span></th></tr></thead><tbody></tbody>';for(const a of e){const e=document.createElement("tr");e.dataset.lotOccupancyCommentId=a.lotOccupancyCommentId.toString(),e.innerHTML="<td>"+cityssm.escapeHTML(a.recordCreate_userName||"")+"</td><td>"+a.lotOccupancyCommentDateString+(0===a.lotOccupancyCommentTime?"":" "+a.lotOccupancyCommentTimeString)+"</td><td>"+cityssm.escapeHTML(a.lotOccupancyComment||"")+'</td><td class="is-hidden-print"><div class="buttons are-small is-justify-content-end"><button class="button is-primary button--edit" type="button"><span class="icon is-small"><i class="fas fa-pencil-alt" aria-hidden="true"></i></span> <span>Edit</span></button><button class="button is-light is-danger button--delete" data-tooltip="Delete Comment" type="button" aria-label="Delete"><i class="fas fa-trash" aria-hidden="true"></i></button></div></td>',e.querySelector(".button--edit").addEventListener("click",t),e.querySelector(".button--delete").addEventListener("click",c),o.querySelector("tbody").append(e)}a.innerHTML="",a.append(o)};document.querySelector("#button--addComment").addEventListener("click",()=>{let t,c;const s=o=>{o.preventDefault(),cityssm.postJSON(a.urlPrefix+"/lotOccupancies/doAddLotOccupancyComment",t,t=>{t.success?(e=t.lotOccupancyComments,c(),n()):bulmaJS.alert({title:"Error Adding Comment",message:t.errorMessage||"",contextualColorName:"danger"})})};cityssm.openHtmlModal("lotOccupancy-addComment",{onshow:e=>{a.populateAliases(e),e.querySelector("#lotOccupancyCommentAdd--lotOccupancyId").value=o},onshown:(e,a)=>{bulmaJS.toggleHtmlClipped(),e.querySelector("#lotOccupancyCommentAdd--lotOccupancyComment").focus(),(t=e.querySelector("form")).addEventListener("submit",s),c=a},onremoved:()=>{bulmaJS.toggleHtmlClipped()}})}),n()}if(!n){let e=exports.lotOccupancyFees;delete exports.lotOccupancyFees;const t=document.querySelector("#container--lotOccupancyFees"),c=()=>{let t=0;for(const c of e)t+=(c.feeAmount+c.taxAmount)*c.quantity;return t},n=t=>{const c=t.currentTarget.closest(".container--lotOccupancyFee").dataset.feeId;bulmaJS.confirm({title:"Delete Fee",message:"Are you sure you want to delete this fee?",contextualColorName:"warning",okButton:{text:"Yes, Delete Fee",callbackFunction:()=>{cityssm.postJSON(a.urlPrefix+"/lotOccupancies/doDeleteLotOccupancyFee",{lotOccupancyId:o,feeId:c},t=>{t.success?(e=t.lotOccupancyFees,l()):bulmaJS.alert({title:"Error Deleting Fee",message:t.errorMessage||"",contextualColorName:"danger"})})}}})},l=()=>{if(0===e.length)return t.innerHTML='<div class="message is-info"><p class="message-body">There are no fees associated with this record.</p></div>',void p();t.innerHTML='<table class="table is-fullwidth is-striped is-hoverable"><thead><tr><th>Fee</th><th><span class="is-sr-only">Unit Cost</span></th><th class="has-width-1"><span class="is-sr-only">&times;</span></th><th class="has-width-1"><span class="is-sr-only">Quantity</span></th><th class="has-width-1"><span class="is-sr-only">equals</span></th><th class="has-width-1 has-text-right">Total</th><th class="has-width-1 is-hidden-print"><span class="is-sr-only">Options</span></th></tr></thead><tbody></tbody><tfoot><tr><th colspan="5">Subtotal</th><td class="has-text-weight-bold has-text-right" id="lotOccupancyFees--feeAmountTotal"></td><td class="is-hidden-print"></td></tr><tr><th colspan="5">Tax</th><td class="has-text-right" id="lotOccupancyFees--taxAmountTotal"></td><td class="is-hidden-print"></td></tr><tr><th colspan="5">Grand Total</th><td class="has-text-weight-bold has-text-right" id="lotOccupancyFees--grandTotal"></td><td class="is-hidden-print"></td></tr></tfoot></table>';let c=0,a=0;for(const o of e){const e=document.createElement("tr");e.className="container--lotOccupancyFee",e.dataset.feeId=o.feeId.toString(),e.dataset.includeQuantity=o.includeQuantity?"1":"0",e.innerHTML='<td colspan="'+(1===o.quantity?"5":"1")+'">'+cityssm.escapeHTML(o.feeName||"")+"</td>"+(1===o.quantity?"":'<td class="has-text-right">$'+o.feeAmount.toFixed(2)+'</td><td>&times;</td><td class="has-text-right">'+o.quantity+"</td><td>=</td>")+'<td class="has-text-right">$'+(o.feeAmount*o.quantity).toFixed(2)+'</td><td class="is-hidden-print"><button class="button is-small is-danger is-light" data-tooltip="Delete Fee" type="button"><i class="fas fa-trash" aria-hidden="true"></i></button></td>',e.querySelector("button").addEventListener("click",n),t.querySelector("tbody").append(e),c+=o.feeAmount*o.quantity,a+=o.taxAmount*o.quantity}t.querySelector("#lotOccupancyFees--feeAmountTotal").textContent="$"+c.toFixed(2),t.querySelector("#lotOccupancyFees--taxAmountTotal").textContent="$"+a.toFixed(2),t.querySelector("#lotOccupancyFees--grandTotal").textContent="$"+(c+a).toFixed(2),p()};document.querySelector("#button--addFee").addEventListener("click",()=>{if(s)return void bulmaJS.alert({message:"Please save all unsaved changes before adding fees.",contextualColorName:"warning"});let c,n,r;const i=(t,c=1)=>{cityssm.postJSON(a.urlPrefix+"/lotOccupancies/doAddLotOccupancyFee",{lotOccupancyId:o,feeId:t,quantity:c},t=>{t.success?(e=t.lotOccupancyFees,l(),d()):bulmaJS.alert({title:"Error Adding Fee",message:t.errorMessage||"",contextualColorName:"danger"})})},u=e=>{e.preventDefault();const t=Number.parseInt(e.currentTarget.dataset.feeId,10),a=Number.parseInt(e.currentTarget.closest(".container--feeCategory").dataset.feeCategoryId,10),o=c.find(e=>e.feeCategoryId===a).fees.find(e=>e.feeId===t);o.includeQuantity?(e=>{let t,c;const a=a=>{a.preventDefault(),i(e.feeId,t.value),c()};cityssm.openHtmlModal("lotOccupancy-setFeeQuantity",{onshow:t=>{t.querySelector("#lotOccupancyFeeQuantity--quantityUnit").textContent=e.quantityUnit},onshown:(e,o)=>{c=o,t=e.querySelector("#lotOccupancyFeeQuantity--quantity"),e.querySelector("form").addEventListener("submit",a)}})})(o):i(t)},d=()=>{const e=n.value.trim().toLowerCase().split(" ");r.innerHTML="";for(const a of c){const c=document.createElement("div");c.className="container--feeCategory",c.dataset.feeCategoryId=a.feeCategoryId.toString(),c.innerHTML='<h4 class="title is-5 mt-2">'+cityssm.escapeHTML(a.feeCategory||"")+'</h4><div class="panel mb-5"></div>';let o=!1;for(const n of a.fees){if(t.querySelector(".container--lotOccupancyFee[data-fee-id='"+n.feeId+"'][data-include-quantity='0']"))continue;let a=!0;for(const t of e)if(!n.feeName.toLowerCase().includes(t)){a=!1;break}if(!a)continue;o=!0;const s=document.createElement("a");s.className="panel-block is-block container--fee",s.dataset.feeId=n.feeId.toString(),s.href="#",s.innerHTML="<strong>"+cityssm.escapeHTML(n.feeName||"")+"</strong><br /><small>"+cityssm.escapeHTML(n.feeDescription||"").replace(/\n/g,"<br />")+"</small>",s.addEventListener("click",u),c.querySelector(".panel").append(s)}o&&r.append(c)}};cityssm.openHtmlModal("lotOccupancy-addFee",{onshow:e=>{n=e.querySelector("#feeSelect--feeName"),r=e.querySelector("#resultsContainer--feeSelect"),cityssm.postJSON(a.urlPrefix+"/lotOccupancies/doGetFees",{lotOccupancyId:o},e=>{c=e.feeCategories,n.disabled=!1,n.addEventListener("keyup",d),n.focus(),d()})},onshown:()=>{bulmaJS.toggleHtmlClipped()},onhidden:()=>{l()},onremoved:()=>{bulmaJS.toggleHtmlClipped()}})});let r=exports.lotOccupancyTransactions;delete exports.lotOccupancyTransactions;const i=document.querySelector("#container--lotOccupancyTransactions"),u=()=>{let e=0;for(const t of r)e+=t.transactionAmount;return e},d=e=>{const t=e.currentTarget.closest(".container--lotOccupancyTransaction").dataset.transactionIndex;bulmaJS.confirm({title:"Delete Trasnaction",message:"Are you sure you want to delete this transaction?",contextualColorName:"warning",okButton:{text:"Yes, Delete Transaction",callbackFunction:()=>{cityssm.postJSON(a.urlPrefix+"/lotOccupancies/doDeleteLotOccupancyTransaction",{lotOccupancyId:o,transactionIndex:t},e=>{e.success?(r=e.lotOccupancyTransactions,p()):bulmaJS.alert({title:"Error Deleting Transaction",message:e.errorMessage||"",contextualColorName:"danger"})})}}})},p=()=>{if(0===r.length)return void(i.innerHTML='<div class="message '+(0===e.length?"is-info":"is-warning")+'"><p class="message-body">There are no transactions associated with this record.</p></div>');i.innerHTML='<table class="table is-fullwidth is-striped is-hoverable"><thead><tr><th class="has-width-1">Date</th><th>'+cityssm.escapeHTML(exports.aliases.externalReceiptNumber)+'</th><th class="has-text-right has-width-1">Amount</th><th class="has-width-1 is-hidden-print"><span class="is-sr-only">Options</span></th></tr></thead><tbody></tbody><tfoot><tr><th colspan="2">Transaction Total</th><td class="has-text-weight-bold has-text-right" id="lotOccupancyTransactions--grandTotal"></td><td class="is-hidden-print"></td></tr></tfoot></table>';let t=0;for(const e of r){t+=e.transactionAmount;const c=document.createElement("tr");c.className="container--lotOccupancyTransaction",c.dataset.transactionIndex=e.transactionIndex.toString(),c.innerHTML="<td>"+e.transactionDateString+"</td><td>"+cityssm.escapeHTML(e.externalReceiptNumber||"")+"<br /><small>"+cityssm.escapeHTML(e.transactionNote||"")+'</small></td><td class="has-text-right">$'+e.transactionAmount.toFixed(2)+'</td><td class="is-hidden-print"><button class="button is-small is-danger is-light" data-tooltip="Delete Transaction" type="button"><i class="fas fa-trash" aria-hidden="true"></i></button></td>',c.querySelector("button").addEventListener("click",d),i.querySelector("tbody").append(c)}i.querySelector("#lotOccupancyTransactions--grandTotal").textContent="$"+t.toFixed(2);const a=c();a>t&&i.insertAdjacentHTML("afterbegin",'<div class="message is-warning"><div class="message-body"><div class="level"><div class="level-left"><div class="level-item">Outstanding Balance</div></div><div class="level-right"><div class="level-item">$'+(a-t).toFixed(2)+"</div></div></div></div></div>")};document.querySelector("#button--addTransaction").addEventListener("click",()=>{let e;const t=t=>{t.preventDefault(),cityssm.postJSON(a.urlPrefix+"/lotOccupancies/doAddLotOccupancyTransaction",t.currentTarget,t=>{t.success?(r=t.lotOccupancyTransactions,e(),p()):bulmaJS.confirm({title:"Error Adding Transaction",message:t.errorMessage||"",contextualColorName:"danger"})})};cityssm.openHtmlModal("lotOccupancy-addTransaction",{onshow:e=>{a.populateAliases(e),e.querySelector("#lotOccupancyTransactionAdd--lotOccupancyId").value=o.toString();const t=c(),n=u(),s=e.querySelector("#lotOccupancyTransactionAdd--transactionAmount");s.min=(-1*n).toFixed(2),s.max=Math.max(t-n,0).toFixed(2),s.value=Math.max(t-n,0).toFixed(2)},onshown:(c,a)=>{bulmaJS.toggleHtmlClipped(),e=a,c.querySelector("form").addEventListener("submit",t)},onremoved:()=>{bulmaJS.toggleHtmlClipped()}})}),l()}})();
\ No newline at end of file
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),(()=>{var e,t,c;const a=exports.los,o=document.querySelector("#lotOccupancy--lotOccupancyId").value,n=""===o;let s=!1,l=n;const r=()=>{s||(s=!0,cityssm.enableNavBlocker())},i=document.querySelector("#form--lotOccupancy");i.addEventListener("submit",e=>{e.preventDefault(),cityssm.postJSON(a.urlPrefix+"/lotOccupancies/"+(n?"doCreateLotOccupancy":"doUpdateLotOccupancy"),i,e=>{e.success?(s=!1,cityssm.disableNavBlocker(),n||l?window.location.href=a.urlPrefix+"/lotOccupancies/"+e.lotOccupancyId+"/edit?t="+Date.now():bulmaJS.alert({message:exports.aliases.occupancy+" Updated Successfully",contextualColorName:"success"})):bulmaJS.alert({title:"Error Saving "+exports.aliases.occupancy,message:e.errorMessage||"",contextualColorName:"danger"})})});const u=i.querySelectorAll("input, select");for(const e of u)e.addEventListener("change",r);if(!n){const n=()=>{cityssm.postJSON(a.urlPrefix+"/lotOccupancies/doCopyLotOccupancy",{lotOccupancyId:o},e=>{var t;e.success?(cityssm.disableNavBlocker(),window.location.href=a.urlPrefix+"/lotOccupancies/"+(null===(t=e.lotOccupancyId)||void 0===t?void 0:t.toString())+"/edit"):bulmaJS.alert({title:"Error Copying Record",message:e.errorMessage||"",contextualColorName:"danger"})})};null===(e=document.querySelector("#button--copyLotOccupancy"))||void 0===e||e.addEventListener("click",e=>{e.preventDefault(),s?bulmaJS.alert({title:"Unsaved Changes",message:"Please save all unsaved changes before continuing.",contextualColorName:"warning"}):bulmaJS.confirm({title:"Copy "+exports.aliases.occupancy+" Record as New",message:"Are you sure you want to copy this record to a new record?",contextualColorName:"info",okButton:{text:"Yes, Copy",callbackFunction:n}})}),null===(t=document.querySelector("#button--deleteLotOccupancy"))||void 0===t||t.addEventListener("click",e=>{e.preventDefault();bulmaJS.confirm({title:"Delete "+exports.aliases.occupancy+" Record",message:"Are you sure you want to delete this record?",contextualColorName:"warning",okButton:{text:"Yes, Delete",callbackFunction:()=>{cityssm.postJSON(a.urlPrefix+"/lotOccupancies/doDeleteLotOccupancy",{lotOccupancyId:o},e=>{e.success?(cityssm.disableNavBlocker(),window.location.href=a.urlPrefix+"/lotOccupancies?t="+Date.now()):bulmaJS.alert({title:"Error Deleting Record",message:e.errorMessage||"",contextualColorName:"danger"})})}}})}),null===(c=document.querySelector("#button--createWorkOrder"))||void 0===c||c.addEventListener("click",e=>{let t;e.preventDefault();const c=e=>{e.preventDefault(),cityssm.postJSON(a.urlPrefix+"/workOrders/doCreateWorkOrder",e.currentTarget,e=>{e.success?(t(),bulmaJS.confirm({title:"Work Order Created Successfully",message:"Would you like to open the work order now?",contextualColorName:"success",okButton:{text:"Yes, Open the Work Order",callbackFunction:()=>{window.location.href=a.urlPrefix+"/workOrders/"+e.workOrderId+"/edit"}}})):bulmaJS.alert({title:"Error Creating Work Order",message:e.errorMessage,contextualColorName:"danger"})})};cityssm.openHtmlModal("lotOccupancy-createWorkOrder",{onshow:e=>{e.querySelector("#workOrderCreate--lotOccupancyId").value=o,e.querySelector("#workOrderCreate--workOrderOpenDateString").value=cityssm.dateToString(new Date);const t=e.querySelector("#workOrderCreate--workOrderTypeId");for(const e of exports.workOrderTypes){const c=document.createElement("option");c.value=e.workOrderTypeId.toString(),c.textContent=e.workOrderType,t.append(c)}},onshown:(e,a)=>{var o;t=a,null===(o=e.querySelector("form"))||void 0===o||o.addEventListener("submit",c)}})})}const d=document.querySelector("#lotOccupancy--occupancyTypeId");if(n){const e=document.querySelector("#container--lotOccupancyFields");d.addEventListener("change",()=>{""!==d.value?cityssm.postJSON(a.urlPrefix+"/lotOccupancies/doGetOccupancyTypeFields",{occupancyTypeId:d.value},t=>{if(0===t.occupancyTypeFields.length)return void(e.innerHTML='<div class="message is-info"><p class="message-body">There are no additional fields for this '+exports.aliases.occupancy.toLowerCase()+" type.</p></div>");e.innerHTML="";let c="";for(const a of t.occupancyTypeFields){c+=","+a.occupancyTypeFieldId;const t="lotOccupancyFieldValue_"+a.occupancyTypeFieldId,o="lotOccupancy--"+t,n=document.createElement("div");if(n.className="field",n.innerHTML='<label class="label" for="'+o+'"></label><div class="control"></div>',n.querySelector("label").textContent=a.occupancyTypeField,""===a.occupancyTypeFieldValues){const e=document.createElement("input");e.className="input",e.id=o,e.name=t,e.type="text",e.required=a.isRequired,e.minLength=a.minimumLength,e.maxLength=a.maximumLength,a.pattern&&""!==a.pattern&&(e.pattern=a.pattern),n.querySelector(".control").append(e)}else{n.querySelector(".control").innerHTML='<div class="select is-fullwidth"><select id="'+o+'" name="'+t+'"><option value="">(Not Set)</option></select></div>';const e=n.querySelector("select");e.required=a.isRequired;const c=a.occupancyTypeFieldValues.split("\n");for(const t of c){const c=document.createElement("option");c.value=t,c.textContent=t,e.append(c)}}e.append(n)}e.insertAdjacentHTML("beforeend",'<input name="occupancyTypeFieldIds" type="hidden" value="'+c.slice(1)+'" />')}):e.innerHTML='<div class="message is-info"><p class="message-body">Select the '+exports.aliases.occupancy.toLowerCase()+" type to load the available fields.</p></div>"})}else{const e=d.value;d.addEventListener("change",()=>{d.value!==e&&bulmaJS.confirm({title:"Confirm Change",message:"Are you sure you want to change the "+exports.aliases.occupancy.toLowerCase()+" type?\nThis change affects the additional fields associated with this record, and may also affect the available fees.",contextualColorName:"warning",okButton:{text:"Yes, Keep the Change",callbackFunction:()=>{l=!0}},cancelButton:{text:"Revert the Change",callbackFunction:()=>{d.value=e}}})})}const p=document.querySelector("#lotOccupancy--lotName");if(p.addEventListener("click",e=>{const t=e.currentTarget.value;let c,o,n,s;const l=(e,t)=>{document.querySelector("#lotOccupancy--lotId").value=e.toString(),document.querySelector("#lotOccupancy--lotName").value=t,r(),c()},i=e=>{e.preventDefault();const t=e.currentTarget;l(t.dataset.lotId,t.dataset.lotName)},u=()=>{s.innerHTML='<p class="has-text-centered"><i class="fas fa-3x fa-pulse fa-spinner" aria-hidden="true"></i><br />Searching...</p>',cityssm.postJSON(a.urlPrefix+"/lots/doSearchLots",n,e=>{if(0===e.count)return void(s.innerHTML='<div class="message is-info"><p class="message-body">No results.</p></div>');const t=document.createElement("div");t.className="panel";for(const c of e.lots){const e=document.createElement("a");e.className="panel-block is-block",e.href="#",e.dataset.lotId=c.lotId.toString(),e.dataset.lotName=c.lotName,e.innerHTML='<div class="columns"><div class="column">'+cityssm.escapeHTML(c.lotName||"")+'<br /><span class="is-size-7">'+cityssm.escapeHTML(c.mapName||"")+'</span></div><div class="column">'+cityssm.escapeHTML(c.lotStatus)+'<br /><span class="is-size-7">'+(c.lotOccupancyCount>0?"Currently Occupied":"")+"</span></div></div>",e.addEventListener("click",i),t.append(e)}s.innerHTML="",s.append(t)})},d=e=>{e.preventDefault();const t=o.querySelector("#lotCreate--lotName").value;cityssm.postJSON(a.urlPrefix+"/lots/doCreateLot",e.currentTarget,e=>{e.success?l(e.lotId,t):bulmaJS.alert({title:"Error Creating "+exports.aliases.lot,message:e.errorMessage||"",contextualColorName:"danger"})})};cityssm.openHtmlModal("lotOccupancy-selectLot",{onshow:e=>{a.populateAliases(e)},onshown:(e,a)=>{bulmaJS.toggleHtmlClipped(),o=e,c=a,bulmaJS.init(e);const l=e.querySelector("#lotSelect--lotName");""!==document.querySelector("#lotOccupancy--lotId").value&&(l.value=t),l.focus(),l.addEventListener("change",u);const r=e.querySelector("#lotSelect--occupancyStatus");if(r.addEventListener("change",u),""!==t&&(r.value=""),n=e.querySelector("#form--lotSelect"),s=e.querySelector("#resultsContainer--lotSelect"),n.addEventListener("submit",e=>{e.preventDefault()}),u(),exports.lotNamePattern){const t=exports.lotNamePattern;e.querySelector("#lotCreate--lotName").pattern=t.source}const i=e.querySelector("#lotCreate--lotTypeId");for(const e of exports.lotTypes){const t=document.createElement("option");t.value=e.lotTypeId.toString(),t.textContent=e.lotType,i.append(t)}const p=e.querySelector("#lotCreate--lotStatusId");for(const e of exports.lotStatuses){const t=document.createElement("option");t.value=e.lotStatusId.toString(),t.textContent=e.lotStatus,p.append(t)}const m=e.querySelector("#lotCreate--mapId");for(const e of exports.maps){const t=document.createElement("option");t.value=e.mapId.toString(),t.textContent=e.mapName||"(No Name)",m.append(t)}e.querySelector("#form--lotCreate").addEventListener("submit",d)},onremoved:()=>{bulmaJS.toggleHtmlClipped()}})}),document.querySelector(".is-lot-view-button").addEventListener("click",()=>{const e=document.querySelector("#lotOccupancy--lotId").value;e?window.open(a.urlPrefix+"/lots/"+e):bulmaJS.alert({message:"No "+exports.aliases.lot.toLowerCase()+" selected.",contextualColorName:"info"})}),document.querySelector(".is-clear-lot-button").addEventListener("click",()=>{p.disabled?bulmaJS.alert({message:"You need to unlock the field before clearing it.",contextualColorName:"info"}):(p.value="(No "+exports.aliases.lot+")",document.querySelector("#lotOccupancy--lotId").value="",r())}),a.initializeDatePickers(i),document.querySelector("#lotOccupancy--occupancyStartDateString").addEventListener("change",()=>{const e=document.querySelector("#lotOccupancy--occupancyEndDateString").bulmaCalendar.datePicker;e.min=document.querySelector("#lotOccupancy--occupancyStartDateString").value,e.refresh()}),a.initializeUnlockFieldButtons(i),!n){let e=exports.lotOccupancyOccupants;delete exports.lotOccupancyOccupants;const t=t=>{const c=Number.parseInt(t.currentTarget.closest("tr").dataset.lotOccupantIndex,10),s=e.find(e=>e.lotOccupantIndex===c);let l,r;const i=t=>{t.preventDefault(),cityssm.postJSON(a.urlPrefix+"/lotOccupancies/doUpdateLotOccupancyOccupant",l,t=>{t.success?(e=t.lotOccupancyOccupants,r(),n()):bulmaJS.alert({title:"Error Updating "+exports.aliases.occupant,message:t.errorMessage||"",contextualColorName:"danger"})})};cityssm.openHtmlModal("lotOccupancy-editOccupant",{onshow:e=>{a.populateAliases(e),e.querySelector("#lotOccupancyOccupantEdit--lotOccupancyId").value=o,e.querySelector("#lotOccupancyOccupantEdit--lotOccupantIndex").value=c.toString();const t=e.querySelector("#lotOccupancyOccupantEdit--lotOccupantTypeId");let n=!1;for(const e of exports.lotOccupantTypes){const c=document.createElement("option");c.value=e.lotOccupantTypeId.toString(),c.textContent=e.lotOccupantType,e.lotOccupantTypeId===s.lotOccupantTypeId&&(c.selected=!0,n=!0),t.append(c)}if(!n){const e=document.createElement("option");e.value=s.lotOccupantTypeId.toString(),e.textContent=s.lotOccupantType,e.selected=!0,t.append(e)}e.querySelector("#lotOccupancyOccupantEdit--occupantName").value=s.occupantName,e.querySelector("#lotOccupancyOccupantEdit--occupantAddress1").value=s.occupantAddress1,e.querySelector("#lotOccupancyOccupantEdit--occupantAddress2").value=s.occupantAddress2,e.querySelector("#lotOccupancyOccupantEdit--occupantCity").value=s.occupantCity,e.querySelector("#lotOccupancyOccupantEdit--occupantProvince").value=s.occupantProvince,e.querySelector("#lotOccupancyOccupantEdit--occupantPostalCode").value=s.occupantPostalCode,e.querySelector("#lotOccupancyOccupantEdit--occupantPhoneNumber").value=s.occupantPhoneNumber,e.querySelector("#lotOccupancyOccupantEdit--occupantEmailAddress").value=s.occupantEmailAddress,e.querySelector("#lotOccupancyOccupantEdit--occupantComment").value=s.occupantComment},onshown:(e,t)=>{bulmaJS.toggleHtmlClipped(),e.querySelector("#lotOccupancyOccupantEdit--lotOccupantTypeId").focus(),(l=e.querySelector("form")).addEventListener("submit",i),r=t},onremoved:()=>{bulmaJS.toggleHtmlClipped()}})},c=t=>{const c=t.currentTarget.closest("tr").dataset.lotOccupantIndex;bulmaJS.confirm({title:"Remove "+exports.aliases.occupant+"?",message:"Are you sure you want to remove this "+exports.aliases.occupant.toLowerCase()+"?",okButton:{text:"Yes, Remove "+exports.aliases.occupant,callbackFunction:()=>{cityssm.postJSON(a.urlPrefix+"/lotOccupancies/doDeleteLotOccupancyOccupant",{lotOccupancyId:o,lotOccupantIndex:c},t=>{t.success?(e=t.lotOccupancyOccupants,n()):bulmaJS.alert({title:"Error Removing "+exports.aliases.occupant,message:t.errorMessage||"",contextualColorName:"danger"})})}},contextualColorName:"warning"})},n=()=>{const a=document.querySelector("#container--lotOccupancyOccupants");if(cityssm.clearElement(a),0===e.length)return void(a.innerHTML='<div class="message is-warning"><p class="message-body">There are no '+exports.aliases.occupants.toLowerCase()+" associated with this record.</p></div>");const o=document.createElement("table");o.className="table is-fullwidth is-striped is-hoverable",o.innerHTML="<thead><tr><th>"+exports.aliases.occupant+'</th><th>Address</th><th>Other Contact</th><th>Comment</th><th class="is-hidden-print"><span class="is-sr-only">Options</span></th></tr></thead><tbody></tbody>';for(const a of e){const e=document.createElement("tr");e.dataset.lotOccupantIndex=a.lotOccupantIndex.toString(),e.innerHTML="<td>"+cityssm.escapeHTML(a.occupantName||"(No Name)")+'<br /><span class="tag">'+cityssm.escapeHTML(a.lotOccupantType)+"</span></td><td>"+(a.occupantAddress1?cityssm.escapeHTML(a.occupantAddress1)+"<br />":"")+(a.occupantAddress2?cityssm.escapeHTML(a.occupantAddress2)+"<br />":"")+(a.occupantCity?cityssm.escapeHTML(a.occupantCity)+", ":"")+cityssm.escapeHTML(a.occupantProvince||"")+"<br />"+cityssm.escapeHTML(a.occupantPostalCode||"")+"</td><td>"+(a.occupantPhoneNumber?cityssm.escapeHTML(a.occupantPhoneNumber)+"<br />":"")+(a.occupantEmailAddress?cityssm.escapeHTML(a.occupantEmailAddress):"")+"</td><td>"+cityssm.escapeHTML(a.occupantComment)+'</td><td class="is-hidden-print"><div class="buttons are-small is-justify-content-end"><button class="button is-primary button--edit" type="button"><span class="icon is-small"><i class="fas fa-pencil-alt" aria-hidden="true"></i></span> <span>Edit</span></button><button class="button is-light is-danger button--delete" data-tooltip="Delete '+cityssm.escapeHTML(exports.aliases.occupant)+'" type="button" aria-label="Delete"><i class="fas fa-trash" aria-hidden="true"></i></button></div></td>',e.querySelector(".button--edit").addEventListener("click",t),e.querySelector(".button--delete").addEventListener("click",c),o.querySelector("tbody").append(e)}a.append(o)};document.querySelector("#button--addOccupant").addEventListener("click",()=>{let t,c,s,l;const r=c=>{cityssm.postJSON(a.urlPrefix+"/lotOccupancies/doAddLotOccupancyOccupant",c,c=>{c.success?(e=c.lotOccupancyOccupants,t(),n()):bulmaJS.alert({title:"Error Adding "+exports.aliases.occupant,message:c.errorMessage||"",contextualColorName:"danger"})})},i=e=>{e.preventDefault(),r(c)};let u=[];const d=e=>{e.preventDefault();const t=e.currentTarget,c=u[Number.parseInt(t.dataset.index,10)],a=t.closest(".modal").querySelector("#lotOccupancyOccupantCopy--lotOccupantTypeId").value;""===a?bulmaJS.alert({title:"No "+exports.aliases.occupant+" Type Selected",message:"Select a type to apply to the newly added "+exports.aliases.occupant.toLowerCase()+".",contextualColorName:"warning"}):(c.lotOccupantTypeId=Number.parseInt(a,10),c.lotOccupancyId=Number.parseInt(o,10),r(c))},p=e=>{e.preventDefault(),""!==s.querySelector("#lotOccupancyOccupantCopy--searchFilter").value?(l.innerHTML='<div class="has-text-grey has-text-centered"><i class="fas fa-5x fa-circle-notch fa-spin" aria-hidden="true"></i><br />Searching...</div>',cityssm.postJSON(a.urlPrefix+"/lotOccupancies/doSearchPastOccupants",s,e=>{u=e.occupants;const t=document.createElement("div");t.className="panel";for(const[e,c]of u.entries()){const a=document.createElement("a");a.className="panel-block is-block",a.dataset.index=e.toString(),a.innerHTML="<strong>"+cityssm.escapeHTML(c.occupantName||"")+'</strong><br /><div class="columns"><div class="column">'+cityssm.escapeHTML(c.occupantAddress1||"")+"<br />"+(c.occupantAddress2?cityssm.escapeHTML(c.occupantAddress2)+"<br />":"")+cityssm.escapeHTML(c.occupantCity||"")+", "+cityssm.escapeHTML(c.occupantProvince||"")+"<br />"+cityssm.escapeHTML(c.occupantPostalCode||"")+'</div><div class="column">'+(c.occupantPhoneNumber?cityssm.escapeHTML(c.occupantPhoneNumber)+"<br />":"")+cityssm.escapeHTML(c.occupantEmailAddress||"")+"<br /></div></div>",a.addEventListener("click",d),t.append(a)}l.innerHTML="",l.append(t)})):l.innerHTML='<div class="message is-info"><p class="message-body">Enter a partial name or address in the search field above.</p></div>'};cityssm.openHtmlModal("lotOccupancy-addOccupant",{onshow:e=>{a.populateAliases(e),e.querySelector("#lotOccupancyOccupantAdd--lotOccupancyId").value=o;const t=e.querySelector("#lotOccupancyOccupantAdd--lotOccupantTypeId"),c=e.querySelector("#lotOccupancyOccupantCopy--lotOccupantTypeId");for(const e of exports.lotOccupantTypes){const a=document.createElement("option");a.value=e.lotOccupantTypeId.toString(),a.textContent=e.lotOccupantType,t.append(a),c.append(a.cloneNode(!0))}e.querySelector("#lotOccupancyOccupantAdd--occupantCity").value=exports.occupantCityDefault,e.querySelector("#lotOccupancyOccupantAdd--occupantProvince").value=exports.occupantProvinceDefault},onshown:(e,a)=>{bulmaJS.toggleHtmlClipped(),bulmaJS.init(e),e.querySelector("#lotOccupancyOccupantAdd--lotOccupantTypeId").focus(),(c=e.querySelector("#form--lotOccupancyOccupantAdd")).addEventListener("submit",i),l=e.querySelector("#lotOccupancyOccupantCopy--searchResults"),(s=e.querySelector("#form--lotOccupancyOccupantCopy")).addEventListener("submit",e=>{e.preventDefault()}),e.querySelector("#lotOccupancyOccupantCopy--searchFilter").addEventListener("change",p),t=a},onremoved:()=>{bulmaJS.toggleHtmlClipped()}})}),n()}if(!n){let e=exports.lotOccupancyComments;delete exports.lotOccupancyComments;const t=t=>{const c=Number.parseInt(t.currentTarget.closest("tr").dataset.lotOccupancyCommentId,10),s=e.find(e=>e.lotOccupancyCommentId===c);let l,r;const i=t=>{t.preventDefault(),cityssm.postJSON(a.urlPrefix+"/lotOccupancies/doUpdateLotOccupancyComment",l,t=>{t.success?(e=t.lotOccupancyComments,r(),n()):bulmaJS.alert({title:"Error Updating Comment",message:t.errorMessage||"",contextualColorName:"danger"})})};cityssm.openHtmlModal("lotOccupancy-editComment",{onshow:e=>{a.populateAliases(e),e.querySelector("#lotOccupancyCommentEdit--lotOccupancyId").value=o,e.querySelector("#lotOccupancyCommentEdit--lotOccupancyCommentId").value=c.toString(),e.querySelector("#lotOccupancyCommentEdit--lotOccupancyComment").value=s.lotOccupancyComment;const t=e.querySelector("#lotOccupancyCommentEdit--lotOccupancyCommentDateString");t.value=s.lotOccupancyCommentDateString;const n=cityssm.dateToString(new Date);t.max=s.lotOccupancyCommentDateString<=n?n:s.lotOccupancyCommentDateString,e.querySelector("#lotOccupancyCommentEdit--lotOccupancyCommentTimeString").value=s.lotOccupancyCommentTimeString},onshown:(e,t)=>{bulmaJS.toggleHtmlClipped(),a.initializeDatePickers(e),a.initializeTimePickers(e),e.querySelector("#lotOccupancyCommentEdit--lotOccupancyComment").focus(),(l=e.querySelector("form")).addEventListener("submit",i),r=t},onremoved:()=>{bulmaJS.toggleHtmlClipped()}})},c=t=>{const c=Number.parseInt(t.currentTarget.closest("tr").dataset.lotOccupancyCommentId,10);bulmaJS.confirm({title:"Remove Comment?",message:"Are you sure you want to remove this comment?",okButton:{text:"Yes, Remove Comment",callbackFunction:()=>{cityssm.postJSON(a.urlPrefix+"/lotOccupancies/doDeleteLotOccupancyComment",{lotOccupancyId:o,lotOccupancyCommentId:c},t=>{t.success?(e=t.lotOccupancyComments,n()):bulmaJS.alert({title:"Error Removing Comment",message:t.errorMessage||"",contextualColorName:"danger"})})}},contextualColorName:"warning"})},n=()=>{const a=document.querySelector("#container--lotOccupancyComments");if(0===e.length)return void(a.innerHTML='<div class="message is-info"><p class="message-body">There are no comments associated with this record.</p></div>');const o=document.createElement("table");o.className="table is-fullwidth is-striped is-hoverable",o.innerHTML='<thead><tr><th>Commentor</th><th>Comment Date</th><th>Comment</th><th class="is-hidden-print"><span class="is-sr-only">Options</span></th></tr></thead><tbody></tbody>';for(const a of e){const e=document.createElement("tr");e.dataset.lotOccupancyCommentId=a.lotOccupancyCommentId.toString(),e.innerHTML="<td>"+cityssm.escapeHTML(a.recordCreate_userName||"")+"</td><td>"+a.lotOccupancyCommentDateString+(0===a.lotOccupancyCommentTime?"":" "+a.lotOccupancyCommentTimeString)+"</td><td>"+cityssm.escapeHTML(a.lotOccupancyComment||"")+'</td><td class="is-hidden-print"><div class="buttons are-small is-justify-content-end"><button class="button is-primary button--edit" type="button"><span class="icon is-small"><i class="fas fa-pencil-alt" aria-hidden="true"></i></span> <span>Edit</span></button><button class="button is-light is-danger button--delete" data-tooltip="Delete Comment" type="button" aria-label="Delete"><i class="fas fa-trash" aria-hidden="true"></i></button></div></td>',e.querySelector(".button--edit").addEventListener("click",t),e.querySelector(".button--delete").addEventListener("click",c),o.querySelector("tbody").append(e)}a.innerHTML="",a.append(o)};document.querySelector("#button--addComment").addEventListener("click",()=>{let t,c;const s=o=>{o.preventDefault(),cityssm.postJSON(a.urlPrefix+"/lotOccupancies/doAddLotOccupancyComment",t,t=>{t.success?(e=t.lotOccupancyComments,c(),n()):bulmaJS.alert({title:"Error Adding Comment",message:t.errorMessage||"",contextualColorName:"danger"})})};cityssm.openHtmlModal("lotOccupancy-addComment",{onshow:e=>{a.populateAliases(e),e.querySelector("#lotOccupancyCommentAdd--lotOccupancyId").value=o},onshown:(e,a)=>{bulmaJS.toggleHtmlClipped(),e.querySelector("#lotOccupancyCommentAdd--lotOccupancyComment").focus(),(t=e.querySelector("form")).addEventListener("submit",s),c=a},onremoved:()=>{bulmaJS.toggleHtmlClipped()}})}),n()}if(!n){let e=exports.lotOccupancyFees;delete exports.lotOccupancyFees;const t=document.querySelector("#container--lotOccupancyFees"),c=()=>{let t=0;for(const c of e)t+=(c.feeAmount+c.taxAmount)*c.quantity;return t},n=t=>{const c=t.currentTarget.closest(".container--lotOccupancyFee").dataset.feeId;bulmaJS.confirm({title:"Delete Fee",message:"Are you sure you want to delete this fee?",contextualColorName:"warning",okButton:{text:"Yes, Delete Fee",callbackFunction:()=>{cityssm.postJSON(a.urlPrefix+"/lotOccupancies/doDeleteLotOccupancyFee",{lotOccupancyId:o,feeId:c},t=>{t.success?(e=t.lotOccupancyFees,l()):bulmaJS.alert({title:"Error Deleting Fee",message:t.errorMessage||"",contextualColorName:"danger"})})}}})},l=()=>{if(0===e.length)return t.innerHTML='<div class="message is-info"><p class="message-body">There are no fees associated with this record.</p></div>',void p();t.innerHTML='<table class="table is-fullwidth is-striped is-hoverable"><thead><tr><th>Fee</th><th><span class="is-sr-only">Unit Cost</span></th><th class="has-width-1"><span class="is-sr-only">&times;</span></th><th class="has-width-1"><span class="is-sr-only">Quantity</span></th><th class="has-width-1"><span class="is-sr-only">equals</span></th><th class="has-width-1 has-text-right">Total</th><th class="has-width-1 is-hidden-print"><span class="is-sr-only">Options</span></th></tr></thead><tbody></tbody><tfoot><tr><th colspan="5">Subtotal</th><td class="has-text-weight-bold has-text-right" id="lotOccupancyFees--feeAmountTotal"></td><td class="is-hidden-print"></td></tr><tr><th colspan="5">Tax</th><td class="has-text-right" id="lotOccupancyFees--taxAmountTotal"></td><td class="is-hidden-print"></td></tr><tr><th colspan="5">Grand Total</th><td class="has-text-weight-bold has-text-right" id="lotOccupancyFees--grandTotal"></td><td class="is-hidden-print"></td></tr></tfoot></table>';let c=0,a=0;for(const o of e){const e=document.createElement("tr");e.className="container--lotOccupancyFee",e.dataset.feeId=o.feeId.toString(),e.dataset.includeQuantity=o.includeQuantity?"1":"0",e.innerHTML='<td colspan="'+(1===o.quantity?"5":"1")+'">'+cityssm.escapeHTML(o.feeName||"")+"</td>"+(1===o.quantity?"":'<td class="has-text-right">$'+o.feeAmount.toFixed(2)+'</td><td>&times;</td><td class="has-text-right">'+o.quantity+"</td><td>=</td>")+'<td class="has-text-right">$'+(o.feeAmount*o.quantity).toFixed(2)+'</td><td class="is-hidden-print"><button class="button is-small is-danger is-light" data-tooltip="Delete Fee" type="button"><i class="fas fa-trash" aria-hidden="true"></i></button></td>',e.querySelector("button").addEventListener("click",n),t.querySelector("tbody").append(e),c+=o.feeAmount*o.quantity,a+=o.taxAmount*o.quantity}t.querySelector("#lotOccupancyFees--feeAmountTotal").textContent="$"+c.toFixed(2),t.querySelector("#lotOccupancyFees--taxAmountTotal").textContent="$"+a.toFixed(2),t.querySelector("#lotOccupancyFees--grandTotal").textContent="$"+(c+a).toFixed(2),p()};document.querySelector("#button--addFee").addEventListener("click",()=>{if(s)return void bulmaJS.alert({message:"Please save all unsaved changes before adding fees.",contextualColorName:"warning"});let c,n,r;const i=(t,c=1)=>{cityssm.postJSON(a.urlPrefix+"/lotOccupancies/doAddLotOccupancyFee",{lotOccupancyId:o,feeId:t,quantity:c},t=>{t.success?(e=t.lotOccupancyFees,l(),d()):bulmaJS.alert({title:"Error Adding Fee",message:t.errorMessage||"",contextualColorName:"danger"})})},u=e=>{e.preventDefault();const t=Number.parseInt(e.currentTarget.dataset.feeId,10),a=Number.parseInt(e.currentTarget.closest(".container--feeCategory").dataset.feeCategoryId,10),o=c.find(e=>e.feeCategoryId===a).fees.find(e=>e.feeId===t);o.includeQuantity?(e=>{let t,c;const a=a=>{a.preventDefault(),i(e.feeId,t.value),c()};cityssm.openHtmlModal("lotOccupancy-setFeeQuantity",{onshow:t=>{t.querySelector("#lotOccupancyFeeQuantity--quantityUnit").textContent=e.quantityUnit},onshown:(e,o)=>{c=o,t=e.querySelector("#lotOccupancyFeeQuantity--quantity"),e.querySelector("form").addEventListener("submit",a)}})})(o):i(t)},d=()=>{const e=n.value.trim().toLowerCase().split(" ");r.innerHTML="";for(const a of c){const c=document.createElement("div");c.className="container--feeCategory",c.dataset.feeCategoryId=a.feeCategoryId.toString(),c.innerHTML='<h4 class="title is-5 mt-2">'+cityssm.escapeHTML(a.feeCategory||"")+'</h4><div class="panel mb-5"></div>';let o=!1;for(const n of a.fees){if(t.querySelector(".container--lotOccupancyFee[data-fee-id='"+n.feeId+"'][data-include-quantity='0']"))continue;let a=!0;for(const t of e)if(!n.feeName.toLowerCase().includes(t)){a=!1;break}if(!a)continue;o=!0;const s=document.createElement("a");s.className="panel-block is-block container--fee",s.dataset.feeId=n.feeId.toString(),s.href="#",s.innerHTML="<strong>"+cityssm.escapeHTML(n.feeName||"")+"</strong><br /><small>"+cityssm.escapeHTML(n.feeDescription||"").replace(/\n/g,"<br />")+"</small>",s.addEventListener("click",u),c.querySelector(".panel").append(s)}o&&r.append(c)}};cityssm.openHtmlModal("lotOccupancy-addFee",{onshow:e=>{n=e.querySelector("#feeSelect--feeName"),r=e.querySelector("#resultsContainer--feeSelect"),cityssm.postJSON(a.urlPrefix+"/lotOccupancies/doGetFees",{lotOccupancyId:o},e=>{c=e.feeCategories,n.disabled=!1,n.addEventListener("keyup",d),n.focus(),d()})},onshown:()=>{bulmaJS.toggleHtmlClipped()},onhidden:()=>{l()},onremoved:()=>{bulmaJS.toggleHtmlClipped()}})});let r=exports.lotOccupancyTransactions;delete exports.lotOccupancyTransactions;const i=document.querySelector("#container--lotOccupancyTransactions"),u=()=>{let e=0;for(const t of r)e+=t.transactionAmount;return e},d=e=>{const t=e.currentTarget.closest(".container--lotOccupancyTransaction").dataset.transactionIndex;bulmaJS.confirm({title:"Delete Trasnaction",message:"Are you sure you want to delete this transaction?",contextualColorName:"warning",okButton:{text:"Yes, Delete Transaction",callbackFunction:()=>{cityssm.postJSON(a.urlPrefix+"/lotOccupancies/doDeleteLotOccupancyTransaction",{lotOccupancyId:o,transactionIndex:t},e=>{e.success?(r=e.lotOccupancyTransactions,p()):bulmaJS.alert({title:"Error Deleting Transaction",message:e.errorMessage||"",contextualColorName:"danger"})})}}})},p=()=>{if(0===r.length)return void(i.innerHTML='<div class="message '+(0===e.length?"is-info":"is-warning")+'"><p class="message-body">There are no transactions associated with this record.</p></div>');i.innerHTML='<table class="table is-fullwidth is-striped is-hoverable"><thead><tr><th class="has-width-1">Date</th><th>'+cityssm.escapeHTML(exports.aliases.externalReceiptNumber)+'</th><th class="has-text-right has-width-1">Amount</th><th class="has-width-1 is-hidden-print"><span class="is-sr-only">Options</span></th></tr></thead><tbody></tbody><tfoot><tr><th colspan="2">Transaction Total</th><td class="has-text-weight-bold has-text-right" id="lotOccupancyTransactions--grandTotal"></td><td class="is-hidden-print"></td></tr></tfoot></table>';let t=0;for(const e of r){t+=e.transactionAmount;const c=document.createElement("tr");c.className="container--lotOccupancyTransaction",c.dataset.transactionIndex=e.transactionIndex.toString(),c.innerHTML="<td>"+e.transactionDateString+"</td><td>"+cityssm.escapeHTML(e.externalReceiptNumber||"")+"<br /><small>"+cityssm.escapeHTML(e.transactionNote||"")+'</small></td><td class="has-text-right">$'+e.transactionAmount.toFixed(2)+'</td><td class="is-hidden-print"><button class="button is-small is-danger is-light" data-tooltip="Delete Transaction" type="button"><i class="fas fa-trash" aria-hidden="true"></i></button></td>',c.querySelector("button").addEventListener("click",d),i.querySelector("tbody").append(c)}i.querySelector("#lotOccupancyTransactions--grandTotal").textContent="$"+t.toFixed(2);const a=c();a>t&&i.insertAdjacentHTML("afterbegin",'<div class="message is-warning"><div class="message-body"><div class="level"><div class="level-left"><div class="level-item">Outstanding Balance</div></div><div class="level-right"><div class="level-item">$'+(a-t).toFixed(2)+"</div></div></div></div></div>")};document.querySelector("#button--addTransaction").addEventListener("click",()=>{let e;const t=t=>{t.preventDefault(),cityssm.postJSON(a.urlPrefix+"/lotOccupancies/doAddLotOccupancyTransaction",t.currentTarget,t=>{t.success?(r=t.lotOccupancyTransactions,e(),p()):bulmaJS.confirm({title:"Error Adding Transaction",message:t.errorMessage||"",contextualColorName:"danger"})})};cityssm.openHtmlModal("lotOccupancy-addTransaction",{onshow:e=>{a.populateAliases(e),e.querySelector("#lotOccupancyTransactionAdd--lotOccupancyId").value=o.toString();const t=c(),n=u(),s=e.querySelector("#lotOccupancyTransactionAdd--transactionAmount");s.min=(-1*n).toFixed(2),s.max=Math.max(t-n,0).toFixed(2),s.value=Math.max(t-n,0).toFixed(2)},onshown:(c,a)=>{bulmaJS.toggleHtmlClipped(),e=a,c.querySelector("form").addEventListener("submit",t)},onremoved:()=>{bulmaJS.toggleHtmlClipped()}})}),l()}})();
\ No newline at end of file
diff --git a/types/recordTypes.d.ts b/types/recordTypes.d.ts
index ee15392a..5f321ddc 100644
--- a/types/recordTypes.d.ts
+++ b/types/recordTypes.d.ts
@@ -154,6 +154,7 @@ export interface LotOccupancyOccupant extends Record {
     occupantPostalCode?: string;
     occupantPhoneNumber?: string;
     occupantEmailAddress?: string;
+    occupantComment?: string;
     lotOccupancyIdCount?: number;
     recordUpdate_timeMillisMax?: number;
 }
diff --git a/types/recordTypes.ts b/types/recordTypes.ts
index d55ae71a..7818492f 100644
--- a/types/recordTypes.ts
+++ b/types/recordTypes.ts
@@ -203,6 +203,8 @@ export interface LotOccupancyOccupant extends Record {
 
     occupantPhoneNumber?: string;
     occupantEmailAddress?: string;
+
+    occupantComment?: string;
     
     lotOccupancyIdCount?: number;
     recordUpdate_timeMillisMax?: number;
diff --git a/views/lotOccupancy-view.ejs b/views/lotOccupancy-view.ejs
index 335948c4..fa0534be 100644
--- a/views/lotOccupancy-view.ejs
+++ b/views/lotOccupancy-view.ejs
@@ -155,17 +155,19 @@
         <table class="table is-fullwidth is-striped is-hoverable">
             <thead>
                 <tr>
-                    <th><%= configFunctions.getProperty("aliases.occupant") %> Type</th>
                     <th><%= configFunctions.getProperty("aliases.occupant") %></th>
                     <th>Address</th>
                     <th>Other Contact</th>
+                    <th>Comment</th>
                 </tr>
             </thead>
             <tbody>
                 <% for (const lotOccupancyOccupant of lotOccupancy.lotOccupancyOccupants) { %>
                 <tr>
-                    <td><%= lotOccupancyOccupant.lotOccupantType %></td>
-                    <td><%= lotOccupancyOccupant.occupantName %></td>
+                    <td>
+                        <%= lotOccupancyOccupant.occupantName %><br />
+                        <span class="tag"><%= lotOccupancyOccupant.lotOccupantType %></span>
+                    </td>
                     <td>
                         <% if (lotOccupancyOccupant.occupantAddress1) { %>
                             <%= lotOccupancyOccupant.occupantAddress1 %><br />
@@ -185,6 +187,9 @@
                         <% } %>
                         <%= lotOccupancyOccupant.occupantEmailAddress %>
                     </td>
+                    <td>
+                        <%= lotOccupancyOccupant.occupantComment %>
+                    </td>
                 </tr>
                 <% } %>
             </tbody>