From 81cdf6addd4f44d9d6d3ccd0ac630efd4b2caded Mon Sep 17 00:00:00 2001
From: Dan Wilcox <DanielWilcox@mcldaz.org>
Date: Thu, 20 Nov 2025 17:01:50 -0700
Subject: [PATCH 01/13] Add employee card base

---
 PolarisHelper/PolarisClient.cs                |   9 +
 PolarisHelper/PolarisHelper.csproj            |  13 +
 ocuda.sln                                     |   7 +
 .../Areas/Services/EmployeeCardController.cs  | 101 +++
 .../EmployeeCard/DetailsViewModel.cs          |  18 +
 .../ViewModels/EmployeeCard/IndexViewModel.cs |  14 +
 src/Ops.Controllers/Ops.Controllers.csproj    |   1 +
 .../EmployeeCardRequestRepository.cs          |  71 ++
 src/Ops.Data/PromenadeContext.cs              |   2 +
 src/Ops.Service/EmployeeCardService.cs        |  78 +++
 src/Ops.Service/Filters/EmployeeCardFilter.cs |  11 +
 .../IEmployeeCardRequestRepository.cs         |  14 +
 .../Services/IEmployeeCardService.cs          |  15 +
 .../Views/EmployeeCard/Details.cshtml         | 129 ++++
 .../Services/Views/EmployeeCard/Index.cshtml  |  73 ++
 .../Areas/Services/Views/_ViewImports.cshtml  |   7 +
 .../Areas/Services/Views/_ViewStart.cshtml    |   3 +
 src/Ops.Web/Startup.cs                        |   3 +
 src/Ops.Web/Views/Shared/_Layout.cshtml       | 655 +++++++++---------
 .../Filters/RestoreModelStateAttribute.cs     |  56 ++
 .../Filters/SaveModelStateAttribute.cs        |  40 ++
 .../ServicesController.cs                     | 107 +++
 src/Promenade.Controllers/TempDataKey.cs      |   2 +-
 .../Services/EmployeeCardViewModel.cs         |  10 +
 .../EmployeeCardRequestRepository.cs          |  24 +
 src/Promenade.Data/PromenadeContext.cs        |   1 +
 src/Promenade.Models/Defaults/SiteSetting.cs  |  21 +
 .../Entities/EmployeeCardRequest.cs           |  76 ++
 src/Promenade.Models/Keys/SiteSetting.cs      |  10 +
 src/Promenade.Service/EmployeeCardService.cs  |  33 +
 .../IEmployeeCardRequestRepository.cs         |  10 +
 src/Promenade.Web/Startup.cs                  |   5 +-
 .../Views/Services/EmployeeCard.cshtml        | 102 +++
 src/Promenade.Web/Views/Shared/_Layout.cshtml |   8 +
 src/i18n/Keys/Promenade.cs                    |  18 +
 35 files changed, 1421 insertions(+), 326 deletions(-)
 create mode 100644 PolarisHelper/PolarisClient.cs
 create mode 100644 PolarisHelper/PolarisHelper.csproj
 create mode 100644 src/Ops.Controllers/Areas/Services/EmployeeCardController.cs
 create mode 100644 src/Ops.Controllers/Areas/Services/ViewModels/EmployeeCard/DetailsViewModel.cs
 create mode 100644 src/Ops.Controllers/Areas/Services/ViewModels/EmployeeCard/IndexViewModel.cs
 create mode 100644 src/Ops.Data/Promenade/EmployeeCardRequestRepository.cs
 create mode 100644 src/Ops.Service/EmployeeCardService.cs
 create mode 100644 src/Ops.Service/Filters/EmployeeCardFilter.cs
 create mode 100644 src/Ops.Service/Interfaces/Promenade/Repositories/IEmployeeCardRequestRepository.cs
 create mode 100644 src/Ops.Service/Interfaces/Promenade/Services/IEmployeeCardService.cs
 create mode 100644 src/Ops.Web/Areas/Services/Views/EmployeeCard/Details.cshtml
 create mode 100644 src/Ops.Web/Areas/Services/Views/EmployeeCard/Index.cshtml
 create mode 100644 src/Ops.Web/Areas/Services/Views/_ViewImports.cshtml
 create mode 100644 src/Ops.Web/Areas/Services/Views/_ViewStart.cshtml
 create mode 100644 src/Promenade.Controllers/Filters/RestoreModelStateAttribute.cs
 create mode 100644 src/Promenade.Controllers/Filters/SaveModelStateAttribute.cs
 create mode 100644 src/Promenade.Controllers/ServicesController.cs
 create mode 100644 src/Promenade.Controllers/ViewModels/Services/EmployeeCardViewModel.cs
 create mode 100644 src/Promenade.Data/Promenade/EmployeeCardRequestRepository.cs
 create mode 100644 src/Promenade.Models/Entities/EmployeeCardRequest.cs
 create mode 100644 src/Promenade.Service/EmployeeCardService.cs
 create mode 100644 src/Promenade.Service/Interfaces/Repositories/IEmployeeCardRequestRepository.cs
 create mode 100644 src/Promenade.Web/Views/Services/EmployeeCard.cshtml

diff --git a/PolarisHelper/PolarisClient.cs b/PolarisHelper/PolarisClient.cs
new file mode 100644
index 000000000..f7ecf4f33
--- /dev/null
+++ b/PolarisHelper/PolarisClient.cs
@@ -0,0 +1,9 @@
+using Clc.Polaris.Api;
+using Clc.Polaris.Api.Models;
+
+namespace PolarisHelper
+{
+    public static class PolarisClient
+    {
+    }
+}
diff --git a/PolarisHelper/PolarisHelper.csproj b/PolarisHelper/PolarisHelper.csproj
new file mode 100644
index 000000000..704cb2f6e
--- /dev/null
+++ b/PolarisHelper/PolarisHelper.csproj
@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Clc.Polaris.Api" Version="3.1.4-alpha" />
+  </ItemGroup>
+
+</Project>
diff --git a/ocuda.sln b/ocuda.sln
index 0e5f995b9..950033228 100644
--- a/ocuda.sln
+++ b/ocuda.sln
@@ -89,6 +89,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "i18n.Test", "test\i18n\i18n
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SlideUploader", "src\SlideUploader\SlideUploader.csproj", "{0DF031C8-95B2-48D1-ACD9-01E56B10F3D6}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PolarisHelper", "PolarisHelper\PolarisHelper.csproj", "{2A8949EC-DC44-40C5-B07A-9FF935238A30}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -171,6 +173,10 @@ Global
 		{0DF031C8-95B2-48D1-ACD9-01E56B10F3D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0DF031C8-95B2-48D1-ACD9-01E56B10F3D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0DF031C8-95B2-48D1-ACD9-01E56B10F3D6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2A8949EC-DC44-40C5-B07A-9FF935238A30}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2A8949EC-DC44-40C5-B07A-9FF935238A30}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2A8949EC-DC44-40C5-B07A-9FF935238A30}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2A8949EC-DC44-40C5-B07A-9FF935238A30}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -198,6 +204,7 @@ Global
 		{1C0384E0-C8AD-46D9-9319-C75D67E6474E} = {EF2E402F-3D9C-4EAD-93A2-68D759A003A7}
 		{28C9B95E-DD9B-458B-86EC-37B265D66181} = {1C0384E0-C8AD-46D9-9319-C75D67E6474E}
 		{0DF031C8-95B2-48D1-ACD9-01E56B10F3D6} = {FC70E8FE-76E9-4D23-8D85-F219DD8BAC37}
+		{2A8949EC-DC44-40C5-B07A-9FF935238A30} = {FC70E8FE-76E9-4D23-8D85-F219DD8BAC37}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {E2592F73-781B-49DC-8020-540473F814F7}
diff --git a/src/Ops.Controllers/Areas/Services/EmployeeCardController.cs b/src/Ops.Controllers/Areas/Services/EmployeeCardController.cs
new file mode 100644
index 000000000..26e2c12ad
--- /dev/null
+++ b/src/Ops.Controllers/Areas/Services/EmployeeCardController.cs
@@ -0,0 +1,101 @@
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+using Ocuda.Ops.Controllers.Abstract;
+using Ocuda.Ops.Controllers.Areas.Services.ViewModels.EmployeeCard;
+using Ocuda.Ops.Controllers.Filters;
+using Ocuda.Ops.Service.Filters;
+using Ocuda.Ops.Service.Interfaces.Promenade.Services;
+
+namespace Ocuda.Ops.Controllers.Areas.Services
+{
+    [Area("Services")]
+    [Route("[area]/[controller]")]
+    public class EmployeeCardController : BaseController<EmployeeCardController>
+    {
+        public IEmployeeCardService _employeeCardService;
+
+        public EmployeeCardController(ServiceFacades.Controller<EmployeeCardController> context,
+            IEmployeeCardService employeeCardService)
+            : base(context)
+        {
+            ArgumentNullException.ThrowIfNull(employeeCardService);
+
+            _employeeCardService = employeeCardService;
+        }
+
+        public static String Name
+        { get { return "EmployeeCard"; } }
+
+        [HttpGet("[action]/{id}")]
+        [RestoreModelState]
+        public async Task<IActionResult> Details(int id)
+        {
+            var cardRequest = await _employeeCardService.GetRequestAsync(id);
+            if (cardRequest == null)
+            {
+                ShowAlertWarning($"Unable to find card request {id}");
+                return RedirectToAction(nameof(Index));
+            }
+
+            var viewModel = new DetailsViewModel
+            {
+                CardRequest = cardRequest
+            };
+
+            return View(viewModel);
+        }
+
+        [HttpPost("[action]/{id}")]
+        [SaveModelState]
+        public async Task<IActionResult> Details(DetailsViewModel viewModel)
+        {
+            ArgumentNullException.ThrowIfNull(viewModel);
+            if (viewModel.Action == DetailsViewModel.SubmitType.SaveNotes)
+            {
+                await _employeeCardService.UpdateNotesAsync(viewModel.CardRequest);
+            }
+            else
+            {
+
+            }
+            return RedirectToAction(nameof(Details), new { id = viewModel.CardRequest.Id });
+        }
+
+        [HttpGet]
+        public async Task<IActionResult> Index(int? page, bool processed)
+        {
+            page ??= 1;
+
+            var filter = new EmployeeCardFilter(page.Value)
+            {
+                IsProcessed = processed
+            };
+
+            var requests = await _employeeCardService.GetRequestsAsync(filter);
+
+            var viewModel = new IndexViewModel
+            {
+                CardRequests = requests.Data,
+                CurrentPage = page.Value,
+                IsProcessed = processed,
+                ItemCount = requests.Count,
+                ItemsPerPage = filter.Take.Value,
+            };
+
+            if (processed)
+            {
+                viewModel.PendingCount = await _employeeCardService.GetRequestCountAsync(false);
+                viewModel.ProcessedCount = viewModel.ItemCount;
+
+            }
+            else
+            {
+                viewModel.PendingCount = viewModel.ItemCount;
+                viewModel.ProcessedCount = await _employeeCardService.GetRequestCountAsync(true);
+            }
+
+            return View(viewModel);
+        }
+    }
+}
diff --git a/src/Ops.Controllers/Areas/Services/ViewModels/EmployeeCard/DetailsViewModel.cs b/src/Ops.Controllers/Areas/Services/ViewModels/EmployeeCard/DetailsViewModel.cs
new file mode 100644
index 000000000..892428312
--- /dev/null
+++ b/src/Ops.Controllers/Areas/Services/ViewModels/EmployeeCard/DetailsViewModel.cs
@@ -0,0 +1,18 @@
+using Ocuda.Promenade.Models.Entities;
+
+namespace Ocuda.Ops.Controllers.Areas.Services.ViewModels.EmployeeCard
+{
+    public class DetailsViewModel
+    {
+        public EmployeeCardRequest CardRequest { get; set; }
+        public SubmitType Action {get; set; }
+
+        public enum SubmitType
+        {
+            SaveNotes,
+            ProcessNoEmail,
+            ProcessWithEmail,
+            CreateCard
+        }
+    }
+}
diff --git a/src/Ops.Controllers/Areas/Services/ViewModels/EmployeeCard/IndexViewModel.cs b/src/Ops.Controllers/Areas/Services/ViewModels/EmployeeCard/IndexViewModel.cs
new file mode 100644
index 000000000..c24b3edaf
--- /dev/null
+++ b/src/Ops.Controllers/Areas/Services/ViewModels/EmployeeCard/IndexViewModel.cs
@@ -0,0 +1,14 @@
+using System.Collections.Generic;
+using Ocuda.Promenade.Models.Entities;
+using Ocuda.Utility.Models;
+
+namespace Ocuda.Ops.Controllers.Areas.Services.ViewModels.EmployeeCard
+{
+    public class IndexViewModel : PaginateModel
+    {
+        public ICollection<EmployeeCardRequest> CardRequests { get; set; }
+        public bool IsProcessed { get; set; }
+        public int PendingCount { get; set; }
+        public int ProcessedCount { get; set; }
+    }
+}
diff --git a/src/Ops.Controllers/Ops.Controllers.csproj b/src/Ops.Controllers/Ops.Controllers.csproj
index fe6cedc47..104847931 100644
--- a/src/Ops.Controllers/Ops.Controllers.csproj
+++ b/src/Ops.Controllers/Ops.Controllers.csproj
@@ -27,6 +27,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\PolarisHelper\PolarisHelper.csproj" />
     <ProjectReference Include="..\Ops.Service\Ops.Service.csproj" />
     <ProjectReference Include="..\Utility\Utility.csproj" />
   </ItemGroup>
diff --git a/src/Ops.Data/Promenade/EmployeeCardRequestRepository.cs b/src/Ops.Data/Promenade/EmployeeCardRequestRepository.cs
new file mode 100644
index 000000000..f060b754f
--- /dev/null
+++ b/src/Ops.Data/Promenade/EmployeeCardRequestRepository.cs
@@ -0,0 +1,71 @@
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+using Ocuda.Ops.Data.Extensions;
+using Ocuda.Ops.Data.ServiceFacade;
+using Ocuda.Ops.Service.Filters;
+using Ocuda.Ops.Service.Interfaces.Promenade.Repositories;
+using Ocuda.Promenade.Models.Entities;
+using Ocuda.Utility.Models;
+
+namespace Ocuda.Ops.Data.Promenade
+{
+    public class EmployeeCardRequestRepository
+        : GenericRepository<PromenadeContext, EmployeeCardRequest>, IEmployeeCardRequestRepository
+    {
+        public EmployeeCardRequestRepository(Repository<PromenadeContext> repositoryFacade,
+            ILogger<EmployeeCardRequestRepository> logger)
+            : base(repositoryFacade, logger)
+        {
+        }
+
+        public async Task<EmployeeCardRequest> GetByIdAsync(int Id)
+        {
+            return await DbSet
+                .AsNoTracking()
+                .Where(_ => _.Id == Id)
+                .SingleOrDefaultAsync();
+        }
+
+        public async Task<int> GetCountAsync(bool? isProcessed)
+        {
+            var query = DbSet.AsNoTracking();
+
+            if (isProcessed.HasValue)
+            {
+                query = query.Where(_ => _.ProcessedAt.HasValue == isProcessed);
+            }
+
+            return await query.CountAsync();
+        }
+
+        public async Task<CollectionWithCount<EmployeeCardRequest>> GetPaginatedAsync(
+            EmployeeCardFilter filter)
+        {
+            var query = DbSet.AsNoTracking();
+
+            if (filter?.IsProcessed.HasValue == true)
+            {
+                query = query.Where(_ => _.ProcessedAt.HasValue == filter.IsProcessed.Value);
+            }
+
+            if (filter?.IsProcessed == true)
+            {
+                query = query.OrderByDescending(_ => _.ProcessedAt);
+            }
+            else
+            {
+                query = query.OrderBy(_ => _.SubmittedAt);
+            }
+
+            return new CollectionWithCount<EmployeeCardRequest>
+            {
+                Count = await query.CountAsync(),
+                Data = await query
+                    .ApplyPagination(filter)
+                    .ToListAsync()
+            };
+        }
+    }
+}
diff --git a/src/Ops.Data/PromenadeContext.cs b/src/Ops.Data/PromenadeContext.cs
index be5d518ce..8f50c439b 100644
--- a/src/Ops.Data/PromenadeContext.cs
+++ b/src/Ops.Data/PromenadeContext.cs
@@ -46,6 +46,8 @@ protected PromenadeContext(DbContextOptions options) : base(options)
 
         public DbSet<EmediaText> EmediaTexts { get; set; }
 
+        public DbSet<EmployeeCardRequest> EmployeeCardRequests { get; }
+
         public DbSet<ExternalResource> ExternalResources { get; set; }
 
         public DbSet<Feature> Features { get; set; }
diff --git a/src/Ops.Service/EmployeeCardService.cs b/src/Ops.Service/EmployeeCardService.cs
new file mode 100644
index 000000000..a21caa765
--- /dev/null
+++ b/src/Ops.Service/EmployeeCardService.cs
@@ -0,0 +1,78 @@
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Logging;
+using Ocuda.Ops.Service.Abstract;
+using Ocuda.Ops.Service.Filters;
+using Ocuda.Ops.Service.Interfaces.Promenade.Repositories;
+using Ocuda.Ops.Service.Interfaces.Promenade.Services;
+using Ocuda.Promenade.Models.Entities;
+using Ocuda.Utility.Abstract;
+using Ocuda.Utility.Exceptions;
+using Ocuda.Utility.Models;
+
+namespace Ocuda.Ops.Service
+{
+    public class EmployeeCardService : BaseService<EmployeeCardService>, IEmployeeCardService
+    {
+        private readonly IDateTimeProvider _dateTimeProvider;
+        private readonly IEmployeeCardRequestRepository _employeeCardRequestRepository;
+
+        public EmployeeCardService(ILogger<EmployeeCardService> logger,
+            IHttpContextAccessor httpContext,
+            IDateTimeProvider dateTimeProvider,
+            IEmployeeCardRequestRepository employeeCardRequestRepository)
+            : base(logger, httpContext)
+        {
+            ArgumentNullException.ThrowIfNull(dateTimeProvider);
+            ArgumentNullException.ThrowIfNull(employeeCardRequestRepository);
+
+            _dateTimeProvider = dateTimeProvider;
+            _employeeCardRequestRepository = employeeCardRequestRepository;
+        }
+
+        public async Task<EmployeeCardRequest> GetRequestAsync(int requestId)
+        {
+            return await _employeeCardRequestRepository.GetByIdAsync(requestId);
+        }
+
+        public async Task<int> GetRequestCountAsync(bool? isProcessed)
+        {
+            return await _employeeCardRequestRepository.GetCountAsync(isProcessed);
+        }
+
+        public async Task<CollectionWithCount<EmployeeCardRequest>> GetRequestsAsync(
+            EmployeeCardFilter filter)
+        {
+            return await _employeeCardRequestRepository.GetPaginatedAsync(filter);
+        }
+
+        public async Task ProcessAsync(EmployeeCardRequest cardRequest)
+        {
+            ArgumentNullException.ThrowIfNull(cardRequest);
+
+            var currentRequest = await _employeeCardRequestRepository.GetByIdAsync(cardRequest.Id);
+
+            if (currentRequest.ProcessedAt.HasValue)
+            {
+                throw new OcudaException("Request has already been processed.");
+            }
+
+            currentRequest.CardNumber = cardRequest.CardNumber.Trim();
+            currentRequest.Notes = cardRequest.Notes;
+            currentRequest.ProcessedAt = _dateTimeProvider.Now;
+            currentRequest.ProcessedBy = GetCurrentUserId();
+        }
+
+        public async Task UpdateNotesAsync(EmployeeCardRequest cardRequest)
+        {
+            ArgumentNullException.ThrowIfNull(cardRequest);
+
+            var currentRequest = await _employeeCardRequestRepository.GetByIdAsync(cardRequest.Id);
+            currentRequest.Notes = cardRequest.Notes.Trim();
+
+            await _employeeCardRequestRepository.AddAsync(currentRequest);
+            await _employeeCardRequestRepository.SaveAsync();
+        }
+    }
+}
diff --git a/src/Ops.Service/Filters/EmployeeCardFilter.cs b/src/Ops.Service/Filters/EmployeeCardFilter.cs
new file mode 100644
index 000000000..bd7f64e6c
--- /dev/null
+++ b/src/Ops.Service/Filters/EmployeeCardFilter.cs
@@ -0,0 +1,11 @@
+namespace Ocuda.Ops.Service.Filters
+{
+    public class EmployeeCardFilter : BaseFilter
+    {
+        public EmployeeCardFilter(int page) : base(page)
+        {
+        }
+
+        public bool? IsProcessed { get; set; }
+    }
+}
diff --git a/src/Ops.Service/Interfaces/Promenade/Repositories/IEmployeeCardRequestRepository.cs b/src/Ops.Service/Interfaces/Promenade/Repositories/IEmployeeCardRequestRepository.cs
new file mode 100644
index 000000000..ad15b3299
--- /dev/null
+++ b/src/Ops.Service/Interfaces/Promenade/Repositories/IEmployeeCardRequestRepository.cs
@@ -0,0 +1,14 @@
+using System.Threading.Tasks;
+using Ocuda.Ops.Service.Filters;
+using Ocuda.Promenade.Models.Entities;
+using Ocuda.Utility.Models;
+
+namespace Ocuda.Ops.Service.Interfaces.Promenade.Repositories
+{
+    public interface IEmployeeCardRequestRepository : IGenericRepository<EmployeeCardRequest>
+    {
+        Task<EmployeeCardRequest> GetByIdAsync(int Id);
+        Task<int> GetCountAsync(bool? isProcessed);
+        Task<CollectionWithCount<EmployeeCardRequest>> GetPaginatedAsync(EmployeeCardFilter filter);
+    }
+}
diff --git a/src/Ops.Service/Interfaces/Promenade/Services/IEmployeeCardService.cs b/src/Ops.Service/Interfaces/Promenade/Services/IEmployeeCardService.cs
new file mode 100644
index 000000000..715367847
--- /dev/null
+++ b/src/Ops.Service/Interfaces/Promenade/Services/IEmployeeCardService.cs
@@ -0,0 +1,15 @@
+using System.Threading.Tasks;
+using Ocuda.Ops.Service.Filters;
+using Ocuda.Promenade.Models.Entities;
+using Ocuda.Utility.Models;
+
+namespace Ocuda.Ops.Service.Interfaces.Promenade.Services
+{
+    public interface IEmployeeCardService
+    {
+        Task<EmployeeCardRequest> GetRequestAsync(int requestId);
+        Task<int> GetRequestCountAsync(bool? isProcessed);
+        Task<CollectionWithCount<EmployeeCardRequest>> GetRequestsAsync(EmployeeCardFilter filter);
+        Task UpdateNotesAsync(EmployeeCardRequest cardRequest);
+    }
+}
diff --git a/src/Ops.Web/Areas/Services/Views/EmployeeCard/Details.cshtml b/src/Ops.Web/Areas/Services/Views/EmployeeCard/Details.cshtml
new file mode 100644
index 000000000..fa61eaae2
--- /dev/null
+++ b/src/Ops.Web/Areas/Services/Views/EmployeeCard/Details.cshtml
@@ -0,0 +1,129 @@
+@model Ocuda.Ops.Controllers.Areas.Services.ViewModels.EmployeeCard.DetailsViewModel
+
+<form asp-controller="@EmployeeCardController.Name"
+	  asp-action="@nameof(EmployeeCardController.Details)"
+	  method="post"
+	  role="form">
+	<input asp-for="CardRequest.Id" type="hidden" />
+
+	<div class="d-flex flex-wrap justify-content-between mb-2">
+		<h1 class="mb-0">
+			Employee Card Request
+			<small class="text-muted">#@Model.CardRequest.Id</small>
+		</h1>
+		<div>
+			<button name="Action"
+					value="@DetailsViewModel.SubmitType.CreateCard"
+					type="submit"
+					class="btn btn-outline-primary align-top mt-2">
+				<div>
+					<span class="fa fa-credit-card fa-fw"></span>
+					Create Polaris Account
+				</div>
+				<div>and Send Email</div>
+			</button>
+			<button name="Action"
+					value="@DetailsViewModel.SubmitType.ProcessWithEmail"
+					type="submit"
+					class="btn btn-outline-secondary align-top mt-2">
+				<div>
+					<span class="fa fa-circle-check fa-fw"></span>
+					Mark Processed
+				</div>
+				<div>and Send Email</div>
+			</button>
+			<button name="Action"
+					value="@DetailsViewModel.SubmitType.ProcessNoEmail"
+					type="submit"
+					class="btn btn-outline-warning align-top mt-2">
+				<div>
+					<span class="fa fa-circle-xmark fa-fw"></span>
+					Mark Processed
+				</div>
+				<div>and DO NOT Send Email</div>
+			</button>
+			<button name="Action"
+					value="@DetailsViewModel.SubmitType.SaveNotes"
+					type="submit"
+					class="btn btn-outline-info align-top mt-2">
+				<span class="fa fa-comment fa-fw"></span>
+				Save Notes
+			</button>
+			<a class="btn btn-outline-dark align-top mt-2"
+			   asp-controller="@EmployeeCardController.Name"
+			   asp-action="@(nameof(EmployeeCardController.Index))"
+			   asp-route-processed="@Model.CardRequest.ProcessedAt.HasValue">Back</a>
+		</div>
+	</div>
+
+	<div class="row">
+		<h4 class="col-md-3 text-md-end">Account Details</h4>
+	</div>
+	<div class="row mt-2">
+		<div class="col-md-3 text-md-end"><strong>Renewing?</strong></div>
+		<div class="col-md-9">@(Model.CardRequest.ExistingAccount ? "Yes" : "No")</div>
+	</div>
+	<div class="row mt-2">
+		@if (Model.CardRequest.ProcessedAt.HasValue)
+		{
+			<div class="col-md-3 text-md-end"><strong>Library Card #</strong></div>
+			<div class="col-md-9">@Model.CardRequest.CardNumber</div>
+		}
+		else
+		{
+			<input asp-for="CardRequest.CardNumber" formgroup label-class="col-md-3 fw-bold" />
+		}
+	</div>
+	<div class="row mt-3">
+		<div class="col-md-3 text-md-end"><strong>Last Name</strong></div>
+		<div class="col-md-9">@Model.CardRequest.LastName</div>
+	</div>
+	<div class="row mt-2">
+		<div class="col-md-3 text-md-end"><strong>First Name</strong></div>
+		<div class="col-md-9">@Model.CardRequest.FirstName</div>
+	</div>
+	<div class="row mt-4">
+		<div class="col-md-3 text-md-end"><strong>Address</strong></div>
+		<div class="col-md-9">@Model.CardRequest.StreetAddress</div>
+	</div>
+	<div class="row mt-2">
+		<div class="col-md-9 offset-md-3">@Model.CardRequest.City</div>
+	</div>
+	<div class="row mt-2">
+		<div class="col-md-9 offset-md-3">@Model.CardRequest.ZipCode</div>
+	</div>
+	<div class="row mt-4">
+		<div class="col-md-3 text-md-end"><strong>Email</strong></div>
+		<div class="col-md-9">@Model.CardRequest.Email</div>
+	</div>
+	<div class="row mt-2">
+		<div class="col-md-3 text-md-end"><strong>Phone Number</strong></div>
+		<div class="col-md-9">@Model.CardRequest.Phone</div>
+	</div>
+	<div class="row mt-2">
+		<div class="col-md-3 text-md-end"><strong>Birth Date</strong></div>
+		<div class="col-md-9">@Model.CardRequest.BirthDate</div>
+	</div>
+	<div class="row mt-4">
+		<div class="col-md-3 text-md-end"><strong>Department</strong></div>
+		<div class="col-md-9">@Model.CardRequest.Department</div>
+	</div>
+	<div class="row mt-2">
+		<div class="col-md-3 text-md-end"><strong>Employee #</strong></div>
+		<div class="col-md-9">@Model.CardRequest.EmployeeNumber</div>
+	</div>
+
+	<div class="row mt-4">
+		<h4 class="col-md-3 text-md-end">Request notes</h4>
+	</div>
+	<div class="row mt-2">
+		<div class="col-md-3 text-md-end">
+			<label asp-for="CardRequest.Notes" class="form-label fw-bold mb-0"></label>
+			<div><em>(Not saved in Polaris)</em></div>
+		</div>
+		<div class="col-md-9">
+			<textarea asp-for="CardRequest.Notes" class="form-control" rows="3"></textarea>
+			<span asp-validation-for="CardRequest.Notes" class="text-danger"></span>
+		</div>
+	</div>
+</form>
\ No newline at end of file
diff --git a/src/Ops.Web/Areas/Services/Views/EmployeeCard/Index.cshtml b/src/Ops.Web/Areas/Services/Views/EmployeeCard/Index.cshtml
new file mode 100644
index 000000000..a3c258e42
--- /dev/null
+++ b/src/Ops.Web/Areas/Services/Views/EmployeeCard/Index.cshtml
@@ -0,0 +1,73 @@
+@model Ocuda.Ops.Controllers.Areas.Services.ViewModels.EmployeeCard.IndexViewModel
+
+<div class="row">
+	<div class="col-12 col-md-6 mb-2">
+		<h1>Employee Card Requests</h1>
+	</div>
+</div>
+
+<div class="row mb-2">
+	<div class="col-12">
+		<div class="d-inline-block">
+			<ul class="nav nav-pills">
+				<li class="nav-item">
+					<a asp-action="@nameof(EmployeeCardController.Index)"
+					   asp-route-Processed=""
+					   class="nav-link"
+					   ActiveBy routeKey="processed" value=",false">
+						Pending
+					</a>
+				</li>
+				<li class="nav-item">
+					<a asp-action="@nameof(EmployeeCardController.Index)"
+					   asp-route-Processed="true"
+					   class="nav-link"
+					   ActiveBy routeKey="processed"
+					   value="@true">
+						Processed
+					</a>
+				</li>
+			</ul>
+		</div>
+	</div>
+</div>
+
+<table class="table table-sm table-bordered link-table">
+	<thead>
+		<tr>
+			<th>@(Model.IsProcessed ? "Processed" : "Submitted")</th>
+			<th>Name</th>
+			<th>Email</th>
+			<th>Department</th>
+		</tr>
+	</thead>
+	<tbody>
+		@if (Model.ItemCount == 0)
+		{
+			<tr>
+				<td colspan="4">
+					No requests found.
+				</td>
+			</tr>
+		}
+		else
+		{
+			@foreach (var request in Model.CardRequests)
+			{
+				<tr>
+					<td>
+						<a asp-action="@(nameof(EmployeeCardController.Details))"
+						   asp-route-id="@request.Id">
+							@(Model.IsProcessed? request.ProcessedAt: request.SubmittedAt)
+						</a>
+					</td>
+					<td>@request.FirstName @request.LastName</td>
+					<td>@request.Email</td>
+					<td>@request.Department</td>
+				</tr>
+			}
+		}
+	</tbody>
+</table>
+
+<nav paginate="@Model"></nav>
\ No newline at end of file
diff --git a/src/Ops.Web/Areas/Services/Views/_ViewImports.cshtml b/src/Ops.Web/Areas/Services/Views/_ViewImports.cshtml
new file mode 100644
index 000000000..ea056420d
--- /dev/null
+++ b/src/Ops.Web/Areas/Services/Views/_ViewImports.cshtml
@@ -0,0 +1,7 @@
+@using Ocuda.Ops.Web
+@using Ocuda.Ops.Controllers.Areas.Services
+@using Ocuda.Ops.Controllers.Areas.Services.ViewModels.EmployeeCard
+@using Ocuda.Promenade.Models.Entities
+@using Ocuda.Utility.TagHelpers
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
+@addTagHelper *, Ocuda.Utility
\ No newline at end of file
diff --git a/src/Ops.Web/Areas/Services/Views/_ViewStart.cshtml b/src/Ops.Web/Areas/Services/Views/_ViewStart.cshtml
new file mode 100644
index 000000000..2de62418c
--- /dev/null
+++ b/src/Ops.Web/Areas/Services/Views/_ViewStart.cshtml
@@ -0,0 +1,3 @@
+@{
+    Layout = "~/Views/Shared/_Layout.cshtml";
+}
diff --git a/src/Ops.Web/Startup.cs b/src/Ops.Web/Startup.cs
index e682ba964..a57104568 100644
--- a/src/Ops.Web/Startup.cs
+++ b/src/Ops.Web/Startup.cs
@@ -466,6 +466,8 @@ string cacheDiscriminator
                 Data.Promenade.EmediaRepository>();
             services.AddScoped<Service.Interfaces.Promenade.Repositories.IEmediaTextRepository,
                 Data.Promenade.EmediaTextRepository>();
+            services.AddScoped<Service.Interfaces.Promenade.Repositories.IEmployeeCardRequestRepository,
+                Data.Promenade.EmployeeCardRequestRepository>();
             services.AddScoped<Service.Interfaces.Promenade.Repositories.IExternalResourcePromRepository,
                 Data.Promenade.ExternalResourcePromRepository>();
             services.AddScoped<Service.Interfaces.Promenade.Repositories.IFeatureRepository,
@@ -565,6 +567,7 @@ string cacheDiscriminator
             services.AddScoped<IDigitalDisplaySyncService, DigitalDisplaySyncService>();
             services.AddScoped<IEmediaService, EmediaService>();
             services.AddScoped<IEmailService, EmailService>();
+            services.AddScoped<IEmployeeCardService, EmployeeCardService>();
             services.AddScoped<IExternalResourcePromService, ExternalResourcePromService>();
             services.AddScoped<IExternalResourceService, ExternalResourceService>();
             services.AddScoped<IFeatureService, FeatureService>();
diff --git a/src/Ops.Web/Views/Shared/_Layout.cshtml b/src/Ops.Web/Views/Shared/_Layout.cshtml
index 97495414e..823d1a2ef 100644
--- a/src/Ops.Web/Views/Shared/_Layout.cshtml
+++ b/src/Ops.Web/Views/Shared/_Layout.cshtml
@@ -1,336 +1,343 @@
 @{
-    var navigationRows = Context.Items[ItemKey.NavColumn] as List<NavigationRow>;
-    var locations = Context.Items[ItemKey.Locations] as IDictionary<string, string>;
+	var navigationRows = Context.Items[ItemKey.NavColumn] as List<NavigationRow>;
+	var locations = Context.Items[ItemKey.Locations] as IDictionary<string, string>;
 }
 <!DOCTYPE html>
 <html>
 <head>
-    <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>@ViewData[Ocuda.Ops.Controllers.ViewDataKey.Title]</title>
-    <link rel="stylesheet" href="~/css/bootstrap.min.css" />
-    <link rel="stylesheet" href="~/css/main.min.css" />
-    @if (Context.Items.ContainsKey(ItemKey.ExternalCSS))
-    {
-        foreach (var cssUrl in (List<string>)Context.Items[ItemKey.ExternalCSS])
-        {
-            <link rel="stylesheet" href="@cssUrl" asp-append-version="true" />
-        }
-    }
-    @RenderSection("Styles", required: false)
+	<meta charset="utf-8" />
+	<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+	<title>@ViewData[Ocuda.Ops.Controllers.ViewDataKey.Title]</title>
+	<link rel="stylesheet" href="~/css/bootstrap.min.css" />
+	<link rel="stylesheet" href="~/css/main.min.css" />
+	@if (Context.Items.ContainsKey(ItemKey.ExternalCSS))
+	{
+		foreach (var cssUrl in (List<string>)Context.Items[ItemKey.ExternalCSS])
+		{
+			<link rel="stylesheet" href="@cssUrl" asp-append-version="true" />
+		}
+	}
+	@RenderSection("Styles", required: false)
 </head>
 <body>
-    <nav class="navbar navbar-expand-sm navbar-static-top navbar-dark bg-dark oc-navbar d-print-none">
-        <div class="container-fluid m-o px-2 py-0">
-            @if (navigationRows?.Count > 0)
-            {
-                <a id="openNavColumn" href="#" style="margin-right: 1rem; padding: 0.5rem">
-                    <span class="fa-solid fa-ellipsis-vertical fa-inverse"></span>
-                </a>
-            }
-            <ul class="navbar-nav oc-navbrand">
-                <li class="nav-item dropdown">
-                    <a class="nav-link dropdown-toggle text-white"
-                       href="#"
-                       id="intranetDropdown"
-                       role="button"
-                       data-bs-toggle="dropdown"
-                       title="Intranet">
-                        <span class="fa-solid fa-circle-info fa-fw"></span>
-                        Intranet
-                    </a>
-                    <div class="dropdown-menu">
-                        @if (Context.Items[ItemKey.Sections] != null)
-                        {
-                            @foreach (var opsSection in (ICollection<Ocuda.Ops.Models.Entities.Section>)Context.Items[ItemKey.Sections])
-                            {
-                                <a class="dropdown-item"
-                                   asp-area=""
-                                   asp-route-slug="@opsSection.Slug"
-                                   asp-controller="@HomeController.Name"
-                                   asp-action="@(nameof(HomeController.SectionIndex))">
-                                    @if (!string.IsNullOrEmpty(opsSection.Icon))
-                                    {
-                                        <span class="@opsSection.Icon fa-fw"></span>
-                                    }
-                                    @opsSection.Name
-                                    @if (opsSection.SupervisorsOnly)
-                                    {
-                                        <span class="text-muted fa-solid fa-lock fa-fw oc-dropdown-locked"></span>
-                                    }
-                                </a>
-                            }
-                        }
-                    </div>
-                </li>
-            </ul>
-            <button class="navbar-toggler btn-sm justify-self-end" type="button"
-                    data-bs-toggle="collapse" data-bs-target=".navbar-collapse">
-                <span class="visually-hidden">Toggle Navigation</span>
-                Menu
-            </button>
+	<nav class="navbar navbar-expand-sm navbar-static-top navbar-dark bg-dark oc-navbar d-print-none">
+		<div class="container-fluid m-o px-2 py-0">
+			@if (navigationRows?.Count > 0)
+			{
+				<a id="openNavColumn" href="#" style="margin-right: 1rem; padding: 0.5rem">
+					<span class="fa-solid fa-ellipsis-vertical fa-inverse"></span>
+				</a>
+			}
+			<ul class="navbar-nav oc-navbrand">
+				<li class="nav-item dropdown">
+					<a class="nav-link dropdown-toggle text-white"
+					   href="#"
+					   id="intranetDropdown"
+					   role="button"
+					   data-bs-toggle="dropdown"
+					   title="Intranet">
+						<span class="fa-solid fa-circle-info fa-fw"></span>
+						Intranet
+					</a>
+					<div class="dropdown-menu">
+						@if (Context.Items[ItemKey.Sections] != null)
+						{
+							@foreach (var opsSection in (ICollection<Ocuda.Ops.Models.Entities.Section>)Context.Items[ItemKey.Sections])
+							{
+								<a class="dropdown-item"
+								   asp-area=""
+								   asp-route-slug="@opsSection.Slug"
+								   asp-controller="@HomeController.Name"
+								   asp-action="@(nameof(HomeController.SectionIndex))">
+									@if (!string.IsNullOrEmpty(opsSection.Icon))
+									{
+										<span class="@opsSection.Icon fa-fw"></span>
+									}
+									@opsSection.Name
+									@if (opsSection.SupervisorsOnly)
+									{
+										<span class="text-muted fa-solid fa-lock fa-fw oc-dropdown-locked"></span>
+									}
+								</a>
+							}
+						}
+					</div>
+				</li>
+			</ul>
+			<button class="navbar-toggler btn-sm justify-self-end" type="button"
+					data-bs-toggle="collapse" data-bs-target=".navbar-collapse">
+				<span class="visually-hidden">Toggle Navigation</span>
+				Menu
+			</button>
 
-            <div class="collapse navbar-collapse">
-                <ul class="navbar-nav">
-                    <li class="nav-item dropdown">
-                        <a class="nav-link dropdown-toggle text-white"
-                           href="#"
-                           id="navbarLocationsDropdown"
-                           role="button"
-                           data-bs-toggle="dropdown"
-                           aria-haspopup="true"
-                           aria-expanded="false"
-                           title="Locations">
-                            <span class="fa-solid fa-location-dot fa-fw"></span>
-                            Locations
-                        </a>
-                        <div class="dropdown-menu"
-                             aria-labelledby="navbarLocationsDropdown">
-                            <a class="dropdown-item"
-                               asp-action="@nameof(Ocuda.Ops.Controllers.LocationsController.Index)"
-                               asp-area=""
-                               asp-controller="@Ocuda.Ops.Controllers.LocationsController.Name">
-                                All Locations
-                            </a>
-                            @if (locations?.Count > 0)
-                            {
-                                foreach (var location in locations.OrderBy(_ => _.Value))
-                                {
-                                    <a class="dropdown-item"
-                                       asp-action="@nameof(Ocuda.Ops.Controllers.LocationsController.Details)"
-                                       asp-area=""
-                                       asp-controller="@Ocuda.Ops.Controllers.LocationsController.Name"
-                                       asp-route-slug="@location.Key">
-                                        @location.Value
-                                    </a>
-                                }
-                            }
-                        </div>
-                    </li>
-                </ul>
-                <ul class="navbar-nav">
-                    <li class="nav-item dropdown">
-                        <a class="nav-link dropdown-toggle text-white"
-                           href="#"
-                           id="navbarPeopleDropdown"
-                           role="button"
-                           data-bs-toggle="dropdown"
-                           aria-haspopup="true"
-                           aria-expanded="false"
-                           title="Customer Service">
-                            <span class="fa-solid fa-users fa-fw"></span>
-                            Customer Service
-                        </a>
-                        <div class="dropdown-menu"
-                             aria-labelledby="navbarPeopleDropdown">
-                            <a class="dropdown-item"
-                               asp-controller="@Ocuda.Ops.Controllers.Areas.Contact.ScheduleController.Name"
-                               asp-area="@(nameof(Ocuda.Ops.Controllers.Areas.Contact))"
-                               asp-action="@(nameof(Ocuda.Ops.Controllers.Areas.Contact.ScheduleController.Index))">
-                                <span class="fa-regular fa-clock fa-fw"></span>
-                                Book a Librarian
-                            </a>
-                            <a class="dropdown-item"
-                               asp-controller="@Ocuda.Ops.Controllers.Areas.Incident.HomeController.Name"
-                               asp-area="@(nameof(Ocuda.Ops.Controllers.Areas.Incident))"
-                               asp-action="@(nameof(Ocuda.Ops.Controllers.Areas.Incident.HomeController.Mine))">
-                                <span class="fa-solid fa-user-injured fa-fw"></span>
-                                Incident Reports
-                            </a>
-                            <a class="dropdown-item"
-                               asp-controller="@Ocuda.Ops.Controllers.Areas.VolunteerSubmissions.HomeController.Name"
-                               asp-area="@(nameof(Ocuda.Ops.Controllers.Areas.VolunteerSubmissions))"
-                               asp-action="@(nameof(Ocuda.Ops.Controllers.Areas.VolunteerSubmissions.HomeController.All))">
-                                <span class="fa-solid fa-hands-helping fa-fw"></span>
-                                Volunteer Submissions
-                            </a>
-                        </div>
-                    </li>
-                </ul>
-                <ul class="navbar-nav">
-                    <li class="nav-item dropdown">
-                        <a class="nav-link dropdown-toggle text-white"
-                           href="#"
-                           id="navbarMaterialsDropdown"
-                           role="button"
-                           data-bs-toggle="dropdown"
-                           aria-haspopup="true"
-                           aria-expanded="false"
-                           title="Materials">
-                            <span class="fa-solid fa-book fa-fw"></span>
-                            Materials
-                        </a>
-                        <div class="dropdown-menu"
-                             aria-labelledby="navbarMaterialsDropdown">
-                            <a class="dropdown-item"
-                               asp-controller="@Ocuda.Ops.Controllers.Areas.CoverIssue.HomeController.Name"
-                               asp-area="@(nameof(Ocuda.Ops.Controllers.Areas.CoverIssue))"
-                               asp-action="@(nameof(Ocuda.Ops.Controllers.Areas.CoverIssue.HomeController.Index))">
-                                <span class="fa-solid fa-book-skull fa-fw"></span>
-                                Cover Issues
-                            </a>
-                        </div>
-                    </li>
-                </ul>
-            </div>
+			<div class="collapse navbar-collapse">
+				<ul class="navbar-nav">
+					<li class="nav-item dropdown">
+						<a class="nav-link dropdown-toggle text-white"
+						   href="#"
+						   id="navbarLocationsDropdown"
+						   role="button"
+						   data-bs-toggle="dropdown"
+						   aria-haspopup="true"
+						   aria-expanded="false"
+						   title="Locations">
+							<span class="fa-solid fa-location-dot fa-fw"></span>
+							Locations
+						</a>
+						<div class="dropdown-menu"
+							 aria-labelledby="navbarLocationsDropdown">
+							<a class="dropdown-item"
+							   asp-action="@nameof(Ocuda.Ops.Controllers.LocationsController.Index)"
+							   asp-area=""
+							   asp-controller="@Ocuda.Ops.Controllers.LocationsController.Name">
+								All Locations
+							</a>
+							@if (locations?.Count > 0)
+							{
+								foreach (var location in locations.OrderBy(_ => _.Value))
+								{
+									<a class="dropdown-item"
+									   asp-action="@nameof(Ocuda.Ops.Controllers.LocationsController.Details)"
+									   asp-area=""
+									   asp-controller="@Ocuda.Ops.Controllers.LocationsController.Name"
+									   asp-route-slug="@location.Key">
+										@location.Value
+									</a>
+								}
+							}
+						</div>
+					</li>
+				</ul>
+				<ul class="navbar-nav">
+					<li class="nav-item dropdown">
+						<a class="nav-link dropdown-toggle text-white"
+						   href="#"
+						   id="navbarPeopleDropdown"
+						   role="button"
+						   data-bs-toggle="dropdown"
+						   aria-haspopup="true"
+						   aria-expanded="false"
+						   title="Customer Service">
+							<span class="fa-solid fa-users fa-fw"></span>
+							Customer Service
+						</a>
+						<div class="dropdown-menu"
+							 aria-labelledby="navbarPeopleDropdown">
+							<a class="dropdown-item"
+							   asp-controller="@Ocuda.Ops.Controllers.Areas.Contact.ScheduleController.Name"
+							   asp-area="@(nameof(Ocuda.Ops.Controllers.Areas.Contact))"
+							   asp-action="@(nameof(Ocuda.Ops.Controllers.Areas.Contact.ScheduleController.Index))">
+								<span class="fa-regular fa-clock fa-fw"></span>
+								Book a Librarian
+							</a>
+							<a class="dropdown-item"
+							   asp-controller="@Ocuda.Ops.Controllers.Areas.Services.EmployeeCardController.Name"
+							   asp-area="@(nameof(Ocuda.Ops.Controllers.Areas.Services))"
+							   asp-action="@(nameof(Ocuda.Ops.Controllers.Areas.Services.EmployeeCardController.Index))">
+								<span class="fa-solid fa-clipboard-user fa-fw"></span>
+								Employee Card
+							</a>
+							<a class="dropdown-item"
+							   asp-controller="@Ocuda.Ops.Controllers.Areas.Incident.HomeController.Name"
+							   asp-area="@(nameof(Ocuda.Ops.Controllers.Areas.Incident))"
+							   asp-action="@(nameof(Ocuda.Ops.Controllers.Areas.Incident.HomeController.Mine))">
+								<span class="fa-solid fa-user-injured fa-fw"></span>
+								Incident Reports
+							</a>
+							<a class="dropdown-item"
+							   asp-controller="@Ocuda.Ops.Controllers.Areas.VolunteerSubmissions.HomeController.Name"
+							   asp-area="@(nameof(Ocuda.Ops.Controllers.Areas.VolunteerSubmissions))"
+							   asp-action="@(nameof(Ocuda.Ops.Controllers.Areas.VolunteerSubmissions.HomeController.All))">
+								<span class="fa-solid fa-hands-helping fa-fw"></span>
+								Volunteer Submissions
+							</a>
+						</div>
+					</li>
+				</ul>
+				<ul class="navbar-nav">
+					<li class="nav-item dropdown">
+						<a class="nav-link dropdown-toggle text-white"
+						   href="#"
+						   id="navbarMaterialsDropdown"
+						   role="button"
+						   data-bs-toggle="dropdown"
+						   aria-haspopup="true"
+						   aria-expanded="false"
+						   title="Materials">
+							<span class="fa-solid fa-book fa-fw"></span>
+							Materials
+						</a>
+						<div class="dropdown-menu"
+							 aria-labelledby="navbarMaterialsDropdown">
+							<a class="dropdown-item"
+							   asp-controller="@Ocuda.Ops.Controllers.Areas.CoverIssue.HomeController.Name"
+							   asp-area="@(nameof(Ocuda.Ops.Controllers.Areas.CoverIssue))"
+							   asp-action="@(nameof(Ocuda.Ops.Controllers.Areas.CoverIssue.HomeController.Index))">
+								<span class="fa-solid fa-book-skull fa-fw"></span>
+								Cover Issues
+							</a>
+						</div>
+					</li>
+				</ul>
+			</div>
 
-            <div class="collapse navbar-collapse justify-content-end">
-                <ul class="navbar-nav">
-                    <li class="nav-item dropdown">
-                        <a class="nav-link dropdown-toggle text-white"
-                           href="#"
-                           id="navbarManagementDropdown"
-                           role="button"
-                           data-bs-toggle="dropdown"
-                           aria-haspopup="true"
-                           aria-expanded="false"
-                           title="Management">
-                            <span class="fa-solid fa-gear fa-fw"></span>
-                        </a>
-                        <div class="dropdown-menu dropdown-menu-end"
-                             aria-labelledby="navbarManagementDropdown">
-                            <a class="dropdown-item"
-                               asp-controller="@Ocuda.Ops.Controllers.Areas.ContentManagement.HomeController.Name"
-                               asp-area="@(nameof(Ocuda.Ops.Controllers.Areas.ContentManagement))"
-                               asp-action="@(nameof(Ocuda.Ops.Controllers.Areas.ContentManagement.HomeController.Index))">
-                                <span class="fa-solid fa-network-wired fa-fw"></span>
-                                Intranet Management
-                            </a>
-                            @if (Context.User?.HasClaim(ClaimType.HasSiteAdminRights, ClaimType.HasSiteAdminRights) == true)
-                            {
-                                <a class="dropdown-item"
-                                   asp-controller="@Ocuda.Ops.Controllers.Areas.SiteManagement.HomeController.Name"
-                                   asp-area="@(nameof(Ocuda.Ops.Controllers.Areas.SiteManagement))"
-                                   asp-action="@(nameof(Ocuda.Ops.Controllers.Areas.SiteManagement.HomeController.Index))">
-                                    <span class="fa-solid fa-earth-americas fa-fw"></span>
-                                    Web Site Management
-                                </a>
-                            }
-                        </div>
-                    </li>
-                    <li class="nav-item" ActiveBy routeKey="Controller" value="Staff">
-                        <a asp-action="@nameof(StaffController.Index)"
-                           asp-area=""
-                           asp-controller="@StaffController.Name"
-                           class="nav-link text-white"
-                           title="@StaffController.Name">
-                            <span class="fa-solid fa-id-card fa-fw"></span>
-                        </a>
-                    </li>
-                    @if (Context.Items[ItemKey.Nickname] != null)
-                    {
-                        <li class="nav-item" ActiveBy routeKey="Controller" value="Profile">
-                            <a class="nav-link text-white"
-                               asp-controller="Profile"
-                               asp-action="@(nameof(ProfileController.Index))"
-                               asp-route-section=""
-                               asp-route-area=""
-                               asp-route-id="">
-                                <span class="fa-solid fa-circle-user fa-fw"></span>
-                                @Context.Items[ItemKey.Nickname]
-                            </a>
-                        </li>
-                    }
-                </ul>
-            </div>
-        </div>
-    </nav>
+			<div class="collapse navbar-collapse justify-content-end">
+				<ul class="navbar-nav">
+					<li class="nav-item dropdown">
+						<a class="nav-link dropdown-toggle text-white"
+						   href="#"
+						   id="navbarManagementDropdown"
+						   role="button"
+						   data-bs-toggle="dropdown"
+						   aria-haspopup="true"
+						   aria-expanded="false"
+						   title="Management">
+							<span class="fa-solid fa-gear fa-fw"></span>
+						</a>
+						<div class="dropdown-menu dropdown-menu-end"
+							 aria-labelledby="navbarManagementDropdown">
+							<a class="dropdown-item"
+							   asp-controller="@Ocuda.Ops.Controllers.Areas.ContentManagement.HomeController.Name"
+							   asp-area="@(nameof(Ocuda.Ops.Controllers.Areas.ContentManagement))"
+							   asp-action="@(nameof(Ocuda.Ops.Controllers.Areas.ContentManagement.HomeController.Index))">
+								<span class="fa-solid fa-network-wired fa-fw"></span>
+								Intranet Management
+							</a>
+							@if (Context.User?.HasClaim(ClaimType.HasSiteAdminRights, ClaimType.HasSiteAdminRights) == true)
+							{
+								<a class="dropdown-item"
+								   asp-controller="@Ocuda.Ops.Controllers.Areas.SiteManagement.HomeController.Name"
+								   asp-area="@(nameof(Ocuda.Ops.Controllers.Areas.SiteManagement))"
+								   asp-action="@(nameof(Ocuda.Ops.Controllers.Areas.SiteManagement.HomeController.Index))">
+									<span class="fa-solid fa-earth-americas fa-fw"></span>
+									Web Site Management
+								</a>
+							}
+						</div>
+					</li>
+					<li class="nav-item" ActiveBy routeKey="Controller" value="Staff">
+						<a asp-action="@nameof(StaffController.Index)"
+						   asp-area=""
+						   asp-controller="@StaffController.Name"
+						   class="nav-link text-white"
+						   title="@StaffController.Name">
+							<span class="fa-solid fa-id-card fa-fw"></span>
+						</a>
+					</li>
+					@if (Context.Items[ItemKey.Nickname] != null)
+					{
+						<li class="nav-item" ActiveBy routeKey="Controller" value="Profile">
+							<a class="nav-link text-white"
+							   asp-controller="Profile"
+							   asp-action="@(nameof(ProfileController.Index))"
+							   asp-route-section=""
+							   asp-route-area=""
+							   asp-route-id="">
+								<span class="fa-solid fa-circle-user fa-fw"></span>
+								@Context.Items[ItemKey.Nickname]
+							</a>
+						</li>
+					}
+				</ul>
+			</div>
+		</div>
+	</nav>
 
-    <div class="container-fluid">
-        @if (navigationRows?.Count > 0)
-        {
-            <div id="closeNavColumn" class="navcolumn-overlay"></div>
-            <div id="navColumn" class="navcolumn">
-                @foreach (var row in navigationRows)
-                {
-                    <div class="card">
-                        @if (row.Rows?.Count > 0 == false)
-                        {
-                            <a class="navcolumn-item" href="@row.Url">@Html.Raw(row.Name)</a>
-                        }
-                        else
-                        {
-                            <div class="navcolumn-item navcolumn-collapsible">
-                                @Html.Raw(row.Name)
-                                <span class="fa-solid fa-chevron-right float-end fa-fw"></span>
-                            </div>
-                            <div class="collapse navcolumn-collapse">
-                                @foreach (var childRow in row.Rows)
-                                {
-                                    <div class="card">
-                                        @if (childRow.Rows?.Count > 0 == false)
-                                        {
-                                            <a class="navcolumn-item navcolumn-child"
-                                               href="@childRow.Url">@Html.Raw(childRow.Name)</a>
-                                        }
-                                        else
-                                        {
-                                            <div class="navcolumn-item navcolumn-child navcolumn-collapsible">
-                                                @Html.Raw(childRow.Name)
-                                                <span class="fa-solid fa-chevron-right float-end fa-fw"></span>
-                                            </div>
-                                            <div class="collapse navcolumn-collapse">
-                                                @foreach (var grandchildRow in childRow.Rows)
-                                                {
-                                                    <div class="card">
-                                                        <a class="navcolumn-item navcolumn-grandchild"
-                                                           href="@grandchildRow.Url">@Html.Raw(grandchildRow.Name)</a>
-                                                    </div>
-                                                }
-                                            </div>
-                                        }
-                                    </div>
-                                }
-                            </div>
-                        }
-                    </div>
-                }
-            </div>
-        }
-        @RenderSection("Header", required: false)
-        @if (TempData[Ocuda.Ops.Controllers.TempDataKey.AlertDanger] != null)
-        {
-            <div class="row">
-                <div class="col-12 col-md-6 offset-md-3">
-                    <div class="alert alert-danger">@Html.Raw(TempData[Ocuda.Ops.Controllers.TempDataKey.AlertDanger])</div>
-                </div>
-            </div>
-        }
-        @if (TempData[Ocuda.Ops.Controllers.TempDataKey.AlertWarning] != null)
-        {
-            <div class="row">
-                <div class="col-12 col-md-6 offset-md-3">
-                    <div class="alert alert-warning">@Html.Raw(TempData[Ocuda.Ops.Controllers.TempDataKey.AlertWarning])</div>
-                </div>
-            </div>
-        }
-        @if (TempData[Ocuda.Ops.Controllers.TempDataKey.AlertSuccess] != null)
-        {
-            <div class="row">
-                <div class="col-12 col-md-6 offset-md-3">
-                    <div class="alert alert-success">@Html.Raw(TempData[Ocuda.Ops.Controllers.TempDataKey.AlertSuccess])</div>
-                </div>
-            </div>
-        }
-        @if (TempData[Ocuda.Ops.Controllers.TempDataKey.AlertInfo] != null)
-        {
-            <div class="row">
-                <div class="col-12 col-md-6 offset-md-3">
-                    <div class="alert alert-info">@Html.Raw(TempData[Ocuda.Ops.Controllers.TempDataKey.AlertInfo])</div>
-                </div>
-            </div>
-        }
-        @RenderBody()
-    </div>
-    <script src="~/js/main.min.js" asp-append-version="true"></script>
-    <script src="~/js/bootstrap.min.js" asp-append-version="true"></script>
-    @if (Context.Items.ContainsKey(ItemKey.ExternalJS))
-    {
-        foreach (var jsUrl in (List<string>)Context.Items[ItemKey.ExternalJS])
-        {
-            <script src="@jsUrl" asp-append-version="true"></script>
-        }
-    }
-    @RenderSection("Scripts", required: false)
+	<div class="container-fluid">
+		@if (navigationRows?.Count > 0)
+		{
+			<div id="closeNavColumn" class="navcolumn-overlay"></div>
+			<div id="navColumn" class="navcolumn">
+				@foreach (var row in navigationRows)
+				{
+					<div class="card">
+						@if (row.Rows?.Count > 0 == false)
+						{
+							<a class="navcolumn-item" href="@row.Url">@Html.Raw(row.Name)</a>
+						}
+						else
+						{
+							<div class="navcolumn-item navcolumn-collapsible">
+								@Html.Raw(row.Name)
+								<span class="fa-solid fa-chevron-right float-end fa-fw"></span>
+							</div>
+							<div class="collapse navcolumn-collapse">
+								@foreach (var childRow in row.Rows)
+								{
+									<div class="card">
+										@if (childRow.Rows?.Count > 0 == false)
+										{
+											<a class="navcolumn-item navcolumn-child"
+											   href="@childRow.Url">@Html.Raw(childRow.Name)</a>
+										}
+										else
+										{
+											<div class="navcolumn-item navcolumn-child navcolumn-collapsible">
+												@Html.Raw(childRow.Name)
+												<span class="fa-solid fa-chevron-right float-end fa-fw"></span>
+											</div>
+											<div class="collapse navcolumn-collapse">
+												@foreach (var grandchildRow in childRow.Rows)
+												{
+													<div class="card">
+														<a class="navcolumn-item navcolumn-grandchild"
+														   href="@grandchildRow.Url">@Html.Raw(grandchildRow.Name)</a>
+													</div>
+												}
+											</div>
+										}
+									</div>
+								}
+							</div>
+						}
+					</div>
+				}
+			</div>
+		}
+		@RenderSection("Header", required: false)
+		@if (TempData[Ocuda.Ops.Controllers.TempDataKey.AlertDanger] != null)
+		{
+			<div class="row">
+				<div class="col-12 col-md-6 offset-md-3">
+					<div class="alert alert-danger">@Html.Raw(TempData[Ocuda.Ops.Controllers.TempDataKey.AlertDanger])</div>
+				</div>
+			</div>
+		}
+		@if (TempData[Ocuda.Ops.Controllers.TempDataKey.AlertWarning] != null)
+		{
+			<div class="row">
+				<div class="col-12 col-md-6 offset-md-3">
+					<div class="alert alert-warning">@Html.Raw(TempData[Ocuda.Ops.Controllers.TempDataKey.AlertWarning])</div>
+				</div>
+			</div>
+		}
+		@if (TempData[Ocuda.Ops.Controllers.TempDataKey.AlertSuccess] != null)
+		{
+			<div class="row">
+				<div class="col-12 col-md-6 offset-md-3">
+					<div class="alert alert-success">@Html.Raw(TempData[Ocuda.Ops.Controllers.TempDataKey.AlertSuccess])</div>
+				</div>
+			</div>
+		}
+		@if (TempData[Ocuda.Ops.Controllers.TempDataKey.AlertInfo] != null)
+		{
+			<div class="row">
+				<div class="col-12 col-md-6 offset-md-3">
+					<div class="alert alert-info">@Html.Raw(TempData[Ocuda.Ops.Controllers.TempDataKey.AlertInfo])</div>
+				</div>
+			</div>
+		}
+		@RenderBody()
+	</div>
+	<script src="~/js/main.min.js" asp-append-version="true"></script>
+	<script src="~/js/bootstrap.min.js" asp-append-version="true"></script>
+	@if (Context.Items.ContainsKey(ItemKey.ExternalJS))
+	{
+		foreach (var jsUrl in (List<string>)Context.Items[ItemKey.ExternalJS])
+		{
+			<script src="@jsUrl" asp-append-version="true"></script>
+		}
+	}
+	@RenderSection("Scripts", required: false)
 </body>
 </html>
\ No newline at end of file
diff --git a/src/Promenade.Controllers/Filters/RestoreModelStateAttribute.cs b/src/Promenade.Controllers/Filters/RestoreModelStateAttribute.cs
new file mode 100644
index 000000000..8f1350de4
--- /dev/null
+++ b/src/Promenade.Controllers/Filters/RestoreModelStateAttribute.cs
@@ -0,0 +1,56 @@
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.Extensions.Logging;
+using Ocuda.Utility.Helpers;
+
+namespace Ocuda.Promenade.Controllers.Filters
+{
+    public class RestoreModelStateAttribute : ActionFilterAttribute
+    {
+        public string Key { get; set; }
+
+        public override async Task OnActionExecutionAsync(ActionExecutingContext context,
+                                         ActionExecutionDelegate next)
+        {
+            var resultContext = await next();
+
+            var controller = context.Controller as Controller;
+
+            string modelStateKey;
+            if (!string.IsNullOrWhiteSpace(Key))
+            {
+                modelStateKey = ModelStateHelper.GetModelStateKey(Key);
+            }
+            else
+            {
+                modelStateKey = ModelStateHelper.GetModelStateKey(context.RouteData.Values);
+            }
+
+            if (controller?.TempData[modelStateKey] is string modelStateStorage)
+            {
+                var (modelState, time) = ModelStateHelper.DeserializeModelState(modelStateStorage);
+                var timeDifference = DateTimeOffset.Now.ToUnixTimeSeconds() - time;
+
+                var modelstateTimeOut = 2;
+                if (TimeSpan.FromSeconds(timeDifference).Minutes < modelstateTimeOut
+                    || modelstateTimeOut < 1)
+                {
+                    //Only Import if we are viewing
+                    if (resultContext.Result is ViewResult)
+                    {
+                        context.ModelState.Merge(modelState);
+                    }
+                }
+                else
+                {
+                    var _logger = (ILogger<RestoreModelStateAttribute>)context.HttpContext
+                        .RequestServices.GetService(typeof(ILogger<RestoreModelStateAttribute>));
+                    _logger.LogError("ModelState timed out for key {ModelStateKey}",
+                        modelStateKey);
+                }
+            }
+        }
+    }
+}
diff --git a/src/Promenade.Controllers/Filters/SaveModelStateAttribute.cs b/src/Promenade.Controllers/Filters/SaveModelStateAttribute.cs
new file mode 100644
index 000000000..77d5bd5d6
--- /dev/null
+++ b/src/Promenade.Controllers/Filters/SaveModelStateAttribute.cs
@@ -0,0 +1,40 @@
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Ocuda.Utility.Helpers;
+
+namespace Ocuda.Promenade.Controllers.Filters
+{
+    public class SaveModelStateAttribute : ActionFilterAttribute
+    {
+        public string Key { get; set; }
+
+        public override void OnActionExecuted(ActionExecutedContext context)
+        {
+            //Only export when ModelState is not valid
+            if (!context.ModelState.IsValid
+                && (context.Result is RedirectResult
+                    || context.Result is RedirectToRouteResult
+                    || context.Result is RedirectToActionResult))
+            {
+                using var controller = context.Controller as Controller;
+                if (controller != null && context.ModelState != null)
+                {
+                    string modelStateKey;
+                    if (!string.IsNullOrWhiteSpace(Key))
+                    {
+                        modelStateKey = ModelStateHelper.GetModelStateKey(Key);
+                    }
+                    else
+                    {
+                        modelStateKey = ModelStateHelper.GetModelStateKey(context.RouteData.Values);
+                    }
+
+                    controller.TempData[modelStateKey] = ModelStateHelper
+                        .SerializeModelState(context.ModelState);
+                }
+            }
+
+            base.OnActionExecuted(context);
+        }
+    }
+}
diff --git a/src/Promenade.Controllers/ServicesController.cs b/src/Promenade.Controllers/ServicesController.cs
new file mode 100644
index 000000000..8bd0ee29b
--- /dev/null
+++ b/src/Promenade.Controllers/ServicesController.cs
@@ -0,0 +1,107 @@
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+using Ocuda.Promenade.Controllers.Abstract;
+using Ocuda.Promenade.Controllers.Filters;
+using Ocuda.Promenade.Controllers.ViewModels.Services;
+using Ocuda.Promenade.Models.Entities;
+using Ocuda.Promenade.Service;
+using Ocuda.Utility;
+
+namespace Ocuda.Promenade.Controllers
+{
+    [Route("[Controller]")]
+    [Route("{culture:cultureConstraint?}/[Controller]")]
+    public class ServicesController : BaseController<ServicesController>
+    {
+        private readonly EmployeeCardService _employeeCardService;
+        private readonly PageService _pageService;
+        private readonly SegmentService _segmentService;
+
+        public ServicesController(ServiceFacades.Controller<ServicesController> context,
+            EmployeeCardService employeeCardService,
+            PageService pageService,
+            SegmentService segmentService)
+            : base(context) 
+        {
+            ArgumentNullException.ThrowIfNull(employeeCardService);
+            ArgumentNullException.ThrowIfNull(pageService);
+            ArgumentNullException.ThrowIfNull(segmentService);
+
+            _employeeCardService = employeeCardService;
+            _pageService = pageService;
+            _segmentService = segmentService;
+        }
+
+        public static string Name
+        { get { return "Services"; } }
+
+        [HttpGet("[action]")]
+        [RestoreModelState]
+        public async Task<IActionResult> EmployeeCard()
+        {
+            var viewModel = new EmployeeCardViewModel()
+            {
+                CardRequest = new EmployeeCardRequest()
+            };
+
+            var employeeCardSegmentId = await _siteSettingService
+                .GetSettingIntAsync(Models.Keys.SiteSetting.Card.EmployeeCardSegment);
+            if (employeeCardSegmentId > 0)
+            {
+                viewModel.Segment =  await _segmentService
+                    .GetSegmentTextBySegmentIdAsync(employeeCardSegmentId, false);
+            }
+
+            return View(viewModel);
+        }
+
+        [HttpPost("[action]")]
+        [SaveModelState]
+        public async Task<IActionResult> EmployeeCard(EmployeeCardViewModel viewModel)
+        {
+            ArgumentNullException.ThrowIfNull(viewModel);
+
+            if (viewModel.CardRequest.ExistingAccount
+                && string.IsNullOrWhiteSpace(viewModel.CardRequest.CardNumber))
+            {
+                ModelState.AddModelError("CardRequest.CardNumber",
+                    _localizer[ErrorMessage.FieldRequired,
+                        _localizer[i18n.Keys.Promenade.PromptLibraryCardNumber]]);
+            }
+
+            if (ModelState.IsValid)
+            {
+                if (!viewModel.CardRequest.ExistingAccount)
+                {
+                    viewModel.CardRequest.CardNumber = null;
+                }
+
+                await _employeeCardService.AddRequestAsync(viewModel.CardRequest);
+
+                var thanksPageId = await _siteSettingService.GetSettingIntAsync(
+                    Models.Keys.SiteSetting.Card.EmployeeCardThanksPage);
+
+                if (thanksPageId >= 0)
+                {
+                    var pageStub = await _pageService
+                    .GetStubByHeaderIdTypeAsync(thanksPageId,
+                        PageType.Thanks,
+                        false);
+
+                    if (!string.IsNullOrEmpty(pageStub))
+                    {
+                        return RedirectToAction(nameof(ThanksController.Page),
+                            ThanksController.Name,
+                            new { stub = pageStub });
+                    }
+                }
+
+                SetAlertInfo(Ocuda.i18n.Keys.Promenade.EmployeeCardThankYou);
+                ModelState.Clear();
+            }
+
+            return RedirectToAction(nameof(EmployeeCard));
+        }
+    }
+}
diff --git a/src/Promenade.Controllers/TempDataKey.cs b/src/Promenade.Controllers/TempDataKey.cs
index 3162782dd..3f0f5aef3 100644
--- a/src/Promenade.Controllers/TempDataKey.cs
+++ b/src/Promenade.Controllers/TempDataKey.cs
@@ -1,6 +1,6 @@
 namespace Ocuda.Promenade.Controllers
 {
-    internal static class TempDataKey
+    public static class TempDataKey
     {
         public const string AlertInfo = "prom-info-alert";
         public const string OriginalPath = "prom-original-path";
diff --git a/src/Promenade.Controllers/ViewModels/Services/EmployeeCardViewModel.cs b/src/Promenade.Controllers/ViewModels/Services/EmployeeCardViewModel.cs
new file mode 100644
index 000000000..e49e91e3e
--- /dev/null
+++ b/src/Promenade.Controllers/ViewModels/Services/EmployeeCardViewModel.cs
@@ -0,0 +1,10 @@
+using Ocuda.Promenade.Models.Entities;
+
+namespace Ocuda.Promenade.Controllers.ViewModels.Services
+{
+    public class EmployeeCardViewModel
+    {
+        public EmployeeCardRequest CardRequest { get; set; }
+        public SegmentText Segment { get; set; }
+    }
+}
diff --git a/src/Promenade.Data/Promenade/EmployeeCardRequestRepository.cs b/src/Promenade.Data/Promenade/EmployeeCardRequestRepository.cs
new file mode 100644
index 000000000..b4af96a73
--- /dev/null
+++ b/src/Promenade.Data/Promenade/EmployeeCardRequestRepository.cs
@@ -0,0 +1,24 @@
+using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
+using Ocuda.Promenade.Models.Entities;
+using Ocuda.Promenade.Service.Interfaces.Repositories;
+
+namespace Ocuda.Promenade.Data.Promenade
+{
+    public class EmployeeCardRequestRepository
+        : GenericRepository<PromenadeContext, EmployeeCardRequest>,
+            IEmployeeCardRequestRepository
+    {
+        public EmployeeCardRequestRepository(
+            ServiceFacade.Repository<PromenadeContext> repositoryFacade,
+            ILogger<EmployeeCardRequestRepository> logger) : base(repositoryFacade, logger)
+        {
+        }
+
+        public async Task AddSaveAsync(EmployeeCardRequest cardRequest)
+        {
+            await DbSet.AddAsync(cardRequest);
+            await _context.SaveChangesAsync();
+        }
+    }
+}
diff --git a/src/Promenade.Data/PromenadeContext.cs b/src/Promenade.Data/PromenadeContext.cs
index 89432fbf5..20c6b10f7 100644
--- a/src/Promenade.Data/PromenadeContext.cs
+++ b/src/Promenade.Data/PromenadeContext.cs
@@ -28,6 +28,7 @@ protected PromenadeContext(DbContextOptions options) : base(options)
         public DbSet<EmediaCategory> EmediaCategories { get; set; }
         public DbSet<EmediaGroup> EmediaGroups { get; }
         public DbSet<EmediaText> EmediaTexts { get; }
+        public DbSet<EmployeeCardRequest> EmployeeCardRequests { get; }
         public DbSet<ExternalResource> ExternalResources { get; set; }
         public DbSet<Feature> Features { get; }
         public DbSet<Group> Groups { get; }
diff --git a/src/Promenade.Models/Defaults/SiteSetting.cs b/src/Promenade.Models/Defaults/SiteSetting.cs
index f31015cf8..97bb50002 100644
--- a/src/Promenade.Models/Defaults/SiteSetting.cs
+++ b/src/Promenade.Models/Defaults/SiteSetting.cs
@@ -8,6 +8,27 @@ public static class SiteSettings
     {
         public static IEnumerable<SiteSetting> Get { get; } = new[]
         {
+            #region Card
+            new SiteSetting 
+            {
+                Category = nameof(Keys.SiteSetting.Card),
+                Description = "Segment to show on the employee card request page",
+                Id = Keys.SiteSetting.Card.EmployeeCardSegment,
+                Name = "Employee card segment",
+                Type = SiteSettingType.Int,
+                Value = "-1"
+            },
+            new SiteSetting 
+            {
+                Category = nameof(Keys.SiteSetting.Card),
+                Description = "Thanks page to show after employee card request is submitted",
+                Id = Keys.SiteSetting.Card.EmployeeCardThanksPage,
+                Name = "Employee card thanks page",
+                Type = SiteSettingType.Int,
+                Value = "-1"
+            },
+            #endregion
+
             #region Contact
 
             new SiteSetting
diff --git a/src/Promenade.Models/Entities/EmployeeCardRequest.cs b/src/Promenade.Models/Entities/EmployeeCardRequest.cs
new file mode 100644
index 000000000..5a518352e
--- /dev/null
+++ b/src/Promenade.Models/Entities/EmployeeCardRequest.cs
@@ -0,0 +1,76 @@
+using System;
+using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
+
+namespace Ocuda.Promenade.Models.Entities
+{
+    public class EmployeeCardRequest
+    {
+        [Required]
+        [DisplayName(i18n.Keys.Promenade.PromptBirthDate)]
+        public DateTime BirthDate { get; set; }
+
+        [DisplayName(i18n.Keys.Promenade.PromptLibraryCardNumber)]
+        [MaxLength(16)]
+        public string CardNumber { get; set; }
+
+        [Required]
+        [DisplayName(i18n.Keys.Promenade.PromptCity)]
+        [MaxLength(255)]
+        public string City { get; set; }
+
+        [Required]
+        [DisplayName(i18n.Keys.Promenade.PromptCountyDepartment)]
+        [MaxLength(255)]
+        public string Department { get; set; }
+
+        [Required]
+        [DisplayName(i18n.Keys.Promenade.PromptEmail)]
+        [MaxLength(255)]
+        public string Email { get; set; }
+
+        [Required]
+        [DisplayName(i18n.Keys.Promenade.PromptEmployeeNumber)]
+        [MaxLength(16)]
+        public string EmployeeNumber { get; set; }
+
+        public bool ExistingAccount { get; set; }
+
+        [Required]
+        [DisplayName(i18n.Keys.Promenade.PromptFirstName)]
+        [MaxLength(255)]
+        public string FirstName { get; set; }
+
+        [Key]
+        [Required]
+        public int Id { get; set; }
+
+        [Required]
+        [DisplayName(i18n.Keys.Promenade.PromptLastName)]
+        [MaxLength(255)]
+        public string LastName { get; set; }
+
+        [MaxLength(2000)]
+        public string Notes { get; set; }
+
+        [Required]
+        [DisplayName(i18n.Keys.Promenade.PromptPhone)]
+        [MaxLength(16)]
+        public string Phone { get; set; }
+
+        public DateTime? ProcessedAt { get; set; }
+        public int? ProcessedBy { get; set; }
+        
+        [Required]
+        [DisplayName(i18n.Keys.Promenade.PromptStreetAddress)]
+        [MaxLength(255)]
+        public string StreetAddress { get; set; }
+
+        public DateTime SubmittedAt { get; set; }
+
+        [Required]
+        [DisplayName(i18n.Keys.Promenade.PromptZipCode)]
+        [MaxLength(16)]
+        public string ZipCode { get; set; }
+    }
+}
diff --git a/src/Promenade.Models/Keys/SiteSetting.cs b/src/Promenade.Models/Keys/SiteSetting.cs
index b9234ed6a..5fad53415 100644
--- a/src/Promenade.Models/Keys/SiteSetting.cs
+++ b/src/Promenade.Models/Keys/SiteSetting.cs
@@ -2,6 +2,16 @@
 {
     namespace SiteSetting
     {
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Performance",
+            "CA1815:Override equals and operator equals on value types",
+            Justification = "No reason to compare these site setting keys")]
+        public struct Card
+        {
+            public const string EmployeeCardSegment = "Card.EmployeeCardSegment";
+            public const string EmployeeCardThanksPage 
+                = "Card.EmployeeCardThanksPage";
+        }
+
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Performance",
             "CA1815:Override equals and operator equals on value types",
             Justification = "No reason to compare these site setting keys")]
diff --git a/src/Promenade.Service/EmployeeCardService.cs b/src/Promenade.Service/EmployeeCardService.cs
new file mode 100644
index 000000000..1d4d6f07f
--- /dev/null
+++ b/src/Promenade.Service/EmployeeCardService.cs
@@ -0,0 +1,33 @@
+using System;
+using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
+using Ocuda.Promenade.Models.Entities;
+using Ocuda.Promenade.Service.Abstract;
+using Ocuda.Promenade.Service.Interfaces.Repositories;
+using Ocuda.Utility.Abstract;
+
+namespace Ocuda.Promenade.Service
+{
+    public class EmployeeCardService : BaseService<EmployeeCardService>
+    {
+        private readonly IEmployeeCardRequestRepository _employeeCardRequestRepository;
+
+        public EmployeeCardService(ILogger<EmployeeCardService> logger,
+            IDateTimeProvider dateTimeProvider,
+            IEmployeeCardRequestRepository employeeCardRequestRepository)
+            : base(logger, dateTimeProvider)
+        {
+            ArgumentNullException.ThrowIfNull(nameof(employeeCardRequestRepository));
+
+            _employeeCardRequestRepository = employeeCardRequestRepository;
+        }
+
+        public async Task AddRequestAsync(EmployeeCardRequest cardRequest)
+        {
+            ArgumentNullException.ThrowIfNull(cardRequest);
+
+            cardRequest.SubmittedAt = _dateTimeProvider.Now;
+            await _employeeCardRequestRepository.AddSaveAsync(cardRequest);
+        }
+    }
+}
diff --git a/src/Promenade.Service/Interfaces/Repositories/IEmployeeCardRequestRepository.cs b/src/Promenade.Service/Interfaces/Repositories/IEmployeeCardRequestRepository.cs
new file mode 100644
index 000000000..4f72b2249
--- /dev/null
+++ b/src/Promenade.Service/Interfaces/Repositories/IEmployeeCardRequestRepository.cs
@@ -0,0 +1,10 @@
+using System.Threading.Tasks;
+using Ocuda.Promenade.Models.Entities;
+
+namespace Ocuda.Promenade.Service.Interfaces.Repositories
+{
+    public interface IEmployeeCardRequestRepository : IGenericRepository<EmployeeCardRequest>
+    {
+        Task AddSaveAsync(EmployeeCardRequest cardRequest);
+    }
+}
diff --git a/src/Promenade.Web/Startup.cs b/src/Promenade.Web/Startup.cs
index 4c42166a7..d38364f19 100644
--- a/src/Promenade.Web/Startup.cs
+++ b/src/Promenade.Web/Startup.cs
@@ -420,6 +420,8 @@ string cacheDiscriminator
                 Data.Promenade.EmediaTextRepository>();
             services.AddScoped<Service.Interfaces.Repositories.IExternalResourceRepository,
                 Data.Promenade.ExternalResourceRepository>();
+            services.AddScoped<Service.Interfaces.Repositories.IEmployeeCardRequestRepository,
+                Data.Promenade.EmployeeCardRequestRepository>();
             services.AddScoped<Service.Interfaces.Repositories.IFeatureRepository,
                 Data.Promenade.FeatureRepository>();
             services.AddScoped<Service.Interfaces.Repositories.IVolunteerFormRepository,
@@ -523,11 +525,12 @@ string cacheDiscriminator
             services.AddScoped<Utility.Services.Interfaces.IPathResolverService,
                 Utility.Services.PathResolverService>();
 
-            // promenade servicews
+            // promenade services
             services.AddScoped<CarouselService>();
             services.AddScoped<CategoryService>();
             services.AddScoped<DeckService>();
             services.AddScoped<EmediaService>();
+            services.AddScoped<EmployeeCardService>();
             services.AddScoped<ExternalResourceService>();
             services.AddScoped<ImageFeatureService>();
             services.AddScoped<LanguageService>();
diff --git a/src/Promenade.Web/Views/Services/EmployeeCard.cshtml b/src/Promenade.Web/Views/Services/EmployeeCard.cshtml
new file mode 100644
index 000000000..f02c28219
--- /dev/null
+++ b/src/Promenade.Web/Views/Services/EmployeeCard.cshtml
@@ -0,0 +1,102 @@
+@model Ocuda.Promenade.Controllers.ViewModels.Services.EmployeeCardViewModel
+
+@if (!string.IsNullOrEmpty(Model.Segment?.Header))
+{
+	<div class="row">
+		<div class="col-12">
+			<h2>@Model.Segment.Header</h2>
+		</div>
+	</div>
+}
+
+@if (!string.IsNullOrEmpty(Model.Segment?.Text))
+{
+	<div class="row">
+		<div class="col-12">
+			@Html.Raw(Model.Segment.Text)
+		</div>
+	</div>
+}
+
+<div class="row mt-4">
+	<div class="col-12">
+		<form method="post"
+			  role="form"
+			  asp-action="@nameof(ServicesController.EmployeeCard)"
+			  asp-controller="@ServicesController.Name"
+			  asp-route-culture="">
+			<div class="row mb-3">
+				<label class="col-form-label text-md-end col-md-3 pt-0">@Localizer[Promenade.EmployeeCardRenewLabel]</label>
+				<div class="col-md-9">
+					<div class="form-check form-check-inline">
+						<label class="form-check-label" for="ExistingCardYes">@Localizer[Promenade.LabelYes]</label>
+						<input asp-for="CardRequest.ExistingAccount" id="ExistingAccountYes" class="form-check-input" type="radio" value="true" />
+					</div>
+					<div class="form-check form-check-inline">
+						<label class="form-check-label" for="ExistingCardNo">@Localizer[Promenade.LabelNo]</label>
+						<input asp-for="CardRequest.ExistingAccount" id="ExistingAccountNo" class="form-check-input" type="radio" value="false" />
+					</div>
+					<em>@Localizer[Promenade.EmployeeCardRenewInfo]</em>
+				</div>
+			</div>
+			<div id="cardNumberInputContainer" class="row mb-3 @(ViewData.ModelState["CardRequest.ExistingAccount"]?.AttemptedValue == "true" ? "" : "d-none")">
+				<label asp-for="CardRequest.CardNumber" class="col-form-label text-md-end col-md-3"></label>
+				<div class="col-md-9">
+					<input asp-for="CardRequest.CardNumber" class="form-control" />
+					<span asp-validation-for="CardRequest.CardNumber" class="validation-message text-danger"></span>
+				</div>
+			</div>
+
+			<hr class="col-md-9 offset-md-3" />
+
+			<div class="row mb-1">
+				<label class="form-label text-md-end col-md-3"><strong>@Localizer[Promenade.EmployeeCardPersonalLabel]</strong></label>
+			</div>
+
+			<input asp-for="CardRequest.FirstName" formgroup />
+			<input asp-for="CardRequest.LastName" formgroup />
+			<input asp-for="CardRequest.BirthDate" formgroup />
+			<input asp-for="CardRequest.Email" formgroup />
+			<input asp-for="CardRequest.Phone" formgroup />
+
+			<div class="row mb-1">
+				<label class="form-label text-md-end col-md-3"><strong>@Localizer[Promenade.EmployeeCardAddressLabel]</strong></label>
+				<div class="col-md-9">
+					<em>@Localizer[Promenade.EmployeeCardAddressInfo]</em>
+				</div>
+			</div>
+
+			<input asp-for="CardRequest.StreetAddress" formgroup />
+			<input asp-for="CardRequest.City" formgroup />
+			<input asp-for="CardRequest.ZipCode" formgroup />
+
+			<div class="row mb-1">
+				<label class="form-label text-md-end col-md-3"><strong>@Localizer[Promenade.EmployeeCardEmployeeLabel]</strong></label>
+			</div>
+
+			<input asp-for="CardRequest.EmployeeNumber" formgroup />
+			<input asp-for="CardRequest.Department" formgroup />
+
+
+			<button type="submit"
+					class="btn btn-outline-success m-2 btn-lg float-end">
+				<span class="fa-regular fa-circle-check"></span>
+				@Localizer[Promenade.ButtonSubmit]
+			</button>
+		</form>
+	</div>
+</div>
+
+@section scripts
+{
+	<script>
+		$('input[name="CardRequest.ExistingAccount"]').on('change', function() {
+			if ($(this).val() == "true") {
+				$('#cardNumberInputContainer').removeClass('d-none');
+			}
+			else {
+				$('#cardNumberInputContainer').addClass('d-none');
+			}
+		});
+	</script>
+}
\ No newline at end of file
diff --git a/src/Promenade.Web/Views/Shared/_Layout.cshtml b/src/Promenade.Web/Views/Shared/_Layout.cshtml
index 303538830..e0bf2d6ce 100644
--- a/src/Promenade.Web/Views/Shared/_Layout.cshtml
+++ b/src/Promenade.Web/Views/Shared/_Layout.cshtml
@@ -235,6 +235,14 @@
                     </div>
                 }
             </header>
+			@if (TempData[Ocuda.Promenade.Controllers.TempDataKey.AlertInfo] != null)
+			{
+				<div class="row mt-4">
+					<div class="col-12 col-md-6 offset-md-3">
+						<div class="alert alert-info mb-0">@Html.Raw(TempData[Ocuda.Promenade.Controllers.TempDataKey.AlertInfo])</div>
+					</div>
+				</div>
+			}
             <div class="row prom-content-container">
                 <div class="col-12 d-print-inline-block prom-body-content-container"
                      role="main" id="mainContent">
diff --git a/src/i18n/Keys/Promenade.cs b/src/i18n/Keys/Promenade.cs
index 4b363108f..cddf5ba32 100644
--- a/src/i18n/Keys/Promenade.cs
+++ b/src/i18n/Keys/Promenade.cs
@@ -18,6 +18,13 @@ public static class Promenade
         public const string ContactInformation = "Contact Information";
         public const string ContactUs = "Contact Us";
         public const string CoordinatesErrorItem = "There was a problem locating these coordinates: {0}, {1}";
+        public const string EmployeeCardAddressInfo = "please do not enter your work address here";
+        public const string EmployeeCardAddressLabel = "Home Address";
+        public const string EmployeeCardEmployeeLabel = "Employee Information";
+        public const string EmployeeCardPersonalLabel = "Personal Information";
+        public const string EmployeeCardRenewInfo = "Please select yes if you already have a library card!";
+        public const string EmployeeCardRenewLabel = "Renew an existing Account?";
+        public const string EmployeeCardThankYou = "Thank you for submitting your request!";
         public const string Error = "Error";
         public const string ErrorAvailableDaysItem = "This service is only available on the following days: {0}";
         public const string ErrorCouldNotGeocode = "An error occurred and we could not find libraries near that location.";
@@ -40,6 +47,8 @@ public static class Promenade
         public const string HelpItem = "{0} help";
         public const string HowCanWeHelp = "How can we help?";
         public const string KeywordsItem = "Keywords: {0}";
+        public const string LabelNo = "No";
+        public const string LabelYes = "Yes";
         public const string LinkAdultVolunteerForm = "Use our adult volunteer form.";
         public const string LinkTeenVolunteerForm = "Use our teen volunteer form.";
         public const string LocationBackToLocationName = "Back to {0}";
@@ -83,21 +92,30 @@ public static class Promenade
         public const string ProductInventoryStatus = "Status";
         public const string PromptAreYouAdultVolunteer = "Are you an adult looking to volunteer?";
         public const string PromptAreYouTeenVolunteer = "Are you a teen looking to volunteer?";
+        public const string PromptBirthDate = "Birth Date";
+        public const string PromptCity = "City";
+        public const string PromptCountyDepartment = "County Department";
         public const string PromptEmail = "Email";
+        public const string PromptEmployeeNumber = "Employee Number";
         public const string PromptExperience = "Why do you want to volunteer? Describe any previous volunteer experience.";
+        public const string PromptFirstName = "First Name";
         public const string PromptGuardianEmail = "Parent/Guardian Email";
         public const string PromptGuardianName = "Parent/Guardian Name";
         public const string PromptGuardianPhone = "Parent/Guardian Phone";
         public const string PromptLanguage = "Language";
+        public const string PromptLastName = "Last Name";
+        public const string PromptLibraryCardNumber = "Library Card#";
         public const string PromptName = "Name";
         public const string PromptNotes = "Notes";
         public const string PromptPhone = "Phone";
         public const string PromptRequestedDate = "Requested date";
         public const string PromptRequestedDateAndTime = "Requested date and time";
         public const string PromptRequestedTime = "Requested time";
+        public const string PromptStreetAddress = "Street Address";
         public const string PromptSubject = "Subject";
         public const string PromptVolunteerRegularity = "Are you interested in regular volunteer work or certain number of hours?";
         public const string PromptWeeklyAvailability = "Weekly Availability";
+        public const string PromptZipCode = "Zip Code";
         public const string RequiredField = "You must supply a value for: {0}";
         public const string RequiredFieldItem = "The {0} field is required.";
         public const string ScheduleAppointmentDetails = "Here are the details of your appointment:";

From 3aa2a558130412b187e7579c950d132d2576bbcd Mon Sep 17 00:00:00 2001
From: Dan Wilcox <DanielWilcox@mcldaz.org>
Date: Mon, 29 Dec 2025 12:57:13 -0700
Subject: [PATCH 02/13] Add initial card renewal code

---
 PolarisHelper/PolarisClient.cs                |   9 -
 PolarisHelper/PolarisHelper.csproj            |  13 -
 ocuda.sln                                     |  18 +-
 .../CardRenewalController.cs                  | 252 +++++++++++
 .../Areas/ContentManagement/HomeController.cs |   2 +
 .../CardRenewal/ResponseViewModel.cs          |  15 +
 .../CardRenewal/ResponsesViewModel.cs         |  11 +
 .../ViewModels/Home/IndexViewModel.cs         |   1 +
 .../Areas/Services/CardRenewalController.cs   | 283 ++++++++++++
 .../Areas/Services/EmployeeCardController.cs  |   4 +-
 .../CardRenewal/DetailsViewModel.cs           |  44 ++
 .../ViewModels/CardRenewal/IndexViewModel.cs  |  14 +
 src/Ops.Controllers/Ops.Controllers.csproj    |   1 +
 .../Ops/CardRenewalResponseRepository.cs      |  71 +++
 .../Ops/CardRenewalResultRepository.cs        |  27 ++
 src/Ops.Data/Ops/EmailSetupRepository.cs      |  27 ++
 src/Ops.Data/OpsContext.cs                    |   2 +
 .../Promenade/CardRenewalRequestRepository.cs |  75 ++++
 .../EmployeeCardRequestRepository.cs          |   2 +-
 src/Ops.Data/Promenade/LanguageRepository.cs  |   9 +
 src/Ops.Data/PromenadeContext.cs              |   1 +
 src/Ops.Models/Defaults/SiteSettings.cs       |  50 +++
 .../ApplicationPermissionDefinitions.cs       |   6 +
 .../Entities/CardRenewalResponse.cs           |  31 ++
 src/Ops.Models/Entities/CardRenewalResult.cs  |  29 ++
 src/Ops.Models/Entities/EmailSetupText.cs     |   4 +-
 src/Ops.Models/Keys/ApplicationPermission.cs  |   1 +
 src/Ops.Models/Keys/SiteSetting.cs            |   9 +
 src/Ops.Service/CardRenewalRequestService.cs  |  46 ++
 src/Ops.Service/CardRenewalService.cs         | 312 +++++++++++++
 src/Ops.Service/EmailService.cs               |  29 +-
 src/Ops.Service/EmployeeCardService.cs        |   2 +-
 ...EmployeeCardFilter.cs => RequestFilter.cs} |   4 +-
 .../ICardRenewalResponseRepository.cs         |  15 +
 .../ICardRenewalResultRepository.cs           |  10 +
 .../Ops/Repositories/IEmailSetupRepository.cs |  11 +
 .../Ops/Services/ICardRenewalService.cs       |  25 ++
 .../Interfaces/Ops/Services/IEmailService.cs  |   5 +-
 .../ICardRenewalRequestRepository.cs          |  14 +
 .../IEmployeeCardRequestRepository.cs         |   2 +-
 .../Repositories/ILanguageRepository.cs       |   2 +
 .../Services/ICardRenewalRequestService.cs    |  14 +
 .../Services/IEmployeeCardService.cs          |   2 +-
 .../Promenade/Services/ILanguageService.cs    |   2 +
 src/Ops.Service/Keys/CardRenewal.cs           |  14 +
 src/Ops.Service/LanguageService.cs            |   5 +
 .../Models/CardRenewal/ProcessResult.cs       |  14 +
 src/Ops.Service/Ops.Service.csproj            |   1 +
 .../Views/CardRenewal/Response.cshtml         | 128 ++++++
 .../Views/CardRenewal/Responses.cshtml        | 170 +++++++
 .../ContentManagement/Views/Home/Index.cshtml |  16 +
 .../Services/Views/CardRenewal/Details.cshtml | 415 ++++++++++++++++++
 .../Services/Views/CardRenewal/Index.cshtml   |  96 ++++
 src/Ops.Web/Startup.cs                        |  15 +
 src/Ops.Web/Views/Shared/_Layout.cshtml       |   7 +
 src/PolarisHelper/IPolarisHelper.cs           |  15 +
 .../Models/RenewRegistrationResult.cs         |   8 +
 src/PolarisHelper/PolarisHelper.cs            | 136 ++++++
 src/PolarisHelper/PolarisHelper.csproj        |  25 ++
 .../CardRenewalController.cs                  | 354 +++++++++++++++
 .../Promenade.Controllers.csproj              |   1 +
 .../ViewModels/CardRenewal/IndexViewModel.cs  |  24 +
 .../CardRenewal/JuvenileViewModel.cs          |  18 +
 .../CardRenewal/SubmittedViewModel.cs         |  10 +
 .../CardRenewal/VerifyAddressViewModel.cs     |  22 +
 .../Promenade/CardRenewalRequestRepository.cs |  34 ++
 src/Promenade.Data/PromenadeContext.cs        |   1 +
 src/Promenade.Models/Defaults/SiteSetting.cs  |  69 +++
 .../Entities/CardRenewalRequest.cs            |  31 ++
 src/Promenade.Models/Keys/SiteSetting.cs      |   8 +
 src/Promenade.Service/CardRenewalService.cs   |  38 ++
 .../ICardRenewalRequestRepository.cs          |  11 +
 src/Promenade.Web/Startup.cs                  |   8 +
 .../Views/CardRenewal/Index.cshtml            |  65 +++
 .../Views/CardRenewal/Juvenile.cshtml         |  21 +
 .../Views/CardRenewal/Submitted.cshtml        |  14 +
 .../Views/CardRenewal/VerifyAddress.cshtml    |  86 ++++
 src/Utility/Keys/Cache.cs                     |   5 +
 src/i18n/Keys/Promenade.cs                    |  16 +-
 79 files changed, 3366 insertions(+), 41 deletions(-)
 delete mode 100644 PolarisHelper/PolarisClient.cs
 delete mode 100644 PolarisHelper/PolarisHelper.csproj
 create mode 100644 src/Ops.Controllers/Areas/ContentManagement/CardRenewalController.cs
 create mode 100644 src/Ops.Controllers/Areas/ContentManagement/ViewModels/CardRenewal/ResponseViewModel.cs
 create mode 100644 src/Ops.Controllers/Areas/ContentManagement/ViewModels/CardRenewal/ResponsesViewModel.cs
 create mode 100644 src/Ops.Controllers/Areas/Services/CardRenewalController.cs
 create mode 100644 src/Ops.Controllers/Areas/Services/ViewModels/CardRenewal/DetailsViewModel.cs
 create mode 100644 src/Ops.Controllers/Areas/Services/ViewModels/CardRenewal/IndexViewModel.cs
 create mode 100644 src/Ops.Data/Ops/CardRenewalResponseRepository.cs
 create mode 100644 src/Ops.Data/Ops/CardRenewalResultRepository.cs
 create mode 100644 src/Ops.Data/Ops/EmailSetupRepository.cs
 create mode 100644 src/Ops.Data/Promenade/CardRenewalRequestRepository.cs
 create mode 100644 src/Ops.Models/Entities/CardRenewalResponse.cs
 create mode 100644 src/Ops.Models/Entities/CardRenewalResult.cs
 create mode 100644 src/Ops.Service/CardRenewalRequestService.cs
 create mode 100644 src/Ops.Service/CardRenewalService.cs
 rename src/Ops.Service/Filters/{EmployeeCardFilter.cs => RequestFilter.cs} (53%)
 create mode 100644 src/Ops.Service/Interfaces/Ops/Repositories/ICardRenewalResponseRepository.cs
 create mode 100644 src/Ops.Service/Interfaces/Ops/Repositories/ICardRenewalResultRepository.cs
 create mode 100644 src/Ops.Service/Interfaces/Ops/Repositories/IEmailSetupRepository.cs
 create mode 100644 src/Ops.Service/Interfaces/Ops/Services/ICardRenewalService.cs
 create mode 100644 src/Ops.Service/Interfaces/Promenade/Repositories/ICardRenewalRequestRepository.cs
 create mode 100644 src/Ops.Service/Interfaces/Promenade/Services/ICardRenewalRequestService.cs
 create mode 100644 src/Ops.Service/Keys/CardRenewal.cs
 create mode 100644 src/Ops.Service/Models/CardRenewal/ProcessResult.cs
 create mode 100644 src/Ops.Web/Areas/ContentManagement/Views/CardRenewal/Response.cshtml
 create mode 100644 src/Ops.Web/Areas/ContentManagement/Views/CardRenewal/Responses.cshtml
 create mode 100644 src/Ops.Web/Areas/Services/Views/CardRenewal/Details.cshtml
 create mode 100644 src/Ops.Web/Areas/Services/Views/CardRenewal/Index.cshtml
 create mode 100644 src/PolarisHelper/IPolarisHelper.cs
 create mode 100644 src/PolarisHelper/Models/RenewRegistrationResult.cs
 create mode 100644 src/PolarisHelper/PolarisHelper.cs
 create mode 100644 src/PolarisHelper/PolarisHelper.csproj
 create mode 100644 src/Promenade.Controllers/CardRenewalController.cs
 create mode 100644 src/Promenade.Controllers/ViewModels/CardRenewal/IndexViewModel.cs
 create mode 100644 src/Promenade.Controllers/ViewModels/CardRenewal/JuvenileViewModel.cs
 create mode 100644 src/Promenade.Controllers/ViewModels/CardRenewal/SubmittedViewModel.cs
 create mode 100644 src/Promenade.Controllers/ViewModels/CardRenewal/VerifyAddressViewModel.cs
 create mode 100644 src/Promenade.Data/Promenade/CardRenewalRequestRepository.cs
 create mode 100644 src/Promenade.Models/Entities/CardRenewalRequest.cs
 create mode 100644 src/Promenade.Service/CardRenewalService.cs
 create mode 100644 src/Promenade.Service/Interfaces/Repositories/ICardRenewalRequestRepository.cs
 create mode 100644 src/Promenade.Web/Views/CardRenewal/Index.cshtml
 create mode 100644 src/Promenade.Web/Views/CardRenewal/Juvenile.cshtml
 create mode 100644 src/Promenade.Web/Views/CardRenewal/Submitted.cshtml
 create mode 100644 src/Promenade.Web/Views/CardRenewal/VerifyAddress.cshtml

diff --git a/PolarisHelper/PolarisClient.cs b/PolarisHelper/PolarisClient.cs
deleted file mode 100644
index f7ecf4f33..000000000
--- a/PolarisHelper/PolarisClient.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using Clc.Polaris.Api;
-using Clc.Polaris.Api.Models;
-
-namespace PolarisHelper
-{
-    public static class PolarisClient
-    {
-    }
-}
diff --git a/PolarisHelper/PolarisHelper.csproj b/PolarisHelper/PolarisHelper.csproj
deleted file mode 100644
index 704cb2f6e..000000000
--- a/PolarisHelper/PolarisHelper.csproj
+++ /dev/null
@@ -1,13 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Clc.Polaris.Api" Version="3.1.4-alpha" />
-  </ItemGroup>
-
-</Project>
diff --git a/ocuda.sln b/ocuda.sln
index 950033228..39d1d0abe 100644
--- a/ocuda.sln
+++ b/ocuda.sln
@@ -89,7 +89,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "i18n.Test", "test\i18n\i18n
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SlideUploader", "src\SlideUploader\SlideUploader.csproj", "{0DF031C8-95B2-48D1-ACD9-01E56B10F3D6}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PolarisHelper", "PolarisHelper\PolarisHelper.csproj", "{2A8949EC-DC44-40C5-B07A-9FF935238A30}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PolarisHelper", "src\PolarisHelper\PolarisHelper.csproj", "{E11E3598-BE6D-C9D8-D480-4EE48E7F4120}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Clc.Polaris.Api", "..\polaris-api-csharp\src\polaris-api-csharp\Clc.Polaris.Api.csproj", "{85306281-EC61-C4E5-8FC4-3CF8E64C83D5}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -173,10 +175,14 @@ Global
 		{0DF031C8-95B2-48D1-ACD9-01E56B10F3D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0DF031C8-95B2-48D1-ACD9-01E56B10F3D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0DF031C8-95B2-48D1-ACD9-01E56B10F3D6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2A8949EC-DC44-40C5-B07A-9FF935238A30}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2A8949EC-DC44-40C5-B07A-9FF935238A30}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2A8949EC-DC44-40C5-B07A-9FF935238A30}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2A8949EC-DC44-40C5-B07A-9FF935238A30}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E11E3598-BE6D-C9D8-D480-4EE48E7F4120}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E11E3598-BE6D-C9D8-D480-4EE48E7F4120}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E11E3598-BE6D-C9D8-D480-4EE48E7F4120}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E11E3598-BE6D-C9D8-D480-4EE48E7F4120}.Release|Any CPU.Build.0 = Release|Any CPU
+		{85306281-EC61-C4E5-8FC4-3CF8E64C83D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{85306281-EC61-C4E5-8FC4-3CF8E64C83D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{85306281-EC61-C4E5-8FC4-3CF8E64C83D5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{85306281-EC61-C4E5-8FC4-3CF8E64C83D5}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -204,7 +210,7 @@ Global
 		{1C0384E0-C8AD-46D9-9319-C75D67E6474E} = {EF2E402F-3D9C-4EAD-93A2-68D759A003A7}
 		{28C9B95E-DD9B-458B-86EC-37B265D66181} = {1C0384E0-C8AD-46D9-9319-C75D67E6474E}
 		{0DF031C8-95B2-48D1-ACD9-01E56B10F3D6} = {FC70E8FE-76E9-4D23-8D85-F219DD8BAC37}
-		{2A8949EC-DC44-40C5-B07A-9FF935238A30} = {FC70E8FE-76E9-4D23-8D85-F219DD8BAC37}
+		{E11E3598-BE6D-C9D8-D480-4EE48E7F4120} = {FC70E8FE-76E9-4D23-8D85-F219DD8BAC37}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {E2592F73-781B-49DC-8020-540473F814F7}
diff --git a/src/Ops.Controllers/Areas/ContentManagement/CardRenewalController.cs b/src/Ops.Controllers/Areas/ContentManagement/CardRenewalController.cs
new file mode 100644
index 000000000..5445be938
--- /dev/null
+++ b/src/Ops.Controllers/Areas/ContentManagement/CardRenewalController.cs
@@ -0,0 +1,252 @@
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.Extensions.Logging;
+using Ocuda.Ops.Controllers.Abstract;
+using Ocuda.Ops.Controllers.Areas.ContentManagement.ViewModels.CardRenewal;
+using Ocuda.Ops.Controllers.Filters;
+using Ocuda.Ops.Models;
+using Ocuda.Ops.Models.Keys;
+using Ocuda.Ops.Service.Interfaces.Ops.Services;
+using Ocuda.Ops.Service.Interfaces.Promenade.Services;
+using Ocuda.Utility.Exceptions;
+using Ocuda.Utility.Keys;
+
+namespace Ocuda.Ops.Controllers.Areas.ContentManagement
+{
+    [Area("ContentManagement")]
+    [Route("[area]/[controller]")]
+    public class CardRenewalController : BaseController<CardRenewalController>
+    {
+        private readonly ICardRenewalRequestService _cardRenewalRequestService;
+        private readonly ICardRenewalService _cardRenewalService;
+        private readonly IEmailService _emailService;
+        private readonly ILanguageService _languageService;
+        private readonly IPermissionGroupService _permissionGroupService;
+
+        public CardRenewalController(ServiceFacades.Controller<CardRenewalController> context,
+            ICardRenewalRequestService cardRenewalRequestService,
+            ICardRenewalService cardRenewalService,
+            IEmailService emailService,
+            ILanguageService languageService,
+            IPermissionGroupService permissionGroupService)
+            : base(context)
+        {
+            ArgumentNullException.ThrowIfNull(cardRenewalRequestService);
+            ArgumentNullException.ThrowIfNull(cardRenewalService);
+            ArgumentNullException.ThrowIfNull(emailService);
+            ArgumentNullException.ThrowIfNull(languageService);
+            ArgumentNullException.ThrowIfNull(permissionGroupService);
+
+            _cardRenewalRequestService = cardRenewalRequestService;
+            _cardRenewalService = cardRenewalService;
+            _emailService = emailService;
+            _languageService = languageService;
+            _permissionGroupService = permissionGroupService;
+        }
+
+        public static string Area
+        { get { return "ContentManagement"; } }
+
+        public static string Name
+        { get { return "CardRenewal"; } }
+
+        [HttpPost("[action]")]
+        public async Task<JsonResult> ChangeResponseSort(int id, bool increase)
+        {
+            JsonResponse response;
+
+            if (await HasCardRenewalManagementRightsAsync())
+            {
+                try
+                {
+                    await _cardRenewalService.UpdateResponseSortOrderAsync(id, increase);
+                    response = new JsonResponse
+                    {
+                        Success = true
+                    };
+                }
+                catch (OcudaException ex)
+                {
+                    response = new JsonResponse
+                    {
+                        Message = ex.Message,
+                        Success = false
+                    };
+                }
+            }
+            else
+            {
+                response = new JsonResponse
+                {
+                    Message = "Unauthorized",
+                    Success = false
+                };
+            }
+
+            return Json(response);
+        }
+
+        [HttpPost("[action]")]
+        public async Task<IActionResult> CreateResponse(ResponsesViewModel viewModel)
+        {
+            if (!await HasCardRenewalManagementRightsAsync())
+            {
+                return RedirectToUnauthorized();
+            }
+
+            ArgumentNullException.ThrowIfNull(viewModel);
+
+            var response = await _cardRenewalService.CreateResponseAsync(viewModel.Response);
+
+            return RedirectToAction(nameof(Response), new { id = response.Id });
+        }
+
+        [HttpPost("[action]")]
+        public async Task<IActionResult> DeleteResponse(ResponsesViewModel viewModel)
+        {
+            if (!await HasCardRenewalManagementRightsAsync())
+            {
+                return RedirectToUnauthorized();
+            }
+
+            ArgumentNullException.ThrowIfNull(viewModel);
+
+            await _cardRenewalService.DeleteResponseAsync(viewModel.Response.Id);
+
+            ShowAlertSuccess($"Deleted response: {viewModel.Response.Name}");
+
+            return RedirectToAction(nameof(Responses));
+        }
+
+        [HttpGet("[action]")]
+        public async Task<JsonResult> GetEmailSetupText(int emailSetupId, string languageName)
+        {
+            JsonResponse response;
+
+            if (await HasCardRenewalManagementRightsAsync())
+            {
+                try
+                {
+                    var emailSetupText = await _emailService.GetSetupTextByLanguageAsync(
+                        emailSetupId, languageName);
+
+                    return Json(new
+                    {
+                        success = true,
+                        emailSetupText?.Subject,
+                        emailSetupText?.Preview,
+                        emailSetupText?.BodyText
+                    });
+                }
+                catch (OcudaException ex)
+                {
+                    response = new JsonResponse
+                    {
+                        Message = ex.Message,
+                        Success = false
+                    };
+                }
+            }
+            else
+            {
+                response = new JsonResponse
+                {
+                    Message = "Unauthorized",
+                    Success = false
+                };
+            }
+
+            return Json(response);
+        }
+
+        [HttpGet("[action]/{id}")]
+        [RestoreModelState]
+        public async Task<IActionResult> Response(int id)
+        {
+            if (!await HasCardRenewalManagementRightsAsync())
+            {
+                return RedirectToUnauthorized();
+            }
+
+            var response = await _cardRenewalService.GetResponseAsync(id);
+            if (response == null)
+            {
+                ShowAlertDanger($"Could not find Response with ID: {id}");
+                return RedirectToAction(nameof(Responses));
+            }
+
+            var emailSetups = await _emailService.GetEmailSetupsAsync();
+
+            var viewModel = new ResponseViewModel
+            {
+                Response = response,
+                EmailSetups = new SelectList(emailSetups, "Key", "Value"),
+                Languages = await _languageService.GetActiveAsync()
+            };
+
+            if (response.EmailSetupId.HasValue && viewModel.Languages.Count > 0)
+            {
+                viewModel.EmailSetupText = await _emailService.GetSetupTextByLanguageAsync(
+                    response.EmailSetupId.Value,
+                    viewModel.Languages.FirstOrDefault()?.Name);
+            }
+
+            return View(viewModel);
+        }
+
+        [HttpPost("[action]/{id}")]
+        [SaveModelState]
+        public async Task<IActionResult> Response(ResponseViewModel viewModel)
+        {
+            if (!await HasCardRenewalManagementRightsAsync())
+            {
+                return RedirectToUnauthorized();
+            }
+
+            ArgumentNullException.ThrowIfNull(viewModel);
+
+            if (ModelState.IsValid)
+            {
+                try
+                {
+                    await _cardRenewalService.UpdateResponseAsync(viewModel.Response);
+                    ShowAlertSuccess("Updated response");
+                }
+                catch (Exception ex)
+                {
+                    _logger.LogError(ex, "Error updating card renewal response: {Message}",
+                        ex.Message);
+                    ShowAlertDanger("Error updating response");
+                }
+            }
+
+            return RedirectToAction(nameof(Response), new { id = viewModel.Response.Id });
+        }
+
+        [HttpGet("[action]")]
+        public async Task<IActionResult> Responses()
+        {
+            if (!await HasCardRenewalManagementRightsAsync())
+            {
+                return RedirectToUnauthorized();
+            }
+
+            var viewModel = new ResponsesViewModel
+            {
+                Responses = await _cardRenewalService.GetResponsesAsync()
+            };
+
+            return View(viewModel);
+        }
+
+        private async Task<bool> HasCardRenewalManagementRightsAsync()
+        {
+            return !string.IsNullOrEmpty(UserClaim(ClaimType.SiteManager))
+                || await HasAppPermissionAsync(_permissionGroupService,
+                    ApplicationPermission.CardRenewalManagement);
+        }
+    }
+}
diff --git a/src/Ops.Controllers/Areas/ContentManagement/HomeController.cs b/src/Ops.Controllers/Areas/ContentManagement/HomeController.cs
index 6eb16d0d1..9e9a8e229 100644
--- a/src/Ops.Controllers/Areas/ContentManagement/HomeController.cs
+++ b/src/Ops.Controllers/Areas/ContentManagement/HomeController.cs
@@ -35,6 +35,8 @@ public async Task<IActionResult> Index()
             var viewModel = new IndexViewModel
             {
                 IsSiteManager = !string.IsNullOrEmpty(UserClaim(ClaimType.SiteManager)),
+                HasCardRenewalPermissions = await HasAppPermissionAsync(_permissionGroupService,
+                    ApplicationPermission.CardRenewalManagement),
                 HasRosterPermissions = await HasAppPermissionAsync(_permissionGroupService,
                     ApplicationPermission.RosterManagement),
                 HasUserSyncPermissions = await HasAppPermissionAsync(_permissionGroupService,
diff --git a/src/Ops.Controllers/Areas/ContentManagement/ViewModels/CardRenewal/ResponseViewModel.cs b/src/Ops.Controllers/Areas/ContentManagement/ViewModels/CardRenewal/ResponseViewModel.cs
new file mode 100644
index 000000000..48e589595
--- /dev/null
+++ b/src/Ops.Controllers/Areas/ContentManagement/ViewModels/CardRenewal/ResponseViewModel.cs
@@ -0,0 +1,15 @@
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Ocuda.Ops.Models.Entities;
+using Ocuda.Promenade.Models.Entities;
+
+namespace Ocuda.Ops.Controllers.Areas.ContentManagement.ViewModels.CardRenewal
+{
+    public class ResponseViewModel
+    {
+        public SelectList EmailSetups { get; set; }
+        public EmailSetupText EmailSetupText { get; set; }
+        public ICollection<Language> Languages { get; set; }
+        public CardRenewalResponse Response { get; set; }
+    }
+}
diff --git a/src/Ops.Controllers/Areas/ContentManagement/ViewModels/CardRenewal/ResponsesViewModel.cs b/src/Ops.Controllers/Areas/ContentManagement/ViewModels/CardRenewal/ResponsesViewModel.cs
new file mode 100644
index 000000000..f7569c34b
--- /dev/null
+++ b/src/Ops.Controllers/Areas/ContentManagement/ViewModels/CardRenewal/ResponsesViewModel.cs
@@ -0,0 +1,11 @@
+using System.Collections.Generic;
+using Ocuda.Ops.Models.Entities;
+
+namespace Ocuda.Ops.Controllers.Areas.ContentManagement.ViewModels.CardRenewal
+{
+    public class ResponsesViewModel
+    {
+        public IEnumerable<CardRenewalResponse> Responses { get; set; }
+        public CardRenewalResponse Response { get; set; }
+    }
+}
diff --git a/src/Ops.Controllers/Areas/ContentManagement/ViewModels/Home/IndexViewModel.cs b/src/Ops.Controllers/Areas/ContentManagement/ViewModels/Home/IndexViewModel.cs
index 46a9fdd7b..5801db119 100644
--- a/src/Ops.Controllers/Areas/ContentManagement/ViewModels/Home/IndexViewModel.cs
+++ b/src/Ops.Controllers/Areas/ContentManagement/ViewModels/Home/IndexViewModel.cs
@@ -13,6 +13,7 @@ public bool HasPermissions
             }
         }
 
+        public bool HasCardRenewalPermissions { get; set; }
         public bool HasRosterPermissions { get; set; }
         public bool HasSectionManagerPermissions { get; set; }
         public bool HasUserSyncPermissions { get; set; }
diff --git a/src/Ops.Controllers/Areas/Services/CardRenewalController.cs b/src/Ops.Controllers/Areas/Services/CardRenewalController.cs
new file mode 100644
index 000000000..bf70502af
--- /dev/null
+++ b/src/Ops.Controllers/Areas/Services/CardRenewalController.cs
@@ -0,0 +1,283 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.Extensions.Logging;
+using Ocuda.Ops.Controllers.Abstract;
+using Ocuda.Ops.Controllers.Areas.Services.ViewModels.CardRenewal;
+using Ocuda.Ops.Controllers.Filters;
+using Ocuda.Ops.Models;
+using Ocuda.Ops.Service.Filters;
+using Ocuda.Ops.Service.Interfaces.Ops.Services;
+using Ocuda.Ops.Service.Interfaces.Promenade.Services;
+using Ocuda.PolarisHelper;
+using Ocuda.Utility.Exceptions;
+
+namespace Ocuda.Ops.Controllers.Areas.Services
+{
+    [Area("Services")]
+    [Route("[area]/[controller]")]
+    public class CardRenewalController : BaseController<CardRenewalController>
+    {
+        private readonly ICardRenewalRequestService _cardRenewalRequestService;
+        private readonly ICardRenewalService _cardRenewalService;
+        private readonly IPolarisHelper _polarisHelper;
+
+        public CardRenewalController(ServiceFacades.Controller<CardRenewalController> context,
+            ICardRenewalRequestService cardRenewalRequestService,
+            ICardRenewalService cardRenewalService,
+            IPolarisHelper polarisHelper)
+            : base(context)
+        {
+            ArgumentNullException.ThrowIfNull(cardRenewalRequestService);
+            ArgumentNullException.ThrowIfNull(cardRenewalService);
+            ArgumentNullException.ThrowIfNull(polarisHelper);
+
+            _cardRenewalRequestService = cardRenewalRequestService;
+            _cardRenewalService = cardRenewalService;
+            _polarisHelper = polarisHelper;
+        }
+
+        public static string Name
+        { get { return "CardRenewal"; } }
+
+        [HttpGet("[action]/{id}")]
+        [RestoreModelState]
+        public async Task<IActionResult> Details(int id)
+        {
+            var request = await _cardRenewalRequestService.GetRequestAsync(id);
+
+            if (request == null)
+            {
+                return RedirectToAction(nameof(Index));
+            }
+
+            var patronData = _polarisHelper.GetPatronDataOverride(request.Barcode);
+
+            var viewModel = new DetailsViewModel
+            {
+                AddressLookupPath = await _siteSettingService.GetSettingStringAsync(Models
+                    .Keys
+                    .SiteSetting
+                    .CardRenewal
+                    .AddressLookupUrl),
+                AssessorLookupPath = await _siteSettingService.GetSettingStringAsync(Models
+                    .Keys
+                    .SiteSetting
+                    .CardRenewal
+                    .AssessorLookupUrl),
+                PatronCode = await _polarisHelper.GetPatronCodeNameAsync(patronData.PatronCodeID),
+                PatronData = patronData,
+                PatronName = $"{patronData.NameFirst} {patronData.NameLast}",
+                Request = request
+            };
+
+            if (!viewModel.Request.ProcessedAt.HasValue)
+            {
+                var responses = await _cardRenewalService.GetAvailableResponsesAsync();
+                viewModel.ResponseList = responses.Select(_ => new SelectListItem
+                {
+                    Text = _.Name,
+                    Value = _.Id.ToString(CultureInfo.InvariantCulture)
+                });
+            }
+            else
+            {
+                viewModel.Result = await _cardRenewalService
+                    .GetResultForRequestAsync(request.Id);
+            }
+
+            var acceptedCounty = await _siteSettingService.GetSettingStringAsync(Models
+                .Keys
+                .SiteSetting
+                .CardRenewal
+                .AcceptedCounty);
+
+            if (!string.IsNullOrWhiteSpace(acceptedCounty))
+            {
+                viewModel.AcceptedCounty = acceptedCounty;
+                viewModel.InCounty = patronData.PatronAddresses.Any(_ =>
+                    string.Equals(_.County, acceptedCounty, StringComparison.OrdinalIgnoreCase));
+            }
+
+            var juvenilePatronCodes = await _siteSettingService.GetSettingStringAsync(Models
+                .Keys
+                .SiteSetting
+                .CardRenewal
+                .JuvenilePatronCodes);
+
+            if (!string.IsNullOrWhiteSpace(juvenilePatronCodes))
+            {
+                var patronCodeList = juvenilePatronCodes
+                            .Split(",", StringSplitOptions.RemoveEmptyEntries
+                                | StringSplitOptions.TrimEntries)
+                            .ToList();
+
+                foreach (var patronCode in patronCodeList)
+                {
+                    int patronCodeId;
+
+                    if (int.TryParse(patronCode, out patronCodeId))
+                    {
+                        if (patronData.PatronCodeID == patronCodeId)
+                        {
+                            viewModel.IsJuvenile = true;
+
+                            if (patronData.BirthDate.HasValue
+                                && patronData.BirthDate.Value != DateTime.MinValue)
+                            {
+                                DateTime today = DateTime.Today;
+                                var age = today.Year - patronData.BirthDate.Value.Year;
+                                if (patronData.BirthDate.Value > today.AddYears(-age))
+                                {
+                                    age--;
+                                }
+                                viewModel.PatronAge = age;
+                            }
+                        }
+                    }
+                    else
+                    {
+                        _logger.LogError($"Invalid juvenile patron code id '{patronCode}'");
+                    }
+                }
+            }
+
+            var leapPatronUrl = await _siteSettingService.GetSettingStringAsync(Models
+                .Keys
+                .SiteSetting
+                .CardRenewal
+                .LeapPatronUrl);
+
+            if (!string.IsNullOrWhiteSpace(leapPatronUrl))
+            {
+                viewModel.LeapPath = leapPatronUrl + request.PatronId;
+            }
+
+            return View(viewModel);
+        }
+
+        [HttpPost("[action]/{id}")]
+        public async Task<IActionResult> Details(DetailsViewModel viewModel)
+        {
+            ArgumentNullException.ThrowIfNull(viewModel);
+
+            if (ModelState.IsValid)
+            {
+                try
+                {
+                    var request = await _cardRenewalRequestService
+                        .GetRequestAsync(viewModel.RequestId);
+
+                    if (request.ProcessedAt.HasValue) 
+                    {
+                        _logger.LogError($"Attempted to process request {request.Id} which has already been processed.");
+                    }
+
+
+                    var result = _polarisHelper.RenewPatronRegistration(
+                        request.Barcode,
+                        request.Email);
+
+                    await _cardRenewalService.ProcessRequestAsync(
+                        request.Id,
+                        viewModel.ResponseId.Value,
+                        viewModel.ResponseText,
+                        viewModel.PatronName);
+                }
+                catch (OcudaException ex)
+                {
+
+                }
+            }
+
+            return RedirectToAction(nameof(Details), new
+            {
+                id = viewModel.RequestId
+            });
+        }
+
+        [HttpPost("[action]")]
+        public async Task<IActionResult> Discard(int id)
+        {
+            try
+            {
+                await _cardRenewalService.DiscardRequestAsync(id);
+                ShowAlertSuccess($"Request {id} has been discarded");
+            }
+            catch (OcudaException ex)
+            {
+                ShowAlertDanger($"Unable to discard request: {ex.Message}");
+                return RedirectToAction(nameof(Details), new { id });
+            }
+
+            return RedirectToAction(nameof(Index));
+        }
+
+        [HttpGet("[action]")]
+        public async Task<JsonResult> GetResponseText(int responseId, int languageId)
+        {
+            try
+            {
+                var response = await _cardRenewalService
+                    .GetResponseTextAsync(responseId, languageId);
+
+                var options = new JsonSerializerOptions
+                {
+                    Converters = { new JsonStringEnumConverter() }
+                };
+
+                return Json(new { success = true, response.Text, response.Type }, options);
+            }
+            catch (OcudaException ex)
+            {
+                var response = new JsonResponse
+                {
+                    Message = ex.Message,
+                    Success = false
+                };
+                return Json(response);
+            }
+        }
+
+        [HttpGet("[action]")]
+        public async Task<IActionResult> Index(int? page, bool processed)
+        {
+            page ??= 1;
+
+            var filter = new RequestFilter(page.Value)
+            {
+                IsProcessed = processed
+            };
+
+            var requests = await _cardRenewalRequestService.GetRequestsAsync(filter);
+
+            var viewModel = new IndexViewModel
+            {
+                CardRequests = requests.Data,
+                CurrentPage = page.Value,
+                IsProcessed = processed,
+                ItemCount = requests.Count,
+                ItemsPerPage = filter.Take.Value
+            };
+
+            if (processed)
+            {
+                viewModel.PendingCount = await _cardRenewalRequestService.GetRequestCountAsync(false);
+                viewModel.ProcessedCount = viewModel.ItemCount;
+            }
+            else
+            {
+                viewModel.PendingCount = viewModel.ItemCount;
+                viewModel.ProcessedCount = await _cardRenewalRequestService.GetRequestCountAsync(true);
+            }
+
+            return View(viewModel);
+        }
+    }
+}
diff --git a/src/Ops.Controllers/Areas/Services/EmployeeCardController.cs b/src/Ops.Controllers/Areas/Services/EmployeeCardController.cs
index 26e2c12ad..07051f963 100644
--- a/src/Ops.Controllers/Areas/Services/EmployeeCardController.cs
+++ b/src/Ops.Controllers/Areas/Services/EmployeeCardController.cs
@@ -24,7 +24,7 @@ public EmployeeCardController(ServiceFacades.Controller<EmployeeCardController>
             _employeeCardService = employeeCardService;
         }
 
-        public static String Name
+        public static string Name
         { get { return "EmployeeCard"; } }
 
         [HttpGet("[action]/{id}")]
@@ -67,7 +67,7 @@ public async Task<IActionResult> Index(int? page, bool processed)
         {
             page ??= 1;
 
-            var filter = new EmployeeCardFilter(page.Value)
+            var filter = new RequestFilter(page.Value)
             {
                 IsProcessed = processed
             };
diff --git a/src/Ops.Controllers/Areas/Services/ViewModels/CardRenewal/DetailsViewModel.cs b/src/Ops.Controllers/Areas/Services/ViewModels/CardRenewal/DetailsViewModel.cs
new file mode 100644
index 000000000..48b20d2f9
--- /dev/null
+++ b/src/Ops.Controllers/Areas/Services/ViewModels/CardRenewal/DetailsViewModel.cs
@@ -0,0 +1,44 @@
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
+using Clc.Polaris.Api.Models;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Ocuda.Ops.Models.Entities;
+using Ocuda.Promenade.Models.Entities;
+
+namespace Ocuda.Ops.Controllers.Areas.Services.ViewModels.CardRenewal
+{
+    public class DetailsViewModel
+    {
+        private const int _maxNotesDisplayLength = 400;
+
+        public CardRenewalRequest Request { get; set; }
+        public CardRenewalResult Result { get; set; }
+        public PatronData PatronData { get; set; }
+        public string AcceptedCounty { get; set; }
+        public string AddressLookupPath { get; set; }
+        public string AssessorLookupPath { get; set; }
+        public bool InCounty { get; set; }
+        public bool IsJuvenile { get; set; }
+        public string LeapPath { get; set; }
+        public int? PatronAge { get; set; }
+        public string PatronCode { get; set; }
+        public string PatronName { get; set; }
+        public IEnumerable<SelectListItem> ResponseList { get; set; }
+
+        public int RequestId { get; set; }
+
+        [DisplayName("Response")]
+        [Required]
+        public int? ResponseId { get; set; }
+
+        [DisplayName("Email Text")]
+        [Required]
+        public string ResponseText { get; set; }
+
+        public int MaxNotesDisplayLength
+        {
+            get { return _maxNotesDisplayLength; }
+        }
+    }
+}
diff --git a/src/Ops.Controllers/Areas/Services/ViewModels/CardRenewal/IndexViewModel.cs b/src/Ops.Controllers/Areas/Services/ViewModels/CardRenewal/IndexViewModel.cs
new file mode 100644
index 000000000..ca729bc0b
--- /dev/null
+++ b/src/Ops.Controllers/Areas/Services/ViewModels/CardRenewal/IndexViewModel.cs
@@ -0,0 +1,14 @@
+using System.Collections.Generic;
+using Ocuda.Promenade.Models.Entities;
+using Ocuda.Utility.Models;
+
+namespace Ocuda.Ops.Controllers.Areas.Services.ViewModels.CardRenewal
+{
+    public class IndexViewModel : PaginateModel
+    {
+        public ICollection<CardRenewalRequest> CardRequests { get; set; }
+        public bool IsProcessed { get; set; }
+        public int PendingCount { get; set; }
+        public int ProcessedCount { get; set; }
+    }
+}
diff --git a/src/Ops.Controllers/Ops.Controllers.csproj b/src/Ops.Controllers/Ops.Controllers.csproj
index 104847931..79ebc663a 100644
--- a/src/Ops.Controllers/Ops.Controllers.csproj
+++ b/src/Ops.Controllers/Ops.Controllers.csproj
@@ -29,6 +29,7 @@
   <ItemGroup>
     <ProjectReference Include="..\..\PolarisHelper\PolarisHelper.csproj" />
     <ProjectReference Include="..\Ops.Service\Ops.Service.csproj" />
+    <ProjectReference Include="..\PolarisHelper\PolarisHelper.csproj" />
     <ProjectReference Include="..\Utility\Utility.csproj" />
   </ItemGroup>
 
diff --git a/src/Ops.Data/Ops/CardRenewalResponseRepository.cs b/src/Ops.Data/Ops/CardRenewalResponseRepository.cs
new file mode 100644
index 000000000..db237deb3
--- /dev/null
+++ b/src/Ops.Data/Ops/CardRenewalResponseRepository.cs
@@ -0,0 +1,71 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+using Ocuda.Ops.Models.Entities;
+using Ocuda.Ops.Service.Interfaces.Ops.Repositories;
+
+namespace Ocuda.Ops.Data.Ops
+{
+    public class CardRenewalResponseRepository 
+        : OpsRepository<OpsContext, CardRenewalResponse, int>, 
+        ICardRenewalResponseRepository
+    {
+        public CardRenewalResponseRepository(ServiceFacade.Repository<OpsContext> repositoryFacade,
+            ILogger<CardRenewalResponseRepository> logger) : base(repositoryFacade, logger)
+        {
+        }
+
+        public override async Task<CardRenewalResponse> FindAsync(int id)
+        {
+            return await DbSet
+                .AsNoTracking()
+                .Where(_ => !_.IsDeleted && _.Id == id)
+                .SingleOrDefaultAsync();
+        }
+
+        public async Task<CardRenewalResponse> GetBySortOrderAsync(int sortOrder)
+        {
+            return await DbSet
+                .AsNoTracking()
+                .Where(_ => !_.IsDeleted && _.SortOrder == sortOrder)
+                .FirstOrDefaultAsync();
+        }
+
+        public async Task<int?> GetMaxSortOrderAsync()
+        {
+            return await DbSet
+                .AsNoTracking()
+                .Where(_ => !_.IsDeleted)
+                .MaxAsync(_ => (int?)_.SortOrder);
+        }
+
+        public async Task<IEnumerable<CardRenewalResponse>> GetAllAsync()
+        {
+            return await DbSet
+                .AsNoTracking()
+                .Include(_ => _.EmailSetup)
+                .Where(_ => !_.IsDeleted)
+                .OrderBy(_ => _.SortOrder)
+                .ToListAsync();
+        }
+
+        public async Task<IEnumerable<CardRenewalResponse>> GetAvailableAsync()
+        {
+            return await DbSet
+                .AsNoTracking()
+                .Where(_ => !_.IsDeleted && _.EmailSetupId.HasValue)
+                .OrderBy(_ => _.SortOrder)
+                .ToListAsync();
+        }
+
+        public async Task<List<CardRenewalResponse>> GetSubsequentAsync(int sortOrder)
+        {
+            return await DbSet
+                .AsNoTracking()
+                .Where(_ => !_.IsDeleted && _.SortOrder > sortOrder)
+                .ToListAsync();
+        }
+    }
+}
diff --git a/src/Ops.Data/Ops/CardRenewalResultRepository.cs b/src/Ops.Data/Ops/CardRenewalResultRepository.cs
new file mode 100644
index 000000000..581edc08b
--- /dev/null
+++ b/src/Ops.Data/Ops/CardRenewalResultRepository.cs
@@ -0,0 +1,27 @@
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+using Ocuda.Ops.Models.Entities;
+using Ocuda.Ops.Service.Interfaces.Ops.Repositories;
+
+namespace Ocuda.Ops.Data.Ops
+{
+    public class CardRenewalResultRepository : OpsRepository<OpsContext, CardRenewalResult, int>,
+        ICardRenewalResultRepository
+    {
+        public CardRenewalResultRepository(ServiceFacade.Repository<OpsContext> repositoryFacade,
+            ILogger<CardRenewalResultRepository> logger) : base(repositoryFacade, logger)
+        {
+        }
+
+        public async Task<CardRenewalResult> GetForRequestAsync(int requestId)
+        {
+            return await DbSet
+                .AsNoTracking()
+                .Include(_ => _.CreatedByUser)
+                .Where(_ => _.CardRenewalRequestId == requestId)
+                .SingleOrDefaultAsync();
+        }
+    }
+}
diff --git a/src/Ops.Data/Ops/EmailSetupRepository.cs b/src/Ops.Data/Ops/EmailSetupRepository.cs
new file mode 100644
index 000000000..f9d9a3219
--- /dev/null
+++ b/src/Ops.Data/Ops/EmailSetupRepository.cs
@@ -0,0 +1,27 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+using Ocuda.Ops.Models.Entities;
+using Ocuda.Ops.Service.Interfaces.Ops.Repositories;
+
+namespace Ocuda.Ops.Data.Ops
+{
+    public class EmailSetupRepository 
+        : GenericRepository<OpsContext, EmailSetup>, IEmailSetupRepository
+    {
+        public EmailSetupRepository(ServiceFacade.Repository<OpsContext> repositoryFacade,
+            ILogger<EmailSetupRepository> logger) : base(repositoryFacade, logger)
+        {
+        }
+
+        public async Task<IEnumerable<EmailSetup>> GetAllAsync()
+        {
+            return await DbSet
+                .AsNoTracking()
+                .OrderBy(_ => _.Description)
+                .ToListAsync();
+        }
+    }
+}
diff --git a/src/Ops.Data/OpsContext.cs b/src/Ops.Data/OpsContext.cs
index 5a8ad3965..1bec9e8c1 100644
--- a/src/Ops.Data/OpsContext.cs
+++ b/src/Ops.Data/OpsContext.cs
@@ -16,6 +16,8 @@ protected OpsContext(DbContextOptions options) : base(options)
         }
 
         public DbSet<ApiKey> ApiKeys { get; set; }
+        public DbSet<CardRenewalResponse> CardRenewalResponses { get; set; }
+        public DbSet<CardRenewalResult> CardRenewalResults { get; set; }
         public DbSet<Category> Categories { get; set; }
         public DbSet<ClaimGroup> ClaimGroups { get; set; }
         public DbSet<CoverIssueDetail> CoverIssueDetails { get; set; }
diff --git a/src/Ops.Data/Promenade/CardRenewalRequestRepository.cs b/src/Ops.Data/Promenade/CardRenewalRequestRepository.cs
new file mode 100644
index 000000000..061d57ee6
--- /dev/null
+++ b/src/Ops.Data/Promenade/CardRenewalRequestRepository.cs
@@ -0,0 +1,75 @@
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+using Ocuda.Ops.Data.Extensions;
+using Ocuda.Ops.Data.ServiceFacade;
+using Ocuda.Ops.Service.Filters;
+using Ocuda.Ops.Service.Interfaces.Promenade.Repositories;
+using Ocuda.Promenade.Models.Entities;
+using Ocuda.Utility.Models;
+
+namespace Ocuda.Ops.Data.Promenade
+{
+    public class CardRenewalRequestRepository :
+        GenericRepository<PromenadeContext, CardRenewalRequest>, ICardRenewalRequestRepository
+    {
+        public CardRenewalRequestRepository(Repository<PromenadeContext> repositoryFacade,
+            ILogger<CardRenewalRequestRepository> logger)
+            : base(repositoryFacade, logger)
+        {
+        }
+
+        public async Task<CardRenewalRequest> GetByIdAsync(int id)
+        {
+            return await DbSet
+                .AsNoTracking()
+                .Where(_ => _.Id == id && !_.IsDiscarded)
+                .SingleOrDefaultAsync();
+        }
+
+        public async Task<int> GetCountAsync(bool? isProcessed)
+        {
+            var query = DbSet
+                .AsNoTracking()
+                .Where(_ => !_.IsDiscarded);
+
+            if (isProcessed.HasValue)
+            {
+                query = query.Where(_ => _.ProcessedAt.HasValue == isProcessed);
+            }
+
+            return await query.CountAsync();
+        }
+
+        public async Task<CollectionWithCount<CardRenewalRequest>> GetPaginatedAsync(
+            RequestFilter filter)
+        {
+            var query = DbSet
+                .AsNoTracking()
+                .Where(_ => !_.IsDiscarded);
+
+            if (filter?.IsProcessed.HasValue == true)
+            {
+                query = query.Where(_ => _.ProcessedAt.HasValue == filter.IsProcessed.Value);
+            }
+
+            if (filter?.IsProcessed == true)
+            {
+                query = query.OrderByDescending(_ => _.ProcessedAt);
+            }
+            else
+            {
+                query = query.OrderBy(_ => _.SubmittedAt);
+            }
+
+            return new CollectionWithCount<CardRenewalRequest>
+            {
+                Count = await query.CountAsync(),
+                Data = await query
+                    .ApplyPagination(filter)
+                    .ToListAsync()
+            };
+        }
+    }
+}
diff --git a/src/Ops.Data/Promenade/EmployeeCardRequestRepository.cs b/src/Ops.Data/Promenade/EmployeeCardRequestRepository.cs
index f060b754f..51310b986 100644
--- a/src/Ops.Data/Promenade/EmployeeCardRequestRepository.cs
+++ b/src/Ops.Data/Promenade/EmployeeCardRequestRepository.cs
@@ -41,7 +41,7 @@ public async Task<int> GetCountAsync(bool? isProcessed)
         }
 
         public async Task<CollectionWithCount<EmployeeCardRequest>> GetPaginatedAsync(
-            EmployeeCardFilter filter)
+            RequestFilter filter)
         {
             var query = DbSet.AsNoTracking();
 
diff --git a/src/Ops.Data/Promenade/LanguageRepository.cs b/src/Ops.Data/Promenade/LanguageRepository.cs
index 0b1ab8d13..5a2200220 100644
--- a/src/Ops.Data/Promenade/LanguageRepository.cs
+++ b/src/Ops.Data/Promenade/LanguageRepository.cs
@@ -60,6 +60,15 @@ public async Task<int> GetDefaultLanguageId()
                 .SingleOrDefaultAsync();
         }
 
+        public async Task<string> GetDefaultLanguageNameAsync()
+        {
+            return await DbSet
+                .AsNoTracking()
+                .Where(_ => _.IsActive && _.IsDefault)
+                .Select(_ => _.Name)
+                .SingleOrDefaultAsync();
+        }
+
         public async Task<int> GetLanguageId(string culture)
         {
             return await DbSet
diff --git a/src/Ops.Data/PromenadeContext.cs b/src/Ops.Data/PromenadeContext.cs
index 8f50c439b..cf3f81240 100644
--- a/src/Ops.Data/PromenadeContext.cs
+++ b/src/Ops.Data/PromenadeContext.cs
@@ -14,6 +14,7 @@ protected PromenadeContext(DbContextOptions options) : base(options)
         }
 
         public DbSet<CardDetail> CardDetails { get; set; }
+        public DbSet<CardRenewalRequest> CardRenewalRequests { get; set; }
         public DbSet<Card> Cards { get; set; }
         public DbSet<CarouselButtonLabel> CarouselButtonLabels { get; set; }
 
diff --git a/src/Ops.Models/Defaults/SiteSettings.cs b/src/Ops.Models/Defaults/SiteSettings.cs
index c2f415e4b..b6a2a1cdd 100644
--- a/src/Ops.Models/Defaults/SiteSettings.cs
+++ b/src/Ops.Models/Defaults/SiteSettings.cs
@@ -8,6 +8,56 @@ public static class SiteSettings
     {
         public static IEnumerable<SiteSetting> Get { get; } = new[]
         {
+            #region CardRenewal
+
+            new SiteSetting 
+            {
+                Id = Keys.SiteSetting.CardRenewal.AcceptedCounty,
+                Name = "Accepted county",
+                Description = "Accepted county for card renewal addresses",
+                Category = "CardRenewal",
+                Value = "",
+                Type = SiteSettingType.StringNullable
+            },
+            new SiteSetting
+            {
+                Id = Keys.SiteSetting.CardRenewal.AddressLookupUrl,
+                Name = "Address lookup url",
+                Description = "Address lookup url with scheme, host and path",
+                Category = "CardRenewal",
+                Value = "",
+                Type = SiteSettingType.StringNullable
+            },
+            new SiteSetting
+            {
+                Id = Keys.SiteSetting.CardRenewal.AssessorLookupUrl,
+                Name = "Assessor lookup url",
+                Description = "Assessor lookup with scheme, host and path",
+                Category = "CardRenewal",
+                Value = "",
+                Type= SiteSettingType.StringNullable
+            },
+            new SiteSetting
+            {
+                Id = Keys.SiteSetting.CardRenewal.JuvenilePatronCodes,
+                Name = "Juvenile patron codes",
+                Description = "Juvenile patron code ids, comma delimited",
+                Category = "CardRenewal",
+                Value = "",
+                Type = SiteSettingType.StringNullable
+            },
+            new SiteSetting
+            {
+                Id = Keys.SiteSetting.CardRenewal.LeapPatronUrl,
+                Name = "Leap patron record url",
+                Description = "Leap patron record url with scheme, host and path",
+                Category = "CardRenewal",
+                Value = "",
+                Type = SiteSettingType.StringNullable
+            },
+
+            #endregion CardRenwal
+
             #region Carousel
 
             new SiteSetting
diff --git a/src/Ops.Models/Definitions/ApplicationPermissionDefinitions.cs b/src/Ops.Models/Definitions/ApplicationPermissionDefinitions.cs
index c3d7c316b..37a0001ae 100644
--- a/src/Ops.Models/Definitions/ApplicationPermissionDefinitions.cs
+++ b/src/Ops.Models/Definitions/ApplicationPermissionDefinitions.cs
@@ -7,6 +7,12 @@ public static class ApplicationPermissionDefinitions
     {
         public static readonly ApplicationPermissionDefinition[] ApplicationPermissions =
             {
+            new()
+            {
+                Id = ApplicationPermission.CardRenewalManagement,
+                Info = "Manage settings related to card renewal.",
+                Name = "Card Renewal Management"
+            },
             new() {
                 Id = ApplicationPermission.CoverIssueManagement,
                 Info = "Able to mark cover issues as resolved.",
diff --git a/src/Ops.Models/Entities/CardRenewalResponse.cs b/src/Ops.Models/Entities/CardRenewalResponse.cs
new file mode 100644
index 000000000..a8842b14d
--- /dev/null
+++ b/src/Ops.Models/Entities/CardRenewalResponse.cs
@@ -0,0 +1,31 @@
+using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Ocuda.Ops.Models.Entities
+{
+    public class CardRenewalResponse : Abstract.BaseEntity
+    {
+        [DisplayName("Email")]
+        public int? EmailSetupId { get; set; }
+        public EmailSetup EmailSetup { get; set; }
+
+        public bool IsDeleted { get; set; }
+
+        [Required]
+        [MaxLength(255)]
+        public string Name { get; set; }
+
+        [NotMapped]
+        public string Text { get; set; }
+
+        public ResponseType Type { get; set; }
+        public int SortOrder { get; set; }
+
+        public enum ResponseType
+        {
+            Accept,
+            Deny
+        }
+    }
+}
diff --git a/src/Ops.Models/Entities/CardRenewalResult.cs b/src/Ops.Models/Entities/CardRenewalResult.cs
new file mode 100644
index 000000000..1143b5de1
--- /dev/null
+++ b/src/Ops.Models/Entities/CardRenewalResult.cs
@@ -0,0 +1,29 @@
+using System;
+using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Ocuda.Ops.Models.Entities
+{
+    public class CardRenewalResult
+    {
+        [Key]
+        [DatabaseGenerated(DatabaseGeneratedOption.None)]
+        [Required]
+        public int CardRenewalRequestId { get; set; }
+
+        public int? CardRenewalResponseId { get; set; }
+        public CardRenewalResponse CardRenewalResponse { get; set; }
+
+        public DateTime CreatedAt { get; set; }
+
+        [ForeignKey(nameof(CreatedByUser))]
+        public int CreatedBy { get; set; }
+        public User CreatedByUser { get; set; }
+
+        public bool IsDiscarded { get; set; }
+
+        [DisplayName("Email Text")]
+        public string ResponseText { get; set; }
+    }
+}
diff --git a/src/Ops.Models/Entities/EmailSetupText.cs b/src/Ops.Models/Entities/EmailSetupText.cs
index 46bc173a1..23e27dd9b 100644
--- a/src/Ops.Models/Entities/EmailSetupText.cs
+++ b/src/Ops.Models/Entities/EmailSetupText.cs
@@ -1,4 +1,5 @@
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
 
 namespace Ocuda.Ops.Models.Entities
 {
@@ -20,6 +21,7 @@ public class EmailSetupText
         [MaxLength(255)]
         public string Preview { get; set; }
 
+        [DisplayName("Text")]
         public string BodyText { get; set; }
         public string BodyHtml { get; set; }
 
diff --git a/src/Ops.Models/Keys/ApplicationPermission.cs b/src/Ops.Models/Keys/ApplicationPermission.cs
index cdd7005de..a1bb6da92 100644
--- a/src/Ops.Models/Keys/ApplicationPermission.cs
+++ b/src/Ops.Models/Keys/ApplicationPermission.cs
@@ -5,6 +5,7 @@
         Justification = "Descriptive key name")]
     public static class ApplicationPermission
     {
+        public static readonly string CardRenewalManagement = nameof(CardRenewalManagement);
         public static readonly string CoverIssueManagement = nameof(CoverIssueManagement);
         public static readonly string DigitalDisplayContentManagement = nameof(DigitalDisplayContentManagement);
         public static readonly string EmediaManagement = nameof(EmediaManagement);
diff --git a/src/Ops.Models/Keys/SiteSetting.cs b/src/Ops.Models/Keys/SiteSetting.cs
index 344910eeb..086fd541d 100644
--- a/src/Ops.Models/Keys/SiteSetting.cs
+++ b/src/Ops.Models/Keys/SiteSetting.cs
@@ -2,6 +2,15 @@
 {
     namespace SiteSetting
     {
+        public static class CardRenewal
+        {
+            public static readonly string AcceptedCounty = "CardRenewal.AcceptedCounty";
+            public static readonly string AddressLookupUrl = "CardRenewal.AddressLookupUrl";
+            public static readonly string AssessorLookupUrl = "CardRenewal.AssessorLookupUrl";
+            public static readonly string JuvenilePatronCodes = "CardRenewal.JuvenilePatronCodes";
+            public static readonly string LeapPatronUrl = "CardRenewal.LeapPatronUrl";
+        }
+
         public static class Carousel
         {
             public static readonly string ImageRestrictToDomains = "Carousel.ImageRestricToDomains";
diff --git a/src/Ops.Service/CardRenewalRequestService.cs b/src/Ops.Service/CardRenewalRequestService.cs
new file mode 100644
index 000000000..3b5661bd0
--- /dev/null
+++ b/src/Ops.Service/CardRenewalRequestService.cs
@@ -0,0 +1,46 @@
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Logging;
+using Ocuda.Ops.Service.Abstract;
+using Ocuda.Ops.Service.Filters;
+using Ocuda.Ops.Service.Interfaces.Promenade.Repositories;
+using Ocuda.Ops.Service.Interfaces.Promenade.Services;
+using Ocuda.Promenade.Models.Entities;
+using Ocuda.Utility.Models;
+
+namespace Ocuda.Ops.Service
+{
+    public class CardRenewalRequestService : BaseService<CardRenewalRequestService>,
+        ICardRenewalRequestService
+    {
+        private readonly ICardRenewalRequestRepository _cardRenewalRequestRepository;
+
+        public CardRenewalRequestService(ILogger<CardRenewalRequestService> logger,
+            IHttpContextAccessor httpContext,
+            ICardRenewalRequestRepository cardRenewalRequestRepository)
+            : base(logger, httpContext)
+        {
+            ArgumentNullException.ThrowIfNull(cardRenewalRequestRepository);
+
+            _cardRenewalRequestRepository = cardRenewalRequestRepository;
+
+        }
+
+        public async Task<CardRenewalRequest> GetRequestAsync(int id)
+        {
+            return await _cardRenewalRequestRepository.GetByIdAsync(id);
+        }
+
+        public async Task<int> GetRequestCountAsync(bool? isProcessed)
+        {
+            return await _cardRenewalRequestRepository.GetCountAsync(isProcessed);
+        }
+
+        public async Task<CollectionWithCount<CardRenewalRequest>> GetRequestsAsync(
+            RequestFilter filter)
+        {
+            return await _cardRenewalRequestRepository.GetPaginatedAsync(filter);
+        }
+    }
+}
diff --git a/src/Ops.Service/CardRenewalService.cs b/src/Ops.Service/CardRenewalService.cs
new file mode 100644
index 000000000..40432a532
--- /dev/null
+++ b/src/Ops.Service/CardRenewalService.cs
@@ -0,0 +1,312 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Logging;
+using Ocuda.Ops.Models.Entities;
+using Ocuda.Ops.Service.Abstract;
+using Ocuda.Ops.Service.Interfaces.Ops.Repositories;
+using Ocuda.Ops.Service.Interfaces.Ops.Services;
+using Ocuda.Ops.Service.Interfaces.Promenade.Repositories;
+using Ocuda.Ops.Service.Interfaces.Promenade.Services;
+using Ocuda.Ops.Service.Models.CardRenewal;
+using Ocuda.PolarisHelper;
+using Ocuda.Utility.Abstract;
+using Ocuda.Utility.Exceptions;
+
+namespace Ocuda.Ops.Service
+{
+    public class CardRenewalService : BaseService<CardRenewalService>,
+        ICardRenewalService
+    {
+        private readonly ICardRenewalRequestRepository _cardRenewalRequestRepository;
+        private readonly ICardRenewalResponseRepository _cardRenewalResponseRepository;
+        private readonly ICardRenewalResultRepository _cardRenewalResultRepository;
+        private readonly IDateTimeProvider _dateTimeProvider;
+        private readonly IEmailService _emailService;
+        private readonly ILanguageService _languageService;
+        private readonly IPolarisHelper _polarisHelper;
+
+        public CardRenewalService(ILogger<CardRenewalService> logger,
+            IHttpContextAccessor httpContext,
+            ICardRenewalRequestRepository cardRenewalRequestRepository,
+            ICardRenewalResponseRepository cardRenewalResponseRepository,
+            ICardRenewalResultRepository cardRenewalResultRepository,
+            IDateTimeProvider dateTimeProvider,
+            IEmailService emailService,
+            ILanguageService languageService,
+            IPolarisHelper polarisHelper)
+            : base(logger, httpContext)
+        {
+            ArgumentNullException.ThrowIfNull(cardRenewalRequestRepository);
+            ArgumentNullException.ThrowIfNull(cardRenewalResponseRepository);
+            ArgumentNullException.ThrowIfNull(cardRenewalResultRepository);
+            ArgumentNullException.ThrowIfNull(dateTimeProvider);
+            ArgumentNullException.ThrowIfNull(emailService);
+            ArgumentNullException.ThrowIfNull(languageService);
+            ArgumentNullException.ThrowIfNull(polarisHelper);
+
+            _cardRenewalRequestRepository = cardRenewalRequestRepository;
+            _cardRenewalResponseRepository = cardRenewalResponseRepository;
+            _cardRenewalResultRepository = cardRenewalResultRepository;
+            _dateTimeProvider = dateTimeProvider;
+            _emailService = emailService;
+            _languageService = languageService;
+            _polarisHelper = polarisHelper;
+        }
+
+        public async Task<CardRenewalResponse> CreateResponseAsync(CardRenewalResponse response)
+        {
+            ArgumentNullException.ThrowIfNull(response);
+
+            response.CreatedAt = _dateTimeProvider.Now;
+            response.CreatedBy = GetCurrentUserId();
+            response.Name = response.Name.Trim();
+
+            var maxSortOrder = await _cardRenewalResponseRepository.GetMaxSortOrderAsync();
+            if (maxSortOrder.HasValue)
+            {
+                response.SortOrder = maxSortOrder.Value + 1;
+            }
+
+            await _cardRenewalResponseRepository.AddAsync(response);
+            await _cardRenewalResponseRepository.SaveAsync();
+
+            return response;
+        }
+
+        public async Task DeleteResponseAsync(int id)
+        {
+            var response = await _cardRenewalResponseRepository.FindAsync(id);
+
+            var subsequentResponses = await _cardRenewalResponseRepository
+                .GetSubsequentAsync(response.SortOrder);
+            if (subsequentResponses.Count > 0)
+            {
+                subsequentResponses.ForEach(_ => _.SortOrder--);
+                _cardRenewalResponseRepository.UpdateRange(subsequentResponses);
+            }
+
+            response.IsDeleted = true;
+            _cardRenewalResponseRepository.Update(response);
+            await _cardRenewalResponseRepository.SaveAsync();
+        }
+
+        public async Task DiscardRequestAsync(int id)
+        {
+            var request = await _cardRenewalRequestRepository.GetByIdAsync(id);
+
+            if (request == null)
+            {
+                throw new OcudaException("Request does not exist");
+            }
+
+            if (request.ProcessedAt.HasValue)
+            {
+                throw new OcudaException("Request has already been processed");
+            }
+
+            var now = _dateTimeProvider.Now;
+
+            var result = new CardRenewalResult
+            {
+                CardRenewalRequestId = request.Id,
+                CreatedAt = now,
+                CreatedBy = GetCurrentUserId(),
+                IsDiscarded = true
+            };
+            await _cardRenewalResultRepository.AddAsync(result);
+
+
+            request.IsDiscarded = true;
+            request.ProcessedAt = now;
+            _cardRenewalRequestRepository.Update(request);
+
+            await _cardRenewalResultRepository.SaveAsync();
+            await _cardRenewalRequestRepository.SaveAsync();
+        }
+
+        public async Task<IEnumerable<CardRenewalResponse>> GetAvailableResponsesAsync()
+        {
+            return await _cardRenewalResponseRepository.GetAvailableAsync();
+        }
+
+        public async Task<CardRenewalResponse> GetResponseAsync(int id)
+        {
+            return await _cardRenewalResponseRepository.FindAsync(id);
+        }
+
+        public async Task<CardRenewalResponse> GetResponseTextAsync(int responseId, int languageId)
+        {
+            var response = await _cardRenewalResponseRepository.FindAsync(responseId);
+            if (!response.EmailSetupId.HasValue)
+            {
+                _logger.LogError($"Invalid card renewal response '{responseId}': no email setup set.");
+                throw new OcudaException("Invalid response");
+            }
+
+            var language = await _languageService.GetActiveByIdAsync(languageId);
+
+            var emailSetupText = await _emailService.GetSetupTextByLanguageAsync(
+                response.EmailSetupId.Value,
+                language.Name);
+
+            if (emailSetupText == null)
+            {
+                var defaultLanguage = await _languageService.GetDefaultLanguageNameAsync();
+
+                emailSetupText = await _emailService.GetSetupTextByLanguageAsync(
+                    response.EmailSetupId.Value,
+                    defaultLanguage);
+                if (emailSetupText == null)
+                {
+                    _logger.LogError($"Invalid card renewal response '{responseId}': email setup {response.EmailSetupId} is missing text.");
+                    throw new OcudaException("Invalid response");
+                }
+            }
+
+            response.Text = emailSetupText.BodyText;
+
+            return response;
+        }
+
+        public async Task<IEnumerable<CardRenewalResponse>> GetResponsesAsync()
+        {
+            return await _cardRenewalResponseRepository.GetAllAsync();
+        }
+
+
+        public async Task<CardRenewalResult> GetResultForRequestAsync(int requestId)
+        {
+            return await _cardRenewalResultRepository.GetForRequestAsync(requestId);
+        }
+
+        public async Task<ProcessResult> ProcessRequestAsync(int requestId,
+            int responseId,
+            string responseText,
+            string patronName)
+        {
+            var request = await _cardRenewalRequestRepository
+                .GetByIdAsync(requestId);
+            if (request.ProcessedAt.HasValue)
+            {
+                throw new OcudaException("Request has already been processed.");
+            }
+
+            var processResult = new ProcessResult();
+
+            var response = await _cardRenewalResponseRepository.FindAsync(responseId);
+
+            if (response.Type == CardRenewalResponse.ResponseType.Accept)
+            {
+                var renewResult = _polarisHelper.RenewPatronRegistration(
+                        request.Barcode,
+                        request.Email);
+
+                if (!renewResult.Success)
+                {
+                    throw new OcudaException("Unable to update the record in Polaris.");
+                }
+
+                processResult.EmailNotUpdated = renewResult.EmailNotUpdated;
+            }
+
+            var language = await _languageService.GetActiveByIdAsync(request.LanguageId);
+            var tags = new Dictionary<string, string>
+            {
+                { Keys.CardRenewal.CustomerBarcode, request.Barcode },
+                { Keys.CardRenewal.CustomerName, patronName }
+            };
+
+            var emailDetails = await _emailService.GetDetailsAsync(response.EmailSetupId.Value,
+                language.Name,
+                tags,
+                responseText);
+
+            emailDetails.ToEmailAddress = request.Email;
+            emailDetails.ToName = patronName;
+
+            EmailRecord sentEmail = null;
+
+            try
+            {
+                sentEmail = await _emailService.SendAsync(emailDetails);
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex,
+                        "Error sending email setup {EmailSetupId} to {EmailTo}: {ErrorMessage}",
+                        response.EmailSetupId.Value,
+                        emailDetails.ToEmailAddress,
+                        ex.Message);
+
+                throw new OcudaException("Unable to send email.");
+            }
+
+            if (sentEmail != null)
+            {
+                var now = _dateTimeProvider.Now;
+
+                request.ProcessedAt = now;
+                _cardRenewalRequestRepository.Update(request);
+
+                var result = new CardRenewalResult
+                {
+                    CardRenewalRequestId = request.Id,
+                    CreatedAt = now,
+                    CreatedBy = GetCurrentUserId(),
+                    ResponseText = sentEmail.BodyText
+                };
+
+                await _cardRenewalResultRepository.AddAsync(result);
+                //await _cardRenewalResponseRepository.SaveAsync();
+            }
+
+
+            return processResult;
+        }
+
+        public async Task UpdateResponseAsync(CardRenewalResponse response)
+        {
+            ArgumentNullException.ThrowIfNull(response);
+
+            var currentResponse = await _cardRenewalResponseRepository.FindAsync(response.Id);
+
+            currentResponse.EmailSetupId = response.EmailSetupId;
+            currentResponse.Name = response.Name.Trim();
+
+            _cardRenewalResponseRepository.Update(currentResponse);
+            await _cardRenewalResponseRepository.SaveAsync();
+        }
+
+        public async Task UpdateResponseSortOrderAsync(int id, bool increase)
+        {
+            var response = await _cardRenewalResponseRepository.FindAsync(id);
+
+            int newSortOrder;
+            if (increase)
+            {
+                newSortOrder = response.SortOrder + 1;
+            }
+            else
+            {
+                if (response.SortOrder == 0)
+                {
+                    throw new OcudaException("Response is already in the first position.");
+                }
+                newSortOrder = response.SortOrder - 1;
+            }
+
+            var responseInPosition = await _cardRenewalResponseRepository.GetBySortOrderAsync(
+                newSortOrder)
+                ?? throw new OcudaException("Response is already in the last position.");
+
+            responseInPosition.SortOrder = response.SortOrder;
+            response.SortOrder = newSortOrder;
+
+            _cardRenewalResponseRepository.Update(response);
+            _cardRenewalResponseRepository.Update(responseInPosition);
+            await _cardRenewalResponseRepository.SaveAsync();
+        }
+    }
+}
diff --git a/src/Ops.Service/EmailService.cs b/src/Ops.Service/EmailService.cs
index dbcfede5f..aefc94205 100644
--- a/src/Ops.Service/EmailService.cs
+++ b/src/Ops.Service/EmailService.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Globalization;
+using System.Linq;
 using System.Threading.Tasks;
 using CommonMark;
 using Microsoft.AspNetCore.Http;
@@ -21,6 +22,7 @@ public class EmailService : BaseService<EmailService>, IEmailService
 
         private readonly IOcudaCache _cache;
         private readonly IEmailRecordRepository _emailRecordRepository;
+        private readonly IEmailSetupRepository _emailSetupRepository;
         private readonly IEmailSetupTextRepository _emailSetupTextRepository;
         private readonly IEmailTemplateTextRepository _emailTemplateTextRepository;
         private readonly Utility.Email.Sender _sender;
@@ -28,6 +30,7 @@ public class EmailService : BaseService<EmailService>, IEmailService
 
         public EmailService(ILogger<EmailService> logger,
             IEmailRecordRepository emailRecordRepository,
+            IEmailSetupRepository emailSetupRepository,
             IEmailSetupTextRepository emailSetupTextRepository,
             IEmailTemplateTextRepository emailTemplateTextRepository,
             IHttpContextAccessor httpContextAccessor,
@@ -38,6 +41,7 @@ public EmailService(ILogger<EmailService> logger,
         {
             ArgumentNullException.ThrowIfNull(cache);
             ArgumentNullException.ThrowIfNull(emailRecordRepository);
+            ArgumentNullException.ThrowIfNull(emailSetupRepository);
             ArgumentNullException.ThrowIfNull(emailSetupTextRepository);
             ArgumentNullException.ThrowIfNull(emailTemplateTextRepository);
             ArgumentNullException.ThrowIfNull(sender);
@@ -45,6 +49,7 @@ public EmailService(ILogger<EmailService> logger,
 
             _cache = cache;
             _emailRecordRepository = emailRecordRepository;
+            _emailSetupRepository = emailSetupRepository;
             _emailSetupTextRepository = emailSetupTextRepository;
             _emailTemplateTextRepository = emailTemplateTextRepository;
             _sender = sender;
@@ -53,11 +58,18 @@ public EmailService(ILogger<EmailService> logger,
 
         public async Task<Utility.Email.Details> GetDetailsAsync(int emailSetupId,
              string languageName,
-             IDictionary<string, string> tags)
+             IDictionary<string, string> tags,
+             string overrideText = null)
         {
             var emailSetupText = await GetEmailSetupAsync(emailSetupId, languageName)
                 ?? throw new OcudaEmailException($"Unable to find email setup {emailSetupId} in the requested or default language.");
 
+            if (!string.IsNullOrWhiteSpace(overrideText))
+            {
+                emailSetupText.BodyHtml = null;
+                emailSetupText.BodyText = overrideText;
+            }
+
             var emailTemplateText
                 = await GetEmailTemplateAsync(emailSetupText.EmailSetup.EmailTemplateId,
                     languageName)
@@ -69,7 +81,8 @@ var emailTemplateText
             {
                 try
                 {
-                    emailSetupText.BodyHtml = CommonMarkConverter.Convert(emailSetupText.BodyText);
+                    emailSetupText.BodyHtml = CommonMarkConverter.Convert(overrideText 
+                        ?? emailSetupText.BodyText);
                 }
                 catch (CommonMarkException cmex)
                 {
@@ -100,6 +113,18 @@ var emailTemplateText
             };
         }
 
+        public async Task<Dictionary<int, string>> GetEmailSetupsAsync()
+        {
+            var emailSetups = await _emailSetupRepository.GetAllAsync();
+            return emailSetups.ToDictionary(_ => _.Id, _ => _.Description);
+        }
+
+        public async Task<EmailSetupText> GetSetupTextByLanguageAsync(int emailSetupId, 
+            string languageName)
+        {
+            return await _emailSetupTextRepository.GetByIdLanguageAsync(emailSetupId, languageName);
+        }
+
         public async Task<EmailRecord> SendAsync(Utility.Email.Details emailDetails)
         {
             var record = await _sender.SendEmailAsync(emailDetails);
diff --git a/src/Ops.Service/EmployeeCardService.cs b/src/Ops.Service/EmployeeCardService.cs
index a21caa765..a82d9557a 100644
--- a/src/Ops.Service/EmployeeCardService.cs
+++ b/src/Ops.Service/EmployeeCardService.cs
@@ -42,7 +42,7 @@ public async Task<int> GetRequestCountAsync(bool? isProcessed)
         }
 
         public async Task<CollectionWithCount<EmployeeCardRequest>> GetRequestsAsync(
-            EmployeeCardFilter filter)
+            RequestFilter filter)
         {
             return await _employeeCardRequestRepository.GetPaginatedAsync(filter);
         }
diff --git a/src/Ops.Service/Filters/EmployeeCardFilter.cs b/src/Ops.Service/Filters/RequestFilter.cs
similarity index 53%
rename from src/Ops.Service/Filters/EmployeeCardFilter.cs
rename to src/Ops.Service/Filters/RequestFilter.cs
index bd7f64e6c..0f4b28563 100644
--- a/src/Ops.Service/Filters/EmployeeCardFilter.cs
+++ b/src/Ops.Service/Filters/RequestFilter.cs
@@ -1,8 +1,8 @@
 namespace Ocuda.Ops.Service.Filters
 {
-    public class EmployeeCardFilter : BaseFilter
+    public class RequestFilter : BaseFilter
     {
-        public EmployeeCardFilter(int page) : base(page)
+        public RequestFilter(int page) : base(page)
         {
         }
 
diff --git a/src/Ops.Service/Interfaces/Ops/Repositories/ICardRenewalResponseRepository.cs b/src/Ops.Service/Interfaces/Ops/Repositories/ICardRenewalResponseRepository.cs
new file mode 100644
index 000000000..0be78bb00
--- /dev/null
+++ b/src/Ops.Service/Interfaces/Ops/Repositories/ICardRenewalResponseRepository.cs
@@ -0,0 +1,15 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Ocuda.Ops.Models.Entities;
+
+namespace Ocuda.Ops.Service.Interfaces.Ops.Repositories
+{
+    public interface ICardRenewalResponseRepository : IOpsRepository<CardRenewalResponse, int>
+    {
+        Task<CardRenewalResponse> GetBySortOrderAsync(int sortOrder);
+        Task<int?> GetMaxSortOrderAsync();
+        Task<IEnumerable<CardRenewalResponse>> GetAllAsync();
+        Task<IEnumerable<CardRenewalResponse>> GetAvailableAsync();
+        Task<List<CardRenewalResponse>> GetSubsequentAsync(int sortOrder);
+    }
+}
diff --git a/src/Ops.Service/Interfaces/Ops/Repositories/ICardRenewalResultRepository.cs b/src/Ops.Service/Interfaces/Ops/Repositories/ICardRenewalResultRepository.cs
new file mode 100644
index 000000000..014cc74d1
--- /dev/null
+++ b/src/Ops.Service/Interfaces/Ops/Repositories/ICardRenewalResultRepository.cs
@@ -0,0 +1,10 @@
+using System.Threading.Tasks;
+using Ocuda.Ops.Models.Entities;
+
+namespace Ocuda.Ops.Service.Interfaces.Ops.Repositories
+{
+    public interface ICardRenewalResultRepository : IOpsRepository<CardRenewalResult, int>
+    {
+        Task<CardRenewalResult> GetForRequestAsync(int requestId);
+    }
+}
diff --git a/src/Ops.Service/Interfaces/Ops/Repositories/IEmailSetupRepository.cs b/src/Ops.Service/Interfaces/Ops/Repositories/IEmailSetupRepository.cs
new file mode 100644
index 000000000..4e8f776df
--- /dev/null
+++ b/src/Ops.Service/Interfaces/Ops/Repositories/IEmailSetupRepository.cs
@@ -0,0 +1,11 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Ocuda.Ops.Models.Entities;
+
+namespace Ocuda.Ops.Service.Interfaces.Ops.Repositories
+{
+    public interface IEmailSetupRepository : IGenericRepository<EmailSetup>
+    {
+        Task<IEnumerable<EmailSetup>> GetAllAsync();
+    }
+}
diff --git a/src/Ops.Service/Interfaces/Ops/Services/ICardRenewalService.cs b/src/Ops.Service/Interfaces/Ops/Services/ICardRenewalService.cs
new file mode 100644
index 000000000..b4ef0323a
--- /dev/null
+++ b/src/Ops.Service/Interfaces/Ops/Services/ICardRenewalService.cs
@@ -0,0 +1,25 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Ocuda.Ops.Models.Entities;
+using Ocuda.Ops.Service.Models.CardRenewal;
+
+namespace Ocuda.Ops.Service.Interfaces.Ops.Services
+{
+    public interface ICardRenewalService
+    {
+        Task<CardRenewalResponse> CreateResponseAsync(CardRenewalResponse response);
+        Task DeleteResponseAsync(int id);
+        Task DiscardRequestAsync(int id);
+        Task<IEnumerable<CardRenewalResponse>> GetAvailableResponsesAsync();
+        Task<CardRenewalResponse> GetResponseAsync(int id);
+        Task<IEnumerable<CardRenewalResponse>> GetResponsesAsync();
+        Task<CardRenewalResponse> GetResponseTextAsync(int responseId, int languageId);
+        Task<CardRenewalResult> GetResultForRequestAsync(int requestId);
+        Task<ProcessResult> ProcessRequestAsync(int requestId,
+            int responseId,
+            string responseText,
+            string patronName);
+        Task UpdateResponseAsync(CardRenewalResponse response);
+        Task UpdateResponseSortOrderAsync(int id, bool increase);
+    }
+}
diff --git a/src/Ops.Service/Interfaces/Ops/Services/IEmailService.cs b/src/Ops.Service/Interfaces/Ops/Services/IEmailService.cs
index 8b6a82dcc..4cbef7752 100644
--- a/src/Ops.Service/Interfaces/Ops/Services/IEmailService.cs
+++ b/src/Ops.Service/Interfaces/Ops/Services/IEmailService.cs
@@ -8,7 +8,10 @@ namespace Ocuda.Ops.Service.Interfaces.Ops.Services
     public interface IEmailService
     {
         Task<Details> GetDetailsAsync(int emailSetupId, string languageName,
-            IDictionary<string, string> tags);
+            IDictionary<string, string> tags, string overrideText = null);
+
+        Task<Dictionary<int, string>> GetEmailSetupsAsync();
+        Task<EmailSetupText> GetSetupTextByLanguageAsync(int emailSetupId, string languageName);
 
         Task<EmailRecord> SendAsync(Details emailDetails);
     }
diff --git a/src/Ops.Service/Interfaces/Promenade/Repositories/ICardRenewalRequestRepository.cs b/src/Ops.Service/Interfaces/Promenade/Repositories/ICardRenewalRequestRepository.cs
new file mode 100644
index 000000000..bf245d978
--- /dev/null
+++ b/src/Ops.Service/Interfaces/Promenade/Repositories/ICardRenewalRequestRepository.cs
@@ -0,0 +1,14 @@
+using System.Threading.Tasks;
+using Ocuda.Ops.Service.Filters;
+using Ocuda.Promenade.Models.Entities;
+using Ocuda.Utility.Models;
+
+namespace Ocuda.Ops.Service.Interfaces.Promenade.Repositories
+{
+    public interface ICardRenewalRequestRepository : IGenericRepository<CardRenewalRequest>
+    {
+        Task<CardRenewalRequest> GetByIdAsync(int id);
+        Task<int> GetCountAsync(bool? isProcessed);
+        Task<CollectionWithCount<CardRenewalRequest>> GetPaginatedAsync(RequestFilter filter);
+    }
+}
diff --git a/src/Ops.Service/Interfaces/Promenade/Repositories/IEmployeeCardRequestRepository.cs b/src/Ops.Service/Interfaces/Promenade/Repositories/IEmployeeCardRequestRepository.cs
index ad15b3299..6b3493880 100644
--- a/src/Ops.Service/Interfaces/Promenade/Repositories/IEmployeeCardRequestRepository.cs
+++ b/src/Ops.Service/Interfaces/Promenade/Repositories/IEmployeeCardRequestRepository.cs
@@ -9,6 +9,6 @@ public interface IEmployeeCardRequestRepository : IGenericRepository<EmployeeCar
     {
         Task<EmployeeCardRequest> GetByIdAsync(int Id);
         Task<int> GetCountAsync(bool? isProcessed);
-        Task<CollectionWithCount<EmployeeCardRequest>> GetPaginatedAsync(EmployeeCardFilter filter);
+        Task<CollectionWithCount<EmployeeCardRequest>> GetPaginatedAsync(RequestFilter filter);
     }
 }
diff --git a/src/Ops.Service/Interfaces/Promenade/Repositories/ILanguageRepository.cs b/src/Ops.Service/Interfaces/Promenade/Repositories/ILanguageRepository.cs
index ced6a2e9f..cd765c304 100644
--- a/src/Ops.Service/Interfaces/Promenade/Repositories/ILanguageRepository.cs
+++ b/src/Ops.Service/Interfaces/Promenade/Repositories/ILanguageRepository.cs
@@ -16,6 +16,8 @@ public interface ILanguageRepository : IGenericRepository<Language>
 
         Task<int> GetDefaultLanguageId();
 
+        Task<string> GetDefaultLanguageNameAsync();
+
         Task<int> GetLanguageId(string culture);
     }
 }
\ No newline at end of file
diff --git a/src/Ops.Service/Interfaces/Promenade/Services/ICardRenewalRequestService.cs b/src/Ops.Service/Interfaces/Promenade/Services/ICardRenewalRequestService.cs
new file mode 100644
index 000000000..cc88586a7
--- /dev/null
+++ b/src/Ops.Service/Interfaces/Promenade/Services/ICardRenewalRequestService.cs
@@ -0,0 +1,14 @@
+using System.Threading.Tasks;
+using Ocuda.Ops.Service.Filters;
+using Ocuda.Promenade.Models.Entities;
+using Ocuda.Utility.Models;
+
+namespace Ocuda.Ops.Service.Interfaces.Promenade.Services
+{
+    public interface ICardRenewalRequestService
+    {
+        Task<CardRenewalRequest> GetRequestAsync(int id);
+        Task<int> GetRequestCountAsync(bool? isProcessed);
+        Task<CollectionWithCount<CardRenewalRequest>> GetRequestsAsync(RequestFilter filter);
+    }
+}
diff --git a/src/Ops.Service/Interfaces/Promenade/Services/IEmployeeCardService.cs b/src/Ops.Service/Interfaces/Promenade/Services/IEmployeeCardService.cs
index 715367847..3a4906bb6 100644
--- a/src/Ops.Service/Interfaces/Promenade/Services/IEmployeeCardService.cs
+++ b/src/Ops.Service/Interfaces/Promenade/Services/IEmployeeCardService.cs
@@ -9,7 +9,7 @@ public interface IEmployeeCardService
     {
         Task<EmployeeCardRequest> GetRequestAsync(int requestId);
         Task<int> GetRequestCountAsync(bool? isProcessed);
-        Task<CollectionWithCount<EmployeeCardRequest>> GetRequestsAsync(EmployeeCardFilter filter);
+        Task<CollectionWithCount<EmployeeCardRequest>> GetRequestsAsync(RequestFilter filter);
         Task UpdateNotesAsync(EmployeeCardRequest cardRequest);
     }
 }
diff --git a/src/Ops.Service/Interfaces/Promenade/Services/ILanguageService.cs b/src/Ops.Service/Interfaces/Promenade/Services/ILanguageService.cs
index 775a51f3e..66284f444 100644
--- a/src/Ops.Service/Interfaces/Promenade/Services/ILanguageService.cs
+++ b/src/Ops.Service/Interfaces/Promenade/Services/ILanguageService.cs
@@ -13,5 +13,7 @@ public interface ILanguageService
         Task<IDictionary<int, string>> GetActiveNamesAsync();
 
         Task<int> GetDefaultLanguageId();
+
+        Task<string> GetDefaultLanguageNameAsync();
     }
 }
\ No newline at end of file
diff --git a/src/Ops.Service/Keys/CardRenewal.cs b/src/Ops.Service/Keys/CardRenewal.cs
new file mode 100644
index 000000000..01bf676e4
--- /dev/null
+++ b/src/Ops.Service/Keys/CardRenewal.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Ocuda.Ops.Service.Keys
+{
+    public class CardRenewal
+    {
+        public static readonly string CustomerBarcode = "CustomerBarcode";
+        public static readonly string CustomerName = "CustomerName";
+    }
+}
diff --git a/src/Ops.Service/LanguageService.cs b/src/Ops.Service/LanguageService.cs
index effbc0b1f..1fc9a3276 100644
--- a/src/Ops.Service/LanguageService.cs
+++ b/src/Ops.Service/LanguageService.cs
@@ -36,5 +36,10 @@ public async Task<int> GetDefaultLanguageId()
         {
             return await _languageRepository.GetDefaultLanguageId();
         }
+
+        public async Task<string> GetDefaultLanguageNameAsync()
+        {
+            return await _languageRepository.GetDefaultLanguageNameAsync();
+        }
     }
 }
\ No newline at end of file
diff --git a/src/Ops.Service/Models/CardRenewal/ProcessResult.cs b/src/Ops.Service/Models/CardRenewal/ProcessResult.cs
new file mode 100644
index 000000000..1c64fd34c
--- /dev/null
+++ b/src/Ops.Service/Models/CardRenewal/ProcessResult.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Ocuda.Ops.Service.Models.CardRenewal
+{
+    public class ProcessResult
+    {
+        public bool APIRenew { get; set; }
+        public bool EmailNotUpdated { get; set; }
+    }
+}
diff --git a/src/Ops.Service/Ops.Service.csproj b/src/Ops.Service/Ops.Service.csproj
index 9919f422d..74d9b1013 100644
--- a/src/Ops.Service/Ops.Service.csproj
+++ b/src/Ops.Service/Ops.Service.csproj
@@ -30,6 +30,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Ops.Models\Ops.Models.csproj" />
+    <ProjectReference Include="..\PolarisHelper\PolarisHelper.csproj" />
     <ProjectReference Include="..\Promenade.Models\Promenade.Models.csproj" />
     <ProjectReference Include="..\Promenade.Service\Promenade.Service.csproj" />
     <ProjectReference Include="..\Utility\Utility.csproj" />
diff --git a/src/Ops.Web/Areas/ContentManagement/Views/CardRenewal/Response.cshtml b/src/Ops.Web/Areas/ContentManagement/Views/CardRenewal/Response.cshtml
new file mode 100644
index 000000000..93b0ebfde
--- /dev/null
+++ b/src/Ops.Web/Areas/ContentManagement/Views/CardRenewal/Response.cshtml
@@ -0,0 +1,128 @@
+@model Ocuda.Ops.Controllers.Areas.ContentManagement.ViewModels.CardRenewal.ResponseViewModel
+
+<div class="d-flex justify-content-between">
+	<h1>
+		Card Renewal Response
+		<small class="text-muted">@Model.Response.Name</small>
+	</h1>
+	<div>
+		<a asp-action="@(nameof(CardRenewalController.Responses))"
+		   class="btn btn-outline-dark">Back</a>
+	</div>
+</div>
+
+<div class="row pt-3">
+	<div class="col-12">
+		<input asp-for="Response.Type" disabled formgroup hide-required />
+	</div>
+</div>
+
+<div class="row pb-3">
+	<div class="col-12 col-md-9 offset-md-3">
+		<hr />
+	</div>
+</div>
+
+<form asp-controller="@CardRenewalController.Name"
+	  asp-action="@nameof(CardRenewalController.Response)"
+	  method="post"
+	  role="form">
+	<input asp-for="Response.Id" type="hidden" />
+
+	<input asp-for="Response.Name" formgroup />
+	<select asp-for="Response.EmailSetupId" asp-items="Model.EmailSetups" formgroup>
+		<option></option>
+	</select>
+
+	<div class="row">
+		<div class="offset-md-3 col-md-9">
+			<button type="submit"
+					class="btn btn-outline-success btn-lg"
+					buttonspinner>
+				<span class="fa-regular fa-floppy-disk"></span>
+				Save
+			</button>
+		</div>
+	</div>
+</form>
+
+<div class="row">
+	<div class="col-12 col-md-9 offset-md-3">
+		<hr />
+	</div>
+</div>
+
+<div class="row pb-3">
+	<div class="col-12 col-md-9 offset-md-3">
+		<h3>
+			Email Text Preview
+			<small class="text-muted"><span id="emailSpinner" class="fa-solid fa-spinner fa-pulse d-none"></span></small>
+		</h3>
+		<div>
+			@foreach (var language in Model.Languages)
+			{
+				<button type="button"
+						class="languageSelector btn btn-sm btn-outline-info mt-1 @(language.Id == Model.Languages.First().Id ? "active" : null)"
+						data-name="@language.Name">
+					@language.Description
+				</button>
+			}
+		</div>
+	</div>
+</div>
+
+<input asp-for="EmailSetupText.Subject" formgroup readonly />
+<input asp-for="EmailSetupText.Preview" formgroup readonly />
+<textarea asp-for="EmailSetupText.BodyText" formgroup readonly rows="15"></textarea>
+
+<div class="row">
+	<div class="col-12 col-md-9 offset-md-3">
+		<strong>Replacement Keys</strong> &ndash; {{@Ocuda.Ops.Service.Keys.CardRenewal.CustomerBarcode}}, {{@Ocuda.Ops.Service.Keys.CardRenewal.CustomerName}}
+	</div>
+</div>
+
+
+@section Scripts {
+	<script>
+		$('#Response_EmailSetupId').on('change', function() {
+			UpdateEmailSetupText();
+		});
+
+		$('.languageSelector').on('click', function()
+		{
+			if (!$(this).hasClass('active')){
+				$('.languageSelector').removeClass('active');
+				$(this).addClass('active');
+				UpdateEmailSetupText();
+			}
+
+		});
+
+		function UpdateEmailSetupText() {
+			$('#emailSpinner').removeClass('d-none');
+			$('#Response_EmailSetupId').attr('disabled', 'disabled');
+			$('.languageSelector').attr('disabled', 'disabled');
+
+			let emailSetupId = $('#Response_EmailSetupId').val();
+			let languageName = $('.languageSelector.active').data('name');
+
+			$.get('@Url.Action(nameof(CardRenewalController.GetEmailSetupText))',
+				{ emailSetupId, languageName})
+				.done(function(response) {
+					if (response.success == true) {
+						$('#EmailSetupText_Subject').val(response.subject);
+						$('#EmailSetupText_Preview').val(response.preview);
+						$('#EmailSetupText_BodyText').val(response.bodyText);
+					}
+					else {
+						alert(response.message);
+					}
+			})
+			.always(function() {
+				$('#emailSpinner').addClass('d-none');
+				$('#Response_EmailSetupId').removeAttr('disabled');
+				$('.languageSelector').removeAttr('disabled');
+			});
+		}
+	</script>
+}
\ No newline at end of file
diff --git a/src/Ops.Web/Areas/ContentManagement/Views/CardRenewal/Responses.cshtml b/src/Ops.Web/Areas/ContentManagement/Views/CardRenewal/Responses.cshtml
new file mode 100644
index 000000000..898518a44
--- /dev/null
+++ b/src/Ops.Web/Areas/ContentManagement/Views/CardRenewal/Responses.cshtml
@@ -0,0 +1,170 @@
+@model Ocuda.Ops.Controllers.Areas.ContentManagement.ViewModels.CardRenewal.ResponsesViewModel
+
+<div class="d-flex justify-content-between">
+	<h1>
+		Card Renewal Responses
+	</h1>
+	<div>
+		<button type="button"
+				class="btn btn-outline-secondary"
+				data-bs-toggle="modal"
+				data-bs-target="#addModal">
+			Create
+		</button>
+	</div>
+</div>
+
+<table class="table table-sm table-bordered table-striped">
+	<thead>
+		<tr>
+			<th>Type</th>
+			<th>Name</th>
+			<th>Email</th>
+			<th>&nbsp;</th>
+		</tr>
+	</thead>
+	<tbody>
+		@if (Model.Responses.Count() == 0)
+		{
+			<tr>
+				<td colspan="4">
+					No responses found.
+				</td>
+			</tr>
+		}
+		else
+		{
+			@foreach (var response in Model.Responses)
+			{
+				<tr>
+					<td>@response.Type</td>
+					<td>
+						<a asp-action="@nameof(CardRenewalController.Response)"
+						   asp-route-id="@response.Id">
+							@response.Name
+						</a>
+					</td>
+					<td>@response.EmailSetup?.Description</td>
+					<td align="center">
+						<button type="button"
+								class="btn btn-outline-primary changeSort decreaseSortButton"
+								data-id="@response.Id"
+								data-increase="false"
+								disabled="@(response.Id == Model.Responses.First().Id ? "disabled" : null)">
+							<span class="fa-solid fa-arrow-up" aria-hidden="true"></span>
+						</button>
+						<button class="btn btn-outline-primary changeSort increaseSortButton"
+								data-id="@response.Id"
+								data-increase="true"
+								disabled="@(response.Id == Model.Responses.Last().Id ? "disabled" : null)">
+							<span class="fa-solid fa-arrow-down" aria-hidden="true"></span>
+						</button>
+						<button type="button"
+								class="btn btn-outline-danger"
+								data-bs-toggle="modal"
+								data-bs-target="#deleteModal"
+								data-id="@response.Id"
+								data-name="@response.Name">
+							<span class="fa-solid fa-circle-minus" aria-hidden="true"></span>
+						</button>
+					</td>
+				</tr>
+			}
+		}
+	</tbody>
+</table>
+
+<form asp-controller="@CardRenewalController.Name"
+	  asp-action="@nameof(CardRenewalController.CreateResponse)"
+	  method="post"
+	  role="form">
+	<div modal id="addModal" name="Response" type="Ocuda.Utility.TagHelpers.ModalTypes.Add">
+		<input asp-for="Response.Name" formgroup />
+		<select asp-for="Response.Type" formgroup>
+			<option></option>
+			@foreach (var result in Enum.GetValues(typeof(CardRenewalResponse.ResponseType)))
+			{
+				<option value="@result">@result</option>
+			}
+		</select>
+	</div>
+</form>
+
+<form asp-controller="@CardRenewalController.Name"
+	  asp-action="@nameof(CardRenewalController.DeleteResponse)"
+	  method="post"
+	  role="form">
+	<input id="deleteId" asp-for="Response.Id" type="hidden" />
+	<input id="deleteName" asp-for="Response.Name" type="hidden" />
+
+	<div modal 
+		id="deleteModal" 
+		name="Response" 
+		type="Ocuda.Utility.TagHelpers.ModalTypes.Delete">
+	</div>
+</form>
+
+@section Scripts {
+	<script>
+			$('.changeSort').on('click', function () {
+			let button = $(this);
+			let id = button.data('id');
+			let increase = button.data('increase');
+			let icon = button.children('span');
+			if (icon.hasClass('fa-spinner') == false) {
+				icon.removeClass('fa-arrow-up fa-arrow-down').addClass('fa-spinner fa-pulse');
+				$.post('@Url.Action(nameof(CardRenewalController.ChangeResponseSort))',
+					{ id, increase },
+					function (response) {
+						icon.removeClass('fa-spinner fa-pulse');
+						if (increase) {
+							icon.addClass('fa-arrow-down');
+						}
+						else {
+							icon.addClass('fa-arrow-up');
+						}
+						if (response.success) {
+							var row = button.closest('tr');
+							if (increase) {
+								var nextRow = row.next();
+								row.insertAfter(nextRow);
+								row.find('.decreaseSortButton').removeAttr('disabled');
+								if (row.next().length == 0) {
+									row.find('.increaseSortButton').attr('disabled', 'disabled');
+								}
+								nextRow.find('.increaseSortButton').removeAttr('disabled');
+								if (nextRow.prev().length == 0) {
+									nextRow.find('.decreaseSortButton').attr('disabled', 'disabled');
+								}
+							}
+							else {
+								var prevRow = row.prev();
+								row.insertBefore(prevRow);
+								row.find('.increaseSortButton').removeAttr('disabled');
+								if (row.prev().length == 0) {
+									row.find('.decreaseSortButton').attr('disabled', 'disabled');
+								}
+								prevRow.find('.decreaseSortButton').removeAttr('disabled');
+								if (prevRow.next().length == 0) {
+									prevRow.find('.increaseSortButton').attr('disabled', 'disabled');
+								}
+							}
+						}
+						else {
+							alert(response.message);
+						}
+					});
+			}
+		});
+		
+		$('#deleteModal').on('show.bs.modal', function (e) {
+			let button = $(e.relatedTarget);
+			let id = button.data('id');
+			let name = button.data('name');
+
+			$('#deleteId').val(id);
+			$('#deleteName').val(name);
+			$(this).find('.modal-text').text('Are you sure you want to delete the response' + ' \'' + name + '\'?');
+		});
+	</script>
+}
\ No newline at end of file
diff --git a/src/Ops.Web/Areas/ContentManagement/Views/Home/Index.cshtml b/src/Ops.Web/Areas/ContentManagement/Views/Home/Index.cshtml
index cdd976e6c..d824a6b5e 100644
--- a/src/Ops.Web/Areas/ContentManagement/Views/Home/Index.cshtml
+++ b/src/Ops.Web/Areas/ContentManagement/Views/Home/Index.cshtml
@@ -4,6 +4,22 @@
 <h1>Intranet management</h1>
 
 <div class="row">
+	@if (Model.IsSiteManager || Model.HasCardRenewalPermissions)
+	{
+		<div class="col-12 col-md-4 my-2">
+			<div class="card">
+				<div class="card-header lead fw-bold">
+					Card Renewal
+				</div>
+				<div class="card-body">
+					<a asp-area="@CardRenewalController.Area"
+					   asp-controller="@CardRenewalController.Name"
+					   asp-action="@nameof(CardRenewalController.Responses)"
+					   class="btn btn-outline-dark mt-1">View @nameof(CardRenewalController.Responses)</a>
+				</div>
+			</div>
+		</div>
+	}
     <div class="col-12 col-md-4 my-2">
         <div class="card">
             <div class="card-header lead fw-bold">
diff --git a/src/Ops.Web/Areas/Services/Views/CardRenewal/Details.cshtml b/src/Ops.Web/Areas/Services/Views/CardRenewal/Details.cshtml
new file mode 100644
index 000000000..4e94d1bd8
--- /dev/null
+++ b/src/Ops.Web/Areas/Services/Views/CardRenewal/Details.cshtml
@@ -0,0 +1,415 @@
+@model Ocuda.Ops.Controllers.Areas.Services.ViewModels.CardRenewal.DetailsViewModel
+
+<div class="row">
+	<div class="col-12 col-md-6 col-xl-4 offset-xl-2">
+		<table class="table table-sm table-bordered">
+			<tr>
+				<th style="width: 10rem;">Record id</th>
+				<td>
+					@Model.Request.PatronId
+					@if (!string.IsNullOrEmpty(Model.LeapPath))
+					{
+						<a href="@Model.LeapPath" target="_blank" title="View in Leap">
+							<span class="fa-solid fa-arrow-up-right-from-square fa-fw"></span>
+						</a>
+					}
+				</td>
+			</tr>
+			<tr>
+				<th>Request barcode</th>
+				<td>@Model.Request.Barcode</td>
+			</tr>
+			<tr>
+				<th>First name</th>
+				<td>@Model.PatronData.NameFirst</td>
+			</tr>
+			<tr>
+				<th>Last name</th>
+				<td>@Model.PatronData.NameLast</td>
+			</tr>
+			<tr>
+				<th>Email address</th>
+				<td>@Model.Request.Email</td>
+			</tr>
+			<tr>
+				<th>Expiration date</th>
+				<td>@Model.PatronData.ExpirationDate.ToShortDateString()</td>
+			</tr>
+			<tr class="@(Model.PatronData.AddrCheckDate == Model.PatronData.ExpirationDate ? "table-success" : "table-danger")">
+				<th>Address check date</th>
+				<td>@Model.PatronData.AddrCheckDate?.ToShortDateString()</td>
+			</tr>
+			<tr class="@(Model.Request.SameAddress ? "table-success" : "table-danger")">
+				<th>At the same address</th>
+				<td>@(Model.Request.SameAddress ? "Yes" : "No")</td>
+			</tr>
+			@if (!string.IsNullOrWhiteSpace(Model.AcceptedCounty))
+			{
+				<tr class="@(Model.InCounty ? "table-success" : "table-danger")">
+					<th>In @Model.AcceptedCounty County</th>
+					<td>@(Model.InCounty ? "Yes" : "No")</td>
+				</tr>
+			}
+			<tr>
+				<th>Patron code</th>
+				<td>@Model.PatronCode</td>
+			</tr>
+		</table>
+
+		@if (Model.IsJuvenile)
+		{
+			<table class="table table-sm table-bordered">
+				@if (Model.PatronAge.HasValue)
+				{
+					<tr>
+						<th>Age</th>
+						<td>@Model.PatronAge</td>
+					</tr>
+				}
+				<tr>
+					<th style="width: 13rem;">Request guardian's name</th>
+					<td>@Model.Request.GuardianName</td>
+				</tr>
+				<tr>
+					<th>Request guardian's barcode</th>
+					<td>@Model.Request.GuardianBarcode</td>
+				</tr>
+				<tr>
+					<th>Polaris guardian's name</th>
+					<td>@Model.PatronData.User3</td>
+				</tr>
+				<tr>
+					<th>Polaris guardian's barcode</th>
+					<td>@Model.PatronData.User2</td>
+				</tr>
+			</table>
+		}
+	</div>
+	<div class="col-12 col-md-6 col-xl-4">
+		<table class="table table-sm table-bordered">
+			<tr>
+				<th style="width: 10rem;">Charges</th>
+				<td>@Model.PatronData.ChargeBalance.ToString("C")</td>
+			</tr>
+			<tr class="@(Model.PatronData.PatronSystemBlocks.Any() ? "table-danger" : "table-success")">
+				<th>Has system blocks</th>
+				<td>@(Model.PatronData.PatronSystemBlocks.Any() ? "Yes" : "No")</td>
+			</tr>
+			<tr>
+				<th>Blocks</th>
+				<td>TODO</td>
+			</tr>
+			<tr class="@(string.IsNullOrWhiteSpace(Model.PatronData.PatronNotes?.BlockingStatusNotes) ? "table-success" : "table-danger")">
+				<th>
+					Blocking notes
+					@if (Model.PatronData.PatronNotes?.BlockingStatusNotes?.Length > Model.MaxNotesDisplayLength)
+					{
+						<button type="button"
+								class="btn btn-sm btn-light"
+								data-bs-toggle="modal"
+								data-bs-target="#blockingNotesModal">
+							<strong>
+								<span class="fa-regular fa-note-sticky fa-fw"></span>
+								View full notes
+							</strong>
+						</button>
+					}
+				</th>
+				<td>@(!string.IsNullOrWhiteSpace(Model.PatronData.PatronNotes?.BlockingStatusNotes) ? new string(Model.PatronData.PatronNotes?.BlockingStatusNotes.Take(Model.MaxNotesDisplayLength).ToArray()) : "None")</td>
+			</tr>
+			<tr>
+				<th>
+					Non-blocking notes
+					@if (Model.PatronData.PatronNotes?.NonBlockingStatusNotes?.Length > Model.MaxNotesDisplayLength)
+					{
+						<button type="button"
+								class="btn btn-sm btn-light"
+								data-bs-toggle="modal"
+								data-bs-target="#nonBlockingNotesModal">
+							<strong>
+								<span class="fa-regular fa-note-sticky fa-fw"></span>
+								View full notes
+							</strong>
+						</button>
+					}
+				</th>
+				<td>@(!string.IsNullOrWhiteSpace(Model.PatronData.PatronNotes?.NonBlockingStatusNotes) ? new string(Model.PatronData.PatronNotes?.NonBlockingStatusNotes.Take(Model.MaxNotesDisplayLength).ToArray()) : "None")</td>
+			</tr>
+			<tr>
+				<th>Proof of address</th>
+				<td>@Model.PatronData.User4</td>
+			</tr>
+		</table>
+		@if (Model.Request.ProcessedAt.HasValue)
+		{
+			<table class="table table-sm table-bordered table-striped">
+				<tr>
+					<th>Processed by</th>
+					<td>
+						@if (Model.Result.CreatedByUser.IsDeleted == false)
+						{
+							<a asp-controller="Profile"
+							   asp-area=""
+							   asp-action="Index"
+							   asp-route-id="@Model.Result.CreatedByUser.Username">@Model.Result.CreatedByUser.Name</a>
+						}
+						else
+						{
+							@Model.Result.CreatedByUser.Name
+						}
+					</td>
+				</tr>
+				<tr>
+					<th>Processed at</th>
+					<td>@Model.Request.ProcessedAt</td>
+				</tr>
+			</table>
+		}
+	</div>
+</div>
+
+<div class="row">
+	<div class="col-12 col-xl-8 offset-xl-2">
+		<div class="accordion" id="addressAccordion">
+			<div class="accordion-item">
+				<h2 class="accordion-header">
+					<button class="accordion-button collapsed"
+							type="button"
+							data-bs-toggle="collapse"
+							data-bs-target="#addressContainer"
+							aria-expanded="false"
+							aria-controler="addressContainer">
+						Address Verification
+					</button>
+				</h2>
+				<div id="addressContainer"
+					 class="accordion-collapse collapse"
+					 data-bs-parent="#addressAccordion">
+					<div class="accordion-body">
+						<div class="row">
+							<div class="col-12 col-md-4">
+								<div><em>Address(es) in Polaris:</em></div>
+								@foreach (var address in Model.PatronData.PatronAddresses)
+								{
+									<div>
+										<strong>@address.FreeTextLabel</strong>
+										@if (!string.IsNullOrWhiteSpace(Model.AddressLookupPath) || !string.IsNullOrWhiteSpace(Model.AssessorLookupPath))
+										{
+											<span>
+												(<a href="#"
+													class="addressLookup"
+													data-address="@address.StreetOne @address.StreetTwo"
+													data-zip="@address.PostalCode">Look up</a>)
+											</span>
+
+										}
+									</div>
+									<div class="mb-3">
+										@address.StreetOne<br />
+										@if (!string.IsNullOrWhiteSpace(address.StreetTwo))
+										{
+											@address.StreetTwo
+											<br />
+										}
+										@address.City @address.State, @address.PostalCode<br />
+										County: @address.County
+									</div>
+								}
+							</div>
+							@if (!string.IsNullOrWhiteSpace(Model.AddressLookupPath) || !string.IsNullOrWhiteSpace(Model.AssessorLookupPath))
+							{
+								<div class="col-12 col-md-8">
+									@if (!string.IsNullOrWhiteSpace(Model.AddressLookupPath))
+									{
+										<div id="addressLookupResults" class="mb-2"></div>
+									}
+									@if (!string.IsNullOrWhiteSpace(Model.AssessorLookupPath))
+									{
+										<div id="assessorLookupResults"></div>
+									}
+								</div>
+							}
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+
+<form asp-controller="@CardRenewalController.Name"
+	  asp-action="@nameof(CardRenewalController.Details)"
+	  method="post"
+	  role="form">
+	<input asp-for="PatronName" type="hidden" />
+	<input asp-for="RequestId" value="@Model.Request.Id" type="hidden" />
+
+	<div class="row mt-4">
+		<div class="col-12 col-xl-8 offset-xl-2">
+			<div class="mb-3">
+				<select asp-for="ResponseId" asp-items="@Model.ResponseList" class="form-control">
+					<option value="">Please select a response</option>
+				</select>
+				<span asp-validation-for="ResponseId" class="text-danger"></span>
+			</div>
+
+			<div class="mb-3">
+				<textarea asp-for="ResponseText" class="form-control" rows="5"></textarea>
+				<span asp-validation-for="ResponseText" class="text-danger"></span>
+			</div>
+
+			<div class="row mb-3">
+				<div class="col-12">
+					<strong>Replacement Keys</strong> &ndash; {{@Ocuda.Ops.Service.Keys.CardRenewal.CustomerBarcode}}, {{@Ocuda.Ops.Service.Keys.CardRenewal.CustomerName}}
+				</div>
+			</div>
+
+
+			<div>
+				<button id="processButton"
+						type="submit"
+						class="btn btn-secondary disabled"
+						button-spinner>
+					<span id="buttonIcon" class="d-none"></span>
+					<span id="buttonText">Mark Processed, send email</span>
+				</button>
+				<button type="button"
+						class="btn btn-warning"
+						data-bs-toggle="modal"
+						data-bs-target="#discardModal">
+					<span class="fa-solid fa-trash-can"></span>
+					Discard Request, do not send email
+				</button>
+				<a asp-action="@(nameof(CardRenewalController.Index))"
+				   asp-route-processed="@(Model.Request.ProcessedAt.HasValue ? "true" : "")"
+				   class="btn btn-outline-dark float-end">Back</a>
+			</div>
+		</div>
+	</div>
+</form>
+
+<form asp-action="@nameof(CardRenewalController.Discard)"
+	  enctype="multipart/form-data"
+	  method="post"
+	  role="form">
+	<input name="id" value="@Model.Request.Id" type="hidden" />
+
+	<div class="modal" tabindex="-1" id="discardModal">
+		<div class="modal-dialog">
+			<div class="modal-content">
+				<div class="modal-header">
+					<h5 class="modal-title">Discard Request</h5>
+					<button type="button"
+							class="btn-close"
+							data-bs-dismiss="modal"
+							aria-label="Close"></button>
+				</div>
+				<div class="modal-body">
+					<p>Are you sure you want to discard this request?</p>
+				</div>
+				<div class="modal-footer">
+					<button type="button" class="btn btn-outline-secondary" data-bs-dismiss="modal">Close</button>
+					<button type="submit" class="btn btn-outline-warning">
+						<span class="fa fa-trash" aria-hidden="true"></span>
+						Discard
+					</button>
+				</div>
+			</div>
+		</div>
+	</div>
+</form>
+
+@if (Model.PatronData.PatronNotes?.BlockingStatusNotes?.Length > Model.MaxNotesDisplayLength)
+{
+	<div modal id="blockingNotesModal" name="Blocking Notes" suppress-footer="true">
+		@Model.PatronData.PatronNotes?.BlockingStatusNotes
+	</div>
+}
+
+@if (Model.PatronData.PatronNotes?.NonBlockingStatusNotes?.Length > Model.MaxNotesDisplayLength)
+{
+	<div modal id="nonBlockingNotesModal" name="Non-Blocking Notes" suppress-footer="true">
+		@Model.PatronData.PatronNotes?.NonBlockingStatusNotes
+	</div>
+}
+
+@section scripts {
+	<script>
+		$('.addressLookup').on("click", function(e) {
+			e.preventDefault();
+			let searchAddress = $(this).attr('data-address');
+			let searchZip = $(this).attr('data-zip');
+			let addressLookupDiv = $('#addressLookupResults');
+			let assessorLookupDiv = $('#assessorLookupResults');
+
+			addressLookupDiv.html('<strong>Loading address...</strong>  <span class="fa-solid fa-spinner fa-pulse fa-fw">');
+			assessorLookupDiv.html('<strong>Loading assessor...</strong>  <span class="fa-solid fa-spinner fa-pulse fa-fw">');
+
+			let addressLookupUrl = '@Model.AddressLookupPath';
+
+			$.get(addressLookupUrl,
+				{
+					address: searchAddress,
+					zip: searchZip
+				})
+				.done(function(response) {
+					if (response.success == true)
+					{
+						alert(response.residents);
+					}
+				});
+		});
+
+		$('#ResponseId').on('change', function() {
+			const languageId = '@Model.Request.LanguageId';
+			let responseId = $(this).val();
+			let responseText = $('#ResponseText');
+
+			if (responseId == '') {
+				responseText.val('');
+				UpdateProcessButton('');
+			}
+			else {
+				$.get('@Url.Action(nameof(CardRenewalController.GetResponseText))',
+					{responseId, languageId})
+					.done(function(response) {
+						if (response.success) {
+							responseText.val(response.Text);
+							UpdateProcessButton(response.Type);
+						}
+						else {
+							alert(response.message);
+						}
+					});
+			}
+		});
+
+		function UpdateProcessButton(responseType) {
+			let processButton = $('#processButton');
+			let buttonIcon = $('#buttonIcon');
+			let buttonText = $('#buttonText');
+			if (responseType == 'Accept') {
+				processButton.attr('class', 'btn btn-success btn-spinner');
+				buttonText.text('Update in Polaris, Mark Processed, send email');
+				buttonIcon.attr('class', 'fa-solid fa-pen-to-square');
+			}
+			else if (responseType == 'Deny') {
+				processButton.attr('class', 'btn btn-danger btn-spinner');
+				buttonText.text('Mark Processed, send email');
+				buttonIcon.attr('class', 'fa-solid fa-xmark');
+			}
+			else {
+				processButton.attr('class', 'btn btn-secondary disabled');
+				buttonText.text('Mark Processed, send email');
+				buttonIcon.attr('class', 'd-none');
+			}
+		}
+
+	</script>
+
+	@if (!Model.Request.ProcessedAt.HasValue)
+	{
+		<script>
+		</script>
+	}
+}
\ No newline at end of file
diff --git a/src/Ops.Web/Areas/Services/Views/CardRenewal/Index.cshtml b/src/Ops.Web/Areas/Services/Views/CardRenewal/Index.cshtml
new file mode 100644
index 000000000..aeacccbfd
--- /dev/null
+++ b/src/Ops.Web/Areas/Services/Views/CardRenewal/Index.cshtml
@@ -0,0 +1,96 @@
+@model Ocuda.Ops.Controllers.Areas.Services.ViewModels.CardRenewal.IndexViewModel
+
+<div class="row">
+	<div class="col-12 col-md-6 mb-2">
+		<h1>
+			Card Renewal Requests
+			<small class="text-muted d-print-block">@(Model.IsProcessed ? "Processed" : "Pending")</small>
+		</h1>
+
+	</div>
+</div>
+
+<div class="row mb-2">
+	<div class="col-12">
+		<div class="d-inline-block">
+			<ul class="nav nav-pills">
+				<li class="nav-item">
+					<a asp-action="@nameof(CardRenewalController.Index)"
+					   asp-route-Processed=""
+					   class="nav-link"
+					   ActiveBy routeKey="processed" value=",false">
+						Pending
+						<span class="badge text-bg-secondary">@Model.PendingCount</span>
+					</a>
+				</li>
+				<li class="nav-item">
+					<a asp-action="@nameof(EmployeeCardController.Index)"
+					   asp-route-Processed="true"
+					   class="nav-link"
+					   ActiveBy routeKey="processed"
+					   value="@true">
+						Processed
+						<span class="badge text-bg-secondary">@Model.ProcessedCount</span>
+					</a>
+				</li>
+			</ul>
+		</div>
+	</div>
+</div>
+
+<table class="table table-sm table-bordered table-striped">
+	<thead>
+		<tr>
+			<th>@(Model.IsProcessed ? "Processed" : "Submitted")</th>
+			<th>Barcode</th>
+			<th>Same Address?</th>
+			@if (Model.IsProcessed)
+			{
+				<th>Accepted?</th>
+			}
+		</tr>
+	</thead>
+	<tbody>
+		@if (Model.ItemCount == 0)
+		{
+			<tr>
+				<td colspan="4">
+					No requests found.
+				</td>
+			</tr>
+		}
+		else
+		{
+			@foreach (var request in Model.CardRequests)
+			{
+				<tr>
+					<td>
+						<a asp-action="@(nameof(CardRenewalController.Details))"
+						   asp-route-id="@request.Id">
+							@(Model.IsProcessed? request.ProcessedAt: request.SubmittedAt)
+						</a>
+					</td>
+					<td>@request.Barcode</td>
+					<td class="@(request.SameAddress ? "table-success" : "table-danger")">@(request.SameAddress ? "Yes" : "No")</td>
+					@if (Model.IsProcessed)
+					{
+						/*
+						<td>
+							@if (request.Accepted == true)
+							{
+								<span class="fa-solid fa-check fa-fw"></span>
+							}
+							else
+							{
+								<span class="fa-solid fa-xmark fa-fw"></span>
+							}
+						</td>
+						*/
+					}
+				</tr>
+			}
+		}
+	</tbody>
+</table>
+
+<nav paginate="@Model"></nav>
\ No newline at end of file
diff --git a/src/Ops.Web/Startup.cs b/src/Ops.Web/Startup.cs
index a57104568..246b1318f 100644
--- a/src/Ops.Web/Startup.cs
+++ b/src/Ops.Web/Startup.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Net.Http;
 using System.Net.Http.Headers;
+using Clc.Polaris.Api.Configuration;
 using Microsoft.AspNetCore.Authentication.Cookies;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.DataProtection;
@@ -22,6 +23,7 @@
 using Ocuda.Ops.Service.Interfaces.Promenade.Services;
 using Ocuda.Ops.Web.JobScheduling;
 using Ocuda.Ops.Web.StartupHelper;
+using Ocuda.PolarisHelper;
 using Ocuda.Utility.Abstract;
 using Ocuda.Utility.Exceptions;
 using Ocuda.Utility.Keys;
@@ -123,6 +125,8 @@ public void ConfigureServices(IServiceCollection services)
                     = new Microsoft.AspNetCore.Localization.RequestCulture(culture);
             });
 
+            services.Configure<PapiSettings>(_config.GetSection(PapiSettings.SECTION_NAME));
+
             services.AddHealthChecks();
 
             switch (_config[Configuration.OpsDistributedCache])
@@ -327,10 +331,15 @@ string cacheDiscriminator
             // helpers
             services.AddScoped<Utility.Helpers.WebHelper>();
             services.AddScoped<Utility.Email.Sender>();
+            services.AddScoped<IPolarisHelper, PolarisHelper.PolarisHelper>();
 
             // repositories
             services.AddScoped<Service.Interfaces.Ops.Repositories.IApiKeyRepository,
                 Data.Ops.ApiKeyRepository>();
+            services.AddScoped<Service.Interfaces.Ops.Repositories.ICardRenewalResponseRepository,
+                Data.Ops.CardRenewalResponseRepository>();
+            services.AddScoped<Service.Interfaces.Ops.Repositories.ICardRenewalResultRepository,
+                Data.Ops.CardRenewalResultRepository>();
             services.AddScoped<Service.Interfaces.Ops.Repositories.ICategoryRepository,
                 Data.Ops.CategoryRepository>();
             services.AddScoped<Service.Interfaces.Ops.Repositories.IClaimGroupRepository,
@@ -353,6 +362,8 @@ string cacheDiscriminator
                 Data.Ops.DigitalDisplaySetRepository>();
             services.AddScoped<Service.Interfaces.Ops.Repositories.IEmailRecordRepository,
                 Data.Ops.EmailRecordRepository>();
+            services.AddScoped<Service.Interfaces.Ops.Repositories.IEmailSetupRepository,
+                Data.Ops.EmailSetupRepository>();
             services.AddScoped<Service.Interfaces.Ops.Repositories.IEmailSetupTextRepository,
                 Data.Ops.EmailSetupTextRepository>();
             services.AddScoped<Service.Interfaces.Ops.Repositories.IEmailTemplateTextRepository,
@@ -436,6 +447,8 @@ string cacheDiscriminator
 
             services.AddScoped<Service.Interfaces.Promenade.Repositories.ICardDetailRepository,
                 Data.Promenade.CardDetailRepository>();
+            services.AddScoped<Service.Interfaces.Promenade.Repositories.ICardRenewalRequestRepository,
+                Data.Promenade.CardRenewalRequestRepository>();
             services.AddScoped<Service.Interfaces.Promenade.Repositories.ICardRepository,
                 Data.Promenade.CardRepository>();
             services.AddScoped<Service.Interfaces.Promenade.Repositories.ICarouselButtonLabelRepository,
@@ -558,6 +571,8 @@ string cacheDiscriminator
             // services
             services.AddScoped<IApiKeyService, ApiKeyService>();
             services.AddScoped<IAuthorizationService, AuthorizationService>();
+            services.AddScoped<ICardRenewalRequestService, CardRenewalRequestService>();
+            services.AddScoped<ICardRenewalService, CardRenewalService>();
             services.AddScoped<ICarouselService, CarouselService>();
             services.AddScoped<ICategoryService, CategoryService>();
             services.AddScoped<ICoverIssueService, CoverIssueService>();
diff --git a/src/Ops.Web/Views/Shared/_Layout.cshtml b/src/Ops.Web/Views/Shared/_Layout.cshtml
index 823d1a2ef..22606d704 100644
--- a/src/Ops.Web/Views/Shared/_Layout.cshtml
+++ b/src/Ops.Web/Views/Shared/_Layout.cshtml
@@ -130,6 +130,13 @@
 								<span class="fa-regular fa-clock fa-fw"></span>
 								Book a Librarian
 							</a>
+							<a class="dropdown-item"
+							   asp-controller="@Ocuda.Ops.Controllers.Areas.Services.CardRenewalController.Name"
+							   asp-area="@(nameof(Ocuda.Ops.Controllers.Areas.Services))"
+							   asp-action="@(nameof(Ocuda.Ops.Controllers.Areas.Services.CardRenewalController.Index))">
+								<span class="fa-solid fa-credit-card fa-fw"></span>
+								Card Renewal
+							</a>
 							<a class="dropdown-item"
 							   asp-controller="@Ocuda.Ops.Controllers.Areas.Services.EmployeeCardController.Name"
 							   asp-area="@(nameof(Ocuda.Ops.Controllers.Areas.Services))"
diff --git a/src/PolarisHelper/IPolarisHelper.cs b/src/PolarisHelper/IPolarisHelper.cs
new file mode 100644
index 000000000..9f9dc0087
--- /dev/null
+++ b/src/PolarisHelper/IPolarisHelper.cs
@@ -0,0 +1,15 @@
+using System.Threading.Tasks;
+using Clc.Polaris.Api.Models;
+using Ocuda.PolarisHelper.Models;
+
+namespace Ocuda.PolarisHelper
+{
+    public interface IPolarisHelper
+    {
+        PatronValidateResult AuthenticatePatron(string barcode, string password);
+        Task<string> GetPatronCodeNameAsync(int patronCodeId);
+        PatronData GetPatronData(string barcode, string password);
+        PatronData GetPatronDataOverride(string barcode);
+        RenewRegistrationResult RenewPatronRegistration(string barcode, string email);
+    }
+}
diff --git a/src/PolarisHelper/Models/RenewRegistrationResult.cs b/src/PolarisHelper/Models/RenewRegistrationResult.cs
new file mode 100644
index 000000000..7e8fd849d
--- /dev/null
+++ b/src/PolarisHelper/Models/RenewRegistrationResult.cs
@@ -0,0 +1,8 @@
+namespace Ocuda.PolarisHelper.Models
+{
+    public class RenewRegistrationResult
+    {
+        public bool EmailNotUpdated { get; set; }
+        public bool Success { get; set; }
+    }
+}
diff --git a/src/PolarisHelper/PolarisHelper.cs b/src/PolarisHelper/PolarisHelper.cs
new file mode 100644
index 000000000..64fa679db
--- /dev/null
+++ b/src/PolarisHelper/PolarisHelper.cs
@@ -0,0 +1,136 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Clc.Polaris.Api;
+using Clc.Polaris.Api.Configuration;
+using Clc.Polaris.Api.Models;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+using Ocuda.PolarisHelper.Models;
+using Ocuda.Utility.Keys;
+using Ocuda.Utility.Services.Interfaces;
+
+namespace Ocuda.PolarisHelper
+{
+    public class PolarisHelper : IPolarisHelper
+    {
+        private const int CacheCodesHours = 1;
+        private const int PAPIInvalidEmailErrorCode = -3518;
+
+        private readonly IOcudaCache _cache;
+        private readonly ILogger<PolarisHelper> _logger;
+        private readonly IPapiClient _papiClient;
+
+        public PolarisHelper(IOcudaCache cache,
+            ILogger<PolarisHelper> logger,
+            IOptions<PapiSettings> options)
+        {
+
+            ArgumentNullException.ThrowIfNull(cache);
+            ArgumentNullException.ThrowIfNull(logger);
+            ArgumentNullException.ThrowIfNull(options);
+
+            _cache = cache;
+            _logger = logger;
+            _papiClient = new PapiClient(options.Value);
+        }
+
+        public PatronValidateResult AuthenticatePatron(string barcode, string password)
+        {
+            return _papiClient.PatronValidate(barcode, password)?.Data;
+        }
+
+        public async Task<string> GetPatronCodeNameAsync(int patronCodeId)
+        {
+            var patronCodes = await _cache
+                .GetObjectFromCacheAsync<List<PatronCodeRow>>(Cache.PolarisPatronCodes);
+
+            if (patronCodes == null)
+            {
+                patronCodes = _papiClient.PatronCodesGet().Data.PatronCodesRows;
+                await _cache.SaveToCacheAsync(Cache.PolarisPatronCodes,
+                    patronCodes,
+                    CacheCodesHours);
+            }
+
+            return patronCodes
+                .Where(_ => _.PatronCodeID == patronCodeId)
+                .Select(_ => _.Description)
+                .SingleOrDefault();
+        }
+
+        //public async Task<>-
+
+        public PatronData GetPatronData(string barcode, string password)
+        {
+            return _papiClient.PatronBasicDataGet(barcode, password, true).Data.PatronBasicData;
+        }
+
+        public PatronData GetPatronDataOverride(string barcode)
+        {
+            return _papiClient.PatronBasicDataGet(barcode, addresses: true, notes: true)
+                .Data
+                .PatronBasicData;
+        }
+
+        public RenewRegistrationResult RenewPatronRegistration(string barcode, string email)
+        {
+            var date = DateTime.Now.AddYears(1);
+            var updateParams = new PatronUpdateParams
+            {
+                BranchId = _papiClient.OrganizationId,
+                UserId = _papiClient.UserId,
+                LogonWorkstationId = _papiClient.WorkstationId,
+                ExpirationDate = date,
+                AddrCheckDate = date,
+                EmailAddress = email
+            };
+
+            var renewResult = new RenewRegistrationResult();
+
+            var updateResults = _papiClient.PatronUpdate(barcode, updateParams);
+
+            if (updateResults.Exception != null)
+            {
+                _logger.LogCritical("PAPI call was not successful: {ErrorMessage}",
+                    updateResults.Exception.Message);
+            }
+            else if (!updateResults.Response.IsSuccessStatusCode)
+            {
+                _logger.LogCritical("PAPI call was not successful after {Elapsed} ms: {StatusCode}",
+                    updateResults.ResponseTime,
+                    updateResults.Response.StatusCode);
+            }
+            else
+            {
+                if (updateResults.Data.PAPIErrorCode == PAPIInvalidEmailErrorCode)
+                {
+                    renewResult.EmailNotUpdated = true;
+                    updateParams.EmailAddress = null;
+
+                    updateResults = _papiClient.PatronUpdate(barcode, updateParams);
+                }
+
+                if (updateResults.Data.PAPIErrorCode != 0)
+                {
+                    _logger.LogCritical("PAPI error after {Elapsed} ms: {PAPIErrorCode}",
+                        updateResults.ResponseTime,
+                        updateResults.Data.PAPIErrorCode);
+                }
+                else if (updateResults.Data.PAPIErrorCode == 0)
+                {
+                    renewResult.Success = true;
+                    if (renewResult.EmailNotUpdated)
+                    {
+                        _logger.LogWarning("Unable to update email to {EmailAddress} for barcode {Barcode}",
+                            email,
+                            barcode);
+                    }
+                }
+            }
+
+            return renewResult;
+        }
+    }
+}
diff --git a/src/PolarisHelper/PolarisHelper.csproj b/src/PolarisHelper/PolarisHelper.csproj
new file mode 100644
index 000000000..403b46685
--- /dev/null
+++ b/src/PolarisHelper/PolarisHelper.csproj
@@ -0,0 +1,25 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <AssemblyName>Ocuda.PolarisHelper</AssemblyName>
+    <Authors>Maricopa County Library District Web developers</Authors>
+    <CodeAnalysisRuleSet>../../OcudaRuleSet.ruleset</CodeAnalysisRuleSet>
+    <Company>Maricopa County Library District</Company>
+    <Copyright>Copyright 2018 Maricopa County Library District</Copyright>
+    <PackageLicenseUrl>https://github.com/MCLD/ocuda/blob/develop/LICENSE</PackageLicenseUrl>
+    <Product>Ocuda</Product>
+    <RepositoryType>Git</RepositoryType>
+    <RepositoryUrl>https://github.com/MCLD/ocuda/</RepositoryUrl>
+    <RootNamespace>Ocuda.PolarisHelper</RootNamespace>
+    <TargetFramework>net8.0</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Options" Version="8.0.2" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Utility\Utility.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Promenade.Controllers/CardRenewalController.cs b/src/Promenade.Controllers/CardRenewalController.cs
new file mode 100644
index 000000000..f864a99bd
--- /dev/null
+++ b/src/Promenade.Controllers/CardRenewalController.cs
@@ -0,0 +1,354 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.Json;
+using System.Threading.Tasks;
+using Clc.Polaris.Api.Models;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Logging;
+using Ocuda.PolarisHelper;
+using Ocuda.Promenade.Controllers.Abstract;
+using Ocuda.Promenade.Controllers.Filters;
+using Ocuda.Promenade.Controllers.ViewModels.CardRenewal;
+using Ocuda.Promenade.Models.Entities;
+using Ocuda.Promenade.Service;
+using Ocuda.Utility.Abstract;
+
+namespace Ocuda.Promenade.Controllers
+{
+    [Route("[Controller]")]
+    [Route("{culture:cultureConstraint?}/[Controller]")]
+    public class CardRenewalController : BaseController<CardRenewalController>
+    {
+        private const string TempDataAddresses = "TempData.Addresses";
+        private const string TempDataEmail = "TempData.Email";
+        private const string TempDataJuvenile = "TempData.Juvenile";
+        private const string TempDataRequest = "TempData.Request";
+        private const string TempDataTimeout = "TempData.Timeout";
+
+        private readonly CardRenewalService _cardRenewalService;
+        private readonly IDateTimeProvider _dateTimeProvider;
+        private readonly IPolarisHelper _polarisHelper;
+        private readonly SegmentService _segmentService;
+
+        public CardRenewalController(ServiceFacades.Controller<CardRenewalController> context,
+            CardRenewalService cardRenewalService,
+            IDateTimeProvider dateTimeProvider,
+            IPolarisHelper polarisHelper,
+            SegmentService segmentService)
+            : base(context)
+        {
+            ArgumentNullException.ThrowIfNull(cardRenewalService);
+            ArgumentNullException.ThrowIfNull(dateTimeProvider);
+            ArgumentNullException.ThrowIfNull(polarisHelper);
+            ArgumentNullException.ThrowIfNull(segmentService);
+
+            _cardRenewalService = cardRenewalService;
+            _dateTimeProvider = dateTimeProvider;
+            _polarisHelper = polarisHelper;
+            _segmentService = segmentService;
+        }
+
+        public static string Name
+        { get { return "CardRenewal"; } }
+
+        [HttpGet]
+        [RestoreModelState]
+        public async Task<IActionResult> Index(string cardNumber)
+        {
+            if (TempData.ContainsKey(TempDataTimeout))
+            {
+                ModelState.AddModelError(nameof(IndexViewModel.Invalid),
+                    _localizer[i18n.Keys.Promenade.CardRenewalSessionTimeout]);
+                TempData.Remove(TempDataTimeout);
+            }
+
+            var viewModel = new IndexViewModel()
+            {
+                Barcode = cardNumber,
+                ForgotPasswordLink = await _siteSettingService
+                    .GetSettingStringAsync(Models.Keys.SiteSetting.Card.ForgotPasswordLink)
+            };
+
+            var cardRenewalSegmentId = await _siteSettingService
+                .GetSettingIntAsync(Models.Keys.SiteSetting.Card.CardRenewalSegment);
+            if (cardRenewalSegmentId > 0)
+            {
+                viewModel.SegmentText = await _segmentService
+                    .GetSegmentTextBySegmentIdAsync(cardRenewalSegmentId, false);
+            }
+
+            return View(viewModel);
+        }
+
+        [HttpPost]
+        [SaveModelState]
+        public async Task<IActionResult> Index(IndexViewModel viewModel)
+        {
+            ArgumentNullException.ThrowIfNull(viewModel);
+
+            if (ModelState.IsValid)
+            {
+                var barcode = viewModel.Barcode.Trim()
+                    .Replace(" ", "", StringComparison.OrdinalIgnoreCase);
+                var password = viewModel.Password.Trim();
+
+                var patronValidateResult = _polarisHelper.AuthenticatePatron(barcode, password);
+
+                if (patronValidateResult == null)
+                {
+                    _logger.LogInformation($"Invalid card number or password for Barcode '{barcode}'");
+                    ModelState.AddModelError(nameof(viewModel.Invalid),
+                        _localizer[i18n.Keys.Promenade.CardRenewalInvalidLogin]);
+                }
+                else
+                {
+                    var pendingRequest = await _cardRenewalService
+                        .GetPendingRequestAsync(patronValidateResult.PatronID);
+                    if (pendingRequest != null)
+                    {
+                        // TODO
+                        // Send to Pending page
+                    }
+
+                    var cutoffDays = await _siteSettingService
+                        .GetSettingIntAsync(Models.Keys.SiteSetting.Card.ExpirationCutoffDays);
+                    if (cutoffDays > -1)
+                    {
+                        var renewalAllowedDate = patronValidateResult
+                            .ExpirationDate.Value.AddDays(-cutoffDays).Date;
+                        if (renewalAllowedDate > _dateTimeProvider.Now.Date)
+                        {
+                            ModelState.AddModelError(nameof(viewModel.Invalid),
+                                _localizer[i18n.Keys.Promenade.CardRenewalInvalidCutoff,
+                                    cutoffDays,
+                                    renewalAllowedDate.ToShortDateString()]);
+                            return RedirectToAction(nameof(Index));
+                        }
+                    }
+
+                    // TODO
+                    // Check patron code for staff ids
+
+                    // TODO
+                    // Check patron code for non resident
+
+                    // TODO?
+                    // Check patron code for juvenile restricted
+
+                    var patronData = _polarisHelper.GetPatronData(barcode, password);
+
+                    IEnumerable<PatronAddress> addresses = patronData.PatronAddresses;
+
+                    var acceptedCounties = await _siteSettingService
+                        .GetSettingStringAsync(Models.Keys.SiteSetting.Card.AcceptedCounties);
+                    if (!string.IsNullOrWhiteSpace(acceptedCounties))
+                    {
+                        var counties = acceptedCounties.Split(",",
+                            StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);
+                        addresses = addresses.Where(_ => counties.Contains(_.County,
+                            StringComparer.OrdinalIgnoreCase));
+                    }
+                    addresses = addresses
+                        .DistinctBy(_ => new { _.StreetOne, _.StreetTwo, _.City, _.PostalCode });
+
+                    var request = new CardRenewalRequest
+                    {
+                        Barcode = barcode,
+                        PatronId = patronData.PatronID
+                    };
+
+                    TempData[TempDataAddresses] = JsonSerializer.Serialize(addresses);
+                    TempData[TempDataEmail] = patronData.EmailAddress;
+                    TempData[TempDataRequest] = JsonSerializer.Serialize(request);
+
+                    var juvenilePatronCodes = await _siteSettingService
+                        .GetSettingStringAsync(Models.Keys.SiteSetting.Card.JuvenilePatronCodes,true);
+                    if (!string.IsNullOrWhiteSpace(juvenilePatronCodes))
+                    {
+                        var patronCodeList = juvenilePatronCodes
+                            .Split(",", StringSplitOptions.RemoveEmptyEntries
+                                | StringSplitOptions.TrimEntries)
+                            .ToList();
+
+                        foreach (var patronCode in patronCodeList)
+                        {
+                            int patronCodeId;
+
+                            if (int.TryParse(patronCode, out patronCodeId))
+                            {
+                                if (patronValidateResult.PatronCodeID == patronCodeId)
+                                {
+                                    TempData[TempDataJuvenile] = true;
+                                    return RedirectToAction(nameof(Juvenile));
+                                }
+                            }
+                            else
+                            {
+                                _logger.LogError($"Invalid juvenile patron code id '{patronCode}'");
+                            }
+                        }
+                    }
+
+                    // TODO
+                    // Check for unpaid fines
+
+                    // TODO
+                    // Check for juvenile turned adult
+
+                    // TODO?
+                    // Check for student turned adult
+
+
+
+                    return RedirectToAction(nameof(VerifyAddress));
+                }
+            }
+            return RedirectToAction(nameof(Index));
+        }
+
+        [HttpGet("[action]")]
+        [RestoreModelState]
+        public IActionResult Juvenile()
+        {
+            if (!TempData.ContainsKey(TempDataJuvenile))
+            {
+                return RedirectToAction(nameof(Index));
+            }
+
+            return View();
+        }
+
+        [HttpPost("[action]")]
+        [SaveModelState]
+        public IActionResult Juvenile(JuvenileViewModel viewModel)
+        {
+            ArgumentNullException.ThrowIfNull(viewModel);
+
+            if (!TempData.ContainsKey(TempDataJuvenile))
+            {
+                TempData[TempDataTimeout] = true;
+                return RedirectToAction(nameof(Index));
+            }
+
+            if (ModelState.IsValid)
+            {
+                var request = JsonSerializer
+                    .Deserialize<CardRenewalRequest>((string)TempData.Peek(TempDataRequest));
+
+                request.GuardianBarcode = viewModel.GuardianBarcode;
+                request.GuardianName = viewModel.GuardianName;
+
+                TempData[TempDataRequest] = JsonSerializer.Serialize(request);
+
+                return RedirectToAction(nameof(VerifyAddress));
+            }
+
+            return RedirectToAction(nameof(Juvenile));
+        }
+
+        [HttpGet("[action]")]
+        public async Task<IActionResult> Submitted()
+        {
+            if (!TempData.ContainsKey(TempDataRequest))
+            {
+                return RedirectToAction(nameof(Index));
+            }
+
+            var viewModel = new SubmittedViewModel()
+            {
+                Request = JsonSerializer
+                    .Deserialize<CardRenewalRequest>((string)TempData.Peek(TempDataRequest))
+            };
+
+            var submittedSegmentId = await _siteSettingService
+                .GetSettingIntAsync(Models.Keys.SiteSetting.Card.SubmittedSegment);
+            if (submittedSegmentId > 0)
+            {
+                viewModel.SegmentText = await _segmentService
+                    .GetSegmentTextBySegmentIdAsync(submittedSegmentId, false);
+            }
+
+            TempData.Remove(TempDataRequest);
+
+            return View(viewModel);
+        }
+
+        [HttpGet("[action]")]
+        [RestoreModelState]
+        public async Task<IActionResult> VerifyAddress()
+        {
+            if (!TempData.ContainsKey(TempDataRequest))
+            {
+                return RedirectToAction(nameof(Index));
+            }
+
+            var viewModel = new VerifyAddressViewModel()
+            {
+                Addresses = JsonSerializer
+                    .Deserialize<List<PatronAddress>>((string)TempData.Peek(TempDataAddresses)),
+                Email = (string)TempData.Peek(TempDataEmail)
+            };
+
+            var verifyAddressSegmentId = await _siteSettingService
+                .GetSettingIntAsync(Models.Keys.SiteSetting.Card.VerifyAddressSegment);
+            if (verifyAddressSegmentId > 0)
+            {
+                viewModel.HeaderSegmentText = await _segmentService
+                    .GetSegmentTextBySegmentIdAsync(verifyAddressSegmentId, false);
+            }
+
+            if (viewModel.Addresses.Count == 0)
+            {
+                var noAddressSegmentId = await _siteSettingService
+                .GetSettingIntAsync(Models.Keys.SiteSetting.Card.NoAddressSegment);
+                if (noAddressSegmentId > 0)
+                {
+                    viewModel.NoAddressSegmentText = await _segmentService
+                        .GetSegmentTextBySegmentIdAsync(noAddressSegmentId, false);
+                }
+            }
+
+            return View(viewModel);
+        }
+
+        [HttpPost("[action]")]
+        [SaveModelState]
+        public async Task<IActionResult> VerifyAddress(VerifyAddressViewModel viewModel)
+        {
+            ArgumentNullException.ThrowIfNull(viewModel);
+
+            if (!TempData.ContainsKey(TempDataRequest))
+            {
+                TempData[TempDataTimeout] = true;
+                return RedirectToAction(nameof(Index));
+            }
+
+            if (ModelState.IsValid)
+            {
+                var request = JsonSerializer
+                    .Deserialize<CardRenewalRequest>((string)TempData.Peek(TempDataRequest));
+
+                request.Email = viewModel.Email.Trim();
+
+                if (viewModel.SameAddress)
+                {
+                    var addresses = JsonSerializer
+                        .Deserialize<List<PatronAddress>>((string)TempData.Peek(TempDataAddresses));
+                    if (addresses.Count > 0)
+                    {
+                        request.SameAddress = true;
+                    }
+                }
+                await _cardRenewalService.CreateRequestAsync(request);
+
+                TempData.Remove(TempDataAddresses);
+                TempData.Remove(TempDataEmail);
+
+                return RedirectToAction(nameof(Submitted));
+            }
+
+            return RedirectToAction(nameof(VerifyAddress));
+        }
+    }
+}
diff --git a/src/Promenade.Controllers/Promenade.Controllers.csproj b/src/Promenade.Controllers/Promenade.Controllers.csproj
index f883e7a9d..a76926e79 100644
--- a/src/Promenade.Controllers/Promenade.Controllers.csproj
+++ b/src/Promenade.Controllers/Promenade.Controllers.csproj
@@ -21,6 +21,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\i18n\i18n.csproj" />
+    <ProjectReference Include="..\PolarisHelper\PolarisHelper.csproj" />
     <ProjectReference Include="..\Promenade.Data\Promenade.Data.csproj" />
     <ProjectReference Include="..\Promenade.Service\Promenade.Service.csproj" />
   </ItemGroup>
diff --git a/src/Promenade.Controllers/ViewModels/CardRenewal/IndexViewModel.cs b/src/Promenade.Controllers/ViewModels/CardRenewal/IndexViewModel.cs
new file mode 100644
index 000000000..22cbfabb0
--- /dev/null
+++ b/src/Promenade.Controllers/ViewModels/CardRenewal/IndexViewModel.cs
@@ -0,0 +1,24 @@
+using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
+using Ocuda.Promenade.Models.Entities;
+using Ocuda.Utility;
+
+namespace Ocuda.Promenade.Controllers.ViewModels.CardRenewal
+{
+    public class IndexViewModel
+    {
+        [Required(ErrorMessage = ErrorMessage.FieldRequired)]
+        [DisplayName(i18n.Keys.Promenade.PromptLibraryCardNumber)]
+        public string Barcode { get; set; }
+
+        public bool Invalid { get; set; }
+
+        public string ForgotPasswordLink { get; set; }
+
+        [Required(ErrorMessage = ErrorMessage.FieldRequired)]
+        [DisplayName(i18n.Keys.Promenade.PromptPassword)]
+        public string Password { get; set; }
+
+        public SegmentText SegmentText { get; set; }
+    }
+}
diff --git a/src/Promenade.Controllers/ViewModels/CardRenewal/JuvenileViewModel.cs b/src/Promenade.Controllers/ViewModels/CardRenewal/JuvenileViewModel.cs
new file mode 100644
index 000000000..bcda0c03e
--- /dev/null
+++ b/src/Promenade.Controllers/ViewModels/CardRenewal/JuvenileViewModel.cs
@@ -0,0 +1,18 @@
+using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
+using Ocuda.Promenade.Models.Entities;
+using Ocuda.Utility;
+
+namespace Ocuda.Promenade.Controllers.ViewModels.CardRenewal
+{
+    public class JuvenileViewModel
+    {
+        [Required(ErrorMessage = ErrorMessage.FieldRequired)]
+        [DisplayName(i18n.Keys.Promenade.PromptGuardianBarcode)]
+        public string GuardianBarcode { get; set; }
+
+        [Required(ErrorMessage = ErrorMessage.FieldRequired)]
+        [DisplayName(i18n.Keys.Promenade.PromptGuardianName)]
+        public string GuardianName { get; set; }
+    }
+}
diff --git a/src/Promenade.Controllers/ViewModels/CardRenewal/SubmittedViewModel.cs b/src/Promenade.Controllers/ViewModels/CardRenewal/SubmittedViewModel.cs
new file mode 100644
index 000000000..306fad662
--- /dev/null
+++ b/src/Promenade.Controllers/ViewModels/CardRenewal/SubmittedViewModel.cs
@@ -0,0 +1,10 @@
+using Ocuda.Promenade.Models.Entities;
+
+namespace Ocuda.Promenade.Controllers.ViewModels.CardRenewal
+{
+    public class SubmittedViewModel
+    {
+        public CardRenewalRequest Request { get; set; }
+        public SegmentText SegmentText { get; set; }
+    }
+}
diff --git a/src/Promenade.Controllers/ViewModels/CardRenewal/VerifyAddressViewModel.cs b/src/Promenade.Controllers/ViewModels/CardRenewal/VerifyAddressViewModel.cs
new file mode 100644
index 000000000..97c49d3c8
--- /dev/null
+++ b/src/Promenade.Controllers/ViewModels/CardRenewal/VerifyAddressViewModel.cs
@@ -0,0 +1,22 @@
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
+using Clc.Polaris.Api.Models;
+using Ocuda.Promenade.Models.Entities;
+using Ocuda.Utility;
+
+namespace Ocuda.Promenade.Controllers.ViewModels.CardRenewal
+{
+    public class VerifyAddressViewModel
+    {
+        public List<PatronAddress> Addresses { get; set; }
+
+        [Required(ErrorMessage = ErrorMessage.FieldRequired)]
+        [DisplayName(i18n.Keys.Promenade.PromptEmail)]
+        public string Email { get; set; }
+
+        public SegmentText HeaderSegmentText { get; set; }
+        public SegmentText NoAddressSegmentText {get; set; }
+        public bool SameAddress { get; set; }
+    }
+}
diff --git a/src/Promenade.Data/Promenade/CardRenewalRequestRepository.cs b/src/Promenade.Data/Promenade/CardRenewalRequestRepository.cs
new file mode 100644
index 000000000..23b4b569d
--- /dev/null
+++ b/src/Promenade.Data/Promenade/CardRenewalRequestRepository.cs
@@ -0,0 +1,34 @@
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+using Ocuda.Promenade.Data.ServiceFacade;
+using Ocuda.Promenade.Models.Entities;
+using Ocuda.Promenade.Service.Interfaces.Repositories;
+
+namespace Ocuda.Promenade.Data.Promenade
+{
+    public class CardRenewalRequestRepository
+        : GenericRepository<PromenadeContext, CardRenewalRequest>, ICardRenewalRequestRepository
+    {
+        public CardRenewalRequestRepository(Repository<PromenadeContext> repositoryFacade,
+            ILogger<CardRenewalRequest> logger) : base(repositoryFacade, logger)
+        {
+        }
+
+        public async Task AddSaveAsync(CardRenewalRequest request)
+        {
+            await DbSet.AddAsync(request);
+            await _context.SaveChangesAsync();
+        }
+
+        public async Task<CardRenewalRequest> GetPendingRequestAsync(int patronId)
+        {
+            return await DbSet
+                .AsNoTracking()
+                .Where(_ => _.PatronId == patronId && !_.IsDiscarded && !_.ProcessedAt.HasValue)
+                .OrderByDescending(_ => _.SubmittedAt)
+                .FirstOrDefaultAsync();
+        }
+    }
+}
diff --git a/src/Promenade.Data/PromenadeContext.cs b/src/Promenade.Data/PromenadeContext.cs
index 20c6b10f7..7298eff8d 100644
--- a/src/Promenade.Data/PromenadeContext.cs
+++ b/src/Promenade.Data/PromenadeContext.cs
@@ -11,6 +11,7 @@ protected PromenadeContext(DbContextOptions options) : base(options)
         }
 
         public DbSet<CardDetail> CardDetails { get; }
+        public DbSet<CardRenewalRequest> CardRenewalRequests { get; set; }
         public DbSet<Card> Cards { get; }
         public DbSet<CarouselButtonLabel> CarouselButtonLabels { get; }
         public DbSet<CarouselButtonLabelText> CarouselButtonLabelTexts { get; }
diff --git a/src/Promenade.Models/Defaults/SiteSetting.cs b/src/Promenade.Models/Defaults/SiteSetting.cs
index 97bb50002..8ad080f57 100644
--- a/src/Promenade.Models/Defaults/SiteSetting.cs
+++ b/src/Promenade.Models/Defaults/SiteSetting.cs
@@ -9,6 +9,23 @@ public static class SiteSettings
         public static IEnumerable<SiteSetting> Get { get; } = new[]
         {
             #region Card
+            new SiteSetting
+            {
+                Category = nameof(Keys.SiteSetting.Card),
+                Description = "Accepted counties for card renewal addresses, comma delimited",
+                Id = Keys.SiteSetting.Card.AcceptedCounties,
+                Name = "Accepted counties",
+                Type = SiteSettingType.StringNullable
+            },
+            new SiteSetting 
+            {
+                Category = nameof(Keys.SiteSetting.Card),
+                Description = "Segment to show on the card renewal page",
+                Id = Keys.SiteSetting.Card.CardRenewalSegment,
+                Name = "Card renewal segment",
+                Type = SiteSettingType.Int,
+                Value = "-1"
+            },
             new SiteSetting 
             {
                 Category = nameof(Keys.SiteSetting.Card),
@@ -27,6 +44,58 @@ public static class SiteSettings
                 Type = SiteSettingType.Int,
                 Value = "-1"
             },
+            new SiteSetting
+            {
+                Category = nameof(Keys.SiteSetting.Card),
+                Description = "Number of days before a cards expiration that it's eligible for online renewal",
+                Id = Keys.SiteSetting.Card.ExpirationCutoffDays,
+                Name = "Card renewal expiration cutoff days",
+                Type= SiteSettingType.Int,
+                Value = "-1"
+            },
+            new SiteSetting
+            {
+                Category = nameof(Keys.SiteSetting.Card),
+                Description = "Link for 'Forgot Password' on card renewal page",
+                Id = Keys.SiteSetting.Card.ForgotPasswordLink,
+                Name = "Forgot Password link",
+                Type = SiteSettingType.StringNullable
+            },
+            new SiteSetting
+            {
+                Category = nameof(Keys.SiteSetting.Card),
+                Description = "Juvenile patron code ids, comma delimited",
+                Id = Keys.SiteSetting.Card.JuvenilePatronCodes,
+                Name = "Juvenile patron codes",
+                Type = SiteSettingType.StringNullable
+            },
+            new SiteSetting
+            {
+                Category = nameof(Keys.SiteSetting.Card),
+                Description = "Segment to show on the verify address page when there's no valid addresses",
+                Id = Keys.SiteSetting.Card.NoAddressSegment,
+                Name = "No address segment",
+                Type = SiteSettingType.Int,
+                Value = "-1"
+            },
+            new SiteSetting
+            {
+                Category = nameof(Keys.SiteSetting.Card),
+                Description = "Segment to show on the verify address page header",
+                Id = Keys.SiteSetting.Card.SubmittedSegment,
+                Name = "Submitted segment",
+                Type = SiteSettingType.Int,
+                Value = "-1"
+            },
+            new SiteSetting 
+            {
+                Category = nameof(Keys.SiteSetting.Card),
+                Description = "Segment to show on the submitted page",
+                Id = Keys.SiteSetting.Card.VerifyAddressSegment,
+                Name = "Verify address segment",
+                Type = SiteSettingType.Int,
+                Value = "-1"
+            },
             #endregion
 
             #region Contact
diff --git a/src/Promenade.Models/Entities/CardRenewalRequest.cs b/src/Promenade.Models/Entities/CardRenewalRequest.cs
new file mode 100644
index 000000000..cc755dcd9
--- /dev/null
+++ b/src/Promenade.Models/Entities/CardRenewalRequest.cs
@@ -0,0 +1,31 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+
+namespace Ocuda.Promenade.Models.Entities
+{
+    public class CardRenewalRequest
+    {
+        [Required]
+        public string Barcode { get; set; }
+
+        [Required]
+        public string Email { get; set; }
+
+        public string GuardianBarcode { get; set; }
+        public string GuardianName { get; set; }
+
+        [Key]
+        [Required]
+        public int Id { get; set; }
+
+        public bool IsDiscarded { get; set; }
+
+        public int LanguageId { get; set; }
+        public Language Language { get; set; }
+
+        public int PatronId { get; set; }
+        public DateTime? ProcessedAt {get;set;}
+        public bool SameAddress { get; set; }
+        public DateTime SubmittedAt { get; set; }
+    }
+}
diff --git a/src/Promenade.Models/Keys/SiteSetting.cs b/src/Promenade.Models/Keys/SiteSetting.cs
index 5fad53415..ca7beb6b2 100644
--- a/src/Promenade.Models/Keys/SiteSetting.cs
+++ b/src/Promenade.Models/Keys/SiteSetting.cs
@@ -7,9 +7,17 @@ namespace SiteSetting
             Justification = "No reason to compare these site setting keys")]
         public struct Card
         {
+            public const string AcceptedCounties = "Card.AcceptedCounties";
+            public const string CardRenewalSegment = "Card.CardRenewalSegment";
             public const string EmployeeCardSegment = "Card.EmployeeCardSegment";
             public const string EmployeeCardThanksPage 
                 = "Card.EmployeeCardThanksPage";
+            public const string ExpirationCutoffDays = "Card.ExpirationCutoffDays";
+            public const string ForgotPasswordLink = "Card.ForgotPasswordLink";
+            public const string JuvenilePatronCodes = "Card.JuvenilePatronCodes";
+            public const string NoAddressSegment = "Card.NoAddressSegment";
+            public const string SubmittedSegment = "Card.SubmittedSegment";
+            public const string VerifyAddressSegment = "Card.VerifyAddressSegment";
         }
 
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Performance",
diff --git a/src/Promenade.Service/CardRenewalService.cs b/src/Promenade.Service/CardRenewalService.cs
new file mode 100644
index 000000000..4eedb6a6c
--- /dev/null
+++ b/src/Promenade.Service/CardRenewalService.cs
@@ -0,0 +1,38 @@
+using System;
+using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
+using Ocuda.Promenade.Models.Entities;
+using Ocuda.Promenade.Service.Abstract;
+using Ocuda.Promenade.Service.Interfaces.Repositories;
+using Ocuda.Utility.Abstract;
+
+namespace Ocuda.Promenade.Service
+{
+    public class CardRenewalService : BaseService<CardRenewalService>
+    {
+        private ICardRenewalRequestRepository _cardRenewalRequestRepository;
+
+        public CardRenewalService(ILogger<CardRenewalService> logger,
+            IDateTimeProvider dateTimeProvider,
+            ICardRenewalRequestRepository cardRenewalRequestRepository)
+            : base(logger, dateTimeProvider)
+        {
+            ArgumentNullException.ThrowIfNull(cardRenewalRequestRepository);
+
+            _cardRenewalRequestRepository = cardRenewalRequestRepository;
+        }
+
+        public async Task CreateRequestAsync(CardRenewalRequest request)
+        {
+            ArgumentNullException.ThrowIfNull(request);
+
+            request.SubmittedAt = _dateTimeProvider.Now;
+            await _cardRenewalRequestRepository.AddSaveAsync(request);
+        }
+
+        public async Task<CardRenewalRequest> GetPendingRequestAsync(int patronId)
+        {
+            return await _cardRenewalRequestRepository.GetPendingRequestAsync(patronId);
+        }
+    }
+}
diff --git a/src/Promenade.Service/Interfaces/Repositories/ICardRenewalRequestRepository.cs b/src/Promenade.Service/Interfaces/Repositories/ICardRenewalRequestRepository.cs
new file mode 100644
index 000000000..bba1b865e
--- /dev/null
+++ b/src/Promenade.Service/Interfaces/Repositories/ICardRenewalRequestRepository.cs
@@ -0,0 +1,11 @@
+using System.Threading.Tasks;
+using Ocuda.Promenade.Models.Entities;
+
+namespace Ocuda.Promenade.Service.Interfaces.Repositories
+{
+    public interface ICardRenewalRequestRepository : IGenericRepository<CardRenewalRequest>
+    {
+        Task AddSaveAsync(CardRenewalRequest request);
+        Task<CardRenewalRequest> GetPendingRequestAsync(int patronId);
+    }
+}
diff --git a/src/Promenade.Web/Startup.cs b/src/Promenade.Web/Startup.cs
index d38364f19..1b5faf740 100644
--- a/src/Promenade.Web/Startup.cs
+++ b/src/Promenade.Web/Startup.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Linq;
+using Clc.Polaris.Api.Configuration;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.DataProtection;
 using Microsoft.AspNetCore.Hosting;
@@ -20,6 +21,7 @@
 using Microsoft.Net.Http.Headers;
 using Ocuda.i18n;
 using Ocuda.i18n.RouteConstraint;
+using Ocuda.PolarisHelper;
 using Ocuda.Promenade.Controllers;
 using Ocuda.Promenade.Data;
 using Ocuda.Promenade.Service;
@@ -373,6 +375,8 @@ string cacheDiscriminator
                 _.LowercaseUrls = true;
             });
 
+            services.Configure<PapiSettings>(_config.GetSection(PapiSettings.SECTION_NAME));
+
             // service facades
             services.AddScoped(typeof(Controllers.ServiceFacades.Controller<>));
             services.AddScoped(typeof(Controllers.ServiceFacades.PageController));
@@ -382,6 +386,7 @@ string cacheDiscriminator
             services.AddScoped<IDateTimeProvider, CurrentDateTimeProvider>();
             services.AddScoped<Utility.Services.Interfaces.IOcudaCache,
                 Utility.Services.OcudaCache>();
+            services.AddScoped<IPolarisHelper, PolarisHelper.PolarisHelper>();
 
             services.AddHttpClient<IGoogleClient, GoogleClient>();
 
@@ -392,6 +397,8 @@ string cacheDiscriminator
             // repositories
             services.AddScoped<Service.Interfaces.Repositories.ICardDetailRepository,
                 Data.Promenade.CardDetailRepository>();
+            services.AddScoped<Service.Interfaces.Repositories.ICardRenewalRequestRepository,
+                Data.Promenade.CardRenewalRequestRepository>();
             services.AddScoped<Service.Interfaces.Repositories.ICardRepository,
                 Data.Promenade.CardRepository>();
             services.AddScoped<Service.Interfaces.Repositories.ICarouselButtonLabelTextRepository,
@@ -526,6 +533,7 @@ string cacheDiscriminator
                 Utility.Services.PathResolverService>();
 
             // promenade services
+            services.AddScoped<CardRenewalService>();
             services.AddScoped<CarouselService>();
             services.AddScoped<CategoryService>();
             services.AddScoped<DeckService>();
diff --git a/src/Promenade.Web/Views/CardRenewal/Index.cshtml b/src/Promenade.Web/Views/CardRenewal/Index.cshtml
new file mode 100644
index 000000000..fea16e84a
--- /dev/null
+++ b/src/Promenade.Web/Views/CardRenewal/Index.cshtml
@@ -0,0 +1,65 @@
+@model Ocuda.Promenade.Controllers.ViewModels.CardRenewal.IndexViewModel
+
+@if (Model?.SegmentText != null)
+{
+	if (!string.IsNullOrEmpty(Model.SegmentText.Header))
+	{
+		<h1 class="prom-title">@Model.SegmentText.Header</h1>
+	}
+	if (!string.IsNullOrEmpty(Model.SegmentText.Text))
+	{
+		<div class="mb-3">@Html.Raw(Model.SegmentText.Text)</div>
+	}
+}
+else
+{
+	<h1 class="prom-title">@Localizer[Promenade.RenewYourCard]</h1>
+}
+
+@if (ViewData.ModelState[nameof(Model.Invalid)]?.ValidationState
+	== Microsoft.AspNetCore.Mvc.ModelBinding.ModelValidationState.Invalid)
+{
+	<div class="row">
+		<div class="col-12 col-md-6 offset-md-3">
+			<div class="alert alert-danger d-flex">
+				<span class="fa fa-2x fa-exclamation-triangle me-2" aria-hidden="true"></span>
+				<span asp-validation-for="Invalid" class="text-danger fw-bold fs-6"> </span>
+			</div>
+		</div>
+	</div>
+}
+
+<div class="row">
+	<div class="col-12">
+		<form method="post"
+			  role="form"
+			  asp-controller="@CardRenewalController.Name"
+			  asp-action="@nameof(CardRenewalController.Index)"
+			  asp-route-culture="">
+			<input asp-for="Barcode" type="text" formgroup />
+			<div class="row mb-3">
+				<label asp-for="Password" class="col-form-label text-md-end col-md-3">
+					@Localizer[Promenade.PromptPassword]
+					<span class="fa-solid fa-asterisk fa-xs d-inline-block ms-2 text-danger oc-required-field-marker"></span>
+				</label>
+				<div class="col-md-9">
+					<input asp-for="Password" type="password" class="form-control" />
+					<span asp-validation-for="Password" class="validation-message text-danger"></span>
+					@if (!string.IsNullOrWhiteSpace(Model.ForgotPasswordLink))
+					{
+						<div>
+							<a href="@Model.ForgotPasswordLink" target="_blank">@Localizer[Promenade.RenewCardForgotPassword]</a>
+						</div>
+					}
+				</div>
+			</div>
+			<div>
+				<button type="submit"
+						class="btn btn-outline-dark m-2 btn-lg float-end">
+					@Localizer[Promenade.ButtonNext]
+					<span class="fa-solid fa-chevron-right"></span>
+				</button>
+			</div>
+		</form>
+	</div>
+</div>
diff --git a/src/Promenade.Web/Views/CardRenewal/Juvenile.cshtml b/src/Promenade.Web/Views/CardRenewal/Juvenile.cshtml
new file mode 100644
index 000000000..810a1f08a
--- /dev/null
+++ b/src/Promenade.Web/Views/CardRenewal/Juvenile.cshtml
@@ -0,0 +1,21 @@
+@model Ocuda.Promenade.Controllers.ViewModels.CardRenewal.JuvenileViewModel
+
+<div class="row">
+	<div class="col-12">
+		<form method="post"
+			  role="form"
+			  asp-controller="@CardRenewalController.Name"
+			  asp-action="@nameof(CardRenewalController.Juvenile)"
+			  asp-route-culture="">
+			<input asp-for="GuardianName" type="text" formgroup />
+			<input asp-for="GuardianBarcode" type="text" formgroup />
+			<div>
+				<button type="submit"
+						class="btn btn-outline-dark m-2 btn-lg float-end">
+					@Localizer[Promenade.ButtonNext]
+					<span class="fa-solid fa-chevron-right"></span>
+				</button>
+			</div>
+		</form>
+	</div>
+</div>
diff --git a/src/Promenade.Web/Views/CardRenewal/Submitted.cshtml b/src/Promenade.Web/Views/CardRenewal/Submitted.cshtml
new file mode 100644
index 000000000..475deba36
--- /dev/null
+++ b/src/Promenade.Web/Views/CardRenewal/Submitted.cshtml
@@ -0,0 +1,14 @@
+@model Ocuda.Promenade.Controllers.ViewModels.CardRenewal.SubmittedViewModel
+
+@if (Model?.SegmentText != null)
+{
+	if (!string.IsNullOrEmpty(Model.SegmentText.Header))
+	{
+		<h1 class="prom-title">@Model.SegmentText.Header</h1>
+	}
+	@Html.Raw(Model.SegmentText.Text)
+}
+else
+{
+	<h1 class="prom-title">@Localizer[Promenade.CardRenewalSubmitted]</h1>
+}
\ No newline at end of file
diff --git a/src/Promenade.Web/Views/CardRenewal/VerifyAddress.cshtml b/src/Promenade.Web/Views/CardRenewal/VerifyAddress.cshtml
new file mode 100644
index 000000000..0de65b4b4
--- /dev/null
+++ b/src/Promenade.Web/Views/CardRenewal/VerifyAddress.cshtml
@@ -0,0 +1,86 @@
+@model Ocuda.Promenade.Controllers.ViewModels.CardRenewal.VerifyAddressViewModel
+
+@if (Model?.HeaderSegmentText != null)
+{
+	if (!string.IsNullOrEmpty(Model.HeaderSegmentText.Header))
+	{
+		<h1 class="prom-title">@Model.HeaderSegmentText.Header</h1>
+	}
+	if (!string.IsNullOrEmpty(Model.HeaderSegmentText.Text))
+	{
+		<div class="mb-3">@Html.Raw(Model.HeaderSegmentText.Text)</div>
+	}
+}
+else
+{
+	<h1 class="prom-title">@Localizer[Promenade.VerifyYourAddress]</h1>
+}
+
+<div class="row">
+	<div class="col-12">
+		<form method="post"
+			  role="form"
+			  asp-controller="@CardRenewalController.Name"
+			  asp-action="@nameof(CardRenewalController.VerifyAddress)"
+			  asp-route-culture="">
+			<input asp-for="Email" formgroup />
+			<div class="row">
+				<div class="col-md-9 offset-md-3">
+					@if (Model.Addresses.Count > 0)
+					{
+						<div class="row fs-6">
+							<strong class="mb-2">@Localizer[Promenade.CardRenewalSameAddress]</strong>
+							@foreach (var address in Model.Addresses)
+							{
+								<div class="form-group mb-3">
+									<div>@address.StreetOne</div>
+									@if (!string.IsNullOrWhiteSpace(address.StreetTwo))
+									{
+										<div>@address.StreetTwo</div>
+									}
+									<span>@address.City</span>
+									<span>@address.PostalCode</span>
+									<div>County: @address.County</div>
+								</div>
+							}
+						</div>
+						<div>
+							<button type="submit"
+									name="@nameof(Model.SameAddress)"
+									value="true"
+									class="btn btn-outline-success btn-lg mb-3 d-block">
+								<span class="fa-regular fa-circle-check"></span>
+								@Localizer[Promenade.CardRenewalSameAddressYes]
+							</button>
+							<button type="submit"
+									name="@nameof(Model.SameAddress)"
+									value="false"
+									class="btn btn-outline-warning btn-lg d-block">
+								<span class="fa-regular fa-circle-xmark"></span>
+								@Localizer[Promenade.CardRenewalSameAddressNo]
+							</button>
+						</div>
+					}
+					else
+					{
+						@if (Model?.HeaderSegmentText != null)
+						{
+							<strong class="fs-6">@Html.Raw(Model.NoAddressSegmentText.Text)</strong>
+						}
+						else
+						{
+							<strong class="fs-6">@Localizer[Promenade.CardRenewalNoAddress]</strong>
+						}
+						<div>
+							<button type="submit"
+									class="btn btn-outline-success btn-lg mt-3">
+								<span class="fa-regular fa-circle-check"></span>
+								@Localizer[Promenade.ButtonSubmit]
+							</button>
+						</div>
+					}
+				</div>
+			</div>
+		</form>
+	</div>
+</div>
\ No newline at end of file
diff --git a/src/Utility/Keys/Cache.cs b/src/Utility/Keys/Cache.cs
index 28b2b3f24..11f1f3be5 100644
--- a/src/Utility/Keys/Cache.cs
+++ b/src/Utility/Keys/Cache.cs
@@ -2,6 +2,11 @@
 {
     public static class Cache
     {
+        /// <summary>
+        /// Cached Polaris patron codes
+        /// </summary>
+        public static readonly string PolarisPatronCodes = "patroncodes";
+
         /// <summary>
         /// Date and time of last expired slide purge
         /// </summary>
diff --git a/src/i18n/Keys/Promenade.cs b/src/i18n/Keys/Promenade.cs
index cddf5ba32..b38150cbd 100644
--- a/src/i18n/Keys/Promenade.cs
+++ b/src/i18n/Keys/Promenade.cs
@@ -13,6 +13,14 @@ public static class Promenade
         public const string ButtonSubmit = "Submit";
         public const string ButtonSubscribe = "Subscribe";
         public const string ButtonUseMyLocation = "Use my location";
+        public const string CardRenewalInvalidCutoff = "Thanks for your submission! Your card has more than {0} days until it expires, please come back to renew it any time after {1}";
+        public const string CardRenewalInvalidLogin = "You have entered an invalid card number or password";
+        public const string CardRenewalNoAddress = "With no valid address on file your renewal request may not be eligible for a full renewal.";
+        public const string CardRenewalSameAddress = "Do you still live at an address listed below?";
+        public const string CardRenewalSameAddressNo = "No, I have moved";
+        public const string CardRenewalSameAddressYes = "Yes, this is my address";
+        public const string CardRenewalSessionTimeout = "Unfortunately your session has timed out. Please resubmit your barcode and password.";
+        public const string CardRenewalSubmitted = "Renewal request submitted";
         public const string ConnectSocialMedia = "Connect with us on social media!";
         public const string ConnectSocialOn = "Connect with us on {0}";
         public const string ContactInformation = "Contact Information";
@@ -99,14 +107,17 @@ public static class Promenade
         public const string PromptEmployeeNumber = "Employee Number";
         public const string PromptExperience = "Why do you want to volunteer? Describe any previous volunteer experience.";
         public const string PromptFirstName = "First Name";
+        public const string PromptGuardianBarcode = "Parent/Guardian Barcode";
         public const string PromptGuardianEmail = "Parent/Guardian Email";
         public const string PromptGuardianName = "Parent/Guardian Name";
         public const string PromptGuardianPhone = "Parent/Guardian Phone";
         public const string PromptLanguage = "Language";
         public const string PromptLastName = "Last Name";
-        public const string PromptLibraryCardNumber = "Library Card#";
+        public const string PromptLibraryCardNumber = "Library Card Number";
+        public const string PromptLibraryCardPlease = "Please enter your library card number";
         public const string PromptName = "Name";
         public const string PromptNotes = "Notes";
+        public const string PromptPassword = "Password";
         public const string PromptPhone = "Phone";
         public const string PromptRequestedDate = "Requested date";
         public const string PromptRequestedDateAndTime = "Requested date and time";
@@ -116,6 +127,8 @@ public static class Promenade
         public const string PromptVolunteerRegularity = "Are you interested in regular volunteer work or certain number of hours?";
         public const string PromptWeeklyAvailability = "Weekly Availability";
         public const string PromptZipCode = "Zip Code";
+        public const string RenewCardForgotPassword = "Forgot your password?";
+        public const string RenewYourCard = "Renew your card";
         public const string RequiredField = "You must supply a value for: {0}";
         public const string RequiredFieldItem = "The {0} field is required.";
         public const string ScheduleAppointmentDetails = "Here are the details of your appointment:";
@@ -134,6 +147,7 @@ public static class Promenade
         public const string SignUpForEmailNewsletter = "Sign up for our email newsletter";
         public const string SpecialHours = "Special Hours";
         public const string TodaysHours = "Today's Hours: {0}";
+        public const string VerifyYourAddress = "Verify your address";
         public const string ViewShowNotes = "View show notes";
         public const string VisitHomePage = "Visit home page";
         public const string VolunteerPageTitle = "Volunteer";

From a0ba81cd4e06464b2bafbc7a8772806898a805bf Mon Sep 17 00:00:00 2001
From: Dan Wilcox <DanielWilcox@mcldaz.org>
Date: Thu, 15 Jan 2026 15:16:20 -0700
Subject: [PATCH 03/13] Add further card renewal code

---
 ocuda.sln                                     |   6 -
 src/Models/AddressLookupResult.cs             |  13 +
 src/Models/Customer.cs                        |   1 +
 src/Models/CustomerBlock.cs                   |   8 +
 src/Ops.Controllers/ApiController.cs          |  64 ++
 .../Areas/Services/CardRenewalController.cs   | 189 +++---
 .../CardRenewal/DetailsViewModel.cs           |  18 +-
 .../ViewModels/CardRenewal/IndexViewModel.cs  |   1 +
 src/Ops.Controllers/Ops.Controllers.csproj    |   2 +-
 .../Ops/CardRenewalResultRepository.cs        |   9 +
 src/Ops.Models/Defaults/SiteSettings.cs       |  22 +-
 .../Entities/CardRenewalResponse.cs           |   3 +-
 src/Ops.Models/Keys/SiteSetting.cs            |   3 +-
 src/Ops.Service/CardRenewalService.cs         |  84 +--
 .../ICardRenewalResultRepository.cs           |   1 +
 .../Ops/Services/ICardRenewalService.cs       |   3 +-
 .../Ops/Services/ISiteSettingService.cs       |   1 +
 src/Ops.Service/Keys/CardRenewal.cs           |   8 +-
 .../Models/CardRenewal/ProcessResult.cs       |   9 +-
 src/Ops.Service/SiteSettingService.cs         |  14 +
 .../Services/Views/CardRenewal/Details.cshtml | 366 +++++++-----
 .../Services/Views/CardRenewal/Index.cshtml   |  27 +-
 src/Ops.Web/Startup.cs                        |   8 +-
 src/PolarisHelper/IPolarisHelper.cs           |  17 +-
 src/PolarisHelper/PolarisContext.cs           |   9 +
 src/PolarisHelper/PolarisHelper.cs            | 175 +++++-
 src/PolarisHelper/PolarisHelper.csproj        |   2 +
 .../CardRenewalController.cs                  | 548 +++++++++++++-----
 .../CardRenewal/JuvenileViewModel.cs          |   2 +
 .../CardRenewal/SubmittedViewModel.cs         |  10 -
 .../CardRenewal/VerifyAddressViewModel.cs     |   4 +-
 .../Promenade/CardRenewalRequestRepository.cs |   4 +-
 src/Promenade.Models/Defaults/SiteSetting.cs  | 144 +++--
 .../Entities/CardRenewalRequest.cs            |  17 +-
 src/Promenade.Models/Keys/SiteSetting.cs      |  30 +-
 src/Promenade.Models/Promenade.Models.csproj  |   1 +
 src/Promenade.Service/CardRenewalService.cs   |  13 +-
 .../ICardRenewalRequestRepository.cs          |   2 +-
 src/Promenade.Web/Startup.cs                  |   3 -
 .../Views/CardRenewal/Index.cshtml            |   9 +-
 .../Views/CardRenewal/Juvenile.cshtml         |  14 +
 .../Views/CardRenewal/NotConfigured.cshtml    |  14 +
 .../Views/CardRenewal/Submitted.cshtml        |  13 +-
 .../Views/CardRenewal/UnableToRenew.cshtml    |  14 +
 .../Views/CardRenewal/VerifyAddress.cshtml    |  21 +-
 src/i18n/Keys/Promenade.cs                    |  12 +-
 46 files changed, 1396 insertions(+), 542 deletions(-)
 create mode 100644 src/Models/AddressLookupResult.cs
 create mode 100644 src/Models/CustomerBlock.cs
 create mode 100644 src/PolarisHelper/PolarisContext.cs
 delete mode 100644 src/Promenade.Controllers/ViewModels/CardRenewal/SubmittedViewModel.cs
 create mode 100644 src/Promenade.Web/Views/CardRenewal/NotConfigured.cshtml
 create mode 100644 src/Promenade.Web/Views/CardRenewal/UnableToRenew.cshtml

diff --git a/ocuda.sln b/ocuda.sln
index 072884408..983002e77 100644
--- a/ocuda.sln
+++ b/ocuda.sln
@@ -91,8 +91,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Models", "src\Models\Models
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PolarisHelper", "src\PolarisHelper\PolarisHelper.csproj", "{E11E3598-BE6D-C9D8-D480-4EE48E7F4120}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Clc.Polaris.Api", "..\polaris-api-csharp\src\polaris-api-csharp\Clc.Polaris.Api.csproj", "{85306281-EC61-C4E5-8FC4-3CF8E64C83D5}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -179,10 +177,6 @@ Global
 		{E11E3598-BE6D-C9D8-D480-4EE48E7F4120}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E11E3598-BE6D-C9D8-D480-4EE48E7F4120}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E11E3598-BE6D-C9D8-D480-4EE48E7F4120}.Release|Any CPU.Build.0 = Release|Any CPU
-		{85306281-EC61-C4E5-8FC4-3CF8E64C83D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{85306281-EC61-C4E5-8FC4-3CF8E64C83D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{85306281-EC61-C4E5-8FC4-3CF8E64C83D5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{85306281-EC61-C4E5-8FC4-3CF8E64C83D5}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/src/Models/AddressLookupResult.cs b/src/Models/AddressLookupResult.cs
new file mode 100644
index 000000000..f408da017
--- /dev/null
+++ b/src/Models/AddressLookupResult.cs
@@ -0,0 +1,13 @@
+using System.Collections.Generic;
+
+namespace Ocuda.Models
+{
+    public class AddressLookupResult
+    {
+        public string Error { get; set; }
+        public IEnumerable<string> Residents { get; set; }
+        public string PostalCode { get; set; }
+        public string StreetAddress1 { get; set; }
+        public bool Success { get; set; }
+    }
+}
diff --git a/src/Models/Customer.cs b/src/Models/Customer.cs
index aff02ee52..326d98f98 100644
--- a/src/Models/Customer.cs
+++ b/src/Models/Customer.cs
@@ -9,6 +9,7 @@ public class Customer
         public DateTime? AddressVerificationDate { get; set; }
         public DateTime? BirthDate { get; set; }
         public string BlockingNotes { get; set; }
+        public double ChargeBalance { get; set; }
         public int CustomerCodeId { get; set; }
         public string CustomerIdNumber { get; set; }
         public string EmailAddress { get; set; }
diff --git a/src/Models/CustomerBlock.cs b/src/Models/CustomerBlock.cs
new file mode 100644
index 000000000..ebd64a3f7
--- /dev/null
+++ b/src/Models/CustomerBlock.cs
@@ -0,0 +1,8 @@
+namespace Ocuda.Models
+{
+    public class CustomerBlock
+    {
+        public int? BlockId { get; set; }
+        public string Description { get; set; }
+    }
+}
diff --git a/src/Ops.Controllers/ApiController.cs b/src/Ops.Controllers/ApiController.cs
index 8ff0b41d5..f0558125e 100644
--- a/src/Ops.Controllers/ApiController.cs
+++ b/src/Ops.Controllers/ApiController.cs
@@ -1,8 +1,13 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
+using System.Net.Http;
+using System.Text.Json;
 using System.Threading.Tasks;
+using System.Web;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
+using Ocuda.Models;
 using Ocuda.Ops.Controllers.Areas.ContentManagement;
 using Ocuda.Ops.Models;
 using Ocuda.Ops.Models.Entities;
@@ -10,6 +15,7 @@
 using Ocuda.Ops.Service.Interfaces.Ops.Services;
 using Ocuda.Utility.Exceptions;
 using Ocuda.Utility.Keys;
+using Org.BouncyCastle.Utilities.Encoders;
 using Serilog.Context;
 
 namespace Ocuda.Ops.Controllers
@@ -20,36 +26,47 @@ public class ApiController : Controller
         private readonly IApiKeyService _apiKeyService;
         private readonly IAuthorizationService _authorizationService;
         private readonly IDigitalDisplayService _digitalDisplayService;
+        private readonly HttpClient _httpClient;
         private readonly ILdapService _ldapService;
         private readonly ILogger _logger;
         private readonly IPermissionGroupService _permissionGroupService;
+        private readonly ISiteSettingService _siteSettingService;
         private readonly IUserService _userService;
 
         public ApiController(IApiKeyService apiKeyService,
             IAuthorizationService authorizationService,
             IDigitalDisplayService digitalDisplayService,
+            HttpClient httpClient,
             ILdapService ldapService,
             ILogger<ApiController> logger,
             IPermissionGroupService permissionGroupService,
+            ISiteSettingService siteSettingService,
             IUserService userService)
         {
             ArgumentNullException.ThrowIfNull(apiKeyService);
             ArgumentNullException.ThrowIfNull(authorizationService);
             ArgumentNullException.ThrowIfNull(digitalDisplayService);
+            ArgumentNullException.ThrowIfNull(httpClient);
             ArgumentNullException.ThrowIfNull(ldapService);
             ArgumentNullException.ThrowIfNull(logger);
             ArgumentNullException.ThrowIfNull(permissionGroupService);
+            ArgumentNullException.ThrowIfNull(siteSettingService);
             ArgumentNullException.ThrowIfNull(userService);
 
             _apiKeyService = apiKeyService;
             _authorizationService = authorizationService;
             _digitalDisplayService = digitalDisplayService;
+            _httpClient = httpClient;
             _ldapService = ldapService;
             _logger = logger;
             _permissionGroupService = permissionGroupService;
+            _siteSettingService = siteSettingService;
             _userService = userService;
         }
 
+        public static string Name
+        { get { return "Api"; } }
+
         private static JsonResponse ErrorJobResult(string message)
         {
             return new JsonResponse
@@ -60,6 +77,53 @@ private static JsonResponse ErrorJobResult(string message)
             };
         }
 
+        public async Task<AddressLookupResult> AddressLookup(string address, string zip)
+        {
+            var addressLookupPath = await _siteSettingService.GetSettingStringAsync(Models
+                    .Keys
+                    .SiteSetting
+                    .CardRenewal
+                    .AddressLookupUrl);
+
+            var queryParams = new Dictionary<string, string>
+            {
+                { nameof(address), HttpUtility.UrlEncode(address) },
+                { nameof(zip), HttpUtility.UrlEncode(zip) }
+            };
+            var parameterString = string.Join('&', queryParams.Select(_ => $"{_.Key}={_.Value}"));
+
+            var queryUri = new UriBuilder(addressLookupPath) { Query = parameterString }.Uri;
+
+            using var response = await _httpClient.GetAsync(queryUri);
+
+            if (response.IsSuccessStatusCode)
+            {
+                using var responseStream = await response.Content.ReadAsStreamAsync();
+                
+                try
+                {
+                    return await JsonSerializer.DeserializeAsync<AddressLookupResult>(
+                        responseStream,
+                        new JsonSerializerOptions
+                        {
+                            PropertyNamingPolicy = JsonNamingPolicy.CamelCase
+                        });
+                }
+                catch (JsonException jex)
+                {
+                    _logger.LogError(jex, "Error decoding JSON: {ErrorMessage}", jex.Message);
+                }
+            }
+            else
+            {
+                _logger.LogError("Address lookup returned status code {StatusCode} for parameters {Parameters}",
+                    response.StatusCode,
+                    parameterString);
+            }
+
+            return null;
+        }
+
         #region Slide Upload
 
         [HttpPost("[action]")]
diff --git a/src/Ops.Controllers/Areas/Services/CardRenewalController.cs b/src/Ops.Controllers/Areas/Services/CardRenewalController.cs
index bf70502af..f41a3d1f4 100644
--- a/src/Ops.Controllers/Areas/Services/CardRenewalController.cs
+++ b/src/Ops.Controllers/Areas/Services/CardRenewalController.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
 using System.Text.Json;
@@ -12,6 +11,7 @@
 using Ocuda.Ops.Controllers.Areas.Services.ViewModels.CardRenewal;
 using Ocuda.Ops.Controllers.Filters;
 using Ocuda.Ops.Models;
+using Ocuda.Ops.Models.Entities;
 using Ocuda.Ops.Service.Filters;
 using Ocuda.Ops.Service.Interfaces.Ops.Services;
 using Ocuda.Ops.Service.Interfaces.Promenade.Services;
@@ -24,22 +24,28 @@ namespace Ocuda.Ops.Controllers.Areas.Services
     [Route("[area]/[controller]")]
     public class CardRenewalController : BaseController<CardRenewalController>
     {
+        private const string leapPatronRecordsPath = "/records";
+
         private readonly ICardRenewalRequestService _cardRenewalRequestService;
         private readonly ICardRenewalService _cardRenewalService;
+        private readonly ILanguageService _languageService;
         private readonly IPolarisHelper _polarisHelper;
 
         public CardRenewalController(ServiceFacades.Controller<CardRenewalController> context,
             ICardRenewalRequestService cardRenewalRequestService,
             ICardRenewalService cardRenewalService,
+            ILanguageService languageService,
             IPolarisHelper polarisHelper)
             : base(context)
         {
             ArgumentNullException.ThrowIfNull(cardRenewalRequestService);
             ArgumentNullException.ThrowIfNull(cardRenewalService);
+            ArgumentNullException.ThrowIfNull(languageService);
             ArgumentNullException.ThrowIfNull(polarisHelper);
 
             _cardRenewalRequestService = cardRenewalRequestService;
             _cardRenewalService = cardRenewalService;
+            _languageService = languageService;
             _polarisHelper = polarisHelper;
         }
 
@@ -50,6 +56,11 @@ public static string Name
         [RestoreModelState]
         public async Task<IActionResult> Details(int id)
         {
+            if (!_polarisHelper.IsConfigured)
+            {
+                return RedirectToAction(nameof(Index));
+            }
+
             var request = await _cardRenewalRequestService.GetRequestAsync(id);
 
             if (request == null)
@@ -57,27 +68,31 @@ public async Task<IActionResult> Details(int id)
                 return RedirectToAction(nameof(Index));
             }
 
-            var patronData = _polarisHelper.GetPatronDataOverride(request.Barcode);
+            request.Language = await _languageService.GetActiveByIdAsync(request.LanguageId);
+
+            var customer = _polarisHelper.GetCustomerDataOverride(request.Barcode);
 
             var viewModel = new DetailsViewModel
             {
-                AddressLookupPath = await _siteSettingService.GetSettingStringAsync(Models
-                    .Keys
-                    .SiteSetting
-                    .CardRenewal
-                    .AddressLookupUrl),
-                AssessorLookupPath = await _siteSettingService.GetSettingStringAsync(Models
+                AddressLookupUrlSet = !string.IsNullOrWhiteSpace(
+                    await _siteSettingService.GetSettingStringAsync(Models
+                        .Keys
+                        .SiteSetting
+                        .CardRenewal
+                        .AddressLookupUrl)),
+                AssessorLookupUrl = await _siteSettingService.GetSettingStringAsync(Models
                     .Keys
                     .SiteSetting
                     .CardRenewal
                     .AssessorLookupUrl),
-                PatronCode = await _polarisHelper.GetPatronCodeNameAsync(patronData.PatronCodeID),
-                PatronData = patronData,
-                PatronName = $"{patronData.NameFirst} {patronData.NameLast}",
+                Customer = customer,
+                CustomerCode = await _polarisHelper
+                    .GetCustomerCodeNameAsync(customer.CustomerCodeId),
+                CustomerName = $"{customer.NameFirst} {customer.NameLast}",
                 Request = request
             };
 
-            if (!viewModel.Request.ProcessedAt.HasValue)
+            if (!request.ProcessedAt.HasValue)
             {
                 var responses = await _cardRenewalService.GetAvailableResponsesAsync();
                 viewModel.ResponseList = responses.Select(_ => new SelectListItem
@@ -88,8 +103,40 @@ public async Task<IActionResult> Details(int id)
             }
             else
             {
-                viewModel.Result = await _cardRenewalService
-                    .GetResultForRequestAsync(request.Id);
+                var result = await _cardRenewalService.GetResultForRequestAsync(request.Id);
+                result.ResponseText = CommonMark.CommonMarkConverter.Convert(result.ResponseText);
+                viewModel.Result = result;
+            }
+
+            var blocks = await _polarisHelper.GetCustomerBlocksAsync(customer.Id);
+            if (blocks.Count > 0)
+            {
+                var ignoredBlocks = await _siteSettingService.GetSettingStringAsync(Models
+                   .Keys
+                   .SiteSetting
+                   .CardRenewal
+                   .IgnoredBlockIds);
+                if (!string.IsNullOrWhiteSpace(ignoredBlocks))
+                {
+                    var ignoredBlockIdList = ignoredBlocks
+                        .Split(',', StringSplitOptions.RemoveEmptyEntries
+                            | StringSplitOptions.TrimEntries)
+                        .ToList();
+
+                    foreach (var ignoredBlock in ignoredBlockIdList)
+                    {
+                        if (int.TryParse(ignoredBlock, out int ignoredBlockId))
+                        {
+                            blocks.RemoveAll(_ => _.BlockId == ignoredBlockId);
+                        }
+                        else
+                        {
+                            _logger.LogError($"Invalid ignored block id '{ignoredBlock}'");
+                        }
+                    }
+                }
+
+                viewModel.CustomerBlocks = blocks;
             }
 
             var acceptedCounty = await _siteSettingService.GetSettingStringAsync(Models
@@ -97,55 +144,34 @@ public async Task<IActionResult> Details(int id)
                 .SiteSetting
                 .CardRenewal
                 .AcceptedCounty);
-
             if (!string.IsNullOrWhiteSpace(acceptedCounty))
             {
                 viewModel.AcceptedCounty = acceptedCounty;
-                viewModel.InCounty = patronData.PatronAddresses.Any(_ =>
+                viewModel.InCounty = customer.Addresses.Any(_ =>
                     string.Equals(_.County, acceptedCounty, StringComparison.OrdinalIgnoreCase));
             }
 
-            var juvenilePatronCodes = await _siteSettingService.GetSettingStringAsync(Models
+            var chargeLimit = await _siteSettingService.GetSettingDoubleAsync(Models
                 .Keys
                 .SiteSetting
                 .CardRenewal
-                .JuvenilePatronCodes);
-
-            if (!string.IsNullOrWhiteSpace(juvenilePatronCodes))
+                .ChargesLimit);
+            if (chargeLimit >= 0 && customer.ChargeBalance >= chargeLimit)
             {
-                var patronCodeList = juvenilePatronCodes
-                            .Split(",", StringSplitOptions.RemoveEmptyEntries
-                                | StringSplitOptions.TrimEntries)
-                            .ToList();
 
-                foreach (var patronCode in patronCodeList)
-                {
-                    int patronCodeId;
+                viewModel.OverChargesLimit = true;
+            }
 
-                    if (int.TryParse(patronCode, out patronCodeId))
-                    {
-                        if (patronData.PatronCodeID == patronCodeId)
-                        {
-                            viewModel.IsJuvenile = true;
-
-                            if (patronData.BirthDate.HasValue
-                                && patronData.BirthDate.Value != DateTime.MinValue)
-                            {
-                                DateTime today = DateTime.Today;
-                                var age = today.Year - patronData.BirthDate.Value.Year;
-                                if (patronData.BirthDate.Value > today.AddYears(-age))
-                                {
-                                    age--;
-                                }
-                                viewModel.PatronAge = age;
-                            }
-                        }
-                    }
-                    else
-                    {
-                        _logger.LogError($"Invalid juvenile patron code id '{patronCode}'");
-                    }
+            if (!string.IsNullOrWhiteSpace(request.GuardianName) && customer.BirthDate.HasValue
+                && customer.BirthDate.Value != DateTime.MinValue)
+            {
+                DateTime today = DateTime.Today;
+                var age = today.Year - customer.BirthDate.Value.Year;
+                if (customer.BirthDate.Value > today.AddYears(-age))
+                {
+                    age--;
                 }
+                viewModel.CustomerAge = age;
             }
 
             var leapPatronUrl = await _siteSettingService.GetSettingStringAsync(Models
@@ -153,46 +179,63 @@ public async Task<IActionResult> Details(int id)
                 .SiteSetting
                 .CardRenewal
                 .LeapPatronUrl);
-
             if (!string.IsNullOrWhiteSpace(leapPatronUrl))
             {
-                viewModel.LeapPath = leapPatronUrl + request.PatronId;
+                viewModel.LeapPath = leapPatronUrl + request.CustomerId + leapPatronRecordsPath;
             }
 
             return View(viewModel);
         }
 
         [HttpPost("[action]/{id}")]
+        [SaveModelState]
         public async Task<IActionResult> Details(DetailsViewModel viewModel)
         {
             ArgumentNullException.ThrowIfNull(viewModel);
 
+            if (!_polarisHelper.IsConfigured)
+            {
+                return RedirectToAction(nameof(Index));
+            }
+
             if (ModelState.IsValid)
             {
                 try
                 {
-                    var request = await _cardRenewalRequestService
-                        .GetRequestAsync(viewModel.RequestId);
+                    var processResult = await _cardRenewalService.ProcessRequestAsync(
+                        viewModel.RequestId,
+                        viewModel.ResponseId.Value,
+                        viewModel.ResponseText,
+                        viewModel.CustomerName);
 
-                    if (request.ProcessedAt.HasValue) 
+                    if (!processResult.EmailSent)
                     {
-                        _logger.LogError($"Attempted to process request {request.Id} which has already been processed.");
+                        ShowAlertDanger($"There was an error sending the email for request {viewModel.RequestId}");
                     }
 
+                    if (processResult.Type == CardRenewalResponse.ResponseType.Accept)
+                    {
+                        ShowAlertSuccess($"Request {viewModel.RequestId} has been successfully processed and the record has been updated in Polaris!");
 
-                    var result = _polarisHelper.RenewPatronRegistration(
-                        request.Barcode,
-                        request.Email);
-
-                    await _cardRenewalService.ProcessRequestAsync(
-                        request.Id,
-                        viewModel.ResponseId.Value,
-                        viewModel.ResponseText,
-                        viewModel.PatronName);
+                        if (processResult.EmailNotUpdated)
+                        {
+                            ShowAlertWarning("Email was not able to be updated");
+                            return RedirectToAction(nameof(Details), new { viewModel.RequestId });
+                        }
+                    }
+                    else if (processResult.Type == CardRenewalResponse.ResponseType.Partial)
+                    {
+                        ShowAlertSuccess($"Request {viewModel.RequestId} has been successfully processed, be sure to update the record in Polaris!");
+                    }
+                    else
+                    {
+                        ShowAlertSuccess($"Request {viewModel.RequestId} has been successfully processed");
+                    }
+                    return RedirectToAction(nameof(Index));
                 }
                 catch (OcudaException ex)
                 {
-
+                    ShowAlertDanger($"Unable to process card renewal request: {ex.Message}");
                 }
             }
 
@@ -203,17 +246,17 @@ await _cardRenewalService.ProcessRequestAsync(
         }
 
         [HttpPost("[action]")]
-        public async Task<IActionResult> Discard(int id)
+        public async Task<IActionResult> Discard(int requestId)
         {
             try
             {
-                await _cardRenewalService.DiscardRequestAsync(id);
-                ShowAlertSuccess($"Request {id} has been discarded");
+                await _cardRenewalService.DiscardRequestAsync(requestId);
+                ShowAlertSuccess($"Request {requestId} has been discarded");
             }
             catch (OcudaException ex)
             {
                 ShowAlertDanger($"Unable to discard request: {ex.Message}");
-                return RedirectToAction(nameof(Details), new { id });
+                return RedirectToAction(nameof(Details), new { requestId });
             }
 
             return RedirectToAction(nameof(Index));
@@ -259,6 +302,7 @@ public async Task<IActionResult> Index(int? page, bool processed)
 
             var viewModel = new IndexViewModel
             {
+                APIConfigured = _polarisHelper.IsConfigured,
                 CardRequests = requests.Data,
                 CurrentPage = page.Value,
                 IsProcessed = processed,
@@ -270,6 +314,11 @@ public async Task<IActionResult> Index(int? page, bool processed)
             {
                 viewModel.PendingCount = await _cardRenewalRequestService.GetRequestCountAsync(false);
                 viewModel.ProcessedCount = viewModel.ItemCount;
+
+                foreach (var request in viewModel.CardRequests)
+                {
+                    request.Accepted = await _cardRenewalService.IsRequestAccepted(request.Id);
+                }
             }
             else
             {
diff --git a/src/Ops.Controllers/Areas/Services/ViewModels/CardRenewal/DetailsViewModel.cs b/src/Ops.Controllers/Areas/Services/ViewModels/CardRenewal/DetailsViewModel.cs
index 48b20d2f9..e5b359291 100644
--- a/src/Ops.Controllers/Areas/Services/ViewModels/CardRenewal/DetailsViewModel.cs
+++ b/src/Ops.Controllers/Areas/Services/ViewModels/CardRenewal/DetailsViewModel.cs
@@ -1,8 +1,8 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
-using Clc.Polaris.Api.Models;
 using Microsoft.AspNetCore.Mvc.Rendering;
+using Ocuda.Models;
 using Ocuda.Ops.Models.Entities;
 using Ocuda.Promenade.Models.Entities;
 
@@ -14,18 +14,18 @@ public class DetailsViewModel
 
         public CardRenewalRequest Request { get; set; }
         public CardRenewalResult Result { get; set; }
-        public PatronData PatronData { get; set; }
+        public List<CustomerBlock> CustomerBlocks { get; set; }
+        public Customer Customer { get; set; }
         public string AcceptedCounty { get; set; }
-        public string AddressLookupPath { get; set; }
-        public string AssessorLookupPath { get; set; }
+        public bool AddressLookupUrlSet { get; set; }
+        public string AssessorLookupUrl { get; set; }
+        public int? CustomerAge { get; set; }
+        public string CustomerCode { get; set; }
+        public string CustomerName { get; set; }
         public bool InCounty { get; set; }
-        public bool IsJuvenile { get; set; }
         public string LeapPath { get; set; }
-        public int? PatronAge { get; set; }
-        public string PatronCode { get; set; }
-        public string PatronName { get; set; }
+        public bool OverChargesLimit { get; set; }
         public IEnumerable<SelectListItem> ResponseList { get; set; }
-
         public int RequestId { get; set; }
 
         [DisplayName("Response")]
diff --git a/src/Ops.Controllers/Areas/Services/ViewModels/CardRenewal/IndexViewModel.cs b/src/Ops.Controllers/Areas/Services/ViewModels/CardRenewal/IndexViewModel.cs
index ca729bc0b..6f4e9cd4f 100644
--- a/src/Ops.Controllers/Areas/Services/ViewModels/CardRenewal/IndexViewModel.cs
+++ b/src/Ops.Controllers/Areas/Services/ViewModels/CardRenewal/IndexViewModel.cs
@@ -7,6 +7,7 @@ namespace Ocuda.Ops.Controllers.Areas.Services.ViewModels.CardRenewal
     public class IndexViewModel : PaginateModel
     {
         public ICollection<CardRenewalRequest> CardRequests { get; set; }
+        public bool APIConfigured { get; set; }
         public bool IsProcessed { get; set; }
         public int PendingCount { get; set; }
         public int ProcessedCount { get; set; }
diff --git a/src/Ops.Controllers/Ops.Controllers.csproj b/src/Ops.Controllers/Ops.Controllers.csproj
index 79ebc663a..3dc985c13 100644
--- a/src/Ops.Controllers/Ops.Controllers.csproj
+++ b/src/Ops.Controllers/Ops.Controllers.csproj
@@ -27,7 +27,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\PolarisHelper\PolarisHelper.csproj" />
+    <ProjectReference Include="..\Models\Models.csproj" />
     <ProjectReference Include="..\Ops.Service\Ops.Service.csproj" />
     <ProjectReference Include="..\PolarisHelper\PolarisHelper.csproj" />
     <ProjectReference Include="..\Utility\Utility.csproj" />
diff --git a/src/Ops.Data/Ops/CardRenewalResultRepository.cs b/src/Ops.Data/Ops/CardRenewalResultRepository.cs
index 581edc08b..c5d1e9cff 100644
--- a/src/Ops.Data/Ops/CardRenewalResultRepository.cs
+++ b/src/Ops.Data/Ops/CardRenewalResultRepository.cs
@@ -23,5 +23,14 @@ public async Task<CardRenewalResult> GetForRequestAsync(int requestId)
                 .Where(_ => _.CardRenewalRequestId == requestId)
                 .SingleOrDefaultAsync();
         }
+
+        public async Task<CardRenewalResponse.ResponseType> GetRequestResponseTypeAsync(
+            int requestId)
+        {
+            return await DbSet.AsNoTracking()
+                .Where(_ => _.CardRenewalRequestId == requestId)
+                .Select(_ => _.CardRenewalResponse.Type)
+                .SingleOrDefaultAsync();
+        }
     }
 }
diff --git a/src/Ops.Models/Defaults/SiteSettings.cs b/src/Ops.Models/Defaults/SiteSettings.cs
index cb333410a..6954fe4b0 100644
--- a/src/Ops.Models/Defaults/SiteSettings.cs
+++ b/src/Ops.Models/Defaults/SiteSettings.cs
@@ -39,9 +39,18 @@ public static class SiteSettings
             },
             new SiteSetting
             {
-                Id = Keys.SiteSetting.CardRenewal.JuvenilePatronCodes,
-                Name = "Juvenile patron codes",
-                Description = "Juvenile patron code ids, comma delimited",
+                Id = Keys.SiteSetting.CardRenewal.ChargesLimit,
+                Name = "Charges Limit",
+                Description = "Charges amount when a warning starts being shown",
+                Category = "CardRenewal",
+                Value = "-1",
+                Type = SiteSettingType.Double
+            },
+            new SiteSetting
+            {
+                Id = Keys.SiteSetting.CardRenewal.IgnoredBlockIds,
+                Name = "Ignored block ids",
+                Description = "Ids of blocks that won't be included, comma delimited",
                 Category = "CardRenewal",
                 Value = "",
                 Type = SiteSettingType.StringNullable
@@ -49,12 +58,13 @@ public static class SiteSettings
             new SiteSetting
             {
                 Id = Keys.SiteSetting.CardRenewal.LeapPatronUrl,
-                Name = "Leap patron record url",
-                Description = "Leap patron record url with scheme, host and path",
+                Name = "Leap patron records url",
+                Description = "Leap patron records url with scheme, host and path",
                 Category = "CardRenewal",
                 Value = "",
                 Type = SiteSettingType.StringNullable
             },
+            
 
             #endregion CardRenwal
 
@@ -229,7 +239,7 @@ public static class SiteSettings
                 Name = "Email template id",
                 Description = "Email template id to use when sending a notificaton about a new incident report, 0 is disabled",
                 Category = "Incident",
-                Value = "0",
+                Value = "-1",
                 Type = SiteSettingType.Int
             },
             new SiteSetting
diff --git a/src/Ops.Models/Entities/CardRenewalResponse.cs b/src/Ops.Models/Entities/CardRenewalResponse.cs
index a8842b14d..ccd08f720 100644
--- a/src/Ops.Models/Entities/CardRenewalResponse.cs
+++ b/src/Ops.Models/Entities/CardRenewalResponse.cs
@@ -25,7 +25,8 @@ public class CardRenewalResponse : Abstract.BaseEntity
         public enum ResponseType
         {
             Accept,
-            Deny
+            Deny,
+            Partial
         }
     }
 }
diff --git a/src/Ops.Models/Keys/SiteSetting.cs b/src/Ops.Models/Keys/SiteSetting.cs
index 7e7fcaf35..a6c5d7a8d 100644
--- a/src/Ops.Models/Keys/SiteSetting.cs
+++ b/src/Ops.Models/Keys/SiteSetting.cs
@@ -7,7 +7,8 @@ public static class CardRenewal
             public static readonly string AcceptedCounty = "CardRenewal.AcceptedCounty";
             public static readonly string AddressLookupUrl = "CardRenewal.AddressLookupUrl";
             public static readonly string AssessorLookupUrl = "CardRenewal.AssessorLookupUrl";
-            public static readonly string JuvenilePatronCodes = "CardRenewal.JuvenilePatronCodes";
+            public static readonly string ChargesLimit = "CardRenewal.ChargesLimit";
+            public static readonly string IgnoredBlockIds = "CardRenewal.IgnoredBlockIds";
             public static readonly string LeapPatronUrl = "CardRenewal.LeapPatronUrl";
         }
 
diff --git a/src/Ops.Service/CardRenewalService.cs b/src/Ops.Service/CardRenewalService.cs
index 40432a532..c049d5a10 100644
--- a/src/Ops.Service/CardRenewalService.cs
+++ b/src/Ops.Service/CardRenewalService.cs
@@ -100,8 +100,7 @@ public async Task DiscardRequestAsync(int id)
             {
                 throw new OcudaException("Request does not exist");
             }
-
-            if (request.ProcessedAt.HasValue)
+            else if (request.ProcessedAt.HasValue)
             {
                 throw new OcudaException("Request has already been processed");
             }
@@ -175,16 +174,26 @@ public async Task<IEnumerable<CardRenewalResponse>> GetResponsesAsync()
             return await _cardRenewalResponseRepository.GetAllAsync();
         }
 
-
         public async Task<CardRenewalResult> GetResultForRequestAsync(int requestId)
         {
             return await _cardRenewalResultRepository.GetForRequestAsync(requestId);
         }
 
+        public async Task<bool> IsRequestAccepted(int requestId)
+        {
+            var responseType = await _cardRenewalResultRepository
+                .GetRequestResponseTypeAsync(requestId);
+
+            return responseType == CardRenewalResponse.ResponseType.Accept;
+        }
+
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Design",
+            "CA1031:Do not catch general exception types",
+            Justification = "Show end user error message rather than exception")]
         public async Task<ProcessResult> ProcessRequestAsync(int requestId,
             int responseId,
             string responseText,
-            string patronName)
+            string customerName)
         {
             var request = await _cardRenewalRequestRepository
                 .GetByIdAsync(requestId);
@@ -193,13 +202,16 @@ public async Task<ProcessResult> ProcessRequestAsync(int requestId,
                 throw new OcudaException("Request has already been processed.");
             }
 
-            var processResult = new ProcessResult();
-
             var response = await _cardRenewalResponseRepository.FindAsync(responseId);
 
+            var processResult = new ProcessResult
+            {
+                Type = response.Type
+            };
+
             if (response.Type == CardRenewalResponse.ResponseType.Accept)
             {
-                var renewResult = _polarisHelper.RenewPatronRegistration(
+                var renewResult = _polarisHelper.RenewCustomerRegistration(
                         request.Barcode,
                         request.Email);
 
@@ -215,7 +227,7 @@ public async Task<ProcessResult> ProcessRequestAsync(int requestId,
             var tags = new Dictionary<string, string>
             {
                 { Keys.CardRenewal.CustomerBarcode, request.Barcode },
-                { Keys.CardRenewal.CustomerName, patronName }
+                { Keys.CardRenewal.CustomerName, customerName }
             };
 
             var emailDetails = await _emailService.GetDetailsAsync(response.EmailSetupId.Value,
@@ -223,14 +235,40 @@ public async Task<ProcessResult> ProcessRequestAsync(int requestId,
                 tags,
                 responseText);
 
-            emailDetails.ToEmailAddress = request.Email;
-            emailDetails.ToName = patronName;
+            var now = _dateTimeProvider.Now;
+
+            request.ProcessedAt = now;
+            _cardRenewalRequestRepository.Update(request);
+
+            var result = new CardRenewalResult
+            {
+                CardRenewalRequestId = request.Id,
+                CardRenewalResponseId = response.Id,
+                CreatedAt = now,
+                CreatedBy = GetCurrentUserId(),
+                ResponseText = emailDetails.BodyText
+            };
 
-            EmailRecord sentEmail = null;
+            await _cardRenewalResultRepository.AddAsync(result);
+            await _cardRenewalResultRepository.SaveAsync();
+            await _cardRenewalRequestRepository.SaveAsync();
+
+            emailDetails.ToEmailAddress = request.Email;
+            emailDetails.ToName = customerName;
 
             try
             {
-                sentEmail = await _emailService.SendAsync(emailDetails);
+                var sentEmail = await _emailService.SendAsync(emailDetails);
+                if (sentEmail != null)
+                {
+                    processResult.EmailSent = true;
+                }
+                else
+                {
+                    _logger.LogWarning("Card renewal email (setup {EmailSetupId}) failed sending to {EmailTo}",
+                        response.EmailSetupId.Value,
+                        request.Email);
+                }
             }
             catch (Exception ex)
             {
@@ -239,30 +277,8 @@ public async Task<ProcessResult> ProcessRequestAsync(int requestId,
                         response.EmailSetupId.Value,
                         emailDetails.ToEmailAddress,
                         ex.Message);
-
-                throw new OcudaException("Unable to send email.");
-            }
-
-            if (sentEmail != null)
-            {
-                var now = _dateTimeProvider.Now;
-
-                request.ProcessedAt = now;
-                _cardRenewalRequestRepository.Update(request);
-
-                var result = new CardRenewalResult
-                {
-                    CardRenewalRequestId = request.Id,
-                    CreatedAt = now,
-                    CreatedBy = GetCurrentUserId(),
-                    ResponseText = sentEmail.BodyText
-                };
-
-                await _cardRenewalResultRepository.AddAsync(result);
-                //await _cardRenewalResponseRepository.SaveAsync();
             }
 
-
             return processResult;
         }
 
diff --git a/src/Ops.Service/Interfaces/Ops/Repositories/ICardRenewalResultRepository.cs b/src/Ops.Service/Interfaces/Ops/Repositories/ICardRenewalResultRepository.cs
index 014cc74d1..b81c9c499 100644
--- a/src/Ops.Service/Interfaces/Ops/Repositories/ICardRenewalResultRepository.cs
+++ b/src/Ops.Service/Interfaces/Ops/Repositories/ICardRenewalResultRepository.cs
@@ -6,5 +6,6 @@ namespace Ocuda.Ops.Service.Interfaces.Ops.Repositories
     public interface ICardRenewalResultRepository : IOpsRepository<CardRenewalResult, int>
     {
         Task<CardRenewalResult> GetForRequestAsync(int requestId);
+        Task<CardRenewalResponse.ResponseType> GetRequestResponseTypeAsync(int requestId);
     }
 }
diff --git a/src/Ops.Service/Interfaces/Ops/Services/ICardRenewalService.cs b/src/Ops.Service/Interfaces/Ops/Services/ICardRenewalService.cs
index b4ef0323a..d3073dfe4 100644
--- a/src/Ops.Service/Interfaces/Ops/Services/ICardRenewalService.cs
+++ b/src/Ops.Service/Interfaces/Ops/Services/ICardRenewalService.cs
@@ -15,10 +15,11 @@ public interface ICardRenewalService
         Task<IEnumerable<CardRenewalResponse>> GetResponsesAsync();
         Task<CardRenewalResponse> GetResponseTextAsync(int responseId, int languageId);
         Task<CardRenewalResult> GetResultForRequestAsync(int requestId);
+        Task<bool> IsRequestAccepted(int requestId);
         Task<ProcessResult> ProcessRequestAsync(int requestId,
             int responseId,
             string responseText,
-            string patronName);
+            string customerName);
         Task UpdateResponseAsync(CardRenewalResponse response);
         Task UpdateResponseSortOrderAsync(int id, bool increase);
     }
diff --git a/src/Ops.Service/Interfaces/Ops/Services/ISiteSettingService.cs b/src/Ops.Service/Interfaces/Ops/Services/ISiteSettingService.cs
index fae8fcf5d..381f0d4cb 100644
--- a/src/Ops.Service/Interfaces/Ops/Services/ISiteSettingService.cs
+++ b/src/Ops.Service/Interfaces/Ops/Services/ISiteSettingService.cs
@@ -9,6 +9,7 @@ public interface ISiteSettingService
         Task EnsureSiteSettingsExistAsync(int sysadminId);
         Task<ICollection<SiteSetting>> GetAllAsync();
         Task<bool> GetSettingBoolAsync(string key);
+        Task<double> GetSettingDoubleAsync(string key);
         Task<int> GetSettingIntAsync(string key);
         Task<string> GetSettingStringAsync(string key);
         Task<SiteSetting> UpdateAsync(string key, string value);
diff --git a/src/Ops.Service/Keys/CardRenewal.cs b/src/Ops.Service/Keys/CardRenewal.cs
index 01bf676e4..bb6bc40b9 100644
--- a/src/Ops.Service/Keys/CardRenewal.cs
+++ b/src/Ops.Service/Keys/CardRenewal.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Ocuda.Ops.Service.Keys
+namespace Ocuda.Ops.Service.Keys
 {
     public class CardRenewal
     {
diff --git a/src/Ops.Service/Models/CardRenewal/ProcessResult.cs b/src/Ops.Service/Models/CardRenewal/ProcessResult.cs
index 1c64fd34c..9e3b6329f 100644
--- a/src/Ops.Service/Models/CardRenewal/ProcessResult.cs
+++ b/src/Ops.Service/Models/CardRenewal/ProcessResult.cs
@@ -1,14 +1,11 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using static Ocuda.Ops.Models.Entities.CardRenewalResponse;
 
 namespace Ocuda.Ops.Service.Models.CardRenewal
 {
     public class ProcessResult
     {
-        public bool APIRenew { get; set; }
         public bool EmailNotUpdated { get; set; }
+        public bool EmailSent { get; set; }
+        public ResponseType Type { get; set; }
     }
 }
diff --git a/src/Ops.Service/SiteSettingService.cs b/src/Ops.Service/SiteSettingService.cs
index 60c68fd3f..9372d844f 100644
--- a/src/Ops.Service/SiteSettingService.cs
+++ b/src/Ops.Service/SiteSettingService.cs
@@ -90,6 +90,20 @@ public async Task<bool> GetSettingBoolAsync(string key)
             }
         }
 
+        public async Task<double> GetSettingDoubleAsync(string key)
+        {
+            var settingValue = await GetSettingValueAsync(key);
+
+            if (double.TryParse(settingValue, out double result))
+            {
+                return result;
+            }
+            else
+            {
+                throw new OcudaException($"Invalid value for double setting {key}: {settingValue}");
+            }
+        }
+
         public async Task<int> GetSettingIntAsync(string key)
         {
             var settingValue = await GetSettingValueAsync(key);
diff --git a/src/Ops.Web/Areas/Services/Views/CardRenewal/Details.cshtml b/src/Ops.Web/Areas/Services/Views/CardRenewal/Details.cshtml
index 4e94d1bd8..f113dca38 100644
--- a/src/Ops.Web/Areas/Services/Views/CardRenewal/Details.cshtml
+++ b/src/Ops.Web/Areas/Services/Views/CardRenewal/Details.cshtml
@@ -6,7 +6,7 @@
 			<tr>
 				<th style="width: 10rem;">Record id</th>
 				<td>
-					@Model.Request.PatronId
+					@Model.Request.CustomerId
 					@if (!string.IsNullOrEmpty(Model.LeapPath))
 					{
 						<a href="@Model.LeapPath" target="_blank" title="View in Leap">
@@ -19,13 +19,17 @@
 				<th>Request barcode</th>
 				<td>@Model.Request.Barcode</td>
 			</tr>
+			<tr>
+				<th>Request language</th>
+				<td>@Model.Request.Language.Description</td>
+			</tr>
 			<tr>
 				<th>First name</th>
-				<td>@Model.PatronData.NameFirst</td>
+				<td>@Model.Customer.NameFirst</td>
 			</tr>
 			<tr>
 				<th>Last name</th>
-				<td>@Model.PatronData.NameLast</td>
+				<td>@Model.Customer.NameLast</td>
 			</tr>
 			<tr>
 				<th>Email address</th>
@@ -33,11 +37,11 @@
 			</tr>
 			<tr>
 				<th>Expiration date</th>
-				<td>@Model.PatronData.ExpirationDate.ToShortDateString()</td>
+				<td>@Model.Customer.ExpirationDate?.ToShortDateString()</td>
 			</tr>
-			<tr class="@(Model.PatronData.AddrCheckDate == Model.PatronData.ExpirationDate ? "table-success" : "table-danger")">
+			<tr class="@(Model.Customer.AddressVerificationDate == Model.Customer.ExpirationDate ? "table-success" : "table-danger")">
 				<th>Address check date</th>
-				<td>@Model.PatronData.AddrCheckDate?.ToShortDateString()</td>
+				<td>@Model.Customer.AddressVerificationDate?.ToShortDateString()</td>
 			</tr>
 			<tr class="@(Model.Request.SameAddress ? "table-success" : "table-danger")">
 				<th>At the same address</th>
@@ -52,18 +56,18 @@
 			}
 			<tr>
 				<th>Patron code</th>
-				<td>@Model.PatronCode</td>
+				<td>@Model.CustomerCode</td>
 			</tr>
 		</table>
 
-		@if (Model.IsJuvenile)
+		@if (!string.IsNullOrWhiteSpace(Model.Request.GuardianName))
 		{
 			<table class="table table-sm table-bordered">
-				@if (Model.PatronAge.HasValue)
+				@if (Model.CustomerAge.HasValue)
 				{
 					<tr>
 						<th>Age</th>
-						<td>@Model.PatronAge</td>
+						<td>@Model.CustomerAge</td>
 					</tr>
 				}
 				<tr>
@@ -76,33 +80,45 @@
 				</tr>
 				<tr>
 					<th>Polaris guardian's name</th>
-					<td>@Model.PatronData.User3</td>
+					<td>@Model.Customer.UserDefinedField3</td>
 				</tr>
 				<tr>
 					<th>Polaris guardian's barcode</th>
-					<td>@Model.PatronData.User2</td>
+					<td>@Model.Customer.UserDefinedField2</td>
 				</tr>
 			</table>
 		}
 	</div>
 	<div class="col-12 col-md-6 col-xl-4">
 		<table class="table table-sm table-bordered">
-			<tr>
+			<tr class="@(Model.OverChargesLimit ? "table-warning" : "table-success")">
 				<th style="width: 10rem;">Charges</th>
-				<td>@Model.PatronData.ChargeBalance.ToString("C")</td>
+				<td>@Model.Customer.ChargeBalance.ToString("C")</td>
 			</tr>
-			<tr class="@(Model.PatronData.PatronSystemBlocks.Any() ? "table-danger" : "table-success")">
+			<tr class="@(Model.Customer.IsBlocked ? "table-danger" : "table-success")">
 				<th>Has system blocks</th>
-				<td>@(Model.PatronData.PatronSystemBlocks.Any() ? "Yes" : "No")</td>
+				<td>@(Model.Customer.IsBlocked ? "Yes" : "No")</td>
 			</tr>
-			<tr>
+			<tr class="@(Model.CustomerBlocks?.Count > 0 ? "table-danger" : "table-success")">
 				<th>Blocks</th>
-				<td>TODO</td>
+				<td>
+					@if (Model.CustomerBlocks?.Count > 0)
+					{
+						foreach (var block in Model.CustomerBlocks)
+						{
+							<div>@block.Description</div>
+						}
+					}
+					else
+					{
+						@:None
+					}
+				</td>
 			</tr>
-			<tr class="@(string.IsNullOrWhiteSpace(Model.PatronData.PatronNotes?.BlockingStatusNotes) ? "table-success" : "table-danger")">
+			<tr class="@(string.IsNullOrWhiteSpace(Model.Customer.BlockingNotes) ? "table-success" : "table-danger")">
 				<th>
 					Blocking notes
-					@if (Model.PatronData.PatronNotes?.BlockingStatusNotes?.Length > Model.MaxNotesDisplayLength)
+					@if (Model.Customer.BlockingNotes?.Length > Model.MaxNotesDisplayLength)
 					{
 						<button type="button"
 								class="btn btn-sm btn-light"
@@ -115,12 +131,21 @@
 						</button>
 					}
 				</th>
-				<td>@(!string.IsNullOrWhiteSpace(Model.PatronData.PatronNotes?.BlockingStatusNotes) ? new string(Model.PatronData.PatronNotes?.BlockingStatusNotes.Take(Model.MaxNotesDisplayLength).ToArray()) : "None")</td>
+				<td>
+					@if (!string.IsNullOrWhiteSpace(Model.Customer.BlockingNotes))
+					{
+						@Model.Customer.BlockingNotes.Substring(0, Model.MaxNotesDisplayLength)
+					}
+					else
+					{
+						@:None
+					}
+				</td>
 			</tr>
 			<tr>
 				<th>
 					Non-blocking notes
-					@if (Model.PatronData.PatronNotes?.NonBlockingStatusNotes?.Length > Model.MaxNotesDisplayLength)
+					@if (Model.Customer.Notes?.Length > Model.MaxNotesDisplayLength)
 					{
 						<button type="button"
 								class="btn btn-sm btn-light"
@@ -133,11 +158,20 @@
 						</button>
 					}
 				</th>
-				<td>@(!string.IsNullOrWhiteSpace(Model.PatronData.PatronNotes?.NonBlockingStatusNotes) ? new string(Model.PatronData.PatronNotes?.NonBlockingStatusNotes.Take(Model.MaxNotesDisplayLength).ToArray()) : "None")</td>
+				<td>
+					@if (!string.IsNullOrWhiteSpace(Model.Customer.Notes))
+					{
+						@Model.Customer.Notes.Substring(0, Model.MaxNotesDisplayLength)
+					}
+					else
+					{
+						@:None
+					}
+				</td>
 			</tr>
 			<tr>
 				<th>Proof of address</th>
-				<td>@Model.PatronData.User4</td>
+				<td>@Model.Customer.UserDefinedField4</td>
 			</tr>
 		</table>
 		@if (Model.Request.ProcessedAt.HasValue)
@@ -168,7 +202,7 @@
 	</div>
 </div>
 
-<div class="row">
+<div class="row mb-4">
 	<div class="col-12 col-xl-8 offset-xl-2">
 		<div class="accordion" id="addressAccordion">
 			<div class="accordion-item">
@@ -189,26 +223,26 @@
 						<div class="row">
 							<div class="col-12 col-md-4">
 								<div><em>Address(es) in Polaris:</em></div>
-								@foreach (var address in Model.PatronData.PatronAddresses)
+								@foreach (var address in Model.Customer.Addresses)
 								{
 									<div>
-										<strong>@address.FreeTextLabel</strong>
-										@if (!string.IsNullOrWhiteSpace(Model.AddressLookupPath) || !string.IsNullOrWhiteSpace(Model.AssessorLookupPath))
+										<strong>@address.AddressType</strong>
+										@if (Model.AddressLookupUrlSet || !string.IsNullOrWhiteSpace(Model.AssessorLookupUrl))
 										{
 											<span>
 												(<a href="#"
 													class="addressLookup"
-													data-address="@address.StreetOne @address.StreetTwo"
+													data-address="@address.StreetAddressOne @address.StreetAddressTwo"
 													data-zip="@address.PostalCode">Look up</a>)
 											</span>
 
 										}
 									</div>
 									<div class="mb-3">
-										@address.StreetOne<br />
-										@if (!string.IsNullOrWhiteSpace(address.StreetTwo))
+										@address.StreetAddressOne<br />
+										@if (!string.IsNullOrWhiteSpace(address.StreetAddressTwo))
 										{
-											@address.StreetTwo
+											@address.StreetAddressTwo
 											<br />
 										}
 										@address.City @address.State, @address.PostalCode<br />
@@ -216,16 +250,19 @@
 									</div>
 								}
 							</div>
-							@if (!string.IsNullOrWhiteSpace(Model.AddressLookupPath) || !string.IsNullOrWhiteSpace(Model.AssessorLookupPath))
+							@if (Model.AddressLookupUrlSet || !string.IsNullOrWhiteSpace(Model.AssessorLookupUrl))
 							{
 								<div class="col-12 col-md-8">
-									@if (!string.IsNullOrWhiteSpace(Model.AddressLookupPath))
+									@if (Model.AddressLookupUrlSet)
 									{
 										<div id="addressLookupResults" class="mb-2"></div>
 									}
-									@if (!string.IsNullOrWhiteSpace(Model.AssessorLookupPath))
+									@if (!string.IsNullOrWhiteSpace(Model.AssessorLookupUrl))
 									{
-										<div id="assessorLookupResults"></div>
+										<div id="assessorLookupResults" class="d-none">
+											<strong>Assessor results:</strong>
+											<div>Click to <a id="assessorLink" href="" target="_blank">load this search on the County Assessor's site</a></div>
+										</div>
 									}
 								</div>
 							}
@@ -237,129 +274,126 @@
 	</div>
 </div>
 
-<form asp-controller="@CardRenewalController.Name"
-	  asp-action="@nameof(CardRenewalController.Details)"
-	  method="post"
-	  role="form">
-	<input asp-for="PatronName" type="hidden" />
-	<input asp-for="RequestId" value="@Model.Request.Id" type="hidden" />
-
-	<div class="row mt-4">
-		<div class="col-12 col-xl-8 offset-xl-2">
-			<div class="mb-3">
-				<select asp-for="ResponseId" asp-items="@Model.ResponseList" class="form-control">
-					<option value="">Please select a response</option>
-				</select>
-				<span asp-validation-for="ResponseId" class="text-danger"></span>
-			</div>
+@if (!Model.Request.ProcessedAt.HasValue)
+{
+	<form asp-controller="@CardRenewalController.Name"
+		  asp-action="@nameof(CardRenewalController.Details)"
+		  method="post"
+		  role="form">
+		<input asp-for="CustomerName" type="hidden" />
+		<input asp-for="RequestId" value="@Model.Request.Id" type="hidden" />
 
-			<div class="mb-3">
-				<textarea asp-for="ResponseText" class="form-control" rows="5"></textarea>
-				<span asp-validation-for="ResponseText" class="text-danger"></span>
-			</div>
+		<div class="row">
+			<div class="col-12 col-xl-8 offset-xl-2">
+				<div class="mb-3">
+					<select asp-for="ResponseId" asp-items="@Model.ResponseList" class="form-control">
+						<option value="">Please select a response</option>
+					</select>
+					<span asp-validation-for="ResponseId" class="text-danger"></span>
+				</div>
 
-			<div class="row mb-3">
-				<div class="col-12">
-					<strong>Replacement Keys</strong> &ndash; {{@Ocuda.Ops.Service.Keys.CardRenewal.CustomerBarcode}}, {{@Ocuda.Ops.Service.Keys.CardRenewal.CustomerName}}
+				<div class="mb-3">
+					<textarea asp-for="ResponseText" class="form-control" rows="5"></textarea>
+					<span asp-validation-for="ResponseText" class="text-danger"></span>
 				</div>
-			</div>
 
+				<div class="row mb-3">
+					<div class="col-12">
+						<strong>Replacement Keys</strong> &ndash; {{@Ocuda.Ops.Service.Keys.CardRenewal.CustomerBarcode}}, {{@Ocuda.Ops.Service.Keys.CardRenewal.CustomerName}}
+					</div>
+				</div>
 
-			<div>
-				<button id="processButton"
-						type="submit"
-						class="btn btn-secondary disabled"
-						button-spinner>
-					<span id="buttonIcon" class="d-none"></span>
-					<span id="buttonText">Mark Processed, send email</span>
-				</button>
-				<button type="button"
-						class="btn btn-warning"
-						data-bs-toggle="modal"
-						data-bs-target="#discardModal">
-					<span class="fa-solid fa-trash-can"></span>
-					Discard Request, do not send email
-				</button>
-				<a asp-action="@(nameof(CardRenewalController.Index))"
-				   asp-route-processed="@(Model.Request.ProcessedAt.HasValue ? "true" : "")"
-				   class="btn btn-outline-dark float-end">Back</a>
+				<div>
+					<button id="processButton"
+							type="submit"
+							class="btn btn-secondary disabled"
+							button-spinner>
+						<span id="buttonIcon" class="d-none"></span>
+						<span id="buttonText">Mark Processed, send email</span>
+					</button>
+					<button type="button"
+							class="btn btn-warning"
+							data-bs-toggle="modal"
+							data-bs-target="#discardModal">
+						<span class="fa-solid fa-trash-can"></span>
+						Discard Request, do not send email
+					</button>
+					<a asp-action="@(nameof(CardRenewalController.Index))"
+					   asp-route-processed="@(Model.Request.ProcessedAt.HasValue ? "true" : "")"
+					   class="btn btn-outline-dark float-end">Back</a>
+				</div>
 			</div>
 		</div>
-	</div>
-</form>
+	</form>
 
-<form asp-action="@nameof(CardRenewalController.Discard)"
-	  enctype="multipart/form-data"
-	  method="post"
-	  role="form">
-	<input name="id" value="@Model.Request.Id" type="hidden" />
+	<form asp-action="@nameof(CardRenewalController.Discard)"
+		  enctype="multipart/form-data"
+		  method="post"
+		  role="form">
+		<input id="discardId" asp-for="RequestId" value="@Model.Request.Id" type="hidden" />
 
-	<div class="modal" tabindex="-1" id="discardModal">
-		<div class="modal-dialog">
-			<div class="modal-content">
-				<div class="modal-header">
-					<h5 class="modal-title">Discard Request</h5>
-					<button type="button"
-							class="btn-close"
-							data-bs-dismiss="modal"
-							aria-label="Close"></button>
-				</div>
-				<div class="modal-body">
-					<p>Are you sure you want to discard this request?</p>
+		<div class="modal" tabindex="-1" id="discardModal">
+			<div class="modal-dialog">
+				<div class="modal-content">
+					<div class="modal-header">
+						<h5 class="modal-title">Discard Request</h5>
+						<button type="button"
+								class="btn-close"
+								data-bs-dismiss="modal"
+								aria-label="Close"></button>
+					</div>
+					<div class="modal-body">
+						<p>Are you sure you want to discard this request?</p>
+					</div>
+					<div class="modal-footer">
+						<button type="button" class="btn btn-outline-secondary" data-bs-dismiss="modal">Close</button>
+						<button type="submit" class="btn btn-outline-warning">
+							<span class="fa fa-trash" aria-hidden="true"></span>
+							Discard
+						</button>
+					</div>
 				</div>
-				<div class="modal-footer">
-					<button type="button" class="btn btn-outline-secondary" data-bs-dismiss="modal">Close</button>
-					<button type="submit" class="btn btn-outline-warning">
-						<span class="fa fa-trash" aria-hidden="true"></span>
-						Discard
-					</button>
+			</div>
+		</div>
+	</form>
+}
+else
+{
+	<div class="row">
+		<div class="col-12 col-xl-8 offset-xl-2">
+			<div class="mb-2">
+				<strong>E-Mail response sent to customer:</strong>
+			</div>
+			<div class="card mb-3">
+				<div class="card-body">
+					@Html.Raw(Model.Result.ResponseText)
 				</div>
 			</div>
+			<div>
+				<a asp-action="@(nameof(CardRenewalController.Index))"
+				   asp-route-processed="@(Model.Request.ProcessedAt.HasValue ? "true" : "")"
+				   class="btn btn-outline-dark float-end">Back</a>
+			</div>
 		</div>
 	</div>
-</form>
+}
 
-@if (Model.PatronData.PatronNotes?.BlockingStatusNotes?.Length > Model.MaxNotesDisplayLength)
+@if (Model.Customer.BlockingNotes?.Length > Model.MaxNotesDisplayLength)
 {
 	<div modal id="blockingNotesModal" name="Blocking Notes" suppress-footer="true">
-		@Model.PatronData.PatronNotes?.BlockingStatusNotes
+		@Model.Customer.BlockingNotes
 	</div>
 }
 
-@if (Model.PatronData.PatronNotes?.NonBlockingStatusNotes?.Length > Model.MaxNotesDisplayLength)
+@if (Model.Customer.Notes?.Length > Model.MaxNotesDisplayLength)
 {
 	<div modal id="nonBlockingNotesModal" name="Non-Blocking Notes" suppress-footer="true">
-		@Model.PatronData.PatronNotes?.NonBlockingStatusNotes
+		@Model.Customer.Notes
 	</div>
 }
 
 @section scripts {
 	<script>
-		$('.addressLookup').on("click", function(e) {
-			e.preventDefault();
-			let searchAddress = $(this).attr('data-address');
-			let searchZip = $(this).attr('data-zip');
-			let addressLookupDiv = $('#addressLookupResults');
-			let assessorLookupDiv = $('#assessorLookupResults');
-
-			addressLookupDiv.html('<strong>Loading address...</strong>  <span class="fa-solid fa-spinner fa-pulse fa-fw">');
-			assessorLookupDiv.html('<strong>Loading assessor...</strong>  <span class="fa-solid fa-spinner fa-pulse fa-fw">');
-
-			let addressLookupUrl = '@Model.AddressLookupPath';
-
-			$.get(addressLookupUrl,
-				{
-					address: searchAddress,
-					zip: searchZip
-				})
-				.done(function(response) {
-					if (response.success == true)
-					{
-						alert(response.residents);
-					}
-				});
-		});
-
 		$('#ResponseId').on('change', function() {
 			const languageId = '@Model.Request.LanguageId';
 			let responseId = $(this).val();
@@ -398,18 +432,82 @@
 				buttonText.text('Mark Processed, send email');
 				buttonIcon.attr('class', 'fa-solid fa-xmark');
 			}
+			else if (responseType == 'Partial') {
+				processButton.attr('class', 'btn btn-primary btn-spinner');
+				buttonText.text('Mark Processed, send email');
+				buttonIcon.attr('class', 'fa-solid fa-check');
+			}
 			else {
 				processButton.attr('class', 'btn btn-secondary disabled');
 				buttonText.text('Mark Processed, send email');
 				buttonIcon.attr('class', 'd-none');
 			}
 		}
-
 	</script>
 
-	@if (!Model.Request.ProcessedAt.HasValue)
+	@if (Model.AddressLookupUrlSet)
+	{
+		<script>
+			$('.addressLookup').on("click", function(e) {
+				e.preventDefault();
+
+				const addressLookupDiv = $('#addressLookupResults');
+				const addressLookupHeader = '<strong>Address lookup results:</strong></br>';
+
+				let searchAddress = $(this).attr('data-address').trim();
+				let searchZip = $(this).attr('data-zip');
+
+				addressLookupDiv.html('<strong>Loading address...</strong>  <span class="fa-solid fa-spinner fa-pulse fa-fw">');
+
+				$.get('@Url.Action(nameof(Ocuda.Ops.Controllers.ApiController.AddressLookup), Ocuda.Ops.Controllers.ApiController.Name)',
+					{
+						address: searchAddress,
+						zip: searchZip
+					})
+					.done(function(response) {
+						if (response != null)
+						{
+							if (response.success)
+							{
+								let formattedResults = [];
+								formattedResults.push(response.streetAddress1,
+									" / ",
+									response.postalCode,
+									"<ul>");
+								response.residents.forEach((_) =>
+								{
+									formattedResults.push("<li>", _, "</li>");
+								})
+								formattedResults.push("</ul>");
+								addressLookupDiv.html(addressLookupHeader + formattedResults.join(""));
+							}
+							else
+							{
+								addressLookupDiv.html(addressLookupHeader + response.error);
+							}
+						}
+						else
+						{
+							addressLookupDiv.html(addressLookupHeader + 'An error occured looking up the address');
+						}
+					})
+					.fail(function() {
+						addressLookupDiv.html(addressLookupHeader + 'An error occured looking up the address');
+					});
+			});
+		</script>
+	}
+
+	@if (!string.IsNullOrWhiteSpace(Model.AssessorLookupUrl))
 	{
 		<script>
+			$('.addressLookup').on("click", function(e) {
+				let searchAddress = $(this).attr('data-address').trim();
+				let searchZip = $(this).attr('data-zip');
+
+				$('#assessorLookupResults').removeClass('d-none');
+				$('#assessorLink').attr('href', '@Model.AssessorLookupUrl' + searchAddress + ' ' + searchZip);
+			});
 		</script>
 	}
 }
\ No newline at end of file
diff --git a/src/Ops.Web/Areas/Services/Views/CardRenewal/Index.cshtml b/src/Ops.Web/Areas/Services/Views/CardRenewal/Index.cshtml
index aeacccbfd..dc69fb32f 100644
--- a/src/Ops.Web/Areas/Services/Views/CardRenewal/Index.cshtml
+++ b/src/Ops.Web/Areas/Services/Views/CardRenewal/Index.cshtml
@@ -6,10 +6,20 @@
 			Card Renewal Requests
 			<small class="text-muted d-print-block">@(Model.IsProcessed ? "Processed" : "Pending")</small>
 		</h1>
-
 	</div>
 </div>
 
+@if (!Model.APIConfigured)
+{
+	<div class="row">
+		<div class="col-12 col-sm-10 offset-sm-1">
+			<div class="alert alert-danger">
+				Please set API/DB configurations to enable processing card renewals
+			</div>
+		</div>
+	</div>
+}
+
 <div class="row mb-2">
 	<div class="col-12">
 		<div class="d-inline-block">
@@ -65,16 +75,22 @@
 			{
 				<tr>
 					<td>
-						<a asp-action="@(nameof(CardRenewalController.Details))"
-						   asp-route-id="@request.Id">
+						@if (Model.APIConfigured)
+						{
+							<a asp-action="@(nameof(CardRenewalController.Details))"
+							   asp-route-id="@request.Id">
+								@(Model.IsProcessed? request.ProcessedAt: request.SubmittedAt)
+							</a>
+						}
+						else
+						{
 							@(Model.IsProcessed? request.ProcessedAt: request.SubmittedAt)
-						</a>
+						}
 					</td>
 					<td>@request.Barcode</td>
 					<td class="@(request.SameAddress ? "table-success" : "table-danger")">@(request.SameAddress ? "Yes" : "No")</td>
 					@if (Model.IsProcessed)
 					{
-						/*
 						<td>
 							@if (request.Accepted == true)
 							{
@@ -85,7 +101,6 @@
 								<span class="fa-solid fa-xmark fa-fw"></span>
 							}
 						</td>
-						*/
 					}
 				</tr>
 			}
diff --git a/src/Ops.Web/Startup.cs b/src/Ops.Web/Startup.cs
index 6b2f79562..1b7152ebf 100644
--- a/src/Ops.Web/Startup.cs
+++ b/src/Ops.Web/Startup.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Net.Http;
 using System.Net.Http.Headers;
-using Clc.Polaris.Api.Configuration;
 using Microsoft.AspNetCore.Authentication.Cookies;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.DataProtection;
@@ -125,8 +124,6 @@ public void ConfigureServices(IServiceCollection services)
                     = new Microsoft.AspNetCore.Localization.RequestCulture(culture);
             });
 
-            services.Configure<PapiSettings>(_config.GetSection(PapiSettings.SECTION_NAME));
-
             services.AddHealthChecks();
 
             switch (_config[Configuration.OpsDistributedCache])
@@ -167,6 +164,8 @@ string cacheDiscriminator
             string promCs = _config.GetConnectionString("Promenade")
                 ?? throw new OcudaException("ConnectionString:Promenade not configured.");
 
+            string polarisCs = _config.GetConnectionString("Polaris");
+
             var provider = _config[Configuration.OpsDatabaseProvider];
             switch (provider)
             {
@@ -175,6 +174,9 @@ string cacheDiscriminator
                         DataProvider.SqlServer.Ops.Context>(_ => _.UseSqlServer(opsCs));
                     services.AddDbContextPool<PromenadeContext,
                         DataProvider.SqlServer.Promenade.Context>(_ => _.UseSqlServer(promCs));
+
+                    services.AddDbContextPool<PolarisContext>(_ => _.UseSqlServer(polarisCs));
+
                     services.AddHealthChecks();
                     break;
 
diff --git a/src/PolarisHelper/IPolarisHelper.cs b/src/PolarisHelper/IPolarisHelper.cs
index 9f9dc0087..b04b2c775 100644
--- a/src/PolarisHelper/IPolarisHelper.cs
+++ b/src/PolarisHelper/IPolarisHelper.cs
@@ -1,15 +1,18 @@
-using System.Threading.Tasks;
-using Clc.Polaris.Api.Models;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Ocuda.Models;
 using Ocuda.PolarisHelper.Models;
 
 namespace Ocuda.PolarisHelper
 {
     public interface IPolarisHelper
     {
-        PatronValidateResult AuthenticatePatron(string barcode, string password);
-        Task<string> GetPatronCodeNameAsync(int patronCodeId);
-        PatronData GetPatronData(string barcode, string password);
-        PatronData GetPatronDataOverride(string barcode);
-        RenewRegistrationResult RenewPatronRegistration(string barcode, string email);
+        bool IsConfigured { get; }
+        bool AuthenticateCustomer(string barcode, string password);
+        Task<List<CustomerBlock>> GetCustomerBlocksAsync(int customerId);
+        Task<string> GetCustomerCodeNameAsync(int customerCodeId);
+        Customer GetCustomerData(string barcode, string password);
+        Customer GetCustomerDataOverride(string barcode);
+        RenewRegistrationResult RenewCustomerRegistration(string barcode, string email);
     }
 }
diff --git a/src/PolarisHelper/PolarisContext.cs b/src/PolarisHelper/PolarisContext.cs
new file mode 100644
index 000000000..433328c95
--- /dev/null
+++ b/src/PolarisHelper/PolarisContext.cs
@@ -0,0 +1,9 @@
+using Microsoft.EntityFrameworkCore;
+
+namespace Ocuda.PolarisHelper
+{
+    public class PolarisContext : DbContext
+    {
+        public PolarisContext(DbContextOptions options) : base(options) { }
+    }
+}
diff --git a/src/PolarisHelper/PolarisHelper.cs b/src/PolarisHelper/PolarisHelper.cs
index 64fa679db..4c9ea508e 100644
--- a/src/PolarisHelper/PolarisHelper.cs
+++ b/src/PolarisHelper/PolarisHelper.cs
@@ -5,8 +5,10 @@
 using Clc.Polaris.Api;
 using Clc.Polaris.Api.Configuration;
 using Clc.Polaris.Api.Models;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
+using Ocuda.Models;
 using Ocuda.PolarisHelper.Models;
 using Ocuda.Utility.Keys;
 using Ocuda.Utility.Services.Interfaces;
@@ -15,33 +17,88 @@ namespace Ocuda.PolarisHelper
 {
     public class PolarisHelper : IPolarisHelper
     {
+        public bool IsConfigured { get; }
+
         private const int CacheCodesHours = 1;
         private const int PAPIInvalidEmailErrorCode = -3518;
 
         private readonly IOcudaCache _cache;
+        private readonly IConfiguration _config;
+        private readonly PolarisContext _context;
         private readonly ILogger<PolarisHelper> _logger;
         private readonly IPapiClient _papiClient;
 
         public PolarisHelper(IOcudaCache cache,
-            ILogger<PolarisHelper> logger,
-            IOptions<PapiSettings> options)
+            IConfiguration config,
+            ILogger<PolarisHelper> logger)
         {
+            ArgumentNullException.ThrowIfNull(cache);
+            ArgumentNullException.ThrowIfNull(config);
+            ArgumentNullException.ThrowIfNull(logger);
+
+            _cache = cache;
+            _config = config;
+            _logger = logger;
 
+            var settings = new PapiSettings();
+            _config.GetSection(PapiSettings.SECTION_NAME).Bind(settings);
+            _papiClient = new PapiClient(settings);
+            _papiClient.AllowStaffOverrideRequests = false;
+
+            IsConfigured = ValidateConfiguration();
+        }
+
+        public PolarisHelper(IOcudaCache cache,
+            IConfiguration config,
+            PolarisContext context,
+            ILogger<PolarisHelper> logger)
+        {
             ArgumentNullException.ThrowIfNull(cache);
+            ArgumentNullException.ThrowIfNull(config);
+            ArgumentNullException.ThrowIfNull(context);
             ArgumentNullException.ThrowIfNull(logger);
-            ArgumentNullException.ThrowIfNull(options);
 
             _cache = cache;
+            _config = config;
+            _context = context;
             _logger = logger;
-            _papiClient = new PapiClient(options.Value);
+
+            var settings = new PapiSettings();
+            _config.GetSection(PapiSettings.SECTION_NAME).Bind(settings);
+            _papiClient = new PapiClient(settings);
+
+            IsConfigured = ValidateConfiguration();
+        }
+
+        public bool AuthenticateCustomer(string barcode, string password)
+        {
+            var validateResult = _papiClient.PatronValidate(barcode, password)?.Data;
+
+            return validateResult != null;
         }
 
-        public PatronValidateResult AuthenticatePatron(string barcode, string password)
+        public async Task<List<CustomerBlock>> GetCustomerBlocksAsync(int customerId)
         {
-            return _papiClient.PatronValidate(barcode, password)?.Data;
+            var blocks = await _context.Database
+                .SqlQuery<CustomerBlock>(@$"SELECT PS.PatronStopID AS BlockId, PSD.Description
+                    FROM PatronStops as PS
+                    INNER JOIN PatronStopDescriptions as PSD
+                    on PS.PatronStopId = PSD.PatronStopId
+                    WHERE PS.PatronID = {customerId}")
+                .ToListAsync();
+
+            var freeTextBlocks = await _context.Database
+                .SqlQuery<CustomerBlock>(@$"SELECT NULL AS BlockId, FreeTextBlock AS Description
+                    FROM PatronFreeTextBlocks
+                    WHERE PatronID = {customerId}")
+                .ToListAsync();
+
+            blocks.AddRange(freeTextBlocks);
+
+            return blocks;
         }
 
-        public async Task<string> GetPatronCodeNameAsync(int patronCodeId)
+        public async Task<string> GetCustomerCodeNameAsync(int customerCodeId)
         {
             var patronCodes = await _cache
                 .GetObjectFromCacheAsync<List<PatronCodeRow>>(Cache.PolarisPatronCodes);
@@ -55,26 +112,30 @@ await _cache.SaveToCacheAsync(Cache.PolarisPatronCodes,
             }
 
             return patronCodes
-                .Where(_ => _.PatronCodeID == patronCodeId)
+                .Where(_ => _.PatronCodeID == customerCodeId)
                 .Select(_ => _.Description)
                 .SingleOrDefault();
         }
 
-        //public async Task<>-
-
-        public PatronData GetPatronData(string barcode, string password)
+        public Customer GetCustomerData(string barcode, string password)
         {
-            return _papiClient.PatronBasicDataGet(barcode, password, true).Data.PatronBasicData;
+            var patronData = _papiClient.PatronBasicDataGet(barcode, password, addresses: true)
+                .Data
+                .PatronBasicData;
+
+            return GetCustomerInfo(patronData);
         }
 
-        public PatronData GetPatronDataOverride(string barcode)
+        public Customer GetCustomerDataOverride(string barcode)
         {
-            return _papiClient.PatronBasicDataGet(barcode, addresses: true, notes: true)
+            var patronData = _papiClient.PatronBasicDataGet(barcode, addresses: true, notes: true)
                 .Data
                 .PatronBasicData;
+
+            return GetCustomerInfo(patronData);
         }
 
-        public RenewRegistrationResult RenewPatronRegistration(string barcode, string email)
+        public RenewRegistrationResult RenewCustomerRegistration(string barcode, string email)
         {
             var date = DateTime.Now.AddYears(1);
             var updateParams = new PatronUpdateParams
@@ -93,12 +154,12 @@ public RenewRegistrationResult RenewPatronRegistration(string barcode, string em
 
             if (updateResults.Exception != null)
             {
-                _logger.LogCritical("PAPI call was not successful: {ErrorMessage}",
+                _logger.LogError("PAPI call was not successful: {ErrorMessage}",
                     updateResults.Exception.Message);
             }
             else if (!updateResults.Response.IsSuccessStatusCode)
             {
-                _logger.LogCritical("PAPI call was not successful after {Elapsed} ms: {StatusCode}",
+                _logger.LogError("PAPI call was not successful after {Elapsed} ms: {StatusCode}",
                     updateResults.ResponseTime,
                     updateResults.Response.StatusCode);
             }
@@ -114,7 +175,7 @@ public RenewRegistrationResult RenewPatronRegistration(string barcode, string em
 
                 if (updateResults.Data.PAPIErrorCode != 0)
                 {
-                    _logger.LogCritical("PAPI error after {Elapsed} ms: {PAPIErrorCode}",
+                    _logger.LogError("PAPI error after {Elapsed} ms: {PAPIErrorCode}",
                         updateResults.ResponseTime,
                         updateResults.Data.PAPIErrorCode);
                 }
@@ -132,5 +193,81 @@ public RenewRegistrationResult RenewPatronRegistration(string barcode, string em
 
             return renewResult;
         }
+
+        private static Customer GetCustomerInfo(PatronData patronData)
+        {
+            var customer = new Customer
+            {
+                AddressVerificationDate = patronData.AddrCheckDate,
+                BirthDate = patronData.BirthDate,
+                BlockingNotes = patronData.PatronNotes?.BlockingStatusNotes,
+                ChargeBalance = patronData.ChargeBalance,
+                CustomerCodeId = patronData.PatronCodeID,
+                CustomerIdNumber = patronData.Barcode,
+                EmailAddress = patronData.EmailAddress,
+                ExpirationDate = patronData.ExpirationDate,
+                Id = patronData.PatronID,
+                IsBlocked = patronData.PatronSystemBlocks.Any(),
+                NameFirst = patronData.NameFirst,
+                NameLast = patronData.NameLast,
+                Notes = patronData.PatronNotes?.NonBlockingStatusNotes,
+                UserDefinedField1 = patronData.User1,
+                UserDefinedField2 = patronData.User2,
+                UserDefinedField3 = patronData.User3,
+                UserDefinedField4 = patronData.User4,
+                UserDefinedField5 = patronData.User5
+            };
+
+            var addressList = new List<CustomerAddress>();
+            foreach (var address in patronData.PatronAddresses)
+            {
+                addressList.Add(new CustomerAddress
+                {
+                    AddressType = address.FreeTextLabel,
+                    AddressTypeId = address.AddressTypeID,
+                    City = address.City,
+                    Country = address.Country,
+                    CountryId = address.CountryID,
+                    County = address.County,
+                    Id = address.AddressId,
+                    PostalCode = address.PostalCode,
+                    State = address.State,
+                    StreetAddressOne = address.StreetOne,
+                    StreetAddressTwo = address.StreetTwo,
+                    ZipPlusFour = address.ZipPlusFour,
+                });
+            }
+
+            customer.Addresses = addressList;
+
+            return customer;
+        }
+
+        private bool ValidateConfiguration()
+        {
+            var validConfiguration = !string.IsNullOrEmpty(_papiClient.AccessID)
+                && !string.IsNullOrWhiteSpace(_papiClient.AccessKey)
+                && !string.IsNullOrWhiteSpace(_papiClient.Hostname);
+
+            if (!validConfiguration)
+            {
+                _logger.LogError("PAPI not configured");
+            }
+            else if (_papiClient.AllowStaffOverrideRequests)
+            {
+                validConfiguration = _papiClient.OrganizationId != 0
+                    && _papiClient.UserId != 0
+                    && _papiClient.WorkstationId != 0
+                    && _papiClient.StaffOverrideAccount != null
+                    && !string.IsNullOrWhiteSpace(_context.Database.GetConnectionString());
+
+                if (!validConfiguration)
+                {
+                    _logger.LogError("PAPI/PolarisDB not configured for staff requests");
+                }
+            }
+
+            return validConfiguration;
+        }
     }
 }
diff --git a/src/PolarisHelper/PolarisHelper.csproj b/src/PolarisHelper/PolarisHelper.csproj
index 403b46685..bf7390b6a 100644
--- a/src/PolarisHelper/PolarisHelper.csproj
+++ b/src/PolarisHelper/PolarisHelper.csproj
@@ -15,10 +15,12 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Clc.Polaris.Api" Version="3.1.6" />
     <PackageReference Include="Microsoft.Extensions.Options" Version="8.0.2" />
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\Models\Models.csproj" />
     <ProjectReference Include="..\Utility\Utility.csproj" />
   </ItemGroup>
 
diff --git a/src/Promenade.Controllers/CardRenewalController.cs b/src/Promenade.Controllers/CardRenewalController.cs
index f864a99bd..31dbf1386 100644
--- a/src/Promenade.Controllers/CardRenewalController.cs
+++ b/src/Promenade.Controllers/CardRenewalController.cs
@@ -3,9 +3,10 @@
 using System.Linq;
 using System.Text.Json;
 using System.Threading.Tasks;
-using Clc.Polaris.Api.Models;
+using CommonMark;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
+using Ocuda.Models;
 using Ocuda.PolarisHelper;
 using Ocuda.Promenade.Controllers.Abstract;
 using Ocuda.Promenade.Controllers.Filters;
@@ -20,11 +21,11 @@ namespace Ocuda.Promenade.Controllers
     [Route("{culture:cultureConstraint?}/[Controller]")]
     public class CardRenewalController : BaseController<CardRenewalController>
     {
-        private const string TempDataAddresses = "TempData.Addresses";
-        private const string TempDataEmail = "TempData.Email";
-        private const string TempDataJuvenile = "TempData.Juvenile";
+        private const int AgeOfMajority = 18;
+
         private const string TempDataRequest = "TempData.Request";
         private const string TempDataTimeout = "TempData.Timeout";
+        private const string TempDataUnableToRenew = "TempData.UnableToRenew";
 
         private readonly CardRenewalService _cardRenewalService;
         private readonly IDateTimeProvider _dateTimeProvider;
@@ -56,6 +57,36 @@ public static string Name
         [RestoreModelState]
         public async Task<IActionResult> Index(string cardNumber)
         {
+            var forceReload = HttpContext.Items[ItemKey.ForceReload] as bool? ?? false;
+
+            if (!_polarisHelper.IsConfigured)
+            {
+                _logger.LogError("Card renewal API settings are not configured");
+
+                var notConfiguredSegmentId = await _siteSettingService.GetSettingIntAsync(
+                    Models.Keys.SiteSetting.CardRenewal.NotConfiguredSegment,
+                    forceReload);
+
+                SegmentText notConfiguredSegmentText = null;
+                if (notConfiguredSegmentId > 0)
+                {
+                    notConfiguredSegmentText = await _segmentService.GetSegmentTextBySegmentIdAsync(
+                        notConfiguredSegmentId,
+                        forceReload);
+                    if (notConfiguredSegmentText == null)
+                    {
+                        _logger.LogError($"Card renewal 'Not configured' segment id '{notConfiguredSegmentId}' not found");
+                    }
+                    else if (!string.IsNullOrWhiteSpace(notConfiguredSegmentText.Text))
+                    {
+                        notConfiguredSegmentText.Text = CommonMarkConverter.Convert(
+                            notConfiguredSegmentText.Text);
+                    }
+                }
+
+                return View("NotConfigured", notConfiguredSegmentText);
+            }
+
             if (TempData.ContainsKey(TempDataTimeout))
             {
                 ModelState.AddModelError(nameof(IndexViewModel.Invalid),
@@ -66,16 +97,28 @@ public async Task<IActionResult> Index(string cardNumber)
             var viewModel = new IndexViewModel()
             {
                 Barcode = cardNumber,
-                ForgotPasswordLink = await _siteSettingService
-                    .GetSettingStringAsync(Models.Keys.SiteSetting.Card.ForgotPasswordLink)
+                ForgotPasswordLink = await _siteSettingService.GetSettingStringAsync(
+                    Models.Keys.SiteSetting.Site.ForgotPasswordLink,
+                    forceReload)
             };
 
-            var cardRenewalSegmentId = await _siteSettingService
-                .GetSettingIntAsync(Models.Keys.SiteSetting.Card.CardRenewalSegment);
+            var cardRenewalSegmentId = await _siteSettingService.GetSettingIntAsync(
+                Models.Keys.SiteSetting.CardRenewal.HomeSegment,
+                forceReload);
             if (cardRenewalSegmentId > 0)
             {
-                viewModel.SegmentText = await _segmentService
-                    .GetSegmentTextBySegmentIdAsync(cardRenewalSegmentId, false);
+                viewModel.SegmentText = await _segmentService.GetSegmentTextBySegmentIdAsync(
+                    cardRenewalSegmentId,
+                    forceReload);
+                if (viewModel.SegmentText == null)
+                {
+                    _logger.LogError($"Card renewal 'Home' segment id '{cardRenewalSegmentId}' not found");
+                }
+                else if (!string.IsNullOrWhiteSpace(viewModel.SegmentText.Text))
+                {
+                    viewModel.SegmentText.Text = CommonMarkConverter.Convert(
+                        viewModel.SegmentText.Text);
+                }
             }
 
             return View(viewModel);
@@ -87,136 +130,285 @@ public async Task<IActionResult> Index(IndexViewModel viewModel)
         {
             ArgumentNullException.ThrowIfNull(viewModel);
 
+            if (!_polarisHelper.IsConfigured)
+            {
+                return RedirectToAction(nameof(Index));
+            }
+
             if (ModelState.IsValid)
             {
-                var barcode = viewModel.Barcode.Trim()
-                    .Replace(" ", "", StringComparison.OrdinalIgnoreCase);
+                var barcode = string.Concat(viewModel.Barcode.Where(_ => !char.IsWhiteSpace(_)));
                 var password = viewModel.Password.Trim();
 
-                var patronValidateResult = _polarisHelper.AuthenticatePatron(barcode, password);
+                var validateResult = _polarisHelper.AuthenticateCustomer(barcode, password);
 
-                if (patronValidateResult == null)
+                if (!validateResult)
                 {
                     _logger.LogInformation($"Invalid card number or password for Barcode '{barcode}'");
                     ModelState.AddModelError(nameof(viewModel.Invalid),
                         _localizer[i18n.Keys.Promenade.CardRenewalInvalidLogin]);
+                    return RedirectToAction(nameof(Index));
+                }
+
+                var customer = _polarisHelper.GetCustomerData(barcode, password);
+
+                // Handle accounts with a pending request
+                var pendingRequest = await _cardRenewalService
+                    .GetPendingRequestAsync(customer.Id);
+                if (pendingRequest != null)
+                {
+                    ModelState.AddModelError(nameof(viewModel.Invalid),
+                        _localizer[i18n.Keys.Promenade.CardRenewalPendingRequest,
+                        pendingRequest.SubmittedAt.ToString("d", CultureInfo.CurrentCulture),
+                        pendingRequest.SubmittedAt.ToString("t", CultureInfo.CurrentCulture)]);
+                    return RedirectToAction(nameof(Index));
                 }
-                else
+
+                // Handle accounts that aren't expiring soon
+                var cutoffDays = await _siteSettingService.GetSettingIntAsync(
+                    Models.Keys.SiteSetting.CardRenewal.ExpirationCutoffDays);
+                if (cutoffDays > -1)
                 {
-                    var pendingRequest = await _cardRenewalService
-                        .GetPendingRequestAsync(patronValidateResult.PatronID);
-                    if (pendingRequest != null)
+                    var renewalAllowedDate = customer
+                        .ExpirationDate.Value.AddDays(-cutoffDays).Date;
+                    if (renewalAllowedDate > _dateTimeProvider.Now.Date)
                     {
-                        // TODO
-                        // Send to Pending page
+                        ModelState.AddModelError(nameof(viewModel.Invalid),
+                            _localizer[i18n.Keys.Promenade.CardRenewalInvalidCutoff,
+                                cutoffDays,
+                                renewalAllowedDate.ToShortDateString()]);
+                        return RedirectToAction(nameof(Index));
                     }
+                }
+
+                // Handle accounts belonging to staff
+                var staffCustomerCodes = await _siteSettingService.GetSettingStringAsync(
+                    Models.Keys.SiteSetting.CardRenewal.StaffCustomerCodes);
+                if (!string.IsNullOrWhiteSpace(staffCustomerCodes))
+                {
+                    var customerCodeList = staffCustomerCodes
+                        .Split(",", StringSplitOptions.RemoveEmptyEntries
+                            | StringSplitOptions.TrimEntries)
+                        .ToList();
 
-                    var cutoffDays = await _siteSettingService
-                        .GetSettingIntAsync(Models.Keys.SiteSetting.Card.ExpirationCutoffDays);
-                    if (cutoffDays > -1)
+                    foreach (var customerCode in customerCodeList)
                     {
-                        var renewalAllowedDate = patronValidateResult
-                            .ExpirationDate.Value.AddDays(-cutoffDays).Date;
-                        if (renewalAllowedDate > _dateTimeProvider.Now.Date)
+                        if (int.TryParse(customerCode, out int customerCodeId))
+                        {
+                            if (customer.CustomerCodeId == customerCodeId)
+                            {
+                                ModelState.AddModelError(nameof(viewModel.Invalid),
+                                    _localizer[i18n.Keys.Promenade.CardRenewalInvalidStaff]);
+                                return RedirectToAction(nameof(Index));
+                            }
+                        }
+                        else
                         {
-                            ModelState.AddModelError(nameof(viewModel.Invalid),
-                                _localizer[i18n.Keys.Promenade.CardRenewalInvalidCutoff,
-                                    cutoffDays,
-                                    renewalAllowedDate.ToShortDateString()]);
-                            return RedirectToAction(nameof(Index));
+                            _logger.LogError($"Invalid staff customer code id '{customerCode}'");
                         }
                     }
+                }
 
-                    // TODO
-                    // Check patron code for staff ids
-
-                    // TODO
-                    // Check patron code for non resident
-
-                    // TODO?
-                    // Check patron code for juvenile restricted
+                // Handle accounts belonging to nonresidents 
+                var nonresidentCustomerCodes = await _siteSettingService.GetSettingStringAsync(
+                    Models.Keys.SiteSetting.CardRenewal.NonresidentCustomerCodes);
+                if (!string.IsNullOrWhiteSpace(nonresidentCustomerCodes))
+                {
+                    var customerCodeList = nonresidentCustomerCodes
+                        .Split(",", StringSplitOptions.RemoveEmptyEntries
+                            | StringSplitOptions.TrimEntries)
+                        .ToList();
 
-                    var patronData = _polarisHelper.GetPatronData(barcode, password);
+                    foreach (var customerCode in customerCodeList)
+                    {
+                        if (int.TryParse(customerCode, out int customerCodeId))
+                        {
+                            if (customer.CustomerCodeId == customerCodeId)
+                            {
+                                var nonresidentSegmentId = await _siteSettingService
+                                    .GetSettingIntAsync(Models.Keys.SiteSetting.CardRenewal
+                                        .NonresidentSegment);
+                                if (nonresidentSegmentId <= 0)
+                                {
+                                    _logger.LogError("'Nonresident' segment not set for card renewal");
+                                }
 
-                    IEnumerable<PatronAddress> addresses = patronData.PatronAddresses;
+                                TempData[TempDataUnableToRenew] = nonresidentSegmentId;
 
-                    var acceptedCounties = await _siteSettingService
-                        .GetSettingStringAsync(Models.Keys.SiteSetting.Card.AcceptedCounties);
-                    if (!string.IsNullOrWhiteSpace(acceptedCounties))
-                    {
-                        var counties = acceptedCounties.Split(",",
-                            StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);
-                        addresses = addresses.Where(_ => counties.Contains(_.County,
-                            StringComparer.OrdinalIgnoreCase));
+                                return RedirectToAction(nameof(UnableToRenew));
+                            }
+                        }
+                        else
+                        {
+                            _logger.LogError($"Invalid nonresident customer code id '{customerCode}'");
+                        }
                     }
-                    addresses = addresses
-                        .DistinctBy(_ => new { _.StreetOne, _.StreetTwo, _.City, _.PostalCode });
-
-                    var request = new CardRenewalRequest
-                    {
-                        Barcode = barcode,
-                        PatronId = patronData.PatronID
-                    };
+                }
 
-                    TempData[TempDataAddresses] = JsonSerializer.Serialize(addresses);
-                    TempData[TempDataEmail] = patronData.EmailAddress;
-                    TempData[TempDataRequest] = JsonSerializer.Serialize(request);
+                // Handle accounts that have aged out of their code
+                var ageCheckCustomerCodes = await _siteSettingService.GetSettingStringAsync(
+                    Models.Keys.SiteSetting.CardRenewal.AgeCheckCustomerCodes);
+                if (!string.IsNullOrWhiteSpace(ageCheckCustomerCodes))
+                {
+                    var customerCodeList = ageCheckCustomerCodes
+                        .Split(",", StringSplitOptions.RemoveEmptyEntries
+                            | StringSplitOptions.TrimEntries)
+                        .ToList();
 
-                    var juvenilePatronCodes = await _siteSettingService
-                        .GetSettingStringAsync(Models.Keys.SiteSetting.Card.JuvenilePatronCodes,true);
-                    if (!string.IsNullOrWhiteSpace(juvenilePatronCodes))
+                    foreach (var customerCode in customerCodeList)
                     {
-                        var patronCodeList = juvenilePatronCodes
-                            .Split(",", StringSplitOptions.RemoveEmptyEntries
-                                | StringSplitOptions.TrimEntries)
-                            .ToList();
-
-                        foreach (var patronCode in patronCodeList)
+                        if (int.TryParse(customerCode, out int customerCodeId))
                         {
-                            int patronCodeId;
-
-                            if (int.TryParse(patronCode, out patronCodeId))
+                            if (customer.CustomerCodeId == customerCodeId)
                             {
-                                if (patronValidateResult.PatronCodeID == patronCodeId)
+                                if (customer.BirthDate.HasValue
+                                    && customer.BirthDate.Value != DateTime.MinValue)
                                 {
-                                    TempData[TempDataJuvenile] = true;
-                                    return RedirectToAction(nameof(Juvenile));
+                                    DateTime today = DateTime.Today;
+                                    var age = today.Year - customer.BirthDate.Value.Year;
+                                    if (customer.BirthDate.Value > today.AddYears(-age))
+                                    {
+                                        age--;
+                                    }
+
+                                    if (age >= AgeOfMajority)
+                                    {
+                                        var ageCheckSegmentId = await _siteSettingService
+                                            .GetSettingIntAsync(Models.Keys.SiteSetting.CardRenewal
+                                                .AgeCheckSegment);
+                                        if (ageCheckSegmentId <= 0)
+                                        {
+                                            _logger.LogError("'Age check' segment not set for card renewal");
+                                        }
+
+                                        TempData[TempDataUnableToRenew] = ageCheckSegmentId;
+
+                                        return RedirectToAction(nameof(UnableToRenew));
+                                    }
                                 }
+
+                                break;
                             }
-                            else
-                            {
-                                _logger.LogError($"Invalid juvenile patron code id '{patronCode}'");
-                            }
+                        }
+                        else
+                        {
+                            _logger.LogError($"Invalid age check customer code id '{customerCode}'");
                         }
                     }
+                }
 
-                    // TODO
-                    // Check for unpaid fines
+                IEnumerable<CustomerAddress> addresses = customer.Addresses;
 
-                    // TODO
-                    // Check for juvenile turned adult
+                var acceptedCounties = await _siteSettingService
+                    .GetSettingStringAsync(Models.Keys.SiteSetting.CardRenewal.AcceptedCounties);
+                if (!string.IsNullOrWhiteSpace(acceptedCounties))
+                {
+                    var counties = acceptedCounties.Split(",",
+                        StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);
+                    addresses = addresses.Where(_ => counties.Contains(_.County,
+                        StringComparer.OrdinalIgnoreCase));
+                }
+                addresses = addresses
+                    .DistinctBy(_ => new
+                    {
+                        _.StreetAddressOne,
+                        _.StreetAddressTwo,
+                        _.City,
+                        _.PostalCode
+                    });
 
-                    // TODO?
-                    // Check for student turned adult
+                var request = new CardRenewalRequest
+                {
+                    Addresses = addresses,
+                    Barcode = barcode,
+                    CustomerId = customer.Id,
+                    Email = customer.EmailAddress?.Trim()
+                };
+
+                var juvenileCustomerCodes = await _siteSettingService.GetSettingStringAsync(
+                    Models.Keys.SiteSetting.CardRenewal.JuvenileCustomerCodes);
+                if (!string.IsNullOrWhiteSpace(juvenileCustomerCodes))
+                {
+                    var customerCodeList = juvenileCustomerCodes
+                        .Split(",", StringSplitOptions.RemoveEmptyEntries
+                            | StringSplitOptions.TrimEntries)
+                        .ToList();
 
+                    foreach (var customerCode in customerCodeList)
+                    {
+                        if (int.TryParse(customerCode, out int customerCodeId))
+                        {
+                            if (customer.CustomerCodeId == customerCodeId)
+                            {
+                                request.IsJuvenile = true;
+                                break;
+                            }
+                        }
+                        else
+                        {
+                            _logger.LogError($"Invalid juvenile customer code id '{customerCode}'");
+                        }
+                    }
+                }
 
+                TempData[TempDataRequest] = JsonSerializer.Serialize(request);
 
-                    return RedirectToAction(nameof(VerifyAddress));
+                if (request.IsJuvenile)
+                {
+                    return RedirectToAction(nameof(Juvenile));
                 }
+
+                return RedirectToAction(nameof(VerifyAddress));
             }
             return RedirectToAction(nameof(Index));
         }
 
         [HttpGet("[action]")]
         [RestoreModelState]
-        public IActionResult Juvenile()
+        public async Task<IActionResult> Juvenile()
         {
-            if (!TempData.ContainsKey(TempDataJuvenile))
+            if (!TempData.ContainsKey(TempDataRequest) || !_polarisHelper.IsConfigured)
             {
+                if (!TempData.ContainsKey(TempDataRequest))
+                {
+                    TempData[TempDataTimeout] = true;
+                }
                 return RedirectToAction(nameof(Index));
             }
 
-            return View();
+            var request = JsonSerializer.Deserialize<CardRenewalRequest>(
+                (string)TempData.Peek(TempDataRequest));
+
+            if (!request.IsJuvenile)
+            {
+                return RedirectToAction(nameof(VerifyAddress));
+            }
+
+            var forceReload = HttpContext.Items[ItemKey.ForceReload] as bool? ?? false;
+
+            var viewModel = new JuvenileViewModel();
+
+            var segmentId = await _siteSettingService.GetSettingIntAsync(
+                Models.Keys.SiteSetting.CardRenewal.JuvenileSegment,
+                forceReload);
+
+            if (segmentId > 0)
+            {
+                viewModel.SegmentText = await _segmentService.GetSegmentTextBySegmentIdAsync(
+                    segmentId,
+                    forceReload);
+                if (viewModel.SegmentText == null)
+                {
+                    _logger.LogError($"Card renewal 'Juvenile' segment id '{segmentId}' not found");
+                }
+                else if (!string.IsNullOrWhiteSpace(viewModel.SegmentText.Text))
+                {
+                    viewModel.SegmentText.Text = CommonMarkConverter.Convert(
+                        viewModel.SegmentText.Text);
+                }
+            }
+
+            return View(viewModel);
         }
 
         [HttpPost("[action]")]
@@ -225,20 +417,28 @@ public IActionResult Juvenile(JuvenileViewModel viewModel)
         {
             ArgumentNullException.ThrowIfNull(viewModel);
 
-            if (!TempData.ContainsKey(TempDataJuvenile))
+            if (!TempData.ContainsKey(TempDataRequest) || !_polarisHelper.IsConfigured)
             {
-                TempData[TempDataTimeout] = true;
+                if (!TempData.ContainsKey(TempDataRequest))
+                {
+                    TempData[TempDataTimeout] = true;
+                }
                 return RedirectToAction(nameof(Index));
             }
 
-            if (ModelState.IsValid)
-            {
-                var request = JsonSerializer
-                    .Deserialize<CardRenewalRequest>((string)TempData.Peek(TempDataRequest));
+            var request = JsonSerializer.Deserialize<CardRenewalRequest>(
+                (string)TempData.Peek(TempDataRequest));
 
-                request.GuardianBarcode = viewModel.GuardianBarcode;
-                request.GuardianName = viewModel.GuardianName;
+            if (!request.IsJuvenile)
+            {
+                return RedirectToAction(nameof(VerifyAddress));
+            }
 
+            if (ModelState.IsValid)
+            {
+                request.GuardianBarcode = string.Concat(viewModel.GuardianBarcode
+                    .Where(_ => !char.IsWhiteSpace(_)));
+                request.GuardianName = viewModel.GuardianName.Trim();
                 TempData[TempDataRequest] = JsonSerializer.Serialize(request);
 
                 return RedirectToAction(nameof(VerifyAddress));
@@ -250,62 +450,139 @@ public IActionResult Juvenile(JuvenileViewModel viewModel)
         [HttpGet("[action]")]
         public async Task<IActionResult> Submitted()
         {
-            if (!TempData.ContainsKey(TempDataRequest))
+            if (!_polarisHelper.IsConfigured)
             {
                 return RedirectToAction(nameof(Index));
             }
 
-            var viewModel = new SubmittedViewModel()
+            var forceReload = HttpContext.Items[ItemKey.ForceReload] as bool? ?? false;
+
+            var segmentId = await _siteSettingService.GetSettingIntAsync(
+                Models.Keys.SiteSetting.CardRenewal.SubmittedSegment,
+                forceReload);
+
+            SegmentText segmentText = null;
+            if (segmentId > 0)
             {
-                Request = JsonSerializer
-                    .Deserialize<CardRenewalRequest>((string)TempData.Peek(TempDataRequest))
-            };
+                segmentText = await _segmentService
+                    .GetSegmentTextBySegmentIdAsync(segmentId, forceReload);
+
+                if (segmentText == null)
+                {
+                    _logger.LogError($"Card renewal 'Juvenile' segment id '{segmentId}' not found");
+                }
+                else if (!string.IsNullOrWhiteSpace(segmentText.Text))
+                {
+                    segmentText.Text = CommonMarkConverter.Convert(segmentText.Text);
+                }
+            }
 
-            var submittedSegmentId = await _siteSettingService
-                .GetSettingIntAsync(Models.Keys.SiteSetting.Card.SubmittedSegment);
-            if (submittedSegmentId > 0)
+            return View(segmentText);
+        }
+
+        [HttpGet("[action]")]
+        public async Task<IActionResult> UnableToRenew()
+        {
+            if (!TempData.ContainsKey(TempDataRequest) || !_polarisHelper.IsConfigured)
             {
-                viewModel.SegmentText = await _segmentService
-                    .GetSegmentTextBySegmentIdAsync(submittedSegmentId, false);
+                if (!TempData.ContainsKey(TempDataRequest))
+                {
+                    TempData[TempDataTimeout] = true;
+                }
+                return RedirectToAction(nameof(Index));
             }
 
-            TempData.Remove(TempDataRequest);
+            var segmentId = (int)TempData.Peek(TempDataUnableToRenew);
 
-            return View(viewModel);
+            SegmentText segmentText = null;
+            if (segmentId > 0)
+            {
+                var forceReload = HttpContext.Items[ItemKey.ForceReload] as bool? ?? false;
+
+                segmentText = await _segmentService.GetSegmentTextBySegmentIdAsync(
+                segmentId,
+                forceReload);
+
+                if (segmentText == null)
+                {
+                    _logger.LogError($"Card renewal segment id '{segmentId}' not found for unable to renew response");
+                }
+                else if (!string.IsNullOrWhiteSpace(segmentText.Text))
+                {
+                    segmentText.Text = CommonMarkConverter.Convert(segmentText.Text);
+                }
+            }
+
+            return View(segmentText);
         }
 
         [HttpGet("[action]")]
         [RestoreModelState]
         public async Task<IActionResult> VerifyAddress()
         {
-            if (!TempData.ContainsKey(TempDataRequest))
+            if (!TempData.ContainsKey(TempDataRequest) || !_polarisHelper.IsConfigured)
             {
+                if (!TempData.ContainsKey(TempDataRequest))
+                {
+                    TempData[TempDataTimeout] = true;
+                }
                 return RedirectToAction(nameof(Index));
             }
 
+            var request = JsonSerializer.Deserialize<CardRenewalRequest>(
+                (string)TempData.Peek(TempDataRequest));
+
+            if (request.IsJuvenile && string.IsNullOrWhiteSpace(request.GuardianName))
+            {
+                return RedirectToAction(nameof(Juvenile));
+            }
+
+            var forceReload = HttpContext.Items[ItemKey.ForceReload] as bool? ?? false;
+
             var viewModel = new VerifyAddressViewModel()
             {
-                Addresses = JsonSerializer
-                    .Deserialize<List<PatronAddress>>((string)TempData.Peek(TempDataAddresses)),
-                Email = (string)TempData.Peek(TempDataEmail)
+                Addresses = request.Addresses,
+                Email = request.Email
             };
 
-            var verifyAddressSegmentId = await _siteSettingService
-                .GetSettingIntAsync(Models.Keys.SiteSetting.Card.VerifyAddressSegment);
+            var verifyAddressSegmentId = await _siteSettingService.GetSettingIntAsync(
+                Models.Keys.SiteSetting.CardRenewal.VerifyAddressSegment,
+                forceReload);
             if (verifyAddressSegmentId > 0)
             {
                 viewModel.HeaderSegmentText = await _segmentService
-                    .GetSegmentTextBySegmentIdAsync(verifyAddressSegmentId, false);
+                    .GetSegmentTextBySegmentIdAsync(verifyAddressSegmentId, forceReload);
+
+                if (viewModel.HeaderSegmentText == null)
+                {
+                    _logger.LogError($"Card renewal 'Verify address' segment id '{verifyAddressSegmentId}' not found");
+                }
+                else if (!string.IsNullOrWhiteSpace(viewModel.HeaderSegmentText.Text))
+                {
+                    viewModel.HeaderSegmentText.Text = CommonMarkConverter.Convert(
+                        viewModel.HeaderSegmentText.Text);
+                }
             }
 
-            if (viewModel.Addresses.Count == 0)
+            if (!viewModel.Addresses.Any())
             {
-                var noAddressSegmentId = await _siteSettingService
-                .GetSettingIntAsync(Models.Keys.SiteSetting.Card.NoAddressSegment);
+                var noAddressSegmentId = await _siteSettingService.GetSettingIntAsync(
+                    Models.Keys.SiteSetting.CardRenewal.NoAddressSegment,
+                    forceReload);
                 if (noAddressSegmentId > 0)
                 {
                     viewModel.NoAddressSegmentText = await _segmentService
-                        .GetSegmentTextBySegmentIdAsync(noAddressSegmentId, false);
+                        .GetSegmentTextBySegmentIdAsync(noAddressSegmentId, forceReload);
+
+                    if (viewModel.NoAddressSegmentText == null)
+                    {
+                        _logger.LogError($"Card renewal 'No address' segment id '{noAddressSegmentId}' not found");
+                    }
+                    else if (!string.IsNullOrWhiteSpace(viewModel.NoAddressSegmentText.Text))
+                    {
+                        viewModel.NoAddressSegmentText.Text = CommonMarkConverter.Convert(
+                            viewModel.NoAddressSegmentText.Text);
+                    }
                 }
             }
 
@@ -318,32 +595,35 @@ public async Task<IActionResult> VerifyAddress(VerifyAddressViewModel viewModel)
         {
             ArgumentNullException.ThrowIfNull(viewModel);
 
-            if (!TempData.ContainsKey(TempDataRequest))
+            if (!TempData.ContainsKey(TempDataRequest) || !_polarisHelper.IsConfigured)
             {
-                TempData[TempDataTimeout] = true;
+                if (!TempData.ContainsKey(TempDataRequest))
+                {
+                    TempData[TempDataTimeout] = true;
+                }
                 return RedirectToAction(nameof(Index));
             }
 
-            if (ModelState.IsValid)
+            var request = JsonSerializer.Deserialize<CardRenewalRequest>(
+                (string)TempData.Peek(TempDataRequest));
+
+            if (request.IsJuvenile && string.IsNullOrWhiteSpace(request.GuardianName))
             {
-                var request = JsonSerializer
-                    .Deserialize<CardRenewalRequest>((string)TempData.Peek(TempDataRequest));
+                return RedirectToAction(nameof(Juvenile));
+            }
 
+            if (ModelState.IsValid)
+            {
                 request.Email = viewModel.Email.Trim();
 
-                if (viewModel.SameAddress)
+                if (viewModel.SameAddress && request.Addresses.Any())
                 {
-                    var addresses = JsonSerializer
-                        .Deserialize<List<PatronAddress>>((string)TempData.Peek(TempDataAddresses));
-                    if (addresses.Count > 0)
-                    {
-                        request.SameAddress = true;
-                    }
+                    request.SameAddress = true;
                 }
+
                 await _cardRenewalService.CreateRequestAsync(request);
 
-                TempData.Remove(TempDataAddresses);
-                TempData.Remove(TempDataEmail);
+                TempData.Remove(TempDataRequest);
 
                 return RedirectToAction(nameof(Submitted));
             }
diff --git a/src/Promenade.Controllers/ViewModels/CardRenewal/JuvenileViewModel.cs b/src/Promenade.Controllers/ViewModels/CardRenewal/JuvenileViewModel.cs
index bcda0c03e..5778f571d 100644
--- a/src/Promenade.Controllers/ViewModels/CardRenewal/JuvenileViewModel.cs
+++ b/src/Promenade.Controllers/ViewModels/CardRenewal/JuvenileViewModel.cs
@@ -14,5 +14,7 @@ public class JuvenileViewModel
         [Required(ErrorMessage = ErrorMessage.FieldRequired)]
         [DisplayName(i18n.Keys.Promenade.PromptGuardianName)]
         public string GuardianName { get; set; }
+
+        public SegmentText SegmentText { get; set; }
     }
 }
diff --git a/src/Promenade.Controllers/ViewModels/CardRenewal/SubmittedViewModel.cs b/src/Promenade.Controllers/ViewModels/CardRenewal/SubmittedViewModel.cs
deleted file mode 100644
index 306fad662..000000000
--- a/src/Promenade.Controllers/ViewModels/CardRenewal/SubmittedViewModel.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using Ocuda.Promenade.Models.Entities;
-
-namespace Ocuda.Promenade.Controllers.ViewModels.CardRenewal
-{
-    public class SubmittedViewModel
-    {
-        public CardRenewalRequest Request { get; set; }
-        public SegmentText SegmentText { get; set; }
-    }
-}
diff --git a/src/Promenade.Controllers/ViewModels/CardRenewal/VerifyAddressViewModel.cs b/src/Promenade.Controllers/ViewModels/CardRenewal/VerifyAddressViewModel.cs
index 97c49d3c8..dce62ce02 100644
--- a/src/Promenade.Controllers/ViewModels/CardRenewal/VerifyAddressViewModel.cs
+++ b/src/Promenade.Controllers/ViewModels/CardRenewal/VerifyAddressViewModel.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
-using Clc.Polaris.Api.Models;
+using Ocuda.Models;
 using Ocuda.Promenade.Models.Entities;
 using Ocuda.Utility;
 
@@ -9,7 +9,7 @@ namespace Ocuda.Promenade.Controllers.ViewModels.CardRenewal
 {
     public class VerifyAddressViewModel
     {
-        public List<PatronAddress> Addresses { get; set; }
+        public IEnumerable<CustomerAddress> Addresses { get; set; }
 
         [Required(ErrorMessage = ErrorMessage.FieldRequired)]
         [DisplayName(i18n.Keys.Promenade.PromptEmail)]
diff --git a/src/Promenade.Data/Promenade/CardRenewalRequestRepository.cs b/src/Promenade.Data/Promenade/CardRenewalRequestRepository.cs
index 23b4b569d..8c252b41e 100644
--- a/src/Promenade.Data/Promenade/CardRenewalRequestRepository.cs
+++ b/src/Promenade.Data/Promenade/CardRenewalRequestRepository.cs
@@ -22,11 +22,11 @@ public async Task AddSaveAsync(CardRenewalRequest request)
             await _context.SaveChangesAsync();
         }
 
-        public async Task<CardRenewalRequest> GetPendingRequestAsync(int patronId)
+        public async Task<CardRenewalRequest> GetPendingRequestAsync(int customerId)
         {
             return await DbSet
                 .AsNoTracking()
-                .Where(_ => _.PatronId == patronId && !_.IsDiscarded && !_.ProcessedAt.HasValue)
+                .Where(_ => _.CustomerId == customerId && !_.IsDiscarded && !_.ProcessedAt.HasValue)
                 .OrderByDescending(_ => _.SubmittedAt)
                 .FirstOrDefaultAsync();
         }
diff --git a/src/Promenade.Models/Defaults/SiteSetting.cs b/src/Promenade.Models/Defaults/SiteSetting.cs
index 8ad080f57..a15919200 100644
--- a/src/Promenade.Models/Defaults/SiteSetting.cs
+++ b/src/Promenade.Models/Defaults/SiteSetting.cs
@@ -9,23 +9,7 @@ public static class SiteSettings
         public static IEnumerable<SiteSetting> Get { get; } = new[]
         {
             #region Card
-            new SiteSetting
-            {
-                Category = nameof(Keys.SiteSetting.Card),
-                Description = "Accepted counties for card renewal addresses, comma delimited",
-                Id = Keys.SiteSetting.Card.AcceptedCounties,
-                Name = "Accepted counties",
-                Type = SiteSettingType.StringNullable
-            },
-            new SiteSetting 
-            {
-                Category = nameof(Keys.SiteSetting.Card),
-                Description = "Segment to show on the card renewal page",
-                Id = Keys.SiteSetting.Card.CardRenewalSegment,
-                Name = "Card renewal segment",
-                Type = SiteSettingType.Int,
-                Value = "-1"
-            },
+
             new SiteSetting 
             {
                 Category = nameof(Keys.SiteSetting.Card),
@@ -44,59 +28,135 @@ public static class SiteSettings
                 Type = SiteSettingType.Int,
                 Value = "-1"
             },
+
+            #endregion Card
+
+            #region CardRenewal
+
             new SiteSetting
             {
-                Category = nameof(Keys.SiteSetting.Card),
+                Category = nameof(Keys.SiteSetting.CardRenewal),
+                Description = "Accepted counties for card renewal addresses, comma delimited",
+                Id = Keys.SiteSetting.CardRenewal.AcceptedCounties,
+                Name = "Accepted counties",
+                Type = SiteSettingType.StringNullable
+            },
+            new SiteSetting
+            {
+                Category = nameof(Keys.SiteSetting.CardRenewal),
+                Description = "Customer codes ids to check for becoming 18 years old, comma delimited",
+                Id = Keys.SiteSetting.CardRenewal.AgeCheckCustomerCodes,
+                Name = "Age check customer codes",
+                Type = SiteSettingType.StringNullable
+            },
+            new SiteSetting
+            {
+                Category = nameof (Keys.SiteSetting.CardRenewal),
+                Description = "Segment to show to age check customers who have become 18",
+                Id = Keys.SiteSetting.CardRenewal.AgeCheckSegment,
+                Name = "Age check segment",
+                Type = SiteSettingType.Int,
+                Value = "-1"
+            },
+            new SiteSetting
+            {
+                Category = nameof(Keys.SiteSetting.CardRenewal),
                 Description = "Number of days before a cards expiration that it's eligible for online renewal",
-                Id = Keys.SiteSetting.Card.ExpirationCutoffDays,
+                Id = Keys.SiteSetting.CardRenewal.ExpirationCutoffDays,
                 Name = "Card renewal expiration cutoff days",
                 Type= SiteSettingType.Int,
                 Value = "-1"
             },
+            
             new SiteSetting
             {
-                Category = nameof(Keys.SiteSetting.Card),
-                Description = "Link for 'Forgot Password' on card renewal page",
-                Id = Keys.SiteSetting.Card.ForgotPasswordLink,
-                Name = "Forgot Password link",
-                Type = SiteSettingType.StringNullable
+                Category = nameof(Keys.SiteSetting.CardRenewal),
+                Description = "Segment to show on the card renewal home page",
+                Id = Keys.SiteSetting.CardRenewal.HomeSegment,
+                Name = "Card renewal segment",
+                Type = SiteSettingType.Int,
+                Value = "-1"
             },
             new SiteSetting
             {
-                Category = nameof(Keys.SiteSetting.Card),
-                Description = "Juvenile patron code ids, comma delimited",
-                Id = Keys.SiteSetting.Card.JuvenilePatronCodes,
-                Name = "Juvenile patron codes",
+                Category = nameof(Keys.SiteSetting.CardRenewal),
+                Description = "Juvenile customer code ids, comma delimited",
+                Id = Keys.SiteSetting.CardRenewal.JuvenileCustomerCodes,
+                Name = "Juvenile customer codes",
                 Type = SiteSettingType.StringNullable
             },
             new SiteSetting
             {
-                Category = nameof(Keys.SiteSetting.Card),
+                Category = nameof(Keys.SiteSetting.CardRenewal),
+                Description = "Segment to show on the juvenile page",
+                Id = Keys.SiteSetting.CardRenewal.JuvenileSegment,
+                Name = "Juvenile segment",
+                Type = SiteSettingType.Int,
+                Value = "-1"
+            },
+            new SiteSetting
+            {
+                Category = nameof(Keys.SiteSetting.CardRenewal),
                 Description = "Segment to show on the verify address page when there's no valid addresses",
-                Id = Keys.SiteSetting.Card.NoAddressSegment,
+                Id = Keys.SiteSetting.CardRenewal.NoAddressSegment,
                 Name = "No address segment",
                 Type = SiteSettingType.Int,
                 Value = "-1"
             },
             new SiteSetting
             {
-                Category = nameof(Keys.SiteSetting.Card),
-                Description = "Segment to show on the verify address page header",
-                Id = Keys.SiteSetting.Card.SubmittedSegment,
-                Name = "Submitted segment",
+                Category = nameof(Keys.SiteSetting.CardRenewal),
+                Description = "Nonresident customer code ids, comma delimited",
+                Id = Keys.SiteSetting.CardRenewal.NonresidentCustomerCodes,
+                Name = "Nonresident customer codes",
+                Type = SiteSettingType.StringNullable
+            },
+            new SiteSetting
+            {
+                Category = nameof(Keys.SiteSetting.CardRenewal),
+                Description = "Segment to show when a customer can't renew their card due to being a nonresident",
+                Id = Keys.SiteSetting.CardRenewal.NonresidentSegment,
+                Name = "Nonresident segment",
                 Type = SiteSettingType.Int,
                 Value = "-1"
             },
-            new SiteSetting 
+            new SiteSetting
             {
-                Category = nameof(Keys.SiteSetting.Card),
+                Category = nameof(Keys.SiteSetting.CardRenewal),
+                Description = "Segment to show when api settings aren't configured",
+                Id = Keys.SiteSetting.CardRenewal.NotConfiguredSegment,
+                Name = "Not configured segment",
+                Type = SiteSettingType.Int,
+                Value = "-1"
+            },
+            new SiteSetting
+            {
+                Category = nameof(Keys.SiteSetting.CardRenewal),
+                Description = "Staff customer code ids, comma delimited",
+                Id = Keys.SiteSetting.CardRenewal.StaffCustomerCodes,
+                Name = "Staff customer codes",
+                Type = SiteSettingType.StringNullable
+            },
+            new SiteSetting
+            {
+                Category = nameof(Keys.SiteSetting.CardRenewal),
                 Description = "Segment to show on the submitted page",
-                Id = Keys.SiteSetting.Card.VerifyAddressSegment,
+                Id = Keys.SiteSetting.CardRenewal.SubmittedSegment,
+                Name = "Submitted segment",
+                Type = SiteSettingType.Int,
+                Value = "-1"
+            },
+            new SiteSetting
+            {
+                Category = nameof(Keys.SiteSetting.CardRenewal),
+                Description = "Segment to show on the verify address page",
+                Id = Keys.SiteSetting.CardRenewal.VerifyAddressSegment,
                 Name = "Verify address segment",
                 Type = SiteSettingType.Int,
                 Value = "-1"
             },
-            #endregion
+
+            #endregion CardRenewal
 
             #region Contact
 
@@ -246,6 +306,14 @@ public static class SiteSettings
                 Id = Keys.SiteSetting.Site.FooterImageAlt,
                 Name = "Footer Image Alt",
                 Type = SiteSettingType.StringNullable
+            },
+            new SiteSetting
+            {
+                Category = nameof(Keys.SiteSetting.Site),
+                Description = "Link to the forgot password page",
+                Id = Keys.SiteSetting.Site.ForgotPasswordLink,
+                Name = "Forgot Password link",
+                Type = SiteSettingType.StringNullable
             },
              new SiteSetting
             {
diff --git a/src/Promenade.Models/Entities/CardRenewalRequest.cs b/src/Promenade.Models/Entities/CardRenewalRequest.cs
index cc755dcd9..3c04be0ed 100644
--- a/src/Promenade.Models/Entities/CardRenewalRequest.cs
+++ b/src/Promenade.Models/Entities/CardRenewalRequest.cs
@@ -1,13 +1,24 @@
 using System;
+using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using Ocuda.Models;
 
 namespace Ocuda.Promenade.Models.Entities
 {
     public class CardRenewalRequest
     {
+        [NotMapped]
+        public bool Accepted { get; set; }
+
+        [NotMapped]
+        public IEnumerable<CustomerAddress> Addresses { get; set; }
+
         [Required]
         public string Barcode { get; set; }
 
+        public int CustomerId { get; set; }
+
         [Required]
         public string Email { get; set; }
 
@@ -20,11 +31,13 @@ public class CardRenewalRequest
 
         public bool IsDiscarded { get; set; }
 
+        [NotMapped]
+        public bool IsJuvenile { get; set; }
+
         public int LanguageId { get; set; }
         public Language Language { get; set; }
 
-        public int PatronId { get; set; }
-        public DateTime? ProcessedAt {get;set;}
+        public DateTime? ProcessedAt { get; set; }
         public bool SameAddress { get; set; }
         public DateTime SubmittedAt { get; set; }
     }
diff --git a/src/Promenade.Models/Keys/SiteSetting.cs b/src/Promenade.Models/Keys/SiteSetting.cs
index ca7beb6b2..be5580632 100644
--- a/src/Promenade.Models/Keys/SiteSetting.cs
+++ b/src/Promenade.Models/Keys/SiteSetting.cs
@@ -7,17 +7,30 @@ namespace SiteSetting
             Justification = "No reason to compare these site setting keys")]
         public struct Card
         {
-            public const string AcceptedCounties = "Card.AcceptedCounties";
-            public const string CardRenewalSegment = "Card.CardRenewalSegment";
             public const string EmployeeCardSegment = "Card.EmployeeCardSegment";
             public const string EmployeeCardThanksPage 
                 = "Card.EmployeeCardThanksPage";
-            public const string ExpirationCutoffDays = "Card.ExpirationCutoffDays";
-            public const string ForgotPasswordLink = "Card.ForgotPasswordLink";
-            public const string JuvenilePatronCodes = "Card.JuvenilePatronCodes";
-            public const string NoAddressSegment = "Card.NoAddressSegment";
-            public const string SubmittedSegment = "Card.SubmittedSegment";
-            public const string VerifyAddressSegment = "Card.VerifyAddressSegment";
+        }
+
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Performance",
+            "CA1815:Override equals and operator equals on value types",
+            Justification = "No reason to compare these site setting keys")]
+        public struct CardRenewal
+        {
+            public const string AcceptedCounties = "CardRenewal.AcceptedCounties";
+            public const string AgeCheckCustomerCodes = "CardRenewal.AgeCheckCustomerCodes";
+            public const string AgeCheckSegment = "CardRenewal.AgeCheckSegment";
+            public const string HomeSegment = "CardRenewal.HomeSegment";
+            public const string ExpirationCutoffDays = "CardRenewal.ExpirationCutoffDays";
+            public const string JuvenileCustomerCodes = "CardRenewal.JuvenileCustomerCodes";
+            public const string JuvenileSegment = "CardRenewal.JuvenileSegment";
+            public const string NoAddressSegment = "CardRenewal.NoAddressSegment";
+            public const string NonresidentCustomerCodes = "CardRenewal.NonresidentCustomerCodes";
+            public const string NonresidentSegment = "CardRenewal.NonresidentSegment";
+            public const string NotConfiguredSegment = "CardRenewal.NotConfiguredSegment";
+            public const string StaffCustomerCodes = "CardRenewal.StaffCustomerCodes";
+            public const string SubmittedSegment = "CardRenewal.SubmittedSegment";
+            public const string VerifyAddressSegment = "CardRenewal.VerifyAddressSegment";
         }
 
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Performance",
@@ -55,6 +68,7 @@ public struct Site
             public const string CatalogSearchLink = "Site.CatalogSearchLink";
             public const string FooterImage = "Site.FooterImage";
             public const string FooterImageAlt = "Site.FooterImageAlt";
+            public const string ForgotPasswordLink = "Site.ForgotPasswordLink";
             public const string GoogleTrackingCode = "Site.GoogleTrackingCode";
             public const string IsTLS = "Site.IsTLS";
             public const string NavigationIdFooter = "Site.NavigationIdFooter";
diff --git a/src/Promenade.Models/Promenade.Models.csproj b/src/Promenade.Models/Promenade.Models.csproj
index c4c2fef3c..8a26d89eb 100644
--- a/src/Promenade.Models/Promenade.Models.csproj
+++ b/src/Promenade.Models/Promenade.Models.csproj
@@ -19,6 +19,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\Models\Models.csproj" />
     <ProjectReference Include="..\Utility\Utility.csproj" />
   </ItemGroup>
 
diff --git a/src/Promenade.Service/CardRenewalService.cs b/src/Promenade.Service/CardRenewalService.cs
index 4eedb6a6c..ee1cc077b 100644
--- a/src/Promenade.Service/CardRenewalService.cs
+++ b/src/Promenade.Service/CardRenewalService.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Globalization;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 using Ocuda.Promenade.Models.Entities;
@@ -11,28 +12,34 @@ namespace Ocuda.Promenade.Service
     public class CardRenewalService : BaseService<CardRenewalService>
     {
         private ICardRenewalRequestRepository _cardRenewalRequestRepository;
+        private LanguageService _languageService;
 
         public CardRenewalService(ILogger<CardRenewalService> logger,
             IDateTimeProvider dateTimeProvider,
-            ICardRenewalRequestRepository cardRenewalRequestRepository)
+            ICardRenewalRequestRepository cardRenewalRequestRepository,
+            LanguageService languageService)
             : base(logger, dateTimeProvider)
         {
             ArgumentNullException.ThrowIfNull(cardRenewalRequestRepository);
+            ArgumentNullException.ThrowIfNull(languageService);
 
             _cardRenewalRequestRepository = cardRenewalRequestRepository;
+            _languageService = languageService;
         }
 
         public async Task CreateRequestAsync(CardRenewalRequest request)
         {
             ArgumentNullException.ThrowIfNull(request);
 
+            request.LanguageId = await _languageService.GetLanguageIdAsync(
+                CultureInfo.CurrentCulture.Name);
             request.SubmittedAt = _dateTimeProvider.Now;
             await _cardRenewalRequestRepository.AddSaveAsync(request);
         }
 
-        public async Task<CardRenewalRequest> GetPendingRequestAsync(int patronId)
+        public async Task<CardRenewalRequest> GetPendingRequestAsync(int customerId)
         {
-            return await _cardRenewalRequestRepository.GetPendingRequestAsync(patronId);
+            return await _cardRenewalRequestRepository.GetPendingRequestAsync(customerId);
         }
     }
 }
diff --git a/src/Promenade.Service/Interfaces/Repositories/ICardRenewalRequestRepository.cs b/src/Promenade.Service/Interfaces/Repositories/ICardRenewalRequestRepository.cs
index bba1b865e..c818e1b8a 100644
--- a/src/Promenade.Service/Interfaces/Repositories/ICardRenewalRequestRepository.cs
+++ b/src/Promenade.Service/Interfaces/Repositories/ICardRenewalRequestRepository.cs
@@ -6,6 +6,6 @@ namespace Ocuda.Promenade.Service.Interfaces.Repositories
     public interface ICardRenewalRequestRepository : IGenericRepository<CardRenewalRequest>
     {
         Task AddSaveAsync(CardRenewalRequest request);
-        Task<CardRenewalRequest> GetPendingRequestAsync(int patronId);
+        Task<CardRenewalRequest> GetPendingRequestAsync(int customerId);
     }
 }
diff --git a/src/Promenade.Web/Startup.cs b/src/Promenade.Web/Startup.cs
index 1b5faf740..5aa9d8df0 100644
--- a/src/Promenade.Web/Startup.cs
+++ b/src/Promenade.Web/Startup.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Linq;
-using Clc.Polaris.Api.Configuration;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.DataProtection;
 using Microsoft.AspNetCore.Hosting;
@@ -375,8 +374,6 @@ string cacheDiscriminator
                 _.LowercaseUrls = true;
             });
 
-            services.Configure<PapiSettings>(_config.GetSection(PapiSettings.SECTION_NAME));
-
             // service facades
             services.AddScoped(typeof(Controllers.ServiceFacades.Controller<>));
             services.AddScoped(typeof(Controllers.ServiceFacades.PageController));
diff --git a/src/Promenade.Web/Views/CardRenewal/Index.cshtml b/src/Promenade.Web/Views/CardRenewal/Index.cshtml
index fea16e84a..d9b3936fe 100644
--- a/src/Promenade.Web/Views/CardRenewal/Index.cshtml
+++ b/src/Promenade.Web/Views/CardRenewal/Index.cshtml
@@ -6,14 +6,11 @@
 	{
 		<h1 class="prom-title">@Model.SegmentText.Header</h1>
 	}
-	if (!string.IsNullOrEmpty(Model.SegmentText.Text))
-	{
-		<div class="mb-3">@Html.Raw(Model.SegmentText.Text)</div>
-	}
+	@Html.Raw(Model.SegmentText.Text)
 }
 else
 {
-	<h1 class="prom-title">@Localizer[Promenade.RenewYourCard]</h1>
+	<h1 class="prom-title">@Localizer[Promenade.RenewYourLibraryCard]</h1>
 }
 
 @if (ViewData.ModelState[nameof(Model.Invalid)]?.ValidationState
@@ -48,7 +45,7 @@ else
 					@if (!string.IsNullOrWhiteSpace(Model.ForgotPasswordLink))
 					{
 						<div>
-							<a href="@Model.ForgotPasswordLink" target="_blank">@Localizer[Promenade.RenewCardForgotPassword]</a>
+							<a href="@Model.ForgotPasswordLink" target="_blank">@Localizer[Promenade.ForgotPassword]</a>
 						</div>
 					}
 				</div>
diff --git a/src/Promenade.Web/Views/CardRenewal/Juvenile.cshtml b/src/Promenade.Web/Views/CardRenewal/Juvenile.cshtml
index 810a1f08a..7728a6eea 100644
--- a/src/Promenade.Web/Views/CardRenewal/Juvenile.cshtml
+++ b/src/Promenade.Web/Views/CardRenewal/Juvenile.cshtml
@@ -1,5 +1,19 @@
 @model Ocuda.Promenade.Controllers.ViewModels.CardRenewal.JuvenileViewModel
 
+@if (Model?.SegmentText != null)
+{
+	if (!string.IsNullOrEmpty(Model.SegmentText.Header))
+	{
+		<h1 class="prom-title">@Model.SegmentText.Header</h1>
+	}
+	@Html.Raw(Model.SegmentText.Text)
+}
+else
+{
+	<h1 class="prom-title">@Localizer[Promenade.RenewYourLibraryCard]</h1>
+	<p>@Localizer[Promenade.CardRenewalJuvenile]</p>
+}
+
 <div class="row">
 	<div class="col-12">
 		<form method="post"
diff --git a/src/Promenade.Web/Views/CardRenewal/NotConfigured.cshtml b/src/Promenade.Web/Views/CardRenewal/NotConfigured.cshtml
new file mode 100644
index 000000000..719f23c95
--- /dev/null
+++ b/src/Promenade.Web/Views/CardRenewal/NotConfigured.cshtml
@@ -0,0 +1,14 @@
+@model Ocuda.Promenade.Models.Entities.SegmentText
+@if (Model != null)
+{
+	if (!string.IsNullOrEmpty(Model.Header))
+	{
+		<h1 class="prom-title">@Model.Header</h1>
+	}
+	@Html.Raw(Model.Text)
+}
+else
+{
+	<h1 class="prom-title">@Localizer[Promenade.RenewYourLibraryCard]</h1>
+	<p>@HtmlLocalizer[Promenade.CardRenewalNotConfigured, Url.Action(nameof(LocationsController.Find), LocationsController.Name)]</p>
+}
diff --git a/src/Promenade.Web/Views/CardRenewal/Submitted.cshtml b/src/Promenade.Web/Views/CardRenewal/Submitted.cshtml
index 475deba36..d83d71750 100644
--- a/src/Promenade.Web/Views/CardRenewal/Submitted.cshtml
+++ b/src/Promenade.Web/Views/CardRenewal/Submitted.cshtml
@@ -1,14 +1,15 @@
-@model Ocuda.Promenade.Controllers.ViewModels.CardRenewal.SubmittedViewModel
+@model Ocuda.Promenade.Models.Entities.SegmentText
 
-@if (Model?.SegmentText != null)
+@if (Model != null)
 {
-	if (!string.IsNullOrEmpty(Model.SegmentText.Header))
+	if (!string.IsNullOrEmpty(Model.Header))
 	{
-		<h1 class="prom-title">@Model.SegmentText.Header</h1>
+		<h1 class="prom-title">@Model.Header</h1>
 	}
-	@Html.Raw(Model.SegmentText.Text)
+	@Html.Raw(Model.Text)
 }
 else
 {
-	<h1 class="prom-title">@Localizer[Promenade.CardRenewalSubmitted]</h1>
+	<h1 class="prom-title">@Localizer[Promenade.RenewYourLibraryCard]</h1>
+	<p>@Localizer[Promenade.CardRenewalSubmitted]</p>
 }
\ No newline at end of file
diff --git a/src/Promenade.Web/Views/CardRenewal/UnableToRenew.cshtml b/src/Promenade.Web/Views/CardRenewal/UnableToRenew.cshtml
new file mode 100644
index 000000000..c967a470f
--- /dev/null
+++ b/src/Promenade.Web/Views/CardRenewal/UnableToRenew.cshtml
@@ -0,0 +1,14 @@
+@model Ocuda.Promenade.Models.Entities.SegmentText
+@if (Model != null)
+{
+	if (!string.IsNullOrEmpty(Model.Header))
+	{
+		<h1 class="prom-title">@Model.Header</h1>
+	}
+	@Html.Raw(Model.Text)
+}
+else
+{
+	<h1 class="prom-title">@Localizer[Promenade.RenewYourLibraryCard]</h1>
+	<p>@HtmlLocalizer[Promenade.CardRenewalUnableToRenew, Url.Action(nameof(LocationsController.Find), LocationsController.Name)]</p>
+}
diff --git a/src/Promenade.Web/Views/CardRenewal/VerifyAddress.cshtml b/src/Promenade.Web/Views/CardRenewal/VerifyAddress.cshtml
index 0de65b4b4..93fd1e8ab 100644
--- a/src/Promenade.Web/Views/CardRenewal/VerifyAddress.cshtml
+++ b/src/Promenade.Web/Views/CardRenewal/VerifyAddress.cshtml
@@ -6,14 +6,11 @@
 	{
 		<h1 class="prom-title">@Model.HeaderSegmentText.Header</h1>
 	}
-	if (!string.IsNullOrEmpty(Model.HeaderSegmentText.Text))
-	{
-		<div class="mb-3">@Html.Raw(Model.HeaderSegmentText.Text)</div>
-	}
+	@Html.Raw(Model.HeaderSegmentText.Text)
 }
 else
 {
-	<h1 class="prom-title">@Localizer[Promenade.VerifyYourAddress]</h1>
+	<h1 class="prom-title">@Localizer[Promenade.RenewYourLibraryCard]</h1>
 }
 
 <div class="row">
@@ -26,17 +23,17 @@ else
 			<input asp-for="Email" formgroup />
 			<div class="row">
 				<div class="col-md-9 offset-md-3">
-					@if (Model.Addresses.Count > 0)
+					@if (Model.Addresses.Any())
 					{
 						<div class="row fs-6">
 							<strong class="mb-2">@Localizer[Promenade.CardRenewalSameAddress]</strong>
 							@foreach (var address in Model.Addresses)
 							{
 								<div class="form-group mb-3">
-									<div>@address.StreetOne</div>
-									@if (!string.IsNullOrWhiteSpace(address.StreetTwo))
+									<div>@address.StreetAddressOne</div>
+									@if (!string.IsNullOrWhiteSpace(address.StreetAddressTwo))
 									{
-										<div>@address.StreetTwo</div>
+										<div>@address.StreetAddressTwo</div>
 									}
 									<span>@address.City</span>
 									<span>@address.PostalCode</span>
@@ -63,13 +60,13 @@ else
 					}
 					else
 					{
-						@if (Model?.HeaderSegmentText != null)
+						@if (Model?.NoAddressSegmentText != null)
 						{
-							<strong class="fs-6">@Html.Raw(Model.NoAddressSegmentText.Text)</strong>
+							@Html.Raw(Model.NoAddressSegmentText.Text)
 						}
 						else
 						{
-							<strong class="fs-6">@Localizer[Promenade.CardRenewalNoAddress]</strong>
+							<p>@Localizer[Promenade.CardRenewalNoAddress]</p>
 						}
 						<div>
 							<button type="submit"
diff --git a/src/i18n/Keys/Promenade.cs b/src/i18n/Keys/Promenade.cs
index b38150cbd..b65d034f6 100644
--- a/src/i18n/Keys/Promenade.cs
+++ b/src/i18n/Keys/Promenade.cs
@@ -15,12 +15,17 @@ public static class Promenade
         public const string ButtonUseMyLocation = "Use my location";
         public const string CardRenewalInvalidCutoff = "Thanks for your submission! Your card has more than {0} days until it expires, please come back to renew it any time after {1}";
         public const string CardRenewalInvalidLogin = "You have entered an invalid card number or password";
+        public const string CardRenewalInvalidStaff = "It appears that the barcode you've entered belongs to a staff account. Please speak to your branch manager or supervisor for instructions on how to renew your account.";
+        public const string CardRenewalJuvenile = "It looks like you're trying to renew a juvenile account, please have a parent or guardian complete the rest of the process.";
         public const string CardRenewalNoAddress = "With no valid address on file your renewal request may not be eligible for a full renewal.";
+        public const string CardRenewalNotConfigured = "Please contact <a href=\"{0}\">your library</a> to renew your library card.";
+        public const string CardRenewalPendingRequest = "It looks like we are still working on a request you submitted on {0} at {1}. You'll be hearing from us soon.";
         public const string CardRenewalSameAddress = "Do you still live at an address listed below?";
         public const string CardRenewalSameAddressNo = "No, I have moved";
         public const string CardRenewalSameAddressYes = "Yes, this is my address";
         public const string CardRenewalSessionTimeout = "Unfortunately your session has timed out. Please resubmit your barcode and password.";
-        public const string CardRenewalSubmitted = "Renewal request submitted";
+        public const string CardRenewalSubmitted = "Thank you for using our online renewal service!";
+        public const string CardRenewalUnableToRenew = "We are unable to renew your card at this time. Please contact <a href=\"{0}\">your library</a> to renew your library card.";
         public const string ConnectSocialMedia = "Connect with us on social media!";
         public const string ConnectSocialOn = "Connect with us on {0}";
         public const string ContactInformation = "Contact Information";
@@ -52,6 +57,7 @@ public static class Promenade
         public const string ErrorVolunteerNotAcceptingAdult = "This location is not accepting adult volunteer applications at this time.";
         public const string ErrorVolunteerNotAcceptingTeen = "This location is not accepting teen volunteer applications at this time.";
         public const string ErrorZipCode = "Please enter a 5 digit numeric ZIP code.";
+        public const string ForgotPassword = "Forgot your password?";
         public const string HelpItem = "{0} help";
         public const string HowCanWeHelp = "How can we help?";
         public const string KeywordsItem = "Keywords: {0}";
@@ -127,8 +133,7 @@ public static class Promenade
         public const string PromptVolunteerRegularity = "Are you interested in regular volunteer work or certain number of hours?";
         public const string PromptWeeklyAvailability = "Weekly Availability";
         public const string PromptZipCode = "Zip Code";
-        public const string RenewCardForgotPassword = "Forgot your password?";
-        public const string RenewYourCard = "Renew your card";
+        public const string RenewYourLibraryCard = "Renew your library card";
         public const string RequiredField = "You must supply a value for: {0}";
         public const string RequiredFieldItem = "The {0} field is required.";
         public const string ScheduleAppointmentDetails = "Here are the details of your appointment:";
@@ -147,7 +152,6 @@ public static class Promenade
         public const string SignUpForEmailNewsletter = "Sign up for our email newsletter";
         public const string SpecialHours = "Special Hours";
         public const string TodaysHours = "Today's Hours: {0}";
-        public const string VerifyYourAddress = "Verify your address";
         public const string ViewShowNotes = "View show notes";
         public const string VisitHomePage = "Visit home page";
         public const string VolunteerPageTitle = "Volunteer";

From 88c47ac0c2dd48afa02ac0525806e0d0fdbb55bc Mon Sep 17 00:00:00 2001
From: Dan Wilcox <DanielWilcox@mcldaz.org>
Date: Thu, 15 Jan 2026 17:48:46 -0700
Subject: [PATCH 04/13] Fix a11y issues

---
 src/Promenade.Web/Views/CardRenewal/Index.cshtml         | 6 +++---
 src/Promenade.Web/Views/CardRenewal/Juvenile.cshtml      | 4 ++--
 src/Promenade.Web/Views/CardRenewal/VerifyAddress.cshtml | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Promenade.Web/Views/CardRenewal/Index.cshtml b/src/Promenade.Web/Views/CardRenewal/Index.cshtml
index d9b3936fe..61396ea8a 100644
--- a/src/Promenade.Web/Views/CardRenewal/Index.cshtml
+++ b/src/Promenade.Web/Views/CardRenewal/Index.cshtml
@@ -20,7 +20,7 @@ else
 		<div class="col-12 col-md-6 offset-md-3">
 			<div class="alert alert-danger d-flex">
 				<span class="fa fa-2x fa-exclamation-triangle me-2" aria-hidden="true"></span>
-				<span asp-validation-for="Invalid" class="text-danger fw-bold fs-6"> </span>
+				<span asp-validation-for="Invalid" class="fw-bold fs-6"> </span>
 			</div>
 		</div>
 	</div>
@@ -33,14 +33,14 @@ else
 			  asp-controller="@CardRenewalController.Name"
 			  asp-action="@nameof(CardRenewalController.Index)"
 			  asp-route-culture="">
-			<input asp-for="Barcode" type="text" formgroup />
+			<input asp-for="Barcode" type="text" formgroup autocomplete="off" />
 			<div class="row mb-3">
 				<label asp-for="Password" class="col-form-label text-md-end col-md-3">
 					@Localizer[Promenade.PromptPassword]
 					<span class="fa-solid fa-asterisk fa-xs d-inline-block ms-2 text-danger oc-required-field-marker"></span>
 				</label>
 				<div class="col-md-9">
-					<input asp-for="Password" type="password" class="form-control" />
+					<input asp-for="Password" type="password" class="form-control" autocomplete="off" />
 					<span asp-validation-for="Password" class="validation-message text-danger"></span>
 					@if (!string.IsNullOrWhiteSpace(Model.ForgotPasswordLink))
 					{
diff --git a/src/Promenade.Web/Views/CardRenewal/Juvenile.cshtml b/src/Promenade.Web/Views/CardRenewal/Juvenile.cshtml
index 7728a6eea..468ba5f07 100644
--- a/src/Promenade.Web/Views/CardRenewal/Juvenile.cshtml
+++ b/src/Promenade.Web/Views/CardRenewal/Juvenile.cshtml
@@ -21,8 +21,8 @@ else
 			  asp-controller="@CardRenewalController.Name"
 			  asp-action="@nameof(CardRenewalController.Juvenile)"
 			  asp-route-culture="">
-			<input asp-for="GuardianName" type="text" formgroup />
-			<input asp-for="GuardianBarcode" type="text" formgroup />
+			<input asp-for="GuardianName" type="text" formgroup autocomplete="off" />
+			<input asp-for="GuardianBarcode" type="text" formgroup autocomplete="off" />
 			<div>
 				<button type="submit"
 						class="btn btn-outline-dark m-2 btn-lg float-end">
diff --git a/src/Promenade.Web/Views/CardRenewal/VerifyAddress.cshtml b/src/Promenade.Web/Views/CardRenewal/VerifyAddress.cshtml
index 93fd1e8ab..ef02e2fe0 100644
--- a/src/Promenade.Web/Views/CardRenewal/VerifyAddress.cshtml
+++ b/src/Promenade.Web/Views/CardRenewal/VerifyAddress.cshtml
@@ -20,7 +20,7 @@ else
 			  asp-controller="@CardRenewalController.Name"
 			  asp-action="@nameof(CardRenewalController.VerifyAddress)"
 			  asp-route-culture="">
-			<input asp-for="Email" formgroup />
+			<input asp-for="Email" formgroup autocomplete="email" />
 			<div class="row">
 				<div class="col-md-9 offset-md-3">
 					@if (Model.Addresses.Any())

From adc5df5f06ae240a0b8dcc2307c8ec38f8946e7c Mon Sep 17 00:00:00 2001
From: Dan Wilcox <DanielWilcox@mcldaz.org>
Date: Fri, 16 Jan 2026 12:11:41 -0700
Subject: [PATCH 05/13] Deduplicate model state filter methods

---
 .../CardRenewalController.cs                  |  1 +
 .../DigitalDisplaysController.cs              |  1 +
 .../IdentityProvidersController.cs            |  1 +
 .../ContentManagement/RosterController.cs     |  1 +
 .../ContentManagement/SectionController.cs    |  1 +
 .../Areas/Incident/HomeController.cs          |  1 +
 .../Areas/Services/CardRenewalController.cs   |  1 +
 .../Areas/Services/EmployeeCardController.cs  |  1 +
 .../SiteManagement/CarouselsController.cs     |  1 +
 .../SiteManagement/CategoriesController.cs    |  1 +
 .../Areas/SiteManagement/EmediaController.cs  |  1 +
 .../SiteManagement/FeaturesController.cs      |  1 +
 .../Areas/SiteManagement/GroupsController.cs  |  1 +
 .../SiteManagement/ImageFeaturesController.cs |  1 +
 .../SiteManagement/LocationsController.cs     |  1 +
 .../SiteManagement/NavigationsController.cs   |  1 +
 .../Areas/SiteManagement/PagesController.cs   |  1 +
 .../SiteManagement/ScheduleController.cs      |  1 +
 .../SiteManagement/SegmentWrapsController.cs  |  1 +
 .../SiteManagement/SegmentsController.cs      |  1 +
 .../SiteManagement/SocialCardsController.cs   |  1 +
 .../SiteManagement/VolunteerController.cs     |  1 +
 .../Filters/RestoreModelStateAttribute.cs     | 57 +++---------------
 src/Ops.Controllers/LocationsController.cs    |  1 +
 .../CardRenewalController.cs                  |  2 +
 .../Filters/RestoreModelStateAttribute.cs     | 50 ++--------------
 .../Filters/SaveModelStateAttribute.cs        | 40 -------------
 .../ServicesController.cs                     |  1 +
 .../Filters/RestoreModelStateAttributeBase.cs | 60 +++++++++++++++++++
 .../Filters/SaveModelStateAttribute.cs        |  6 +-
 30 files changed, 106 insertions(+), 133 deletions(-)
 delete mode 100644 src/Promenade.Controllers/Filters/SaveModelStateAttribute.cs
 create mode 100644 src/Utility/Filters/RestoreModelStateAttributeBase.cs
 rename src/{Ops.Controllers => Utility}/Filters/SaveModelStateAttribute.cs (86%)

diff --git a/src/Ops.Controllers/Areas/ContentManagement/CardRenewalController.cs b/src/Ops.Controllers/Areas/ContentManagement/CardRenewalController.cs
index 5445be938..f51495fe7 100644
--- a/src/Ops.Controllers/Areas/ContentManagement/CardRenewalController.cs
+++ b/src/Ops.Controllers/Areas/ContentManagement/CardRenewalController.cs
@@ -12,6 +12,7 @@
 using Ocuda.Ops.Service.Interfaces.Ops.Services;
 using Ocuda.Ops.Service.Interfaces.Promenade.Services;
 using Ocuda.Utility.Exceptions;
+using Ocuda.Utility.Filters;
 using Ocuda.Utility.Keys;
 
 namespace Ocuda.Ops.Controllers.Areas.ContentManagement
diff --git a/src/Ops.Controllers/Areas/ContentManagement/DigitalDisplaysController.cs b/src/Ops.Controllers/Areas/ContentManagement/DigitalDisplaysController.cs
index 1f9152bfb..e821b82fb 100644
--- a/src/Ops.Controllers/Areas/ContentManagement/DigitalDisplaysController.cs
+++ b/src/Ops.Controllers/Areas/ContentManagement/DigitalDisplaysController.cs
@@ -17,6 +17,7 @@
 using Ocuda.Ops.Service.Interfaces.Ops.Services;
 using Ocuda.Promenade.Models.Entities;
 using Ocuda.Utility.Exceptions;
+using Ocuda.Utility.Filters;
 using Ocuda.Utility.Keys;
 using Ocuda.Utility.Models;
 
diff --git a/src/Ops.Controllers/Areas/ContentManagement/IdentityProvidersController.cs b/src/Ops.Controllers/Areas/ContentManagement/IdentityProvidersController.cs
index ddd29ad31..e6ec7e301 100644
--- a/src/Ops.Controllers/Areas/ContentManagement/IdentityProvidersController.cs
+++ b/src/Ops.Controllers/Areas/ContentManagement/IdentityProvidersController.cs
@@ -9,6 +9,7 @@
 using Ocuda.Ops.Service.Filters;
 using Ocuda.Ops.Service.Interfaces.Ops.Services;
 using Ocuda.Utility.Exceptions;
+using Ocuda.Utility.Filters;
 using Ocuda.Utility.Keys;
 
 namespace Ocuda.Ops.Controllers.Areas.ContentManagement
diff --git a/src/Ops.Controllers/Areas/ContentManagement/RosterController.cs b/src/Ops.Controllers/Areas/ContentManagement/RosterController.cs
index a0e1835d0..336acd62f 100644
--- a/src/Ops.Controllers/Areas/ContentManagement/RosterController.cs
+++ b/src/Ops.Controllers/Areas/ContentManagement/RosterController.cs
@@ -14,6 +14,7 @@
 using Ocuda.Ops.Service.Filters;
 using Ocuda.Ops.Service.Interfaces.Ops.Services;
 using Ocuda.Utility.Exceptions;
+using Ocuda.Utility.Filters;
 using Ocuda.Utility.Keys;
 
 namespace Ocuda.Ops.Controllers.Areas.ContentManagement
diff --git a/src/Ops.Controllers/Areas/ContentManagement/SectionController.cs b/src/Ops.Controllers/Areas/ContentManagement/SectionController.cs
index b72fba5f6..58b2116d0 100644
--- a/src/Ops.Controllers/Areas/ContentManagement/SectionController.cs
+++ b/src/Ops.Controllers/Areas/ContentManagement/SectionController.cs
@@ -15,6 +15,7 @@
 using Ocuda.Ops.Service.Interfaces.Ops.Services;
 using Ocuda.Utility.Exceptions;
 using Ocuda.Utility.Extensions;
+using Ocuda.Utility.Filters;
 using Ocuda.Utility.Keys;
 using Ocuda.Utility.Models;
 using Ocuda.Utility.Services.Interfaces;
diff --git a/src/Ops.Controllers/Areas/Incident/HomeController.cs b/src/Ops.Controllers/Areas/Incident/HomeController.cs
index c2f8a5de0..43d4af017 100644
--- a/src/Ops.Controllers/Areas/Incident/HomeController.cs
+++ b/src/Ops.Controllers/Areas/Incident/HomeController.cs
@@ -19,6 +19,7 @@
 using Ocuda.Ops.Service.Interfaces.Ops.Services;
 using Ocuda.Utility.Abstract;
 using Ocuda.Utility.Exceptions;
+using Ocuda.Utility.Filters;
 using Ocuda.Utility.Keys;
 using Ocuda.Utility.Services.Interfaces;
 
diff --git a/src/Ops.Controllers/Areas/Services/CardRenewalController.cs b/src/Ops.Controllers/Areas/Services/CardRenewalController.cs
index f41a3d1f4..4bb8e3961 100644
--- a/src/Ops.Controllers/Areas/Services/CardRenewalController.cs
+++ b/src/Ops.Controllers/Areas/Services/CardRenewalController.cs
@@ -17,6 +17,7 @@
 using Ocuda.Ops.Service.Interfaces.Promenade.Services;
 using Ocuda.PolarisHelper;
 using Ocuda.Utility.Exceptions;
+using Ocuda.Utility.Filters;
 
 namespace Ocuda.Ops.Controllers.Areas.Services
 {
diff --git a/src/Ops.Controllers/Areas/Services/EmployeeCardController.cs b/src/Ops.Controllers/Areas/Services/EmployeeCardController.cs
index 07051f963..c79c71b3f 100644
--- a/src/Ops.Controllers/Areas/Services/EmployeeCardController.cs
+++ b/src/Ops.Controllers/Areas/Services/EmployeeCardController.cs
@@ -6,6 +6,7 @@
 using Ocuda.Ops.Controllers.Filters;
 using Ocuda.Ops.Service.Filters;
 using Ocuda.Ops.Service.Interfaces.Promenade.Services;
+using Ocuda.Utility.Filters;
 
 namespace Ocuda.Ops.Controllers.Areas.Services
 {
diff --git a/src/Ops.Controllers/Areas/SiteManagement/CarouselsController.cs b/src/Ops.Controllers/Areas/SiteManagement/CarouselsController.cs
index 0bfe8d23f..6de4c39fa 100644
--- a/src/Ops.Controllers/Areas/SiteManagement/CarouselsController.cs
+++ b/src/Ops.Controllers/Areas/SiteManagement/CarouselsController.cs
@@ -17,6 +17,7 @@
 using Ocuda.Ops.Service.Interfaces.Promenade.Services;
 using Ocuda.Promenade.Models.Entities;
 using Ocuda.Utility.Exceptions;
+using Ocuda.Utility.Filters;
 using Ocuda.Utility.Keys;
 using Ocuda.Utility.Models;
 
diff --git a/src/Ops.Controllers/Areas/SiteManagement/CategoriesController.cs b/src/Ops.Controllers/Areas/SiteManagement/CategoriesController.cs
index b2256b777..dca0602cd 100644
--- a/src/Ops.Controllers/Areas/SiteManagement/CategoriesController.cs
+++ b/src/Ops.Controllers/Areas/SiteManagement/CategoriesController.cs
@@ -13,6 +13,7 @@
 using Ocuda.Ops.Service.Interfaces.Promenade.Services;
 using Ocuda.Promenade.Models.Entities;
 using Ocuda.Utility.Exceptions;
+using Ocuda.Utility.Filters;
 using Ocuda.Utility.Keys;
 using Ocuda.Utility.Models;
 
diff --git a/src/Ops.Controllers/Areas/SiteManagement/EmediaController.cs b/src/Ops.Controllers/Areas/SiteManagement/EmediaController.cs
index 0807da6e6..220f9b828 100644
--- a/src/Ops.Controllers/Areas/SiteManagement/EmediaController.cs
+++ b/src/Ops.Controllers/Areas/SiteManagement/EmediaController.cs
@@ -15,6 +15,7 @@
 using Ocuda.Ops.Service.Interfaces.Promenade.Services;
 using Ocuda.Promenade.Models.Entities;
 using Ocuda.Utility.Exceptions;
+using Ocuda.Utility.Filters;
 using Ocuda.Utility.Models;
 
 namespace Ocuda.Ops.Controllers.Areas.SiteManagement
diff --git a/src/Ops.Controllers/Areas/SiteManagement/FeaturesController.cs b/src/Ops.Controllers/Areas/SiteManagement/FeaturesController.cs
index a7e8bb119..35134f5f2 100644
--- a/src/Ops.Controllers/Areas/SiteManagement/FeaturesController.cs
+++ b/src/Ops.Controllers/Areas/SiteManagement/FeaturesController.cs
@@ -16,6 +16,7 @@
 using Ocuda.Utility.Email;
 using Ocuda.Utility.Exceptions;
 using Ocuda.Utility.Extensions;
+using Ocuda.Utility.Filters;
 
 namespace Ocuda.Ops.Controllers.Areas.SiteManagement
 {
diff --git a/src/Ops.Controllers/Areas/SiteManagement/GroupsController.cs b/src/Ops.Controllers/Areas/SiteManagement/GroupsController.cs
index 4c56f02fd..ea9580e95 100644
--- a/src/Ops.Controllers/Areas/SiteManagement/GroupsController.cs
+++ b/src/Ops.Controllers/Areas/SiteManagement/GroupsController.cs
@@ -11,6 +11,7 @@
 using Ocuda.Ops.Service.Interfaces.Ops.Services;
 using Ocuda.Promenade.Models.Entities;
 using Ocuda.Utility.Exceptions;
+using Ocuda.Utility.Filters;
 using Ocuda.Utility.Keys;
 using Ocuda.Utility.Models;
 
diff --git a/src/Ops.Controllers/Areas/SiteManagement/ImageFeaturesController.cs b/src/Ops.Controllers/Areas/SiteManagement/ImageFeaturesController.cs
index ae9298c71..bb2d398e9 100644
--- a/src/Ops.Controllers/Areas/SiteManagement/ImageFeaturesController.cs
+++ b/src/Ops.Controllers/Areas/SiteManagement/ImageFeaturesController.cs
@@ -19,6 +19,7 @@
 using Ocuda.Utility.Abstract;
 using Ocuda.Utility.Exceptions;
 using Ocuda.Utility.Extensions;
+using Ocuda.Utility.Filters;
 using Ocuda.Utility.Keys;
 using SixLabors.ImageSharp;
 
diff --git a/src/Ops.Controllers/Areas/SiteManagement/LocationsController.cs b/src/Ops.Controllers/Areas/SiteManagement/LocationsController.cs
index b9061a71f..00bc6d664 100644
--- a/src/Ops.Controllers/Areas/SiteManagement/LocationsController.cs
+++ b/src/Ops.Controllers/Areas/SiteManagement/LocationsController.cs
@@ -16,6 +16,7 @@
 using Ocuda.Ops.Service.Interfaces.Promenade.Services;
 using Ocuda.Promenade.Models.Entities;
 using Ocuda.Utility.Exceptions;
+using Ocuda.Utility.Filters;
 using Ocuda.Utility.Keys;
 using Ocuda.Utility.Models;
 using Ocuda.Utility.Services.Interfaces;
diff --git a/src/Ops.Controllers/Areas/SiteManagement/NavigationsController.cs b/src/Ops.Controllers/Areas/SiteManagement/NavigationsController.cs
index 2164e5037..07eb904f2 100644
--- a/src/Ops.Controllers/Areas/SiteManagement/NavigationsController.cs
+++ b/src/Ops.Controllers/Areas/SiteManagement/NavigationsController.cs
@@ -20,6 +20,7 @@
 using Ocuda.Utility.Abstract;
 using Ocuda.Utility.Exceptions;
 using Ocuda.Utility.Extensions;
+using Ocuda.Utility.Filters;
 
 namespace Ocuda.Ops.Controllers.Areas.SiteManagement
 {
diff --git a/src/Ops.Controllers/Areas/SiteManagement/PagesController.cs b/src/Ops.Controllers/Areas/SiteManagement/PagesController.cs
index 68ae25b79..0facd2efa 100644
--- a/src/Ops.Controllers/Areas/SiteManagement/PagesController.cs
+++ b/src/Ops.Controllers/Areas/SiteManagement/PagesController.cs
@@ -20,6 +20,7 @@
 using Ocuda.Promenade.Models.Entities;
 using Ocuda.Utility.Exceptions;
 using Ocuda.Utility.Extensions;
+using Ocuda.Utility.Filters;
 using Ocuda.Utility.Keys;
 using Ocuda.Utility.Models;
 
diff --git a/src/Ops.Controllers/Areas/SiteManagement/ScheduleController.cs b/src/Ops.Controllers/Areas/SiteManagement/ScheduleController.cs
index 28efabc51..22c4fd273 100644
--- a/src/Ops.Controllers/Areas/SiteManagement/ScheduleController.cs
+++ b/src/Ops.Controllers/Areas/SiteManagement/ScheduleController.cs
@@ -10,6 +10,7 @@
 using Ocuda.Ops.Controllers.Filters;
 using Ocuda.Ops.Service.Interfaces.Promenade.Services;
 using Ocuda.Promenade.Models.Entities;
+using Ocuda.Utility.Filters;
 using Ocuda.Utility.Keys;
 
 namespace Ocuda.Ops.Controllers.Areas.SiteManagement
diff --git a/src/Ops.Controllers/Areas/SiteManagement/SegmentWrapsController.cs b/src/Ops.Controllers/Areas/SiteManagement/SegmentWrapsController.cs
index f45d50a1f..125df0dfd 100644
--- a/src/Ops.Controllers/Areas/SiteManagement/SegmentWrapsController.cs
+++ b/src/Ops.Controllers/Areas/SiteManagement/SegmentWrapsController.cs
@@ -8,6 +8,7 @@
 using Ocuda.Ops.Controllers.ServiceFacades;
 using Ocuda.Ops.Service.Filters;
 using Ocuda.Ops.Service.Interfaces.Promenade.Services;
+using Ocuda.Utility.Filters;
 using Ocuda.Utility.Keys;
 
 namespace Ocuda.Ops.Controllers.Areas.SiteManagement
diff --git a/src/Ops.Controllers/Areas/SiteManagement/SegmentsController.cs b/src/Ops.Controllers/Areas/SiteManagement/SegmentsController.cs
index be3de9a3d..add530168 100644
--- a/src/Ops.Controllers/Areas/SiteManagement/SegmentsController.cs
+++ b/src/Ops.Controllers/Areas/SiteManagement/SegmentsController.cs
@@ -22,6 +22,7 @@
 using Ocuda.Promenade.Models.Entities;
 using Ocuda.Utility.Exceptions;
 using Ocuda.Utility.Extensions;
+using Ocuda.Utility.Filters;
 using Ocuda.Utility.Keys;
 using Ocuda.Utility.Models;
 
diff --git a/src/Ops.Controllers/Areas/SiteManagement/SocialCardsController.cs b/src/Ops.Controllers/Areas/SiteManagement/SocialCardsController.cs
index 32eea5dac..30dbfec1e 100644
--- a/src/Ops.Controllers/Areas/SiteManagement/SocialCardsController.cs
+++ b/src/Ops.Controllers/Areas/SiteManagement/SocialCardsController.cs
@@ -10,6 +10,7 @@
 using Ocuda.Ops.Service.Interfaces.Ops.Services;
 using Ocuda.Ops.Service.Interfaces.Promenade.Services;
 using Ocuda.Utility.Exceptions;
+using Ocuda.Utility.Filters;
 using Ocuda.Utility.Keys;
 using Ocuda.Utility.Models;
 
diff --git a/src/Ops.Controllers/Areas/SiteManagement/VolunteerController.cs b/src/Ops.Controllers/Areas/SiteManagement/VolunteerController.cs
index 6f0d7ffd7..2320db5fe 100644
--- a/src/Ops.Controllers/Areas/SiteManagement/VolunteerController.cs
+++ b/src/Ops.Controllers/Areas/SiteManagement/VolunteerController.cs
@@ -15,6 +15,7 @@
 using Ocuda.Ops.Service.Interfaces.Promenade.Services;
 using Ocuda.Promenade.Models.Entities;
 using Ocuda.Utility.Exceptions;
+using Ocuda.Utility.Filters;
 using Ocuda.Utility.Keys;
 
 namespace Ocuda.Ops.Controllers.Areas.SiteManagement
diff --git a/src/Ops.Controllers/Filters/RestoreModelStateAttribute.cs b/src/Ops.Controllers/Filters/RestoreModelStateAttribute.cs
index b00c0aca9..565090690 100644
--- a/src/Ops.Controllers/Filters/RestoreModelStateAttribute.cs
+++ b/src/Ops.Controllers/Filters/RestoreModelStateAttribute.cs
@@ -1,60 +1,21 @@
-using System;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
+using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc.Filters;
-using Microsoft.Extensions.Logging;
 using Ocuda.Ops.Service.Interfaces.Ops.Services;
-using Ocuda.Utility.Helpers;
+using Ocuda.Utility.Filters;
 
 namespace Ocuda.Ops.Controllers.Filters
 {
-    public class RestoreModelStateAttribute : ActionFilterAttribute
+    public sealed class RestoreModelStateAttribute : RestoreModelStateAttributeBase
     {
-        public string Key { get; set; }
-
         public override async Task OnActionExecutionAsync(ActionExecutingContext context,
                                          ActionExecutionDelegate next)
         {
-            var resultContext = await next();
-
-            var controller = context.Controller as Controller;
-
-            string modelStateKey;
-            if (!string.IsNullOrWhiteSpace(Key))
-            {
-                modelStateKey = ModelStateHelper.GetModelStateKey(Key);
-            }
-            else
-            {
-                modelStateKey = ModelStateHelper.GetModelStateKey(context.RouteData.Values);
-            }
-
-            if (controller?.TempData[modelStateKey] is string modelStateStorage)
-            {
-                var (modelState, time) = ModelStateHelper.DeserializeModelState(modelStateStorage);
-                var timeDifference = DateTimeOffset.Now.ToUnixTimeSeconds() - time;
-
-                var _siteSettingService = (ISiteSettingService)context.HttpContext.RequestServices
-                    .GetService(typeof(ISiteSettingService));
-                var modelstateTimeOut = await _siteSettingService
-                    .GetSettingIntAsync(Models.Keys.SiteSetting.UserInterface.ModelStateTimeoutMinutes);
-                if (TimeSpan.FromSeconds(timeDifference).Minutes < modelstateTimeOut
-                    || modelstateTimeOut < 1)
-                {
-                    //Only Import if we are viewing
-                    if (resultContext.Result is ViewResult)
-                    {
-                        context.ModelState.Merge(modelState);
-                    }
-                }
-                else
-                {
-                    var _logger = (ILogger<RestoreModelStateAttribute>)context.HttpContext
-                        .RequestServices.GetService(typeof(ILogger<RestoreModelStateAttribute>));
-                    _logger.LogError("ModelState timed out for key {ModelStateKey}",
-                        modelStateKey);
-                }
-            }
+            var _siteSettingService = (ISiteSettingService)context.HttpContext.RequestServices
+                   .GetService(typeof(ISiteSettingService));
+            ModelStateTimeOut = await _siteSettingService
+                .GetSettingIntAsync(Models.Keys.SiteSetting.UserInterface.ModelStateTimeoutMinutes);
+            
+            await base.OnActionExecutionAsync(context, next);
         }
     }
 }
diff --git a/src/Ops.Controllers/LocationsController.cs b/src/Ops.Controllers/LocationsController.cs
index 71347ef58..deaba6f16 100644
--- a/src/Ops.Controllers/LocationsController.cs
+++ b/src/Ops.Controllers/LocationsController.cs
@@ -22,6 +22,7 @@
 using Ocuda.Promenade.Models.Entities;
 using Ocuda.Utility.Exceptions;
 using Ocuda.Utility.Extensions;
+using Ocuda.Utility.Filters;
 using Ocuda.Utility.Keys;
 
 namespace Ocuda.Ops.Controllers
diff --git a/src/Promenade.Controllers/CardRenewalController.cs b/src/Promenade.Controllers/CardRenewalController.cs
index 31dbf1386..1cc0b7894 100644
--- a/src/Promenade.Controllers/CardRenewalController.cs
+++ b/src/Promenade.Controllers/CardRenewalController.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
 using System.Text.Json;
 using System.Threading.Tasks;
@@ -14,6 +15,7 @@
 using Ocuda.Promenade.Models.Entities;
 using Ocuda.Promenade.Service;
 using Ocuda.Utility.Abstract;
+using Ocuda.Utility.Filters;
 
 namespace Ocuda.Promenade.Controllers
 {
diff --git a/src/Promenade.Controllers/Filters/RestoreModelStateAttribute.cs b/src/Promenade.Controllers/Filters/RestoreModelStateAttribute.cs
index 8f1350de4..2c0bff65b 100644
--- a/src/Promenade.Controllers/Filters/RestoreModelStateAttribute.cs
+++ b/src/Promenade.Controllers/Filters/RestoreModelStateAttribute.cs
@@ -1,56 +1,18 @@
-using System;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
+using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc.Filters;
-using Microsoft.Extensions.Logging;
-using Ocuda.Utility.Helpers;
+using Ocuda.Utility.Filters;
 
 namespace Ocuda.Promenade.Controllers.Filters
 {
-    public class RestoreModelStateAttribute : ActionFilterAttribute
+    public sealed class RestoreModelStateAttribute : RestoreModelStateAttributeBase
     {
-        public string Key { get; set; }
+        public const int TimeOutMinutes = 2;
 
         public override async Task OnActionExecutionAsync(ActionExecutingContext context,
                                          ActionExecutionDelegate next)
         {
-            var resultContext = await next();
-
-            var controller = context.Controller as Controller;
-
-            string modelStateKey;
-            if (!string.IsNullOrWhiteSpace(Key))
-            {
-                modelStateKey = ModelStateHelper.GetModelStateKey(Key);
-            }
-            else
-            {
-                modelStateKey = ModelStateHelper.GetModelStateKey(context.RouteData.Values);
-            }
-
-            if (controller?.TempData[modelStateKey] is string modelStateStorage)
-            {
-                var (modelState, time) = ModelStateHelper.DeserializeModelState(modelStateStorage);
-                var timeDifference = DateTimeOffset.Now.ToUnixTimeSeconds() - time;
-
-                var modelstateTimeOut = 2;
-                if (TimeSpan.FromSeconds(timeDifference).Minutes < modelstateTimeOut
-                    || modelstateTimeOut < 1)
-                {
-                    //Only Import if we are viewing
-                    if (resultContext.Result is ViewResult)
-                    {
-                        context.ModelState.Merge(modelState);
-                    }
-                }
-                else
-                {
-                    var _logger = (ILogger<RestoreModelStateAttribute>)context.HttpContext
-                        .RequestServices.GetService(typeof(ILogger<RestoreModelStateAttribute>));
-                    _logger.LogError("ModelState timed out for key {ModelStateKey}",
-                        modelStateKey);
-                }
-            }
+            ModelStateTimeOut = TimeOutMinutes;
+            await base.OnActionExecutionAsync(context, next);
         }
     }
 }
diff --git a/src/Promenade.Controllers/Filters/SaveModelStateAttribute.cs b/src/Promenade.Controllers/Filters/SaveModelStateAttribute.cs
deleted file mode 100644
index 77d5bd5d6..000000000
--- a/src/Promenade.Controllers/Filters/SaveModelStateAttribute.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.Filters;
-using Ocuda.Utility.Helpers;
-
-namespace Ocuda.Promenade.Controllers.Filters
-{
-    public class SaveModelStateAttribute : ActionFilterAttribute
-    {
-        public string Key { get; set; }
-
-        public override void OnActionExecuted(ActionExecutedContext context)
-        {
-            //Only export when ModelState is not valid
-            if (!context.ModelState.IsValid
-                && (context.Result is RedirectResult
-                    || context.Result is RedirectToRouteResult
-                    || context.Result is RedirectToActionResult))
-            {
-                using var controller = context.Controller as Controller;
-                if (controller != null && context.ModelState != null)
-                {
-                    string modelStateKey;
-                    if (!string.IsNullOrWhiteSpace(Key))
-                    {
-                        modelStateKey = ModelStateHelper.GetModelStateKey(Key);
-                    }
-                    else
-                    {
-                        modelStateKey = ModelStateHelper.GetModelStateKey(context.RouteData.Values);
-                    }
-
-                    controller.TempData[modelStateKey] = ModelStateHelper
-                        .SerializeModelState(context.ModelState);
-                }
-            }
-
-            base.OnActionExecuted(context);
-        }
-    }
-}
diff --git a/src/Promenade.Controllers/ServicesController.cs b/src/Promenade.Controllers/ServicesController.cs
index 8bd0ee29b..9e259627e 100644
--- a/src/Promenade.Controllers/ServicesController.cs
+++ b/src/Promenade.Controllers/ServicesController.cs
@@ -7,6 +7,7 @@
 using Ocuda.Promenade.Models.Entities;
 using Ocuda.Promenade.Service;
 using Ocuda.Utility;
+using Ocuda.Utility.Filters;
 
 namespace Ocuda.Promenade.Controllers
 {
diff --git a/src/Utility/Filters/RestoreModelStateAttributeBase.cs b/src/Utility/Filters/RestoreModelStateAttributeBase.cs
new file mode 100644
index 000000000..a06593610
--- /dev/null
+++ b/src/Utility/Filters/RestoreModelStateAttributeBase.cs
@@ -0,0 +1,60 @@
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.Extensions.Logging;
+using Ocuda.Utility.Helpers;
+
+namespace Ocuda.Utility.Filters
+{
+    /// <summary>
+    /// Load model state items from temp data and merge them into the model state when redirected to
+    /// after a model state error. Key can be set manually or generated from route values.
+    /// </summary>
+    public abstract class RestoreModelStateAttributeBase : ActionFilterAttribute
+    {
+        public string Key { get; set; }
+        public int ModelStateTimeOut { get; set; }
+
+        public override async Task OnActionExecutionAsync(ActionExecutingContext context,
+                                         ActionExecutionDelegate next)
+        {
+            var resultContext = await next();
+
+            var controller = context.Controller as Controller;
+
+            string modelStateKey;
+            if (!string.IsNullOrWhiteSpace(Key))
+            {
+                modelStateKey = ModelStateHelper.GetModelStateKey(Key);
+            }
+            else
+            {
+                modelStateKey = ModelStateHelper.GetModelStateKey(context.RouteData.Values);
+            }
+
+            if (controller?.TempData[modelStateKey] is string modelStateStorage)
+            {
+                var (modelState, time) = ModelStateHelper.DeserializeModelState(modelStateStorage);
+                var timeDifference = DateTimeOffset.Now.ToUnixTimeSeconds() - time;
+
+                if (TimeSpan.FromSeconds(timeDifference).Minutes < ModelStateTimeOut
+                    || ModelStateTimeOut < 1)
+                {
+                    //Only Import if we are viewing
+                    if (resultContext.Result is ViewResult)
+                    {
+                        context.ModelState.Merge(modelState);
+                    }
+                }
+                else
+                {
+                    var _logger = (ILogger<RestoreModelStateAttributeBase>)context.HttpContext
+                        .RequestServices.GetService(typeof(ILogger<RestoreModelStateAttributeBase>));
+                    _logger.LogError("ModelState timed out for key {ModelStateKey}",
+                        modelStateKey);
+                }
+            }
+        }
+    }
+}
diff --git a/src/Ops.Controllers/Filters/SaveModelStateAttribute.cs b/src/Utility/Filters/SaveModelStateAttribute.cs
similarity index 86%
rename from src/Ops.Controllers/Filters/SaveModelStateAttribute.cs
rename to src/Utility/Filters/SaveModelStateAttribute.cs
index f8b45abe0..2d37e87ce 100644
--- a/src/Ops.Controllers/Filters/SaveModelStateAttribute.cs
+++ b/src/Utility/Filters/SaveModelStateAttribute.cs
@@ -2,8 +2,12 @@
 using Microsoft.AspNetCore.Mvc.Filters;
 using Ocuda.Utility.Helpers;
 
-namespace Ocuda.Ops.Controllers.Filters
+namespace Ocuda.Utility.Filters
 {
+    /// <summary>
+    /// Save model state items to temp data when redirecting after a model state error. Key can be
+    /// set manually or generated from route values.
+    /// </summary>
     public class SaveModelStateAttribute : ActionFilterAttribute
     {
         public string Key { get; set; }

From d1c406b56076aff07355212258f6da320db9762a Mon Sep 17 00:00:00 2001
From: Dan Wilcox <DanielWilcox@mcldaz.org>
Date: Fri, 16 Jan 2026 15:04:24 -0700
Subject: [PATCH 06/13] Remove employee card code

---
 .../Areas/Services/EmployeeCardController.cs  | 102 --------------
 .../EmployeeCard/DetailsViewModel.cs          |  18 ---
 .../ViewModels/EmployeeCard/IndexViewModel.cs |  14 --
 .../EmployeeCardRequestRepository.cs          |  71 ----------
 src/Ops.Data/PromenadeContext.cs              |   2 -
 src/Ops.Service/EmployeeCardService.cs        |  78 -----------
 .../IEmployeeCardRequestRepository.cs         |  14 --
 .../Services/IEmployeeCardService.cs          |  15 --
 .../Services/Views/CardRenewal/Index.cshtml   |   2 +-
 .../Views/EmployeeCard/Details.cshtml         | 129 ------------------
 .../Services/Views/EmployeeCard/Index.cshtml  |  73 ----------
 .../Areas/Services/Views/_ViewImports.cshtml  |   2 -
 src/Ops.Web/Startup.cs                        |   3 -
 src/Ops.Web/Views/Shared/_Layout.cshtml       |   7 -
 .../ServicesController.cs                     | 108 ---------------
 .../Services/EmployeeCardViewModel.cs         |  10 --
 .../EmployeeCardRequestRepository.cs          |  24 ----
 src/Promenade.Data/PromenadeContext.cs        |   1 -
 src/Promenade.Models/Defaults/SiteSetting.cs  |  23 ----
 .../Entities/EmployeeCardRequest.cs           |  76 -----------
 src/Promenade.Models/Keys/SiteSetting.cs      |  10 --
 src/Promenade.Service/EmployeeCardService.cs  |  33 -----
 .../IEmployeeCardRequestRepository.cs         |  10 --
 src/Promenade.Web/Startup.cs                  |   3 -
 .../Views/Services/EmployeeCard.cshtml        | 102 --------------
 src/i18n/Keys/Promenade.cs                    |  18 ---
 26 files changed, 1 insertion(+), 947 deletions(-)
 delete mode 100644 src/Ops.Controllers/Areas/Services/EmployeeCardController.cs
 delete mode 100644 src/Ops.Controllers/Areas/Services/ViewModels/EmployeeCard/DetailsViewModel.cs
 delete mode 100644 src/Ops.Controllers/Areas/Services/ViewModels/EmployeeCard/IndexViewModel.cs
 delete mode 100644 src/Ops.Data/Promenade/EmployeeCardRequestRepository.cs
 delete mode 100644 src/Ops.Service/EmployeeCardService.cs
 delete mode 100644 src/Ops.Service/Interfaces/Promenade/Repositories/IEmployeeCardRequestRepository.cs
 delete mode 100644 src/Ops.Service/Interfaces/Promenade/Services/IEmployeeCardService.cs
 delete mode 100644 src/Ops.Web/Areas/Services/Views/EmployeeCard/Details.cshtml
 delete mode 100644 src/Ops.Web/Areas/Services/Views/EmployeeCard/Index.cshtml
 delete mode 100644 src/Promenade.Controllers/ServicesController.cs
 delete mode 100644 src/Promenade.Controllers/ViewModels/Services/EmployeeCardViewModel.cs
 delete mode 100644 src/Promenade.Data/Promenade/EmployeeCardRequestRepository.cs
 delete mode 100644 src/Promenade.Models/Entities/EmployeeCardRequest.cs
 delete mode 100644 src/Promenade.Service/EmployeeCardService.cs
 delete mode 100644 src/Promenade.Service/Interfaces/Repositories/IEmployeeCardRequestRepository.cs
 delete mode 100644 src/Promenade.Web/Views/Services/EmployeeCard.cshtml

diff --git a/src/Ops.Controllers/Areas/Services/EmployeeCardController.cs b/src/Ops.Controllers/Areas/Services/EmployeeCardController.cs
deleted file mode 100644
index c79c71b3f..000000000
--- a/src/Ops.Controllers/Areas/Services/EmployeeCardController.cs
+++ /dev/null
@@ -1,102 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
-using Ocuda.Ops.Controllers.Abstract;
-using Ocuda.Ops.Controllers.Areas.Services.ViewModels.EmployeeCard;
-using Ocuda.Ops.Controllers.Filters;
-using Ocuda.Ops.Service.Filters;
-using Ocuda.Ops.Service.Interfaces.Promenade.Services;
-using Ocuda.Utility.Filters;
-
-namespace Ocuda.Ops.Controllers.Areas.Services
-{
-    [Area("Services")]
-    [Route("[area]/[controller]")]
-    public class EmployeeCardController : BaseController<EmployeeCardController>
-    {
-        public IEmployeeCardService _employeeCardService;
-
-        public EmployeeCardController(ServiceFacades.Controller<EmployeeCardController> context,
-            IEmployeeCardService employeeCardService)
-            : base(context)
-        {
-            ArgumentNullException.ThrowIfNull(employeeCardService);
-
-            _employeeCardService = employeeCardService;
-        }
-
-        public static string Name
-        { get { return "EmployeeCard"; } }
-
-        [HttpGet("[action]/{id}")]
-        [RestoreModelState]
-        public async Task<IActionResult> Details(int id)
-        {
-            var cardRequest = await _employeeCardService.GetRequestAsync(id);
-            if (cardRequest == null)
-            {
-                ShowAlertWarning($"Unable to find card request {id}");
-                return RedirectToAction(nameof(Index));
-            }
-
-            var viewModel = new DetailsViewModel
-            {
-                CardRequest = cardRequest
-            };
-
-            return View(viewModel);
-        }
-
-        [HttpPost("[action]/{id}")]
-        [SaveModelState]
-        public async Task<IActionResult> Details(DetailsViewModel viewModel)
-        {
-            ArgumentNullException.ThrowIfNull(viewModel);
-            if (viewModel.Action == DetailsViewModel.SubmitType.SaveNotes)
-            {
-                await _employeeCardService.UpdateNotesAsync(viewModel.CardRequest);
-            }
-            else
-            {
-
-            }
-            return RedirectToAction(nameof(Details), new { id = viewModel.CardRequest.Id });
-        }
-
-        [HttpGet]
-        public async Task<IActionResult> Index(int? page, bool processed)
-        {
-            page ??= 1;
-
-            var filter = new RequestFilter(page.Value)
-            {
-                IsProcessed = processed
-            };
-
-            var requests = await _employeeCardService.GetRequestsAsync(filter);
-
-            var viewModel = new IndexViewModel
-            {
-                CardRequests = requests.Data,
-                CurrentPage = page.Value,
-                IsProcessed = processed,
-                ItemCount = requests.Count,
-                ItemsPerPage = filter.Take.Value,
-            };
-
-            if (processed)
-            {
-                viewModel.PendingCount = await _employeeCardService.GetRequestCountAsync(false);
-                viewModel.ProcessedCount = viewModel.ItemCount;
-
-            }
-            else
-            {
-                viewModel.PendingCount = viewModel.ItemCount;
-                viewModel.ProcessedCount = await _employeeCardService.GetRequestCountAsync(true);
-            }
-
-            return View(viewModel);
-        }
-    }
-}
diff --git a/src/Ops.Controllers/Areas/Services/ViewModels/EmployeeCard/DetailsViewModel.cs b/src/Ops.Controllers/Areas/Services/ViewModels/EmployeeCard/DetailsViewModel.cs
deleted file mode 100644
index 892428312..000000000
--- a/src/Ops.Controllers/Areas/Services/ViewModels/EmployeeCard/DetailsViewModel.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using Ocuda.Promenade.Models.Entities;
-
-namespace Ocuda.Ops.Controllers.Areas.Services.ViewModels.EmployeeCard
-{
-    public class DetailsViewModel
-    {
-        public EmployeeCardRequest CardRequest { get; set; }
-        public SubmitType Action {get; set; }
-
-        public enum SubmitType
-        {
-            SaveNotes,
-            ProcessNoEmail,
-            ProcessWithEmail,
-            CreateCard
-        }
-    }
-}
diff --git a/src/Ops.Controllers/Areas/Services/ViewModels/EmployeeCard/IndexViewModel.cs b/src/Ops.Controllers/Areas/Services/ViewModels/EmployeeCard/IndexViewModel.cs
deleted file mode 100644
index c24b3edaf..000000000
--- a/src/Ops.Controllers/Areas/Services/ViewModels/EmployeeCard/IndexViewModel.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System.Collections.Generic;
-using Ocuda.Promenade.Models.Entities;
-using Ocuda.Utility.Models;
-
-namespace Ocuda.Ops.Controllers.Areas.Services.ViewModels.EmployeeCard
-{
-    public class IndexViewModel : PaginateModel
-    {
-        public ICollection<EmployeeCardRequest> CardRequests { get; set; }
-        public bool IsProcessed { get; set; }
-        public int PendingCount { get; set; }
-        public int ProcessedCount { get; set; }
-    }
-}
diff --git a/src/Ops.Data/Promenade/EmployeeCardRequestRepository.cs b/src/Ops.Data/Promenade/EmployeeCardRequestRepository.cs
deleted file mode 100644
index 51310b986..000000000
--- a/src/Ops.Data/Promenade/EmployeeCardRequestRepository.cs
+++ /dev/null
@@ -1,71 +0,0 @@
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Logging;
-using Ocuda.Ops.Data.Extensions;
-using Ocuda.Ops.Data.ServiceFacade;
-using Ocuda.Ops.Service.Filters;
-using Ocuda.Ops.Service.Interfaces.Promenade.Repositories;
-using Ocuda.Promenade.Models.Entities;
-using Ocuda.Utility.Models;
-
-namespace Ocuda.Ops.Data.Promenade
-{
-    public class EmployeeCardRequestRepository
-        : GenericRepository<PromenadeContext, EmployeeCardRequest>, IEmployeeCardRequestRepository
-    {
-        public EmployeeCardRequestRepository(Repository<PromenadeContext> repositoryFacade,
-            ILogger<EmployeeCardRequestRepository> logger)
-            : base(repositoryFacade, logger)
-        {
-        }
-
-        public async Task<EmployeeCardRequest> GetByIdAsync(int Id)
-        {
-            return await DbSet
-                .AsNoTracking()
-                .Where(_ => _.Id == Id)
-                .SingleOrDefaultAsync();
-        }
-
-        public async Task<int> GetCountAsync(bool? isProcessed)
-        {
-            var query = DbSet.AsNoTracking();
-
-            if (isProcessed.HasValue)
-            {
-                query = query.Where(_ => _.ProcessedAt.HasValue == isProcessed);
-            }
-
-            return await query.CountAsync();
-        }
-
-        public async Task<CollectionWithCount<EmployeeCardRequest>> GetPaginatedAsync(
-            RequestFilter filter)
-        {
-            var query = DbSet.AsNoTracking();
-
-            if (filter?.IsProcessed.HasValue == true)
-            {
-                query = query.Where(_ => _.ProcessedAt.HasValue == filter.IsProcessed.Value);
-            }
-
-            if (filter?.IsProcessed == true)
-            {
-                query = query.OrderByDescending(_ => _.ProcessedAt);
-            }
-            else
-            {
-                query = query.OrderBy(_ => _.SubmittedAt);
-            }
-
-            return new CollectionWithCount<EmployeeCardRequest>
-            {
-                Count = await query.CountAsync(),
-                Data = await query
-                    .ApplyPagination(filter)
-                    .ToListAsync()
-            };
-        }
-    }
-}
diff --git a/src/Ops.Data/PromenadeContext.cs b/src/Ops.Data/PromenadeContext.cs
index cf3f81240..fc2729157 100644
--- a/src/Ops.Data/PromenadeContext.cs
+++ b/src/Ops.Data/PromenadeContext.cs
@@ -47,8 +47,6 @@ protected PromenadeContext(DbContextOptions options) : base(options)
 
         public DbSet<EmediaText> EmediaTexts { get; set; }
 
-        public DbSet<EmployeeCardRequest> EmployeeCardRequests { get; }
-
         public DbSet<ExternalResource> ExternalResources { get; set; }
 
         public DbSet<Feature> Features { get; set; }
diff --git a/src/Ops.Service/EmployeeCardService.cs b/src/Ops.Service/EmployeeCardService.cs
deleted file mode 100644
index a82d9557a..000000000
--- a/src/Ops.Service/EmployeeCardService.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.Logging;
-using Ocuda.Ops.Service.Abstract;
-using Ocuda.Ops.Service.Filters;
-using Ocuda.Ops.Service.Interfaces.Promenade.Repositories;
-using Ocuda.Ops.Service.Interfaces.Promenade.Services;
-using Ocuda.Promenade.Models.Entities;
-using Ocuda.Utility.Abstract;
-using Ocuda.Utility.Exceptions;
-using Ocuda.Utility.Models;
-
-namespace Ocuda.Ops.Service
-{
-    public class EmployeeCardService : BaseService<EmployeeCardService>, IEmployeeCardService
-    {
-        private readonly IDateTimeProvider _dateTimeProvider;
-        private readonly IEmployeeCardRequestRepository _employeeCardRequestRepository;
-
-        public EmployeeCardService(ILogger<EmployeeCardService> logger,
-            IHttpContextAccessor httpContext,
-            IDateTimeProvider dateTimeProvider,
-            IEmployeeCardRequestRepository employeeCardRequestRepository)
-            : base(logger, httpContext)
-        {
-            ArgumentNullException.ThrowIfNull(dateTimeProvider);
-            ArgumentNullException.ThrowIfNull(employeeCardRequestRepository);
-
-            _dateTimeProvider = dateTimeProvider;
-            _employeeCardRequestRepository = employeeCardRequestRepository;
-        }
-
-        public async Task<EmployeeCardRequest> GetRequestAsync(int requestId)
-        {
-            return await _employeeCardRequestRepository.GetByIdAsync(requestId);
-        }
-
-        public async Task<int> GetRequestCountAsync(bool? isProcessed)
-        {
-            return await _employeeCardRequestRepository.GetCountAsync(isProcessed);
-        }
-
-        public async Task<CollectionWithCount<EmployeeCardRequest>> GetRequestsAsync(
-            RequestFilter filter)
-        {
-            return await _employeeCardRequestRepository.GetPaginatedAsync(filter);
-        }
-
-        public async Task ProcessAsync(EmployeeCardRequest cardRequest)
-        {
-            ArgumentNullException.ThrowIfNull(cardRequest);
-
-            var currentRequest = await _employeeCardRequestRepository.GetByIdAsync(cardRequest.Id);
-
-            if (currentRequest.ProcessedAt.HasValue)
-            {
-                throw new OcudaException("Request has already been processed.");
-            }
-
-            currentRequest.CardNumber = cardRequest.CardNumber.Trim();
-            currentRequest.Notes = cardRequest.Notes;
-            currentRequest.ProcessedAt = _dateTimeProvider.Now;
-            currentRequest.ProcessedBy = GetCurrentUserId();
-        }
-
-        public async Task UpdateNotesAsync(EmployeeCardRequest cardRequest)
-        {
-            ArgumentNullException.ThrowIfNull(cardRequest);
-
-            var currentRequest = await _employeeCardRequestRepository.GetByIdAsync(cardRequest.Id);
-            currentRequest.Notes = cardRequest.Notes.Trim();
-
-            await _employeeCardRequestRepository.AddAsync(currentRequest);
-            await _employeeCardRequestRepository.SaveAsync();
-        }
-    }
-}
diff --git a/src/Ops.Service/Interfaces/Promenade/Repositories/IEmployeeCardRequestRepository.cs b/src/Ops.Service/Interfaces/Promenade/Repositories/IEmployeeCardRequestRepository.cs
deleted file mode 100644
index 6b3493880..000000000
--- a/src/Ops.Service/Interfaces/Promenade/Repositories/IEmployeeCardRequestRepository.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System.Threading.Tasks;
-using Ocuda.Ops.Service.Filters;
-using Ocuda.Promenade.Models.Entities;
-using Ocuda.Utility.Models;
-
-namespace Ocuda.Ops.Service.Interfaces.Promenade.Repositories
-{
-    public interface IEmployeeCardRequestRepository : IGenericRepository<EmployeeCardRequest>
-    {
-        Task<EmployeeCardRequest> GetByIdAsync(int Id);
-        Task<int> GetCountAsync(bool? isProcessed);
-        Task<CollectionWithCount<EmployeeCardRequest>> GetPaginatedAsync(RequestFilter filter);
-    }
-}
diff --git a/src/Ops.Service/Interfaces/Promenade/Services/IEmployeeCardService.cs b/src/Ops.Service/Interfaces/Promenade/Services/IEmployeeCardService.cs
deleted file mode 100644
index 3a4906bb6..000000000
--- a/src/Ops.Service/Interfaces/Promenade/Services/IEmployeeCardService.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System.Threading.Tasks;
-using Ocuda.Ops.Service.Filters;
-using Ocuda.Promenade.Models.Entities;
-using Ocuda.Utility.Models;
-
-namespace Ocuda.Ops.Service.Interfaces.Promenade.Services
-{
-    public interface IEmployeeCardService
-    {
-        Task<EmployeeCardRequest> GetRequestAsync(int requestId);
-        Task<int> GetRequestCountAsync(bool? isProcessed);
-        Task<CollectionWithCount<EmployeeCardRequest>> GetRequestsAsync(RequestFilter filter);
-        Task UpdateNotesAsync(EmployeeCardRequest cardRequest);
-    }
-}
diff --git a/src/Ops.Web/Areas/Services/Views/CardRenewal/Index.cshtml b/src/Ops.Web/Areas/Services/Views/CardRenewal/Index.cshtml
index dc69fb32f..812b01ea7 100644
--- a/src/Ops.Web/Areas/Services/Views/CardRenewal/Index.cshtml
+++ b/src/Ops.Web/Areas/Services/Views/CardRenewal/Index.cshtml
@@ -34,7 +34,7 @@
 					</a>
 				</li>
 				<li class="nav-item">
-					<a asp-action="@nameof(EmployeeCardController.Index)"
+					<a asp-action="@nameof(CardRenewalController.Index)"
 					   asp-route-Processed="true"
 					   class="nav-link"
 					   ActiveBy routeKey="processed"
diff --git a/src/Ops.Web/Areas/Services/Views/EmployeeCard/Details.cshtml b/src/Ops.Web/Areas/Services/Views/EmployeeCard/Details.cshtml
deleted file mode 100644
index fa61eaae2..000000000
--- a/src/Ops.Web/Areas/Services/Views/EmployeeCard/Details.cshtml
+++ /dev/null
@@ -1,129 +0,0 @@
-@model Ocuda.Ops.Controllers.Areas.Services.ViewModels.EmployeeCard.DetailsViewModel
-
-<form asp-controller="@EmployeeCardController.Name"
-	  asp-action="@nameof(EmployeeCardController.Details)"
-	  method="post"
-	  role="form">
-	<input asp-for="CardRequest.Id" type="hidden" />
-
-	<div class="d-flex flex-wrap justify-content-between mb-2">
-		<h1 class="mb-0">
-			Employee Card Request
-			<small class="text-muted">#@Model.CardRequest.Id</small>
-		</h1>
-		<div>
-			<button name="Action"
-					value="@DetailsViewModel.SubmitType.CreateCard"
-					type="submit"
-					class="btn btn-outline-primary align-top mt-2">
-				<div>
-					<span class="fa fa-credit-card fa-fw"></span>
-					Create Polaris Account
-				</div>
-				<div>and Send Email</div>
-			</button>
-			<button name="Action"
-					value="@DetailsViewModel.SubmitType.ProcessWithEmail"
-					type="submit"
-					class="btn btn-outline-secondary align-top mt-2">
-				<div>
-					<span class="fa fa-circle-check fa-fw"></span>
-					Mark Processed
-				</div>
-				<div>and Send Email</div>
-			</button>
-			<button name="Action"
-					value="@DetailsViewModel.SubmitType.ProcessNoEmail"
-					type="submit"
-					class="btn btn-outline-warning align-top mt-2">
-				<div>
-					<span class="fa fa-circle-xmark fa-fw"></span>
-					Mark Processed
-				</div>
-				<div>and DO NOT Send Email</div>
-			</button>
-			<button name="Action"
-					value="@DetailsViewModel.SubmitType.SaveNotes"
-					type="submit"
-					class="btn btn-outline-info align-top mt-2">
-				<span class="fa fa-comment fa-fw"></span>
-				Save Notes
-			</button>
-			<a class="btn btn-outline-dark align-top mt-2"
-			   asp-controller="@EmployeeCardController.Name"
-			   asp-action="@(nameof(EmployeeCardController.Index))"
-			   asp-route-processed="@Model.CardRequest.ProcessedAt.HasValue">Back</a>
-		</div>
-	</div>
-
-	<div class="row">
-		<h4 class="col-md-3 text-md-end">Account Details</h4>
-	</div>
-	<div class="row mt-2">
-		<div class="col-md-3 text-md-end"><strong>Renewing?</strong></div>
-		<div class="col-md-9">@(Model.CardRequest.ExistingAccount ? "Yes" : "No")</div>
-	</div>
-	<div class="row mt-2">
-		@if (Model.CardRequest.ProcessedAt.HasValue)
-		{
-			<div class="col-md-3 text-md-end"><strong>Library Card #</strong></div>
-			<div class="col-md-9">@Model.CardRequest.CardNumber</div>
-		}
-		else
-		{
-			<input asp-for="CardRequest.CardNumber" formgroup label-class="col-md-3 fw-bold" />
-		}
-	</div>
-	<div class="row mt-3">
-		<div class="col-md-3 text-md-end"><strong>Last Name</strong></div>
-		<div class="col-md-9">@Model.CardRequest.LastName</div>
-	</div>
-	<div class="row mt-2">
-		<div class="col-md-3 text-md-end"><strong>First Name</strong></div>
-		<div class="col-md-9">@Model.CardRequest.FirstName</div>
-	</div>
-	<div class="row mt-4">
-		<div class="col-md-3 text-md-end"><strong>Address</strong></div>
-		<div class="col-md-9">@Model.CardRequest.StreetAddress</div>
-	</div>
-	<div class="row mt-2">
-		<div class="col-md-9 offset-md-3">@Model.CardRequest.City</div>
-	</div>
-	<div class="row mt-2">
-		<div class="col-md-9 offset-md-3">@Model.CardRequest.ZipCode</div>
-	</div>
-	<div class="row mt-4">
-		<div class="col-md-3 text-md-end"><strong>Email</strong></div>
-		<div class="col-md-9">@Model.CardRequest.Email</div>
-	</div>
-	<div class="row mt-2">
-		<div class="col-md-3 text-md-end"><strong>Phone Number</strong></div>
-		<div class="col-md-9">@Model.CardRequest.Phone</div>
-	</div>
-	<div class="row mt-2">
-		<div class="col-md-3 text-md-end"><strong>Birth Date</strong></div>
-		<div class="col-md-9">@Model.CardRequest.BirthDate</div>
-	</div>
-	<div class="row mt-4">
-		<div class="col-md-3 text-md-end"><strong>Department</strong></div>
-		<div class="col-md-9">@Model.CardRequest.Department</div>
-	</div>
-	<div class="row mt-2">
-		<div class="col-md-3 text-md-end"><strong>Employee #</strong></div>
-		<div class="col-md-9">@Model.CardRequest.EmployeeNumber</div>
-	</div>
-
-	<div class="row mt-4">
-		<h4 class="col-md-3 text-md-end">Request notes</h4>
-	</div>
-	<div class="row mt-2">
-		<div class="col-md-3 text-md-end">
-			<label asp-for="CardRequest.Notes" class="form-label fw-bold mb-0"></label>
-			<div><em>(Not saved in Polaris)</em></div>
-		</div>
-		<div class="col-md-9">
-			<textarea asp-for="CardRequest.Notes" class="form-control" rows="3"></textarea>
-			<span asp-validation-for="CardRequest.Notes" class="text-danger"></span>
-		</div>
-	</div>
-</form>
\ No newline at end of file
diff --git a/src/Ops.Web/Areas/Services/Views/EmployeeCard/Index.cshtml b/src/Ops.Web/Areas/Services/Views/EmployeeCard/Index.cshtml
deleted file mode 100644
index a3c258e42..000000000
--- a/src/Ops.Web/Areas/Services/Views/EmployeeCard/Index.cshtml
+++ /dev/null
@@ -1,73 +0,0 @@
-@model Ocuda.Ops.Controllers.Areas.Services.ViewModels.EmployeeCard.IndexViewModel
-
-<div class="row">
-	<div class="col-12 col-md-6 mb-2">
-		<h1>Employee Card Requests</h1>
-	</div>
-</div>
-
-<div class="row mb-2">
-	<div class="col-12">
-		<div class="d-inline-block">
-			<ul class="nav nav-pills">
-				<li class="nav-item">
-					<a asp-action="@nameof(EmployeeCardController.Index)"
-					   asp-route-Processed=""
-					   class="nav-link"
-					   ActiveBy routeKey="processed" value=",false">
-						Pending
-					</a>
-				</li>
-				<li class="nav-item">
-					<a asp-action="@nameof(EmployeeCardController.Index)"
-					   asp-route-Processed="true"
-					   class="nav-link"
-					   ActiveBy routeKey="processed"
-					   value="@true">
-						Processed
-					</a>
-				</li>
-			</ul>
-		</div>
-	</div>
-</div>
-
-<table class="table table-sm table-bordered link-table">
-	<thead>
-		<tr>
-			<th>@(Model.IsProcessed ? "Processed" : "Submitted")</th>
-			<th>Name</th>
-			<th>Email</th>
-			<th>Department</th>
-		</tr>
-	</thead>
-	<tbody>
-		@if (Model.ItemCount == 0)
-		{
-			<tr>
-				<td colspan="4">
-					No requests found.
-				</td>
-			</tr>
-		}
-		else
-		{
-			@foreach (var request in Model.CardRequests)
-			{
-				<tr>
-					<td>
-						<a asp-action="@(nameof(EmployeeCardController.Details))"
-						   asp-route-id="@request.Id">
-							@(Model.IsProcessed? request.ProcessedAt: request.SubmittedAt)
-						</a>
-					</td>
-					<td>@request.FirstName @request.LastName</td>
-					<td>@request.Email</td>
-					<td>@request.Department</td>
-				</tr>
-			}
-		}
-	</tbody>
-</table>
-
-<nav paginate="@Model"></nav>
\ No newline at end of file
diff --git a/src/Ops.Web/Areas/Services/Views/_ViewImports.cshtml b/src/Ops.Web/Areas/Services/Views/_ViewImports.cshtml
index ea056420d..e74331b16 100644
--- a/src/Ops.Web/Areas/Services/Views/_ViewImports.cshtml
+++ b/src/Ops.Web/Areas/Services/Views/_ViewImports.cshtml
@@ -1,7 +1,5 @@
 @using Ocuda.Ops.Web
 @using Ocuda.Ops.Controllers.Areas.Services
-@using Ocuda.Ops.Controllers.Areas.Services.ViewModels.EmployeeCard
-@using Ocuda.Promenade.Models.Entities
 @using Ocuda.Utility.TagHelpers
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
 @addTagHelper *, Ocuda.Utility
\ No newline at end of file
diff --git a/src/Ops.Web/Startup.cs b/src/Ops.Web/Startup.cs
index 1b7152ebf..7d3d72a13 100644
--- a/src/Ops.Web/Startup.cs
+++ b/src/Ops.Web/Startup.cs
@@ -484,8 +484,6 @@ string cacheDiscriminator
                 Data.Promenade.EmediaRepository>();
             services.AddScoped<Service.Interfaces.Promenade.Repositories.IEmediaTextRepository,
                 Data.Promenade.EmediaTextRepository>();
-            services.AddScoped<Service.Interfaces.Promenade.Repositories.IEmployeeCardRequestRepository,
-                Data.Promenade.EmployeeCardRequestRepository>();
             services.AddScoped<Service.Interfaces.Promenade.Repositories.IExternalResourcePromRepository,
                 Data.Promenade.ExternalResourcePromRepository>();
             services.AddScoped<Service.Interfaces.Promenade.Repositories.IFeatureRepository,
@@ -587,7 +585,6 @@ string cacheDiscriminator
             services.AddScoped<IDigitalDisplaySyncService, DigitalDisplaySyncService>();
             services.AddScoped<IEmediaService, EmediaService>();
             services.AddScoped<IEmailService, EmailService>();
-            services.AddScoped<IEmployeeCardService, EmployeeCardService>();
             services.AddScoped<IExternalResourcePromService, ExternalResourcePromService>();
             services.AddScoped<IExternalResourceService, ExternalResourceService>();
             services.AddScoped<IFeatureService, FeatureService>();
diff --git a/src/Ops.Web/Views/Shared/_Layout.cshtml b/src/Ops.Web/Views/Shared/_Layout.cshtml
index 213e41f16..e6738e620 100644
--- a/src/Ops.Web/Views/Shared/_Layout.cshtml
+++ b/src/Ops.Web/Views/Shared/_Layout.cshtml
@@ -158,13 +158,6 @@
 								<span class="fa-solid fa-credit-card fa-fw"></span>
 								Card Renewal
 							</a>
-							<a class="dropdown-item"
-							   asp-controller="@Ocuda.Ops.Controllers.Areas.Services.EmployeeCardController.Name"
-							   asp-area="@(nameof(Ocuda.Ops.Controllers.Areas.Services))"
-							   asp-action="@(nameof(Ocuda.Ops.Controllers.Areas.Services.EmployeeCardController.Index))">
-								<span class="fa-solid fa-clipboard-user fa-fw"></span>
-								Employee Card
-							</a>
 							<a class="dropdown-item"
 							   asp-controller="@Ocuda.Ops.Controllers.Areas.Incident.HomeController.Name"
 							   asp-area="@(nameof(Ocuda.Ops.Controllers.Areas.Incident))"
diff --git a/src/Promenade.Controllers/ServicesController.cs b/src/Promenade.Controllers/ServicesController.cs
deleted file mode 100644
index 9e259627e..000000000
--- a/src/Promenade.Controllers/ServicesController.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
-using Ocuda.Promenade.Controllers.Abstract;
-using Ocuda.Promenade.Controllers.Filters;
-using Ocuda.Promenade.Controllers.ViewModels.Services;
-using Ocuda.Promenade.Models.Entities;
-using Ocuda.Promenade.Service;
-using Ocuda.Utility;
-using Ocuda.Utility.Filters;
-
-namespace Ocuda.Promenade.Controllers
-{
-    [Route("[Controller]")]
-    [Route("{culture:cultureConstraint?}/[Controller]")]
-    public class ServicesController : BaseController<ServicesController>
-    {
-        private readonly EmployeeCardService _employeeCardService;
-        private readonly PageService _pageService;
-        private readonly SegmentService _segmentService;
-
-        public ServicesController(ServiceFacades.Controller<ServicesController> context,
-            EmployeeCardService employeeCardService,
-            PageService pageService,
-            SegmentService segmentService)
-            : base(context) 
-        {
-            ArgumentNullException.ThrowIfNull(employeeCardService);
-            ArgumentNullException.ThrowIfNull(pageService);
-            ArgumentNullException.ThrowIfNull(segmentService);
-
-            _employeeCardService = employeeCardService;
-            _pageService = pageService;
-            _segmentService = segmentService;
-        }
-
-        public static string Name
-        { get { return "Services"; } }
-
-        [HttpGet("[action]")]
-        [RestoreModelState]
-        public async Task<IActionResult> EmployeeCard()
-        {
-            var viewModel = new EmployeeCardViewModel()
-            {
-                CardRequest = new EmployeeCardRequest()
-            };
-
-            var employeeCardSegmentId = await _siteSettingService
-                .GetSettingIntAsync(Models.Keys.SiteSetting.Card.EmployeeCardSegment);
-            if (employeeCardSegmentId > 0)
-            {
-                viewModel.Segment =  await _segmentService
-                    .GetSegmentTextBySegmentIdAsync(employeeCardSegmentId, false);
-            }
-
-            return View(viewModel);
-        }
-
-        [HttpPost("[action]")]
-        [SaveModelState]
-        public async Task<IActionResult> EmployeeCard(EmployeeCardViewModel viewModel)
-        {
-            ArgumentNullException.ThrowIfNull(viewModel);
-
-            if (viewModel.CardRequest.ExistingAccount
-                && string.IsNullOrWhiteSpace(viewModel.CardRequest.CardNumber))
-            {
-                ModelState.AddModelError("CardRequest.CardNumber",
-                    _localizer[ErrorMessage.FieldRequired,
-                        _localizer[i18n.Keys.Promenade.PromptLibraryCardNumber]]);
-            }
-
-            if (ModelState.IsValid)
-            {
-                if (!viewModel.CardRequest.ExistingAccount)
-                {
-                    viewModel.CardRequest.CardNumber = null;
-                }
-
-                await _employeeCardService.AddRequestAsync(viewModel.CardRequest);
-
-                var thanksPageId = await _siteSettingService.GetSettingIntAsync(
-                    Models.Keys.SiteSetting.Card.EmployeeCardThanksPage);
-
-                if (thanksPageId >= 0)
-                {
-                    var pageStub = await _pageService
-                    .GetStubByHeaderIdTypeAsync(thanksPageId,
-                        PageType.Thanks,
-                        false);
-
-                    if (!string.IsNullOrEmpty(pageStub))
-                    {
-                        return RedirectToAction(nameof(ThanksController.Page),
-                            ThanksController.Name,
-                            new { stub = pageStub });
-                    }
-                }
-
-                SetAlertInfo(Ocuda.i18n.Keys.Promenade.EmployeeCardThankYou);
-                ModelState.Clear();
-            }
-
-            return RedirectToAction(nameof(EmployeeCard));
-        }
-    }
-}
diff --git a/src/Promenade.Controllers/ViewModels/Services/EmployeeCardViewModel.cs b/src/Promenade.Controllers/ViewModels/Services/EmployeeCardViewModel.cs
deleted file mode 100644
index e49e91e3e..000000000
--- a/src/Promenade.Controllers/ViewModels/Services/EmployeeCardViewModel.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using Ocuda.Promenade.Models.Entities;
-
-namespace Ocuda.Promenade.Controllers.ViewModels.Services
-{
-    public class EmployeeCardViewModel
-    {
-        public EmployeeCardRequest CardRequest { get; set; }
-        public SegmentText Segment { get; set; }
-    }
-}
diff --git a/src/Promenade.Data/Promenade/EmployeeCardRequestRepository.cs b/src/Promenade.Data/Promenade/EmployeeCardRequestRepository.cs
deleted file mode 100644
index b4af96a73..000000000
--- a/src/Promenade.Data/Promenade/EmployeeCardRequestRepository.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using System.Threading.Tasks;
-using Microsoft.Extensions.Logging;
-using Ocuda.Promenade.Models.Entities;
-using Ocuda.Promenade.Service.Interfaces.Repositories;
-
-namespace Ocuda.Promenade.Data.Promenade
-{
-    public class EmployeeCardRequestRepository
-        : GenericRepository<PromenadeContext, EmployeeCardRequest>,
-            IEmployeeCardRequestRepository
-    {
-        public EmployeeCardRequestRepository(
-            ServiceFacade.Repository<PromenadeContext> repositoryFacade,
-            ILogger<EmployeeCardRequestRepository> logger) : base(repositoryFacade, logger)
-        {
-        }
-
-        public async Task AddSaveAsync(EmployeeCardRequest cardRequest)
-        {
-            await DbSet.AddAsync(cardRequest);
-            await _context.SaveChangesAsync();
-        }
-    }
-}
diff --git a/src/Promenade.Data/PromenadeContext.cs b/src/Promenade.Data/PromenadeContext.cs
index 7298eff8d..068e545cc 100644
--- a/src/Promenade.Data/PromenadeContext.cs
+++ b/src/Promenade.Data/PromenadeContext.cs
@@ -29,7 +29,6 @@ protected PromenadeContext(DbContextOptions options) : base(options)
         public DbSet<EmediaCategory> EmediaCategories { get; set; }
         public DbSet<EmediaGroup> EmediaGroups { get; }
         public DbSet<EmediaText> EmediaTexts { get; }
-        public DbSet<EmployeeCardRequest> EmployeeCardRequests { get; }
         public DbSet<ExternalResource> ExternalResources { get; set; }
         public DbSet<Feature> Features { get; }
         public DbSet<Group> Groups { get; }
diff --git a/src/Promenade.Models/Defaults/SiteSetting.cs b/src/Promenade.Models/Defaults/SiteSetting.cs
index a15919200..3afcee4a9 100644
--- a/src/Promenade.Models/Defaults/SiteSetting.cs
+++ b/src/Promenade.Models/Defaults/SiteSetting.cs
@@ -8,29 +8,6 @@ public static class SiteSettings
     {
         public static IEnumerable<SiteSetting> Get { get; } = new[]
         {
-            #region Card
-
-            new SiteSetting 
-            {
-                Category = nameof(Keys.SiteSetting.Card),
-                Description = "Segment to show on the employee card request page",
-                Id = Keys.SiteSetting.Card.EmployeeCardSegment,
-                Name = "Employee card segment",
-                Type = SiteSettingType.Int,
-                Value = "-1"
-            },
-            new SiteSetting 
-            {
-                Category = nameof(Keys.SiteSetting.Card),
-                Description = "Thanks page to show after employee card request is submitted",
-                Id = Keys.SiteSetting.Card.EmployeeCardThanksPage,
-                Name = "Employee card thanks page",
-                Type = SiteSettingType.Int,
-                Value = "-1"
-            },
-
-            #endregion Card
-
             #region CardRenewal
 
             new SiteSetting
diff --git a/src/Promenade.Models/Entities/EmployeeCardRequest.cs b/src/Promenade.Models/Entities/EmployeeCardRequest.cs
deleted file mode 100644
index 5a518352e..000000000
--- a/src/Promenade.Models/Entities/EmployeeCardRequest.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-using System;
-using System.ComponentModel;
-using System.ComponentModel.DataAnnotations;
-
-namespace Ocuda.Promenade.Models.Entities
-{
-    public class EmployeeCardRequest
-    {
-        [Required]
-        [DisplayName(i18n.Keys.Promenade.PromptBirthDate)]
-        public DateTime BirthDate { get; set; }
-
-        [DisplayName(i18n.Keys.Promenade.PromptLibraryCardNumber)]
-        [MaxLength(16)]
-        public string CardNumber { get; set; }
-
-        [Required]
-        [DisplayName(i18n.Keys.Promenade.PromptCity)]
-        [MaxLength(255)]
-        public string City { get; set; }
-
-        [Required]
-        [DisplayName(i18n.Keys.Promenade.PromptCountyDepartment)]
-        [MaxLength(255)]
-        public string Department { get; set; }
-
-        [Required]
-        [DisplayName(i18n.Keys.Promenade.PromptEmail)]
-        [MaxLength(255)]
-        public string Email { get; set; }
-
-        [Required]
-        [DisplayName(i18n.Keys.Promenade.PromptEmployeeNumber)]
-        [MaxLength(16)]
-        public string EmployeeNumber { get; set; }
-
-        public bool ExistingAccount { get; set; }
-
-        [Required]
-        [DisplayName(i18n.Keys.Promenade.PromptFirstName)]
-        [MaxLength(255)]
-        public string FirstName { get; set; }
-
-        [Key]
-        [Required]
-        public int Id { get; set; }
-
-        [Required]
-        [DisplayName(i18n.Keys.Promenade.PromptLastName)]
-        [MaxLength(255)]
-        public string LastName { get; set; }
-
-        [MaxLength(2000)]
-        public string Notes { get; set; }
-
-        [Required]
-        [DisplayName(i18n.Keys.Promenade.PromptPhone)]
-        [MaxLength(16)]
-        public string Phone { get; set; }
-
-        public DateTime? ProcessedAt { get; set; }
-        public int? ProcessedBy { get; set; }
-        
-        [Required]
-        [DisplayName(i18n.Keys.Promenade.PromptStreetAddress)]
-        [MaxLength(255)]
-        public string StreetAddress { get; set; }
-
-        public DateTime SubmittedAt { get; set; }
-
-        [Required]
-        [DisplayName(i18n.Keys.Promenade.PromptZipCode)]
-        [MaxLength(16)]
-        public string ZipCode { get; set; }
-    }
-}
diff --git a/src/Promenade.Models/Keys/SiteSetting.cs b/src/Promenade.Models/Keys/SiteSetting.cs
index be5580632..4b5d6798d 100644
--- a/src/Promenade.Models/Keys/SiteSetting.cs
+++ b/src/Promenade.Models/Keys/SiteSetting.cs
@@ -2,16 +2,6 @@
 {
     namespace SiteSetting
     {
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Performance",
-            "CA1815:Override equals and operator equals on value types",
-            Justification = "No reason to compare these site setting keys")]
-        public struct Card
-        {
-            public const string EmployeeCardSegment = "Card.EmployeeCardSegment";
-            public const string EmployeeCardThanksPage 
-                = "Card.EmployeeCardThanksPage";
-        }
-
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Performance",
             "CA1815:Override equals and operator equals on value types",
             Justification = "No reason to compare these site setting keys")]
diff --git a/src/Promenade.Service/EmployeeCardService.cs b/src/Promenade.Service/EmployeeCardService.cs
deleted file mode 100644
index 1d4d6f07f..000000000
--- a/src/Promenade.Service/EmployeeCardService.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using Microsoft.Extensions.Logging;
-using Ocuda.Promenade.Models.Entities;
-using Ocuda.Promenade.Service.Abstract;
-using Ocuda.Promenade.Service.Interfaces.Repositories;
-using Ocuda.Utility.Abstract;
-
-namespace Ocuda.Promenade.Service
-{
-    public class EmployeeCardService : BaseService<EmployeeCardService>
-    {
-        private readonly IEmployeeCardRequestRepository _employeeCardRequestRepository;
-
-        public EmployeeCardService(ILogger<EmployeeCardService> logger,
-            IDateTimeProvider dateTimeProvider,
-            IEmployeeCardRequestRepository employeeCardRequestRepository)
-            : base(logger, dateTimeProvider)
-        {
-            ArgumentNullException.ThrowIfNull(nameof(employeeCardRequestRepository));
-
-            _employeeCardRequestRepository = employeeCardRequestRepository;
-        }
-
-        public async Task AddRequestAsync(EmployeeCardRequest cardRequest)
-        {
-            ArgumentNullException.ThrowIfNull(cardRequest);
-
-            cardRequest.SubmittedAt = _dateTimeProvider.Now;
-            await _employeeCardRequestRepository.AddSaveAsync(cardRequest);
-        }
-    }
-}
diff --git a/src/Promenade.Service/Interfaces/Repositories/IEmployeeCardRequestRepository.cs b/src/Promenade.Service/Interfaces/Repositories/IEmployeeCardRequestRepository.cs
deleted file mode 100644
index 4f72b2249..000000000
--- a/src/Promenade.Service/Interfaces/Repositories/IEmployeeCardRequestRepository.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using System.Threading.Tasks;
-using Ocuda.Promenade.Models.Entities;
-
-namespace Ocuda.Promenade.Service.Interfaces.Repositories
-{
-    public interface IEmployeeCardRequestRepository : IGenericRepository<EmployeeCardRequest>
-    {
-        Task AddSaveAsync(EmployeeCardRequest cardRequest);
-    }
-}
diff --git a/src/Promenade.Web/Startup.cs b/src/Promenade.Web/Startup.cs
index 5aa9d8df0..e3b5d9acd 100644
--- a/src/Promenade.Web/Startup.cs
+++ b/src/Promenade.Web/Startup.cs
@@ -424,8 +424,6 @@ string cacheDiscriminator
                 Data.Promenade.EmediaTextRepository>();
             services.AddScoped<Service.Interfaces.Repositories.IExternalResourceRepository,
                 Data.Promenade.ExternalResourceRepository>();
-            services.AddScoped<Service.Interfaces.Repositories.IEmployeeCardRequestRepository,
-                Data.Promenade.EmployeeCardRequestRepository>();
             services.AddScoped<Service.Interfaces.Repositories.IFeatureRepository,
                 Data.Promenade.FeatureRepository>();
             services.AddScoped<Service.Interfaces.Repositories.IVolunteerFormRepository,
@@ -535,7 +533,6 @@ string cacheDiscriminator
             services.AddScoped<CategoryService>();
             services.AddScoped<DeckService>();
             services.AddScoped<EmediaService>();
-            services.AddScoped<EmployeeCardService>();
             services.AddScoped<ExternalResourceService>();
             services.AddScoped<ImageFeatureService>();
             services.AddScoped<LanguageService>();
diff --git a/src/Promenade.Web/Views/Services/EmployeeCard.cshtml b/src/Promenade.Web/Views/Services/EmployeeCard.cshtml
deleted file mode 100644
index f02c28219..000000000
--- a/src/Promenade.Web/Views/Services/EmployeeCard.cshtml
+++ /dev/null
@@ -1,102 +0,0 @@
-@model Ocuda.Promenade.Controllers.ViewModels.Services.EmployeeCardViewModel
-
-@if (!string.IsNullOrEmpty(Model.Segment?.Header))
-{
-	<div class="row">
-		<div class="col-12">
-			<h2>@Model.Segment.Header</h2>
-		</div>
-	</div>
-}
-
-@if (!string.IsNullOrEmpty(Model.Segment?.Text))
-{
-	<div class="row">
-		<div class="col-12">
-			@Html.Raw(Model.Segment.Text)
-		</div>
-	</div>
-}
-
-<div class="row mt-4">
-	<div class="col-12">
-		<form method="post"
-			  role="form"
-			  asp-action="@nameof(ServicesController.EmployeeCard)"
-			  asp-controller="@ServicesController.Name"
-			  asp-route-culture="">
-			<div class="row mb-3">
-				<label class="col-form-label text-md-end col-md-3 pt-0">@Localizer[Promenade.EmployeeCardRenewLabel]</label>
-				<div class="col-md-9">
-					<div class="form-check form-check-inline">
-						<label class="form-check-label" for="ExistingCardYes">@Localizer[Promenade.LabelYes]</label>
-						<input asp-for="CardRequest.ExistingAccount" id="ExistingAccountYes" class="form-check-input" type="radio" value="true" />
-					</div>
-					<div class="form-check form-check-inline">
-						<label class="form-check-label" for="ExistingCardNo">@Localizer[Promenade.LabelNo]</label>
-						<input asp-for="CardRequest.ExistingAccount" id="ExistingAccountNo" class="form-check-input" type="radio" value="false" />
-					</div>
-					<em>@Localizer[Promenade.EmployeeCardRenewInfo]</em>
-				</div>
-			</div>
-			<div id="cardNumberInputContainer" class="row mb-3 @(ViewData.ModelState["CardRequest.ExistingAccount"]?.AttemptedValue == "true" ? "" : "d-none")">
-				<label asp-for="CardRequest.CardNumber" class="col-form-label text-md-end col-md-3"></label>
-				<div class="col-md-9">
-					<input asp-for="CardRequest.CardNumber" class="form-control" />
-					<span asp-validation-for="CardRequest.CardNumber" class="validation-message text-danger"></span>
-				</div>
-			</div>
-
-			<hr class="col-md-9 offset-md-3" />
-
-			<div class="row mb-1">
-				<label class="form-label text-md-end col-md-3"><strong>@Localizer[Promenade.EmployeeCardPersonalLabel]</strong></label>
-			</div>
-
-			<input asp-for="CardRequest.FirstName" formgroup />
-			<input asp-for="CardRequest.LastName" formgroup />
-			<input asp-for="CardRequest.BirthDate" formgroup />
-			<input asp-for="CardRequest.Email" formgroup />
-			<input asp-for="CardRequest.Phone" formgroup />
-
-			<div class="row mb-1">
-				<label class="form-label text-md-end col-md-3"><strong>@Localizer[Promenade.EmployeeCardAddressLabel]</strong></label>
-				<div class="col-md-9">
-					<em>@Localizer[Promenade.EmployeeCardAddressInfo]</em>
-				</div>
-			</div>
-
-			<input asp-for="CardRequest.StreetAddress" formgroup />
-			<input asp-for="CardRequest.City" formgroup />
-			<input asp-for="CardRequest.ZipCode" formgroup />
-
-			<div class="row mb-1">
-				<label class="form-label text-md-end col-md-3"><strong>@Localizer[Promenade.EmployeeCardEmployeeLabel]</strong></label>
-			</div>
-
-			<input asp-for="CardRequest.EmployeeNumber" formgroup />
-			<input asp-for="CardRequest.Department" formgroup />
-
-
-			<button type="submit"
-					class="btn btn-outline-success m-2 btn-lg float-end">
-				<span class="fa-regular fa-circle-check"></span>
-				@Localizer[Promenade.ButtonSubmit]
-			</button>
-		</form>
-	</div>
-</div>
-
-@section scripts
-{
-	<script>
-		$('input[name="CardRequest.ExistingAccount"]').on('change', function() {
-			if ($(this).val() == "true") {
-				$('#cardNumberInputContainer').removeClass('d-none');
-			}
-			else {
-				$('#cardNumberInputContainer').addClass('d-none');
-			}
-		});
-	</script>
-}
\ No newline at end of file
diff --git a/src/i18n/Keys/Promenade.cs b/src/i18n/Keys/Promenade.cs
index b65d034f6..1f35cf56c 100644
--- a/src/i18n/Keys/Promenade.cs
+++ b/src/i18n/Keys/Promenade.cs
@@ -31,13 +31,6 @@ public static class Promenade
         public const string ContactInformation = "Contact Information";
         public const string ContactUs = "Contact Us";
         public const string CoordinatesErrorItem = "There was a problem locating these coordinates: {0}, {1}";
-        public const string EmployeeCardAddressInfo = "please do not enter your work address here";
-        public const string EmployeeCardAddressLabel = "Home Address";
-        public const string EmployeeCardEmployeeLabel = "Employee Information";
-        public const string EmployeeCardPersonalLabel = "Personal Information";
-        public const string EmployeeCardRenewInfo = "Please select yes if you already have a library card!";
-        public const string EmployeeCardRenewLabel = "Renew an existing Account?";
-        public const string EmployeeCardThankYou = "Thank you for submitting your request!";
         public const string Error = "Error";
         public const string ErrorAvailableDaysItem = "This service is only available on the following days: {0}";
         public const string ErrorCouldNotGeocode = "An error occurred and we could not find libraries near that location.";
@@ -61,8 +54,6 @@ public static class Promenade
         public const string HelpItem = "{0} help";
         public const string HowCanWeHelp = "How can we help?";
         public const string KeywordsItem = "Keywords: {0}";
-        public const string LabelNo = "No";
-        public const string LabelYes = "Yes";
         public const string LinkAdultVolunteerForm = "Use our adult volunteer form.";
         public const string LinkTeenVolunteerForm = "Use our teen volunteer form.";
         public const string LocationBackToLocationName = "Back to {0}";
@@ -106,21 +97,14 @@ public static class Promenade
         public const string ProductInventoryStatus = "Status";
         public const string PromptAreYouAdultVolunteer = "Are you an adult looking to volunteer?";
         public const string PromptAreYouTeenVolunteer = "Are you a teen looking to volunteer?";
-        public const string PromptBirthDate = "Birth Date";
-        public const string PromptCity = "City";
-        public const string PromptCountyDepartment = "County Department";
         public const string PromptEmail = "Email";
-        public const string PromptEmployeeNumber = "Employee Number";
         public const string PromptExperience = "Why do you want to volunteer? Describe any previous volunteer experience.";
-        public const string PromptFirstName = "First Name";
         public const string PromptGuardianBarcode = "Parent/Guardian Barcode";
         public const string PromptGuardianEmail = "Parent/Guardian Email";
         public const string PromptGuardianName = "Parent/Guardian Name";
         public const string PromptGuardianPhone = "Parent/Guardian Phone";
         public const string PromptLanguage = "Language";
-        public const string PromptLastName = "Last Name";
         public const string PromptLibraryCardNumber = "Library Card Number";
-        public const string PromptLibraryCardPlease = "Please enter your library card number";
         public const string PromptName = "Name";
         public const string PromptNotes = "Notes";
         public const string PromptPassword = "Password";
@@ -128,11 +112,9 @@ public static class Promenade
         public const string PromptRequestedDate = "Requested date";
         public const string PromptRequestedDateAndTime = "Requested date and time";
         public const string PromptRequestedTime = "Requested time";
-        public const string PromptStreetAddress = "Street Address";
         public const string PromptSubject = "Subject";
         public const string PromptVolunteerRegularity = "Are you interested in regular volunteer work or certain number of hours?";
         public const string PromptWeeklyAvailability = "Weekly Availability";
-        public const string PromptZipCode = "Zip Code";
         public const string RenewYourLibraryCard = "Renew your library card";
         public const string RequiredField = "You must supply a value for: {0}";
         public const string RequiredFieldItem = "The {0} field is required.";

From 41caf75fa3203a694a9460cccc13bf8ffeb4c38d Mon Sep 17 00:00:00 2001
From: Dan Wilcox <DanielWilcox@mcldaz.org>
Date: Tue, 20 Jan 2026 13:12:14 -0700
Subject: [PATCH 07/13] Clean up code

---
 src/Ops.Controllers/ApiController.cs          |   1 -
 .../CardRenewalController.cs                  |   4 -
 .../Areas/Services/CardRenewalController.cs   |   7 +-
 src/Ops.Models/Defaults/SiteSettings.cs       |   2 +-
 src/Ops.Service/CardRenewalRequestService.cs  |   1 -
 .../Interfaces/Ops/Services/IEmailService.cs  |   8 +-
 .../Views/CardRenewal/Response.cshtml         |  24 +-
 .../Views/CardRenewal/Responses.cshtml        |   6 +-
 .../Services/Views/CardRenewal/Details.cshtml |   2 +
 .../Services/Views/CardRenewal/Index.cshtml   |   3 +-
 src/Ops.Web/Views/Shared/_Layout.cshtml       | 636 +++++++++---------
 .../CardRenewalController.cs                  |   8 +-
 src/Promenade.Controllers/TempDataKey.cs      |   2 +-
 .../CardRenewal/VerifyAddressViewModel.cs     |   2 +-
 .../Views/CardRenewal/NotConfigured.cshtml    |   1 +
 .../Views/CardRenewal/UnableToRenew.cshtml    |   1 +
 src/Promenade.Web/Views/Shared/_Layout.cshtml |   8 -
 17 files changed, 350 insertions(+), 366 deletions(-)

diff --git a/src/Ops.Controllers/ApiController.cs b/src/Ops.Controllers/ApiController.cs
index f0558125e..6447f4f29 100644
--- a/src/Ops.Controllers/ApiController.cs
+++ b/src/Ops.Controllers/ApiController.cs
@@ -15,7 +15,6 @@
 using Ocuda.Ops.Service.Interfaces.Ops.Services;
 using Ocuda.Utility.Exceptions;
 using Ocuda.Utility.Keys;
-using Org.BouncyCastle.Utilities.Encoders;
 using Serilog.Context;
 
 namespace Ocuda.Ops.Controllers
diff --git a/src/Ops.Controllers/Areas/ContentManagement/CardRenewalController.cs b/src/Ops.Controllers/Areas/ContentManagement/CardRenewalController.cs
index f51495fe7..0f100c557 100644
--- a/src/Ops.Controllers/Areas/ContentManagement/CardRenewalController.cs
+++ b/src/Ops.Controllers/Areas/ContentManagement/CardRenewalController.cs
@@ -21,27 +21,23 @@ namespace Ocuda.Ops.Controllers.Areas.ContentManagement
     [Route("[area]/[controller]")]
     public class CardRenewalController : BaseController<CardRenewalController>
     {
-        private readonly ICardRenewalRequestService _cardRenewalRequestService;
         private readonly ICardRenewalService _cardRenewalService;
         private readonly IEmailService _emailService;
         private readonly ILanguageService _languageService;
         private readonly IPermissionGroupService _permissionGroupService;
 
         public CardRenewalController(ServiceFacades.Controller<CardRenewalController> context,
-            ICardRenewalRequestService cardRenewalRequestService,
             ICardRenewalService cardRenewalService,
             IEmailService emailService,
             ILanguageService languageService,
             IPermissionGroupService permissionGroupService)
             : base(context)
         {
-            ArgumentNullException.ThrowIfNull(cardRenewalRequestService);
             ArgumentNullException.ThrowIfNull(cardRenewalService);
             ArgumentNullException.ThrowIfNull(emailService);
             ArgumentNullException.ThrowIfNull(languageService);
             ArgumentNullException.ThrowIfNull(permissionGroupService);
 
-            _cardRenewalRequestService = cardRenewalRequestService;
             _cardRenewalService = cardRenewalService;
             _emailService = emailService;
             _languageService = languageService;
diff --git a/src/Ops.Controllers/Areas/Services/CardRenewalController.cs b/src/Ops.Controllers/Areas/Services/CardRenewalController.cs
index 4bb8e3961..d44c974a7 100644
--- a/src/Ops.Controllers/Areas/Services/CardRenewalController.cs
+++ b/src/Ops.Controllers/Areas/Services/CardRenewalController.cs
@@ -25,7 +25,7 @@ namespace Ocuda.Ops.Controllers.Areas.Services
     [Route("[area]/[controller]")]
     public class CardRenewalController : BaseController<CardRenewalController>
     {
-        private const string leapPatronRecordsPath = "/records";
+        private const string leapPatronRecordsPath = "/record";
 
         private readonly ICardRenewalRequestService _cardRenewalRequestService;
         private readonly ICardRenewalService _cardRenewalService;
@@ -292,6 +292,11 @@ public async Task<JsonResult> GetResponseText(int responseId, int languageId)
         [HttpGet("[action]")]
         public async Task<IActionResult> Index(int? page, bool processed)
         {
+            if (!_polarisHelper.IsConfigured)
+            {
+                _logger.LogError("Card renewal API settings are not configured");
+            }
+
             page ??= 1;
 
             var filter = new RequestFilter(page.Value)
diff --git a/src/Ops.Models/Defaults/SiteSettings.cs b/src/Ops.Models/Defaults/SiteSettings.cs
index 6954fe4b0..f627eac70 100644
--- a/src/Ops.Models/Defaults/SiteSettings.cs
+++ b/src/Ops.Models/Defaults/SiteSettings.cs
@@ -239,7 +239,7 @@ public static class SiteSettings
                 Name = "Email template id",
                 Description = "Email template id to use when sending a notificaton about a new incident report, 0 is disabled",
                 Category = "Incident",
-                Value = "-1",
+                Value = "0",
                 Type = SiteSettingType.Int
             },
             new SiteSetting
diff --git a/src/Ops.Service/CardRenewalRequestService.cs b/src/Ops.Service/CardRenewalRequestService.cs
index 3b5661bd0..dd9d0617b 100644
--- a/src/Ops.Service/CardRenewalRequestService.cs
+++ b/src/Ops.Service/CardRenewalRequestService.cs
@@ -24,7 +24,6 @@ public CardRenewalRequestService(ILogger<CardRenewalRequestService> logger,
             ArgumentNullException.ThrowIfNull(cardRenewalRequestRepository);
 
             _cardRenewalRequestRepository = cardRenewalRequestRepository;
-
         }
 
         public async Task<CardRenewalRequest> GetRequestAsync(int id)
diff --git a/src/Ops.Service/Interfaces/Ops/Services/IEmailService.cs b/src/Ops.Service/Interfaces/Ops/Services/IEmailService.cs
index 4cbef7752..ce828d7d4 100644
--- a/src/Ops.Service/Interfaces/Ops/Services/IEmailService.cs
+++ b/src/Ops.Service/Interfaces/Ops/Services/IEmailService.cs
@@ -7,12 +7,12 @@ namespace Ocuda.Ops.Service.Interfaces.Ops.Services
 {
     public interface IEmailService
     {
-        Task<Details> GetDetailsAsync(int emailSetupId, string languageName,
-            IDictionary<string, string> tags, string overrideText = null);
-
+        Task<Details> GetDetailsAsync(int emailSetupId, 
+            string languageName,
+            IDictionary<string, string> tags, 
+            string overrideText = null);
         Task<Dictionary<int, string>> GetEmailSetupsAsync();
         Task<EmailSetupText> GetSetupTextByLanguageAsync(int emailSetupId, string languageName);
-
         Task<EmailRecord> SendAsync(Details emailDetails);
     }
 }
\ No newline at end of file
diff --git a/src/Ops.Web/Areas/ContentManagement/Views/CardRenewal/Response.cshtml b/src/Ops.Web/Areas/ContentManagement/Views/CardRenewal/Response.cshtml
index 93b0ebfde..c75c5c6fd 100644
--- a/src/Ops.Web/Areas/ContentManagement/Views/CardRenewal/Response.cshtml
+++ b/src/Ops.Web/Areas/ContentManagement/Views/CardRenewal/Response.cshtml
@@ -11,17 +11,7 @@
 	</div>
 </div>
 
-<div class="row pt-3">
-	<div class="col-12">
-		<input asp-for="Response.Type" disabled formgroup hide-required />
-	</div>
-</div>
 
-<div class="row pb-3">
-	<div class="col-12 col-md-9 offset-md-3">
-		<hr />
-	</div>
-</div>
 
 <form asp-controller="@CardRenewalController.Name"
 	  asp-action="@nameof(CardRenewalController.Response)"
@@ -29,6 +19,7 @@
 	  role="form">
 	<input asp-for="Response.Id" type="hidden" />
 
+	<input asp-for="Response.Type" disabled formgroup hide-required />
 	<input asp-for="Response.Name" formgroup />
 	<select asp-for="Response.EmailSetupId" asp-items="Model.EmailSetups" formgroup>
 		<option></option>
@@ -95,7 +86,6 @@
 				$(this).addClass('active');
 				UpdateEmailSetupText();
 			}
-
 		});
 
 		function UpdateEmailSetupText() {
@@ -117,12 +107,12 @@
 					else {
 						alert(response.message);
 					}
-			})
-			.always(function() {
-				$('#emailSpinner').addClass('d-none');
-				$('#Response_EmailSetupId').removeAttr('disabled');
-				$('.languageSelector').removeAttr('disabled');
-			});
+				})
+				.always(function() {
+					$('#emailSpinner').addClass('d-none');
+					$('#Response_EmailSetupId').removeAttr('disabled');
+					$('.languageSelector').removeAttr('disabled');
+				});
 		}
 	</script>
 }
\ No newline at end of file
diff --git a/src/Ops.Web/Areas/ContentManagement/Views/CardRenewal/Responses.cshtml b/src/Ops.Web/Areas/ContentManagement/Views/CardRenewal/Responses.cshtml
index 898518a44..c3cd48544 100644
--- a/src/Ops.Web/Areas/ContentManagement/Views/CardRenewal/Responses.cshtml
+++ b/src/Ops.Web/Areas/ContentManagement/Views/CardRenewal/Responses.cshtml
@@ -124,9 +124,9 @@
 							icon.addClass('fa-arrow-up');
 						}
 						if (response.success) {
-							var row = button.closest('tr');
+							let row = button.closest('tr');
 							if (increase) {
-								var nextRow = row.next();
+								let nextRow = row.next();
 								row.insertAfter(nextRow);
 								row.find('.decreaseSortButton').removeAttr('disabled');
 								if (row.next().length == 0) {
@@ -138,7 +138,7 @@
 								}
 							}
 							else {
-								var prevRow = row.prev();
+								let prevRow = row.prev();
 								row.insertBefore(prevRow);
 								row.find('.increaseSortButton').removeAttr('disabled');
 								if (row.prev().length == 0) {
diff --git a/src/Ops.Web/Areas/Services/Views/CardRenewal/Details.cshtml b/src/Ops.Web/Areas/Services/Views/CardRenewal/Details.cshtml
index f113dca38..15bec2495 100644
--- a/src/Ops.Web/Areas/Services/Views/CardRenewal/Details.cshtml
+++ b/src/Ops.Web/Areas/Services/Views/CardRenewal/Details.cshtml
@@ -502,6 +502,8 @@ else
 	{
 		<script>
 			$('.addressLookup').on("click", function(e) {
+				e.preventDefault();
+
 				let searchAddress = $(this).attr('data-address').trim();
 				let searchZip = $(this).attr('data-zip');
 
diff --git a/src/Ops.Web/Areas/Services/Views/CardRenewal/Index.cshtml b/src/Ops.Web/Areas/Services/Views/CardRenewal/Index.cshtml
index 812b01ea7..8e481f48d 100644
--- a/src/Ops.Web/Areas/Services/Views/CardRenewal/Index.cshtml
+++ b/src/Ops.Web/Areas/Services/Views/CardRenewal/Index.cshtml
@@ -37,8 +37,7 @@
 					<a asp-action="@nameof(CardRenewalController.Index)"
 					   asp-route-Processed="true"
 					   class="nav-link"
-					   ActiveBy routeKey="processed"
-					   value="@true">
+					   ActiveBy routeKey="processed" value="true">
 						Processed
 						<span class="badge text-bg-secondary">@Model.ProcessedCount</span>
 					</a>
diff --git a/src/Ops.Web/Views/Shared/_Layout.cshtml b/src/Ops.Web/Views/Shared/_Layout.cshtml
index e6738e620..d160c0585 100644
--- a/src/Ops.Web/Views/Shared/_Layout.cshtml
+++ b/src/Ops.Web/Views/Shared/_Layout.cshtml
@@ -20,345 +20,345 @@
 	@RenderSection("Styles", required: false)
 </head>
 <body>
-    @if (User?.Identity?.IsAuthenticated != true)
-    {
-        <nav class="navbar navbar-expand-sm navbar-static-top navbar-dark bg-dark oc-navbar d-print-none">
-            <div class="container-fluid m-o px-2 py-0">
-                <ul class="navbar-nav oc-navbrand">
-                    <li class="nav-item dropdown">
-                        <a class="nav-link text-white"
-                           href="#"
-                           role="button"
-                           data-bs-toggle="dropdown"
-                           title="Intranet">
-                            <span class="fa-solid fa-circle-info fa-fw"></span>
-                            Intranet
-                        </a>
-                    </li>
-                </ul>
-            </div>
-        </nav>
-    }
-    else
-    {
-        <nav class="navbar navbar-expand-sm navbar-static-top navbar-dark bg-dark oc-navbar d-print-none">
-            <div class="container-fluid m-o px-2 py-0">
-                @if (navigationRows?.Count > 0)
-                {
-                    <a id="openNavColumn" href="#" style="margin-right: 1rem; padding: 0.5rem">
-                        <span class="fa-solid fa-ellipsis-vertical fa-inverse"></span>
-                    </a>
-                }
-                <ul class="navbar-nav oc-navbrand">
-                    <li class="nav-item dropdown">
-                        <a class="nav-link dropdown-toggle text-white"
-                           href="#"
-                           id="intranetDropdown"
-                           role="button"
-                           data-bs-toggle="dropdown"
-                           title="Intranet">
-                            <span class="fa-solid fa-circle-info fa-fw"></span>
-                            Intranet
-                        </a>
-                        <div class="dropdown-menu">
-                            @if (Context.Items[ItemKey.Sections] != null)
-                            {
-                                @foreach (var opsSection in (ICollection<Ocuda.Ops.Models.Entities.Section>)Context.Items[ItemKey.Sections])
-                                {
-                                    <a class="dropdown-item"
-                                       asp-area=""
-                                       asp-route-slug="@opsSection.Slug"
-                                       asp-controller="@HomeController.Name"
-                                       asp-action="@(nameof(HomeController.SectionIndex))">
-                                        @if (!string.IsNullOrEmpty(opsSection.Icon))
-                                        {
-                                            <span class="@opsSection.Icon fa-fw"></span>
-                                        }
-                                        @opsSection.Name
-                                        @if (opsSection.SupervisorsOnly)
-                                        {
-                                            <span class="text-muted fa-solid fa-lock fa-fw oc-dropdown-locked"></span>
-                                        }
-                                    </a>
-                                }
-                            }
-                        </div>
-                    </li>
-                </ul>
-                <button class="navbar-toggler btn-sm justify-self-end" type="button"
-                        data-bs-toggle="collapse" data-bs-target=".navbar-collapse">
-                    <span class="visually-hidden">Toggle Navigation</span>
-                    Menu
-                </button>
-
-			<div class="collapse navbar-collapse">
-				<ul class="navbar-nav">
+	@if (User?.Identity?.IsAuthenticated != true)
+	{
+		<nav class="navbar navbar-expand-sm navbar-static-top navbar-dark bg-dark oc-navbar d-print-none">
+			<div class="container-fluid m-o px-2 py-0">
+				<ul class="navbar-nav oc-navbrand">
+					<li class="nav-item dropdown">
+						<a class="nav-link text-white"
+						   href="#"
+						   role="button"
+						   data-bs-toggle="dropdown"
+						   title="Intranet">
+							<span class="fa-solid fa-circle-info fa-fw"></span>
+							Intranet
+						</a>
+					</li>
+				</ul>
+			</div>
+		</nav>
+	}
+	else
+	{
+		<nav class="navbar navbar-expand-sm navbar-static-top navbar-dark bg-dark oc-navbar d-print-none">
+			<div class="container-fluid m-o px-2 py-0">
+				@if (navigationRows?.Count > 0)
+				{
+					<a id="openNavColumn" href="#" style="margin-right: 1rem; padding: 0.5rem">
+						<span class="fa-solid fa-ellipsis-vertical fa-inverse"></span>
+					</a>
+				}
+				<ul class="navbar-nav oc-navbrand">
 					<li class="nav-item dropdown">
 						<a class="nav-link dropdown-toggle text-white"
 						   href="#"
-						   id="navbarLocationsDropdown"
+						   id="intranetDropdown"
 						   role="button"
 						   data-bs-toggle="dropdown"
-						   aria-haspopup="true"
-						   aria-expanded="false"
-						   title="Locations">
-							<span class="fa-solid fa-location-dot fa-fw"></span>
-							Locations
+						   title="Intranet">
+							<span class="fa-solid fa-circle-info fa-fw"></span>
+							Intranet
 						</a>
-						<div class="dropdown-menu"
-							 aria-labelledby="navbarLocationsDropdown">
-							<a class="dropdown-item"
-							   asp-action="@nameof(Ocuda.Ops.Controllers.LocationsController.Index)"
-							   asp-area=""
-							   asp-controller="@Ocuda.Ops.Controllers.LocationsController.Name">
-								All Locations
-							</a>
-							@if (locations?.Count > 0)
+						<div class="dropdown-menu">
+							@if (Context.Items[ItemKey.Sections] != null)
 							{
-								foreach (var location in locations.OrderBy(_ => _.Value))
+								@foreach (var opsSection in (ICollection<Ocuda.Ops.Models.Entities.Section>)Context.Items[ItemKey.Sections])
 								{
 									<a class="dropdown-item"
-									   asp-action="@nameof(Ocuda.Ops.Controllers.LocationsController.Details)"
 									   asp-area=""
-									   asp-controller="@Ocuda.Ops.Controllers.LocationsController.Name"
-									   asp-route-slug="@location.Key">
-										@location.Value
+									   asp-route-slug="@opsSection.Slug"
+									   asp-controller="@HomeController.Name"
+									   asp-action="@(nameof(HomeController.SectionIndex))">
+										@if (!string.IsNullOrEmpty(opsSection.Icon))
+										{
+											<span class="@opsSection.Icon fa-fw"></span>
+										}
+										@opsSection.Name
+										@if (opsSection.SupervisorsOnly)
+										{
+											<span class="text-muted fa-solid fa-lock fa-fw oc-dropdown-locked"></span>
+										}
 									</a>
 								}
 							}
 						</div>
 					</li>
 				</ul>
-				<ul class="navbar-nav">
-					<li class="nav-item dropdown">
-						<a class="nav-link dropdown-toggle text-white"
-						   href="#"
-						   id="navbarPeopleDropdown"
-						   role="button"
-						   data-bs-toggle="dropdown"
-						   aria-haspopup="true"
-						   aria-expanded="false"
-						   title="Customer Service">
-							<span class="fa-solid fa-users fa-fw"></span>
-							Customer Service
-						</a>
-						<div class="dropdown-menu"
-							 aria-labelledby="navbarPeopleDropdown">
-							<a class="dropdown-item"
-							   asp-controller="@Ocuda.Ops.Controllers.Areas.Contact.ScheduleController.Name"
-							   asp-area="@(nameof(Ocuda.Ops.Controllers.Areas.Contact))"
-							   asp-action="@(nameof(Ocuda.Ops.Controllers.Areas.Contact.ScheduleController.Index))">
-								<span class="fa-regular fa-clock fa-fw"></span>
-								Book a Librarian
+				<button class="navbar-toggler btn-sm justify-self-end" type="button"
+						data-bs-toggle="collapse" data-bs-target=".navbar-collapse">
+					<span class="visually-hidden">Toggle Navigation</span>
+					Menu
+				</button>
+
+				<div class="collapse navbar-collapse">
+					<ul class="navbar-nav">
+						<li class="nav-item dropdown">
+							<a class="nav-link dropdown-toggle text-white"
+							   href="#"
+							   id="navbarLocationsDropdown"
+							   role="button"
+							   data-bs-toggle="dropdown"
+							   aria-haspopup="true"
+							   aria-expanded="false"
+							   title="Locations">
+								<span class="fa-solid fa-location-dot fa-fw"></span>
+								Locations
 							</a>
-							<a class="dropdown-item"
-							   asp-controller="@Ocuda.Ops.Controllers.Areas.Services.CardRenewalController.Name"
-							   asp-area="@(nameof(Ocuda.Ops.Controllers.Areas.Services))"
-							   asp-action="@(nameof(Ocuda.Ops.Controllers.Areas.Services.CardRenewalController.Index))">
-								<span class="fa-solid fa-credit-card fa-fw"></span>
-								Card Renewal
+							<div class="dropdown-menu"
+								 aria-labelledby="navbarLocationsDropdown">
+								<a class="dropdown-item"
+								   asp-action="@nameof(Ocuda.Ops.Controllers.LocationsController.Index)"
+								   asp-area=""
+								   asp-controller="@Ocuda.Ops.Controllers.LocationsController.Name">
+									All Locations
+								</a>
+								@if (locations?.Count > 0)
+								{
+									foreach (var location in locations.OrderBy(_ => _.Value))
+									{
+										<a class="dropdown-item"
+										   asp-action="@nameof(Ocuda.Ops.Controllers.LocationsController.Details)"
+										   asp-area=""
+										   asp-controller="@Ocuda.Ops.Controllers.LocationsController.Name"
+										   asp-route-slug="@location.Key">
+											@location.Value
+										</a>
+									}
+								}
+							</div>
+						</li>
+					</ul>
+					<ul class="navbar-nav">
+						<li class="nav-item dropdown">
+							<a class="nav-link dropdown-toggle text-white"
+							   href="#"
+							   id="navbarPeopleDropdown"
+							   role="button"
+							   data-bs-toggle="dropdown"
+							   aria-haspopup="true"
+							   aria-expanded="false"
+							   title="Customer Service">
+								<span class="fa-solid fa-users fa-fw"></span>
+								Customer Service
 							</a>
-							<a class="dropdown-item"
-							   asp-controller="@Ocuda.Ops.Controllers.Areas.Incident.HomeController.Name"
-							   asp-area="@(nameof(Ocuda.Ops.Controllers.Areas.Incident))"
-							   asp-action="@(nameof(Ocuda.Ops.Controllers.Areas.Incident.HomeController.Mine))">
-								<span class="fa-solid fa-user-injured fa-fw"></span>
-								Incident Reports
+							<div class="dropdown-menu"
+								 aria-labelledby="navbarPeopleDropdown">
+								<a class="dropdown-item"
+								   asp-controller="@Ocuda.Ops.Controllers.Areas.Contact.ScheduleController.Name"
+								   asp-area="@(nameof(Ocuda.Ops.Controllers.Areas.Contact))"
+								   asp-action="@(nameof(Ocuda.Ops.Controllers.Areas.Contact.ScheduleController.Index))">
+									<span class="fa-regular fa-clock fa-fw"></span>
+									Book a Librarian
+								</a>
+								<a class="dropdown-item"
+								   asp-controller="@Ocuda.Ops.Controllers.Areas.Services.CardRenewalController.Name"
+								   asp-area="@(nameof(Ocuda.Ops.Controllers.Areas.Services))"
+								   asp-action="@(nameof(Ocuda.Ops.Controllers.Areas.Services.CardRenewalController.Index))">
+									<span class="fa-solid fa-credit-card fa-fw"></span>
+									Card Renewal
+								</a>
+								<a class="dropdown-item"
+								   asp-controller="@Ocuda.Ops.Controllers.Areas.Incident.HomeController.Name"
+								   asp-area="@(nameof(Ocuda.Ops.Controllers.Areas.Incident))"
+								   asp-action="@(nameof(Ocuda.Ops.Controllers.Areas.Incident.HomeController.Mine))">
+									<span class="fa-solid fa-user-injured fa-fw"></span>
+									Incident Reports
+								</a>
+								<a class="dropdown-item"
+								   asp-controller="@Ocuda.Ops.Controllers.Areas.VolunteerSubmissions.HomeController.Name"
+								   asp-area="@(nameof(Ocuda.Ops.Controllers.Areas.VolunteerSubmissions))"
+								   asp-action="@(nameof(Ocuda.Ops.Controllers.Areas.VolunteerSubmissions.HomeController.All))">
+									<span class="fa-solid fa-hands-helping fa-fw"></span>
+									Volunteer Submissions
+								</a>
+							</div>
+						</li>
+					</ul>
+					<ul class="navbar-nav">
+						<li class="nav-item dropdown">
+							<a class="nav-link dropdown-toggle text-white"
+							   href="#"
+							   id="navbarMaterialsDropdown"
+							   role="button"
+							   data-bs-toggle="dropdown"
+							   aria-haspopup="true"
+							   aria-expanded="false"
+							   title="Materials">
+								<span class="fa-solid fa-book fa-fw"></span>
+								Materials
 							</a>
-							<a class="dropdown-item"
-							   asp-controller="@Ocuda.Ops.Controllers.Areas.VolunteerSubmissions.HomeController.Name"
-							   asp-area="@(nameof(Ocuda.Ops.Controllers.Areas.VolunteerSubmissions))"
-							   asp-action="@(nameof(Ocuda.Ops.Controllers.Areas.VolunteerSubmissions.HomeController.All))">
-								<span class="fa-solid fa-hands-helping fa-fw"></span>
-								Volunteer Submissions
+							<div class="dropdown-menu"
+								 aria-labelledby="navbarMaterialsDropdown">
+								<a class="dropdown-item"
+								   asp-controller="@Ocuda.Ops.Controllers.Areas.CoverIssue.HomeController.Name"
+								   asp-area="@(nameof(Ocuda.Ops.Controllers.Areas.CoverIssue))"
+								   asp-action="@(nameof(Ocuda.Ops.Controllers.Areas.CoverIssue.HomeController.Index))">
+									<span class="fa-solid fa-book-skull fa-fw"></span>
+									Cover Issues
+								</a>
+							</div>
+						</li>
+					</ul>
+				</div>
+
+				<div class="collapse navbar-collapse justify-content-end">
+					<ul class="navbar-nav">
+						<li class="nav-item dropdown">
+							<a class="nav-link dropdown-toggle text-white"
+							   href="#"
+							   id="navbarManagementDropdown"
+							   role="button"
+							   data-bs-toggle="dropdown"
+							   aria-haspopup="true"
+							   aria-expanded="false"
+							   title="Management">
+								<span class="fa-solid fa-gear fa-fw"></span>
 							</a>
-						</div>
-					</li>
-				</ul>
-				<ul class="navbar-nav">
-					<li class="nav-item dropdown">
-						<a class="nav-link dropdown-toggle text-white"
-						   href="#"
-						   id="navbarMaterialsDropdown"
-						   role="button"
-						   data-bs-toggle="dropdown"
-						   aria-haspopup="true"
-						   aria-expanded="false"
-						   title="Materials">
-							<span class="fa-solid fa-book fa-fw"></span>
-							Materials
-						</a>
-						<div class="dropdown-menu"
-							 aria-labelledby="navbarMaterialsDropdown">
-							<a class="dropdown-item"
-							   asp-controller="@Ocuda.Ops.Controllers.Areas.CoverIssue.HomeController.Name"
-							   asp-area="@(nameof(Ocuda.Ops.Controllers.Areas.CoverIssue))"
-							   asp-action="@(nameof(Ocuda.Ops.Controllers.Areas.CoverIssue.HomeController.Index))">
-								<span class="fa-solid fa-book-skull fa-fw"></span>
-								Cover Issues
+							<div class="dropdown-menu dropdown-menu-end"
+								 aria-labelledby="navbarManagementDropdown">
+								<a class="dropdown-item"
+								   asp-controller="@Ocuda.Ops.Controllers.Areas.ContentManagement.HomeController.Name"
+								   asp-area="@(nameof(Ocuda.Ops.Controllers.Areas.ContentManagement))"
+								   asp-action="@(nameof(Ocuda.Ops.Controllers.Areas.ContentManagement.HomeController.Index))">
+									<span class="fa-solid fa-network-wired fa-fw"></span>
+									Intranet Management
+								</a>
+								@if (Context.User?.HasClaim(ClaimType.HasSiteAdminRights, ClaimType.HasSiteAdminRights) == true)
+								{
+									<a class="dropdown-item"
+									   asp-controller="@Ocuda.Ops.Controllers.Areas.SiteManagement.HomeController.Name"
+									   asp-area="@(nameof(Ocuda.Ops.Controllers.Areas.SiteManagement))"
+									   asp-action="@(nameof(Ocuda.Ops.Controllers.Areas.SiteManagement.HomeController.Index))">
+										<span class="fa-solid fa-earth-americas fa-fw"></span>
+										Web Site Management
+									</a>
+								}
+							</div>
+						</li>
+						<li class="nav-item" ActiveBy routeKey="Controller" value="Staff">
+							<a asp-action="@nameof(StaffController.Index)"
+							   asp-area=""
+							   asp-controller="@StaffController.Name"
+							   class="nav-link text-white"
+							   title="@StaffController.Name">
+								<span class="fa-solid fa-id-card fa-fw"></span>
 							</a>
-						</div>
-					</li>
-				</ul>
+						</li>
+						@if (Context.Items[ItemKey.Nickname] != null)
+						{
+							<li class="nav-item" ActiveBy routeKey="Controller" value="Profile">
+								<a class="nav-link text-white"
+								   asp-controller="Profile"
+								   asp-action="@(nameof(ProfileController.Index))"
+								   asp-route-section=""
+								   asp-route-area=""
+								   asp-route-id="">
+									<span class="fa-solid fa-circle-user fa-fw"></span>
+									@Context.Items[ItemKey.Nickname]
+								</a>
+							</li>
+						}
+					</ul>
+				</div>
 			</div>
-
-                <div class="collapse navbar-collapse justify-content-end">
-                    <ul class="navbar-nav">
-                        <li class="nav-item dropdown">
-                            <a class="nav-link dropdown-toggle text-white"
-                               href="#"
-                               id="navbarManagementDropdown"
-                               role="button"
-                               data-bs-toggle="dropdown"
-                               aria-haspopup="true"
-                               aria-expanded="false"
-                               title="Management">
-                                <span class="fa-solid fa-gear fa-fw"></span>
-                            </a>
-                            <div class="dropdown-menu dropdown-menu-end"
-                                 aria-labelledby="navbarManagementDropdown">
-                                <a class="dropdown-item"
-                                   asp-controller="@Ocuda.Ops.Controllers.Areas.ContentManagement.HomeController.Name"
-                                   asp-area="@(nameof(Ocuda.Ops.Controllers.Areas.ContentManagement))"
-                                   asp-action="@(nameof(Ocuda.Ops.Controllers.Areas.ContentManagement.HomeController.Index))">
-                                    <span class="fa-solid fa-network-wired fa-fw"></span>
-                                    Intranet Management
-                                </a>
-                                @if (Context.User?.HasClaim(ClaimType.HasSiteAdminRights, ClaimType.HasSiteAdminRights) == true)
-                                {
-                                    <a class="dropdown-item"
-                                       asp-controller="@Ocuda.Ops.Controllers.Areas.SiteManagement.HomeController.Name"
-                                       asp-area="@(nameof(Ocuda.Ops.Controllers.Areas.SiteManagement))"
-                                       asp-action="@(nameof(Ocuda.Ops.Controllers.Areas.SiteManagement.HomeController.Index))">
-                                        <span class="fa-solid fa-earth-americas fa-fw"></span>
-                                        Web Site Management
-                                    </a>
-                                }
-                            </div>
-                        </li>
-                        <li class="nav-item" ActiveBy routeKey="Controller" value="Staff">
-                            <a asp-action="@nameof(StaffController.Index)"
-                               asp-area=""
-                               asp-controller="@StaffController.Name"
-                               class="nav-link text-white"
-                               title="@StaffController.Name">
-                                <span class="fa-solid fa-id-card fa-fw"></span>
-                            </a>
-                        </li>
-                        @if (Context.Items[ItemKey.Nickname] != null)
-                        {
-                            <li class="nav-item" ActiveBy routeKey="Controller" value="Profile">
-                                <a class="nav-link text-white"
-                                   asp-controller="Profile"
-                                   asp-action="@(nameof(ProfileController.Index))"
-                                   asp-route-section=""
-                                   asp-route-area=""
-                                   asp-route-id="">
-                                    <span class="fa-solid fa-circle-user fa-fw"></span>
-                                    @Context.Items[ItemKey.Nickname]
-                                </a>
-                            </li>
-                        }
-                    </ul>
-                </div>
-            </div>
-        </nav>
-    }
-    <div class="container-fluid">
-        @if (navigationRows?.Count > 0)
-        {
-            <div id="closeNavColumn" class="navcolumn-overlay"></div>
-            <div id="navColumn" class="navcolumn">
-                @foreach (var row in navigationRows)
-                {
-                    <div class="card">
-                        @if (row.Rows?.Count > 0 == false)
-                        {
-                            <a class="navcolumn-item" href="@row.Url">@Html.Raw(row.Name)</a>
-                        }
-                        else
-                        {
-                            <div class="navcolumn-item navcolumn-collapsible">
-                                @Html.Raw(row.Name)
-                                <span class="fa-solid fa-chevron-right float-end fa-fw"></span>
-                            </div>
-                            <div class="collapse navcolumn-collapse">
-                                @foreach (var childRow in row.Rows)
-                                {
-                                    <div class="card">
-                                        @if (childRow.Rows?.Count > 0 == false)
-                                        {
-                                            <a class="navcolumn-item navcolumn-child"
-                                               href="@childRow.Url">@Html.Raw(childRow.Name)</a>
-                                        }
-                                        else
-                                        {
-                                            <div class="navcolumn-item navcolumn-child navcolumn-collapsible">
-                                                @Html.Raw(childRow.Name)
-                                                <span class="fa-solid fa-chevron-right float-end fa-fw"></span>
-                                            </div>
-                                            <div class="collapse navcolumn-collapse">
-                                                @foreach (var grandchildRow in childRow.Rows)
-                                                {
-                                                    <div class="card">
-                                                        <a class="navcolumn-item navcolumn-grandchild"
-                                                           href="@grandchildRow.Url">@Html.Raw(grandchildRow.Name)</a>
-                                                    </div>
-                                                }
-                                            </div>
-                                        }
-                                    </div>
-                                }
-                            </div>
-                        }
-                    </div>
-                }
-            </div>
-        }
-        @RenderSection("Header", required: false)
-        @if (TempData[Ocuda.Ops.Controllers.TempDataKey.AlertDanger] != null)
-        {
-            <div class="row">
-                <div class="col-12 col-md-6 offset-md-3">
-                    <div class="alert alert-danger">@Html.Raw(TempData[Ocuda.Ops.Controllers.TempDataKey.AlertDanger])</div>
-                </div>
-            </div>
-        }
-        @if (TempData[Ocuda.Ops.Controllers.TempDataKey.AlertWarning] != null)
-        {
-            <div class="row">
-                <div class="col-12 col-md-6 offset-md-3">
-                    <div class="alert alert-warning">@Html.Raw(TempData[Ocuda.Ops.Controllers.TempDataKey.AlertWarning])</div>
-                </div>
-            </div>
-        }
-        @if (TempData[Ocuda.Ops.Controllers.TempDataKey.AlertSuccess] != null)
-        {
-            <div class="row">
-                <div class="col-12 col-md-6 offset-md-3">
-                    <div class="alert alert-success">@Html.Raw(TempData[Ocuda.Ops.Controllers.TempDataKey.AlertSuccess])</div>
-                </div>
-            </div>
-        }
-        @if (TempData[Ocuda.Ops.Controllers.TempDataKey.AlertInfo] != null)
-        {
-            <div class="row">
-                <div class="col-12 col-md-6 offset-md-3">
-                    <div class="alert alert-info">@Html.Raw(TempData[Ocuda.Ops.Controllers.TempDataKey.AlertInfo])</div>
-                </div>
-            </div>
-        }
-        @RenderBody()
-    </div>
-    <script src="~/js/main.min.js" asp-append-version="true"></script>
-    <script src="~/js/bootstrap.min.js" asp-append-version="true"></script>
-    @if (Context.Items.ContainsKey(ItemKey.ExternalJS))
-    {
-        foreach (var jsUrl in (List<string>)Context.Items[ItemKey.ExternalJS])
-        {
-            <script src="@jsUrl" asp-append-version="true"></script>
-        }
-    }
-    @RenderSection("Scripts", required: false)
+		</nav>
+	}
+	<div class="container-fluid">
+		@if (navigationRows?.Count > 0)
+		{
+			<div id="closeNavColumn" class="navcolumn-overlay"></div>
+			<div id="navColumn" class="navcolumn">
+				@foreach (var row in navigationRows)
+				{
+					<div class="card">
+						@if (row.Rows?.Count > 0 == false)
+						{
+							<a class="navcolumn-item" href="@row.Url">@Html.Raw(row.Name)</a>
+						}
+						else
+						{
+							<div class="navcolumn-item navcolumn-collapsible">
+								@Html.Raw(row.Name)
+								<span class="fa-solid fa-chevron-right float-end fa-fw"></span>
+							</div>
+							<div class="collapse navcolumn-collapse">
+								@foreach (var childRow in row.Rows)
+								{
+									<div class="card">
+										@if (childRow.Rows?.Count > 0 == false)
+										{
+											<a class="navcolumn-item navcolumn-child"
+											   href="@childRow.Url">@Html.Raw(childRow.Name)</a>
+										}
+										else
+										{
+											<div class="navcolumn-item navcolumn-child navcolumn-collapsible">
+												@Html.Raw(childRow.Name)
+												<span class="fa-solid fa-chevron-right float-end fa-fw"></span>
+											</div>
+											<div class="collapse navcolumn-collapse">
+												@foreach (var grandchildRow in childRow.Rows)
+												{
+													<div class="card">
+														<a class="navcolumn-item navcolumn-grandchild"
+														   href="@grandchildRow.Url">@Html.Raw(grandchildRow.Name)</a>
+													</div>
+												}
+											</div>
+										}
+									</div>
+								}
+							</div>
+						}
+					</div>
+				}
+			</div>
+		}
+		@RenderSection("Header", required: false)
+		@if (TempData[Ocuda.Ops.Controllers.TempDataKey.AlertDanger] != null)
+		{
+			<div class="row">
+				<div class="col-12 col-md-6 offset-md-3">
+					<div class="alert alert-danger">@Html.Raw(TempData[Ocuda.Ops.Controllers.TempDataKey.AlertDanger])</div>
+				</div>
+			</div>
+		}
+		@if (TempData[Ocuda.Ops.Controllers.TempDataKey.AlertWarning] != null)
+		{
+			<div class="row">
+				<div class="col-12 col-md-6 offset-md-3">
+					<div class="alert alert-warning">@Html.Raw(TempData[Ocuda.Ops.Controllers.TempDataKey.AlertWarning])</div>
+				</div>
+			</div>
+		}
+		@if (TempData[Ocuda.Ops.Controllers.TempDataKey.AlertSuccess] != null)
+		{
+			<div class="row">
+				<div class="col-12 col-md-6 offset-md-3">
+					<div class="alert alert-success">@Html.Raw(TempData[Ocuda.Ops.Controllers.TempDataKey.AlertSuccess])</div>
+				</div>
+			</div>
+		}
+		@if (TempData[Ocuda.Ops.Controllers.TempDataKey.AlertInfo] != null)
+		{
+			<div class="row">
+				<div class="col-12 col-md-6 offset-md-3">
+					<div class="alert alert-info">@Html.Raw(TempData[Ocuda.Ops.Controllers.TempDataKey.AlertInfo])</div>
+				</div>
+			</div>
+		}
+		@RenderBody()
+	</div>
+	<script src="~/js/main.min.js" asp-append-version="true"></script>
+	<script src="~/js/bootstrap.min.js" asp-append-version="true"></script>
+	@if (Context.Items.ContainsKey(ItemKey.ExternalJS))
+	{
+		foreach (var jsUrl in (List<string>)Context.Items[ItemKey.ExternalJS])
+		{
+			<script src="@jsUrl" asp-append-version="true"></script>
+		}
+	}
+	@RenderSection("Scripts", required: false)
 </body>
 </html>
\ No newline at end of file
diff --git a/src/Promenade.Controllers/CardRenewalController.cs b/src/Promenade.Controllers/CardRenewalController.cs
index 1cc0b7894..f6e4b9912 100644
--- a/src/Promenade.Controllers/CardRenewalController.cs
+++ b/src/Promenade.Controllers/CardRenewalController.cs
@@ -471,7 +471,7 @@ public async Task<IActionResult> Submitted()
 
                 if (segmentText == null)
                 {
-                    _logger.LogError($"Card renewal 'Juvenile' segment id '{segmentId}' not found");
+                    _logger.LogError($"Card renewal 'Submitted' segment id '{segmentId}' not found");
                 }
                 else if (!string.IsNullOrWhiteSpace(segmentText.Text))
                 {
@@ -485,9 +485,9 @@ public async Task<IActionResult> Submitted()
         [HttpGet("[action]")]
         public async Task<IActionResult> UnableToRenew()
         {
-            if (!TempData.ContainsKey(TempDataRequest) || !_polarisHelper.IsConfigured)
+            if (!TempData.ContainsKey(TempDataUnableToRenew) || !_polarisHelper.IsConfigured)
             {
-                if (!TempData.ContainsKey(TempDataRequest))
+                if (!TempData.ContainsKey(TempDataUnableToRenew))
                 {
                     TempData[TempDataTimeout] = true;
                 }
@@ -566,7 +566,7 @@ public async Task<IActionResult> VerifyAddress()
                 }
             }
 
-            if (!viewModel.Addresses.Any())
+            if (!request.Addresses.Any())
             {
                 var noAddressSegmentId = await _siteSettingService.GetSettingIntAsync(
                     Models.Keys.SiteSetting.CardRenewal.NoAddressSegment,
diff --git a/src/Promenade.Controllers/TempDataKey.cs b/src/Promenade.Controllers/TempDataKey.cs
index 3f0f5aef3..3162782dd 100644
--- a/src/Promenade.Controllers/TempDataKey.cs
+++ b/src/Promenade.Controllers/TempDataKey.cs
@@ -1,6 +1,6 @@
 namespace Ocuda.Promenade.Controllers
 {
-    public static class TempDataKey
+    internal static class TempDataKey
     {
         public const string AlertInfo = "prom-info-alert";
         public const string OriginalPath = "prom-original-path";
diff --git a/src/Promenade.Controllers/ViewModels/CardRenewal/VerifyAddressViewModel.cs b/src/Promenade.Controllers/ViewModels/CardRenewal/VerifyAddressViewModel.cs
index dce62ce02..2d6bf0a7c 100644
--- a/src/Promenade.Controllers/ViewModels/CardRenewal/VerifyAddressViewModel.cs
+++ b/src/Promenade.Controllers/ViewModels/CardRenewal/VerifyAddressViewModel.cs
@@ -16,7 +16,7 @@ public class VerifyAddressViewModel
         public string Email { get; set; }
 
         public SegmentText HeaderSegmentText { get; set; }
-        public SegmentText NoAddressSegmentText {get; set; }
+        public SegmentText NoAddressSegmentText { get; set; }
         public bool SameAddress { get; set; }
     }
 }
diff --git a/src/Promenade.Web/Views/CardRenewal/NotConfigured.cshtml b/src/Promenade.Web/Views/CardRenewal/NotConfigured.cshtml
index 719f23c95..95e3f79b2 100644
--- a/src/Promenade.Web/Views/CardRenewal/NotConfigured.cshtml
+++ b/src/Promenade.Web/Views/CardRenewal/NotConfigured.cshtml
@@ -1,4 +1,5 @@
 @model Ocuda.Promenade.Models.Entities.SegmentText
+
 @if (Model != null)
 {
 	if (!string.IsNullOrEmpty(Model.Header))
diff --git a/src/Promenade.Web/Views/CardRenewal/UnableToRenew.cshtml b/src/Promenade.Web/Views/CardRenewal/UnableToRenew.cshtml
index c967a470f..f40caf53e 100644
--- a/src/Promenade.Web/Views/CardRenewal/UnableToRenew.cshtml
+++ b/src/Promenade.Web/Views/CardRenewal/UnableToRenew.cshtml
@@ -1,4 +1,5 @@
 @model Ocuda.Promenade.Models.Entities.SegmentText
+
 @if (Model != null)
 {
 	if (!string.IsNullOrEmpty(Model.Header))
diff --git a/src/Promenade.Web/Views/Shared/_Layout.cshtml b/src/Promenade.Web/Views/Shared/_Layout.cshtml
index e0bf2d6ce..303538830 100644
--- a/src/Promenade.Web/Views/Shared/_Layout.cshtml
+++ b/src/Promenade.Web/Views/Shared/_Layout.cshtml
@@ -235,14 +235,6 @@
                     </div>
                 }
             </header>
-			@if (TempData[Ocuda.Promenade.Controllers.TempDataKey.AlertInfo] != null)
-			{
-				<div class="row mt-4">
-					<div class="col-12 col-md-6 offset-md-3">
-						<div class="alert alert-info mb-0">@Html.Raw(TempData[Ocuda.Promenade.Controllers.TempDataKey.AlertInfo])</div>
-					</div>
-				</div>
-			}
             <div class="row prom-content-container">
                 <div class="col-12 d-print-inline-block prom-body-content-container"
                      role="main" id="mainContent">

From 2d2ef517445df2d9787d20b9e734f46894f53491 Mon Sep 17 00:00:00 2001
From: Dan Wilcox <DanielWilcox@mcldaz.org>
Date: Tue, 20 Jan 2026 13:52:22 -0700
Subject: [PATCH 08/13] Fix merge

---
 src/Ops.Web/Startup.cs | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/src/Ops.Web/Startup.cs b/src/Ops.Web/Startup.cs
index baabef872..b2657c209 100644
--- a/src/Ops.Web/Startup.cs
+++ b/src/Ops.Web/Startup.cs
@@ -166,32 +166,20 @@ string cacheDiscriminator
 
             string polarisCs = _config.GetConnectionString("Polaris");
 
-            var provider = _config[Configuration.OpsDatabaseProvider];
-            switch (provider)
             if (_config[Configuration.OpsDatabaseProvider]?.ToUpperInvariant() == "SQLSERVER")
             {
                 services.AddDbContextPool<OpsContext,
                     DataProvider.SqlServer.Ops.Context>(_ => _.UseSqlServer(opsCs));
                 services.AddDbContextPool<PromenadeContext,
                     DataProvider.SqlServer.Promenade.Context>(_ => _.UseSqlServer(promCs));
+
+                services.AddDbContextPool<PolarisContext>(_ => _.UseSqlServer(polarisCs));
+
                 services.AddHealthChecks();
             }
             else
             {
                 throw new OcudaException("No Configuration.OpsDatabaseProvider configured.");
-                case "SqlServer":
-                    services.AddDbContextPool<OpsContext,
-                        DataProvider.SqlServer.Ops.Context>(_ => _.UseSqlServer(opsCs));
-                    services.AddDbContextPool<PromenadeContext,
-                        DataProvider.SqlServer.Promenade.Context>(_ => _.UseSqlServer(promCs));
-
-                    services.AddDbContextPool<PolarisContext>(_ => _.UseSqlServer(polarisCs));
-
-                    services.AddHealthChecks();
-                    break;
-
-                default:
-                    throw new OcudaException("No Configuration.OpsDatabaseProvider configured.");
             }
 
             // store the data protection key in the context

From f03447dbcecf10e9a24db44012629760d490b438 Mon Sep 17 00:00:00 2001
From: Dan Wilcox <DanielWilcox@mcldaz.org>
Date: Tue, 20 Jan 2026 14:31:03 -0700
Subject: [PATCH 09/13] Fix notes trimming

---
 src/Ops.Web/Areas/Services/Views/CardRenewal/Details.cshtml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Ops.Web/Areas/Services/Views/CardRenewal/Details.cshtml b/src/Ops.Web/Areas/Services/Views/CardRenewal/Details.cshtml
index 15bec2495..9cb27fdb8 100644
--- a/src/Ops.Web/Areas/Services/Views/CardRenewal/Details.cshtml
+++ b/src/Ops.Web/Areas/Services/Views/CardRenewal/Details.cshtml
@@ -1,4 +1,4 @@
-@model Ocuda.Ops.Controllers.Areas.Services.ViewModels.CardRenewal.DetailsViewModel
+	@model Ocuda.Ops.Controllers.Areas.Services.ViewModels.CardRenewal.DetailsViewModel
 
 <div class="row">
 	<div class="col-12 col-md-6 col-xl-4 offset-xl-2">
@@ -134,7 +134,7 @@
 				<td>
 					@if (!string.IsNullOrWhiteSpace(Model.Customer.BlockingNotes))
 					{
-						@Model.Customer.BlockingNotes.Substring(0, Model.MaxNotesDisplayLength)
+						@(new string(Model.Customer.BlockingNotes.Take(Model.MaxNotesDisplayLength).ToArray()))
 					}
 					else
 					{
@@ -161,7 +161,7 @@
 				<td>
 					@if (!string.IsNullOrWhiteSpace(Model.Customer.Notes))
 					{
-						@Model.Customer.Notes.Substring(0, Model.MaxNotesDisplayLength)
+						@(new string(Model.Customer.Notes.Take(Model.MaxNotesDisplayLength).ToArray()))
 					}
 					else
 					{

From 25b617b8762420a42e1f3c1433510d651eff26c7 Mon Sep 17 00:00:00 2001
From: Dan Wilcox <DanielWilcox@mcldaz.org>
Date: Tue, 20 Jan 2026 16:13:18 -0700
Subject: [PATCH 10/13] Add english resx values

---
 src/i18n/Resources/Shared.en.resx | 72 +++++++++++++++++++++++++++++++
 1 file changed, 72 insertions(+)

diff --git a/src/i18n/Resources/Shared.en.resx b/src/i18n/Resources/Shared.en.resx
index c8b7e4883..455fba344 100644
--- a/src/i18n/Resources/Shared.en.resx
+++ b/src/i18n/Resources/Shared.en.resx
@@ -589,4 +589,76 @@
     <value>Search</value>
     <comment>Hover text to display on the search button</comment>
   </data>
+  <data name="Thanks for your submission! Your card has more than {0} days until it expires, please come back to renew it any time after {1}" xml:space="preserve">
+    <value>Thanks for your submission! Your card has more than {0} days until it expires, please come back to renew it any time after {1}</value>
+    <comment>Error message: the library card is not near expiration; {0} is how many days before expiration, {1} is the earliest date</comment>
+  </data>
+  <data name="You have entered an invalid card number or password" xml:space="preserve">
+    <value>You have entered an invalid card number or password</value>
+    <comment>Error message: invalid login information</comment>
+  </data>
+  <data name="It appears that the barcode you've entered belongs to a staff account. Please speak to your branch manager or supervisor for instructions on how to renew your account." xml:space="preserve">
+    <value>It appears that the barcode you've entered belongs to a staff account. Please speak to your branch manager or supervisor for instructions on how to renew your account.</value>
+    <comment>Error message: account belongs to a staff member</comment>
+  </data>
+  <data name="It looks like you're trying to renew a juvenile account, please have a parent or guardian complete the rest of the process." xml:space="preserve">
+    <value>It looks like you're trying to renew a juvenile account, please have a parent or guardian complete the rest of the process.</value>
+    <comment>Label indicating how to proceed with the form</comment>
+  </data>
+  <data name="With no valid address on file your renewal request may not be eligible for a full renewal." xml:space="preserve">
+    <value>With no valid address on file your renewal request may not be eligible for a full renewal.</value>
+    <comment>Label informing how the request may be processed</comment>
+  </data>
+  <data name="Please contact &lt;a href=\&quot;{0}\&quot;&gt;your library&lt;/a&gt; to renew your library card." xml:space="preserve">
+    <value>Please contact &lt;a href=\"{0}\"&gt;your library&lt;/a&gt; to renew your library card.</value>
+    <comment>Message informing where to renew a library card; {0} is replaced with a link to the locations</comment>
+  </data>
+  <data name="It looks like we are still working on a request you submitted on {0} at {1}. You'll be hearing from us soon.&quot;" xml:space="preserve">
+    <value>It looks like we are still working on a request you submitted on {0} at {1}. You'll be hearing from us soon."</value>
+    <comment>Error message: there's a pending request for the account; {0} is replace with the date of the request, {1} with the time</comment>
+  </data>
+  <data name="Do you still live at an address listed below?" xml:space="preserve">
+    <value>Do you still live at an address listed below?</value>
+    <comment>Label asking if a customer lives at an address in the list</comment>
+  </data>
+  <data name="No, I have moved" xml:space="preserve">
+    <value>No, I have moved</value>
+    <comment>Button: responding in the negative to the question of if the customer still lives at a listed address</comment>
+  </data>
+  <data name="Yes, this is my address" xml:space="preserve">
+    <value>Yes, this is my address</value>
+    <comment>Button: responding in the affirmative to the question of if the customer still lives at a listed address</comment>
+  </data>
+  <data name="Unfortunately your session has timed out. Please resubmit your barcode and password." xml:space="preserve">
+    <value>Unfortunately your session has timed out. Please resubmit your barcode and password.</value>
+    <comment>Error message: too long has elapsed while the user was viewing a form and their session expired.</comment>
+  </data>
+  <data name="Thank you for using our online renewal service!" xml:space="preserve">
+    <value>Thank you for using our online renewal service!</value>
+    <comment>Default follow-up shown to customer after submitting card renewal form.</comment>
+  </data>
+  <data name="We are unable to renew your card at this time. Please contact &lt;a href=\&quot;{0}\&quot;&gt;your library&lt;/a&gt; to renew your library card.&quot;" xml:space="preserve">
+    <value>We are unable to renew your card at this time. Please contact &lt;a href=\"{0}\"&gt;your library&lt;/a&gt; to renew your library card."</value>
+    <comment>Message informing the card cannot be renewed and how to proceed; {0} is replaced with a link to the locations</comment>
+  </data>
+  <data name="Forgot your password?" xml:space="preserve">
+    <value>Forgot your password?</value>
+    <comment>Link for a customer to click if they've forgotten their password</comment>
+  </data>
+  <data name="Parent/Guardian Barcode" xml:space="preserve">
+    <value>Parent/Guardian Barcode</value>
+    <comment>Label prompting a customer to entier the parent or guardian's barcode number</comment>
+  </data>
+  <data name="Library Card Number" xml:space="preserve">
+    <value>Library Card Number</value>
+    <comment>Label prompting a customer to enter their library card number</comment>
+  </data>
+  <data name="Password" xml:space="preserve">
+    <value>Password</value>
+    <comment>Label prompting a customer to enter their password</comment>
+  </data>
+  <data name="Renew your library card" xml:space="preserve">
+    <value>Renew your library card</value>
+    <comment>Default header for card renewal request pages</comment>
+  </data>
 </root>
\ No newline at end of file

From 56f144d550902bae7614deaa35735a5b9ac4a4b5 Mon Sep 17 00:00:00 2001
From: Dan Wilcox <DanielWilcox@mcldaz.org>
Date: Tue, 20 Jan 2026 16:20:39 -0700
Subject: [PATCH 11/13] Fix resx entries

---
 src/i18n/Resources/Shared.en.resx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/i18n/Resources/Shared.en.resx b/src/i18n/Resources/Shared.en.resx
index 455fba344..e619e260b 100644
--- a/src/i18n/Resources/Shared.en.resx
+++ b/src/i18n/Resources/Shared.en.resx
@@ -613,8 +613,8 @@
     <value>Please contact &lt;a href=\"{0}\"&gt;your library&lt;/a&gt; to renew your library card.</value>
     <comment>Message informing where to renew a library card; {0} is replaced with a link to the locations</comment>
   </data>
-  <data name="It looks like we are still working on a request you submitted on {0} at {1}. You'll be hearing from us soon.&quot;" xml:space="preserve">
-    <value>It looks like we are still working on a request you submitted on {0} at {1}. You'll be hearing from us soon."</value>
+  <data name="It looks like we are still working on a request you submitted on {0} at {1}. You'll be hearing from us soon." xml:space="preserve">
+    <value>It looks like we are still working on a request you submitted on {0} at {1}. You'll be hearing from us soon.</value>
     <comment>Error message: there's a pending request for the account; {0} is replace with the date of the request, {1} with the time</comment>
   </data>
   <data name="Do you still live at an address listed below?" xml:space="preserve">
@@ -637,8 +637,8 @@
     <value>Thank you for using our online renewal service!</value>
     <comment>Default follow-up shown to customer after submitting card renewal form.</comment>
   </data>
-  <data name="We are unable to renew your card at this time. Please contact &lt;a href=\&quot;{0}\&quot;&gt;your library&lt;/a&gt; to renew your library card.&quot;" xml:space="preserve">
-    <value>We are unable to renew your card at this time. Please contact &lt;a href=\"{0}\"&gt;your library&lt;/a&gt; to renew your library card."</value>
+  <data name="We are unable to renew your card at this time. Please contact &lt;a href=\&quot;{0}\&quot;&gt;your library&lt;/a&gt; to renew your library card." xml:space="preserve">
+    <value>We are unable to renew your card at this time. Please contact &lt;a href=\"{0}\"&gt;your library&lt;/a&gt; to renew your library card.</value>
     <comment>Message informing the card cannot be renewed and how to proceed; {0} is replaced with a link to the locations</comment>
   </data>
   <data name="Forgot your password?" xml:space="preserve">

From 75010b038d289ec6cc2ac64f81273a0b35b056a0 Mon Sep 17 00:00:00 2001
From: Dan Wilcox <DanielWilcox@mcldaz.org>
Date: Tue, 20 Jan 2026 16:29:17 -0700
Subject: [PATCH 12/13] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b6f1dab9d..56fda29aa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -32,6 +32,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 - Application permission handling and administration
 - Emedia management
 - Promenade navigation management
+- Card renewal requests
 
 ### Changed
 - Default to only logging Warnings for Microsoft and System namespaces

From 7aef12fffabc20602f4e27d930245b9ff4522aa4 Mon Sep 17 00:00:00 2001
From: Dan Wilcox <DanielWilcox@mcldaz.org>
Date: Thu, 22 Jan 2026 13:43:32 -0700
Subject: [PATCH 13/13] Update site setting name property

---
 src/Promenade.Models/Defaults/SiteSetting.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Promenade.Models/Defaults/SiteSetting.cs b/src/Promenade.Models/Defaults/SiteSetting.cs
index 3afcee4a9..bd7035d73 100644
--- a/src/Promenade.Models/Defaults/SiteSetting.cs
+++ b/src/Promenade.Models/Defaults/SiteSetting.cs
@@ -44,13 +44,12 @@ public static class SiteSettings
                 Type= SiteSettingType.Int,
                 Value = "-1"
             },
-            
             new SiteSetting
             {
                 Category = nameof(Keys.SiteSetting.CardRenewal),
                 Description = "Segment to show on the card renewal home page",
                 Id = Keys.SiteSetting.CardRenewal.HomeSegment,
-                Name = "Card renewal segment",
+                Name = "Home segment",
                 Type = SiteSettingType.Int,
                 Value = "-1"
             },