diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 0000000..e3db819
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,28 @@
+name: CI
+
+on:
+  push:
+    branches: [main, master]
+  pull_request:
+    branches: [main, master]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: "9.0.x"
+
+      - name: Restore
+        run: dotnet restore Aquiis.sln
+
+      - name: Build
+        run: dotnet build Aquiis.sln --no-restore --configuration Release
+
+      - name: Run focused tests
+        run: dotnet test Aquiis.SimpleStart.Tests/Aquiis.SimpleStart.Tests.csproj --no-build --verbosity normal
diff --git a/.gitignore b/.gitignore
index 0f68e8d..aa4f4f9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,7 @@ Data/Backups/**
 
 /Data/app*
 
+
+# Python virtual environment created per-project
+.venv/
+
diff --git a/Aquiis.SimpleStart.Tests/ApplicationWorkflowService.LeaseLifecycleTests.cs b/Aquiis.SimpleStart.Tests/ApplicationWorkflowService.LeaseLifecycleTests.cs
new file mode 100644
index 0000000..2e98f24
--- /dev/null
+++ b/Aquiis.SimpleStart.Tests/ApplicationWorkflowService.LeaseLifecycleTests.cs
@@ -0,0 +1,147 @@
+using System.Security.Claims;
+using System.Threading.Tasks;
+using System;
+using Aquiis.SimpleStart.Application.Services.Workflows;
+using Aquiis.SimpleStart.Core.Entities;
+using Aquiis.SimpleStart.Shared.Services;
+using Aquiis.SimpleStart.Shared.Components.Account;
+using Aquiis.SimpleStart.Core.Constants;
+using Microsoft.AspNetCore.Components.Authorization;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging.Abstractions;
+using Moq;
+using Xunit;
+
+namespace Aquiis.SimpleStart.Tests;
+
+public class ApplicationWorkflowServiceLeaseLifecycleTests
+{
+    [Fact]
+    public async Task GenerateAndAcceptLeaseOffer_CreatesLeaseAndTenant_UpdatesProperty()
+    {
+        // Arrange - setup SQLite in-memory
+        var connection = new Microsoft.Data.Sqlite.SqliteConnection("Data Source=:memory:");
+        connection.Open();
+        var options = new DbContextOptionsBuilder<Infrastructure.Data.ApplicationDbContext>()
+            .UseSqlite(connection)
+            .Options;
+
+        var testUserId = "test-user-id";
+        var orgId = Guid.NewGuid();
+
+        // Mock AuthenticationStateProvider
+        var claims = new ClaimsPrincipal(new ClaimsIdentity(new[] { new Claim(ClaimTypes.NameIdentifier, testUserId) }, "TestAuth"));
+        var mockAuth = new Mock<AuthenticationStateProvider>();
+        mockAuth.Setup(a => a.GetAuthenticationStateAsync())
+            .ReturnsAsync(new AuthenticationState(claims));
+
+        var mockUserStore = new Mock<IUserStore<ApplicationUser>>();
+        var mockUserManager = new Mock<UserManager<ApplicationUser>>(
+            mockUserStore.Object,
+            null, null, null, null, null, null, null, null);
+
+        var appUser = new ApplicationUser { Id = testUserId, ActiveOrganizationId = orgId };
+        mockUserManager.Setup(u => u.FindByIdAsync(It.IsAny<string>())).ReturnsAsync(appUser);
+
+        var serviceProvider = new Mock<IServiceProvider>();
+
+        var userContext = new UserContextService(mockAuth.Object, mockUserManager.Object, serviceProvider.Object);
+
+        // Create DbContext and seed data
+        await using var context = new Infrastructure.Data.ApplicationDbContext(options);
+        await context.Database.EnsureCreatedAsync();
+
+        var appUserEntity = new ApplicationUser { Id = testUserId, UserName = "testuser", Email = "t@t.com", ActiveOrganizationId = orgId };
+        context.Users.Add(appUserEntity);
+
+        var org = new Organization { Id = orgId, Name = "TestOrg", OwnerId = testUserId, CreatedBy = testUserId, CreatedOn = DateTime.UtcNow };
+        context.Organizations.Add(org);
+
+        var prospect = new ProspectiveTenant { Id = Guid.NewGuid(), OrganizationId = orgId, FirstName = "Lease", LastName = "Tester", Email = "lt@example.com", Phone = "123", Status = ApplicationConstants.ProspectiveStatuses.Lead, CreatedBy = testUserId, CreatedOn = DateTime.UtcNow };
+        var property = new Property { Id = Guid.NewGuid(), OrganizationId = orgId, Address = "456 Elm", City = "X", State = "ST", ZipCode = "00000", Status = ApplicationConstants.PropertyStatuses.Available, CreatedBy = testUserId, CreatedOn = DateTime.UtcNow, MonthlyRent = 1200m };
+        context.ProspectiveTenants.Add(prospect);
+        context.Properties.Add(property);
+        await context.SaveChangesAsync();
+
+        var noteService = new Application.Services.NoteService(context, userContext);
+        var workflowService = new ApplicationWorkflowService(context, userContext, noteService);
+
+        // Submit application
+        var submissionModel = new ApplicationSubmissionModel
+        {
+            ApplicationFee = 25m,
+            ApplicationFeePaid = true,
+            ApplicationFeePaymentMethod = "Card",
+            CurrentAddress = "Addr",
+            CurrentCity = "C",
+            CurrentState = "ST",
+            CurrentZipCode = "00000",
+            CurrentRent = 1000m,
+            LandlordName = "L",
+            LandlordPhone = "P",
+            EmployerName = "E",
+            JobTitle = "J",
+            MonthlyIncome = 2000m,
+            EmploymentLengthMonths = 12,
+            Reference1Name = "R1",
+            Reference1Phone = "111",
+            Reference1Relationship = "Friend"
+        };
+
+        var submitResult = await workflowService.SubmitApplicationAsync(prospect.Id, property.Id, submissionModel);
+        Assert.True(submitResult.Success, string.Join(";", submitResult.Errors));
+        var application = submitResult.Data!;
+
+        // Initiate screening and complete it as Passed
+        var screeningResult = await workflowService.InitiateScreeningAsync(application.Id, true, true);
+        Assert.True(screeningResult.Success, string.Join(";", screeningResult.Errors));
+
+        var completeScreeningResult = await workflowService.CompleteScreeningAsync(application.Id, new ScreeningResultModel
+        {
+            BackgroundCheckPassed = true,
+            CreditCheckPassed = true,
+            CreditScore = 700,
+            OverallResult = "Passed",
+            ResultNotes = "All good"
+        });
+        Assert.True(completeScreeningResult.Success, string.Join(";", completeScreeningResult.Errors));
+
+        // Approve application
+        var approveResult = await workflowService.ApproveApplicationAsync(application.Id);
+        Assert.True(approveResult.Success, string.Join(";", approveResult.Errors));
+
+        // Generate lease offer
+        var offerModel = new LeaseOfferModel
+        {
+            StartDate = DateTime.Today.AddDays(14),
+            EndDate = DateTime.Today.AddYears(1).AddDays(14),
+            MonthlyRent = property.MonthlyRent,
+            SecurityDeposit = property.MonthlyRent,
+            Terms = "Standard",
+            Notes = "Test offer"
+        };
+
+        var generateResult = await workflowService.GenerateLeaseOfferAsync(application.Id, offerModel);
+        Assert.True(generateResult.Success, string.Join(";", generateResult.Errors));
+        var leaseOffer = generateResult.Data!;
+
+        // Accept lease offer
+        var acceptResult = await workflowService.AcceptLeaseOfferAsync(leaseOffer.Id, "Card", DateTime.UtcNow);
+        Assert.True(acceptResult.Success, string.Join(";", acceptResult.Errors));
+        var lease = acceptResult.Data!;
+
+        // Assert: Lease exists in DB, Tenant created, Property status Occupied
+        var dbLease = await context.Leases.Include(l => l.Tenant).FirstOrDefaultAsync(l => l.Id == lease.Id);
+        Assert.NotNull(dbLease);
+        Assert.NotNull(dbLease!.Tenant);
+
+        var dbProperty = await context.Properties.FirstOrDefaultAsync(p => p.Id == property.Id);
+        Assert.NotNull(dbProperty);
+        Assert.Equal(ApplicationConstants.PropertyStatuses.Occupied, dbProperty!.Status);
+
+        // Audit logs should contain LeaseOffer Accept entry
+        var audit = await context.WorkflowAuditLogs.FirstOrDefaultAsync(w => w.EntityType == "LeaseOffer" && w.EntityId == leaseOffer.Id);
+        Assert.NotNull(audit);
+    }
+}
diff --git a/Aquiis.SimpleStart.Tests/ApplicationWorkflowServiceTests.cs b/Aquiis.SimpleStart.Tests/ApplicationWorkflowServiceTests.cs
new file mode 100644
index 0000000..a674279
--- /dev/null
+++ b/Aquiis.SimpleStart.Tests/ApplicationWorkflowServiceTests.cs
@@ -0,0 +1,116 @@
+using System.Security.Claims;
+using System.Threading.Tasks;
+using System;
+using Aquiis.SimpleStart.Application.Services.Workflows;
+using Aquiis.SimpleStart.Core.Entities;
+using Aquiis.SimpleStart.Shared.Services;
+using Aquiis.SimpleStart.Shared.Components.Account;
+using Aquiis.SimpleStart.Core.Constants;
+using Microsoft.AspNetCore.Components.Authorization;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging.Abstractions;
+using Moq;
+using Xunit;
+
+namespace Aquiis.SimpleStart.Tests;
+
+public class ApplicationWorkflowServiceTests
+{
+    [Fact]
+    public async Task GetApplicationWorkflowStateAsync_ReturnsExpectedState()
+    {
+        // Arrange
+        // Use SQLite in-memory to support transactions used by workflow base class
+        var connection = new Microsoft.Data.Sqlite.SqliteConnection("Data Source=:memory:");
+        connection.Open();
+        var options = new DbContextOptionsBuilder<Infrastructure.Data.ApplicationDbContext>()
+            .UseSqlite(connection)
+            .Options;
+        // Create test user and org
+        var testUserId = "test-user-id";
+        var orgId = Guid.NewGuid();
+
+        // Mock AuthenticationStateProvider
+        var claims = new ClaimsPrincipal(new ClaimsIdentity(new[] { new Claim(ClaimTypes.NameIdentifier, testUserId) }, "TestAuth"));
+        var mockAuth = new Mock<AuthenticationStateProvider>();
+        mockAuth.Setup(a => a.GetAuthenticationStateAsync())
+            .ReturnsAsync(new AuthenticationState(claims));
+
+        // Mock UserManager to return an ApplicationUser with ActiveOrganizationId set
+        var mockUserStore = new Mock<IUserStore<ApplicationUser>>();
+        var mockUserManager = new Mock<UserManager<ApplicationUser>>(
+            mockUserStore.Object,
+            null, null, null, null, null, null, null, null);
+
+        var appUser = new ApplicationUser { Id = testUserId, ActiveOrganizationId = orgId };
+        mockUserManager.Setup(u => u.FindByIdAsync(It.IsAny<string>())).ReturnsAsync(appUser);
+
+        var serviceProvider = new Mock<IServiceProvider>();
+
+        // Create real UserContextService using mocks
+        var userContext = new UserContextService(mockAuth.Object, mockUserManager.Object, serviceProvider.Object);
+
+        // Create DbContext and seed prospect/property
+        await using var context = new Infrastructure.Data.ApplicationDbContext(options);
+        // Ensure schema is created for SQLite in-memory
+        await context.Database.EnsureCreatedAsync();
+        var appUserEntity = new ApplicationUser { Id = testUserId, UserName = "testuser", Email = "t@t.com", ActiveOrganizationId = orgId };
+        context.Users.Add(appUserEntity);
+
+        var org = new Organization { Id = orgId, Name = "TestOrg", OwnerId = testUserId, CreatedBy = testUserId, CreatedOn = DateTime.UtcNow };
+        context.Organizations.Add(org);
+
+        var prospect = new ProspectiveTenant { Id = Guid.NewGuid(), OrganizationId = orgId, FirstName = "Test", LastName = "User", Email = "t@t.com", Phone = "123", Status = "Lead", CreatedBy = testUserId, CreatedOn = DateTime.UtcNow };
+        var property = new Property { Id = Guid.NewGuid(), OrganizationId = orgId, Address = "123 Main", City = "X", State = "ST", ZipCode = "00000", Status = ApplicationConstants.PropertyStatuses.Available, CreatedBy = testUserId, CreatedOn = DateTime.UtcNow };
+        context.ProspectiveTenants.Add(prospect);
+        context.Properties.Add(property);
+        await context.SaveChangesAsync();
+
+        // Create NoteService (not used heavily in this test)
+        var noteService = new Application.Services.NoteService(context, userContext);
+
+        var workflowService = new ApplicationWorkflowService(context, userContext, noteService);
+
+        // Act - submit application then initiate screening
+        var submissionModel = new ApplicationSubmissionModel
+        {
+            ApplicationFee = 25m,
+            ApplicationFeePaid = true,
+            ApplicationFeePaymentMethod = "Card",
+            CurrentAddress = "Addr",
+            CurrentCity = "C",
+            CurrentState = "ST",
+            CurrentZipCode = "00000",
+            CurrentRent = 1000m,
+            LandlordName = "L",
+            LandlordPhone = "P",
+            EmployerName = "E",
+            JobTitle = "J",
+            MonthlyIncome = 2000m,
+            EmploymentLengthMonths = 12,
+            Reference1Name = "R1",
+            Reference1Phone = "111",
+            Reference1Relationship = "Friend"
+        };
+
+        var submitResult = await workflowService.SubmitApplicationAsync(prospect.Id, property.Id, submissionModel);
+        Assert.True(submitResult.Success, string.Join(";", submitResult.Errors));
+
+        var application = submitResult.Data!;
+
+        var screeningResult = await workflowService.InitiateScreeningAsync(application.Id, true, true);
+        Assert.True(screeningResult.Success, string.Join(";", screeningResult.Errors));
+
+        // Get aggregated workflow state
+        var state = await workflowService.GetApplicationWorkflowStateAsync(application.Id);
+
+        // Assert
+        Assert.NotNull(state.Application);
+        Assert.NotNull(state.Prospect);
+        Assert.NotNull(state.Property);
+        Assert.NotNull(state.Screening);
+        Assert.NotEmpty(state.AuditHistory);
+
+    }
+}
diff --git a/Aquiis.SimpleStart.Tests/Aquiis.SimpleStart.Tests.csproj b/Aquiis.SimpleStart.Tests/Aquiis.SimpleStart.Tests.csproj
new file mode 100644
index 0000000..656978d
--- /dev/null
+++ b/Aquiis.SimpleStart.Tests/Aquiis.SimpleStart.Tests.csproj
@@ -0,0 +1,21 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net9.0</TargetFramework>
+    <IsPackable>false</IsPackable>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="xunit" Version="2.6.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.6.2" />
+    <PackageReference Include="Moq" Version="4.18.4" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.11" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Aquiis.SimpleStart\Aquiis.SimpleStart.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/Aquiis.SimpleStart/.github/copilot-instructions.md b/Aquiis.SimpleStart/.github/copilot-instructions.md
index aefdf5c..95ca41a 100644
--- a/Aquiis.SimpleStart/.github/copilot-instructions.md
+++ b/Aquiis.SimpleStart/.github/copilot-instructions.md
@@ -1,5 +1,43 @@
 # Aquiis Property Management System - AI Agent Instructions
 
+## Development Workflow
+
+### Feature Branch Strategy
+
+**CRITICAL: Always develop new features on feature branches, never directly on main**
+
+1. **Create Feature Branch**: Before starting any new phase or major feature:
+   ```bash
+   git checkout -b Phase-X-Feature-Name
+   ```
+   - Use descriptive names: `Phase-6-Workflow-Services-and-Automation`
+   - Branch from `main` to ensure clean starting point
+
+2. **Development on Feature Branch**:
+   - All commits for the feature go to the feature branch
+   - Build and test frequently to ensure no breaking changes
+   - Keep commits focused and atomic
+
+3. **Merge to Main** (only when complete and error-free):
+   ```bash
+   # Ensure build succeeds with 0 errors
+   dotnet build Aquiis.sln
+   
+   # Switch to main and merge
+   git checkout main
+   git merge Phase-X-Feature-Name
+   
+   # Push to remote
+   git push origin main
+   ```
+
+4. **Protection**: Main branch should always be production-ready
+   - Never commit directly to main during active development
+   - Only merge tested, working code
+   - If build fails, fix on feature branch before merging
+
+---
+
 ## Project Overview
 
 Aquiis is a multi-tenant property management system built with **ASP.NET Core 9.0 + Blazor Server**. It manages properties, tenants, leases, invoices, payments, documents, inspections, and maintenance requests with role-based access control.
diff --git a/Aquiis.SimpleStart/Application/Services/CalendarEventService.cs b/Aquiis.SimpleStart/Application/Services/CalendarEventService.cs
index 41926db..b5a92e9 100644
--- a/Aquiis.SimpleStart/Application/Services/CalendarEventService.cs
+++ b/Aquiis.SimpleStart/Application/Services/CalendarEventService.cs
@@ -88,7 +88,7 @@ public CalendarEventService(ApplicationDbContext context, CalendarSettingsServic
         /// <summary>
         /// Delete a calendar event
         /// </summary>
-        public async Task DeleteEventAsync(int? calendarEventId)
+        public async Task DeleteEventAsync(Guid? calendarEventId)
         {
             if (!calendarEventId.HasValue) return;
 
@@ -127,7 +127,7 @@ public async Task<List<CalendarEvent>> GetEventsAsync(
         /// <summary>
         /// Get a specific calendar event by ID
         /// </summary>
-        public async Task<CalendarEvent?> GetEventByIdAsync(int eventId)
+        public async Task<CalendarEvent?> GetEventByIdAsync(Guid eventId)
         {
             var organizationId = await _userContextService.GetActiveOrganizationIdAsync();
             return await _context.CalendarEvents
@@ -187,7 +187,7 @@ public async Task<CalendarEvent> CreateCustomEventAsync(CalendarEvent calendarEv
         /// <summary>
         /// Get all calendar events for a specific property
         /// </summary>
-        public async Task<List<CalendarEvent>> GetEventsByPropertyIdAsync(int propertyId)
+        public async Task<List<CalendarEvent>> GetEventsByPropertyIdAsync(Guid propertyId)
         {
             var organizationId = await _userContextService.GetActiveOrganizationIdAsync();
             return await _context.CalendarEvents
@@ -221,6 +221,7 @@ private CalendarEvent CreateEventFromEntity<T>(T entity)
             
             return new CalendarEvent
             {
+                Id = Guid.NewGuid(),
                 Title = entity.GetEventTitle(),
                 StartOn = entity.GetEventStart(),
                 DurationMinutes = entity.GetEventDuration(),
diff --git a/Aquiis.SimpleStart/Application/Services/CalendarSettingsService.cs b/Aquiis.SimpleStart/Application/Services/CalendarSettingsService.cs
index ed75e3f..8780c58 100644
--- a/Aquiis.SimpleStart/Application/Services/CalendarSettingsService.cs
+++ b/Aquiis.SimpleStart/Application/Services/CalendarSettingsService.cs
@@ -17,7 +17,7 @@ public CalendarSettingsService(ApplicationDbContext context, UserContextService
         _userContext = userContext;
     }
 
-    public async Task<List<CalendarSettings>> GetSettingsAsync(string organizationId)
+    public async Task<List<CalendarSettings>> GetSettingsAsync(Guid organizationId)
     {
         await EnsureDefaultsAsync(organizationId);
 
@@ -28,7 +28,7 @@ public async Task<List<CalendarSettings>> GetSettingsAsync(string organizationId
             .ToListAsync();
     }
 
-    public async Task<CalendarSettings?> GetSettingAsync(string organizationId, string entityType)
+    public async Task<CalendarSettings?> GetSettingAsync(Guid organizationId, string entityType)
     {
         var setting = await _context.CalendarSettings
             .FirstOrDefaultAsync(s => s.OrganizationId == organizationId 
@@ -58,7 +58,7 @@ public async Task<CalendarSettings> UpdateSettingAsync(CalendarSettings setting)
         return setting;
     }
 
-    public async Task<bool> IsAutoCreateEnabledAsync(string organizationId, string entityType)
+    public async Task<bool> IsAutoCreateEnabledAsync(Guid organizationId, string entityType)
     {
         var setting = await _context.CalendarSettings
             .FirstOrDefaultAsync(s => s.OrganizationId == organizationId 
@@ -69,7 +69,7 @@ public async Task<bool> IsAutoCreateEnabledAsync(string organizationId, string e
         return setting?.AutoCreateEvents ?? true;
     }
 
-    public async Task EnsureDefaultsAsync(string organizationId)
+    public async Task EnsureDefaultsAsync(Guid organizationId)
     {
         var userId = await _userContext.GetUserIdAsync();
         var entityTypes = SchedulableEntityRegistry.GetEntityTypeNames();
@@ -96,7 +96,7 @@ public async Task EnsureDefaultsAsync(string organizationId)
         }
     }
 
-    private CalendarSettings CreateDefaultSetting(string organizationId, string entityType)
+    private CalendarSettings CreateDefaultSetting(Guid organizationId, string entityType)
     {
         // Get defaults from CalendarEventTypes if available
         var config = CalendarEventTypes.Config.ContainsKey(entityType)
@@ -106,6 +106,7 @@ private CalendarSettings CreateDefaultSetting(string organizationId, string enti
         var userId = _userContext.GetUserIdAsync().Result;
         return new CalendarSettings
         {
+            Id = Guid.NewGuid(),
             OrganizationId = organizationId,
             EntityType = entityType,
             AutoCreateEvents = true,
diff --git a/Aquiis.SimpleStart/Application/Services/ChecklistService.cs b/Aquiis.SimpleStart/Application/Services/ChecklistService.cs
index 26b5f3f..a46be58 100644
--- a/Aquiis.SimpleStart/Application/Services/ChecklistService.cs
+++ b/Aquiis.SimpleStart/Application/Services/ChecklistService.cs
@@ -41,7 +41,7 @@ public async Task<List<ChecklistTemplate>> GetChecklistTemplatesAsync()
                 .ToListAsync();
         }
 
-        public async Task<ChecklistTemplate?> GetChecklistTemplateByIdAsync(int templateId)
+        public async Task<ChecklistTemplate?> GetChecklistTemplateByIdAsync(Guid templateId)
         {
             var userId = await _userContext.GetUserIdAsync();
             if (userId == null)
@@ -78,7 +78,7 @@ public async Task<ChecklistTemplate> AddChecklistTemplateAsync(ChecklistTemplate
                 throw new InvalidOperationException($"A template named '{template.Name}' already exists.");
             }
 
-            template.OrganizationId = organizationId!;
+            template.OrganizationId = organizationId!.Value;
             template.CreatedBy = !string.IsNullOrEmpty(userId) ? userId : string.Empty;
             template.CreatedOn = DateTime.UtcNow;
 
@@ -103,7 +103,7 @@ public async Task UpdateChecklistTemplateAsync(ChecklistTemplate template)
             await _dbContext.SaveChangesAsync();
         }
 
-        public async Task DeleteChecklistTemplateAsync(int templateId)
+        public async Task DeleteChecklistTemplateAsync(Guid templateId)
         {
             var userId = await _userContext.GetUserIdAsync();
             if (userId == null)
@@ -135,7 +135,8 @@ public async Task<ChecklistTemplateItem> AddChecklistTemplateItemAsync(Checklist
 
             var organizationId = await _userContext.GetActiveOrganizationIdAsync();
 
-            item.OrganizationId = organizationId!;
+            item.Id = Guid.NewGuid();
+            item.OrganizationId = organizationId!.Value;
             item.CreatedBy = !string.IsNullOrEmpty(userId) ? userId : string.Empty;
             item.CreatedOn = DateTime.UtcNow;
 
@@ -160,7 +161,7 @@ public async Task UpdateChecklistTemplateItemAsync(ChecklistTemplateItem item)
             await _dbContext.SaveChangesAsync();
         }
 
-        public async Task DeleteChecklistTemplateItemAsync(int itemId)
+        public async Task DeleteChecklistTemplateItemAsync(Guid itemId)
         {
             var userId = await _userContext.GetUserIdAsync();
             if (userId == null)
@@ -211,7 +212,7 @@ public async Task<List<Checklist>> GetChecklistsAsync(bool includeArchived = fal
             return await query.OrderByDescending(c => c.CreatedOn).ToListAsync();
         }
 
-        public async Task<List<Checklist>> GetChecklistsByPropertyIdAsync(int propertyId)
+        public async Task<List<Checklist>> GetChecklistsByPropertyIdAsync(Guid propertyId)
         {
             var userId = await _userContext.GetUserIdAsync();
             if (userId == null)
@@ -231,7 +232,7 @@ public async Task<List<Checklist>> GetChecklistsByPropertyIdAsync(int propertyId
                 .ToListAsync();
         }
 
-        public async Task<List<Checklist>> GetChecklistsByLeaseIdAsync(int leaseId)
+        public async Task<List<Checklist>> GetChecklistsByLeaseIdAsync(Guid leaseId)
         {
             var userId = await _userContext.GetUserIdAsync();
             if (userId == null)
@@ -251,7 +252,7 @@ public async Task<List<Checklist>> GetChecklistsByLeaseIdAsync(int leaseId)
                 .ToListAsync();
         }
 
-        public async Task<Checklist?> GetChecklistByIdAsync(int checklistId)
+        public async Task<Checklist?> GetChecklistByIdAsync(Guid checklistId)
         {
             var userId = await _userContext.GetUserIdAsync();
             if (userId == null)
@@ -274,7 +275,7 @@ public async Task<List<Checklist>> GetChecklistsByLeaseIdAsync(int leaseId)
         /// <summary>
         /// Creates a new checklist instance from a template, including all template items
         /// </summary>
-        public async Task<Checklist> CreateChecklistFromTemplateAsync(int templateId)
+        public async Task<Checklist> CreateChecklistFromTemplateAsync(Guid templateId)
         {
             var userId = await _userContext.GetUserIdAsync();
             if (userId == null)
@@ -294,11 +295,12 @@ public async Task<Checklist> CreateChecklistFromTemplateAsync(int templateId)
             // Create the checklist from template
             var checklist = new Checklist
             {
+                Id = Guid.NewGuid(),
                 Name = template.Name,
                 ChecklistType = template.Category,
                 ChecklistTemplateId = template.Id,
                 Status = ApplicationConstants.ChecklistStatuses.Draft,
-                OrganizationId = organizationId!,
+                OrganizationId = organizationId!.Value,
                 CreatedBy = !string.IsNullOrEmpty(userId) ? userId : string.Empty,
                 CreatedOn = DateTime.UtcNow
             };
@@ -311,6 +313,7 @@ public async Task<Checklist> CreateChecklistFromTemplateAsync(int templateId)
             {
                 var checklistItem = new ChecklistItem
                 {
+                    Id = Guid.NewGuid(),
                     ChecklistId = checklist.Id,
                     ItemText = templateItem.ItemText,
                     ItemOrder = templateItem.ItemOrder,
@@ -318,15 +321,23 @@ public async Task<Checklist> CreateChecklistFromTemplateAsync(int templateId)
                     SectionOrder = templateItem.SectionOrder,
                     RequiresValue = templateItem.RequiresValue,
                     IsChecked = false,
-                    OrganizationId = organizationId!
+                    OrganizationId = organizationId!.Value,
+                    CreatedBy = !string.IsNullOrEmpty(userId) ? userId : string.Empty,
+                    CreatedOn = DateTime.UtcNow
                 };
                 _dbContext.ChecklistItems.Add(checklistItem);
             }
 
             await _dbContext.SaveChangesAsync();
 
-            // Reload with items
-            return await GetChecklistByIdAsync(checklist.Id) ?? checklist;
+            // Return checklist with items already loaded in memory
+            checklist.Items = await _dbContext.ChecklistItems
+                .Where(i => i.ChecklistId == checklist.Id)
+                .OrderBy(i => i.SectionOrder)
+                .ThenBy(i => i.ItemOrder)
+                .ToListAsync();
+                
+            return checklist;
         }
 
         public async Task<Checklist> AddChecklistAsync(Checklist checklist)
@@ -339,7 +350,8 @@ public async Task<Checklist> AddChecklistAsync(Checklist checklist)
 
             var organizationId = await _userContext.GetActiveOrganizationIdAsync();
 
-            checklist.OrganizationId = organizationId!;
+            checklist.Id = Guid.NewGuid();
+            checklist.OrganizationId = organizationId!.Value;
             checklist.CreatedBy = !string.IsNullOrEmpty(userId) ? userId : string.Empty;
             checklist.CreatedOn = DateTime.UtcNow;
 
@@ -364,7 +376,7 @@ public async Task UpdateChecklistAsync(Checklist checklist)
             await _dbContext.SaveChangesAsync();
         }
 
-        public async Task DeleteChecklistAsync(int checklistId)
+        public async Task DeleteChecklistAsync(Guid checklistId)
         {
             var userId = await _userContext.GetUserIdAsync();
             if (userId == null)
@@ -393,7 +405,7 @@ public async Task DeleteChecklistAsync(int checklistId)
             }
         }
 
-        public async Task ArchiveChecklistAsync(int checklistId)
+        public async Task ArchiveChecklistAsync(Guid checklistId)
         {
             var userId = await _userContext.GetUserIdAsync();
             if (userId == null)
@@ -415,7 +427,7 @@ public async Task ArchiveChecklistAsync(int checklistId)
             }
         }
 
-        public async Task UnarchiveChecklistAsync(int checklistId)
+        public async Task UnarchiveChecklistAsync(Guid checklistId)
         {
             var userId = await _userContext.GetUserIdAsync();
             if (userId == null)
@@ -437,7 +449,7 @@ public async Task UnarchiveChecklistAsync(int checklistId)
             }
         }
 
-        public async Task CompleteChecklistAsync(int checklistId)
+        public async Task CompleteChecklistAsync(Guid checklistId)
         {
             var userId = await _userContext.GetUserIdAsync();
             if (userId == null)
@@ -506,7 +518,7 @@ public async Task CompleteChecklistAsync(int checklistId)
             }
         }
 
-        public async Task<ChecklistTemplate> SaveChecklistAsTemplateAsync(int checklistId, string templateName, string? templateDescription = null)
+        public async Task<ChecklistTemplate> SaveChecklistAsTemplateAsync(Guid checklistId, string templateName, string? templateDescription = null)
         {
             var userId = await _userContext.GetUserIdAsync();
             if (userId == null)
@@ -544,7 +556,7 @@ public async Task<ChecklistTemplate> SaveChecklistAsTemplateAsync(int checklistI
                 Description = templateDescription ?? $"Template created from checklist: {checklist.Name}",
                 Category = checklist.ChecklistType,
                 IsSystemTemplate = false,
-                OrganizationId = organizationId!,
+                OrganizationId = organizationId!.Value,
                 CreatedBy = !string.IsNullOrEmpty(userId) ? userId : string.Empty,
                 CreatedOn = DateTime.UtcNow
             };
@@ -557,6 +569,7 @@ public async Task<ChecklistTemplate> SaveChecklistAsTemplateAsync(int checklistI
             {
                 var templateItem = new ChecklistTemplateItem
                 {
+                    Id = Guid.NewGuid(),
                     ChecklistTemplateId = template.Id,
                     ItemText = item.ItemText,
                     ItemOrder = item.ItemOrder,
@@ -565,7 +578,7 @@ public async Task<ChecklistTemplate> SaveChecklistAsTemplateAsync(int checklistI
                     IsRequired = false, // User can customize this later
                     RequiresValue = item.RequiresValue,
                     AllowsNotes = true,
-                    OrganizationId = organizationId!,
+                    OrganizationId = organizationId!.Value,
                     CreatedBy = !string.IsNullOrEmpty(userId) ? userId : string.Empty,
                     CreatedOn = DateTime.UtcNow
                 };
@@ -592,7 +605,8 @@ public async Task<ChecklistItem> AddChecklistItemAsync(ChecklistItem item)
 
             var organizationId = await _userContext.GetActiveOrganizationIdAsync();
 
-            item.OrganizationId = organizationId!;
+            item.Id = Guid.NewGuid();
+            item.OrganizationId = organizationId!.Value;
             item.CreatedBy = !string.IsNullOrEmpty(userId) ? userId : string.Empty;
             item.CreatedOn = DateTime.UtcNow;
 
@@ -617,7 +631,7 @@ public async Task UpdateChecklistItemAsync(ChecklistItem item)
             await _dbContext.SaveChangesAsync();
         }
 
-        public async Task DeleteChecklistItemAsync(int itemId)
+        public async Task DeleteChecklistItemAsync(Guid itemId)
         {
             var userId = await _userContext.GetUserIdAsync();
             if (userId == null)
diff --git a/Aquiis.SimpleStart/Application/Services/FinancialReportService.cs b/Aquiis.SimpleStart/Application/Services/FinancialReportService.cs
index 9a7e7d8..2d8d038 100644
--- a/Aquiis.SimpleStart/Application/Services/FinancialReportService.cs
+++ b/Aquiis.SimpleStart/Application/Services/FinancialReportService.cs
@@ -17,10 +17,10 @@ public FinancialReportService(IDbContextFactory<ApplicationDbContext> contextFac
     /// Generate income statement for a specific period and optional property
     /// </summary>
     public async Task<IncomeStatement> GenerateIncomeStatementAsync(
-        string organizationId, 
+        Guid organizationId, 
         DateTime startDate, 
         DateTime endDate, 
-        int? propertyId = null)
+        Guid? propertyId = null)
     {
         using var context = await _contextFactory.CreateDbContextAsync();
 
@@ -97,7 +97,7 @@ public async Task<IncomeStatement> GenerateIncomeStatementAsync(
     /// <summary>
     /// Generate rent roll report showing all properties and tenants
     /// </summary>
-    public async Task<List<RentRollItem>> GenerateRentRollAsync(string organizationId, DateTime asOfDate)
+    public async Task<List<RentRollItem>> GenerateRentRollAsync(Guid organizationId, DateTime asOfDate)
     {
         using var context = await _contextFactory.CreateDbContextAsync();
 
@@ -136,7 +136,7 @@ public async Task<List<RentRollItem>> GenerateRentRollAsync(string organizationI
     /// Generate property performance comparison report
     /// </summary>
     public async Task<List<PropertyPerformance>> GeneratePropertyPerformanceAsync(
-        string organizationId, 
+        Guid organizationId, 
         DateTime startDate, 
         DateTime endDate)
     {
@@ -213,7 +213,7 @@ public async Task<List<PropertyPerformance>> GeneratePropertyPerformanceAsync(
     /// <summary>
     /// Generate tax report data for Schedule E
     /// </summary>
-    public async Task<List<TaxReportData>> GenerateTaxReportAsync(string organizationId, int year, int? propertyId = null)
+    public async Task<List<TaxReportData>> GenerateTaxReportAsync(Guid organizationId, int year, Guid? propertyId = null)
     {
         using var context = await _contextFactory.CreateDbContextAsync();
         var startDate = new DateTime(year, 1, 1);
diff --git a/Aquiis.SimpleStart/Application/Services/NoteService.cs b/Aquiis.SimpleStart/Application/Services/NoteService.cs
index 0c9820b..7bb68e6 100644
--- a/Aquiis.SimpleStart/Application/Services/NoteService.cs
+++ b/Aquiis.SimpleStart/Application/Services/NoteService.cs
@@ -20,24 +20,26 @@ public NoteService(ApplicationDbContext context, UserContextService userContext)
         /// <summary>
         /// Add a note to an entity
         /// </summary>
-        public async Task<Note> AddNoteAsync(string entityType, int entityId, string content)
+        public async Task<Note> AddNoteAsync(string entityType, Guid entityId, string content)
         {
             var organizationId = await _userContext.GetActiveOrganizationIdAsync();
             var userId = await _userContext.GetUserIdAsync();
             var userFullName = await _userContext.GetUserNameAsync();
+            var userEmail = await _userContext.GetUserEmailAsync();
 
-            if (string.IsNullOrEmpty(organizationId) || string.IsNullOrEmpty(userId))
+            if (!organizationId.HasValue || string.IsNullOrEmpty(userId))
             {
                 throw new InvalidOperationException("User context is not available.");
             }
 
             var note = new Note
             {
-                OrganizationId = organizationId!,
+                Id = Guid.NewGuid(),
+                OrganizationId = organizationId!.Value,
                 EntityType = entityType,
                 EntityId = entityId,
                 Content = content.Trim(),
-                UserFullName = !string.IsNullOrWhiteSpace(userFullName) ? userFullName : "Unknown User",
+                UserFullName = !string.IsNullOrWhiteSpace(userFullName) ? userFullName : userEmail,
                 CreatedBy = !string.IsNullOrEmpty(userId) ? userId : string.Empty,
                 CreatedOn = DateTime.UtcNow
             };
@@ -51,7 +53,7 @@ public async Task<Note> AddNoteAsync(string entityType, int entityId, string con
         /// <summary>
         /// Get all notes for an entity, ordered by newest first
         /// </summary>
-        public async Task<List<Note>> GetNotesAsync(string entityType, int entityId)
+        public async Task<List<Note>> GetNotesAsync(string entityType, Guid entityId)
         {
             var organizationId = await _userContext.GetActiveOrganizationIdAsync();
             return await _context.Notes
@@ -67,7 +69,7 @@ public async Task<List<Note>> GetNotesAsync(string entityType, int entityId)
         /// <summary>
         /// Delete a note (soft delete)
         /// </summary>
-        public async Task<bool> DeleteNoteAsync(int noteId)
+        public async Task<bool> DeleteNoteAsync(Guid noteId)
         {
             var organizationId = await _userContext.GetActiveOrganizationIdAsync();
             var note = await _context.Notes
@@ -90,7 +92,7 @@ public async Task<bool> DeleteNoteAsync(int noteId)
         /// <summary>
         /// Get note count for an entity
         /// </summary>
-        public async Task<int> GetNoteCountAsync(string entityType, int entityId)
+        public async Task<int> GetNoteCountAsync(string entityType, Guid entityId)
         {
             var organizationId = await _userContext.GetActiveOrganizationIdAsync();
             return await _context.Notes
diff --git a/Aquiis.SimpleStart/Application/Services/OrganizationService.cs b/Aquiis.SimpleStart/Application/Services/OrganizationService.cs
index aabe521..a227802 100644
--- a/Aquiis.SimpleStart/Application/Services/OrganizationService.cs
+++ b/Aquiis.SimpleStart/Application/Services/OrganizationService.cs
@@ -27,7 +27,7 @@ public async Task<Organization> CreateOrganizationAsync(string ownerId, string n
         {
             var organization = new Organization
             {
-                Id = Guid.NewGuid().ToString(),
+                Id = Guid.NewGuid(),
                 OwnerId = ownerId,
                 Name = name,
                 DisplayName = displayName ?? name,
@@ -42,7 +42,7 @@ public async Task<Organization> CreateOrganizationAsync(string ownerId, string n
             // Create Owner entry in UserOrganizations
             var userOrganization = new UserOrganization
             {
-                Id = Guid.NewGuid().ToString(),
+                Id = Guid.NewGuid(),
                 UserId = ownerId,
                 OrganizationId = organization.Id,
                 Role = ApplicationConstants.OrganizationRoles.Owner,
@@ -54,11 +54,11 @@ public async Task<Organization> CreateOrganizationAsync(string ownerId, string n
             };
 
             _dbContext.UserOrganizations.Add(userOrganization);
-            await _dbContext.SaveChangesAsync();
 
             // add organization settings record with defaults
             var settings = new OrganizationSettings
                 {
+                    Id = Guid.NewGuid(),
                     OrganizationId = organization.Id,
                     Name = organization.Name,
                     LateFeeEnabled = true,
@@ -90,7 +90,7 @@ public async Task<Organization> CreateOrganizationAsync(Organization organizatio
                 throw new InvalidOperationException("Cannot create organization: User ID is not available in context.");
 
 
-            organization.Id = Guid.NewGuid().ToString();
+            organization.Id = Guid.NewGuid();
             organization.OwnerId = userId;
             organization.IsActive = true;
             organization.CreatedOn = DateTime.UtcNow;
@@ -101,7 +101,7 @@ public async Task<Organization> CreateOrganizationAsync(Organization organizatio
             // Create Owner entry in UserOrganizations
             var userOrganization = new UserOrganization
             {
-                Id = Guid.NewGuid().ToString(),
+                Id = Guid.NewGuid(),
                 UserId = userId,
                 OrganizationId = organization.Id,
                 Role = ApplicationConstants.OrganizationRoles.Owner,
@@ -141,7 +141,7 @@ public async Task<Organization> CreateOrganizationAsync(Organization organizatio
         /// <summary>
         /// Get organization by ID
         /// </summary>
-        public async Task<Organization?> GetOrganizationByIdAsync(string organizationId)
+        public async Task<Organization?> GetOrganizationByIdAsync(Guid organizationId)
         {
             return await _dbContext.Organizations
                 .Include(o => o.UserOrganizations)
@@ -195,7 +195,7 @@ public async Task<bool> UpdateOrganizationAsync(Organization organization)
         /// <summary>
         /// Delete organization (soft delete)
         /// </summary>
-        public async Task<bool> DeleteOrganizationAsync(string organizationId, string deletedBy)
+        public async Task<bool> DeleteOrganizationAsync(Guid organizationId, string deletedBy)
         {
             var organization = await _dbContext.Organizations.FindAsync(organizationId);
             if (organization == null || organization.IsDeleted)
@@ -231,7 +231,7 @@ public async Task<bool> DeleteOrganizationAsync(string organizationId, string de
         /// <summary>
         /// Check if user is the owner of an organization
         /// </summary>
-        public async Task<bool> IsOwnerAsync(string userId, string organizationId)
+        public async Task<bool> IsOwnerAsync(string userId, Guid organizationId)
         {
             var organization = await _dbContext.Organizations.FindAsync(organizationId);
             return organization != null && organization.OwnerId == userId && !organization.IsDeleted;
@@ -240,7 +240,7 @@ public async Task<bool> IsOwnerAsync(string userId, string organizationId)
         /// <summary>
         /// Check if user has administrator role in an organization
         /// </summary>
-        public async Task<bool> IsAdministratorAsync(string userId, string organizationId)
+        public async Task<bool> IsAdministratorAsync(string userId, Guid organizationId)
         {
             var role = await GetUserRoleForOrganizationAsync(userId, organizationId);
             return role == ApplicationConstants.OrganizationRoles.Administrator;
@@ -249,7 +249,7 @@ public async Task<bool> IsAdministratorAsync(string userId, string organizationI
         /// <summary>
         /// Check if user can access an organization (has any active role)
         /// </summary>
-        public async Task<bool> CanAccessOrganizationAsync(string userId, string organizationId)
+        public async Task<bool> CanAccessOrganizationAsync(string userId, Guid organizationId)
         {
             return await _dbContext.UserOrganizations
                 .AnyAsync(uo => uo.UserId == userId 
@@ -261,7 +261,7 @@ public async Task<bool> CanAccessOrganizationAsync(string userId, string organiz
         /// <summary>
         /// Get user's role for a specific organization
         /// </summary>
-        public async Task<string?> GetUserRoleForOrganizationAsync(string userId, string organizationId)
+        public async Task<string?> GetUserRoleForOrganizationAsync(string userId, Guid organizationId)
         {
             var userOrg = await _dbContext.UserOrganizations
                 .FirstOrDefaultAsync(uo => uo.UserId == userId 
@@ -279,7 +279,7 @@ public async Task<bool> CanAccessOrganizationAsync(string userId, string organiz
         /// <summary>
         /// Grant a user access to an organization with a specific role
         /// </summary>
-        public async Task<bool> GrantOrganizationAccessAsync(string userId, string organizationId, string role, string grantedBy)
+        public async Task<bool> GrantOrganizationAccessAsync(string userId, Guid organizationId, string role, string grantedBy)
         {
             // Validate role
             if (!ApplicationConstants.OrganizationRoles.IsValid(role))
@@ -317,7 +317,7 @@ public async Task<bool> GrantOrganizationAccessAsync(string userId, string organ
                 // Create new access
                 var userOrganization = new UserOrganization
                 {
-                    Id = Guid.NewGuid().ToString(),
+                    Id = Guid.NewGuid(),
                     UserId = userId,
                     OrganizationId = organizationId,
                     Role = role,
@@ -338,7 +338,7 @@ public async Task<bool> GrantOrganizationAccessAsync(string userId, string organ
         /// <summary>
         /// Revoke a user's access to an organization
         /// </summary>
-        public async Task<bool> RevokeOrganizationAccessAsync(string userId, string organizationId, string revokedBy)
+        public async Task<bool> RevokeOrganizationAccessAsync(string userId, Guid organizationId, string revokedBy)
         {
             var userOrg = await _dbContext.UserOrganizations
                 .FirstOrDefaultAsync(uo => uo.UserId == userId 
@@ -368,7 +368,7 @@ public async Task<bool> RevokeOrganizationAccessAsync(string userId, string orga
         /// <summary>
         /// Update a user's role in an organization
         /// </summary>
-        public async Task<bool> UpdateUserRoleAsync(string userId, string organizationId, string newRole, string modifiedBy)
+        public async Task<bool> UpdateUserRoleAsync(string userId, Guid organizationId, string newRole, string modifiedBy)
         {
             // Validate role
             if (!ApplicationConstants.OrganizationRoles.IsValid(newRole))
@@ -402,7 +402,7 @@ public async Task<bool> UpdateUserRoleAsync(string userId, string organizationId
         /// <summary>
         /// Get all users with access to an organization
         /// </summary>
-        public async Task<List<UserOrganization>> GetOrganizationUsersAsync(string organizationId)
+        public async Task<List<UserOrganization>> GetOrganizationUsersAsync(Guid organizationId)
         {
             return await _dbContext.UserOrganizations
                 .Where(uo => uo.OrganizationId == organizationId && uo.IsActive && !uo.IsDeleted && uo.UserId != ApplicationConstants.SystemUser.Id)
diff --git a/Aquiis.SimpleStart/Application/Services/PropertyManagementService.cs b/Aquiis.SimpleStart/Application/Services/PropertyManagementService.cs
index af509aa..b5f7bf4 100644
--- a/Aquiis.SimpleStart/Application/Services/PropertyManagementService.cs
+++ b/Aquiis.SimpleStart/Application/Services/PropertyManagementService.cs
@@ -58,7 +58,7 @@ public async Task<List<Property>> GetPropertiesAsync()
                 .ToListAsync();
         }
 
-        public async Task<Property?> GetPropertyByIdAsync(int propertyId)
+        public async Task<Property?> GetPropertyByIdAsync(Guid propertyId)
         {
             var _userId = await _userContext.GetUserIdAsync();
 
@@ -122,7 +122,8 @@ public async Task AddPropertyAsync(Property property)
             var organizationId = await _userContext.GetActiveOrganizationIdAsync();
 
             // Set tracking fields automatically
-            property.OrganizationId = organizationId!;
+            property.Id = Guid.NewGuid();
+            property.OrganizationId = organizationId!.Value;
             property.CreatedBy = _userId;
             property.CreatedOn = DateTime.UtcNow;
 
@@ -160,13 +161,13 @@ public async Task UpdatePropertyAsync(Property property)
             // Set tracking fields automatically
             property.LastModifiedBy = _userId;
             property.LastModifiedOn = DateTime.UtcNow;
-            property.OrganizationId = organizationId!; // Prevent org hijacking
+            property.OrganizationId = organizationId!.Value; // Prevent org hijacking
 
             _dbContext.Entry(existing).CurrentValues.SetValues(property);
             await _dbContext.SaveChangesAsync();
         }
 
-        public async Task DeletePropertyAsync(int propertyId)
+        public async Task DeletePropertyAsync(Guid propertyId)
         {
             var _userId = await _userContext.GetUserIdAsync();
 
@@ -197,7 +198,7 @@ public async Task DeletePropertyAsync(int propertyId)
             }
         }
 
-        private async Task SoftDeletePropertyAsync(int propertyId)
+        private async Task SoftDeletePropertyAsync(Guid propertyId)
         {
             var _userId = await _userContext.GetUserIdAsync();
 
@@ -269,7 +270,7 @@ public async Task<List<Tenant>> GetTenantsAsync()
                 .ToListAsync();
         }
         
-        public async Task<List<Tenant>> GetTenantsByLeaseIdAsync(int leaseId)
+        public async Task<List<Tenant>> GetTenantsByLeaseIdAsync(Guid leaseId)
         {
             var _userId = await _userContext.GetUserIdAsync();
 
@@ -292,7 +293,7 @@ public async Task<List<Tenant>> GetTenantsByLeaseIdAsync(int leaseId)
                 .Where(t => tenantIds.Contains(t.Id) && t.OrganizationId == organizationId && !t.IsDeleted)
                 .ToListAsync();
         }
-        public async Task<List<Tenant>> GetTenantsByPropertyIdAsync(int propertyId)
+        public async Task<List<Tenant>> GetTenantsByPropertyIdAsync(Guid propertyId)
         {
             var _userId = await _userContext.GetUserIdAsync();
 
@@ -316,7 +317,7 @@ public async Task<List<Tenant>> GetTenantsByPropertyIdAsync(int propertyId)
                 .ToListAsync();
         }
 
-        public async Task<Tenant?> GetTenantByIdAsync(int tenantId)
+        public async Task<Tenant?> GetTenantByIdAsync(Guid tenantId)
         {
             var _userId = await _userContext.GetUserIdAsync();
 
@@ -363,7 +364,8 @@ public async Task<Tenant> AddTenantAsync(Tenant tenant)
             var organizationId = await _userContext.GetActiveOrganizationIdAsync();
 
             // Set tracking fields automatically
-            tenant.OrganizationId = organizationId!;
+            tenant.Id = Guid.NewGuid();
+            tenant.OrganizationId = organizationId!.Value;
             tenant.CreatedBy = _userId;
             tenant.CreatedOn = DateTime.UtcNow;
 
@@ -397,7 +399,7 @@ public async Task UpdateTenantAsync(Tenant tenant)
             // Set tracking fields automatically
             tenant.LastModifiedOn = DateTime.UtcNow;
             tenant.LastModifiedBy = _userId;
-            tenant.OrganizationId = organizationId!; // Prevent org hijacking
+            tenant.OrganizationId = organizationId!.Value; // Prevent org hijacking
 
             _dbContext.Entry(existing).CurrentValues.SetValues(tenant);
             await _dbContext.SaveChangesAsync();
@@ -463,7 +465,7 @@ public async Task<List<Lease>> GetLeasesAsync()
                 .Where(l => !l.IsDeleted && !l.Tenant!.IsDeleted && !l.Property.IsDeleted && l.Property.OrganizationId == organizationId)
                 .ToListAsync();
         }
-        public async Task<Lease?> GetLeaseByIdAsync(int leaseId)
+        public async Task<Lease?> GetLeaseByIdAsync(Guid leaseId)
         {
             var _userId = await _userContext.GetUserIdAsync();
 
@@ -481,7 +483,7 @@ public async Task<List<Lease>> GetLeasesAsync()
                 .FirstOrDefaultAsync(l => l.Id == leaseId && !l.IsDeleted && (l.Tenant == null || !l.Tenant.IsDeleted) && !l.Property.IsDeleted && l.Property.OrganizationId == organizationId);
         }
 
-        public async Task<List<Lease>> GetLeasesByPropertyIdAsync(int propertyId)
+        public async Task<List<Lease>> GetLeasesByPropertyIdAsync(Guid propertyId)
         {
             var _userId = await _userContext.GetUserIdAsync();
 
@@ -504,7 +506,29 @@ public async Task<List<Lease>> GetLeasesByPropertyIdAsync(int propertyId)
                 .ToList();
         }
 
-        public async Task<List<Lease>> GetActiveLeasesByPropertyIdAsync(int propertyId)
+        public async Task<List<Lease>> GetCurrentAndUpcomingLeasesByPropertyIdAsync(Guid propertyId)
+        {
+            var _userId = await _userContext.GetUserIdAsync();
+
+            if (string.IsNullOrEmpty(_userId))
+            {
+                throw new UnauthorizedAccessException("User is not authenticated.");
+            }
+            
+            var organizationId = await _userContext.GetActiveOrganizationIdAsync();
+
+            return await _dbContext.Leases
+                .Include(l => l.Property)
+                .Include(l => l.Tenant)
+                .Where(l => l.PropertyId == propertyId 
+                    && !l.IsDeleted 
+                    && l.Property.OrganizationId == organizationId
+                    && (l.Status == ApplicationConstants.LeaseStatuses.Pending
+                        || l.Status == ApplicationConstants.LeaseStatuses.Active))
+                .ToListAsync();
+        }
+
+        public async Task<List<Lease>> GetActiveLeasesByPropertyIdAsync(Guid propertyId)
         {
             var _userId = await _userContext.GetUserIdAsync();
 
@@ -528,7 +552,7 @@ public async Task<List<Lease>> GetActiveLeasesByPropertyIdAsync(int propertyId)
         }
 
         
-        public async Task<List<Lease>> GetLeasesByTenantIdAsync(int tenantId)
+        public async Task<List<Lease>> GetLeasesByTenantIdAsync(Guid tenantId)
         {
             var _userId = await _userContext.GetUserIdAsync();
 
@@ -564,6 +588,8 @@ public async Task<List<Lease>> GetLeasesByTenantIdAsync(int tenantId)
                 return lease;
 
             // Set tracking fields automatically
+            lease.Id = Guid.NewGuid();
+            lease.OrganizationId = organizationId!.Value;
             lease.CreatedBy = _userId;
             lease.CreatedOn = DateTime.UtcNow;
 
@@ -610,7 +636,7 @@ public async Task UpdateLeaseAsync(Lease lease)
             await _dbContext.SaveChangesAsync();
         }
 
-        public async Task DeleteLeaseAsync(int leaseId)
+        public async Task DeleteLeaseAsync(Guid leaseId)
         {
             var _userId = await _userContext.GetUserIdAsync();
 
@@ -643,7 +669,7 @@ public async Task DeleteLeaseAsync(int leaseId)
             }
         }
 
-        private async Task SoftDeleteLeaseAsync(int leaseId)
+        private async Task SoftDeleteLeaseAsync(Guid leaseId)
         {
             var userId = await _userContext.GetUserIdAsync();
             var organizationId = await _userContext.GetActiveOrganizationIdAsync();
@@ -685,7 +711,7 @@ public async Task<List<Invoice>> GetInvoicesAsync()
                 .ToListAsync();
         }
 
-        public async Task<Invoice?> GetInvoiceByIdAsync(int invoiceId)
+        public async Task<Invoice?> GetInvoiceByIdAsync(Guid invoiceId)
         {
             var organizationId = await _userContext.GetActiveOrganizationIdAsync();
 
@@ -701,7 +727,7 @@ public async Task<List<Invoice>> GetInvoicesAsync()
                     && i.Lease.Property.OrganizationId == organizationId);
         }
 
-        public async Task<List<Invoice>> GetInvoicesByLeaseIdAsync(int leaseId)
+        public async Task<List<Invoice>> GetInvoicesByLeaseIdAsync(Guid leaseId)
         {
             var organizationId = await _userContext.GetActiveOrganizationIdAsync();
 
@@ -739,7 +765,8 @@ public async Task AddInvoiceAsync(Invoice invoice)
             }
 
             // Set tracking fields automatically
-            invoice.OrganizationId = organizationId!;
+            invoice.Id = Guid.NewGuid();
+            invoice.OrganizationId = organizationId!.Value;
             invoice.CreatedBy = _userId;
             invoice.CreatedOn = DateTime.UtcNow;
 
@@ -771,7 +798,7 @@ public async Task UpdateInvoiceAsync(Invoice invoice)
             // Set tracking fields automatically
             invoice.LastModifiedOn = DateTime.UtcNow;
             invoice.LastModifiedBy = userId;
-            invoice.OrganizationId = organizationId!; // Prevent org hijacking
+            invoice.OrganizationId = organizationId!.Value; // Prevent org hijacking
 
             _dbContext.Entry(existing).CurrentValues.SetValues(invoice);
             await _dbContext.SaveChangesAsync();
@@ -802,11 +829,11 @@ public async Task DeleteInvoiceAsync(Invoice invoice)
         public async Task<string> GenerateInvoiceNumberAsync()
         {
             var organizationId = await _userContext.GetActiveOrganizationIdAsync();    
-            var lastInvoice = await _dbContext.Invoices.Where(i => i.OrganizationId == organizationId)
-                .OrderByDescending(i => i.Id)
-                .FirstOrDefaultAsync();
+            var invoiceCount = await _dbContext.Invoices
+                .Where(i => i.OrganizationId == organizationId)
+                .CountAsync();
             
-            var nextNumber = lastInvoice != null ? lastInvoice.Id + 1 : 1;
+            var nextNumber = invoiceCount + 1;
             return $"INV-{DateTime.Now:yyyyMM}-{nextNumber:D5}";
         }
 
@@ -831,7 +858,7 @@ public async Task<List<Payment>> GetPaymentsAsync()
         }
 
 
-        public async Task<Payment?> GetPaymentByIdAsync(int paymentId)
+        public async Task<Payment?> GetPaymentByIdAsync(Guid paymentId)
         {
             var organizationId = await _userContext.GetActiveOrganizationIdAsync();
             return await _dbContext.Payments
@@ -844,7 +871,7 @@ public async Task<List<Payment>> GetPaymentsAsync()
                 .FirstOrDefaultAsync(p => p.Id == paymentId && !p.IsDeleted && p.Invoice.Lease.Property.OrganizationId == organizationId);
         }
 
-        public async Task<List<Payment>> GetPaymentsByInvoiceIdAsync(int invoiceId)
+        public async Task<List<Payment>> GetPaymentsByInvoiceIdAsync(Guid invoiceId)
         {
             var organizationId = await _userContext.GetActiveOrganizationIdAsync();
             return await _dbContext.Payments
@@ -866,7 +893,8 @@ public async Task AddPaymentAsync(Payment payment)
             var organizationId = await _userContext.GetActiveOrganizationIdAsync();
             
             // Set tracking fields automatically
-            payment.OrganizationId = organizationId!;
+            payment.Id = Guid.NewGuid();
+            payment.OrganizationId = organizationId!.Value;
             payment.CreatedBy = _userId;
             payment.CreatedOn = DateTime.UtcNow;
 
@@ -898,7 +926,7 @@ public async Task UpdatePaymentAsync(Payment payment)
             }
             
             // Set tracking fields automatically
-            payment.OrganizationId = organizationId!;
+            payment.OrganizationId = organizationId!.Value;
             payment.LastModifiedOn = DateTime.UtcNow;
             payment.LastModifiedBy = _userId;
 
@@ -938,7 +966,7 @@ public async Task DeletePaymentAsync(Payment payment)
             await UpdateInvoicePaidAmountAsync(invoiceId);
         }
 
-        private async Task UpdateInvoicePaidAmountAsync(int invoiceId)
+        private async Task UpdateInvoicePaidAmountAsync(Guid invoiceId)
         {
             var organizationId = await _userContext.GetActiveOrganizationIdAsync();
             var invoice = await _dbContext.Invoices.Where(i => i.Id == invoiceId && i.OrganizationId == organizationId).FirstOrDefaultAsync();
@@ -987,7 +1015,7 @@ public async Task<List<Document>> GetDocumentsAsync()
                 .ToListAsync();
         }
 
-        public async Task<Document?> GetDocumentByIdAsync(int documentId)
+        public async Task<Document?> GetDocumentByIdAsync(Guid documentId)
         {
             var organizationId = await _userContext.GetActiveOrganizationIdAsync();
 
@@ -1004,7 +1032,7 @@ public async Task<List<Document>> GetDocumentsAsync()
                 .FirstOrDefaultAsync(d => d.Id == documentId && !d.IsDeleted && d.OrganizationId == organizationId);
         }
 
-        public async Task<List<Document>> GetDocumentsByLeaseIdAsync(int leaseId)
+        public async Task<List<Document>> GetDocumentsByLeaseIdAsync(Guid leaseId)
         {
             var organizationId = await _userContext.GetActiveOrganizationIdAsync();
 
@@ -1018,7 +1046,7 @@ public async Task<List<Document>> GetDocumentsByLeaseIdAsync(int leaseId)
                 .ToListAsync();
         }
         
-        public async Task<List<Document>> GetDocumentsByPropertyIdAsync(int propertyId)
+        public async Task<List<Document>> GetDocumentsByPropertyIdAsync(Guid propertyId)
         {
             var organizationId = await _userContext.GetActiveOrganizationIdAsync();
 
@@ -1031,7 +1059,7 @@ public async Task<List<Document>> GetDocumentsByPropertyIdAsync(int propertyId)
                 .ToListAsync();
         }
 
-        public async Task<List<Document>> GetDocumentsByTenantIdAsync(int tenantId)
+        public async Task<List<Document>> GetDocumentsByTenantIdAsync(Guid tenantId)
         {
             var organizationId = await _userContext.GetActiveOrganizationIdAsync();
 
@@ -1054,8 +1082,9 @@ public async Task<Document> AddDocumentAsync(Document document)
                 throw new UnauthorizedAccessException("User is not authenticated.");
             }
 
+            document.Id = Guid.NewGuid();
+            document.OrganizationId = organizationId!.Value;
             document.CreatedBy = _userId;
-            document.OrganizationId = organizationId!;
             document.CreatedOn = DateTime.UtcNow;
             _dbContext.Documents.Add(document);
             await _dbContext.SaveChangesAsync();
@@ -1084,7 +1113,7 @@ public async Task UpdateDocumentAsync(Document document)
             // Set tracking fields automatically
             document.LastModifiedBy = _userId;
             document.LastModifiedOn = DateTime.UtcNow;
-            document.OrganizationId = organizationId!; // Prevent org hijacking
+            document.OrganizationId = organizationId!.Value; // Prevent org hijacking
 
             _dbContext.Entry(existing).CurrentValues.SetValues(document);
             await _dbContext.SaveChangesAsync();
@@ -1185,7 +1214,7 @@ public async Task<List<Inspection>> GetInspectionsAsync()
                 .ToListAsync();
         }
 
-        public async Task<List<Inspection>> GetInspectionsByPropertyIdAsync(int propertyId)
+        public async Task<List<Inspection>> GetInspectionsByPropertyIdAsync(Guid propertyId)
         {
             var organizationId = await _userContext.GetActiveOrganizationIdAsync();
             
@@ -1198,7 +1227,7 @@ public async Task<List<Inspection>> GetInspectionsByPropertyIdAsync(int property
                 .ToListAsync();
         }
 
-        public async Task<Inspection?> GetInspectionByIdAsync(int inspectionId)
+        public async Task<Inspection?> GetInspectionByIdAsync(Guid inspectionId)
         {
             var organizationId = await _userContext.GetActiveOrganizationIdAsync();
             
@@ -1219,7 +1248,9 @@ public async Task AddInspectionAsync(Inspection inspection)
             {
                 throw new UnauthorizedAccessException("User is not authenticated.");
             }
-            inspection.OrganizationId = organizationId!;
+
+            inspection.Id = Guid.NewGuid();
+            inspection.OrganizationId = organizationId!.Value;
             inspection.CreatedBy = _userId;
             inspection.CreatedOn = DateTime.UtcNow;
             await _dbContext.Inspections.AddAsync(inspection);
@@ -1274,7 +1305,7 @@ public async Task UpdateInspectionAsync(Inspection inspection)
             // Set tracking fields automatically
             inspection.LastModifiedBy = _userId;
             inspection.LastModifiedOn = DateTime.UtcNow;
-            inspection.OrganizationId = organizationId!; // Prevent org hijacking
+            inspection.OrganizationId = organizationId!.Value; // Prevent org hijacking
 
             _dbContext.Entry(existing).CurrentValues.SetValues(inspection);
             await _dbContext.SaveChangesAsync();
@@ -1283,11 +1314,11 @@ public async Task UpdateInspectionAsync(Inspection inspection)
             await _calendarEventService.CreateOrUpdateEventAsync(inspection);
         }
 
-        public async Task DeleteInspectionAsync(int inspectionId)
+        public async Task DeleteInspectionAsync(Guid inspectionId)
         {
             var userId = await _userContext.GetUserIdAsync();
             var organizationId = await _userContext.GetActiveOrganizationIdAsync();
-            if (string.IsNullOrEmpty(userId) || string.IsNullOrEmpty(organizationId))
+            if (string.IsNullOrEmpty(userId) || !organizationId.HasValue || organizationId == Guid.Empty)
             {
                 throw new UnauthorizedAccessException("User is not authenticated.");
             }
@@ -1320,7 +1351,7 @@ public async Task DeleteInspectionAsync(int inspectionId)
         /// <summary>
         /// Updates property inspection tracking after a routine inspection is completed
         /// </summary>
-        public async Task UpdatePropertyInspectionTrackingAsync(int propertyId, DateTime inspectionDate, int intervalMonths = 12)
+        public async Task UpdatePropertyInspectionTrackingAsync(Guid propertyId, DateTime inspectionDate, int intervalMonths = 12)
         {
             var organizationId = await _userContext.GetActiveOrganizationIdAsync();
 
@@ -1393,7 +1424,7 @@ public async Task<int> GetOverdueInspectionCountAsync()
         /// <summary>
         /// Initializes inspection tracking for a property (sets first inspection due date)
         /// </summary>
-        public async Task InitializePropertyInspectionTrackingAsync(int propertyId, int intervalMonths = 12)
+        public async Task InitializePropertyInspectionTrackingAsync(Guid propertyId, int intervalMonths = 12)
         {
             var property = await _dbContext.Properties.FindAsync(propertyId);
             var organizationId = await _userContext.GetActiveOrganizationIdAsync();
@@ -1437,6 +1468,7 @@ private async Task CreateRoutineInspectionCalendarEventAsync(Property property)
 
             var calendarEvent = new CalendarEvent
             {
+                Id = Guid.NewGuid(),
                 Title = $"Routine Inspection - {property.Address}",
                 Description = $"Routine inspection due for property at {property.Address}, {property.City}, {property.State}",
                 StartOn = property.NextRoutineInspectionDueDate.Value,
@@ -1474,7 +1506,7 @@ public async Task<List<MaintenanceRequest>> GetMaintenanceRequestsAsync()
                 .ToListAsync();
         }
 
-        public async Task<List<MaintenanceRequest>> GetMaintenanceRequestsByPropertyAsync(int propertyId)
+        public async Task<List<MaintenanceRequest>> GetMaintenanceRequestsByPropertyAsync(Guid propertyId)
         {
             var organizationId = await _userContext.GetActiveOrganizationIdAsync();
 
@@ -1486,7 +1518,7 @@ public async Task<List<MaintenanceRequest>> GetMaintenanceRequestsByPropertyAsyn
                 .ToListAsync();
         }
 
-        public async Task<List<MaintenanceRequest>> GetMaintenanceRequestsByLeaseAsync(int leaseId)
+        public async Task<List<MaintenanceRequest>> GetMaintenanceRequestsByLeaseAsync(Guid leaseId)
         {
             var organizationId = await _userContext.GetActiveOrganizationIdAsync();
 
@@ -1565,7 +1597,7 @@ public async Task<int> GetUrgentMaintenanceRequestCountAsync()
                 .CountAsync();
         }
 
-        public async Task<MaintenanceRequest?> GetMaintenanceRequestByIdAsync(int id)
+        public async Task<MaintenanceRequest?> GetMaintenanceRequestByIdAsync(Guid id)
         {
             var organizationId = await _userContext.GetActiveOrganizationIdAsync();
 
@@ -1585,7 +1617,9 @@ public async Task AddMaintenanceRequestAsync(MaintenanceRequest maintenanceReque
             }
 
             var organizationId = await _userContext.GetActiveOrganizationIdAsync();
-            maintenanceRequest.OrganizationId = organizationId!;
+            // Set tracking fields automatically
+            maintenanceRequest.Id = Guid.NewGuid();
+            maintenanceRequest.OrganizationId = organizationId!.Value;
             maintenanceRequest.CreatedBy = _userId;
             maintenanceRequest.CreatedOn = DateTime.UtcNow;
 
@@ -1619,7 +1653,7 @@ public async Task UpdateMaintenanceRequestAsync(MaintenanceRequest maintenanceRe
             // Set tracking fields automatically
             maintenanceRequest.LastModifiedBy = _userId;
             maintenanceRequest.LastModifiedOn = DateTime.UtcNow;
-            maintenanceRequest.OrganizationId = organizationId!; // Prevent org hijacking
+            maintenanceRequest.OrganizationId = organizationId!.Value; // Prevent org hijacking
 
             _dbContext.Entry(existing).CurrentValues.SetValues(maintenanceRequest);
             await _dbContext.SaveChangesAsync();
@@ -1628,7 +1662,7 @@ public async Task UpdateMaintenanceRequestAsync(MaintenanceRequest maintenanceRe
             await _calendarEventService.CreateOrUpdateEventAsync(maintenanceRequest);
         }
 
-        public async Task DeleteMaintenanceRequestAsync(int id)
+        public async Task DeleteMaintenanceRequestAsync(Guid id)
         {
             var _userId = await _userContext.GetUserIdAsync();
 
@@ -1656,7 +1690,7 @@ public async Task DeleteMaintenanceRequestAsync(int id)
             }
         }
 
-        public async Task UpdateMaintenanceRequestStatusAsync(int id, string status)
+        public async Task UpdateMaintenanceRequestStatusAsync(Guid id, string status)
         {
             var _userId = await _userContext.GetUserIdAsync();
 
@@ -1698,7 +1732,7 @@ public async Task UpdateMaintenanceRequestStatusAsync(int id, string status)
         {
             var organizationId = await _userContext.GetActiveOrganizationIdAsync();
 
-            if (string.IsNullOrEmpty(organizationId))
+            if (!organizationId.HasValue || organizationId == Guid.Empty)
             {
                 throw new InvalidOperationException("Organization ID not found for current user");
             }
@@ -1713,7 +1747,7 @@ public async Task UpdateMaintenanceRequestStatusAsync(int id, string status)
                 var userId = await _userContext.GetUserIdAsync();
                 settings = new OrganizationSettings
                 {
-                    OrganizationId = organizationId, // This should be set to the actual organization ID
+                    OrganizationId = organizationId.Value, // This should be set to the actual organization ID
                     LateFeeEnabled = true,
                     LateFeeAutoApply = true,
                     LateFeeGracePeriodDays = 3,
@@ -1732,7 +1766,7 @@ public async Task UpdateMaintenanceRequestStatusAsync(int id, string status)
             return settings;
         }
 
-        public async Task<OrganizationSettings?> GetOrganizationSettingsByOrgIdAsync(string organizationId)
+        public async Task<OrganizationSettings?> GetOrganizationSettingsByOrgIdAsync(Guid organizationId)
         {
             var settings = await _dbContext.OrganizationSettings
                 .Where(s => !s.IsDeleted && s.OrganizationId == organizationId)
@@ -1747,11 +1781,11 @@ public async Task UpdateMaintenanceRequestStatusAsync(int id, string status)
         public async Task UpdateOrganizationSettingsAsync(OrganizationSettings settings)
         {
             var organizationId = await _userContext.GetActiveOrganizationIdAsync();
-            if (string.IsNullOrEmpty(organizationId))
+            if (!organizationId.HasValue || organizationId == Guid.Empty)
             {
                 throw new InvalidOperationException("Organization ID not found for current user");
             }
-            if (settings.OrganizationId != organizationId)
+            if (settings.OrganizationId != organizationId.Value)
             {
                 throw new InvalidOperationException("Cannot update settings for a different organization");
             }
@@ -1781,7 +1815,7 @@ public async Task<List<ProspectiveTenant>> GetAllProspectiveTenantsAsync()
                 .ToListAsync();
         }
 
-        public async Task<ProspectiveTenant?> GetProspectiveTenantByIdAsync(int id)
+        public async Task<ProspectiveTenant?> GetProspectiveTenantByIdAsync(Guid id)
         {
             var organizationId = await _userContext.GetActiveOrganizationIdAsync();
             return await _dbContext.ProspectiveTenants
@@ -1797,7 +1831,8 @@ public async Task<ProspectiveTenant> CreateProspectiveTenantAsync(ProspectiveTen
             var organizationId = await _userContext.GetActiveOrganizationIdAsync();
             var userId = await _userContext.GetUserIdAsync();
 
-            prospectiveTenant.OrganizationId = organizationId!;
+            prospectiveTenant.Id = Guid.NewGuid();
+            prospectiveTenant.OrganizationId = organizationId!.Value;
             prospectiveTenant.CreatedBy = string.IsNullOrEmpty(userId) ? string.Empty : userId;
             prospectiveTenant.CreatedOn = DateTime.UtcNow;
             prospectiveTenant.Status = ApplicationConstants.ProspectiveStatuses.Lead;
@@ -1831,14 +1866,14 @@ public async Task<ProspectiveTenant> UpdateProspectiveTenantAsync(ProspectiveTen
             // Set tracking fields automatically
             prospectiveTenant.LastModifiedOn = DateTime.UtcNow;
             prospectiveTenant.LastModifiedBy = userId;
-            prospectiveTenant.OrganizationId = organizationId!; // Prevent org hijacking
+            prospectiveTenant.OrganizationId = organizationId!.Value; // Prevent org hijacking
 
             _dbContext.Entry(existing).CurrentValues.SetValues(prospectiveTenant);
             await _dbContext.SaveChangesAsync();
             return prospectiveTenant;
         }
 
-        public async Task DeleteProspectiveTenantAsync(int id)
+        public async Task DeleteProspectiveTenantAsync(Guid id)
         {
             var organizationId = await _userContext.GetActiveOrganizationIdAsync();
             var userId = await _userContext.GetUserIdAsync();
@@ -1875,7 +1910,7 @@ public async Task<List<Tour>> GetAllToursAsync()
             .ToListAsync();
         }
 
-        public async Task<List<Tour>> GetToursByProspectiveIdAsync(int prospectiveTenantId)
+        public async Task<List<Tour>> GetToursByProspectiveIdAsync(Guid prospectiveTenantId)
         {
             var organizationId = await _userContext.GetActiveOrganizationIdAsync();
             return await _dbContext.Tours
@@ -1887,7 +1922,7 @@ public async Task<List<Tour>> GetToursByProspectiveIdAsync(int prospectiveTenant
                 .ToListAsync();
         }
 
-        public async Task<Tour?> GetTourByIdAsync(int id)
+        public async Task<Tour?> GetTourByIdAsync(Guid id)
         {
             var organizationId = await _userContext.GetActiveOrganizationIdAsync();
             return await _dbContext.Tours
@@ -1898,14 +1933,14 @@ public async Task<List<Tour>> GetToursByProspectiveIdAsync(int prospectiveTenant
                 .FirstOrDefaultAsync();
         }
 
-        public async Task<Tour> CreateTourAsync(Tour tour, int? templateId = null)
+        public async Task<Tour> CreateTourAsync(Tour tour, Guid? templateId = null)
         {
             var organizationId = await _userContext.GetActiveOrganizationIdAsync();
             var userId = await _userContext.GetUserIdAsync();
 
-            tour.OrganizationId = organizationId!;
+            tour.Id = Guid.NewGuid();
+            tour.OrganizationId = organizationId!.Value;
             tour.CreatedBy = string.IsNullOrEmpty(userId) ? string.Empty : userId;
-
             tour.CreatedOn = DateTime.UtcNow;
             tour.Status = ApplicationConstants.TourStatuses.Scheduled;
 
@@ -1917,7 +1952,7 @@ public async Task<Tour> CreateTourAsync(Tour tour, int? templateId = null)
             // Find the specified template, or fall back to default "Property Tour" template
             ChecklistTemplate? tourTemplate = null;
             
-            if (templateId.HasValue && templateId.Value > 0)
+            if (templateId.HasValue)
             {
                 // Use the specified template
                 tourTemplate = await _dbContext.ChecklistTemplates
@@ -1992,7 +2027,7 @@ public async Task<Tour> UpdateTourAsync(Tour tour)
             // Set tracking fields automatically
             tour.LastModifiedBy = userId;
             tour.LastModifiedOn = DateTime.UtcNow;
-            tour.OrganizationId = organizationId!; // Prevent org hijacking
+            tour.OrganizationId = organizationId!.Value; // Prevent org hijacking
 
             _dbContext.Entry(existing).CurrentValues.SetValues(tour);
             await _dbContext.SaveChangesAsync();
@@ -2003,12 +2038,12 @@ public async Task<Tour> UpdateTourAsync(Tour tour)
             return tour;
         }
 
-        public async Task DeleteTourAsync(int id)
+        public async Task DeleteTourAsync(Guid id)
         {
             var userId = await _userContext.GetUserIdAsync();
             var organizationId = await _userContext.GetActiveOrganizationIdAsync();
 
-            if(string.IsNullOrEmpty(userId) || string.IsNullOrEmpty(organizationId))
+            if(string.IsNullOrEmpty(userId) || !organizationId.HasValue || organizationId == Guid.Empty)
             {
                 throw new UnauthorizedAccessException("User is not authenticated.");
             }
@@ -2035,7 +2070,7 @@ public async Task DeleteTourAsync(int id)
                 await _calendarEventService.DeleteEventAsync(tour.CalendarEventId);
         }
 
-        public async Task<bool> CancelTourAsync(int tourId)
+        public async Task<bool> CancelTourAsync(Guid tourId)
         {
             var userId = await _userContext.GetUserIdAsync();
             var organizationId = await _userContext.GetActiveOrganizationIdAsync();
@@ -2046,7 +2081,7 @@ public async Task<bool> CancelTourAsync(int tourId)
                 throw new InvalidOperationException("Tour not found.");
             }
 
-            if(string.IsNullOrEmpty(userId) || string.IsNullOrEmpty(organizationId) || tour.OrganizationId != organizationId)
+            if(string.IsNullOrEmpty(userId) || !organizationId.HasValue || tour.OrganizationId != organizationId.Value)
             {
                 throw new UnauthorizedAccessException("User is not authenticated.");
             }
@@ -2083,7 +2118,7 @@ public async Task<bool> CancelTourAsync(int tourId)
             return true;
         }
 
-        public async Task<bool> CompleteTourAsync(int tourId, string? feedback = null, string? interestLevel = null)
+        public async Task<bool> CompleteTourAsync(Guid tourId, string? feedback = null, string? interestLevel = null)
         {
             var userId = await _userContext.GetUserIdAsync();
             var organizationId = await _userContext.GetActiveOrganizationIdAsync();
@@ -2091,7 +2126,7 @@ public async Task<bool> CompleteTourAsync(int tourId, string? feedback = null, s
             var tour = await GetTourByIdAsync(tourId);
             if (tour == null) return false;
 
-            if(string.IsNullOrEmpty(userId) || string.IsNullOrEmpty(organizationId) || tour.OrganizationId != organizationId)
+            if(string.IsNullOrEmpty(userId) || !organizationId.HasValue || tour.OrganizationId != organizationId.Value)
             {
                 throw new UnauthorizedAccessException("User is not authenticated.");
             }
@@ -2122,7 +2157,7 @@ public async Task<bool> CompleteTourAsync(int tourId, string? feedback = null, s
             return true;
         }
 
-        public async Task<bool> MarkTourAsNoShowAsync(int tourId)
+        public async Task<bool> MarkTourAsNoShowAsync(Guid tourId)
         {
             var userId = await _userContext.GetUserIdAsync();
             var organizationId = await _userContext.GetActiveOrganizationIdAsync();
@@ -2130,7 +2165,7 @@ public async Task<bool> MarkTourAsNoShowAsync(int tourId)
             var tour = await GetTourByIdAsync(tourId);
             if (tour == null) return false;
 
-            if(string.IsNullOrEmpty(userId) || string.IsNullOrEmpty(organizationId) || tour.OrganizationId != organizationId)
+            if(string.IsNullOrEmpty(userId) || !organizationId.HasValue || tour.OrganizationId != organizationId.Value)
             {
                 throw new UnauthorizedAccessException("User is not authenticated.");
             }
@@ -2172,7 +2207,7 @@ public async Task<List<RentalApplication>> GetAllRentalApplicationsAsync()
                 .ToListAsync();
         }
 
-        public async Task<RentalApplication?> GetRentalApplicationByIdAsync(int id)
+        public async Task<RentalApplication?> GetRentalApplicationByIdAsync(Guid id)
         {
             var organizationId = await _userContext.GetActiveOrganizationIdAsync();
             return await _dbContext.RentalApplications
@@ -2183,7 +2218,7 @@ public async Task<List<RentalApplication>> GetAllRentalApplicationsAsync()
                 .FirstOrDefaultAsync();
         }
 
-        public async Task<RentalApplication?> GetApplicationByProspectiveIdAsync(int prospectiveTenantId)
+        public async Task<RentalApplication?> GetApplicationByProspectiveIdAsync(Guid prospectiveTenantId)
         {
             var organizationId = await _userContext.GetActiveOrganizationIdAsync();
             return await _dbContext.RentalApplications
@@ -2198,7 +2233,8 @@ public async Task<RentalApplication> CreateRentalApplicationAsync(RentalApplicat
             var organizationId = await _userContext.GetActiveOrganizationIdAsync();
             var userId = await _userContext.GetUserIdAsync();
 
-            application.OrganizationId = organizationId!;
+            application.Id = Guid.NewGuid();
+            application.OrganizationId = organizationId!.Value;
             application.CreatedBy = string.IsNullOrEmpty(userId) ? string.Empty : userId;
             application.CreatedOn = DateTime.UtcNow;
             application.AppliedOn = DateTime.UtcNow;
@@ -2283,14 +2319,14 @@ public async Task<RentalApplication> UpdateRentalApplicationAsync(RentalApplicat
             // Set tracking fields automatically
             application.LastModifiedBy = userId;
             application.LastModifiedOn = DateTime.UtcNow;
-            application.OrganizationId = organizationId!; // Prevent org hijacking
+            application.OrganizationId = organizationId!.Value; // Prevent org hijacking
 
             _dbContext.Entry(existing).CurrentValues.SetValues(application);
             await _dbContext.SaveChangesAsync();
             return application;
         }
 
-        public async Task DeleteRentalApplicationAsync(int id)
+        public async Task DeleteRentalApplicationAsync(Guid id)
         {
             var organizationId = await _userContext.GetActiveOrganizationIdAsync();
             var userId = await _userContext.GetUserIdAsync();
@@ -2316,7 +2352,7 @@ public async Task DeleteRentalApplicationAsync(int id)
 
         #region ApplicationScreening CRUD
 
-        public async Task<ApplicationScreening?> GetScreeningByApplicationIdAsync(int rentalApplicationId)
+        public async Task<ApplicationScreening?> GetScreeningByApplicationIdAsync(Guid rentalApplicationId)
         {
             var organizationId = await _userContext.GetActiveOrganizationIdAsync();
             return await _dbContext.ApplicationScreenings
@@ -2329,8 +2365,9 @@ public async Task<ApplicationScreening> CreateScreeningAsync(ApplicationScreenin
         {
             var organizationId = await _userContext.GetActiveOrganizationIdAsync();
             var userId = await _userContext.GetUserIdAsync();
-
-            screening.OrganizationId = organizationId!;
+            
+            screening.Id = Guid.NewGuid();
+            screening.OrganizationId = organizationId!.Value;
             screening.CreatedBy = string.IsNullOrEmpty(userId) ? string.Empty : userId;
             screening.CreatedOn = DateTime.UtcNow;
             screening.OverallResult = ApplicationConstants.ScreeningResults.Pending;
@@ -2381,7 +2418,7 @@ public async Task<ApplicationScreening> UpdateScreeningAsync(ApplicationScreenin
             // Set tracking fields automatically
             screening.LastModifiedOn = DateTime.UtcNow;
             screening.LastModifiedBy = userId;
-            screening.OrganizationId = organizationId!; // Prevent org hijacking
+            screening.OrganizationId = organizationId!.Value; // Prevent org hijacking
 
             _dbContext.Entry(existing).CurrentValues.SetValues(screening);
             await _dbContext.SaveChangesAsync();
@@ -2392,7 +2429,7 @@ public async Task<ApplicationScreening> UpdateScreeningAsync(ApplicationScreenin
 
         #region Business Logic
 
-        public async Task<bool> ApproveApplicationAsync(int applicationId)
+        public async Task<bool> ApproveApplicationAsync(Guid applicationId)
         {
             var organizationId = await _userContext.GetActiveOrganizationIdAsync();
             var userId = await _userContext.GetUserIdAsync() ?? string.Empty;
@@ -2426,7 +2463,7 @@ public async Task<bool> ApproveApplicationAsync(int applicationId)
             return true;
         }
 
-        public async Task<bool> DenyApplicationAsync(int applicationId, string reason)
+        public async Task<bool> DenyApplicationAsync(Guid applicationId, string reason)
         {
             var userId = await _userContext.GetUserIdAsync() ?? string.Empty;
             var organizationId = await _userContext.GetActiveOrganizationIdAsync();
@@ -2456,7 +2493,7 @@ public async Task<bool> DenyApplicationAsync(int applicationId, string reason)
             return true;
         }
 
-        public async Task<bool> WithdrawApplicationAsync(int applicationId, string? reason = null)
+        public async Task<bool> WithdrawApplicationAsync(Guid applicationId, string? reason = null)
         {
             var organizationId = await _userContext.GetActiveOrganizationIdAsync();
             var userId = await _userContext.GetUserIdAsync() ?? string.Empty;
@@ -2564,7 +2601,8 @@ public async Task<List<RentalApplication>> GetPendingApplicationsAsync()
             var organizationId = await _userContext.GetActiveOrganizationIdAsync();
             var userId = await _userContext.GetUserIdAsync();
 
-            leaseOffer.OrganizationId = organizationId!;
+            leaseOffer.Id = Guid.NewGuid();
+            leaseOffer.OrganizationId = organizationId!.Value;
             leaseOffer.CreatedBy = string.IsNullOrEmpty(userId) ? string.Empty : userId;
             leaseOffer.CreatedOn = DateTime.UtcNow;
             _dbContext.LeaseOffers.Add(leaseOffer);
@@ -2572,7 +2610,7 @@ public async Task<List<RentalApplication>> GetPendingApplicationsAsync()
             return leaseOffer;
         }
 
-        public async Task<LeaseOffer?> GetLeaseOfferByIdAsync(int leaseOfferId)
+        public async Task<LeaseOffer?> GetLeaseOfferByIdAsync(Guid leaseOfferId)
         {
             var organizationId = await _userContext.GetActiveOrganizationIdAsync();
             return await _dbContext.LeaseOffers
@@ -2582,7 +2620,7 @@ public async Task<List<RentalApplication>> GetPendingApplicationsAsync()
                 .FirstOrDefaultAsync(lo => lo.Id == leaseOfferId && lo.OrganizationId == organizationId && !lo.IsDeleted);
         }
 
-        public async Task<LeaseOffer?> GetLeaseOfferByApplicationIdAsync(int applicationId)
+        public async Task<LeaseOffer?> GetLeaseOfferByApplicationIdAsync(Guid applicationId)
         {
             var organizationId = await _userContext.GetActiveOrganizationIdAsync();
             return await _dbContext.LeaseOffers
@@ -2592,7 +2630,7 @@ public async Task<List<RentalApplication>> GetPendingApplicationsAsync()
                 .FirstOrDefaultAsync(lo => lo.RentalApplicationId == applicationId && lo.OrganizationId == organizationId && !lo.IsDeleted);
         }
 
-        public async Task<List<LeaseOffer>> GetLeaseOffersByPropertyIdAsync(int propertyId)
+        public async Task<List<LeaseOffer>> GetLeaseOffersByPropertyIdAsync(Guid propertyId)
         {
             var organizationId = await _userContext.GetActiveOrganizationIdAsync();
             return await _dbContext.LeaseOffers
@@ -2627,7 +2665,7 @@ public async Task<LeaseOffer> UpdateLeaseOfferAsync(LeaseOffer leaseOffer)
             // Set tracking fields automatically
             leaseOffer.LastModifiedBy = userId;
             leaseOffer.LastModifiedOn = DateTime.UtcNow;
-            leaseOffer.OrganizationId = organizationId!; // Prevent org hijacking
+            leaseOffer.OrganizationId = organizationId!.Value; // Prevent org hijacking
 
             _dbContext.Entry(existing).CurrentValues.SetValues(leaseOffer);
             await _dbContext.SaveChangesAsync();
diff --git a/Aquiis.SimpleStart/Application/Services/ScheduledTaskService.cs b/Aquiis.SimpleStart/Application/Services/ScheduledTaskService.cs
index d20768b..3333249 100644
--- a/Aquiis.SimpleStart/Application/Services/ScheduledTaskService.cs
+++ b/Aquiis.SimpleStart/Application/Services/ScheduledTaskService.cs
@@ -125,7 +125,7 @@ private async Task DoWork(CancellationToken stoppingToken)
         private async Task ApplyLateFees(
             ApplicationDbContext dbContext, 
             ToastService toastService, 
-            string organizationId,
+            Guid organizationId,
             OrganizationSettings settings,
             CancellationToken stoppingToken)
         {
@@ -176,7 +176,7 @@ private async Task ApplyLateFees(
             }
         }
 
-        private async Task UpdateInvoiceStatuses(ApplicationDbContext dbContext, string organizationId, CancellationToken stoppingToken)
+        private async Task UpdateInvoiceStatuses(ApplicationDbContext dbContext, Guid organizationId, CancellationToken stoppingToken)
         {
             try
             {
@@ -213,7 +213,7 @@ private async Task UpdateInvoiceStatuses(ApplicationDbContext dbContext, string
 
         private async Task SendPaymentReminders(
             ApplicationDbContext dbContext, 
-            string organizationId,
+            Guid organizationId,
             OrganizationSettings settings,
             CancellationToken stoppingToken)
         {
@@ -265,7 +265,7 @@ private async Task SendPaymentReminders(
             }
         }
 
-        private async Task CheckLeaseRenewals(ApplicationDbContext dbContext, string organizationId, CancellationToken stoppingToken)
+        private async Task CheckLeaseRenewals(ApplicationDbContext dbContext, Guid organizationId, CancellationToken stoppingToken)
         {
             try
             {
diff --git a/Aquiis.SimpleStart/Application/Services/SecurityDepositService.cs b/Aquiis.SimpleStart/Application/Services/SecurityDepositService.cs
index 40429df..151ce6f 100644
--- a/Aquiis.SimpleStart/Application/Services/SecurityDepositService.cs
+++ b/Aquiis.SimpleStart/Application/Services/SecurityDepositService.cs
@@ -27,15 +27,15 @@ public SecurityDepositService(ApplicationDbContext context, UserContextService u
         /// Collects a security deposit for a lease.
         /// </summary>
         public async Task<SecurityDeposit> CollectSecurityDepositAsync(
-            int leaseId,
+            Guid leaseId,
             decimal amount,
             string paymentMethod,
             string? transactionReference,
-            int? tenantId = null)
+            Guid? tenantId = null)
         {
             var userId = await _userContext.GetUserIdAsync();
             var organizationId = await _userContext.GetActiveOrganizationIdAsync();
-            if (string.IsNullOrEmpty(organizationId))
+            if (!organizationId.HasValue)
                 throw new InvalidOperationException("Organization context is required");
 
             var lease = await _context.Leases
@@ -53,12 +53,12 @@ public async Task<SecurityDeposit> CollectSecurityDepositAsync(
                 throw new InvalidOperationException($"Security deposit already exists for lease {leaseId}");
 
             // Use provided tenantId or fall back to lease.TenantId
-            int depositTenantId;
+            Guid depositTenantId;
             if (tenantId.HasValue)
             {
                 depositTenantId = tenantId.Value;
             }
-            else if (lease.TenantId > 0)
+            else if (lease.TenantId != Guid.Empty)
             {
                 depositTenantId = lease.TenantId;
             }
@@ -69,7 +69,7 @@ public async Task<SecurityDeposit> CollectSecurityDepositAsync(
 
             var deposit = new SecurityDeposit
             {
-                OrganizationId = organizationId,
+                OrganizationId = organizationId.Value,
                 LeaseId = leaseId,
                 TenantId = depositTenantId,
                 Amount = amount,
@@ -91,7 +91,7 @@ public async Task<SecurityDeposit> CollectSecurityDepositAsync(
         /// <summary>
         /// Adds a security deposit to the investment pool when lease becomes active.
         /// </summary>
-        public async Task<bool> AddToInvestmentPoolAsync(int securityDepositId)
+        public async Task<bool> AddToInvestmentPoolAsync(Guid securityDepositId)
         {
             var userId = await _userContext.GetUserIdAsync();
             
@@ -128,7 +128,7 @@ public async Task<bool> AddToInvestmentPoolAsync(int securityDepositId)
         /// <summary>
         /// Removes a security deposit from the investment pool when lease ends.
         /// </summary>
-        public async Task<bool> RemoveFromInvestmentPoolAsync(int securityDepositId)
+        public async Task<bool> RemoveFromInvestmentPoolAsync(Guid securityDepositId)
         {
             var userId = await _userContext.GetUserIdAsync();
             
@@ -164,7 +164,7 @@ public async Task<bool> RemoveFromInvestmentPoolAsync(int securityDepositId)
         /// <summary>
         /// Gets security deposit by lease ID.
         /// </summary>
-        public async Task<SecurityDeposit?> GetSecurityDepositByLeaseIdAsync(int leaseId)
+        public async Task<SecurityDeposit?> GetSecurityDepositByLeaseIdAsync(Guid leaseId)
         {
             var organizationId = await _userContext.GetActiveOrganizationIdAsync();
 
@@ -242,7 +242,7 @@ public async Task<SecurityDepositInvestmentPool> GetOrCreateInvestmentPoolAsync(
         {
             var userId = await _userContext.GetUserIdAsync();
             var organizationId = await _userContext.GetActiveOrganizationIdAsync();
-            if (string.IsNullOrEmpty(organizationId))
+            if (!organizationId.HasValue)
                 throw new InvalidOperationException("Organization context is required");
 
             var pool = await _context.SecurityDepositInvestmentPools
@@ -259,7 +259,7 @@ public async Task<SecurityDepositInvestmentPool> GetOrCreateInvestmentPoolAsync(
 
             pool = new SecurityDepositInvestmentPool
             {
-                OrganizationId = organizationId,
+                OrganizationId = organizationId.Value,
                 Year = year,
                 StartingBalance = 0,
                 EndingBalance = 0,
@@ -411,7 +411,7 @@ public async Task<List<SecurityDepositDividend>> CalculateDividendsAsync(int yea
 
                 var dividend = new SecurityDepositDividend
                 {
-                    OrganizationId = organizationId,
+                    OrganizationId = organizationId.Value,
                     SecurityDepositId = deposit.Id,
                     InvestmentPoolId = pool.Id,
                     LeaseId = deposit.LeaseId,
@@ -457,7 +457,7 @@ public async Task<List<SecurityDepositDividend>> CalculateDividendsAsync(int yea
         /// <summary>
         /// Gets an investment pool by ID.
         /// </summary>
-        public async Task<SecurityDepositInvestmentPool?> GetInvestmentPoolByIdAsync(int poolId)
+        public async Task<SecurityDepositInvestmentPool?> GetInvestmentPoolByIdAsync(Guid poolId)
         {
             var organizationId = await _userContext.GetActiveOrganizationIdAsync();
 
@@ -490,7 +490,7 @@ public async Task<List<SecurityDepositInvestmentPool>> GetInvestmentPoolsAsync()
         /// Records tenant's payment method choice for dividend.
         /// </summary>
         public async Task<bool> RecordDividendChoiceAsync(
-            int dividendId,
+            Guid dividendId,
             string paymentMethod,
             string? mailingAddress)
         {
@@ -528,7 +528,7 @@ public async Task<bool> RecordDividendChoiceAsync(
         /// Processes dividend payment (applies as credit or marks as paid).
         /// </summary>
         public async Task<bool> ProcessDividendPaymentAsync(
-            int dividendId,
+            Guid dividendId,
             string? paymentReference)
         {
             var userId = await _userContext.GetUserIdAsync();
@@ -566,7 +566,7 @@ public async Task<bool> ProcessDividendPaymentAsync(
         /// <summary>
         /// Gets dividends for a specific tenant.
         /// </summary>
-        public async Task<List<SecurityDepositDividend>> GetTenantDividendsAsync(int tenantId)
+        public async Task<List<SecurityDepositDividend>> GetTenantDividendsAsync(Guid tenantId)
         {
             var organizationId = await _userContext.GetActiveOrganizationIdAsync();
 
@@ -610,7 +610,7 @@ public async Task<List<SecurityDepositDividend>> GetDividendsByYearAsync(int yea
         /// Calculates total refund amount (deposit + dividends - deductions).
         /// </summary>
         public async Task<decimal> CalculateRefundAmountAsync(
-            int securityDepositId,
+            Guid securityDepositId,
             decimal deductionsAmount)
         {
             var deposit = await _context.SecurityDeposits
@@ -632,7 +632,7 @@ public async Task<decimal> CalculateRefundAmountAsync(
         /// Processes security deposit refund.
         /// </summary>
         public async Task<SecurityDeposit> ProcessRefundAsync(
-            int securityDepositId,
+            Guid securityDepositId,
             decimal deductionsAmount,
             string? deductionsReason,
             string refundMethod,
@@ -707,7 +707,7 @@ public async Task<List<SecurityDeposit>> GetPendingRefundsAsync()
         /// <summary>
         /// Closes an investment pool, marking it as complete.
         /// </summary>
-        public async Task<SecurityDepositInvestmentPool> CloseInvestmentPoolAsync(int poolId)
+        public async Task<SecurityDepositInvestmentPool> CloseInvestmentPoolAsync(Guid poolId)
         {
             var userId = await _userContext.GetUserIdAsync();
             
diff --git a/Aquiis.SimpleStart/Application/Services/TenantConversionService.cs b/Aquiis.SimpleStart/Application/Services/TenantConversionService.cs
index f4203f6..052f884 100644
--- a/Aquiis.SimpleStart/Application/Services/TenantConversionService.cs
+++ b/Aquiis.SimpleStart/Application/Services/TenantConversionService.cs
@@ -31,7 +31,7 @@ public TenantConversionService(
         /// </summary>
         /// <param name="prospectiveTenantId">ID of the prospective tenant to convert</param>
         /// <returns>The newly created Tenant, or existing Tenant if already converted</returns>
-        public async Task<Tenant?> ConvertProspectToTenantAsync(int prospectiveTenantId)
+        public async Task<Tenant?> ConvertProspectToTenantAsync(Guid prospectiveTenantId)
         {
             try
             {
@@ -93,7 +93,7 @@ public TenantConversionService(
         /// <summary>
         /// Gets tenant by ProspectiveTenantId, or null if not yet converted
         /// </summary>
-        public async Task<Tenant?> GetTenantByProspectIdAsync(int prospectiveTenantId)
+        public async Task<Tenant?> GetTenantByProspectIdAsync(Guid prospectiveTenantId)
         {
             return await _context.Tenants
                 .FirstOrDefaultAsync(t => t.ProspectiveTenantId == prospectiveTenantId && !t.IsDeleted);
@@ -102,7 +102,7 @@ public TenantConversionService(
         /// <summary>
         /// Checks if a prospect has already been converted to a tenant
         /// </summary>
-        public async Task<bool> IsProspectAlreadyConvertedAsync(int prospectiveTenantId)
+        public async Task<bool> IsProspectAlreadyConvertedAsync(Guid prospectiveTenantId)
         {
             return await _context.Tenants
                 .AnyAsync(t => t.ProspectiveTenantId == prospectiveTenantId && !t.IsDeleted);
@@ -111,7 +111,7 @@ public async Task<bool> IsProspectAlreadyConvertedAsync(int prospectiveTenantId)
         /// <summary>
         /// Gets the ProspectiveTenant history for a given Tenant
         /// </summary>
-        public async Task<ProspectiveTenant?> GetProspectHistoryForTenantAsync(int tenantId)
+        public async Task<ProspectiveTenant?> GetProspectHistoryForTenantAsync(Guid tenantId)
         {
             var tenant = await _context.Tenants
                 .FirstOrDefaultAsync(t => t.Id == tenantId && !t.IsDeleted);
diff --git a/Aquiis.SimpleStart/Application/Services/Workflows/ApplicationWorkflowService.cs b/Aquiis.SimpleStart/Application/Services/Workflows/ApplicationWorkflowService.cs
index a763330..73cee5c 100644
--- a/Aquiis.SimpleStart/Application/Services/Workflows/ApplicationWorkflowService.cs
+++ b/Aquiis.SimpleStart/Application/Services/Workflows/ApplicationWorkflowService.cs
@@ -30,11 +30,15 @@ public enum ApplicationStatus
     /// </summary>
     public class ApplicationWorkflowService : BaseWorkflowService, IWorkflowState<ApplicationStatus>
     {
+        private readonly NoteService _noteService;
+
         public ApplicationWorkflowService(
             ApplicationDbContext context,
-            UserContextService userContext)
+            UserContextService userContext,
+            NoteService noteService)
             : base(context, userContext)
         {
+            _noteService = noteService;
         }
 
         #region State Machine Implementation
@@ -99,8 +103,8 @@ public string GetInvalidTransitionReason(ApplicationStatus fromStatus, Applicati
         /// Creates application, updates property status if first app, and updates prospect status.
         /// </summary>
         public async Task<WorkflowResult<RentalApplication>> SubmitApplicationAsync(
-            int prospectId,
-            int propertyId,
+            Guid prospectId,
+            Guid propertyId,
             ApplicationSubmissionModel model)
         {
             return await ExecuteWorkflowAsync<RentalApplication>(async () =>
@@ -115,14 +119,15 @@ public async Task<WorkflowResult<RentalApplication>> SubmitApplicationAsync(
 
                 // Get organization settings for expiration days
                 var settings = await _context.OrganizationSettings
-                    .FirstOrDefaultAsync(s => s.OrganizationId == orgId.ToString());
+                    .FirstOrDefaultAsync(s => s.OrganizationId == orgId);
                 
                 var expirationDays = settings?.ApplicationExpirationDays ?? 30;
 
                 // Create application
                 var application = new RentalApplication
                 {
-                    OrganizationId = orgId.ToString(),
+                    Id = Guid.NewGuid(),
+                    OrganizationId = orgId,
                     ProspectiveTenantId = prospectId,
                     PropertyId = propertyId,
                     Status = ApplicationConstants.ApplicationStatuses.Submitted,
@@ -154,11 +159,11 @@ public async Task<WorkflowResult<RentalApplication>> SubmitApplicationAsync(
                 };
 
                 _context.RentalApplications.Add(application);
-                await _context.SaveChangesAsync(); // Save to get application ID for logging
+                // Note: EF Core will assign ID when transaction commits
 
                 // Update property status if this is first application
                 var property = await _context.Properties
-                    .FirstOrDefaultAsync(p => p.Id == propertyId && p.OrganizationId == orgId.ToString());
+                    .FirstOrDefaultAsync(p => p.Id == propertyId && p.OrganizationId == orgId);
                 
                 if (property != null && property.Status == ApplicationConstants.PropertyStatuses.Available)
                 {
@@ -169,7 +174,7 @@ public async Task<WorkflowResult<RentalApplication>> SubmitApplicationAsync(
 
                 // Update prospect status
                 var prospect = await _context.ProspectiveTenants
-                    .FirstOrDefaultAsync(p => p.Id == prospectId && p.OrganizationId == orgId.ToString());
+                    .FirstOrDefaultAsync(p => p.Id == prospectId && p.OrganizationId == orgId);
                 
                 if (prospect != null)
                 {
@@ -205,7 +210,7 @@ await LogTransitionAsync(
         /// <summary>
         /// Marks an application as under manual review.
         /// </summary>
-        public async Task<WorkflowResult> MarkApplicationUnderReviewAsync(int applicationId)
+        public async Task<WorkflowResult> MarkApplicationUnderReviewAsync(Guid applicationId)
         {
             return await ExecuteWorkflowAsync(async () =>
             {
@@ -248,7 +253,7 @@ await LogTransitionAsync(
         /// Requires application fee to be paid.
         /// </summary>
         public async Task<WorkflowResult<ApplicationScreening>> InitiateScreeningAsync(
-            int applicationId,
+            Guid applicationId,
             bool requestBackgroundCheck,
             bool requestCreditCheck)
         {
@@ -258,10 +263,29 @@ public async Task<WorkflowResult<ApplicationScreening>> InitiateScreeningAsync(
                 if (application == null)
                     return WorkflowResult<ApplicationScreening>.Fail("Application not found");
 
+                var userId = await GetCurrentUserIdAsync();
+                var orgId = await GetActiveOrganizationIdAsync();
+
+                // Auto-transition from Submitted to UnderReview if needed
+                if (application.Status == ApplicationConstants.ApplicationStatuses.Submitted)
+                {
+                    application.Status = ApplicationConstants.ApplicationStatuses.UnderReview;
+                    application.DecisionBy = userId;
+                    application.LastModifiedBy = userId;
+                    application.LastModifiedOn = DateTime.UtcNow;
+
+                    await LogTransitionAsync(
+                        "RentalApplication",
+                        applicationId,
+                        ApplicationConstants.ApplicationStatuses.Submitted,
+                        ApplicationConstants.ApplicationStatuses.UnderReview,
+                        "AutoTransition-InitiateScreening");
+                }
+
                 // Validate state
                 if (application.Status != ApplicationConstants.ApplicationStatuses.UnderReview)
                     return WorkflowResult<ApplicationScreening>.Fail(
-                        $"Application must be Under Review to initiate screening. Current status: {application.Status}");
+                        $"Application must be Submitted or Under Review to initiate screening. Current status: {application.Status}");
 
                 // Validate application fee paid
                 if (!application.ApplicationFeePaid)
@@ -276,13 +300,10 @@ public async Task<WorkflowResult<ApplicationScreening>> InitiateScreeningAsync(
                     return WorkflowResult<ApplicationScreening>.Fail(
                         "Screening already exists for this application");
 
-                var userId = await GetCurrentUserIdAsync();
-                var orgId = await GetActiveOrganizationIdAsync();
-
                 // Create screening record
                 var screening = new ApplicationScreening
                 {
-                    OrganizationId = orgId.ToString(),
+                    OrganizationId = orgId,
                     RentalApplicationId = applicationId,
                     BackgroundCheckRequested = requestBackgroundCheck,
                     BackgroundCheckRequestedOn = requestBackgroundCheck ? DateTime.UtcNow : null,
@@ -327,7 +348,7 @@ await LogTransitionAsync(
         /// Approves an application after screening review.
         /// Requires screening to be completed with passing result.
         /// </summary>
-        public async Task<WorkflowResult> ApproveApplicationAsync(int applicationId)
+        public async Task<WorkflowResult> ApproveApplicationAsync(Guid applicationId)
         {
             return await ExecuteWorkflowAsync(async () =>
             {
@@ -383,7 +404,7 @@ await LogTransitionAsync(
         /// Denies an application with a required reason.
         /// Rolls back property status if no other pending applications exist.
         /// </summary>
-        public async Task<WorkflowResult> DenyApplicationAsync(int applicationId, string denialReason)
+        public async Task<WorkflowResult> DenyApplicationAsync(Guid applicationId, string denialReason)
         {
             return await ExecuteWorkflowAsync(async () =>
             {
@@ -444,7 +465,7 @@ await LogTransitionAsync(
         /// Withdraws an application (initiated by prospect).
         /// Rolls back property status if no other pending applications exist.
         /// </summary>
-        public async Task<WorkflowResult> WithdrawApplicationAsync(int applicationId, string withdrawalReason)
+        public async Task<WorkflowResult> WithdrawApplicationAsync(Guid applicationId, string withdrawalReason)
         {
             return await ExecuteWorkflowAsync(async () =>
             {
@@ -503,11 +524,504 @@ await LogTransitionAsync(
             });
         }
 
+        /// <summary>
+        /// Updates screening results after background/credit checks are completed.
+        /// Does not automatically approve - requires manual ApproveApplicationAsync call.
+        /// </summary>
+        public async Task<WorkflowResult> CompleteScreeningAsync(
+            Guid applicationId,
+            ScreeningResultModel results)
+        {
+            return await ExecuteWorkflowAsync(async () =>
+            {
+                var application = await GetApplicationAsync(applicationId);
+                if (application == null)
+                    return WorkflowResult.Fail("Application not found");
+
+                if (application.Status != ApplicationConstants.ApplicationStatuses.Screening)
+                    return WorkflowResult.Fail(
+                        $"Application must be in Screening status. Current status: {application.Status}");
+
+                if (application.Screening == null)
+                    return WorkflowResult.Fail("Screening record not found");
+
+                var userId = await GetCurrentUserIdAsync();
+
+                // Update screening results
+                var screening = application.Screening;
+
+                if (results.BackgroundCheckPassed.HasValue)
+                {
+                    screening.BackgroundCheckPassed = results.BackgroundCheckPassed;
+                    screening.BackgroundCheckCompletedOn = DateTime.UtcNow;
+                    screening.BackgroundCheckNotes = results.BackgroundCheckNotes;
+                }
+
+                if (results.CreditCheckPassed.HasValue)
+                {
+                    screening.CreditCheckPassed = results.CreditCheckPassed;
+                    screening.CreditScore = results.CreditScore;
+                    screening.CreditCheckCompletedOn = DateTime.UtcNow;
+                    screening.CreditCheckNotes = results.CreditCheckNotes;
+                }
+
+                screening.OverallResult = results.OverallResult;
+                screening.ResultNotes = results.ResultNotes;
+                screening.LastModifiedBy = userId;
+                screening.LastModifiedOn = DateTime.UtcNow;
+
+                await LogTransitionAsync(
+                    "ApplicationScreening",
+                    screening.Id,
+                    "Pending",
+                    screening.OverallResult,
+                    "CompleteScreening",
+                    results.ResultNotes);
+
+                return WorkflowResult.Ok("Screening results updated successfully");
+
+            });
+        }
+
+        /// <summary>
+        /// Generates a lease offer for an approved application.
+        /// Creates LeaseOffer entity, updates property to LeasePending, and denies competing applications.
+        /// </summary>
+        public async Task<WorkflowResult<LeaseOffer>> GenerateLeaseOfferAsync(
+            Guid applicationId,
+            LeaseOfferModel model)
+        {
+            return await ExecuteWorkflowAsync<LeaseOffer>(async () =>
+            {
+                var application = await GetApplicationAsync(applicationId);
+                if (application == null)
+                    return WorkflowResult<LeaseOffer>.Fail("Application not found");
+
+                // Validate application approved
+                if (application.Status != ApplicationConstants.ApplicationStatuses.Approved)
+                    return WorkflowResult<LeaseOffer>.Fail(
+                        $"Application must be Approved to generate lease offer. Current status: {application.Status}");
+
+                // Validate property not already leased
+                var property = application.Property;
+                if (property == null)
+                    return WorkflowResult<LeaseOffer>.Fail("Property not found");
+
+                if (property.Status == ApplicationConstants.PropertyStatuses.Occupied)
+                    return WorkflowResult<LeaseOffer>.Fail("Property is already occupied");
+
+                // Validate lease dates
+                if (model.StartDate >= model.EndDate)
+                    return WorkflowResult<LeaseOffer>.Fail("End date must be after start date");
+
+                if (model.StartDate < DateTime.Today)
+                    return WorkflowResult<LeaseOffer>.Fail("Start date cannot be in the past");
+
+                if (model.MonthlyRent <= 0 || model.SecurityDeposit < 0)
+                    return WorkflowResult<LeaseOffer>.Fail("Invalid rent or deposit amount");
+
+                var userId = await GetCurrentUserIdAsync();
+                var orgId = await GetActiveOrganizationIdAsync();
+
+                // Create lease offer
+                var leaseOffer = new LeaseOffer
+                {
+                    Id = Guid.NewGuid(),
+                    OrganizationId = orgId,
+                    RentalApplicationId = applicationId,
+                    PropertyId = property.Id,
+                    ProspectiveTenantId = application.ProspectiveTenantId,
+                    StartDate = model.StartDate,
+                    EndDate = model.EndDate,
+                    MonthlyRent = model.MonthlyRent,
+                    SecurityDeposit = model.SecurityDeposit,
+                    Terms = model.Terms,
+                    Notes = model.Notes ?? string.Empty,
+                    OfferedOn = DateTime.UtcNow,
+                    ExpiresOn = DateTime.UtcNow.AddDays(30),
+                    Status = "Pending",
+                    CreatedBy = userId,
+                    CreatedOn = DateTime.UtcNow
+                };
+
+                _context.LeaseOffers.Add(leaseOffer);
+                // Note: EF Core will assign ID when transaction commits
+
+                // Update application
+                var oldAppStatus = application.Status;
+                application.Status = ApplicationConstants.ApplicationStatuses.LeaseOffered;
+                application.LastModifiedBy = userId;
+                application.LastModifiedOn = DateTime.UtcNow;
+
+                // Update prospect
+                if (application.ProspectiveTenant != null)
+                {
+                    application.ProspectiveTenant.Status = ApplicationConstants.ProspectiveStatuses.LeaseOffered;
+                    application.ProspectiveTenant.LastModifiedBy = userId;
+                    application.ProspectiveTenant.LastModifiedOn = DateTime.UtcNow;
+                }
+
+                // Update property to LeasePending
+                property.Status = ApplicationConstants.PropertyStatuses.LeasePending;
+                property.LastModifiedBy = userId;
+                property.LastModifiedOn = DateTime.UtcNow;
+
+                // Deny all competing applications
+                var competingApps = await _context.RentalApplications
+                    .Where(a => a.PropertyId == property.Id &&
+                               a.Id != applicationId &&
+                               a.OrganizationId == orgId &&
+                               (a.Status == ApplicationConstants.ApplicationStatuses.Submitted ||
+                                a.Status == ApplicationConstants.ApplicationStatuses.UnderReview ||
+                                a.Status == ApplicationConstants.ApplicationStatuses.Screening ||
+                                a.Status == ApplicationConstants.ApplicationStatuses.Approved) &&
+                               !a.IsDeleted)
+                    .Include(a => a.ProspectiveTenant)
+                    .ToListAsync();
+
+                foreach (var competingApp in competingApps)
+                {
+                    competingApp.Status = ApplicationConstants.ApplicationStatuses.Denied;
+                    competingApp.DenialReason = "Property leased to another applicant";
+                    competingApp.DecidedOn = DateTime.UtcNow;
+                    competingApp.DecisionBy = userId;
+                    competingApp.LastModifiedBy = userId;
+                    competingApp.LastModifiedOn = DateTime.UtcNow;
+
+                    if (competingApp.ProspectiveTenant != null)
+                    {
+                        competingApp.ProspectiveTenant.Status = ApplicationConstants.ProspectiveStatuses.Denied;
+                        competingApp.ProspectiveTenant.LastModifiedBy = userId;
+                        competingApp.ProspectiveTenant.LastModifiedOn = DateTime.UtcNow;
+                    }
+
+                    await LogTransitionAsync(
+                        "RentalApplication",
+                        competingApp.Id,
+                        competingApp.Status,
+                        ApplicationConstants.ApplicationStatuses.Denied,
+                        "DenyCompetingApplication",
+                        "Property leased to another applicant");
+                }
+
+                await LogTransitionAsync(
+                    "RentalApplication",
+                    applicationId,
+                    oldAppStatus,
+                    application.Status,
+                    "GenerateLeaseOffer");
+
+                await LogTransitionAsync(
+                    "LeaseOffer",
+                    leaseOffer.Id,
+                    null,
+                    "Pending",
+                    "GenerateLeaseOffer");
+
+                return WorkflowResult<LeaseOffer>.Ok(
+                    leaseOffer,
+                    $"Lease offer generated successfully. {competingApps.Count} competing application(s) denied.");
+
+            });
+        }
+
+        /// <summary>
+        /// Accepts a lease offer and converts prospect to tenant.
+        /// Creates Tenant and Lease entities, updates property to Occupied.
+        /// Records security deposit payment.
+        /// </summary>
+        public async Task<WorkflowResult<Lease>> AcceptLeaseOfferAsync(
+            Guid leaseOfferId,
+            string depositPaymentMethod,
+            DateTime depositPaymentDate,
+            string? depositReferenceNumber = null,
+            string? depositNotes = null)
+        {
+            return await ExecuteWorkflowAsync<Lease>(async () =>
+            {
+                var orgId = await GetActiveOrganizationIdAsync();
+                var userId = await GetCurrentUserIdAsync();
+
+                var leaseOffer = await _context.LeaseOffers
+                    .Include(lo => lo.RentalApplication)
+                        .ThenInclude(a => a.ProspectiveTenant)
+                    .Include(lo => lo.Property)
+                    .FirstOrDefaultAsync(lo => lo.Id == leaseOfferId &&
+                                              lo.OrganizationId == orgId &&
+                                              !lo.IsDeleted);
+
+                if (leaseOffer == null)
+                    return WorkflowResult<Lease>.Fail("Lease offer not found");
+
+                if (leaseOffer.Status != "Pending")
+                    return WorkflowResult<Lease>.Fail($"Lease offer status is {leaseOffer.Status}, not Pending");
+
+                if (leaseOffer.ExpiresOn < DateTime.UtcNow)
+                    return WorkflowResult<Lease>.Fail("Lease offer has expired");
+
+                var prospect = leaseOffer.RentalApplication?.ProspectiveTenant;
+                if (prospect == null)
+                    return WorkflowResult<Lease>.Fail("Prospective tenant not found");
+
+                // Convert prospect to tenant
+                var tenant = new Tenant
+                {
+                    Id = Guid.NewGuid(),
+                    OrganizationId = orgId,
+                    FirstName = prospect.FirstName,
+                    LastName = prospect.LastName,
+                    Email = prospect.Email,
+                    PhoneNumber = prospect.Phone,
+                    DateOfBirth = prospect.DateOfBirth,
+                    IdentificationNumber = prospect.IdentificationNumber ?? $"ID-{Guid.NewGuid().ToString("N")[..8]}",
+                    ProspectiveTenantId = prospect.Id,
+                    IsActive = true,
+                    CreatedBy = userId,
+                    CreatedOn = DateTime.UtcNow
+                };
+
+                _context.Tenants.Add(tenant);
+                // Note: EF Core will assign ID when transaction commits
+
+                // Create lease
+                var lease = new Lease
+                {
+                    Id = Guid.NewGuid(),
+                    OrganizationId = orgId,
+                    PropertyId = leaseOffer.PropertyId,
+                    Tenant = tenant, // Use navigation property instead of TenantId
+                    LeaseOfferId = leaseOffer.Id,
+                    StartDate = leaseOffer.StartDate,
+                    EndDate = leaseOffer.EndDate,
+                    MonthlyRent = leaseOffer.MonthlyRent,
+                    SecurityDeposit = leaseOffer.SecurityDeposit,
+                    Terms = leaseOffer.Terms,
+                    Status = ApplicationConstants.LeaseStatuses.Active,
+                    SignedOn = DateTime.UtcNow,
+                    CreatedBy = userId,
+                    CreatedOn = DateTime.UtcNow
+                };
+
+                _context.Leases.Add(lease);
+                // Note: EF Core will assign ID when transaction commits
+
+                // Create security deposit record
+                var securityDeposit = new SecurityDeposit
+                {
+                    Id = Guid.NewGuid(),
+                    OrganizationId = orgId,
+                    Lease = lease, // Use navigation property
+                    Tenant = tenant, // Use navigation property
+                    Amount = leaseOffer.SecurityDeposit,
+                    DateReceived = depositPaymentDate,
+                    PaymentMethod = depositPaymentMethod,
+                    TransactionReference = depositReferenceNumber,
+                    Status = "Held",
+                    InInvestmentPool = true,
+                    PoolEntryDate = leaseOffer.StartDate,
+                    Notes = depositNotes,
+                    CreatedBy = userId,
+                    CreatedOn = DateTime.UtcNow
+                };
+
+                _context.SecurityDeposits.Add(securityDeposit);
+
+                // Update lease offer
+                leaseOffer.Status = "Accepted";
+                leaseOffer.RespondedOn = DateTime.UtcNow;
+                leaseOffer.ConvertedLeaseId = lease.Id;
+                leaseOffer.LastModifiedBy = userId;
+                leaseOffer.LastModifiedOn = DateTime.UtcNow;
+
+                // Update application
+                var application = leaseOffer.RentalApplication;
+                if (application != null)
+                {
+                    application.Status = ApplicationConstants.ApplicationStatuses.LeaseAccepted;
+                    application.LastModifiedBy = userId;
+                    application.LastModifiedOn = DateTime.UtcNow;
+                }
+
+                // Update prospect
+                prospect.Status = ApplicationConstants.ProspectiveStatuses.ConvertedToTenant;
+                prospect.LastModifiedBy = userId;
+                prospect.LastModifiedOn = DateTime.UtcNow;
+
+                // Update property
+                var property = leaseOffer.Property;
+                if (property != null)
+                {
+                    property.Status = ApplicationConstants.PropertyStatuses.Occupied;
+                    property.LastModifiedBy = userId;
+                    property.LastModifiedOn = DateTime.UtcNow;
+                }
+
+                await LogTransitionAsync(
+                    "LeaseOffer",
+                    leaseOfferId,
+                    "Pending",
+                    "Accepted",
+                    "AcceptLeaseOffer");
+
+                await LogTransitionAsync(
+                    "ProspectiveTenant",
+                    prospect.Id,
+                    ApplicationConstants.ProspectiveStatuses.LeaseOffered,
+                    ApplicationConstants.ProspectiveStatuses.ConvertedToTenant,
+                    "AcceptLeaseOffer");
+
+                // Add note if lease start date is in the future
+                if (leaseOffer.StartDate > DateTime.Today)
+                {
+                    var noteContent = $"Lease accepted on {DateTime.Today:MMM dd, yyyy}. Lease start date: {leaseOffer.StartDate:MMM dd, yyyy}.";
+                    await _noteService.AddNoteAsync(ApplicationConstants.EntityTypes.Lease, lease.Id, noteContent);
+                }
+
+                return WorkflowResult<Lease>.Ok(lease, "Lease offer accepted and tenant created successfully");
+
+            });
+        }
+
+        /// <summary>
+        /// Declines a lease offer.
+        /// Rolls back property status and marks prospect as lease declined.
+        /// </summary>
+        public async Task<WorkflowResult> DeclineLeaseOfferAsync(Guid leaseOfferId, string declineReason)
+        {
+            return await ExecuteWorkflowAsync(async () =>
+            {
+                if (string.IsNullOrWhiteSpace(declineReason))
+                    return WorkflowResult.Fail("Decline reason is required");
+
+                var orgId = await GetActiveOrganizationIdAsync();
+                var userId = await GetCurrentUserIdAsync();
+
+                var leaseOffer = await _context.LeaseOffers
+                    .Include(lo => lo.RentalApplication)
+                        .ThenInclude(a => a.ProspectiveTenant)
+                    .Include(lo => lo.Property)
+                    .FirstOrDefaultAsync(lo => lo.Id == leaseOfferId &&
+                                              lo.OrganizationId == orgId &&
+                                              !lo.IsDeleted);
+
+                if (leaseOffer == null)
+                    return WorkflowResult.Fail("Lease offer not found");
+
+                if (leaseOffer.Status != "Pending")
+                    return WorkflowResult.Fail($"Lease offer status is {leaseOffer.Status}, not Pending");
+
+                // Update lease offer
+                leaseOffer.Status = "Declined";
+                leaseOffer.RespondedOn = DateTime.UtcNow;
+                leaseOffer.ResponseNotes = declineReason;
+                leaseOffer.LastModifiedBy = userId;
+                leaseOffer.LastModifiedOn = DateTime.UtcNow;
+
+                // Update application
+                var application = leaseOffer.RentalApplication;
+                if (application != null)
+                {
+                    application.Status = ApplicationConstants.ApplicationStatuses.LeaseDeclined;
+                    application.LastModifiedBy = userId;
+                    application.LastModifiedOn = DateTime.UtcNow;
+
+                    // Update prospect
+                    if (application.ProspectiveTenant != null)
+                    {
+                        application.ProspectiveTenant.Status = ApplicationConstants.ProspectiveStatuses.LeaseDeclined;
+                        application.ProspectiveTenant.LastModifiedBy = userId;
+                        application.ProspectiveTenant.LastModifiedOn = DateTime.UtcNow;
+                    }
+                }
+
+                // Rollback property status
+                await RollbackPropertyStatusIfNeededAsync(leaseOffer.PropertyId);
+
+                await LogTransitionAsync(
+                    "LeaseOffer",
+                    leaseOfferId,
+                    "Pending",
+                    "Declined",
+                    "DeclineLeaseOffer",
+                    declineReason);
+
+                return WorkflowResult.Ok("Lease offer declined");
+
+            });
+        }
+
+        /// <summary>
+        /// Expires a lease offer (called by scheduled task).
+        /// Similar to decline but automated.
+        /// </summary>
+        public async Task<WorkflowResult> ExpireLeaseOfferAsync(Guid leaseOfferId)
+        {
+            return await ExecuteWorkflowAsync(async () =>
+            {
+                var orgId = await GetActiveOrganizationIdAsync();
+                var userId = await GetCurrentUserIdAsync();
+
+                var leaseOffer = await _context.LeaseOffers
+                    .Include(lo => lo.RentalApplication)
+                        .ThenInclude(a => a.ProspectiveTenant)
+                    .Include(lo => lo.Property)
+                    .FirstOrDefaultAsync(lo => lo.Id == leaseOfferId &&
+                                              lo.OrganizationId == orgId &&
+                                              !lo.IsDeleted);
+
+                if (leaseOffer == null)
+                    return WorkflowResult.Fail("Lease offer not found");
+
+                if (leaseOffer.Status != "Pending")
+                    return WorkflowResult.Fail($"Lease offer status is {leaseOffer.Status}, not Pending");
+
+                if (leaseOffer.ExpiresOn >= DateTime.UtcNow)
+                    return WorkflowResult.Fail("Lease offer has not expired yet");
+
+                // Update lease offer
+                leaseOffer.Status = "Expired";
+                leaseOffer.RespondedOn = DateTime.UtcNow;
+                leaseOffer.LastModifiedBy = userId;
+                leaseOffer.LastModifiedOn = DateTime.UtcNow;
+
+                // Update application
+                var application = leaseOffer.RentalApplication;
+                if (application != null)
+                {
+                    application.Status = ApplicationConstants.ApplicationStatuses.Expired;
+                    application.LastModifiedBy = userId;
+                    application.LastModifiedOn = DateTime.UtcNow;
+
+                    // Update prospect
+                    if (application.ProspectiveTenant != null)
+                    {
+                        application.ProspectiveTenant.Status = ApplicationConstants.ProspectiveStatuses.LeaseDeclined;
+                        application.ProspectiveTenant.LastModifiedBy = userId;
+                        application.ProspectiveTenant.LastModifiedOn = DateTime.UtcNow;
+                    }
+                }
+
+                // Rollback property status
+                await RollbackPropertyStatusIfNeededAsync(leaseOffer.PropertyId);
+
+                await LogTransitionAsync(
+                    "LeaseOffer",
+                    leaseOfferId,
+                    "Pending",
+                    "Expired",
+                    "ExpireLeaseOffer",
+                    "Offer expired after 30 days");
+
+                return WorkflowResult.Ok("Lease offer expired");
+
+            });
+        }
+
         #endregion
 
         #region Helper Methods
 
-        private async Task<RentalApplication?> GetApplicationAsync(int applicationId)
+        private async Task<RentalApplication?> GetApplicationAsync(Guid applicationId)
         {
             var orgId = await GetActiveOrganizationIdAsync();
             return await _context.RentalApplications
@@ -516,20 +1030,20 @@ await LogTransitionAsync(
                 .Include(a => a.Screening)
                 .FirstOrDefaultAsync(a =>
                     a.Id == applicationId &&
-                    a.OrganizationId == orgId.ToString() &&
+                    a.OrganizationId == orgId &&
                     !a.IsDeleted);
         }
 
         private async Task<WorkflowResult> ValidateApplicationSubmissionAsync(
-            int prospectId,
-            int propertyId)
+            Guid prospectId,
+            Guid propertyId)
         {
             var errors = new List<string>();
             var orgId = await GetActiveOrganizationIdAsync();
 
             // Validate prospect exists
             var prospect = await _context.ProspectiveTenants
-                .FirstOrDefaultAsync(p => p.Id == prospectId && p.OrganizationId == orgId.ToString() && !p.IsDeleted);
+                .FirstOrDefaultAsync(p => p.Id == prospectId && p.OrganizationId == orgId && !p.IsDeleted);
             
             if (prospect == null)
                 errors.Add("Prospect not found");
@@ -538,7 +1052,7 @@ private async Task<WorkflowResult> ValidateApplicationSubmissionAsync(
 
             // Validate property exists and is available
             var property = await _context.Properties
-                .FirstOrDefaultAsync(p => p.Id == propertyId && p.OrganizationId == orgId.ToString() && !p.IsDeleted);
+                .FirstOrDefaultAsync(p => p.Id == propertyId && p.OrganizationId == orgId && !p.IsDeleted);
             
             if (property == null)
                 errors.Add("Property not found");
@@ -551,7 +1065,7 @@ private async Task<WorkflowResult> ValidateApplicationSubmissionAsync(
                 var existingApp = await _context.RentalApplications
                     .AnyAsync(a =>
                         a.ProspectiveTenantId == prospectId &&
-                        a.OrganizationId == orgId.ToString() &&
+                        a.OrganizationId == orgId &&
                         a.Status != ApplicationConstants.ApplicationStatuses.Denied &&
                         a.Status != ApplicationConstants.ApplicationStatuses.Withdrawn &&
                         a.Status != ApplicationConstants.ApplicationStatuses.Expired &&
@@ -571,7 +1085,7 @@ private async Task<WorkflowResult> ValidateApplicationSubmissionAsync(
         /// Checks if property status should roll back when an application is denied/withdrawn.
         /// Rolls back to Available if no active applications remain.
         /// </summary>
-        private async Task RollbackPropertyStatusIfNeededAsync(int propertyId)
+        private async Task RollbackPropertyStatusIfNeededAsync(Guid propertyId)
         {
             var orgId = await GetActiveOrganizationIdAsync();
             var userId = await GetCurrentUserIdAsync();
@@ -588,7 +1102,7 @@ private async Task RollbackPropertyStatusIfNeededAsync(int propertyId)
             var hasActiveApplications = await _context.RentalApplications
                 .AnyAsync(a =>
                     a.PropertyId == propertyId &&
-                    a.OrganizationId == orgId.ToString() &&
+                    a.OrganizationId == orgId &&
                     activeStates.Contains(a.Status) &&
                     !a.IsDeleted);
 
@@ -596,7 +1110,7 @@ private async Task RollbackPropertyStatusIfNeededAsync(int propertyId)
             if (!hasActiveApplications)
             {
                 var property = await _context.Properties
-                    .FirstOrDefaultAsync(p => p.Id == propertyId && p.OrganizationId == orgId.ToString());
+                    .FirstOrDefaultAsync(p => p.Id == propertyId && p.OrganizationId == orgId);
 
                 if (property != null && property.Status == ApplicationConstants.PropertyStatuses.ApplicationPending)
                 {
@@ -608,6 +1122,49 @@ private async Task RollbackPropertyStatusIfNeededAsync(int propertyId)
         }
 
         #endregion
+
+        /// <summary>
+        /// Returns a comprehensive view of the application's workflow state,
+        /// including related prospect, property, screening, lease offers, and audit history.
+        /// </summary>
+        public async Task<ApplicationWorkflowState> GetApplicationWorkflowStateAsync(Guid applicationId)
+        {
+            var orgId = await GetActiveOrganizationIdAsync();
+
+            var application = await _context.RentalApplications
+                .Include(a => a.ProspectiveTenant)
+                .Include(a => a.Property)
+                .Include(a => a.Screening)
+                .FirstOrDefaultAsync(a => a.Id == applicationId && a.OrganizationId == orgId && !a.IsDeleted);
+
+            if (application == null)
+                return new ApplicationWorkflowState
+                {
+                    Application = null,
+                    AuditHistory = new List<WorkflowAuditLog>(),
+                    LeaseOffers = new List<LeaseOffer>()
+                };
+
+            var leaseOffers = await _context.LeaseOffers
+                .Where(lo => lo.RentalApplicationId == applicationId && lo.OrganizationId == orgId && !lo.IsDeleted)
+                .OrderByDescending(lo => lo.OfferedOn)
+                .ToListAsync();
+
+            var auditHistory = await _context.WorkflowAuditLogs
+                .Where(w => w.EntityType == "RentalApplication" && w.EntityId == applicationId && w.OrganizationId == orgId)
+                .OrderByDescending(w => w.PerformedOn)
+                .ToListAsync();
+
+            return new ApplicationWorkflowState
+            {
+                Application = application,
+                Prospect = application.ProspectiveTenant,
+                Property = application.Property,
+                Screening = application.Screening,
+                LeaseOffers = leaseOffers,
+                AuditHistory = auditHistory
+            };
+        }
     }
 
     /// <summary>
@@ -639,4 +1196,46 @@ public class ApplicationSubmissionModel
         public string? Reference2Phone { get; set; }
         public string? Reference2Relationship { get; set; }
     }
+
+    /// <summary>
+    /// Model for screening results update.
+    /// </summary>
+    public class ScreeningResultModel
+    {
+        public bool? BackgroundCheckPassed { get; set; }
+        public string? BackgroundCheckNotes { get; set; }
+
+        public bool? CreditCheckPassed { get; set; }
+        public int? CreditScore { get; set; }
+        public string? CreditCheckNotes { get; set; }
+
+        public string OverallResult { get; set; } = "Pending"; // Pending, Passed, Failed, ConditionalPass
+        public string? ResultNotes { get; set; }
+    }
+
+    /// <summary>
+    /// Model for lease offer generation.
+    /// </summary>
+    public class LeaseOfferModel
+    {
+        public DateTime StartDate { get; set; }
+        public DateTime EndDate { get; set; }
+        public decimal MonthlyRent { get; set; }
+        public decimal SecurityDeposit { get; set; }
+        public string Terms { get; set; } = string.Empty;
+        public string? Notes { get; set; }
+    }
+
+    /// <summary>
+    /// Aggregated workflow state returned by GetApplicationWorkflowStateAsync.
+    /// </summary>
+    public class ApplicationWorkflowState
+    {
+        public RentalApplication? Application { get; set; }
+        public ProspectiveTenant? Prospect { get; set; }
+        public Property? Property { get; set; }
+        public ApplicationScreening? Screening { get; set; }
+        public List<LeaseOffer> LeaseOffers { get; set; } = new();
+        public List<WorkflowAuditLog> AuditHistory { get; set; } = new();
+    }
 }
diff --git a/Aquiis.SimpleStart/Application/Services/Workflows/BaseWorkflowService.cs b/Aquiis.SimpleStart/Application/Services/Workflows/BaseWorkflowService.cs
index 2890833..669f696 100644
--- a/Aquiis.SimpleStart/Application/Services/Workflows/BaseWorkflowService.cs
+++ b/Aquiis.SimpleStart/Application/Services/Workflows/BaseWorkflowService.cs
@@ -43,6 +43,8 @@ protected async Task<WorkflowResult<T>> ExecuteWorkflowAsync<T>(
                 else
                 {
                     await transaction.RollbackAsync();
+                    // Clear the ChangeTracker to discard all tracked changes
+                    _context.ChangeTracker.Clear();
                 }
 
                 return result;
@@ -50,7 +52,21 @@ protected async Task<WorkflowResult<T>> ExecuteWorkflowAsync<T>(
             catch (Exception ex)
             {
                 await transaction.RollbackAsync();
-                return WorkflowResult<T>.Fail($"Workflow operation failed: {ex.Message}");
+                // Clear the ChangeTracker to discard all tracked changes
+                _context.ChangeTracker.Clear();
+                
+                var errorMessage = ex.Message;
+                if (ex.InnerException != null)
+                {
+                    errorMessage += $" | Inner: {ex.InnerException.Message}";
+                    if (ex.InnerException.InnerException != null)
+                    {
+                        errorMessage += $" | Inner(2): {ex.InnerException.InnerException.Message}";
+                    }
+                }
+                Console.WriteLine($"Workflow Error: {errorMessage}");
+                Console.WriteLine($"Stack Trace: {ex.StackTrace}");
+                return WorkflowResult<T>.Fail($"Workflow operation failed: {errorMessage}");
             }
         }
 
@@ -74,6 +90,8 @@ protected async Task<WorkflowResult> ExecuteWorkflowAsync(
                 else
                 {
                     await transaction.RollbackAsync();
+                    // Clear the ChangeTracker to discard all tracked changes
+                    _context.ChangeTracker.Clear();
                 }
 
                 return result;
@@ -81,7 +99,21 @@ protected async Task<WorkflowResult> ExecuteWorkflowAsync(
             catch (Exception ex)
             {
                 await transaction.RollbackAsync();
-                return WorkflowResult.Fail($"Workflow operation failed: {ex.Message}");
+                // Clear the ChangeTracker to discard all tracked changes
+                _context.ChangeTracker.Clear();
+                
+                var errorMessage = ex.Message;
+                if (ex.InnerException != null)
+                {
+                    errorMessage += $" | Inner: {ex.InnerException.Message}";
+                    if (ex.InnerException.InnerException != null)
+                    {
+                        errorMessage += $" | Inner(2): {ex.InnerException.InnerException.Message}";
+                    }
+                }
+                Console.WriteLine($"Workflow Error: {errorMessage}");
+                Console.WriteLine($"Stack Trace: {ex.StackTrace}");
+                return WorkflowResult.Fail($"Workflow operation failed: {errorMessage}");
             }
         }
 
@@ -90,7 +122,7 @@ protected async Task<WorkflowResult> ExecuteWorkflowAsync(
         /// </summary>
         protected async Task LogTransitionAsync(
             string entityType,
-            int entityId,
+            Guid entityId,
             string? fromStatus,
             string toStatus,
             string action,
@@ -102,6 +134,7 @@ protected async Task LogTransitionAsync(
             
             var auditLog = new WorkflowAuditLog
             {
+                Id = Guid.NewGuid(),
                 EntityType = entityType,
                 EntityId = entityId,
                 FromStatus = fromStatus,
@@ -110,7 +143,7 @@ protected async Task LogTransitionAsync(
                 Reason = reason,
                 PerformedBy = userId,
                 PerformedOn = DateTime.UtcNow,
-                OrganizationId = int.Parse(activeOrgId ?? "0"),
+                OrganizationId = activeOrgId.HasValue ? activeOrgId.Value : Guid.Empty,
                 Metadata = metadata != null ? JsonSerializer.Serialize(metadata) : null,
                 CreatedOn = DateTime.UtcNow,
                 CreatedBy = userId
@@ -125,13 +158,13 @@ protected async Task LogTransitionAsync(
         /// </summary>
         public async Task<List<WorkflowAuditLog>> GetAuditHistoryAsync(
             string entityType,
-            int entityId)
+            Guid entityId)
         {
             var activeOrgId = await _userContext.GetActiveOrganizationIdAsync();
             
             return await _context.WorkflowAuditLogs
                 .Where(w => w.EntityType == entityType && w.EntityId == entityId)
-                .Where(w => w.OrganizationId == int.Parse(activeOrgId ?? "0"))
+                .Where(w => w.OrganizationId == activeOrgId)
                 .OrderBy(w => w.PerformedOn)
                 .ToListAsync();
         }
@@ -141,15 +174,15 @@ public async Task<List<WorkflowAuditLog>> GetAuditHistoryAsync(
         /// </summary>
         protected async Task<bool> ValidateOrganizationOwnershipAsync<TEntity>(
             IQueryable<TEntity> query,
-            int entityId) where TEntity : class
+            Guid entityId) where TEntity : class
         {
             var activeOrgId = await _userContext.GetActiveOrganizationIdAsync();
             
             // This assumes entities have OrganizationId property
             // Override in derived classes if different validation needed
             var entity = await query
-                .Where(e => EF.Property<int>(e, "Id") == entityId)
-                .Where(e => EF.Property<int>(e, "OrganizationId") == int.Parse(activeOrgId ?? "0"))
+                .Where(e => EF.Property<Guid>(e, "Id") == entityId)
+                .Where(e => EF.Property<Guid>(e, "OrganizationId") == activeOrgId)
                 .Where(e => EF.Property<bool>(e, "IsDeleted") == false)
                 .FirstOrDefaultAsync();
 
@@ -167,10 +200,9 @@ protected async Task<string> GetCurrentUserIdAsync()
         /// <summary>
         /// Gets the active organization ID from the user context.
         /// </summary>
-        protected async Task<int> GetActiveOrganizationIdAsync()
+        protected async Task<Guid> GetActiveOrganizationIdAsync()
         {
-            var activeOrgId = await _userContext.GetActiveOrganizationIdAsync();
-            return int.Parse(activeOrgId ?? "0");
+            return await _userContext.GetActiveOrganizationIdAsync() ?? Guid.Empty;
         }
     }
 }
diff --git a/Aquiis.SimpleStart/Application/Services/Workflows/WorkflowAuditLog.cs b/Aquiis.SimpleStart/Application/Services/Workflows/WorkflowAuditLog.cs
index f115ba5..07b3c8e 100644
--- a/Aquiis.SimpleStart/Application/Services/Workflows/WorkflowAuditLog.cs
+++ b/Aquiis.SimpleStart/Application/Services/Workflows/WorkflowAuditLog.cs
@@ -16,10 +16,7 @@ public class WorkflowAuditLog : BaseModel
         /// <summary>
         /// ID of the entity that transitioned
         /// </summary>
-        public required int EntityId { get; set; }
-
-        /// <summary>
-        /// Previous status (null for initial creation)
+        public required Guid EntityId { get; set; }
         /// </summary>
         public string? FromStatus { get; set; }
 
@@ -51,7 +48,7 @@ public class WorkflowAuditLog : BaseModel
         /// <summary>
         /// Organization context for the workflow action
         /// </summary>
-        public required int OrganizationId { get; set; }
+        public required Guid OrganizationId { get; set; }
 
         /// <summary>
         /// Additional context data (JSON serialized)
diff --git a/Aquiis.SimpleStart/Aquiis.SimpleStart.csproj b/Aquiis.SimpleStart/Aquiis.SimpleStart.csproj
index 439b7c2..f4b95d3 100644
--- a/Aquiis.SimpleStart/Aquiis.SimpleStart.csproj
+++ b/Aquiis.SimpleStart/Aquiis.SimpleStart.csproj
@@ -6,6 +6,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <UserSecretsId>aspnet-Aquiis.SimpleStart-c69b6efe-bb20-41de-8cba-044207ebdce1</UserSecretsId>
     <IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
+    <MigrationsDirectory>Infrastructure/Data/Migrations</MigrationsDirectory>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/Aquiis.SimpleStart/Core/Constants/ApplicationConstants.cs b/Aquiis.SimpleStart/Core/Constants/ApplicationConstants.cs
index e38814e..1556caf 100644
--- a/Aquiis.SimpleStart/Core/Constants/ApplicationConstants.cs
+++ b/Aquiis.SimpleStart/Core/Constants/ApplicationConstants.cs
@@ -235,17 +235,35 @@ public static class LeaseTypes {
         public static class LeaseStatuses { 
             public const string Offered = "Offered";
             public const string Pending = "Pending";
+            public const string Accepted = "Accepted";
+            public const string AcceptedPendingStart = "Accepted - Pending Start";
             public const string Active = "Active";
             public const string Declined = "Declined";
+            public const string Renewed = "Renewed";
+            public const string Interrupted = "Interrupted";
             public const string Terminated = "Terminated";
             public const string Expired = "Expired";
 
+            public static IReadOnlyList<string> RenewalStatuses { get; } = new List<string>
+            {
+                "NotRequired",
+                "Pending",
+                "Offered",
+                "Accepted",
+                "Declined",
+                "Expired"
+            };
+
             public static IReadOnlyList<string> AllLeaseStatuses { get; } = new List<string>
             {
                 Offered,
                 Pending,
+                Accepted,
+                AcceptedPendingStart,
                 Active,
                 Declined,
+                Renewed,
+                Interrupted,
                 Terminated,
                 Expired
             };
@@ -281,12 +299,20 @@ public static class PropertyTypes
         public static class PropertyStatuses
         {
             public const string Available = "Available";
-            public const string ApplicationPending = "ApplicationPending";
-            public const string LeasePending = "LeasePending";
+            public const string ApplicationPending = "Application Pending";
+            public const string LeasePending = "Lease Pending";
+            public const string MoveInPending = "Accepted - Move-In Pending";
             public const string Occupied = "Occupied";
-            public const string UnderRenovation = "UnderRenovation";
-            public const string OffMarket = "OffMarket";
+            public const string MoveOutPending = "Move-Out Pending";
+            public const string UnderRenovation = "Under Renovation";
+            public const string OffMarket = "Off Market";
             
+            public static IReadOnlyList<string> OccupiedStatuses { get; } = new List<string>
+            {
+                MoveInPending,
+                Occupied,
+                MoveOutPending
+            };
             public static IReadOnlyList<string> AllPropertyStatuses { get; } = new List<string>
             {
                 Available,
@@ -359,16 +385,22 @@ public static class MaintenanceRequestStatuses
 
         public static class TenantStatuses
         {
+            public const string Prospective = "Prospective";
+            public const string Pending = "Pending";
+            public const string MoveInPending = "Move-In Pending";
             public const string Active = "Active";
+            public const string MoveOutPending = "Move-Out Pending";
             public const string Inactive = "Inactive";
-            public const string Prospective = "Prospective";
             public const string Evicted = "Evicted";
 
             public static IReadOnlyList<string> AllTenantStatuses { get; } = new List<string>
-            {       
+            {
+                Prospective,
+                Pending,       
+                MoveInPending,
                 Active,
+                MoveOutPending,
                 Inactive,
-                Prospective,
                 Evicted
             };
 
@@ -432,15 +464,15 @@ public static class ChecklistStatuses
         public static class ProspectiveStatuses
         {
             public const string Lead = "Lead";
-            public const string TourScheduled = "TourScheduled";
+            public const string TourScheduled = "Tour Scheduled";
             public const string Applied = "Applied";
             public const string Screening = "Screening";
             public const string Approved = "Approved";
             public const string Denied = "Denied";
             public const string Withdrawn = "Withdrawn";
-            public const string LeaseOffered = "LeaseOffered";
-            public const string LeaseDeclined = "LeaseDeclined";
-            public const string ConvertedToTenant = "ConvertedToTenant";
+            public const string LeaseOffered = "Lease Offered";
+            public const string LeaseDeclined = "Lease Declined";
+            public const string ConvertedToTenant = "Converted To Tenant";
 
             public static IReadOnlyList<string> AllProspectiveStatuses { get; } = new List<string>
             {
@@ -499,10 +531,10 @@ public static class TourStatuses
 
         public static class TourInterestLevels
         {
-            public const string VeryInterested = "VeryInterested";
+            public const string VeryInterested = "Very Interested";
             public const string Interested = "Interested";
             public const string Neutral = "Neutral";
-            public const string NotInterested = "NotInterested";
+            public const string NotInterested = "Not Interested";
 
             public static IReadOnlyList<string> AllTourInterestLevels { get; } = new List<string>
             {
@@ -516,15 +548,15 @@ public static class TourInterestLevels
         public static class ApplicationStatuses
         {
             public const string Submitted = "Submitted";
-            public const string UnderReview = "UnderReview";
+            public const string UnderReview = "Under Review";
             public const string Screening = "Screening";
             public const string Approved = "Approved";
             public const string Denied = "Denied";
             public const string Expired = "Expired";
             public const string Withdrawn = "Withdrawn";
-            public const string LeaseOffered = "LeaseOffered";
-            public const string LeaseAccepted = "LeaseAccepted";
-            public const string LeaseDeclined = "LeaseDeclined";
+            public const string LeaseOffered = "Lease Offered";
+            public const string LeaseAccepted = "Lease Accepted";
+            public const string LeaseDeclined = "Lease Declined";
 
             public static IReadOnlyList<string> AllApplicationStatuses { get; } = new List<string>
             {
@@ -546,7 +578,7 @@ public static class ScreeningResults
             public const string Pending = "Pending";
             public const string Passed = "Passed";
             public const string Failed = "Failed";
-            public const string ConditionalPass = "ConditionalPass";
+            public const string ConditionalPass = "Conditional Pass";
 
             public static IReadOnlyList<string> AllScreeningResults { get; } = new List<string>
             {
@@ -563,7 +595,7 @@ public static class SecurityDepositStatuses
             public const string Released = "Released";
             public const string Refunded = "Refunded";
             public const string Forfeited = "Forfeited";
-            public const string PartiallyRefunded = "PartiallyRefunded";
+            public const string PartiallyRefunded = "Partially Refunded";
 
             public static IReadOnlyList<string> AllSecurityDepositStatuses { get; } = new List<string>
             {
@@ -594,7 +626,7 @@ public static class InvestmentPoolStatuses
         public static class DividendPaymentMethods
         {
             public const string Pending = "Pending";
-            public const string LeaseCredit = "LeaseCredit";
+            public const string LeaseCredit = "Lease Credit";
             public const string Check = "Check";
 
             public static IReadOnlyList<string> AllDividendPaymentMethods { get; } = new List<string>
@@ -608,7 +640,7 @@ public static class DividendPaymentMethods
         public static class DividendStatuses
         {
             public const string Pending = "Pending";
-            public const string ChoiceMade = "ChoiceMade";
+            public const string ChoiceMade = "Choice Made";
             public const string Applied = "Applied";
             public const string Paid = "Paid";
 
@@ -621,6 +653,23 @@ public static class DividendStatuses
             };
         }
 
+        public static class EntityTypes
+        {
+            public const string Property = "Property";
+            public const string Tenant = "Tenant";
+            public const string Lease = "Lease";
+            public const string Invoice = "Invoice";
+            public const string Payment = "Payment";
+            public const string MaintenanceRequest = "MaintenanceRequest";
+            public const string Document = "Document";
+            public const string Inspection = "Inspection";
+            public const string ProspectiveTenant = "ProspectiveTenant";
+            public const string Application = "Application";
+            public const string Tour = "Tour";
+            public const string Checklist = "Checklist";
+            public const string Note = "Note";
+        }
+
         
 
     }
diff --git a/Aquiis.SimpleStart/Core/Constants/EntityTypeNames.cs b/Aquiis.SimpleStart/Core/Constants/EntityTypeNames.cs
new file mode 100644
index 0000000..53c1588
--- /dev/null
+++ b/Aquiis.SimpleStart/Core/Constants/EntityTypeNames.cs
@@ -0,0 +1,65 @@
+using Aquiis.SimpleStart.Core.Entities;
+
+namespace Aquiis.SimpleStart.Core.Constants;
+
+/// <summary>
+/// Centralized entity type names for integration tables (Notes, Audit Logs, etc.)
+/// Uses fully-qualified type names to prevent collisions with external systems
+/// </summary>
+public static class EntityTypeNames
+{
+    // Property Management Domain
+    public const string Property = "Aquiis.SimpleStart.Core.Entities.Property";
+    public const string Tenant = "Aquiis.SimpleStart.Core.Entities.Tenant";
+    public const string Lease = "Aquiis.SimpleStart.Core.Entities.Lease";
+    public const string LeaseOffer = "Aquiis.SimpleStart.Core.Entities.LeaseOffer";
+    public const string Invoice = "Aquiis.SimpleStart.Core.Entities.Invoice";
+    public const string Payment = "Aquiis.SimpleStart.Core.Entities.Payment";
+    public const string MaintenanceRequest = "Aquiis.SimpleStart.Core.Entities.MaintenanceRequest";
+    public const string Inspection = "Aquiis.SimpleStart.Core.Entities.Inspection";
+    public const string Document = "Aquiis.SimpleStart.Core.Entities.Document";
+    
+    // Application/Prospect Domain
+    public const string ProspectiveTenant = "Aquiis.SimpleStart.Core.Entities.ProspectiveTenant";
+    public const string Application = "Aquiis.SimpleStart.Core.Entities.Application";
+    public const string Tour = "Aquiis.SimpleStart.Core.Entities.Tour";
+    
+    // Checklist Domain
+    public const string Checklist = "Aquiis.SimpleStart.Core.Entities.Checklist";
+    public const string ChecklistTemplate = "Aquiis.SimpleStart.Core.Entities.ChecklistTemplate";
+    
+    // Calendar/Events
+    public const string CalendarEvent = "Aquiis.SimpleStart.Core.Entities.CalendarEvent";
+    
+    // Security Deposits
+    public const string SecurityDepositPool = "Aquiis.SimpleStart.Core.Entities.SecurityDepositPool";
+    public const string SecurityDepositTransaction = "Aquiis.SimpleStart.Core.Entities.SecurityDepositTransaction";
+    
+    /// <summary>
+    /// Get the fully-qualified type name for an entity type
+    /// </summary>
+    public static string GetTypeName<T>() where T : BaseModel
+    {
+        return typeof(T).FullName ?? typeof(T).Name;
+    }
+    
+    /// <summary>
+    /// Get the display name (simple name) from a fully-qualified type name
+    /// </summary>
+    public static string GetDisplayName(string fullyQualifiedName)
+    {
+        return fullyQualifiedName.Split('.').Last();
+    }
+    
+    /// <summary>
+    /// Validate that an entity type string is recognized
+    /// </summary>
+    public static bool IsValidEntityType(string entityType)
+    {
+        return typeof(EntityTypeNames)
+            .GetFields(System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.Static)
+            .Where(f => f.FieldType == typeof(string))
+            .Select(f => f.GetValue(null) as string)
+            .Contains(entityType);
+    }
+}
diff --git a/Aquiis.SimpleStart/Core/Entities/ApplicationScreening.cs b/Aquiis.SimpleStart/Core/Entities/ApplicationScreening.cs
index 87e4e46..3d1d666 100644
--- a/Aquiis.SimpleStart/Core/Entities/ApplicationScreening.cs
+++ b/Aquiis.SimpleStart/Core/Entities/ApplicationScreening.cs
@@ -1,18 +1,18 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
+using Aquiis.SimpleStart.Core.Validation;
 
 namespace Aquiis.SimpleStart.Core.Entities
 {
     public class ApplicationScreening : BaseModel
     {
-        [Required]
-        [StringLength(100)]
+        [RequiredGuid]
         [Display(Name = "Organization ID")]
-        public string OrganizationId { get; set; } = string.Empty;
+        public Guid OrganizationId { get; set; } = Guid.Empty;
 
-        [Required]
+        [RequiredGuid]
         [Display(Name = "Rental Application")]
-        public int RentalApplicationId { get; set; }
+        public Guid RentalApplicationId { get; set; }
 
         // Background Check
         [Display(Name = "Background Check Requested")]
diff --git a/Aquiis.SimpleStart/Core/Entities/BaseModel.cs b/Aquiis.SimpleStart/Core/Entities/BaseModel.cs
index 52b6ddb..89ffb35 100644
--- a/Aquiis.SimpleStart/Core/Entities/BaseModel.cs
+++ b/Aquiis.SimpleStart/Core/Entities/BaseModel.cs
@@ -8,8 +8,8 @@ public class BaseModel
     {
         [Key]
         [JsonInclude]
-        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
-        public int Id { get; set; }
+        [DatabaseGenerated(DatabaseGeneratedOption.None)]
+        public Guid Id { get; set; }
 
         [Required]
         [JsonInclude]
diff --git a/Aquiis.SimpleStart/Core/Entities/CalendarEvent.cs b/Aquiis.SimpleStart/Core/Entities/CalendarEvent.cs
index cb92485..3b60c09 100644
--- a/Aquiis.SimpleStart/Core/Entities/CalendarEvent.cs
+++ b/Aquiis.SimpleStart/Core/Entities/CalendarEvent.cs
@@ -1,5 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
+using Aquiis.SimpleStart.Core.Validation;
 
 namespace Aquiis.SimpleStart.Core.Entities
 {
@@ -9,10 +10,9 @@ namespace Aquiis.SimpleStart.Core.Entities
     /// </summary>
     public class CalendarEvent : BaseModel
     {
-        [Required]
-        [StringLength(100)]
+        [RequiredGuid]
         [Display(Name = "Organization ID")]
-        public string OrganizationId { get; set; } = string.Empty;
+        public Guid OrganizationId { get; set; } = Guid.Empty;
 
         [Required]
         [StringLength(200)]
@@ -43,7 +43,7 @@ public class CalendarEvent : BaseModel
         public string? Description { get; set; }
 
         [Display(Name = "Property")]
-        public int? PropertyId { get; set; }
+        public Guid? PropertyId { get; set; }
 
         [StringLength(500)]
         [Display(Name = "Location")]
@@ -59,7 +59,7 @@ public class CalendarEvent : BaseModel
 
         // Polymorphic reference to source entity (null for custom events)
         [Display(Name = "Source Entity ID")]
-        public int? SourceEntityId { get; set; }
+        public Guid? SourceEntityId { get; set; }
 
         [StringLength(100)]
         [Display(Name = "Source Entity Type")]
diff --git a/Aquiis.SimpleStart/Core/Entities/CalendarSettings.cs b/Aquiis.SimpleStart/Core/Entities/CalendarSettings.cs
index f4c9cdc..e9cc02a 100644
--- a/Aquiis.SimpleStart/Core/Entities/CalendarSettings.cs
+++ b/Aquiis.SimpleStart/Core/Entities/CalendarSettings.cs
@@ -1,13 +1,13 @@
 using System.ComponentModel.DataAnnotations;
+using Aquiis.SimpleStart.Core.Validation;
 
 namespace Aquiis.SimpleStart.Core.Entities;
 
 public class CalendarSettings : BaseModel
 {
-    [Required]
-    [StringLength(100)]
+    [RequiredGuid]
     [Display(Name = "Organization ID")]
-    public string OrganizationId { get; set; } = string.Empty;
+    public Guid OrganizationId { get; set; } = Guid.Empty;
     public string EntityType { get; set; } = string.Empty;
     public bool AutoCreateEvents { get; set; } = true;
     public bool ShowOnCalendar { get; set; } = true;
diff --git a/Aquiis.SimpleStart/Core/Entities/Checklist.cs b/Aquiis.SimpleStart/Core/Entities/Checklist.cs
index 6428666..ba8970e 100644
--- a/Aquiis.SimpleStart/Core/Entities/Checklist.cs
+++ b/Aquiis.SimpleStart/Core/Entities/Checklist.cs
@@ -1,24 +1,24 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
+using Aquiis.SimpleStart.Core.Validation;
 
 namespace Aquiis.SimpleStart.Core.Entities
 {
     public class Checklist : BaseModel
     {
-        [Required]
-        [StringLength(100)]
+        [RequiredGuid]
         [Display(Name = "Organization ID")]
-        public string OrganizationId { get; set; } = string.Empty;
+        public Guid OrganizationId { get; set; } = Guid.Empty;
 
         [Display(Name = "Property ID")]
-        public int? PropertyId { get; set; }
+        public Guid? PropertyId { get; set; }
 
         [Display(Name = "Lease ID")]
-        public int? LeaseId { get; set; }
+        public Guid? LeaseId { get; set; }
 
-        [Required]
+        [RequiredGuid]
         [Display(Name = "Checklist Template ID")]
-        public int ChecklistTemplateId { get; set; }
+        public Guid ChecklistTemplateId { get; set; }
 
         [Required]
         [StringLength(200)]
@@ -43,7 +43,7 @@ public class Checklist : BaseModel
         public DateTime? CompletedOn { get; set; }
 
         [Display(Name = "Document ID")]
-        public int? DocumentId { get; set; }
+        public Guid? DocumentId { get; set; }
 
         [StringLength(2000)]
         [Display(Name = "General Notes")]
diff --git a/Aquiis.SimpleStart/Core/Entities/ChecklistItem.cs b/Aquiis.SimpleStart/Core/Entities/ChecklistItem.cs
index 9df990f..1615727 100644
--- a/Aquiis.SimpleStart/Core/Entities/ChecklistItem.cs
+++ b/Aquiis.SimpleStart/Core/Entities/ChecklistItem.cs
@@ -1,19 +1,19 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
+using Aquiis.SimpleStart.Core.Validation;
 
 namespace Aquiis.SimpleStart.Core.Entities
 {
     public class ChecklistItem : BaseModel
     {
 
-        [Required]
-        [StringLength(100)]
+        [RequiredGuid]
         [Display(Name = "Organization ID")]
-        public string OrganizationId { get; set; } = string.Empty;
+        public Guid OrganizationId { get; set; } = Guid.Empty;
 
-        [Required]
+        [RequiredGuid]
         [Display(Name = "Checklist ID")]
-        public int ChecklistId { get; set; }
+        public Guid ChecklistId { get; set; }
 
         [Required]
         [StringLength(500)]
diff --git a/Aquiis.SimpleStart/Core/Entities/ChecklistTemplate.cs b/Aquiis.SimpleStart/Core/Entities/ChecklistTemplate.cs
index e03c81d..b427376 100644
--- a/Aquiis.SimpleStart/Core/Entities/ChecklistTemplate.cs
+++ b/Aquiis.SimpleStart/Core/Entities/ChecklistTemplate.cs
@@ -1,13 +1,13 @@
 using System.ComponentModel.DataAnnotations;
+using Aquiis.SimpleStart.Core.Validation;
 
 namespace Aquiis.SimpleStart.Core.Entities
 {
     public class ChecklistTemplate : BaseModel
     {
-        [Required]
-        [StringLength(100)]
+        [RequiredGuid]
         [Display(Name = "Organization ID")]
-        public string OrganizationId { get; set; } = string.Empty;
+        public Guid OrganizationId { get; set; } = Guid.Empty;
 
         [Required]
         [StringLength(100)]
diff --git a/Aquiis.SimpleStart/Core/Entities/ChecklistTemplateItem.cs b/Aquiis.SimpleStart/Core/Entities/ChecklistTemplateItem.cs
index 6c51a3c..8d95ff6 100644
--- a/Aquiis.SimpleStart/Core/Entities/ChecklistTemplateItem.cs
+++ b/Aquiis.SimpleStart/Core/Entities/ChecklistTemplateItem.cs
@@ -1,18 +1,18 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
+using Aquiis.SimpleStart.Core.Validation;
 
 namespace Aquiis.SimpleStart.Core.Entities
 {
     public class ChecklistTemplateItem : BaseModel
     {
-        [Required]
-        [StringLength(100)]
+        [RequiredGuid]
         [Display(Name = "Organization ID")]
-        public string OrganizationId { get; set; } = string.Empty;
+        public Guid OrganizationId { get; set; } = Guid.Empty;
 
-        [Required]
+        [RequiredGuid]
         [Display(Name = "Checklist Template ID")]
-        public int ChecklistTemplateId { get; set; }
+        public Guid ChecklistTemplateId { get; set; }
 
         [Required]
         [StringLength(500)]
diff --git a/Aquiis.SimpleStart/Core/Entities/Document.cs b/Aquiis.SimpleStart/Core/Entities/Document.cs
index c9c4400..e270a35 100644
--- a/Aquiis.SimpleStart/Core/Entities/Document.cs
+++ b/Aquiis.SimpleStart/Core/Entities/Document.cs
@@ -9,7 +9,7 @@ public class Document:BaseModel
         [Required]
         [StringLength(100)]
         [Display(Name = "Organization ID")]
-        public string OrganizationId { get; set; } = string.Empty;
+        public Guid OrganizationId { get; set; } = Guid.Empty;
 
         [Required]
         [StringLength(255)]
@@ -42,11 +42,11 @@ public class Document:BaseModel
         public string Description { get; set; } = string.Empty;
 
         // Foreign keys - at least one must be set
-        public int? PropertyId { get; set; }
-        public int? TenantId { get; set; }
-        public int? LeaseId { get; set; }
-        public int? InvoiceId { get; set; }
-        public int? PaymentId { get; set; }
+        public Guid? PropertyId { get; set; }
+        public Guid? TenantId { get; set; }
+        public Guid? LeaseId { get; set; }
+        public Guid? InvoiceId { get; set; }
+        public Guid? PaymentId { get; set; }
 
         // Navigation properties
         [ForeignKey("PropertyId")]
diff --git a/Aquiis.SimpleStart/Core/Entities/ISchedulableEntity.cs b/Aquiis.SimpleStart/Core/Entities/ISchedulableEntity.cs
index 991d8cc..f3a9d6b 100644
--- a/Aquiis.SimpleStart/Core/Entities/ISchedulableEntity.cs
+++ b/Aquiis.SimpleStart/Core/Entities/ISchedulableEntity.cs
@@ -9,12 +9,12 @@ public interface ISchedulableEntity
         /// <summary>
         /// Entity ID
         /// </summary>
-        int Id { get; set; }
+        Guid Id { get; set; }
 
         /// <summary>
         /// Organization ID
         /// </summary>
-        string OrganizationId { get; set; }
+        Guid OrganizationId { get; set; }
 
         /// <summary>
         /// Created By User ID
@@ -24,7 +24,7 @@ public interface ISchedulableEntity
         /// <summary>
         /// Link to the associated CalendarEvent
         /// </summary>
-        int? CalendarEventId { get; set; }
+        Guid? CalendarEventId { get; set; }
 
         /// <summary>
         /// Get the title to display on the calendar
@@ -49,7 +49,7 @@ public interface ISchedulableEntity
         /// <summary>
         /// Get the associated property ID (if applicable)
         /// </summary>
-        int? GetPropertyId();
+        Guid? GetPropertyId();
 
         /// <summary>
         /// Get the description/details for the event
diff --git a/Aquiis.SimpleStart/Core/Entities/IncomeStatement.cs b/Aquiis.SimpleStart/Core/Entities/IncomeStatement.cs
index c6b59ab..9047867 100644
--- a/Aquiis.SimpleStart/Core/Entities/IncomeStatement.cs
+++ b/Aquiis.SimpleStart/Core/Entities/IncomeStatement.cs
@@ -1,4 +1,5 @@
 using System.ComponentModel.DataAnnotations;
+using Aquiis.SimpleStart.Core.Validation;
 
 namespace Aquiis.SimpleStart.Core.Entities;
 
@@ -7,14 +8,13 @@ namespace Aquiis.SimpleStart.Core.Entities;
 /// </summary>
 public class IncomeStatement
 {
-    [Required]
-    [StringLength(100)]
+    [RequiredGuid]
     [Display(Name = "Organization ID")]
-    public string OrganizationId { get; set; } = string.Empty;
+    public Guid OrganizationId { get; set; } = Guid.Empty;
         
     public DateTime StartDate { get; set; }
     public DateTime EndDate { get; set; }
-    public int? PropertyId { get; set; }
+    public Guid? PropertyId { get; set; }
     public string? PropertyName { get; set; }
 
     // Income
@@ -42,10 +42,11 @@ public class IncomeStatement
 /// </summary>
 public class RentRollItem
 {
-    public int PropertyId { get; set; }
+    [RequiredGuid]
+    public Guid PropertyId { get; set; }
     public string PropertyName { get; set; } = string.Empty;
     public string PropertyAddress { get; set; } = string.Empty;
-    public int? TenantId { get; set; }
+    public Guid? TenantId { get; set; }
     public string? TenantName { get; set; }
     public string LeaseStatus { get; set; } = string.Empty;
     public DateTime? LeaseStartDate { get; set; }
@@ -63,7 +64,8 @@ public class RentRollItem
 /// </summary>
 public class PropertyPerformance
 {
-    public int PropertyId { get; set; }
+    [RequiredGuid]
+    public Guid PropertyId { get; set; }
     public string PropertyName { get; set; } = string.Empty;
     public string PropertyAddress { get; set; } = string.Empty;
     public decimal TotalIncome { get; set; }
@@ -81,7 +83,7 @@ public class PropertyPerformance
 public class TaxReportData
 {
     public int Year { get; set; }
-    public int? PropertyId { get; set; }
+    public Guid? PropertyId { get; set; }
     public string? PropertyName { get; set; }
     public decimal TotalRentIncome { get; set; }
     public decimal TotalExpenses { get; set; }
diff --git a/Aquiis.SimpleStart/Core/Entities/Inspection.cs b/Aquiis.SimpleStart/Core/Entities/Inspection.cs
index 4e882a5..2b47629 100644
--- a/Aquiis.SimpleStart/Core/Entities/Inspection.cs
+++ b/Aquiis.SimpleStart/Core/Entities/Inspection.cs
@@ -9,14 +9,14 @@ public class Inspection : BaseModel, ISchedulableEntity
         [Required]
         [StringLength(100)]
         [Display(Name = "Organization ID")]
-        public string OrganizationId { get; set; } = string.Empty;
+        public Guid OrganizationId { get; set; } = Guid.Empty;
 
         [Required]
-        public int PropertyId { get; set; }
+        public Guid PropertyId { get; set; }
 
-        public int? CalendarEventId { get; set; }
+        public Guid? CalendarEventId { get; set; }
 
-        public int? LeaseId { get; set; }
+        public Guid? LeaseId { get; set; }
 
         [Required]
         public DateTime CompletedOn { get; set; } = DateTime.Now;
@@ -120,7 +120,7 @@ public class Inspection : BaseModel, ISchedulableEntity
         public string? ActionItemsRequired { get; set; }
 
         // Generated PDF Document
-        public int? DocumentId { get; set; }
+        public Guid? DocumentId { get; set; }
 
         // Navigation Properties
         [ForeignKey("PropertyId")]
@@ -144,7 +144,7 @@ public class Inspection : BaseModel, ISchedulableEntity
         
         public string GetEventType() => CalendarEventTypes.Inspection;
         
-        public int? GetPropertyId() => PropertyId;
+        public Guid? GetPropertyId() => PropertyId;
         
         public string GetEventDescription() => $"{InspectionType} - {OverallCondition}";
         
diff --git a/Aquiis.SimpleStart/Core/Entities/Invoice.cs b/Aquiis.SimpleStart/Core/Entities/Invoice.cs
index 5122590..65ba985 100644
--- a/Aquiis.SimpleStart/Core/Entities/Invoice.cs
+++ b/Aquiis.SimpleStart/Core/Entities/Invoice.cs
@@ -9,10 +9,10 @@ public class Invoice : BaseModel
         [Required]
         [StringLength(100)]
         [Display(Name = "Organization ID")]
-        public string OrganizationId { get; set; } = string.Empty;
+        public Guid OrganizationId { get; set; } = Guid.Empty;
 
         [Required]
-        public int LeaseId { get; set; }
+        public Guid LeaseId { get; set; }
 
         [Required]
         [StringLength(50)]
@@ -59,7 +59,7 @@ public class Invoice : BaseModel
         public DateTime? ReminderSentOn { get; set; }
 
     // Document Tracking
-    public int? DocumentId { get; set; }
+    public Guid? DocumentId { get; set; }
 
         // Navigation properties
     [ForeignKey("LeaseId")]
diff --git a/Aquiis.SimpleStart/Core/Entities/Lease.cs b/Aquiis.SimpleStart/Core/Entities/Lease.cs
index 97878e1..a7c1612 100644
--- a/Aquiis.SimpleStart/Core/Entities/Lease.cs
+++ b/Aquiis.SimpleStart/Core/Entities/Lease.cs
@@ -1,24 +1,24 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
+using Aquiis.SimpleStart.Core.Validation;
 
 namespace Aquiis.SimpleStart.Core.Entities
 {
     
     public class Lease : BaseModel
     {
-        [Required]
-        [StringLength(100)]
+        [RequiredGuid]
         [Display(Name = "Organization ID")]
-        public string OrganizationId { get; set; } = string.Empty;
+        public Guid OrganizationId { get; set; } = Guid.Empty;
 
-        [Required]
-        public int PropertyId { get; set; }
+        [RequiredGuid]
+        public Guid PropertyId { get; set; }
 
-        [Required]
-        public int TenantId { get; set; }
+        [RequiredGuid]
+        public Guid TenantId { get; set; }
 
         // Reference to the lease offer if this lease was created from an accepted offer
-        public int? LeaseOfferId { get; set; }
+        public Guid? LeaseOfferId { get; set; }
 
         [Required]
         [DataType(DataType.Date)]
@@ -74,10 +74,10 @@ public class Lease : BaseModel
         public string? RenewalNotes { get; set; }
 
         // Lease Chain Tracking
-        public int? PreviousLeaseId { get; set; }
+        public Guid? PreviousLeaseId { get; set; }
 
         // Document Tracking
-        public int? DocumentId { get; set; }
+        public Guid? DocumentId { get; set; }
 
         // Navigation properties
         [ForeignKey("PropertyId")]
diff --git a/Aquiis.SimpleStart/Core/Entities/LeaseOffer.cs b/Aquiis.SimpleStart/Core/Entities/LeaseOffer.cs
index a628459..c6f424e 100644
--- a/Aquiis.SimpleStart/Core/Entities/LeaseOffer.cs
+++ b/Aquiis.SimpleStart/Core/Entities/LeaseOffer.cs
@@ -8,16 +8,16 @@ public class LeaseOffer : BaseModel
         [Required]
         [StringLength(100)]
         [Display(Name = "Organization ID")]
-        public string OrganizationId { get; set; } = string.Empty;
+        public Guid OrganizationId { get; set; } = Guid.Empty;
 
         [Required]
-        public int RentalApplicationId { get; set; }
+        public Guid RentalApplicationId { get; set; }
 
         [Required]
-        public int PropertyId { get; set; }
+        public Guid PropertyId { get; set; }
 
         [Required]
-        public int ProspectiveTenantId { get; set; }
+        public Guid ProspectiveTenantId { get; set; }
 
         [Required]
         [DataType(DataType.Date)]
@@ -56,7 +56,7 @@ public class LeaseOffer : BaseModel
         [StringLength(500)]
         public string? ResponseNotes { get; set; }
 
-        public int? ConvertedLeaseId { get; set; } // Set when offer is accepted and converted to lease
+        public Guid? ConvertedLeaseId { get; set; } // Set when offer is accepted and converted to lease
 
         // Navigation properties
         [ForeignKey("RentalApplicationId")]
diff --git a/Aquiis.SimpleStart/Core/Entities/MaintenanceRequest.cs b/Aquiis.SimpleStart/Core/Entities/MaintenanceRequest.cs
index 304c029..da3ff1c 100644
--- a/Aquiis.SimpleStart/Core/Entities/MaintenanceRequest.cs
+++ b/Aquiis.SimpleStart/Core/Entities/MaintenanceRequest.cs
@@ -1,21 +1,21 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
+using Aquiis.SimpleStart.Core.Validation;
 
 namespace Aquiis.SimpleStart.Core.Entities
 {
     public class MaintenanceRequest : BaseModel, ISchedulableEntity
     {
-        [Required]
-        [StringLength(100)]
+        [RequiredGuid]
         [Display(Name = "Organization ID")]
-        public string OrganizationId { get; set; } = string.Empty;
+        public Guid OrganizationId { get; set; } = Guid.Empty;
 
-        [Required]
-        public int PropertyId { get; set; }
+        [RequiredGuid]
+        public Guid PropertyId { get; set; }
 
-        public int? CalendarEventId { get; set; }
+        public Guid? CalendarEventId { get; set; }
 
-        public int? LeaseId { get; set; }
+        public Guid? LeaseId { get; set; }
 
         [Required]
         [StringLength(100)]
@@ -136,7 +136,7 @@ public string StatusBadgeClass
         
         public string GetEventType() => CalendarEventTypes.Maintenance;
         
-        public int? GetPropertyId() => PropertyId;
+        public Guid? GetPropertyId() => PropertyId;
         
         public string GetEventDescription() => $"{Property?.Address ?? "Property"} - {Priority} Priority";
         
diff --git a/Aquiis.SimpleStart/Core/Entities/Note.cs b/Aquiis.SimpleStart/Core/Entities/Note.cs
index 15b3c18..a1d74b9 100644
--- a/Aquiis.SimpleStart/Core/Entities/Note.cs
+++ b/Aquiis.SimpleStart/Core/Entities/Note.cs
@@ -12,7 +12,7 @@ public class Note : BaseModel
         [Required]
         [StringLength(100)]
         [Display(Name = "Organization ID")]
-        public string OrganizationId { get; set; } = string.Empty;
+        public Guid OrganizationId { get; set; } = Guid.Empty;
 
         [Required]
         [StringLength(5000)]
@@ -26,7 +26,7 @@ public class Note : BaseModel
 
         [Required]
         [Display(Name = "Entity ID")]
-        public int EntityId { get; set; }
+        public Guid EntityId { get; set; }
 
         [StringLength(100)]
         [Display(Name = "User Full Name")]
diff --git a/Aquiis.SimpleStart/Core/Entities/Organization.cs b/Aquiis.SimpleStart/Core/Entities/Organization.cs
index d7bbe80..33d14f6 100644
--- a/Aquiis.SimpleStart/Core/Entities/Organization.cs
+++ b/Aquiis.SimpleStart/Core/Entities/Organization.cs
@@ -1,13 +1,13 @@
 using System.ComponentModel.DataAnnotations;
+using Aquiis.SimpleStart.Core.Validation;
 
 namespace Aquiis.SimpleStart.Core.Entities
 {
     public class Organization
     {
-        [Required]
-        [StringLength(100)]
+        [RequiredGuid]
         [Display(Name = "Organization ID")]
-        public string Id { get; set; } = Guid.NewGuid().ToString();
+        public Guid Id { get; set; } = Guid.Empty;
         
         /// <summary>
         /// UserId of the account owner who created this organization
diff --git a/Aquiis.SimpleStart/Core/Entities/OrganizationSettings.cs b/Aquiis.SimpleStart/Core/Entities/OrganizationSettings.cs
index 15167c5..7f45afc 100644
--- a/Aquiis.SimpleStart/Core/Entities/OrganizationSettings.cs
+++ b/Aquiis.SimpleStart/Core/Entities/OrganizationSettings.cs
@@ -14,7 +14,7 @@ public class OrganizationSettings : BaseModel
         [Required]
         [StringLength(100)]
         [Display(Name = "Organization ID")]
-        public string OrganizationId { get; set; } = string.Empty;
+        public Guid OrganizationId { get; set; } = Guid.Empty;
 
         [MaxLength(200)]
         public string? Name { get; set; }
diff --git a/Aquiis.SimpleStart/Core/Entities/Payment.cs b/Aquiis.SimpleStart/Core/Entities/Payment.cs
index 09d2832..a3403aa 100644
--- a/Aquiis.SimpleStart/Core/Entities/Payment.cs
+++ b/Aquiis.SimpleStart/Core/Entities/Payment.cs
@@ -8,10 +8,10 @@ public class Payment : BaseModel
         [Required]
         [StringLength(100)]
         [Display(Name = "Organization ID")]
-        public string OrganizationId { get; set; } = string.Empty;
+        public Guid OrganizationId { get; set; } = Guid.Empty;
 
         [Required]
-        public int InvoiceId { get; set; }
+        public Guid InvoiceId { get; set; }
 
         [Required]
         [DataType(DataType.Date)]
@@ -28,7 +28,7 @@ public class Payment : BaseModel
         public string Notes { get; set; } = string.Empty;
 
         // Document Tracking
-        public int? DocumentId { get; set; }
+        public Guid? DocumentId { get; set; }
 
         // Navigation properties
         [ForeignKey("InvoiceId")]
diff --git a/Aquiis.SimpleStart/Core/Entities/Property.cs b/Aquiis.SimpleStart/Core/Entities/Property.cs
index 6720959..2b9136c 100644
--- a/Aquiis.SimpleStart/Core/Entities/Property.cs
+++ b/Aquiis.SimpleStart/Core/Entities/Property.cs
@@ -12,7 +12,7 @@ public class Property : BaseModel
         [StringLength(100)]
         [DataType(DataType.Text)]
         [Display(Name = "Organization ID")]
-        public string OrganizationId { get; set; } = string.Empty;
+        public Guid OrganizationId { get; set; } = Guid.Empty;
 
         [Required]
         [JsonInclude]
diff --git a/Aquiis.SimpleStart/Core/Entities/ProspectiveTenant.cs b/Aquiis.SimpleStart/Core/Entities/ProspectiveTenant.cs
index baf7dbd..e954a24 100644
--- a/Aquiis.SimpleStart/Core/Entities/ProspectiveTenant.cs
+++ b/Aquiis.SimpleStart/Core/Entities/ProspectiveTenant.cs
@@ -8,7 +8,7 @@ public class ProspectiveTenant : BaseModel
         [Required]
         [StringLength(100)]
         [Display(Name = "Organization ID")]
-        public string OrganizationId { get; set; } = string.Empty;
+        public Guid OrganizationId { get; set; } = Guid.Empty;
 
         [Required]
         [StringLength(100)]
@@ -58,7 +58,7 @@ public class ProspectiveTenant : BaseModel
         public string? Notes { get; set; }
 
         [Display(Name = "Interested Property")]
-        public int? InterestedPropertyId { get; set; }
+        public Guid? InterestedPropertyId { get; set; }
 
         [Display(Name = "Desired Move-In Date")]
         public DateTime? DesiredMoveInDate { get; set; }
diff --git a/Aquiis.SimpleStart/Core/Entities/RentalApplication.cs b/Aquiis.SimpleStart/Core/Entities/RentalApplication.cs
index aac6642..53066bd 100644
--- a/Aquiis.SimpleStart/Core/Entities/RentalApplication.cs
+++ b/Aquiis.SimpleStart/Core/Entities/RentalApplication.cs
@@ -11,15 +11,15 @@ public class RentalApplication : BaseModel
         [StringLength(100)]
         [DataType(DataType.Text)]
         [Display(Name = "Organization ID")]
-        public string OrganizationId { get; set; } = string.Empty;
+        public Guid OrganizationId { get; set; } = Guid.Empty;
 
         [Required]
         [Display(Name = "Prospective Tenant")]
-        public int ProspectiveTenantId { get; set; }
+        public Guid ProspectiveTenantId { get; set; }
 
         [Required]
         [Display(Name = "Property")]
-        public int PropertyId { get; set; }
+        public Guid PropertyId { get; set; }
 
         [Required]
         [Display(Name = "Applied On")]
diff --git a/Aquiis.SimpleStart/Core/Entities/SecurityDeposit.cs b/Aquiis.SimpleStart/Core/Entities/SecurityDeposit.cs
index 5602468..995be90 100644
--- a/Aquiis.SimpleStart/Core/Entities/SecurityDeposit.cs
+++ b/Aquiis.SimpleStart/Core/Entities/SecurityDeposit.cs
@@ -14,15 +14,15 @@ public class SecurityDeposit : BaseModel
         [JsonInclude]
         [StringLength(100)]
         [Display(Name = "Organization ID")]
-        public string OrganizationId { get; set; } = string.Empty;
+        public Guid OrganizationId { get; set; } = Guid.Empty;
 
         [Required]
         [JsonInclude]
-        public int LeaseId { get; set; }
+        public Guid LeaseId { get; set; }
 
         [Required]
         [JsonInclude]
-        public int TenantId { get; set; }
+        public Guid TenantId { get; set; }
 
         [Required]
         [Column(TypeName = "decimal(18,2)")]
diff --git a/Aquiis.SimpleStart/Core/Entities/SecurityDepositDividend.cs b/Aquiis.SimpleStart/Core/Entities/SecurityDepositDividend.cs
index 505ba9a..77f3c38 100644
--- a/Aquiis.SimpleStart/Core/Entities/SecurityDepositDividend.cs
+++ b/Aquiis.SimpleStart/Core/Entities/SecurityDepositDividend.cs
@@ -14,19 +14,19 @@ public class SecurityDepositDividend : BaseModel
         [JsonInclude]
         [StringLength(100)]
         [Display(Name = "Organization ID")]
-        public string OrganizationId { get; set; } = string.Empty;
+        public Guid OrganizationId { get; set; } = Guid.Empty;
 
         [Required]
-        public int SecurityDepositId { get; set; }
+        public Guid SecurityDepositId { get; set; }
 
         [Required]
-        public int InvestmentPoolId { get; set; }
+        public Guid InvestmentPoolId { get; set; }
 
         [Required]
-        public int LeaseId { get; set; }
+        public Guid LeaseId { get; set; }
 
         [Required]
-        public int TenantId { get; set; }
+        public Guid TenantId { get; set; }
 
         [Required]
         public int Year { get; set; }
diff --git a/Aquiis.SimpleStart/Core/Entities/SecurityDepositInvestmentPool.cs b/Aquiis.SimpleStart/Core/Entities/SecurityDepositInvestmentPool.cs
index 24719ad..393aad9 100644
--- a/Aquiis.SimpleStart/Core/Entities/SecurityDepositInvestmentPool.cs
+++ b/Aquiis.SimpleStart/Core/Entities/SecurityDepositInvestmentPool.cs
@@ -10,7 +10,7 @@ namespace Aquiis.SimpleStart.Core.Entities
     public class SecurityDepositInvestmentPool : BaseModel
     {
         [Required]
-        public string OrganizationId { get; set; } = string.Empty;
+        public Guid OrganizationId { get; set; } = Guid.Empty;
 
         [Required]
         public int Year { get; set; }
diff --git a/Aquiis.SimpleStart/Core/Entities/Tenant.cs b/Aquiis.SimpleStart/Core/Entities/Tenant.cs
index c43e932..18408e6 100644
--- a/Aquiis.SimpleStart/Core/Entities/Tenant.cs
+++ b/Aquiis.SimpleStart/Core/Entities/Tenant.cs
@@ -1,12 +1,13 @@
 using System.ComponentModel.DataAnnotations;
+using Aquiis.SimpleStart.Core.Validation;
 
 namespace Aquiis.SimpleStart.Core.Entities {
 
     public class Tenant : BaseModel
     {
 
-        [Required]
-        public string OrganizationId { get; set; } = string.Empty;
+        [RequiredGuid]
+        public Guid OrganizationId { get; set; } = Guid.Empty;
 
         [Required]
         [StringLength(100)]
@@ -45,7 +46,7 @@ public class Tenant : BaseModel
         public string Notes { get; set; } = string.Empty;
 
         // Link back to prospect for audit trail
-        public int? ProspectiveTenantId { get; set; }
+        public Guid? ProspectiveTenantId { get; set; }
 
         // Navigation properties
         public virtual ICollection<Lease> Leases { get; set; } = new List<Lease>();
diff --git a/Aquiis.SimpleStart/Core/Entities/Tour.cs b/Aquiis.SimpleStart/Core/Entities/Tour.cs
index 3a9de9d..2ec1a09 100644
--- a/Aquiis.SimpleStart/Core/Entities/Tour.cs
+++ b/Aquiis.SimpleStart/Core/Entities/Tour.cs
@@ -1,22 +1,22 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
+using Aquiis.SimpleStart.Core.Validation;
 
 namespace Aquiis.SimpleStart.Core.Entities
 {
     public class Tour : BaseModel, ISchedulableEntity
     {
-        [Required]
-        [StringLength(100)]
+        [RequiredGuid]
         [Display(Name = "Organization ID")]
-        public string OrganizationId { get; set; } = string.Empty;
+        public Guid OrganizationId { get; set; } = Guid.Empty;
         
-        [Required]
+        [RequiredGuid]
         [Display(Name = "Prospective Tenant")]
-        public int ProspectiveTenantId { get; set; }
+        public Guid ProspectiveTenantId { get; set; }
 
-        [Required]
+        [RequiredGuid]
         [Display(Name = "Property")]
-        public int PropertyId { get; set; }
+        public Guid PropertyId { get; set; }
 
         [Required]
         [Display(Name = "Scheduled Date & Time")]
@@ -42,10 +42,10 @@ public class Tour : BaseModel, ISchedulableEntity
         public string? ConductedBy { get; set; } = string.Empty; // UserId of property manager
 
         [Display(Name = "Property Tour Checklist")]
-        public int? ChecklistId { get; set; } // Links to property tour checklist
+        public Guid? ChecklistId { get; set; } // Links to property tour checklist
 
         [Display(Name = "Calendar Event")]
-        public int? CalendarEventId { get; set; }
+        public Guid? CalendarEventId { get; set; }
 
         // Navigation properties
         [ForeignKey(nameof(ProspectiveTenantId))]
@@ -66,7 +66,7 @@ public class Tour : BaseModel, ISchedulableEntity
         
         public string GetEventType() => CalendarEventTypes.Tour;
         
-        public int? GetPropertyId() => PropertyId;
+        public Guid? GetPropertyId() => PropertyId;
         
         public string GetEventDescription() => Property?.Address ?? string.Empty;
         
diff --git a/Aquiis.SimpleStart/Core/Entities/UserOrganization.cs b/Aquiis.SimpleStart/Core/Entities/UserOrganization.cs
index bc7b112..b8fd311 100644
--- a/Aquiis.SimpleStart/Core/Entities/UserOrganization.cs
+++ b/Aquiis.SimpleStart/Core/Entities/UserOrganization.cs
@@ -1,6 +1,7 @@
 
 
 using System.ComponentModel.DataAnnotations;
+using Aquiis.SimpleStart.Core.Validation;
 
 namespace Aquiis.SimpleStart.Core.Entities
 {
@@ -10,10 +11,9 @@ namespace Aquiis.SimpleStart.Core.Entities
     public class UserOrganization
     {
 
-        [Required]
-        [StringLength(100)]
+        [RequiredGuid]
         [Display(Name = "UserOrganization ID")]
-        public string Id { get; set; } = Guid.NewGuid().ToString();
+        public Guid Id { get; set; } = Guid.NewGuid();
 
         /// <summary>
         /// The user being granted access
@@ -23,7 +23,8 @@ public class UserOrganization
         /// <summary>
         /// The organization they're being granted access to
         /// </summary>
-        public string OrganizationId { get; set; } = string.Empty;
+        [RequiredGuid]
+        public Guid OrganizationId { get; set; } = Guid.Empty;
         
         /// <summary>
         /// Role within this organization: "Owner", "Administrator", "PropertyManager", "User"
diff --git a/Aquiis.SimpleStart/Core/Validation/OptionalGuidAttribute.cs b/Aquiis.SimpleStart/Core/Validation/OptionalGuidAttribute.cs
new file mode 100644
index 0000000..ac45d87
--- /dev/null
+++ b/Aquiis.SimpleStart/Core/Validation/OptionalGuidAttribute.cs
@@ -0,0 +1,73 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace Aquiis.SimpleStart.Core.Validation;
+
+/// <summary>
+/// Validates that an optional Guid property, if provided, is not Guid.Empty.
+/// Use this for Guid? properties where null is acceptable but Guid.Empty is not.
+/// 
+/// Example: LeaseId on MaintenanceRequest - can be null (no lease yet) but shouldn't be Guid.Empty (invalid reference)
+/// </summary>
+[AttributeUsage(AttributeTargets.Property | AttributeTargets.Field | AttributeTargets.Parameter, AllowMultiple = false)]
+public class OptionalGuidAttribute : ValidationAttribute
+{
+    /// <summary>
+    /// Initializes a new instance of OptionalGuidAttribute with a default error message.
+    /// </summary>
+    public OptionalGuidAttribute()
+        : base("The {0} field cannot be empty if provided. Either leave it null or provide a valid value.")
+    {
+    }
+
+    /// <summary>
+    /// Initializes a new instance of OptionalGuidAttribute with a custom error message.
+    /// </summary>
+    /// <param name="errorMessage">The error message to display when validation fails.</param>
+    public OptionalGuidAttribute(string errorMessage)
+        : base(errorMessage)
+    {
+    }
+
+    /// <summary>
+    /// Validates that if the value is not null, it must not be Guid.Empty.
+    /// </summary>
+    protected override ValidationResult? IsValid(object? value, ValidationContext validationContext)
+    {
+        // Null is acceptable for optional fields
+        if (value == null)
+        {
+            return ValidationResult.Success;
+        }
+
+        // Type check
+        if (value is not Guid guidValue)
+        {
+            return new ValidationResult(
+                $"The {validationContext.DisplayName} field must be a valid Guid or null.",
+                new[] { validationContext.MemberName ?? string.Empty }
+            );
+        }
+
+        // Reject Guid.Empty (if you provide a value, it must be real)
+        if (guidValue == Guid.Empty)
+        {
+            return new ValidationResult(
+                FormatErrorMessage(validationContext.DisplayName),
+                new[] { validationContext.MemberName ?? string.Empty }
+            );
+        }
+
+        return ValidationResult.Success;
+    }
+
+    public override bool IsValid(object? value)
+    {
+        if (value == null)
+            return true;
+
+        if (value is not Guid guidValue)
+            return false;
+
+        return guidValue != Guid.Empty;
+    }
+}
diff --git a/Aquiis.SimpleStart/Core/Validation/RequiredGuidAttribute.cs b/Aquiis.SimpleStart/Core/Validation/RequiredGuidAttribute.cs
new file mode 100644
index 0000000..ef64f6a
--- /dev/null
+++ b/Aquiis.SimpleStart/Core/Validation/RequiredGuidAttribute.cs
@@ -0,0 +1,83 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace Aquiis.SimpleStart.Core.Validation;
+
+/// <summary>
+/// Validates that a Guid property has a value other than Guid.Empty.
+/// Use this instead of [Required] for non-nullable Guid properties.
+/// 
+/// Note: For nullable Guid? properties, use [Required] to check for null,
+/// and optionally combine with [RequiredGuid] to also reject Guid.Empty.
+/// </summary>
+[AttributeUsage(AttributeTargets.Property | AttributeTargets.Field | AttributeTargets.Parameter, AllowMultiple = false)]
+public class RequiredGuidAttribute : ValidationAttribute
+{
+    /// <summary>
+    /// Initializes a new instance of RequiredGuidAttribute with a default error message.
+    /// </summary>
+    public RequiredGuidAttribute()
+        : base("The {0} field is required and cannot be empty.")
+    {
+    }
+
+    /// <summary>
+    /// Initializes a new instance of RequiredGuidAttribute with a custom error message.
+    /// </summary>
+    /// <param name="errorMessage">The error message to display when validation fails.</param>
+    public RequiredGuidAttribute(string errorMessage)
+        : base(errorMessage)
+    {
+    }
+
+    /// <summary>
+    /// Validates that the value is not null, not Guid.Empty, and is a valid Guid.
+    /// </summary>
+    /// <param name="value">The value to validate.</param>
+    /// <param name="validationContext">The context information about the validation operation.</param>
+    /// <returns>ValidationResult.Success if valid, otherwise a ValidationResult with error message.</returns>
+    protected override ValidationResult? IsValid(object? value, ValidationContext validationContext)
+    {
+        // Null check (for Guid? properties)
+        if (value == null)
+        {
+            return new ValidationResult(
+                FormatErrorMessage(validationContext.DisplayName),
+                new[] { validationContext.MemberName ?? string.Empty }
+            );
+        }
+
+        // Type check
+        if (value is not Guid guidValue)
+        {
+            return new ValidationResult(
+                $"The {validationContext.DisplayName} field must be a valid Guid.",
+                new[] { validationContext.MemberName ?? string.Empty }
+            );
+        }
+
+        // Empty Guid check
+        if (guidValue == Guid.Empty)
+        {
+            return new ValidationResult(
+                FormatErrorMessage(validationContext.DisplayName),
+                new[] { validationContext.MemberName ?? string.Empty }
+            );
+        }
+
+        return ValidationResult.Success;
+    }
+
+    /// <summary>
+    /// Simple validation for attribute usage without ValidationContext.
+    /// </summary>
+    public override bool IsValid(object? value)
+    {
+        if (value == null)
+            return false;
+
+        if (value is not Guid guidValue)
+            return false;
+
+        return guidValue != Guid.Empty;
+    }
+}
diff --git a/Aquiis.SimpleStart/Features/Administration/Organizations/Pages/EditOrganization.razor b/Aquiis.SimpleStart/Features/Administration/Organizations/Pages/EditOrganization.razor
index 598115f..4b98ecb 100644
--- a/Aquiis.SimpleStart/Features/Administration/Organizations/Pages/EditOrganization.razor
+++ b/Aquiis.SimpleStart/Features/Administration/Organizations/Pages/EditOrganization.razor
@@ -1,4 +1,4 @@
-@page "/administration/organizations/edit/{Id}"
+@page "/administration/organizations/edit/{Id:guid}"
 
 @using Aquiis.SimpleStart.Core.Entities
 @using Aquiis.SimpleStart.Application.Services
@@ -149,7 +149,7 @@
 
 @code {
     [Parameter]
-    public string Id { get; set; } = string.Empty;
+    public Guid Id { get; set; } = Guid.Empty;
 
     private bool isLoading = true;
     private bool isSubmitting = false;
diff --git a/Aquiis.SimpleStart/Features/Administration/Organizations/Pages/ManageUsers.razor b/Aquiis.SimpleStart/Features/Administration/Organizations/Pages/ManageUsers.razor
index 6cc9caa..8b31ee1 100644
--- a/Aquiis.SimpleStart/Features/Administration/Organizations/Pages/ManageUsers.razor
+++ b/Aquiis.SimpleStart/Features/Administration/Organizations/Pages/ManageUsers.razor
@@ -1,4 +1,4 @@
-@page "/administration/organizations/{Id}/users"
+@page "/administration/organizations/{Id:guid}/users"
 
 @using Aquiis.SimpleStart.Core.Entities
 @using Aquiis.SimpleStart.Application.Services
@@ -215,7 +215,7 @@
 
 @code {
     [Parameter]
-    public string Id { get; set; } = string.Empty;
+    public Guid Id { get; set; } = Guid.Empty;
 
     private bool isLoading = true;
     private Organization? organization;
@@ -237,7 +237,7 @@
         isLoading = true;
         try
         {
-            var userId = await UserContext.GetUserIdAsync();
+            string? userId = await UserContext.GetUserIdAsync();
             if (string.IsNullOrEmpty(userId))
             {
                 return;
diff --git a/Aquiis.SimpleStart/Features/Administration/Organizations/Pages/Organizations.razor b/Aquiis.SimpleStart/Features/Administration/Organizations/Pages/Organizations.razor
index 4aa69b8..1655a67 100644
--- a/Aquiis.SimpleStart/Features/Administration/Organizations/Pages/Organizations.razor
+++ b/Aquiis.SimpleStart/Features/Administration/Organizations/Pages/Organizations.razor
@@ -197,17 +197,17 @@
         Navigation.NavigateTo("/administration/organizations/create");
     }
 
-    private void NavigateToView(string organizationId)
+    private void NavigateToView(Guid organizationId)
     {
         Navigation.NavigateTo($"/administration/organizations/view/{organizationId}");
     }
 
-    private void NavigateToEdit(string organizationId)
+    private void NavigateToEdit(Guid organizationId)
     {
         Navigation.NavigateTo($"/administration/organizations/edit/{organizationId}");
     }
 
-    private void NavigateToManageUsers(string organizationId)
+    private void NavigateToManageUsers(Guid organizationId)
     {
         Navigation.NavigateTo($"/administration/organizations/{organizationId}/users");
     }
diff --git a/Aquiis.SimpleStart/Features/Administration/Organizations/Pages/ViewOrganization.razor b/Aquiis.SimpleStart/Features/Administration/Organizations/Pages/ViewOrganization.razor
index 2e2c0b0..0fceb30 100644
--- a/Aquiis.SimpleStart/Features/Administration/Organizations/Pages/ViewOrganization.razor
+++ b/Aquiis.SimpleStart/Features/Administration/Organizations/Pages/ViewOrganization.razor
@@ -1,4 +1,4 @@
-@page "/administration/organizations/view/{Id}"
+@page "/administration/organizations/view/{Id:guid}"
 
 @using Aquiis.SimpleStart.Core.Entities
 @using Aquiis.SimpleStart.Application.Services
@@ -225,7 +225,7 @@
 
 @code {
     [Parameter]
-    public string Id { get; set; } = string.Empty;
+    public Guid Id { get; set; } = Guid.Empty;
 
     private bool isLoading = true;
     private Organization? organization;
diff --git a/Aquiis.SimpleStart/Features/Administration/Settings/Pages/CalendarSettings.razor b/Aquiis.SimpleStart/Features/Administration/Settings/Pages/CalendarSettings.razor
index db46c1b..58da31c 100644
--- a/Aquiis.SimpleStart/Features/Administration/Settings/Pages/CalendarSettings.razor
+++ b/Aquiis.SimpleStart/Features/Administration/Settings/Pages/CalendarSettings.razor
@@ -275,8 +275,8 @@ else
     protected override async Task OnInitializedAsync()
     {
         // Get organization and role context
-        var org = await UserContext.GetActiveOrganizationAsync();
-        organizationName = org?.Name ?? "Unknown Organization";
+        var organization = await UserContext.GetActiveOrganizationAsync();
+        organizationName = organization?.Name ?? "Unknown Organization";
         userRole = await UserContext.GetCurrentOrganizationRoleAsync() ?? "User";
         canEdit = userRole != "User"; // User role is read-only
         
@@ -288,10 +288,10 @@ else
         loading = true;
         try
         {
-            var orgId = await UserContext.GetActiveOrganizationIdAsync();
-            if (!string.IsNullOrEmpty(orgId))
+            var organizationId = await UserContext.GetActiveOrganizationIdAsync();
+            if (organizationId.HasValue)
             {
-                settings = await SettingsService.GetSettingsAsync(orgId);
+                settings = await SettingsService.GetSettingsAsync(organizationId.Value);
             }
         }
         catch (Exception ex)
diff --git a/Aquiis.SimpleStart/Features/Administration/Settings/Pages/OrganizationSettings.razor b/Aquiis.SimpleStart/Features/Administration/Settings/Pages/OrganizationSettings.razor
index d473b39..72cf23f 100644
--- a/Aquiis.SimpleStart/Features/Administration/Settings/Pages/OrganizationSettings.razor
+++ b/Aquiis.SimpleStart/Features/Administration/Settings/Pages/OrganizationSettings.razor
@@ -369,7 +369,7 @@
     private bool isSubmitting = false;
     private string errorMessage = string.Empty;
     private string successMessage = string.Empty;
-    private string organizationId = string.Empty;
+    private Guid organizationId = Guid.Empty;
     private string organizationName = string.Empty;
     private string userRole = string.Empty;
     private bool canEdit = true;
@@ -379,7 +379,7 @@
     {
         try
         {
-            organizationId = await UserContext.GetActiveOrganizationIdAsync() ?? string.Empty;
+            organizationId = await UserContext.GetActiveOrganizationIdAsync() ?? Guid.Empty;
             await LoadSettings();
         }
         catch (Exception ex)
@@ -426,6 +426,7 @@
         {
             settings = new OrganizationSettingsEntity
             {
+                Id = Guid.NewGuid(),
                 OrganizationId = organizationId,
                 Name = "My Organization",
                 ApplicationFeeEnabled = true,
diff --git a/Aquiis.SimpleStart/Features/Administration/Settings/Pages/ServiceSettings.razor b/Aquiis.SimpleStart/Features/Administration/Settings/Pages/ServiceSettings.razor
index 97f517e..0e2cb7e 100644
--- a/Aquiis.SimpleStart/Features/Administration/Settings/Pages/ServiceSettings.razor
+++ b/Aquiis.SimpleStart/Features/Administration/Settings/Pages/ServiceSettings.razor
@@ -205,8 +205,8 @@
             runningTask = taskType;
             taskResults.Clear();
 
-            var organizationId = await GetActiveOrganizationIdAsync();
-            if (organizationId == null)
+            Guid? organizationId = await GetActiveOrganizationIdAsync();
+            if (!organizationId.HasValue)
             {
                 ToastService.ShowError("Could not determine organization ID");
                 return;
@@ -215,16 +215,16 @@
             switch (taskType)
             {
                 case TaskType.ApplyLateFees:
-                    await ApplyLateFees(organizationId);
+                    await ApplyLateFees(organizationId.Value);
                     break;
                 case TaskType.UpdateInvoiceStatuses:
-                    await UpdateInvoiceStatuses(organizationId);
+                    await UpdateInvoiceStatuses(organizationId.Value);
                     break;
                 case TaskType.SendPaymentReminders:
-                    await SendPaymentReminders(organizationId);
+                    await SendPaymentReminders(organizationId.Value);
                     break;
                 case TaskType.CheckLeaseRenewals:
-                    await CheckLeaseRenewals(organizationId);
+                    await CheckLeaseRenewals(organizationId.Value);
                     break;
             }
 
@@ -258,10 +258,10 @@
                 return;
             }
 
-            await ApplyLateFees(organizationId);
-            await UpdateInvoiceStatuses(organizationId);
-            await SendPaymentReminders(organizationId);
-            await CheckLeaseRenewals(organizationId);
+            await ApplyLateFees(organizationId.Value);
+            await UpdateInvoiceStatuses(organizationId.Value);
+            await SendPaymentReminders(organizationId.Value);
+            await CheckLeaseRenewals(organizationId.Value);
 
             lastRunTime = DateTime.Now;
             ToastService.ShowSuccess("All tasks completed successfully");
@@ -278,13 +278,13 @@
         }
     }
 
-    private async Task<string?> GetActiveOrganizationIdAsync()
+    private async Task<Guid?> GetActiveOrganizationIdAsync()
     {
         // Get organization ID from UserContext
         return await UserContext.GetActiveOrganizationIdAsync();
     }
 
-    private async Task ApplyLateFees(string organizationId)
+    private async Task ApplyLateFees(Guid organizationId)
     {
         var settings = await PropertyService.GetOrganizationSettingsByOrgIdAsync(organizationId);
         
@@ -330,7 +330,7 @@
         taskResults[TaskType.ApplyLateFees] = $"Applied late fees to {overdueInvoices.Count} invoice(s)";
     }
 
-    private async Task UpdateInvoiceStatuses(string organizationId)
+    private async Task UpdateInvoiceStatuses(Guid organizationId)
     {
         var today = DateTime.Today;
         var newlyOverdueInvoices = await DbContext.Invoices
@@ -356,7 +356,7 @@
         taskResults[TaskType.UpdateInvoiceStatuses] = $"Updated {newlyOverdueInvoices.Count} invoice(s) to Overdue status";
     }
 
-    private async Task SendPaymentReminders(string organizationId)
+    private async Task SendPaymentReminders(Guid organizationId)
     {
         var settings = await PropertyService.GetOrganizationSettingsByOrgIdAsync(organizationId);
         if (settings == null || !settings.PaymentReminderEnabled)
@@ -396,7 +396,7 @@
         taskResults[TaskType.SendPaymentReminders] = $"Marked {upcomingInvoices.Count} invoice(s) for payment reminders";
     }
 
-    private async Task CheckLeaseRenewals(string organizationId)
+    private async Task CheckLeaseRenewals(Guid organizationId)
     {
         var today = DateTime.Today;
         int totalProcessed = 0;
diff --git a/Aquiis.SimpleStart/Features/Administration/Users/Manage.razor b/Aquiis.SimpleStart/Features/Administration/Users/Manage.razor
index b907bf9..6506adb 100644
--- a/Aquiis.SimpleStart/Features/Administration/Users/Manage.razor
+++ b/Aquiis.SimpleStart/Features/Administration/Users/Manage.razor
@@ -377,7 +377,7 @@ else
     private UserInfo? selectedUserForEdit;
     private RoleEditModel roleEditModel = new();
 
-    private string organizationId = string.Empty;
+    private Guid organizationId = Guid.Empty;
 
     private string organizationName = string.Empty;
 
@@ -386,7 +386,7 @@ else
         try
         {
             // One line instead of 10+!
-            organizationId = await UserContext!.GetActiveOrganizationIdAsync() ?? string.Empty;
+            organizationId = await UserContext!.GetActiveOrganizationIdAsync() ?? Guid.Empty;
             organizationName = (await UserContext!.GetOrganizationByIdAsync(organizationId))?.Name ?? string.Empty;
             await LoadData();
         }
diff --git a/Aquiis.SimpleStart/Features/Administration/Users/Pages/Create.razor b/Aquiis.SimpleStart/Features/Administration/Users/Pages/Create.razor
index ec0233f..20724ac 100644
--- a/Aquiis.SimpleStart/Features/Administration/Users/Pages/Create.razor
+++ b/Aquiis.SimpleStart/Features/Administration/Users/Pages/Create.razor
@@ -200,7 +200,7 @@
             var currentUserId = await UserContext.GetUserIdAsync();
             var currentOrganizationId = await UserContext.GetActiveOrganizationIdAsync();
             
-            if (string.IsNullOrEmpty(currentUserId) || string.IsNullOrEmpty(currentOrganizationId))
+            if (string.IsNullOrEmpty(currentUserId) || !currentOrganizationId.HasValue)
             {
                 errorMessage = "User not authenticated or no active organization.";
                 return;
@@ -223,8 +223,8 @@
                 PhoneNumber = userModel.PhoneNumber,
                 FirstName = userModel.FirstName,
                 LastName = userModel.LastName,
-                OrganizationId = currentOrganizationId,
-                ActiveOrganizationId = currentOrganizationId
+                OrganizationId = currentOrganizationId.Value,
+                ActiveOrganizationId = currentOrganizationId.Value
             };
 
             var createResult = await UserManager.CreateAsync(newUser, userModel.Password);
@@ -238,7 +238,7 @@
             // Grant organization access with the selected role
             var grantResult = await OrganizationService.GrantOrganizationAccessAsync(
                 newUser.Id, 
-                currentOrganizationId, 
+                currentOrganizationId.Value, 
                 userModel.SelectedRole, 
                 currentUserId);
 
diff --git a/Aquiis.SimpleStart/Features/Administration/Users/View.razor b/Aquiis.SimpleStart/Features/Administration/Users/View.razor
index 1b55f41..78c01b6 100644
--- a/Aquiis.SimpleStart/Features/Administration/Users/View.razor
+++ b/Aquiis.SimpleStart/Features/Administration/Users/View.razor
@@ -326,7 +326,7 @@ else
 
             // Check permissions
             var currentOrgId = await UserContext.GetActiveOrganizationIdAsync();
-            var currentUserRole = await OrganizationService.GetUserRoleForOrganizationAsync(currentUser.Id, currentOrgId ?? string.Empty);
+            var currentUserRole = await OrganizationService.GetUserRoleForOrganizationAsync(currentUser.Id, currentOrgId.Value);
             isCurrentUserAdmin = currentUserRole == ApplicationConstants.OrganizationRoles.Owner || 
                                 currentUserRole == ApplicationConstants.OrganizationRoles.Administrator;
             isViewingOwnAccount = currentUser.Id == viewedUser.Id;
@@ -339,7 +339,7 @@ else
             canEditAccount = isViewingOwnAccount;
 
             // Load user's organization role
-            var viewedUserRole = await OrganizationService.GetUserRoleForOrganizationAsync(viewedUser.Id, currentOrgId ?? string.Empty);
+            var viewedUserRole = await OrganizationService.GetUserRoleForOrganizationAsync(viewedUser.Id, currentOrgId.Value);
             userRoles = viewedUserRole != null ? new List<string> { viewedUserRole } : new List<string>();
             currentUserRole = viewedUserRole ?? "No Role";
             selectedRole = currentUserRole;
@@ -394,14 +394,14 @@ else
             var currentOrgId = await UserContext.GetActiveOrganizationIdAsync();
             var currentUserId = await UserContext.GetUserIdAsync();
             
-            if (string.IsNullOrEmpty(currentOrgId) || string.IsNullOrEmpty(currentUserId))
+            if (!currentOrgId.HasValue || string.IsNullOrEmpty(currentUserId))
             {
                 errorMessage = "Unable to determine current organization context.";
                 return;
             }
 
             // Check if user already has an organization assignment
-            var existingRole = await OrganizationService.GetUserRoleForOrganizationAsync(viewedUser.Id, currentOrgId);
+            var existingRole = await OrganizationService.GetUserRoleForOrganizationAsync(viewedUser.Id, currentOrgId.Value);
             
             bool updateResult;
             if (existingRole != null)
@@ -409,7 +409,7 @@ else
                 // Update existing role
                 updateResult = await OrganizationService.UpdateUserRoleAsync(
                     viewedUser.Id, 
-                    currentOrgId, 
+                    currentOrgId.Value, 
                     selectedRole, 
                     currentUserId);
             }
@@ -418,7 +418,7 @@ else
                 // Grant new organization access with the selected role
                 updateResult = await OrganizationService.GrantOrganizationAccessAsync(
                     viewedUser.Id,
-                    currentOrgId,
+                    currentOrgId.Value,
                     selectedRole,
                     currentUserId);
             }
diff --git a/Aquiis.SimpleStart/Features/PropertyManagement/Applications/Pages/Applications.razor b/Aquiis.SimpleStart/Features/PropertyManagement/Applications/Pages/Applications.razor
index f6fa877..e76879a 100644
--- a/Aquiis.SimpleStart/Features/PropertyManagement/Applications/Pages/Applications.razor
+++ b/Aquiis.SimpleStart/Features/PropertyManagement/Applications/Pages/Applications.razor
@@ -187,13 +187,13 @@
     private List<RentalApplication> deniedApplications = new();
     private string currentFilter = "Pending";
     private bool isLoading = true;
-    private string organizationId = string.Empty;
+    private Guid organizationId = Guid.Empty;
 
     protected override async Task OnInitializedAsync()
     {
         try
         {
-            organizationId = await UserContext.GetActiveOrganizationIdAsync() ?? string.Empty;
+            organizationId = await UserContext.GetActiveOrganizationIdAsync() ?? Guid.Empty;
             await LoadApplications();
         }
         catch (Exception ex)
@@ -241,7 +241,7 @@
         };
     }
 
-    private void ViewApplication(int applicationId)
+    private void ViewApplication(Guid applicationId)
     {
         Navigation.NavigateTo($"/propertymanagement/applications/{applicationId}/review");
     }
diff --git a/Aquiis.SimpleStart/Features/PropertyManagement/Applications/Pages/GenerateLeaseOffer.razor b/Aquiis.SimpleStart/Features/PropertyManagement/Applications/Pages/GenerateLeaseOffer.razor
index 4facace..0379e99 100644
--- a/Aquiis.SimpleStart/Features/PropertyManagement/Applications/Pages/GenerateLeaseOffer.razor
+++ b/Aquiis.SimpleStart/Features/PropertyManagement/Applications/Pages/GenerateLeaseOffer.razor
@@ -1,14 +1,16 @@
-@page "/propertymanagement/applications/{ApplicationId:int}/generate-lease-offer"
+@page "/propertymanagement/applications/{ApplicationId:guid}/generate-lease-offer"
 
 @using Aquiis.SimpleStart.Core.Entities
 @using Aquiis.SimpleStart.Application.Services
 @using Aquiis.SimpleStart.Shared.Services
 @using Aquiis.SimpleStart.Application.Services.PdfGenerators
+@using Aquiis.SimpleStart.Application.Services.Workflows
 @using Aquiis.SimpleStart.Core.Constants
 @using Microsoft.AspNetCore.Authorization
 @using System.ComponentModel.DataAnnotations
 
 @inject PropertyManagementService PropertyService
+@inject ApplicationWorkflowService WorkflowService
 @inject NavigationManager Navigation
 @inject AuthenticationStateProvider AuthStateProvider
 @inject UserContextService UserContext
@@ -259,7 +261,7 @@
 
 @code {
     [Parameter]
-    public int ApplicationId { get; set; }
+    public Guid ApplicationId { get; set; }
 
     private RentalApplication? application;
     private LeaseOfferModel leaseModel = new();
@@ -267,14 +269,14 @@
     private bool isSubmitting = false;
     private string errorMessage = string.Empty;
     private string userId = string.Empty;
-    private string organizationId = string.Empty;
+    private Guid organizationId = Guid.Empty;
 
     protected override async Task OnInitializedAsync()
     {
         try
         {
             userId = await UserContext.GetUserIdAsync() ?? string.Empty;
-            organizationId = await UserContext.GetActiveOrganizationIdAsync() ?? string.Empty;
+            organizationId = await UserContext.GetActiveOrganizationIdAsync() ?? Guid.Empty;
 
             await LoadApplication();
         }
@@ -326,58 +328,28 @@
                 return;
             }
 
-            // Create the lease offer
-            var leaseOffer = new LeaseOffer
+            // Use workflow service to generate lease offer
+            var offerModel = new Aquiis.SimpleStart.Application.Services.Workflows.LeaseOfferModel
             {
-                OrganizationId = organizationId,
-                RentalApplicationId = application.Id,
-                PropertyId = application.PropertyId,
-                ProspectiveTenantId = application.ProspectiveTenantId,
                 StartDate = leaseModel.StartDate,
                 EndDate = leaseModel.EndDate,
                 MonthlyRent = leaseModel.MonthlyRent,
                 SecurityDeposit = leaseModel.SecurityDeposit,
                 Terms = leaseModel.Terms,
-                Notes = leaseModel.Notes ?? string.Empty,
-                Status = "Pending",
-                OfferedOn = DateTime.UtcNow,
-                ExpiresOn = DateTime.UtcNow.AddDays(30), // 30-day expiration
-                CreatedOn = DateTime.UtcNow,
-                CreatedBy = userId
+                Notes = leaseModel.Notes
             };
 
-            var createdOffer = await PropertyService.CreateLeaseOfferAsync(leaseOffer);
+            var result = await WorkflowService.GenerateLeaseOfferAsync(application.Id, offerModel);
 
-            if (createdOffer == null)
+            if (result.Success)
             {
-                errorMessage = "Failed to create lease offer.";
-                return;
-            }
-
-            // Update property status to LeasePending
-            var property = await PropertyService.GetPropertyByIdAsync(application.PropertyId);
-            if (property != null)
-            {
-                property.Status = ApplicationConstants.PropertyStatuses.LeasePending;
-                await PropertyService.UpdatePropertyAsync(property);
+                ToastService.ShowSuccess("Lease offer generated successfully!");
+                Navigation.NavigateTo($"/propertymanagement/leaseoffers/view/{result.Data!.Id}");
             }
-
-            // Update application status
-            application.Status = "LeaseOffered"; // We'll need to add this status
-            await PropertyService.UpdateRentalApplicationAsync(application);
-
-            // Update prospect status
-            if (application.ProspectiveTenant != null)
+            else
             {
-                application.ProspectiveTenant.Status = "LeaseOffered"; // We'll need to add this status
-                await PropertyService.UpdateProspectiveTenantAsync(application.ProspectiveTenant);
+                errorMessage = string.Join(", ", result.Errors);
             }
-
-            // Auto-deny all other pending applications for this property
-            await DenyCompetingApplications(application.PropertyId, application.Id);
-
-            ToastService.ShowSuccess("Lease offer generated successfully!");
-            Navigation.NavigateTo($"/propertymanagement/leaseoffers/view/{createdOffer.Id}");
         }
         catch (Exception ex)
         {
@@ -391,28 +363,8 @@
 
     private async Task DenyCompetingApplications(int propertyId, int currentApplicationId)
     {
-        try
-        {
-            var allApplications = await PropertyService.GetAllRentalApplicationsAsync();
-            var competingApps = allApplications.Where(a => 
-                a.PropertyId == propertyId && 
-                a.Id != currentApplicationId &&
-                (a.Status == ApplicationConstants.ApplicationStatuses.Submitted ||
-                 a.Status == ApplicationConstants.ApplicationStatuses.UnderReview ||
-                 a.Status == ApplicationConstants.ApplicationStatuses.Screening)).ToList();
-
-            foreach (var app in competingApps)
-            {
-                await PropertyService.DenyApplicationAsync(
-                    app.Id,
-                    "Property is no longer available - lease offered to another applicant");
-            }
-        }
-        catch (Exception ex)
-        {
-            // Log but don't fail the main operation
-            Console.WriteLine($"Error denying competing applications: {ex.Message}");
-        }
+        // This method is no longer needed - workflow service handles it automatically
+        await Task.CompletedTask;
     }
 
     private string GetDefaultLeaseTerms()
diff --git a/Aquiis.SimpleStart/Features/PropertyManagement/Applications/Pages/ProspectiveTenants.razor b/Aquiis.SimpleStart/Features/PropertyManagement/Applications/Pages/ProspectiveTenants.razor
index 799ecf1..5a92252 100644
--- a/Aquiis.SimpleStart/Features/PropertyManagement/Applications/Pages/ProspectiveTenants.razor
+++ b/Aquiis.SimpleStart/Features/PropertyManagement/Applications/Pages/ProspectiveTenants.razor
@@ -290,7 +290,7 @@
         try
         {
             var organizationId = await UserContext.GetActiveOrganizationIdAsync();
-            if (!string.IsNullOrEmpty(organizationId))
+            if (organizationId.HasValue && organizationId != Guid.Empty)
             {
                 prospects = await PropertyService.GetAllProspectiveTenantsAsync();
                 
@@ -300,6 +300,10 @@
                 var allProperties = await PropertyService.GetPropertiesAsync();
                 properties = allProperties.Where(p => p.IsAvailable).ToList();
             }
+            else
+            {
+                ToastService.ShowError("Organization context not available");
+            }
         }
         catch (Exception ex)
         {
@@ -330,7 +334,7 @@
             var organizationId = await UserContext.GetActiveOrganizationIdAsync();
             var userId = await UserContext.GetUserIdAsync();
 
-            if (string.IsNullOrEmpty(organizationId) || string.IsNullOrEmpty(userId))
+            if (!organizationId.HasValue || organizationId == Guid.Empty || string.IsNullOrEmpty(userId))
             {
                 ToastService.ShowError("User context not available");
                 return;
@@ -350,7 +354,7 @@
                 Notes = newProspect.Notes,
                 InterestedPropertyId = newProspect.InterestedPropertyId,
                 DesiredMoveInDate = newProspect.DesiredMoveInDate,
-                OrganizationId = organizationId,
+                OrganizationId = organizationId.Value,
             };
             
             await PropertyService.CreateProspectiveTenantAsync(prospect);
@@ -370,22 +374,22 @@
         filterStatus = status;
     }
 
-    private void ScheduleTour(int prospectId)
+    private void ScheduleTour(Guid prospectId)
     {
         Navigation.NavigateTo($"/PropertyManagement/Tours/Schedule/{prospectId}");
     }
 
-    private void BeginApplication(int prospectId)
+    private void BeginApplication(Guid prospectId)
     {
         Navigation.NavigateTo($"/propertymanagement/prospects/{prospectId}/submit-application");
     }
 
-    private void ViewDetails(int prospectId)
+    private void ViewDetails(Guid prospectId)
     {
         Navigation.NavigateTo($"/PropertyManagement/ProspectiveTenants/{prospectId}");
     }
 
-    private async Task DeleteProspect(int prospectId)
+    private async Task DeleteProspect(Guid prospectId)
     {
         // TODO: Add confirmation dialog in future sprint
         try
@@ -393,12 +397,16 @@
             var organizationId = await UserContext.GetActiveOrganizationIdAsync();
             var userId = await UserContext.GetUserIdAsync();
             
-            if (!string.IsNullOrEmpty(organizationId) && !string.IsNullOrEmpty(userId))
+            if (organizationId.HasValue && organizationId != Guid.Empty && !string.IsNullOrEmpty(userId))
             {
                 await PropertyService.DeleteProspectiveTenantAsync(prospectId);
                 ToastService.ShowSuccess("Prospect deleted successfully");
                 await LoadData();
             }
+            else
+            {
+                ToastService.ShowError("User context not available");
+            }
         }
         catch (Exception ex)
         {
@@ -458,7 +466,7 @@
         [StringLength(2000)]
         public string? Notes { get; set; }
 
-        public int? InterestedPropertyId { get; set; }
+        public Guid? InterestedPropertyId { get; set; }
 
         public DateTime? DesiredMoveInDate { get; set; }
     }
diff --git a/Aquiis.SimpleStart/Features/PropertyManagement/Applications/Pages/ReviewApplication.razor b/Aquiis.SimpleStart/Features/PropertyManagement/Applications/Pages/ReviewApplication.razor
index 8eb4bcc..ae1e428 100644
--- a/Aquiis.SimpleStart/Features/PropertyManagement/Applications/Pages/ReviewApplication.razor
+++ b/Aquiis.SimpleStart/Features/PropertyManagement/Applications/Pages/ReviewApplication.razor
@@ -1,14 +1,16 @@
-@page "/propertymanagement/applications/{ApplicationId:int}/review"
+@page "/propertymanagement/applications/{ApplicationId:guid}/review"
 
 @using Aquiis.SimpleStart.Core.Entities
 @using Aquiis.SimpleStart.Application.Services
 @using Aquiis.SimpleStart.Shared.Services
 @using Aquiis.SimpleStart.Application.Services.PdfGenerators
+@using Aquiis.SimpleStart.Application.Services.Workflows
 @using Aquiis.SimpleStart.Core.Constants
 @using Microsoft.AspNetCore.Authorization
 @using System.ComponentModel.DataAnnotations
 
 @inject PropertyManagementService PropertyService
+@inject ApplicationWorkflowService WorkflowService
 @inject NavigationManager Navigation
 @inject AuthenticationStateProvider AuthStateProvider
 @inject UserContextService UserContext
@@ -399,7 +401,9 @@
                                 <i class="bi bi-arrow-left me-2"></i>Back
                             </button>
                             <div>
-                                @if (application.Status == ApplicationConstants.ApplicationStatuses.Submitted && screening == null)
+                                @if ((application.Status == ApplicationConstants.ApplicationStatuses.Submitted || 
+                                      application.Status == ApplicationConstants.ApplicationStatuses.UnderReview) && 
+                                     screening == null && application.ApplicationFeePaid)
                                 {
                                     <button type="button" class="btn btn-info me-2" @onclick="InitiateScreening">
                                         <i class="bi bi-search me-2"></i>Initiate Screening
@@ -762,7 +766,7 @@
 
 @code {
     [Parameter]
-    public int ApplicationId { get; set; }
+    public Guid ApplicationId { get; set; }
 
     private RentalApplication? application;
     private ApplicationScreening? screening;
@@ -782,7 +786,7 @@
     private string denyReason = string.Empty;
     private string withdrawReason = string.Empty;
     private string userId = string.Empty;
-    private string organizationId = string.Empty;
+    private Guid organizationId = Guid.Empty;
     private FeePaymentModel feePaymentModel = new();
     private ScreeningDispositionModel backgroundCheckModel = new();
     private ScreeningDispositionModel creditCheckModel = new();
@@ -793,7 +797,7 @@
         {
             var authState = await AuthStateProvider.GetAuthenticationStateAsync();
             userId = authState.User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value ?? string.Empty;
-            organizationId = await UserContext.GetActiveOrganizationIdAsync() ?? string.Empty;
+            organizationId = await UserContext.GetActiveOrganizationIdAsync() ?? Guid.Empty;
 
             await LoadApplication();
         }
@@ -830,23 +834,19 @@
 
         try
         {
-            var newScreening = new ApplicationScreening
-            {
-                RentalApplicationId = ApplicationId,
-                BackgroundCheckRequested = true,
-                BackgroundCheckRequestedOn = DateTime.UtcNow,
-                CreditCheckRequested = true,
-                CreditCheckRequestedOn = DateTime.UtcNow,
-                OverallResult = ApplicationConstants.ScreeningResults.Pending,
-                OrganizationId = organizationId,
-                CreatedOn = DateTime.UtcNow,
-                CreatedBy = userId
-            };
-
-            screening = await PropertyService.CreateScreeningAsync(newScreening);
-            successMessage = "Screening initiated successfully! Background and credit checks have been requested.";
+            // Request both background and credit checks by default
+            var result = await WorkflowService.InitiateScreeningAsync(ApplicationId, true, true);
             
-            await LoadApplication();
+            if (result.Success)
+            {
+                screening = result.Data;
+                successMessage = "Screening initiated successfully! Background and credit checks have been requested.";
+                await LoadApplication();
+            }
+            else
+            {
+                errorMessage = string.Join(", ", result.Errors);
+            }
         }
         catch (Exception ex)
         {
@@ -867,16 +867,16 @@
 
         try
         {
-            var result = await PropertyService.ApproveApplicationAsync(ApplicationId);
+            var result = await WorkflowService.ApproveApplicationAsync(ApplicationId);
             
-            if (result)
+            if (result.Success)
             {
                 ToastService.ShowSuccess("Application approved! You can now generate a lease offer.");
                 Navigation.NavigateTo($"/propertymanagement/applications/{ApplicationId}/generate-lease-offer");
             }
             else
             {
-                errorMessage = "Failed to approve application.";
+                errorMessage = string.Join(", ", result.Errors);
             }
         }
         catch (Exception ex)
@@ -898,9 +898,9 @@
 
         try
         {
-            var result = await PropertyService.DenyApplicationAsync(ApplicationId, denyReason);
+            var result = await WorkflowService.DenyApplicationAsync(ApplicationId, denyReason);
             
-            if (result)
+            if (result.Success)
             {
                 ToastService.ShowInfo("Application denied.");
                 showDenyModal = false;
@@ -908,7 +908,7 @@
             }
             else
             {
-                errorMessage = "Failed to deny application.";
+                errorMessage = string.Join(", ", result.Errors);
             }
         }
         catch (Exception ex)
@@ -930,9 +930,9 @@
 
         try
         {
-            var result = await PropertyService.WithdrawApplicationAsync(ApplicationId, withdrawReason);
+            var result = await WorkflowService.WithdrawApplicationAsync(ApplicationId, withdrawReason ?? "Withdrawn by applicant");
             
-            if (result)
+            if (result.Success)
             {
                 ToastService.ShowInfo("Application withdrawn.");
                 showWithdrawModal = false;
@@ -940,7 +940,7 @@
             }
             else
             {
-                errorMessage = "Failed to withdraw application.";
+                errorMessage = string.Join(", ", result.Errors);
             }
         }
         catch (Exception ex)
@@ -966,6 +966,12 @@
             application.ApplicationFeePaid = true;
             application.ApplicationFeePaidOn = feePaymentModel.PaymentDate;
             application.ApplicationFeePaymentMethod = feePaymentModel.PaymentMethod;
+            
+            // Transition to UnderReview status once fee is paid
+            if (application.Status == ApplicationConstants.ApplicationStatuses.Submitted)
+            {
+                application.Status = ApplicationConstants.ApplicationStatuses.UnderReview;
+            }
 
             await PropertyService.UpdateRentalApplicationAsync(application);
 
diff --git a/Aquiis.SimpleStart/Features/PropertyManagement/Applications/Pages/ScheduleTour.razor b/Aquiis.SimpleStart/Features/PropertyManagement/Applications/Pages/ScheduleTour.razor
index caf0d12..951c474 100644
--- a/Aquiis.SimpleStart/Features/PropertyManagement/Applications/Pages/ScheduleTour.razor
+++ b/Aquiis.SimpleStart/Features/PropertyManagement/Applications/Pages/ScheduleTour.razor
@@ -1,4 +1,4 @@
-@page "/PropertyManagement/Tours/Schedule/{ProspectId:int}"
+@page "/PropertyManagement/Tours/Schedule/{ProspectId:guid}"
 
 @using Aquiis.SimpleStart.Core.Entities
 @using Aquiis.SimpleStart.Application.Services
@@ -182,7 +182,7 @@
 
 @code {
     [Parameter]
-    public int ProspectId { get; set; }
+    public Guid ProspectId { get; set; }
 
     private ProspectiveTenant? prospect;
     private List<Aquiis.SimpleStart.Core.Entities.Property> availableProperties = new();
@@ -202,7 +202,7 @@
         try
         {
             var organizationId = await UserContext.GetActiveOrganizationIdAsync();
-            if (!string.IsNullOrEmpty(organizationId))
+            if (organizationId.HasValue)
             {
                 prospect = await PropertyService.GetProspectiveTenantByIdAsync(ProspectId);
                 
@@ -233,10 +233,10 @@
                     newTour = new TourViewModel
                     {
                         ProspectiveTenantId = ProspectId,
-                        PropertyId = prospect.InterestedPropertyId ?? 0,
+                        PropertyId = prospect.InterestedPropertyId ?? Guid.Empty,
                         ScheduledOn = DateTime.Now.AddDays(1).Date.AddHours(10), // Default to tomorrow at 10 AM
                         DurationMinutes = 30,
-                        ChecklistTemplateId = tourTemplates.FirstOrDefault(t => t.IsSystemTemplate && t.Name == "Property Tour")?.Id ?? tourTemplates.FirstOrDefault()?.Id ?? 0
+                        ChecklistTemplateId = tourTemplates.FirstOrDefault(t => t.IsSystemTemplate && t.Name == "Property Tour")?.Id ?? tourTemplates.FirstOrDefault()?.Id
                     };
                 }
             }
@@ -255,13 +255,13 @@
     {
         try
         {
-            if (newTour.PropertyId == 0)
+            if (newTour.PropertyId == Guid.Empty)
             {
                 ToastService.ShowError("Please select a property");
                 return;
             }
 
-            if (newTour.ChecklistTemplateId == 0)
+            if (!newTour.ChecklistTemplateId.HasValue || newTour.ChecklistTemplateId.Value == Guid.Empty)
             {
                 ToastService.ShowError("Please select a checklist template");
                 return;
@@ -270,7 +270,7 @@
             var organizationId = await UserContext.GetActiveOrganizationIdAsync();
             var userId = await UserContext.GetUserIdAsync();
 
-            if (string.IsNullOrEmpty(organizationId) || string.IsNullOrEmpty(userId))
+            if (!organizationId.HasValue || string.IsNullOrEmpty(userId))
             {
                 ToastService.ShowError("User context not available");
                 return;
@@ -283,7 +283,7 @@
                 PropertyId = newTour.PropertyId,
                 ScheduledOn = newTour.ScheduledOn,
                 DurationMinutes = newTour.DurationMinutes,
-                OrganizationId = organizationId,
+                OrganizationId = organizationId.Value,
                 CreatedBy = userId
             };
             
@@ -306,10 +306,10 @@
     public class TourViewModel
     {
         [Required]
-        public int ProspectiveTenantId { get; set; }
+        public Guid ProspectiveTenantId { get; set; }
 
         [Required(ErrorMessage = "Property is required")]
-        public int PropertyId { get; set; }
+        public Guid PropertyId { get; set; }
 
         [Required(ErrorMessage = "Date and time is required")]
         public DateTime ScheduledOn { get; set; }
@@ -319,6 +319,6 @@
         public int DurationMinutes { get; set; }
 
         [Required(ErrorMessage = "Checklist template is required")]
-        public int ChecklistTemplateId { get; set; }
+        public Guid? ChecklistTemplateId { get; set; }
     }
 }
diff --git a/Aquiis.SimpleStart/Features/PropertyManagement/Applications/Pages/SubmitApplication.razor b/Aquiis.SimpleStart/Features/PropertyManagement/Applications/Pages/SubmitApplication.razor
index 0d796c7..19e4362 100644
--- a/Aquiis.SimpleStart/Features/PropertyManagement/Applications/Pages/SubmitApplication.razor
+++ b/Aquiis.SimpleStart/Features/PropertyManagement/Applications/Pages/SubmitApplication.razor
@@ -1,14 +1,17 @@
-@page "/propertymanagement/prospects/{ProspectId:int}/submit-application"
+@page "/propertymanagement/prospects/{ProspectId:guid}/submit-application"
 
 @using Aquiis.SimpleStart.Core.Entities
+@using Aquiis.SimpleStart.Core.Validation
 @using Aquiis.SimpleStart.Application.Services
 @using Aquiis.SimpleStart.Shared.Services
 @using Aquiis.SimpleStart.Application.Services.PdfGenerators
+@using Aquiis.SimpleStart.Application.Services.Workflows
 @using Aquiis.SimpleStart.Core.Constants
 @using Microsoft.AspNetCore.Authorization
 @using System.ComponentModel.DataAnnotations
 
 @inject PropertyManagementService PropertyService
+@inject ApplicationWorkflowService WorkflowService
 @inject NavigationManager Navigation
 @inject AuthenticationStateProvider AuthStateProvider
 @inject UserContextService UserContext
@@ -77,8 +80,9 @@
                             </div>
                         }
 
-                        <EditForm Model="applicationModel" OnValidSubmit="HandleSubmitApplication" FormName="submit-application">
+                        <EditForm Model="applicationModel" OnValidSubmit="HandleSubmitApplication">
                             <DataAnnotationsValidator />
+                            <ValidationSummary class="text-danger" />
 
                             <div class="mb-4">
                                 <h5 class="border-bottom pb-2">Applicant Information</h5>
@@ -102,7 +106,7 @@
                                 <h5 class="border-bottom pb-2">Property Selection</h5>
                                 <div class="mb-3">
                                     <label class="form-label">Property *</label>
-                                    <InputSelect @bind-Value="applicationModel.PropertyId" class="form-select" @onchange="OnPropertyChanged">
+                                    <InputSelect @bind-Value="applicationModel.PropertyId" @bind-Value:after="UpdateSelectedProperty" class="form-select">
                                         <option value="0">Select a property...</option>
                                         @foreach (var property in availableProperties)
                                         {
@@ -359,7 +363,7 @@
 
 @code {
     [Parameter]
-    public int ProspectId { get; set; }
+    public Guid ProspectId { get; set; }
 
     private ProspectiveTenant? prospect;
     private RentalApplication? existingApplication;
@@ -372,7 +376,7 @@
     private decimal applicationFee = 50.00m;
     private string errorMessage = string.Empty;
     private string userId = string.Empty;
-    private string organizationId = string.Empty;
+    private Guid organizationId = Guid.Empty;
 
     protected override async Task OnInitializedAsync()
     {
@@ -380,7 +384,7 @@
         {
             var authState = await AuthStateProvider.GetAuthenticationStateAsync();
             userId = authState.User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value ?? string.Empty;
-            organizationId = await UserContext.GetActiveOrganizationIdAsync() ?? string.Empty;
+            organizationId = await UserContext.GetActiveOrganizationIdAsync() ?? Guid.Empty;
 
             await LoadData();
         }
@@ -426,37 +430,55 @@
         }
     }
 
+    private void UpdateSelectedProperty()
+    {
+        if (applicationModel.PropertyId != Guid.Empty)
+        {
+            selectedProperty = availableProperties.FirstOrDefault(p => p.Id == applicationModel.PropertyId);
+        }
+        else
+        {
+            selectedProperty = null;
+        }
+    }
+
     private async Task OnPropertyChanged(ChangeEventArgs e)
     {
-        if (int.TryParse(e.Value?.ToString(), out int propertyId) && propertyId > 0)
+        if (Guid.TryParse(e.Value?.ToString(), out Guid propertyId) && propertyId != Guid.Empty)
         {
+            applicationModel.PropertyId = propertyId;
             selectedProperty = availableProperties.FirstOrDefault(p => p.Id == propertyId);
         }
         else
         {
+            applicationModel.PropertyId = Guid.Empty;
             selectedProperty = null;
         }
         StateHasChanged();
         await Task.CompletedTask;
-
     }
 
     private async Task HandleSubmitApplication()
     {
-        if (prospect == null || selectedProperty == null) return;
+        Console.WriteLine("HandleSubmitApplication called");
+        
+        if (prospect == null || selectedProperty == null)
+        {
+            errorMessage = prospect == null ? "Prospect not found" : "Please select a property";
+            Console.WriteLine($"Validation failed: {errorMessage}");
+            return;
+        }
 
         isSubmitting = true;
         errorMessage = string.Empty;
 
         try
         {
-            var application = new RentalApplication
+            Console.WriteLine($"Submitting application for prospect {ProspectId}, property {applicationModel.PropertyId}");
+            
+            // Use ApplicationWorkflowService to submit application
+            var submissionModel = new Aquiis.SimpleStart.Application.Services.Workflows.ApplicationSubmissionModel
             {
-                ProspectiveTenantId = ProspectId,
-                PropertyId = applicationModel.PropertyId,
-                AppliedOn = DateTime.UtcNow,
-                Status = ApplicationConstants.ApplicationStatuses.Submitted,
-                
                 // Current Address
                 CurrentAddress = applicationModel.CurrentAddress,
                 CurrentCity = applicationModel.CurrentCity,
@@ -482,20 +504,30 @@
                 
                 // Fees
                 ApplicationFee = applicationFee,
-                ApplicationFeePaid = false, // Will be paid separately
-                
-                OrganizationId = organizationId
-                
+                ApplicationFeePaid = false // Will be paid separately
             };
 
-            var createdApplication = await PropertyService.CreateRentalApplicationAsync(application);
+            var result = await WorkflowService.SubmitApplicationAsync(
+                ProspectId, 
+                applicationModel.PropertyId, 
+                submissionModel);
+
+            Console.WriteLine($"Workflow result: Success={result.Success}, Errors={string.Join(", ", result.Errors)}");
 
-            ToastService.ShowSuccess("Application submitted successfully! You will be notified once reviewed.");
-            Navigation.NavigateTo($"/PropertyManagement/ProspectiveTenants/{ProspectId}");
+            if (result.Success)
+            {
+                ToastService.ShowSuccess("Application submitted successfully! You will be notified once reviewed.");
+                Navigation.NavigateTo($"/PropertyManagement/ProspectiveTenants/{ProspectId}");
+            }
+            else
+            {
+                errorMessage = string.Join(", ", result.Errors);
+            }
         }
         catch (Exception ex)
         {
             errorMessage = $"Error submitting application: {ex.Message}";
+            Console.WriteLine($"Exception in HandleSubmitApplication: {ex}");
         }
         finally
         {
@@ -510,9 +542,8 @@
 
     public class ApplicationSubmissionModel
     {
-        [Required(ErrorMessage = "Please select a property")]
-        [Range(1, int.MaxValue, ErrorMessage = "Please select a property")]
-        public int PropertyId { get; set; }
+        [RequiredGuid(ErrorMessage = "Please select a property")]
+        public Guid PropertyId { get; set; }
 
         [Required]
         [StringLength(200)]
diff --git a/Aquiis.SimpleStart/Features/PropertyManagement/Applications/Pages/Tours.razor b/Aquiis.SimpleStart/Features/PropertyManagement/Applications/Pages/Tours.razor
index 1cf8091..96abbee 100644
--- a/Aquiis.SimpleStart/Features/PropertyManagement/Applications/Pages/Tours.razor
+++ b/Aquiis.SimpleStart/Features/PropertyManagement/Applications/Pages/Tours.razor
@@ -272,7 +272,7 @@
         try
         {
             var organizationId = await UserContext.GetActiveOrganizationIdAsync();
-            if (!string.IsNullOrEmpty(organizationId))
+            if (organizationId.HasValue)
             {
                 allTours = await PropertyService.GetAllToursAsync();
                 upcomingTours = await PropertyService.GetUpcomingToursAsync(7);
@@ -303,12 +303,12 @@
         Navigation.NavigateTo("/PropertyManagement/Tours/Calendar");
     }
 
-    private async Task MarkCompleted(int tourId)
+    private async Task MarkCompleted(Guid tourId)
     {
         try
         {
             var organizationId = await UserContext.GetActiveOrganizationIdAsync();
-            if (!string.IsNullOrEmpty(organizationId))
+            if (organizationId.HasValue)
             {
                 var tour = await PropertyService.GetTourByIdAsync(tourId);
                 if (tour != null)
@@ -331,14 +331,14 @@
         }
     }
 
-    private async Task CancelTour(int tourId)
+    private async Task CancelTour(Guid tourId)
     {
         // TODO: Add confirmation dialog in future sprint
         try
         {
             var organizationId = await UserContext.GetActiveOrganizationIdAsync();
             var userId = await UserContext.GetUserIdAsync();
-            if (!string.IsNullOrEmpty(organizationId))
+            if (organizationId.HasValue)
             {
                 await PropertyService.CancelTourAsync(tourId);
                 
@@ -352,7 +352,7 @@
         }
     }
 
-    private void ViewFeedback(int showingId)
+    private void ViewFeedback(Guid showingId)
     {
         Navigation.NavigateTo($"/PropertyManagement/Showings/Feedback/{showingId}");
     }
@@ -390,7 +390,7 @@
         _ => "bg-secondary"
     };
 
-    private void ViewTourChecklist(int checklistId)
+    private void ViewTourChecklist(Guid checklistId)
     {
         Navigation.NavigateTo($"/PropertyManagement/Checklists/View/{checklistId}");
     }
diff --git a/Aquiis.SimpleStart/Features/PropertyManagement/Applications/Pages/ToursCalendar.razor b/Aquiis.SimpleStart/Features/PropertyManagement/Applications/Pages/ToursCalendar.razor
index 1a6f6d9..14eebed 100644
--- a/Aquiis.SimpleStart/Features/PropertyManagement/Applications/Pages/ToursCalendar.razor
+++ b/Aquiis.SimpleStart/Features/PropertyManagement/Applications/Pages/ToursCalendar.razor
@@ -207,7 +207,7 @@
         try
         {
             var organizationId = await UserContext.GetActiveOrganizationIdAsync();
-            if (!string.IsNullOrEmpty(organizationId))
+            if (organizationId.HasValue)
             {
                 allTours = await PropertyService.GetAllToursAsync();
             }
@@ -562,12 +562,12 @@
         selectedTour = null;
     }
 
-    private async Task MarkCompleted(int tourId)
+    private async Task MarkCompleted(Guid tourId)
     {
         try
         {
             var organizationId = await UserContext.GetActiveOrganizationIdAsync();
-            if (!string.IsNullOrEmpty(organizationId))
+            if (organizationId.HasValue)
             {
                 var tour = await PropertyService.GetTourByIdAsync(tourId);
                 if (tour != null)
@@ -590,14 +590,14 @@
         }
     }
 
-    private async Task CancelTour(int tourId)
+    private async Task CancelTour(Guid tourId)
     {
         try
         {
             var organizationId = await UserContext.GetActiveOrganizationIdAsync();
             var userId = await UserContext.GetUserIdAsync();
             
-            if (!string.IsNullOrEmpty(organizationId) && !string.IsNullOrEmpty(userId))
+            if (organizationId.HasValue && !string.IsNullOrEmpty(userId))
             {
                 await PropertyService.CancelTourAsync(tourId);
                 ToastService.ShowSuccess("Tour cancelled successfully");
diff --git a/Aquiis.SimpleStart/Features/PropertyManagement/Applications/Pages/ViewProspectiveTenant.razor b/Aquiis.SimpleStart/Features/PropertyManagement/Applications/Pages/ViewProspectiveTenant.razor
index a023e39..1f89a0b 100644
--- a/Aquiis.SimpleStart/Features/PropertyManagement/Applications/Pages/ViewProspectiveTenant.razor
+++ b/Aquiis.SimpleStart/Features/PropertyManagement/Applications/Pages/ViewProspectiveTenant.razor
@@ -1,4 +1,4 @@
-@page "/PropertyManagement/ProspectiveTenants/{ProspectId:int}"
+@page "/PropertyManagement/ProspectiveTenants/{ProspectId:guid}"
 
 @using Aquiis.SimpleStart.Core.Entities
 @using Aquiis.SimpleStart.Application.Services
@@ -568,7 +568,7 @@
 
 @code {
     [Parameter]
-    public int ProspectId { get; set; }
+    public Guid ProspectId { get; set; }
 
     private ProspectiveTenant? prospect;
     private List<Tour> tours = new();
@@ -588,8 +588,8 @@
         loading = true;
         try
         {
-            var orgId = await UserContext.GetActiveOrganizationIdAsync();
-            if (!string.IsNullOrEmpty(orgId))
+            var organizationId = await UserContext.GetActiveOrganizationIdAsync();
+            if (organizationId.HasValue)
             {
                 prospect = await PropertyService.GetProspectiveTenantByIdAsync(ProspectId);
                 
@@ -659,7 +659,7 @@
             prospect.IdentificationState = editModel.IdentificationState;
             prospect.Source = editModel.Source;
             prospect.Notes = editModel.Notes;
-            prospect.InterestedPropertyId = int.TryParse(editModel.InterestedPropertyId, out var propId) && propId > 0 ? propId : null;
+            prospect.InterestedPropertyId = Guid.TryParse(editModel.InterestedPropertyId, out var propId) && propId != Guid.Empty ? propId : null;
             prospect.DesiredMoveInDate = editModel.DesiredMoveInDate;
 
             await PropertyService.UpdateProspectiveTenantAsync(prospect);
diff --git a/Aquiis.SimpleStart/Features/PropertyManagement/Calendar.razor b/Aquiis.SimpleStart/Features/PropertyManagement/Calendar.razor
index c86406e..48c6cdc 100644
--- a/Aquiis.SimpleStart/Features/PropertyManagement/Calendar.razor
+++ b/Aquiis.SimpleStart/Features/PropertyManagement/Calendar.razor
@@ -643,9 +643,9 @@
     {
         // Load filter defaults from settings
         var organizationId = await UserContext.GetActiveOrganizationIdAsync();
-        if (!string.IsNullOrEmpty(organizationId))
+        if (organizationId.HasValue)
         {
-            var settings = await CalendarSettingsService.GetSettingsAsync(organizationId);
+            var settings = await CalendarSettingsService.GetSettingsAsync(organizationId.Value);
             selectedEventTypes = settings
                 .Where(s => s.ShowOnCalendar)
                 .Select(s => s.EntityType)
@@ -667,7 +667,7 @@
         try
         {
             var organizationId = await UserContext.GetActiveOrganizationIdAsync();
-            if (!string.IsNullOrEmpty(organizationId))
+            if (organizationId.HasValue)
             {
                 // Get date range based on current view
                 var (startDate, endDate) = viewMode switch
@@ -741,7 +741,7 @@
             Icon = "bi-calendar-event",
             EventType = CalendarEventTypes.Custom,
             Status = "Scheduled",
-            OrganizationId = !string.IsNullOrEmpty(organizationId) ? organizationId : string.Empty,
+            OrganizationId = organizationId.HasValue ? organizationId.Value : Guid.Empty,
             CreatedBy = !string.IsNullOrEmpty(userId) ? userId : string.Empty,
             CreatedOn = DateTime.UtcNow
         };
@@ -1211,7 +1211,7 @@
         try
         {
             var organizationId = await UserContext.GetActiveOrganizationIdAsync();
-            if (string.IsNullOrEmpty(organizationId)) return;
+            if (!organizationId.HasValue) return;
 
             switch (calendarEvent.EventType)
             {
@@ -1248,7 +1248,7 @@
         }
     }
 
-    private async Task ShowTourDetailById(int tourId)
+    private async Task ShowTourDetailById(Guid tourId)
     {
         var tour = await PropertyService.GetTourByIdAsync(tourId);
         if (tour != null)
@@ -1261,7 +1261,7 @@
         }
     }
 
-    private async Task ShowInspectionDetailById(int inspectionId)
+    private async Task ShowInspectionDetailById(Guid inspectionId)
     {
         var inspection = await PropertyService.GetInspectionByIdAsync(inspectionId);
         if (inspection != null)
@@ -1274,7 +1274,7 @@
         }
     }
 
-    private async Task ShowMaintenanceRequestDetailById(int maintenanceId)
+    private async Task ShowMaintenanceRequestDetailById(Guid maintenanceId)
     {
         var maintenanceRequest = await PropertyService.GetMaintenanceRequestByIdAsync(maintenanceId);
         if (maintenanceRequest != null)
@@ -1336,12 +1336,12 @@
         Navigation.NavigateTo($"/PropertyManagement/Properties/View/{property.Id}");
     }
 
-    private async Task CompleteTour(int tourId)
+    private async Task CompleteTour(Guid tourId)
     {
         try
         {
             var organizationId = await UserContext.GetActiveOrganizationIdAsync();
-            if (!string.IsNullOrEmpty(organizationId))
+            if (organizationId.HasValue)
             {
                 var tour = await PropertyService.GetTourByIdAsync(tourId);
                 if (tour != null)
@@ -1364,14 +1364,14 @@
         }
     }
 
-    private async Task CancelTour(int tourId)
+    private async Task CancelTour(Guid tourId)
     {
         try
         {
             var organizationId = await UserContext.GetActiveOrganizationIdAsync();
             var userId = await UserContext.GetUserIdAsync();
             
-            if (!string.IsNullOrEmpty(organizationId) && !string.IsNullOrEmpty(userId))
+            if (organizationId.HasValue && !string.IsNullOrEmpty(userId))
             {
                 await PropertyService.CancelTourAsync(tourId);
                 ToastService.ShowSuccess("Tour cancelled successfully");
@@ -1385,14 +1385,14 @@
         }
     }
 
-    private async Task MarkTourAsNoShow(int tourId)
+    private async Task MarkTourAsNoShow(Guid tourId)
     {
         try
         {
             var organizationId = await UserContext.GetActiveOrganizationIdAsync();
             var userId = await UserContext.GetUserIdAsync();
             
-            if (!string.IsNullOrEmpty(organizationId) && !string.IsNullOrEmpty(userId))
+            if (organizationId.HasValue && !string.IsNullOrEmpty(userId))
             {
                 await PropertyService.MarkTourAsNoShowAsync(tourId);
                 ToastService.ShowSuccess("Tour marked as No Show");
@@ -1406,14 +1406,14 @@
         }
     }
 
-    private async Task StartWork(int maintenanceRequestId)
+    private async Task StartWork(Guid maintenanceRequestId)
     {
         try
         {
             var organizationId = await UserContext.GetActiveOrganizationIdAsync();
             var userId = await UserContext.GetUserIdAsync();
             
-            if (!string.IsNullOrEmpty(organizationId) && !string.IsNullOrEmpty(userId))
+            if (organizationId.HasValue && !string.IsNullOrEmpty(userId))
             {
                 var request = await PropertyService.GetMaintenanceRequestByIdAsync(maintenanceRequestId);
                 if (request != null)
@@ -1436,14 +1436,14 @@
         }
     }
 
-    private async Task CompleteMaintenanceRequest(int maintenanceRequestId)
+    private async Task CompleteMaintenanceRequest(Guid maintenanceRequestId)
     {
         try
         {
             var organizationId = await UserContext.GetActiveOrganizationIdAsync();
             var userId = await UserContext.GetUserIdAsync();
             
-            if (!string.IsNullOrEmpty(organizationId) && !string.IsNullOrEmpty(userId))
+            if (organizationId.HasValue && !string.IsNullOrEmpty(userId))
             {
                 var request = await PropertyService.GetMaintenanceRequestByIdAsync(maintenanceRequestId);
                 if (request != null)
@@ -1465,14 +1465,14 @@
         }
     }
 
-    private async Task CancelMaintenanceRequest(int maintenanceRequestId)
+    private async Task CancelMaintenanceRequest(Guid maintenanceRequestId)
     {
         try
         {
             var organizationId = await UserContext.GetActiveOrganizationIdAsync();
             var userId = await UserContext.GetUserIdAsync();
             
-            if (!string.IsNullOrEmpty(organizationId) && !string.IsNullOrEmpty(userId))
+            if (organizationId.HasValue && !string.IsNullOrEmpty(userId))
             {
                 var request = await PropertyService.GetMaintenanceRequestByIdAsync(maintenanceRequestId);
                 if (request != null)
@@ -1492,14 +1492,14 @@
         }
     }
 
-    private async Task UpdateCustomEventStatus(int eventId, string newStatus)
+    private async Task UpdateCustomEventStatus(Guid eventId, string newStatus)
     {
         try
         {
             var organizationId = await UserContext.GetActiveOrganizationIdAsync();
             var userId = await UserContext.GetUserIdAsync();
             
-            if (string.IsNullOrEmpty(organizationId) || string.IsNullOrEmpty(userId))
+            if (!organizationId.HasValue || string.IsNullOrEmpty(userId))
             {
                 ToastService.ShowError("Unable to identify user or organization");
                 return;
@@ -1542,7 +1542,7 @@
         Navigation.NavigateTo("/PropertyManagement/Calendar/ListView");
     }
 
-    private void CompleteRoutineInspection(int propertyId)
+    private void CompleteRoutineInspection(Guid propertyId)
     {
         // Navigate to create new inspection form with the property pre-selected
         Navigation.NavigateTo($"/PropertyManagement/Inspections/Create?propertyId={propertyId}");
diff --git a/Aquiis.SimpleStart/Features/PropertyManagement/CalendarListView.razor b/Aquiis.SimpleStart/Features/PropertyManagement/CalendarListView.razor
index 32cb8b8..b5e66d7 100644
--- a/Aquiis.SimpleStart/Features/PropertyManagement/CalendarListView.razor
+++ b/Aquiis.SimpleStart/Features/PropertyManagement/CalendarListView.razor
@@ -542,7 +542,7 @@
         Navigation.NavigateTo("/PropertyManagement/Calendar");
     }
 
-    private void CompleteRoutineInspection(int propertyId)
+    private void CompleteRoutineInspection(Guid propertyId)
     {
         // Navigate to create new inspection form with the property pre-selected
         Navigation.NavigateTo($"/PropertyManagement/Inspections/Create?propertyId={propertyId}");
@@ -562,7 +562,7 @@
         try
         {
             var organizationId = await UserContext.GetActiveOrganizationIdAsync();
-            if (string.IsNullOrEmpty(organizationId)) return;
+            if (!organizationId.HasValue) return;
 
             switch (calendarEvent.EventType)
             {
@@ -599,7 +599,7 @@
         }
     }
 
-    private async Task ShowTourDetailById(int tourId)
+    private async Task ShowTourDetailById(Guid tourId)
     {
         var tour = await PropertyService.GetTourByIdAsync(tourId);
         if (tour != null)
@@ -612,7 +612,7 @@
         }
     }
 
-    private async Task ShowInspectionDetailById(int inspectionId)
+    private async Task ShowInspectionDetailById(Guid inspectionId)
     {
         var inspection = await PropertyService.GetInspectionByIdAsync(inspectionId);
         if (inspection != null)
@@ -625,7 +625,7 @@
         }
     }
 
-    private async Task ShowMaintenanceRequestDetailById(int maintenanceId)
+    private async Task ShowMaintenanceRequestDetailById(Guid maintenanceId)
     {
         var maintenanceRequest = await PropertyService.GetMaintenanceRequestByIdAsync(maintenanceId);
         if (maintenanceRequest != null)
@@ -684,12 +684,12 @@
         }
     }
 
-    private async Task CompleteTour(int tourId)
+    private async Task CompleteTour(Guid tourId)
     {
         try
         {
             var organizationId = await UserContext.GetActiveOrganizationIdAsync();
-            if (!string.IsNullOrEmpty(organizationId))
+            if (organizationId.HasValue)
             {
                 var tour = await PropertyService.GetTourByIdAsync(tourId);
                 if (tour != null)
@@ -712,14 +712,14 @@
         }
     }
 
-    private async Task CancelTour(int tourId)
+    private async Task CancelTour(Guid tourId)
     {
         try
         {
             var organizationId = await UserContext.GetActiveOrganizationIdAsync();
             var userId = await UserContext.GetUserIdAsync();
             
-            if (!string.IsNullOrEmpty(organizationId) && !string.IsNullOrEmpty(userId))
+            if (organizationId.HasValue && !string.IsNullOrEmpty(userId))
             {
                 await PropertyService.CancelTourAsync(tourId);
                 ToastService.ShowSuccess("Tour cancelled successfully");
@@ -733,14 +733,14 @@
         }
     }
 
-    private async Task MarkTourAsNoShow(int tourId)
+    private async Task MarkTourAsNoShow(Guid tourId)
     {
         try
         {
             var organizationId = await UserContext.GetActiveOrganizationIdAsync();
             var userId = await UserContext.GetUserIdAsync();
             
-            if (!string.IsNullOrEmpty(organizationId) && !string.IsNullOrEmpty(userId))
+            if (organizationId.HasValue && !string.IsNullOrEmpty(userId))
             {
                 await PropertyService.MarkTourAsNoShowAsync(tourId);
                 ToastService.ShowSuccess("Tour marked as No Show");
@@ -754,7 +754,7 @@
         }
     }
 
-    private async Task StartWork(int maintenanceRequestId)
+    private async Task StartWork(Guid maintenanceRequestId)
     {
         try
         {
@@ -776,14 +776,14 @@
         }
     }
 
-    private async Task CompleteMaintenanceRequest(int maintenanceRequestId)
+    private async Task CompleteMaintenanceRequest(Guid maintenanceRequestId)
     {
         try
         {
             var organizationId = await UserContext.GetActiveOrganizationIdAsync();
             var userId = await UserContext.GetUserIdAsync();
             
-            if (!string.IsNullOrEmpty(organizationId) && !string.IsNullOrEmpty(userId))
+            if (organizationId.HasValue && !string.IsNullOrEmpty(userId))
             {
                 var request = await PropertyService.GetMaintenanceRequestByIdAsync(maintenanceRequestId);
                 if (request != null)
@@ -804,14 +804,14 @@
         }
     }
 
-    private async Task CancelMaintenanceRequest(int maintenanceRequestId)
+    private async Task CancelMaintenanceRequest(Guid maintenanceRequestId)
     {
         try
         {
             var organizationId = await UserContext.GetActiveOrganizationIdAsync();
             var userId = await UserContext.GetUserIdAsync();
             
-            if (!string.IsNullOrEmpty(organizationId) && !string.IsNullOrEmpty(userId))
+            if (organizationId.HasValue && !string.IsNullOrEmpty(userId))
             {
                 var request = await PropertyService.GetMaintenanceRequestByIdAsync(maintenanceRequestId);
                 if (request != null)
diff --git a/Aquiis.SimpleStart/Features/PropertyManagement/Checklists/Pages/Checklists.razor b/Aquiis.SimpleStart/Features/PropertyManagement/Checklists/Pages/Checklists.razor
index 4a26d16..9a27bee 100644
--- a/Aquiis.SimpleStart/Features/PropertyManagement/Checklists/Pages/Checklists.razor
+++ b/Aquiis.SimpleStart/Features/PropertyManagement/Checklists/Pages/Checklists.razor
@@ -158,7 +158,7 @@
         }
     }
 
-    private void StartChecklist(int templateId)
+    private void StartChecklist(Guid templateId)
     {
         // Navigate to complete page with template ID - checklist will be created on save
         NavigationManager.NavigateTo($"/propertymanagement/checklists/complete/new?templateId={templateId}");
diff --git a/Aquiis.SimpleStart/Features/PropertyManagement/Checklists/Pages/Complete.razor b/Aquiis.SimpleStart/Features/PropertyManagement/Checklists/Pages/Complete.razor
index b4bd97c..2821e65 100644
--- a/Aquiis.SimpleStart/Features/PropertyManagement/Checklists/Pages/Complete.razor
+++ b/Aquiis.SimpleStart/Features/PropertyManagement/Checklists/Pages/Complete.razor
@@ -1,4 +1,4 @@
-@page "/propertymanagement/checklists/complete/{ChecklistId:int}"
+@page "/propertymanagement/checklists/complete/{ChecklistId:guid}"
 @page "/propertymanagement/checklists/complete/new"
 
 @using Aquiis.SimpleStart.Core.Entities
@@ -10,6 +10,7 @@
 @inject ChecklistService ChecklistService
 @inject PropertyManagementService PropertyManagementService
 @inject UserContextService UserContext
+@inject ToastService ToastService
 @inject NavigationManager NavigationManager
 @attribute [OrganizationAuthorize("Owner", "Administrator", "PropertyManager")]
 @rendermode InteractiveServer
@@ -85,13 +86,13 @@ else
                                             <option value="@lease.Id">@lease.Tenant?.FullName - @lease.StartDate.ToString("MM/dd/yyyy")</option>
                                         }
                                     </select>
-                                    @if (requiresLease && selectedLeaseId == 0)
+                                    @if (requiresLease && selectedLeaseId == Guid.Empty)
                                     {
                                         <small class="text-danger">This checklist type requires a lease selection</small>
                                     }
                                 </div>
                             </div>
-                            <button type="button" class="btn btn-primary" @onclick="AssignPropertyAndLease" disabled="@(selectedPropertyId == 0 || (requiresLease && selectedLeaseId == 0))">
+                            <button type="button" class="btn btn-primary" @onclick="AssignPropertyAndLease" disabled="@(selectedPropertyId == Guid.Empty || (requiresLease && selectedLeaseId == Guid.Empty))">
                                 <i class="bi bi-check"></i> Assign and Continue
                             </button>
                         </div>
@@ -223,7 +224,6 @@ else
                             </div>
                         </div>
                     }
-                    }
 
                     <!-- General Notes -->
                     <div class="card mb-3">
@@ -328,10 +328,10 @@ else
 
 @code {
     [Parameter]
-    public int ChecklistId { get; set; }
+    public Guid ChecklistId { get; set; }
 
     [SupplyParameterFromQuery(Name = "templateId")]
-    public int? TemplateId { get; set; }
+    public Guid? TemplateId { get; set; }
 
     private Checklist? checklist;
     private ChecklistTemplate? template;
@@ -339,24 +339,24 @@ else
     private List<Property> properties = new();
     private List<Lease> leases = new();
     private List<ChecklistItem> checklistItems = new();
-    private int selectedPropertyId = 0;
-    private int selectedLeaseId = 0;
+    private Guid selectedPropertyId = Guid.Empty;
+    private Guid selectedLeaseId = Guid.Empty;
     private bool requiresLease = false;
     private string? successMessage;
     private string? errorMessage;
     private bool isSaving = false;
-    private Dictionary<int, ChecklistItem> modifiedItems = new();
+    private Dictionary<Guid, ChecklistItem> modifiedItems = new();
 
     protected override async Task OnInitializedAsync()
     {
         await LoadProperties();
         
-        if (TemplateId.HasValue && TemplateId.Value > 0)
+        if (TemplateId.HasValue)
         {
             // New checklist from template
             await LoadTemplateForNewChecklist();
         }
-        else if (ChecklistId > 0)
+        else if (ChecklistId != Guid.Empty)
         {
             // Existing checklist
             await LoadChecklist();
@@ -382,11 +382,12 @@ else
             // Create a temporary checklist object (not saved to DB yet)
             checklist = new Checklist
             {
+                Id = Guid.NewGuid(),
                 Name = template.Name,
                 ChecklistType = template.Category,
                 ChecklistTemplateId = template.Id,
                 Status = ApplicationConstants.ChecklistStatuses.Draft,
-                OrganizationId = organizationId!,
+                OrganizationId = organizationId!.Value,
                 CreatedBy = userId!,
                 CreatedOn = DateTime.UtcNow
             };
@@ -394,13 +395,14 @@ else
             // Copy template items to working list
             checklistItems = template.Items.Select(ti => new ChecklistItem
             {
+                Id = Guid.NewGuid(),
                 ItemText = ti.ItemText,
                 ItemOrder = ti.ItemOrder,
                 CategorySection = ti.CategorySection,
                 SectionOrder = ti.SectionOrder,
                 RequiresValue = ti.RequiresValue,
                 IsChecked = false,
-                OrganizationId = organizationId!
+                OrganizationId = organizationId!.Value,
             }).ToList();
 
             // Set Items collection for display
@@ -457,14 +459,14 @@ else
 
     private async Task OnPropertyChanged()
     {
-        if (selectedPropertyId > 0)
+        if (selectedPropertyId != Guid.Empty)
         {
             leases = await PropertyManagementService.GetActiveLeasesByPropertyIdAsync(selectedPropertyId);
         }
         else
         {
             leases.Clear();
-            selectedLeaseId = 0;
+            selectedLeaseId = Guid.Empty;
         }
     }
 
@@ -477,12 +479,31 @@ else
             isSaving = true;
             errorMessage = null;
 
-            checklist.PropertyId = selectedPropertyId;
-            checklist.LeaseId = selectedLeaseId > 0 ? selectedLeaseId : null;
+            checklist.PropertyId = selectedPropertyId != Guid.Empty ? selectedPropertyId : null;
+            checklist.LeaseId = selectedLeaseId != Guid.Empty ? selectedLeaseId : null;
+
+            if (isNewChecklist)
+            {
+                // Create the checklist and persist items
+                var savedChecklist = await ChecklistService.AddChecklistAsync(checklist);
+
+                // Add any in-memory items to the database
+                foreach (var item in checklistItems)
+                {
+                    item.ChecklistId = savedChecklist.Id;
+                    await ChecklistService.AddChecklistItemAsync(item);
+                }
+
+                ChecklistId = savedChecklist.Id;
+                isNewChecklist = false;
+            }
+            else
+            {
+                await ChecklistService.UpdateChecklistAsync(checklist);
+            }
 
-            await ChecklistService.UpdateChecklistAsync(checklist);
             await LoadChecklist(); // Reload to get navigation properties
-            
+
             successMessage = "Property and lease assigned successfully.";
         }
         catch (Exception ex)
@@ -622,7 +643,8 @@ else
         }
         catch (Exception ex)
         {
-            errorMessage = $"Error saving progress: {ex.Message}";
+            errorMessage = $"Error saving progress: {$"{ex.Message} - {ex.InnerException?.Message}"}";
+            ToastService.ShowError(errorMessage);
         }
         finally
         {
@@ -677,7 +699,8 @@ else
         }
         catch (Exception ex)
         {
-            errorMessage = $"Error completing checklist: {ex.Message}";
+            errorMessage = $"Error completing checklist: {$"{ex.Message} - {ex.InnerException?.Message}"}";
+            ToastService.ShowError(errorMessage);
             isSaving = false;
         }
     }
diff --git a/Aquiis.SimpleStart/Features/PropertyManagement/Checklists/Pages/Create.razor b/Aquiis.SimpleStart/Features/PropertyManagement/Checklists/Pages/Create.razor
index 2bd9a40..4dd0971 100644
--- a/Aquiis.SimpleStart/Features/PropertyManagement/Checklists/Pages/Create.razor
+++ b/Aquiis.SimpleStart/Features/PropertyManagement/Checklists/Pages/Create.razor
@@ -69,8 +69,8 @@
                                 <div class="col-md-6 mb-3">
                                     <label class="form-label">Template</label>
                                     <select class="form-select" @bind="selectedTemplateId" @bind:after="OnTemplateChanged" required>
-                                        <option value="0">Select a template...</option>
-                                        <option value="-1">Manage Templates</option>
+                                        <option value="@Guid.Empty">Select a template...</option>
+                                        <option value="@Guid.Empty + 1)">Manage Templates</option>
                                         @foreach (var template in templates)
                                         {
                                             <option value="@template.Id">@template.Name</option>
@@ -91,7 +91,7 @@
                     </div>
 
                     <!-- Checklist Items -->
-                    @if (!checklistItems.Any() && selectedTemplateId > 0)
+                    @if (!checklistItems.Any() && selectedTemplateId != Guid.Empty)
                     {
                         <div class="card mb-3">
                             <div class="card-body text-center py-5">
@@ -211,7 +211,7 @@
     private List<ChecklistTemplate> templates = new();
     private List<ChecklistItem> checklistItems = new();
     
-    private int selectedTemplateId = 0;
+    private Guid selectedTemplateId = Guid.Empty;
     private ChecklistTemplate? selectedTemplate;
     private bool loading = true;
     private bool isSaving = false;
@@ -219,7 +219,7 @@
     private string? successMessage;
 
     [SupplyParameterFromQuery(Name = "templateId")]
-    public int? TemplateIdFromQuery { get; set; }
+    public Guid? TemplateIdFromQuery { get; set; }
 
     protected override async Task OnInitializedAsync()
     {
@@ -261,14 +261,14 @@
 
     private async Task OnTemplateChanged()
     {
-        if (selectedTemplateId == 0)
+        if (selectedTemplateId == Guid.Empty)
         {
             selectedTemplate = null;
             checklistItems.Clear();
             return;
         }
 
-        if (selectedTemplateId == -1)
+        if (selectedTemplateId.ToString() == (Guid.Empty + "1").ToString()) // Manage Templates option
         {
             NavigationManager.NavigateTo("/propertymanagement/checklists/templates");
             return;
@@ -284,6 +284,7 @@
             // Copy template items to checklist items
             checklistItems = selectedTemplate.Items.Select(ti => new ChecklistItem
             {
+                Id = Guid.NewGuid(),
                 ItemText = ti.ItemText,
                 ItemOrder = ti.ItemOrder,
                 CategorySection = ti.CategorySection,
@@ -300,6 +301,7 @@
         var maxSectionOrder = checklistItems.Any() ? checklistItems.Max(i => i.SectionOrder) : 0;
         checklistItems.Add(new ChecklistItem
         {
+            Id = Guid.NewGuid(),
             ItemText = "",
             ItemOrder = maxOrder + 1,
             CategorySection = "Custom",
diff --git a/Aquiis.SimpleStart/Features/PropertyManagement/Checklists/Pages/EditTemplate.razor b/Aquiis.SimpleStart/Features/PropertyManagement/Checklists/Pages/EditTemplate.razor
index b4df743..00a57ea 100644
--- a/Aquiis.SimpleStart/Features/PropertyManagement/Checklists/Pages/EditTemplate.razor
+++ b/Aquiis.SimpleStart/Features/PropertyManagement/Checklists/Pages/EditTemplate.razor
@@ -1,4 +1,4 @@
-@page "/propertymanagement/checklists/templates/edit/{TemplateId:int}"
+@page "/propertymanagement/checklists/templates/edit/{TemplateId:guid}"
 
 @using Aquiis.SimpleStart.Core.Entities
 @using Aquiis.SimpleStart.Application.Services
@@ -219,11 +219,11 @@
 
 @code {
     [Parameter]
-    public int TemplateId { get; set; }
+    public Guid TemplateId { get; set; }
 
     private ChecklistTemplate? template;
     private List<ChecklistTemplateItem> templateItems = new();
-    private List<int> deletedItemIds = new();
+    private List<Guid> deletedItemIds = new();
     
     private bool loading = true;
     private bool isSaving = false;
@@ -278,7 +278,7 @@
     private void RemoveItem(ChecklistTemplateItem item)
     {
         // Track deleted items that exist in database
-        if (item.Id > 0)
+        if (item.Id != Guid.Empty)
         {
             deletedItemIds.Add(item.Id);
         }
@@ -305,8 +305,8 @@
             deletedItemIds.Clear();
 
             // Process items: separate new items from existing ones
-            var existingItems = templateItems.Where(i => i.Id > 0).ToList();
-            var newItems = templateItems.Where(i => i.Id == 0).ToList();
+            var existingItems = templateItems.Where(i => i.Id != Guid.Empty).ToList();
+            var newItems = templateItems.Where(i => i.Id == Guid.Empty).ToList();
 
             // Update existing items
             foreach (var item in existingItems)
diff --git a/Aquiis.SimpleStart/Features/PropertyManagement/Checklists/Pages/MyChecklists.razor b/Aquiis.SimpleStart/Features/PropertyManagement/Checklists/Pages/MyChecklists.razor
index c13278d..25c3379 100644
--- a/Aquiis.SimpleStart/Features/PropertyManagement/Checklists/Pages/MyChecklists.razor
+++ b/Aquiis.SimpleStart/Features/PropertyManagement/Checklists/Pages/MyChecklists.razor
@@ -300,12 +300,12 @@
         NavigationManager.NavigateTo("/propertymanagement/checklists/create");
     }
 
-    private void EditChecklist(int checklistId)
+    private void EditChecklist(Guid checklistId)
     {
         NavigationManager.NavigateTo($"/propertymanagement/checklists/complete/{checklistId}");
     }
 
-    private void ViewChecklist(int checklistId)
+    private void ViewChecklist(Guid checklistId)
     {
         NavigationManager.NavigateTo($"/propertymanagement/checklists/view/{checklistId}");
     }
diff --git a/Aquiis.SimpleStart/Features/PropertyManagement/Checklists/Pages/Templates.razor b/Aquiis.SimpleStart/Features/PropertyManagement/Checklists/Pages/Templates.razor
index 5d527c1..697368f 100644
--- a/Aquiis.SimpleStart/Features/PropertyManagement/Checklists/Pages/Templates.razor
+++ b/Aquiis.SimpleStart/Features/PropertyManagement/Checklists/Pages/Templates.razor
@@ -241,12 +241,12 @@
         NavigationManager.NavigateTo("/propertymanagement/checklists/create");
     }
 
-    private void NavigateToCreateWithTemplate(int templateId)
+    private void NavigateToCreateWithTemplate(Guid templateId)
     {
         NavigationManager.NavigateTo($"/propertymanagement/checklists/create?templateId={templateId}");
     }
 
-    private void NavigateToEditTemplate(int templateId)
+    private void NavigateToEditTemplate(Guid templateId)
     {
         NavigationManager.NavigateTo($"/propertymanagement/checklists/templates/edit/{templateId}");
     }
diff --git a/Aquiis.SimpleStart/Features/PropertyManagement/Checklists/Pages/View.razor b/Aquiis.SimpleStart/Features/PropertyManagement/Checklists/Pages/View.razor
index 873de34..1db2c2c 100644
--- a/Aquiis.SimpleStart/Features/PropertyManagement/Checklists/Pages/View.razor
+++ b/Aquiis.SimpleStart/Features/PropertyManagement/Checklists/Pages/View.razor
@@ -1,4 +1,4 @@
-@page "/propertymanagement/checklists/view/{ChecklistId:int}"
+@page "/propertymanagement/checklists/view/{ChecklistId:guid}"
 
 @using Aquiis.SimpleStart.Core.Entities
 @using Aquiis.SimpleStart.Features.PropertyManagement
@@ -290,7 +290,11 @@ else
         </div>
 
         <!-- Sidebar -->
-        <div class="col-md-4">\n            <div class="card sticky-top" style="top: 1rem;">\n                <div class="card-header">\n                    <h5 class="mb-0"><i class="bi bi-graph-up"></i> Summary</h5>\n                </div>
+        <div class="col-md-4">
+            <div class="card sticky-top" style="top: 1rem;">
+                <div class="card-header">
+                    <h5 class="mb-0"><i class="bi bi-graph-up"></i> Summary</h5>
+                </div>
                 <div class="card-body">
                     @if (checklist.Items != null && checklist.Items.Any())
                     {
@@ -340,7 +344,7 @@ else
 
 @code {
     [Parameter]
-    public int ChecklistId { get; set; }
+    public Guid ChecklistId { get; set; }
 
     private Checklist? checklist;
     private string? successMessage;
@@ -520,7 +524,8 @@ else
             // Create document record
             var document = new Document
             {
-                OrganizationId = organizationId!,
+                Id = Guid.NewGuid(),
+                OrganizationId = organizationId!.Value,
                 FileName = $"Checklist_{checklist.Name.Replace(" ", "_")}_{DateTime.Now:yyyyMMdd}.pdf",
                 FileExtension = ".pdf",
                 FileData = pdfBytes,
diff --git a/Aquiis.SimpleStart/Features/PropertyManagement/Documents/Pages/Documents.razor b/Aquiis.SimpleStart/Features/PropertyManagement/Documents/Pages/Documents.razor
index 4b9e9ea..2f926eb 100644
--- a/Aquiis.SimpleStart/Features/PropertyManagement/Documents/Pages/Documents.razor
+++ b/Aquiis.SimpleStart/Features/PropertyManagement/Documents/Pages/Documents.razor
@@ -122,7 +122,7 @@ else
                 {
                     var property = properties.FirstOrDefault(p => p.Id == propertyGroup.Key);
                     var propertyDocCount = propertyGroup.Count();
-                    var isExpanded = expandedProperties.Contains(propertyGroup.Key);
+                    var isExpanded = expandedProperties.Contains(propertyGroup.Key.GetHashCode());
                     
                     <div class="card mb-3">
                         <div class="card-header" style="cursor: pointer;" @onclick="() => TogglePropertyGroup(propertyGroup.Key)">
@@ -354,14 +354,14 @@ else
     private string sortColumn = nameof(Document.CreatedOn);
     private bool sortAscending = false;
 
-    private IEnumerable<IGrouping<int, Document>> groupedDocuments = Enumerable.Empty<IGrouping<int, Document>>();
+    private IEnumerable<IGrouping<Guid, Document>> groupedDocuments = Enumerable.Empty<IGrouping<Guid, Document>>();
 
     [CascadingParameter]
     private Task<AuthenticationState> AuthenticationStateTask { get; set; } = default!;
 
     [Parameter]
     [SupplyParameterFromQuery]
-    public int? PropertyId { get; set; }
+    public Guid? PropertyId { get; set; }
 
     protected override async Task OnInitializedAsync()
     {
@@ -438,7 +438,7 @@ else
         if (groupByProperty)
         {
             groupedDocuments = filteredDocuments
-                .Where(d => d.PropertyId.HasValue && d.PropertyId.Value > 0)
+                .Where(d => d.PropertyId.HasValue && d.PropertyId.Value != Guid.Empty)
                 .GroupBy(d => d.PropertyId!.Value)
                 .OrderBy(g => properties.FirstOrDefault(p => p.Id == g.Key)?.Address ?? "");
         }
@@ -507,15 +507,15 @@ else
         ApplyFilters();
     }
 
-    private void TogglePropertyGroup(int propertyId)
+    private void TogglePropertyGroup(Guid propertyId)
     {
-        if (expandedProperties.Contains(propertyId))
+        if (expandedProperties.Contains(propertyId.GetHashCode()))
         {
-            expandedProperties.Remove(propertyId);
+            expandedProperties.Remove(propertyId.GetHashCode());
         }
         else
         {
-            expandedProperties.Add(propertyId);
+            expandedProperties.Add(propertyId.GetHashCode());
         }
     }
 
@@ -534,7 +534,7 @@ else
         await JSRuntime.InvokeVoidAsync("downloadFile", fileName, Convert.ToBase64String(fileData), mimeType);
     }
 
-    private void GoToLease(int leaseId)
+    private void GoToLease(Guid leaseId)
     {
         Navigation.NavigateTo($"/propertymanagement/leases/view/{leaseId}");
     }
diff --git a/Aquiis.SimpleStart/Features/PropertyManagement/Documents/Pages/LeaseDocuments.razor b/Aquiis.SimpleStart/Features/PropertyManagement/Documents/Pages/LeaseDocuments.razor
index d285c60..ae6b75a 100644
--- a/Aquiis.SimpleStart/Features/PropertyManagement/Documents/Pages/LeaseDocuments.razor
+++ b/Aquiis.SimpleStart/Features/PropertyManagement/Documents/Pages/LeaseDocuments.razor
@@ -1,4 +1,4 @@
-@page "/propertymanagement/leases/{LeaseId:int}/documents"
+@page "/propertymanagement/leases/{LeaseId:guid}/documents"
 
 @using Aquiis.SimpleStart.Features.PropertyManagement
 @using Aquiis.SimpleStart.Core.Entities
@@ -181,7 +181,7 @@ else
 
 @code {
     [Parameter]
-    public int LeaseId { get; set; }
+    public Guid LeaseId { get; set; }
 
     private Lease? lease;
     private List<Document>? documents;
@@ -247,7 +247,7 @@ else
         isUploading = true;
         try
         {
-           var organizationId = await UserContext.GetActiveOrganizationIdAsync() ?? string.Empty;
+           var organizationId = await UserContext.GetActiveOrganizationIdAsync() ?? Guid.Empty;
 
             // Read file data
             using var memoryStream = new MemoryStream();
diff --git a/Aquiis.SimpleStart/Features/PropertyManagement/Inspections/Pages/Create.razor b/Aquiis.SimpleStart/Features/PropertyManagement/Inspections/Pages/Create.razor
index f61dbc9..2b1465f 100644
--- a/Aquiis.SimpleStart/Features/PropertyManagement/Inspections/Pages/Create.razor
+++ b/Aquiis.SimpleStart/Features/PropertyManagement/Inspections/Pages/Create.razor
@@ -1,13 +1,15 @@
 @page "/propertymanagement/inspections/create"
-@page "/propertymanagement/inspections/create/{PropertyId:int}"
+@page "/propertymanagement/inspections/create/{PropertyId:guid}"
 
 @using Aquiis.SimpleStart.Core.Entities
+@using Aquiis.SimpleStart.Core.Validation
 @using Aquiis.SimpleStart.Features.PropertyManagement
 @using Aquiis.SimpleStart.Application.Services
 @using Aquiis.SimpleStart.Shared.Services
 @using Aquiis.SimpleStart.Application.Services.PdfGenerators
 @using Microsoft.AspNetCore.Authorization
 @using Microsoft.AspNetCore.Components.Forms
+@using System.ComponentModel.DataAnnotations
 
 @inject PropertyManagementService PropertyManagementService
 @inject UserContextService UserContext
@@ -60,7 +62,7 @@ else
 
     <div class="row">
         <div class="col-md-8">
-            <EditForm Model="inspection" OnValidSubmit="SaveInspection" FormName="createInspection">
+            <EditForm Model="model" OnValidSubmit="SaveInspection" FormName="createInspection">
                 <DataAnnotationsValidator />
                 <ValidationSummary class="text-danger" />
                 
@@ -84,12 +86,12 @@ else
                         <div class="row">
                             <div class="col-md-6 mb-3">
                                 <label class="form-label">Inspection Date *</label>
-                                <InputDate @bind-Value="inspection.CompletedOn" class="form-control" />
-                                <ValidationMessage For="() => inspection.CompletedOn" />
+                                <InputDate @bind-Value="model.CompletedOn" class="form-control" />
+                                <ValidationMessage For="() => model.CompletedOn" />
                             </div>
                             <div class="col-md-6 mb-3">
                                 <label class="form-label">Inspection Type *</label>
-                                <InputSelect @bind-Value="inspection.InspectionType" class="form-select">
+                                <InputSelect @bind-Value="model.InspectionType" class="form-select">
                                     <option value="Routine">Routine</option>
                                     <option value="Move-In">Move-In</option>
                                     <option value="Move-Out">Move-Out</option>
@@ -99,7 +101,7 @@ else
                         </div>
                         <div class="mb-3">
                             <label class="form-label">Inspected By</label>
-                            <InputText @bind-Value="inspection.InspectedBy" class="form-control" placeholder="Inspector name" />
+                            <InputText @bind-Value="model.InspectedBy" class="form-control" placeholder="Inspector name" />
                         </div>
                     </div>
                 </div>
@@ -113,13 +115,13 @@ else
                         </button>
                     </div>
                     <div class="card-body">
-                        <InspectionChecklistItem Label="Roof" @bind-IsGood="inspection.ExteriorRoofGood" @bind-Notes="inspection.ExteriorRoofNotes" />
-                        <InspectionChecklistItem Label="Gutters & Downspouts" @bind-IsGood="inspection.ExteriorGuttersGood" @bind-Notes="inspection.ExteriorGuttersNotes" />
-                        <InspectionChecklistItem Label="Siding/Paint" @bind-IsGood="inspection.ExteriorSidingGood" @bind-Notes="inspection.ExteriorSidingNotes" />
-                        <InspectionChecklistItem Label="Windows" @bind-IsGood="inspection.ExteriorWindowsGood" @bind-Notes="inspection.ExteriorWindowsNotes" />
-                        <InspectionChecklistItem Label="Doors" @bind-IsGood="inspection.ExteriorDoorsGood" @bind-Notes="inspection.ExteriorDoorsNotes" />
-                        <InspectionChecklistItem Label="Foundation" @bind-IsGood="inspection.ExteriorFoundationGood" @bind-Notes="inspection.ExteriorFoundationNotes" />
-                        <InspectionChecklistItem Label="Landscaping & Drainage" @bind-IsGood="inspection.LandscapingGood" @bind-Notes="inspection.LandscapingNotes" />
+                        <InspectionChecklistItem Label="Roof" @bind-IsGood="model.ExteriorRoofGood" @bind-Notes="model.ExteriorRoofNotes" />
+                        <InspectionChecklistItem Label="Gutters & Downspouts" @bind-IsGood="model.ExteriorGuttersGood" @bind-Notes="model.ExteriorGuttersNotes" />
+                        <InspectionChecklistItem Label="Siding/Paint" @bind-IsGood="model.ExteriorSidingGood" @bind-Notes="model.ExteriorSidingNotes" />
+                        <InspectionChecklistItem Label="Windows" @bind-IsGood="model.ExteriorWindowsGood" @bind-Notes="model.ExteriorWindowsNotes" />
+                        <InspectionChecklistItem Label="Doors" @bind-IsGood="model.ExteriorDoorsGood" @bind-Notes="model.ExteriorDoorsNotes" />
+                        <InspectionChecklistItem Label="Foundation" @bind-IsGood="model.ExteriorFoundationGood" @bind-Notes="model.ExteriorFoundationNotes" />
+                        <InspectionChecklistItem Label="Landscaping & Drainage" @bind-IsGood="model.LandscapingGood" @bind-Notes="model.LandscapingNotes" />
                     </div>
                 </div>
 
@@ -132,11 +134,11 @@ else
                         </button>
                     </div>
                     <div class="card-body">
-                        <InspectionChecklistItem Label="Walls" @bind-IsGood="inspection.InteriorWallsGood" @bind-Notes="inspection.InteriorWallsNotes" />
-                        <InspectionChecklistItem Label="Ceilings" @bind-IsGood="inspection.InteriorCeilingsGood" @bind-Notes="inspection.InteriorCeilingsNotes" />
-                        <InspectionChecklistItem Label="Floors" @bind-IsGood="inspection.InteriorFloorsGood" @bind-Notes="inspection.InteriorFloorsNotes" />
-                        <InspectionChecklistItem Label="Doors" @bind-IsGood="inspection.InteriorDoorsGood" @bind-Notes="inspection.InteriorDoorsNotes" />
-                        <InspectionChecklistItem Label="Windows" @bind-IsGood="inspection.InteriorWindowsGood" @bind-Notes="inspection.InteriorWindowsNotes" />
+                        <InspectionChecklistItem Label="Walls" @bind-IsGood="model.InteriorWallsGood" @bind-Notes="model.InteriorWallsNotes" />
+                        <InspectionChecklistItem Label="Ceilings" @bind-IsGood="model.InteriorCeilingsGood" @bind-Notes="model.InteriorCeilingsNotes" />
+                        <InspectionChecklistItem Label="Floors" @bind-IsGood="model.InteriorFloorsGood" @bind-Notes="model.InteriorFloorsNotes" />
+                        <InspectionChecklistItem Label="Doors" @bind-IsGood="model.InteriorDoorsGood" @bind-Notes="model.InteriorDoorsNotes" />
+                        <InspectionChecklistItem Label="Windows" @bind-IsGood="model.InteriorWindowsGood" @bind-Notes="model.InteriorWindowsNotes" />
                     </div>
                 </div>
 
@@ -149,10 +151,10 @@ else
                         </button>
                     </div>
                     <div class="card-body">
-                        <InspectionChecklistItem Label="Appliances" @bind-IsGood="inspection.KitchenAppliancesGood" @bind-Notes="inspection.KitchenAppliancesNotes" />
-                        <InspectionChecklistItem Label="Cabinets & Drawers" @bind-IsGood="inspection.KitchenCabinetsGood" @bind-Notes="inspection.KitchenCabinetsNotes" />
-                        <InspectionChecklistItem Label="Countertops" @bind-IsGood="inspection.KitchenCountersGood" @bind-Notes="inspection.KitchenCountersNotes" />
-                        <InspectionChecklistItem Label="Sink & Plumbing" @bind-IsGood="inspection.KitchenSinkPlumbingGood" @bind-Notes="inspection.KitchenSinkPlumbingNotes" />
+                        <InspectionChecklistItem Label="Appliances" @bind-IsGood="model.KitchenAppliancesGood" @bind-Notes="model.KitchenAppliancesNotes" />
+                        <InspectionChecklistItem Label="Cabinets & Drawers" @bind-IsGood="model.KitchenCabinetsGood" @bind-Notes="model.KitchenCabinetsNotes" />
+                        <InspectionChecklistItem Label="Countertops" @bind-IsGood="model.KitchenCountersGood" @bind-Notes="model.KitchenCountersNotes" />
+                        <InspectionChecklistItem Label="Sink & Plumbing" @bind-IsGood="model.KitchenSinkPlumbingGood" @bind-Notes="model.KitchenSinkPlumbingNotes" />
                     </div>
                 </div>
 
@@ -165,10 +167,10 @@ else
                         </button>
                     </div>
                     <div class="card-body">
-                        <InspectionChecklistItem Label="Toilet" @bind-IsGood="inspection.BathroomToiletGood" @bind-Notes="inspection.BathroomToiletNotes" />
-                        <InspectionChecklistItem Label="Sink & Vanity" @bind-IsGood="inspection.BathroomSinkGood" @bind-Notes="inspection.BathroomSinkNotes" />
-                        <InspectionChecklistItem Label="Tub/Shower" @bind-IsGood="inspection.BathroomTubShowerGood" @bind-Notes="inspection.BathroomTubShowerNotes" />
-                        <InspectionChecklistItem Label="Ventilation/Exhaust Fan" @bind-IsGood="inspection.BathroomVentilationGood" @bind-Notes="inspection.BathroomVentilationNotes" />
+                        <InspectionChecklistItem Label="Toilet" @bind-IsGood="model.BathroomToiletGood" @bind-Notes="model.BathroomToiletNotes" />
+                        <InspectionChecklistItem Label="Sink & Vanity" @bind-IsGood="model.BathroomSinkGood" @bind-Notes="model.BathroomSinkNotes" />
+                        <InspectionChecklistItem Label="Tub/Shower" @bind-IsGood="model.BathroomTubShowerGood" @bind-Notes="model.BathroomTubShowerNotes" />
+                        <InspectionChecklistItem Label="Ventilation/Exhaust Fan" @bind-IsGood="model.BathroomVentilationGood" @bind-Notes="model.BathroomVentilationNotes" />
                     </div>
                 </div>
 
@@ -181,11 +183,11 @@ else
                         </button>
                     </div>
                     <div class="card-body">
-                        <InspectionChecklistItem Label="HVAC System" @bind-IsGood="inspection.HvacSystemGood" @bind-Notes="inspection.HvacSystemNotes" />
-                        <InspectionChecklistItem Label="Electrical System" @bind-IsGood="inspection.ElectricalSystemGood" @bind-Notes="inspection.ElectricalSystemNotes" />
-                        <InspectionChecklistItem Label="Plumbing System" @bind-IsGood="inspection.PlumbingSystemGood" @bind-Notes="inspection.PlumbingSystemNotes" />
-                        <InspectionChecklistItem Label="Smoke Detectors" @bind-IsGood="inspection.SmokeDetectorsGood" @bind-Notes="inspection.SmokeDetectorsNotes" />
-                        <InspectionChecklistItem Label="Carbon Monoxide Detectors" @bind-IsGood="inspection.CarbonMonoxideDetectorsGood" @bind-Notes="inspection.CarbonMonoxideDetectorsNotes" />
+                        <InspectionChecklistItem Label="HVAC System" @bind-IsGood="model.HvacSystemGood" @bind-Notes="model.HvacSystemNotes" />
+                        <InspectionChecklistItem Label="Electrical System" @bind-IsGood="model.ElectricalSystemGood" @bind-Notes="model.ElectricalSystemNotes" />
+                        <InspectionChecklistItem Label="Plumbing System" @bind-IsGood="model.PlumbingSystemGood" @bind-Notes="model.PlumbingSystemNotes" />
+                        <InspectionChecklistItem Label="Smoke Detectors" @bind-IsGood="model.SmokeDetectorsGood" @bind-Notes="model.SmokeDetectorsNotes" />
+                        <InspectionChecklistItem Label="Carbon Monoxide Detectors" @bind-IsGood="model.CarbonMonoxideDetectorsGood" @bind-Notes="model.CarbonMonoxideDetectorsNotes" />
                     </div>
                 </div>
 
@@ -197,7 +199,7 @@ else
                     <div class="card-body">
                         <div class="mb-3">
                             <label class="form-label">Overall Condition *</label>
-                            <InputSelect @bind-Value="inspection.OverallCondition" class="form-select">
+                            <InputSelect @bind-Value="model.OverallCondition" class="form-select">
                                 <option value="Excellent">Excellent</option>
                                 <option value="Good">Good</option>
                                 <option value="Fair">Fair</option>
@@ -206,11 +208,11 @@ else
                         </div>
                         <div class="mb-3">
                             <label class="form-label">General Notes</label>
-                            <InputTextArea @bind-Value="inspection.GeneralNotes" class="form-control" rows="4" placeholder="Additional observations or comments..." />
+                            <InputTextArea @bind-Value="model.GeneralNotes" class="form-control" rows="4" placeholder="Additional observations or comments..." />
                         </div>
                         <div class="mb-3">
                             <label class="form-label">Action Items Required</label>
-                            <InputTextArea @bind-Value="inspection.ActionItemsRequired" class="form-control" rows="4" placeholder="List any repairs or follow-up actions needed..." />
+                            <InputTextArea @bind-Value="model.ActionItemsRequired" class="form-control" rows="4" placeholder="List any repairs or follow-up actions needed..." />
                         </div>
                     </div>
                 </div>
@@ -255,13 +257,13 @@ else
 
 @code {
     [Parameter]
-    public int? PropertyId { get; set; }
+    public Guid? PropertyId { get; set; }
 
     [SupplyParameterFromQuery(Name = "propertyId")]
-    public int? PropertyIdFromQuery { get; set; }
+    public Guid? PropertyIdFromQuery { get; set; }
 
     private Property? property;
-    private Inspection inspection = new();
+    private InspectionModel model = new();
     private string? errorMessage;
     private string? successMessage;
     private bool isSaving = false;
@@ -274,16 +276,16 @@ else
             PropertyId = PropertyIdFromQuery;
         }
 
-        // Get the current user's organization and user ID first
+        @* // Get the current user's organization and user ID first
         var organizationId = await UserContext.GetActiveOrganizationIdAsync();
         var userId = await UserContext.GetUserIdAsync();
-        var userEmail = await UserContext.GetUserEmailAsync();
+        var userEmail = await UserContext.GetUserEmailAsync(); *@
 
-        if (organizationId == null || string.IsNullOrEmpty(userId))
+        @* if (organizationId == null || string.IsNullOrEmpty(userId))
         {
             errorMessage = "Unable to determine user context. Please log in again.";
             return;
-        }
+        } *@
 
         if (PropertyId.HasValue)
         {
@@ -295,13 +297,13 @@ else
                 return;
             }
 
-            inspection.PropertyId = PropertyId.Value;
+            model.PropertyId = PropertyId.Value;
             
             // Check if there's an active lease
             var activeLeases = await PropertyManagementService.GetActiveLeasesByPropertyIdAsync(PropertyId.Value);
             if (activeLeases.Any())
             {
-                inspection.LeaseId = activeLeases.First().Id;
+                model.LeaseId = activeLeases.First().Id;
             }
         }
         else
@@ -318,6 +320,72 @@ else
             errorMessage = null;
             successMessage = null;
 
+            var organizationId = await UserContext.GetActiveOrganizationIdAsync();
+            var userId = await UserContext.GetUserIdAsync();
+
+            // Create inspection entity from model
+            var inspection = new Inspection
+            {
+                PropertyId = model.PropertyId,
+                LeaseId = model.LeaseId,
+                CompletedOn = model.CompletedOn,
+                InspectionType = model.InspectionType,
+                InspectedBy = model.InspectedBy,
+                ExteriorRoofGood = model.ExteriorRoofGood,
+                ExteriorRoofNotes = model.ExteriorRoofNotes,
+                ExteriorGuttersGood = model.ExteriorGuttersGood,
+                ExteriorGuttersNotes = model.ExteriorGuttersNotes,
+                ExteriorSidingGood = model.ExteriorSidingGood,
+                ExteriorSidingNotes = model.ExteriorSidingNotes,
+                ExteriorWindowsGood = model.ExteriorWindowsGood,
+                ExteriorWindowsNotes = model.ExteriorWindowsNotes,
+                ExteriorDoorsGood = model.ExteriorDoorsGood,
+                ExteriorDoorsNotes = model.ExteriorDoorsNotes,
+                ExteriorFoundationGood = model.ExteriorFoundationGood,
+                ExteriorFoundationNotes = model.ExteriorFoundationNotes,
+                LandscapingGood = model.LandscapingGood,
+                LandscapingNotes = model.LandscapingNotes,
+                InteriorWallsGood = model.InteriorWallsGood,
+                InteriorWallsNotes = model.InteriorWallsNotes,
+                InteriorCeilingsGood = model.InteriorCeilingsGood,
+                InteriorCeilingsNotes = model.InteriorCeilingsNotes,
+                InteriorFloorsGood = model.InteriorFloorsGood,
+                InteriorFloorsNotes = model.InteriorFloorsNotes,
+                InteriorDoorsGood = model.InteriorDoorsGood,
+                InteriorDoorsNotes = model.InteriorDoorsNotes,
+                InteriorWindowsGood = model.InteriorWindowsGood,
+                InteriorWindowsNotes = model.InteriorWindowsNotes,
+                KitchenAppliancesGood = model.KitchenAppliancesGood,
+                KitchenAppliancesNotes = model.KitchenAppliancesNotes,
+                KitchenCabinetsGood = model.KitchenCabinetsGood,
+                KitchenCabinetsNotes = model.KitchenCabinetsNotes,
+                KitchenCountersGood = model.KitchenCountersGood,
+                KitchenCountersNotes = model.KitchenCountersNotes,
+                KitchenSinkPlumbingGood = model.KitchenSinkPlumbingGood,
+                KitchenSinkPlumbingNotes = model.KitchenSinkPlumbingNotes,
+                BathroomToiletGood = model.BathroomToiletGood,
+                BathroomToiletNotes = model.BathroomToiletNotes,
+                BathroomSinkGood = model.BathroomSinkGood,
+                BathroomSinkNotes = model.BathroomSinkNotes,
+                BathroomTubShowerGood = model.BathroomTubShowerGood,
+                BathroomTubShowerNotes = model.BathroomTubShowerNotes,
+                BathroomVentilationGood = model.BathroomVentilationGood,
+                BathroomVentilationNotes = model.BathroomVentilationNotes,
+                HvacSystemGood = model.HvacSystemGood,
+                HvacSystemNotes = model.HvacSystemNotes,
+                ElectricalSystemGood = model.ElectricalSystemGood,
+                ElectricalSystemNotes = model.ElectricalSystemNotes,
+                PlumbingSystemGood = model.PlumbingSystemGood,
+                PlumbingSystemNotes = model.PlumbingSystemNotes,
+                SmokeDetectorsGood = model.SmokeDetectorsGood,
+                SmokeDetectorsNotes = model.SmokeDetectorsNotes,
+                CarbonMonoxideDetectorsGood = model.CarbonMonoxideDetectorsGood,
+                CarbonMonoxideDetectorsNotes = model.CarbonMonoxideDetectorsNotes,
+                OverallCondition = model.OverallCondition,
+                GeneralNotes = model.GeneralNotes,
+                ActionItemsRequired = model.ActionItemsRequired,
+            };
+
             // Add the inspection
             await PropertyManagementService.AddInspectionAsync(inspection);
 
@@ -351,46 +419,132 @@ else
 
     private void MarkAllExteriorGood()
     {
-        inspection.ExteriorRoofGood = true;
-        inspection.ExteriorGuttersGood = true;
-        inspection.ExteriorSidingGood = true;
-        inspection.ExteriorWindowsGood = true;
-        inspection.ExteriorDoorsGood = true;
-        inspection.ExteriorFoundationGood = true;
-        inspection.LandscapingGood = true;
+        model.ExteriorRoofGood = true;
+        model.ExteriorGuttersGood = true;
+        model.ExteriorSidingGood = true;
+        model.ExteriorWindowsGood = true;
+        model.ExteriorDoorsGood = true;
+        model.ExteriorFoundationGood = true;
+        model.LandscapingGood = true;
     }
 
     private void MarkAllInteriorGood()
     {
-        inspection.InteriorWallsGood = true;
-        inspection.InteriorCeilingsGood = true;
-        inspection.InteriorFloorsGood = true;
-        inspection.InteriorDoorsGood = true;
-        inspection.InteriorWindowsGood = true;
+        model.InteriorWallsGood = true;
+        model.InteriorCeilingsGood = true;
+        model.InteriorFloorsGood = true;
+        model.InteriorDoorsGood = true;
+        model.InteriorWindowsGood = true;
     }
 
     private void MarkAllKitchenGood()
     {
-        inspection.KitchenAppliancesGood = true;
-        inspection.KitchenCabinetsGood = true;
-        inspection.KitchenCountersGood = true;
-        inspection.KitchenSinkPlumbingGood = true;
+        model.KitchenAppliancesGood = true;
+        model.KitchenCabinetsGood = true;
+        model.KitchenCountersGood = true;
+        model.KitchenSinkPlumbingGood = true;
     }
 
     private void MarkAllBathroomGood()
     {
-        inspection.BathroomToiletGood = true;
-        inspection.BathroomSinkGood = true;
-        inspection.BathroomTubShowerGood = true;
-        inspection.BathroomVentilationGood = true;
+        model.BathroomToiletGood = true;
+        model.BathroomSinkGood = true;
+        model.BathroomTubShowerGood = true;
+        model.BathroomVentilationGood = true;
     }
 
     private void MarkAllSystemsGood()
     {
-        inspection.HvacSystemGood = true;
-        inspection.ElectricalSystemGood = true;
-        inspection.PlumbingSystemGood = true;
-        inspection.SmokeDetectorsGood = true;
-        inspection.CarbonMonoxideDetectorsGood = true;
+        model.HvacSystemGood = true;
+        model.ElectricalSystemGood = true;
+        model.PlumbingSystemGood = true;
+        model.SmokeDetectorsGood = true;
+        model.CarbonMonoxideDetectorsGood = true;
+    }
+
+    public class InspectionModel
+    {
+        [RequiredGuid]
+        public Guid PropertyId { get; set; }
+
+        [OptionalGuid]
+        public Guid? LeaseId { get; set; }
+
+        [Required]
+        public DateTime CompletedOn { get; set; } = DateTime.Today;
+
+        [Required]
+        [StringLength(50)]
+        public string InspectionType { get; set; } = "Routine";
+
+        [StringLength(100)]
+        public string? InspectedBy { get; set; }
+
+        // Exterior
+        public bool ExteriorRoofGood { get; set; }
+        public string? ExteriorRoofNotes { get; set; }
+        public bool ExteriorGuttersGood { get; set; }
+        public string? ExteriorGuttersNotes { get; set; }
+        public bool ExteriorSidingGood { get; set; }
+        public string? ExteriorSidingNotes { get; set; }
+        public bool ExteriorWindowsGood { get; set; }
+        public string? ExteriorWindowsNotes { get; set; }
+        public bool ExteriorDoorsGood { get; set; }
+        public string? ExteriorDoorsNotes { get; set; }
+        public bool ExteriorFoundationGood { get; set; }
+        public string? ExteriorFoundationNotes { get; set; }
+        public bool LandscapingGood { get; set; }
+        public string? LandscapingNotes { get; set; }
+
+        // Interior
+        public bool InteriorWallsGood { get; set; }
+        public string? InteriorWallsNotes { get; set; }
+        public bool InteriorCeilingsGood { get; set; }
+        public string? InteriorCeilingsNotes { get; set; }
+        public bool InteriorFloorsGood { get; set; }
+        public string? InteriorFloorsNotes { get; set; }
+        public bool InteriorDoorsGood { get; set; }
+        public string? InteriorDoorsNotes { get; set; }
+        public bool InteriorWindowsGood { get; set; }
+        public string? InteriorWindowsNotes { get; set; }
+
+        // Kitchen
+        public bool KitchenAppliancesGood { get; set; }
+        public string? KitchenAppliancesNotes { get; set; }
+        public bool KitchenCabinetsGood { get; set; }
+        public string? KitchenCabinetsNotes { get; set; }
+        public bool KitchenCountersGood { get; set; }
+        public string? KitchenCountersNotes { get; set; }
+        public bool KitchenSinkPlumbingGood { get; set; }
+        public string? KitchenSinkPlumbingNotes { get; set; }
+
+        // Bathroom
+        public bool BathroomToiletGood { get; set; }
+        public string? BathroomToiletNotes { get; set; }
+        public bool BathroomSinkGood { get; set; }
+        public string? BathroomSinkNotes { get; set; }
+        public bool BathroomTubShowerGood { get; set; }
+        public string? BathroomTubShowerNotes { get; set; }
+        public bool BathroomVentilationGood { get; set; }
+        public string? BathroomVentilationNotes { get; set; }
+
+        // Systems
+        public bool HvacSystemGood { get; set; }
+        public string? HvacSystemNotes { get; set; }
+        public bool ElectricalSystemGood { get; set; }
+        public string? ElectricalSystemNotes { get; set; }
+        public bool PlumbingSystemGood { get; set; }
+        public string? PlumbingSystemNotes { get; set; }
+        public bool SmokeDetectorsGood { get; set; }
+        public string? SmokeDetectorsNotes { get; set; }
+        public bool CarbonMonoxideDetectorsGood { get; set; }
+        public string? CarbonMonoxideDetectorsNotes { get; set; }
+
+        // Overall
+        [Required]
+        [StringLength(50)]
+        public string OverallCondition { get; set; } = "Good";
+        public string? GeneralNotes { get; set; }
+        public string? ActionItemsRequired { get; set; }
     }
 }
diff --git a/Aquiis.SimpleStart/Features/PropertyManagement/Inspections/Pages/Schedule.razor b/Aquiis.SimpleStart/Features/PropertyManagement/Inspections/Pages/Schedule.razor
index c2f6d45..40781a5 100644
--- a/Aquiis.SimpleStart/Features/PropertyManagement/Inspections/Pages/Schedule.razor
+++ b/Aquiis.SimpleStart/Features/PropertyManagement/Inspections/Pages/Schedule.razor
@@ -299,12 +299,12 @@ else
         await LoadData();
     }
 
-    private void ViewProperty(int propertyId)
+    private void ViewProperty(Guid propertyId)
     {
         NavigationManager.NavigateTo($"/propertymanagement/properties/view/{propertyId}");
     }
 
-    private void CreateInspection(int propertyId)
+    private void CreateInspection(Guid propertyId)
     {
         NavigationManager.NavigateTo($"/propertymanagement/inspections/create/{propertyId}");
     }
diff --git a/Aquiis.SimpleStart/Features/PropertyManagement/Inspections/Pages/View.razor b/Aquiis.SimpleStart/Features/PropertyManagement/Inspections/Pages/View.razor
index 452521b..6ff8260 100644
--- a/Aquiis.SimpleStart/Features/PropertyManagement/Inspections/Pages/View.razor
+++ b/Aquiis.SimpleStart/Features/PropertyManagement/Inspections/Pages/View.razor
@@ -1,4 +1,4 @@
-@page "/propertymanagement/inspections/view/{InspectionId:int}"
+@page "/propertymanagement/inspections/view/{InspectionId:guid}"
 
 @using Aquiis.SimpleStart.Core.Entities
 @using Aquiis.SimpleStart.Features.PropertyManagement
@@ -222,7 +222,7 @@ else
 
 @code {
     [Parameter]
-    public int InspectionId { get; set; }
+    public Guid InspectionId { get; set; }
 
     private Inspection? inspection;
     private string? successMessage;
@@ -359,7 +359,7 @@ else
                 DocumentType = "Inspection Report",
                 PropertyId = inspection.PropertyId,
                 LeaseId = inspection.LeaseId,
-                OrganizationId = organizationId!,
+                OrganizationId = organizationId!.Value,
                 CreatedOn = DateTime.UtcNow,
                 CreatedBy = userId!,
                 Description = $"{inspection.InspectionType} Inspection - {inspection.CompletedOn:MMM dd, yyyy}"
diff --git a/Aquiis.SimpleStart/Features/PropertyManagement/Invoices/Pages/CreateInvoice.razor b/Aquiis.SimpleStart/Features/PropertyManagement/Invoices/Pages/CreateInvoice.razor
index 83b72f0..5058248 100644
--- a/Aquiis.SimpleStart/Features/PropertyManagement/Invoices/Pages/CreateInvoice.razor
+++ b/Aquiis.SimpleStart/Features/PropertyManagement/Invoices/Pages/CreateInvoice.razor
@@ -1,6 +1,7 @@
 @page "/propertymanagement/invoices/create"
 @using Aquiis.SimpleStart.Features.PropertyManagement
 @using Aquiis.SimpleStart.Core.Entities
+@using Aquiis.SimpleStart.Core.Validation
 @using Microsoft.AspNetCore.Authorization
 @using Microsoft.AspNetCore.Components.Web
 @using Microsoft.AspNetCore.Components.Forms
@@ -190,7 +191,7 @@
 
     [Parameter]
     [SupplyParameterFromQuery]
-    public int? LeaseId { get; set; }
+    public Guid? LeaseId { get; set; }
 
     protected override async Task OnInitializedAsync()
     {
@@ -213,7 +214,7 @@
 
     private void OnLeaseSelected()
     {
-        if (invoiceModel.LeaseId > 0)
+        if (invoiceModel.LeaseId != Guid.Empty)
         {
             var selectedLease = leases?.FirstOrDefault(l => l.Id == invoiceModel.LeaseId);
             if (selectedLease != null)
@@ -279,9 +280,8 @@
 
     public class InvoiceModel
     {
-        [Required(ErrorMessage = "Lease is required")]
-        [Range(1, int.MaxValue, ErrorMessage = "Please select a lease")]
-        public int LeaseId { get; set; }
+        [RequiredGuid(ErrorMessage = "Lease is required")]
+        public Guid LeaseId { get; set; }
 
         [Required(ErrorMessage = "Invoice number is required")]
         [StringLength(50, ErrorMessage = "Invoice number cannot exceed 50 characters")]
diff --git a/Aquiis.SimpleStart/Features/PropertyManagement/Invoices/Pages/EditInvoice.razor b/Aquiis.SimpleStart/Features/PropertyManagement/Invoices/Pages/EditInvoice.razor
index 9702ad5..2331cfe 100644
--- a/Aquiis.SimpleStart/Features/PropertyManagement/Invoices/Pages/EditInvoice.razor
+++ b/Aquiis.SimpleStart/Features/PropertyManagement/Invoices/Pages/EditInvoice.razor
@@ -1,7 +1,8 @@
-@page "/propertymanagement/invoices/edit/{Id:int}"
+@page "/propertymanagement/invoices/edit/{Id:guid}"
 
 @using Aquiis.SimpleStart.Features.PropertyManagement
 @using Aquiis.SimpleStart.Core.Entities
+@using Aquiis.SimpleStart.Core.Validation
 @using Microsoft.AspNetCore.Authorization
 @using Microsoft.AspNetCore.Components.Web
 @using Microsoft.AspNetCore.Components.Forms
@@ -224,7 +225,7 @@ else
 
 @code {
     [Parameter]
-    public int Id { get; set; }
+    public Guid Id { get; set; }
 
     private Invoice? invoice;
     private InvoiceModel invoiceModel = new InvoiceModel();
@@ -358,8 +359,8 @@ else
 
     public class InvoiceModel
     {
-        [Required(ErrorMessage = "Lease is required")]
-        public int LeaseId { get; set; }
+        [RequiredGuid(ErrorMessage = "Lease is required")]
+        public Guid LeaseId { get; set; }
 
         [Required(ErrorMessage = "Invoice number is required")]
         [StringLength(50, ErrorMessage = "Invoice number cannot exceed 50 characters")]
diff --git a/Aquiis.SimpleStart/Features/PropertyManagement/Invoices/Pages/Invoices.razor b/Aquiis.SimpleStart/Features/PropertyManagement/Invoices/Pages/Invoices.razor
index b8ad6aa..debd08f 100644
--- a/Aquiis.SimpleStart/Features/PropertyManagement/Invoices/Pages/Invoices.razor
+++ b/Aquiis.SimpleStart/Features/PropertyManagement/Invoices/Pages/Invoices.razor
@@ -118,7 +118,7 @@ else
                     var propertyInvoiceCount = propertyGroup.Count();
                     var propertyTotal = propertyGroup.Sum(i => i.Amount);
                     var propertyBalance = propertyGroup.Sum(i => i.BalanceDue);
-                    var isExpanded = expandedProperties.Contains(propertyGroup.Key);
+                    var isExpanded = expandedProperties.Contains(propertyGroup.Key.GetHashCode());
                     
                     <div class="card mb-3">
                         <div class="card-header" style="cursor: pointer;" @onclick="() => TogglePropertyGroup(propertyGroup.Key)">
@@ -372,7 +372,7 @@ else
     private List<Invoice>? invoices;
     private List<Invoice> filteredInvoices = new();
     private List<Invoice> pagedInvoices = new();
-    private IEnumerable<IGrouping<int, Invoice>> groupedInvoices = Enumerable.Empty<IGrouping<int, Invoice>>();
+    private IEnumerable<IGrouping<Guid, Invoice>> groupedInvoices = Enumerable.Empty<IGrouping<Guid, Invoice>>();
     private HashSet<int> expandedProperties = new();
     private string searchTerm = string.Empty;
     private string selectedStatus = string.Empty;
@@ -398,7 +398,7 @@ else
 
     [Parameter]
     [SupplyParameterFromQuery]
-    public int? LeaseId { get; set; }
+    public Guid? LeaseId { get; set; }
 
     protected override async Task OnInitializedAsync()
     {
@@ -445,7 +445,7 @@ else
         if (groupByProperty)
         {
             groupedInvoices = filteredInvoices
-                .Where(i => i.Lease?.PropertyId != null && i.Lease.PropertyId > 0)
+                .Where(i => i.Lease?.PropertyId != null)
                 .GroupBy(i => i.Lease!.PropertyId)
                 .OrderBy(g => g.First().Lease?.Property?.Address)
                 .ToList();
@@ -456,15 +456,15 @@ else
         }
     }
     
-    private void TogglePropertyGroup(int propertyId)
+    private void TogglePropertyGroup(Guid propertyId)
     {
-        if (expandedProperties.Contains(propertyId))
+        if (expandedProperties.Contains(propertyId.GetHashCode()))
         {
-            expandedProperties.Remove(propertyId);
+            expandedProperties.Remove(propertyId.GetHashCode());
         }
         else
         {
-            expandedProperties.Add(propertyId);
+            expandedProperties.Add(propertyId.GetHashCode());
         }
     }
 
@@ -571,12 +571,12 @@ else
         Navigation.NavigateTo("/propertymanagement/invoices/create");
     }
 
-    private void ViewInvoice(int id)
+    private void ViewInvoice(Guid id)
     {
         Navigation.NavigateTo($"/propertymanagement/invoices/view/{id}");
     }
 
-    private void EditInvoice(int id)
+    private void EditInvoice(Guid id)
     {
         Navigation.NavigateTo($"/propertymanagement/invoices/edit/{id}");
     }
diff --git a/Aquiis.SimpleStart/Features/PropertyManagement/Invoices/Pages/ViewInvoice.razor b/Aquiis.SimpleStart/Features/PropertyManagement/Invoices/Pages/ViewInvoice.razor
index 949024c..75ed4b4 100644
--- a/Aquiis.SimpleStart/Features/PropertyManagement/Invoices/Pages/ViewInvoice.razor
+++ b/Aquiis.SimpleStart/Features/PropertyManagement/Invoices/Pages/ViewInvoice.razor
@@ -1,4 +1,4 @@
-@page "/propertymanagement/invoices/view/{Id:int}"
+@page "/propertymanagement/invoices/view/{Id:guid}"
 @using Aquiis.SimpleStart.Features.PropertyManagement
 @using Aquiis.SimpleStart.Core.Entities
 @using Microsoft.AspNetCore.Authorization
@@ -272,7 +272,7 @@ else
 
 @code {
     [Parameter]
-    public int Id { get; set; }
+    public Guid Id { get; set; }
 
     private Invoice? invoice;
     private bool isGenerating = false;
diff --git a/Aquiis.SimpleStart/Features/PropertyManagement/LeaseOffers/Pages/LeaseOffers.razor b/Aquiis.SimpleStart/Features/PropertyManagement/LeaseOffers/Pages/LeaseOffers.razor
index eb9c10b..42e30a2 100644
--- a/Aquiis.SimpleStart/Features/PropertyManagement/LeaseOffers/Pages/LeaseOffers.razor
+++ b/Aquiis.SimpleStart/Features/PropertyManagement/LeaseOffers/Pages/LeaseOffers.razor
@@ -103,13 +103,13 @@ else
 @code {
     private List<LeaseOffer> leaseOffers = new();
     private bool isLoading = true;
-    private string organizationId = string.Empty;
+    private Guid organizationId = Guid.Empty;
 
     protected override async Task OnInitializedAsync()
     {
         try
         {
-            organizationId = await UserContext.GetActiveOrganizationIdAsync() ?? string.Empty;
+            organizationId = await UserContext.GetActiveOrganizationIdAsync() ?? Guid.Empty;
             await LoadLeaseOffers();
         }
         catch (Exception ex)
@@ -142,12 +142,12 @@ else
         leaseOffers = allOffers.OrderByDescending(o => o.OfferedOn).ToList();
     }
 
-    private void ViewOffer(int offerId)
+    private void ViewOffer(Guid offerId)
     {
         Navigation.NavigateTo($"/propertymanagement/leaseoffers/view/{offerId}");
     }
 
-    private void ViewLease(int leaseId)
+    private void ViewLease(Guid leaseId)
     {
         Navigation.NavigateTo($"/propertymanagement/leases/view/{leaseId}");
     }
diff --git a/Aquiis.SimpleStart/Features/PropertyManagement/LeaseOffers/Pages/ViewLeaseOffer.razor b/Aquiis.SimpleStart/Features/PropertyManagement/LeaseOffers/Pages/ViewLeaseOffer.razor
index 2c90f49..8c44f52 100644
--- a/Aquiis.SimpleStart/Features/PropertyManagement/LeaseOffers/Pages/ViewLeaseOffer.razor
+++ b/Aquiis.SimpleStart/Features/PropertyManagement/LeaseOffers/Pages/ViewLeaseOffer.razor
@@ -1,16 +1,19 @@
-@page "/propertymanagement/leaseoffers/view/{Id:int}"
+@page "/propertymanagement/leaseoffers/view/{Id:guid}"
 
 @using Aquiis.SimpleStart.Core.Entities
 @using Aquiis.SimpleStart.Application.Services
 @using Aquiis.SimpleStart.Shared.Services
 @using Aquiis.SimpleStart.Application.Services.PdfGenerators
+@using Aquiis.SimpleStart.Application.Services.Workflows
 @using Aquiis.SimpleStart.Infrastructure.Data
 @using Aquiis.SimpleStart.Core.Constants
 @using Microsoft.AspNetCore.Authorization
 @using Microsoft.AspNetCore.Components.Authorization
 @using Microsoft.EntityFrameworkCore
+@using System.ComponentModel.DataAnnotations
 
 @inject PropertyManagementService PropertyService
+@inject ApplicationWorkflowService WorkflowService
 @inject ApplicationDbContext DbContext
 @inject NavigationManager Navigation
 @inject AuthenticationStateProvider AuthStateProvider
@@ -252,33 +255,70 @@
         <div class="modal-dialog">
             <div class="modal-content">
                 <div class="modal-header bg-success text-white">
-                    <h5 class="modal-title">Accept Lease Offer</h5>
+                    <h5 class="modal-title">Accept Lease Offer & Collect Security Deposit</h5>
                     <button type="button" class="btn-close btn-close-white" @onclick="() => showAcceptModal = false"></button>
                 </div>
                 <div class="modal-body">
-                    <p><strong>Are you sure you want to accept this lease offer?</strong></p>
-                    <p>This will:</p>
-                    <ul>
-                        <li>Convert the prospective tenant to an official tenant</li>
-                        <li>Create an active lease agreement</li>
-                        <li>Update the property status to "Occupied"</li>
-                        <li>Close the rental application</li>
-                    </ul>
-                    
-                    <div class="alert alert-info">
-                        <i class="bi bi-info-circle me-2"></i>
-                        <small>After acceptance, you can collect the security deposit and generate move-in documents.</small>
-                    </div>
-                </div>
-                <div class="modal-footer">
-                    <button type="button" class="btn btn-secondary" @onclick="() => showAcceptModal = false">Cancel</button>
-                    <button type="button" class="btn btn-success" @onclick="AcceptOffer" disabled="@isSubmitting">
-                        @if (isSubmitting)
-                        {
-                            <span class="spinner-border spinner-border-sm me-2"></span>
-                        }
-                        <i class="bi bi-check-circle me-2"></i>Accept & Convert to Lease
-                    </button>
+                    <EditForm Model="depositPaymentModel" OnValidSubmit="AcceptOffer">
+                        <DataAnnotationsValidator />
+                        
+                        <p><strong>This will:</strong></p>
+                        <ul>
+                            <li>Convert the prospective tenant to an official tenant</li>
+                            <li>Create an active lease agreement</li>
+                            <li>Record the security deposit payment</li>
+                            <li>Update the property status to "Occupied"</li>
+                            <li>Close the rental application</li>
+                        </ul>
+
+                        <div class="mb-3">
+                            <p><strong>Security Deposit Amount:</strong> @leaseOffer?.SecurityDeposit.ToString("C")</p>
+                            <p><strong>Tenant:</strong> @leaseOffer?.ProspectiveTenant?.FullName</p>
+                        </div>
+
+                        <div class="mb-3">
+                            <label class="form-label">Payment Method <span class="text-danger">*</span></label>
+                            <InputSelect class="form-select" @bind-Value="depositPaymentModel.PaymentMethod">
+                                <option value="">Select payment method...</option>
+                                <option value="Cash">Cash</option>
+                                <option value="Check">Check</option>
+                                <option value="Cashier's Check">Cashier's Check</option>
+                                <option value="Money Order">Money Order</option>
+                                <option value="Bank Transfer">Bank Transfer</option>
+                                <option value="Wire Transfer">Wire Transfer</option>
+                                <option value="Online Payment">Online Payment</option>
+                            </InputSelect>
+                            <ValidationMessage For="@(() => depositPaymentModel.PaymentMethod)" />
+                        </div>
+
+                        <div class="mb-3">
+                            <label class="form-label">Reference Number (Check #, Confirmation, etc.)</label>
+                            <InputText class="form-control" @bind-Value="depositPaymentModel.ReferenceNumber" placeholder="Optional" />
+                        </div>
+
+                        <div class="mb-3">
+                            <label class="form-label">Payment Date</label>
+                            <InputDate class="form-control" @bind-Value="depositPaymentModel.PaymentDate" />
+                        </div>
+
+                        <div class="mb-3">
+                            <label class="form-label">Notes</label>
+                            <InputTextArea class="form-control" rows="2" @bind-Value="depositPaymentModel.Notes" placeholder="Optional notes about the deposit payment" />
+                        </div>
+
+                        <div class="d-flex justify-content-end gap-2">
+                            <button type="button" class="btn btn-secondary" @onclick="() => showAcceptModal = false">
+                                Cancel
+                            </button>
+                            <button type="submit" class="btn btn-success" disabled="@isSubmitting">
+                                @if (isSubmitting)
+                                {
+                                    <span class="spinner-border spinner-border-sm me-2"></span>
+                                }
+                                <i class="bi bi-check-circle me-2"></i>Accept & Create Lease
+                            </button>
+                        </div>
+                    </EditForm>
                 </div>
             </div>
         </div>
@@ -359,7 +399,7 @@
 
 @code {
     [Parameter]
-    public int Id { get; set; }
+    public Guid Id { get; set; }
 
     private LeaseOffer? leaseOffer;
     private bool isLoading = true;
@@ -369,7 +409,8 @@
     private string errorMessage = string.Empty;
     private string declineReason = string.Empty;
     private string userId = string.Empty;
-    private string organizationId = string.Empty;
+    private Guid organizationId = Guid.Empty;
+    private DepositPaymentModel depositPaymentModel = new();
 
     protected override async Task OnInitializedAsync()
     {
@@ -377,7 +418,7 @@
         {
             var authState = await AuthStateProvider.GetAuthenticationStateAsync();
             userId = authState.User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value ?? string.Empty;
-            organizationId = await UserContext.GetActiveOrganizationIdAsync() ?? string.Empty;
+            organizationId = await UserContext.GetActiveOrganizationIdAsync() ?? Guid.Empty;
 
             await LoadLeaseOffer();
         }
@@ -420,137 +461,36 @@
 
     private async Task AcceptOffer()
     {
-        if (leaseOffer == null || leaseOffer.ProspectiveTenant == null || leaseOffer.Property == null) return;
+        if (leaseOffer == null) return;
 
         isSubmitting = true;
         errorMessage = string.Empty;
 
         try
         {
-            // 1. Create Tenant from ProspectiveTenant
-            var tenant = new Tenant
-            {
-                FirstName = leaseOffer.ProspectiveTenant.FirstName,
-                LastName = leaseOffer.ProspectiveTenant.LastName,
-                Email = leaseOffer.ProspectiveTenant.Email,
-                PhoneNumber = leaseOffer.ProspectiveTenant.Phone,
-                DateOfBirth = leaseOffer.ProspectiveTenant.DateOfBirth,
-                IdentificationNumber = leaseOffer.ProspectiveTenant.IdentificationNumber ?? string.Empty,
-                ProspectiveTenantId = leaseOffer.ProspectiveTenantId,
-                EmergencyContactName = string.Empty,
-                EmergencyContactPhone = null,
-                
-            };
-
-            var createdTenant = await PropertyService.AddTenantAsync(tenant);
-
-            // 2. Create Lease with reference to LeaseOffer and Tenant
-            var lease = new Lease
-            {
-                PropertyId = leaseOffer.PropertyId,
-                OrganizationId = createdTenant.OrganizationId,
-                TenantId = createdTenant.Id,
-                LeaseOfferId = leaseOffer.Id,
-                StartDate = leaseOffer.StartDate,
-                EndDate = leaseOffer.EndDate,
-                MonthlyRent = leaseOffer.MonthlyRent,
-                SecurityDeposit = leaseOffer.SecurityDeposit,
-                Terms = leaseOffer.Terms ?? string.Empty,
-                Status = ApplicationConstants.LeaseStatuses.Active,
-                SignedOn = DateTime.UtcNow,
-               
-            };
-
-            var createdLease = await PropertyService.AddLeaseAsync(lease);
-
-            // 3. Update LeaseOffer status to Accepted
-            leaseOffer.Status = "Accepted";
-            leaseOffer.RespondedOn = DateTime.UtcNow;
-            leaseOffer.ResponseNotes = "Lease offer accepted and converted to active lease";
-            leaseOffer.ConvertedLeaseId = createdLease?.Id;
+            var result = await WorkflowService.AcceptLeaseOfferAsync(
+                leaseOffer.Id,
+                depositPaymentModel.PaymentMethod,
+                depositPaymentModel.PaymentDate,
+                depositPaymentModel.ReferenceNumber,
+                depositPaymentModel.Notes);
             
-
-            await PropertyService.UpdateLeaseOfferAsync(leaseOffer);
-
-            // 4. Update RentalApplication status
-            var application = await PropertyService.GetRentalApplicationByIdAsync(leaseOffer.RentalApplicationId);
-            if (application != null)
+            if (result.Success)
             {
-                application.Status = ApplicationConstants.ApplicationStatuses.LeaseAccepted;
-               
-                await PropertyService.UpdateRentalApplicationAsync(application);
-            }
-
-            // 5. Update Property status to Occupied
-            var property = await PropertyService.GetPropertyByIdAsync(leaseOffer.PropertyId);
-            if (property != null)
-            {
-                property.Status = ApplicationConstants.PropertyStatuses.Occupied;
-                
-                await PropertyService.UpdatePropertyAsync(property);
-            }
-
-            // 6. Update ProspectiveTenant status
-            var prospective = leaseOffer.ProspectiveTenant;
-            if (prospective != null)
-            {
-                prospective.Status = ApplicationConstants.ProspectiveStatuses.ConvertedToTenant;
+                ToastService.ShowSuccess($"Lease offer accepted! Security deposit of {leaseOffer.SecurityDeposit:C} collected via {depositPaymentModel.PaymentMethod}.");
+                showAcceptModal = false;
+                depositPaymentModel = new();
                 
-                await PropertyService.UpdateProspectiveTenantAsync(prospective);
-            }
-
-            // 7. Add Security Deposit to Investment Pool
-             // CRITICAL: Collect security deposit - this MUST succeed before proceeding
-            SecurityDeposit securityDeposit = new();
-            try
-            {
-                securityDeposit = await SecurityDepositService.CollectSecurityDepositAsync(
-                    lease.Id,
-                    lease.SecurityDeposit,
-                    "Online Payment",
-                    "Security deposit collected upon lease acceptance",
-                    tenant.Id); // Pass the newly created tenant ID
-            }
-            catch (Exception depositEx)
-            {
-                var message = depositEx.Message + (depositEx.InnerException != null ? $" - {depositEx.InnerException}" : string.Empty);
-                errorMessage = $"CRITICAL ERROR: Failed to collect security deposit. Lease acceptance aborted. Error: {message}";
-                isSubmitting = false;
-                ToastService.ShowError(errorMessage);
-                Console.WriteLine(errorMessage);
-                //return;
-            }
-
-            if(securityDeposit == null || securityDeposit.Id == 0)
-            {
-                errorMessage = "CRITICAL ERROR: Security deposit record not created. Lease acceptance aborted.";
-                isSubmitting = false;
-                ToastService.ShowError(errorMessage);
-                Console.WriteLine(errorMessage);
-            } else {
-                // Add deposit to investment pool (will start earning dividends)
-                try
+                // Navigate to the newly created lease
+                if (result.Data != null)
                 {
-                    await SecurityDepositService.AddToInvestmentPoolAsync(securityDeposit.Id);
-                }
-                catch (Exception poolEx)
-                {
-                    // Non-critical: deposit collected but not added to pool yet
-                    // Can be added manually later from Security Deposits page
-                    var message = poolEx.Message + (poolEx.InnerException != null ? $" - {poolEx.InnerException}" : string.Empty);
-                    ToastService.ShowWarning($"Security deposit collected but not added to investment pool: {message}");
-                    //return;
-                    Console.WriteLine($"Warning: Security deposit collected but not added to investment pool: {message}");
+                    Navigation.NavigateTo($"/propertymanagement/leases/view/{result.Data.Id}");
                 }
             }
-
-            ToastService.ShowSuccess("Lease offer accepted! Tenant and lease created successfully.");
-            showAcceptModal = false;
-            
-            // Navigate to the newly created lease
-            if (createdLease != null)
+            else
             {
-                Navigation.NavigateTo($"/propertymanagement/leases/view/{createdLease.Id}");
+                errorMessage = string.Join(", ", result.Errors);
+                ToastService.ShowError($"Failed to accept lease offer: {errorMessage}");
             }
         }
         catch (Exception ex)
@@ -577,15 +517,18 @@
 
         try
         {
-            leaseOffer.Status = "Declined";
-            leaseOffer.RespondedOn = DateTime.UtcNow;
-            leaseOffer.ResponseNotes = declineReason;
-
-            await PropertyService.UpdateLeaseOfferAsync(leaseOffer);
+            var result = await WorkflowService.DeclineLeaseOfferAsync(leaseOffer.Id, declineReason ?? "Declined by applicant");
 
-            ToastService.ShowSuccess("Lease offer declined.");
-            showDeclineModal = false;
-            await LoadLeaseOffer();
+            if (result.Success)
+            {
+                ToastService.ShowSuccess("Lease offer declined.");
+                showDeclineModal = false;
+                await LoadLeaseOffer();
+            }
+            else
+            {
+                errorMessage = string.Join(", ", result.Errors);
+            }
         }
         catch (Exception ex)
         {
@@ -616,4 +559,16 @@
             Navigation.NavigateTo("/propertymanagement/applications");
         }
     }
+
+    public class DepositPaymentModel
+    {
+        [Required(ErrorMessage = "Payment method is required")]
+        public string PaymentMethod { get; set; } = string.Empty;
+
+        public string? ReferenceNumber { get; set; }
+
+        public DateTime PaymentDate { get; set; } = DateTime.Today;
+
+        public string? Notes { get; set; }
+    }
 }
diff --git a/Aquiis.SimpleStart/Features/PropertyManagement/Leases/Pages/AcceptLease.razor b/Aquiis.SimpleStart/Features/PropertyManagement/Leases/Pages/AcceptLease.razor
index de502a3..3b6eb83 100644
--- a/Aquiis.SimpleStart/Features/PropertyManagement/Leases/Pages/AcceptLease.razor
+++ b/Aquiis.SimpleStart/Features/PropertyManagement/Leases/Pages/AcceptLease.razor
@@ -1,4 +1,4 @@
-@page "/propertymanagement/leases/{LeaseId:int}/accept"
+@page "/propertymanagement/leases/{LeaseId:guid}/accept"
 
 @using Aquiis.SimpleStart.Core.Entities
 @using Aquiis.SimpleStart.Application.Services
@@ -323,7 +323,7 @@
 
 @code {
     [Parameter]
-    public int LeaseId { get; set; }
+    public Guid LeaseId { get; set; }
 
     private Lease? lease;
     private ProspectiveTenant? prospectiveTenant;
@@ -337,7 +337,7 @@
     private string successMessage = string.Empty;
     private string declineReason = string.Empty;
     private string userId = string.Empty;
-    private string organizationId = string.Empty;
+    private Guid organizationId = Guid.Empty;
 
     protected override async Task OnInitializedAsync()
     {
@@ -345,7 +345,7 @@
         {
             var authState = await AuthStateProvider.GetAuthenticationStateAsync();
             userId = authState.User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value ?? string.Empty;
-            organizationId = await UserContext.GetActiveOrganizationIdAsync() ?? string.Empty;
+            organizationId = await UserContext.GetActiveOrganizationIdAsync() ?? Guid.Empty;
 
             await LoadLease();
         }
@@ -430,7 +430,7 @@
                 return;
             }
 
-            if(securityDeposit == null || securityDeposit.Id == 0)
+            if(securityDeposit == null || securityDeposit.Id == Guid.Empty)
             {
                 errorMessage = "CRITICAL ERROR: Security deposit record not created. Lease acceptance aborted.";
                 isSubmitting = false;
diff --git a/Aquiis.SimpleStart/Features/PropertyManagement/Leases/Pages/CreateLease.razor b/Aquiis.SimpleStart/Features/PropertyManagement/Leases/Pages/CreateLease.razor
index 993a52a..0d5b0ea 100644
--- a/Aquiis.SimpleStart/Features/PropertyManagement/Leases/Pages/CreateLease.razor
+++ b/Aquiis.SimpleStart/Features/PropertyManagement/Leases/Pages/CreateLease.razor
@@ -2,6 +2,7 @@
 
 @using Aquiis.SimpleStart.Core.Entities
 @using Aquiis.SimpleStart.Core.Constants
+@using Aquiis.SimpleStart.Core.Validation
 @using Microsoft.AspNetCore.Components
 @using Microsoft.AspNetCore.Components.Authorization
 @using Microsoft.AspNetCore.Components.Forms
@@ -175,11 +176,11 @@
 @code {
     [Parameter]
     [SupplyParameterFromQuery]
-    public int? PropertyId { get; set; }
+    public Guid? PropertyId { get; set; }
 
     [Parameter]
     [SupplyParameterFromQuery]
-    public int? TenantId { get; set; }
+    public Guid? TenantId { get; set; }
 
     private LeaseModel leaseModel = new();
     private List<Property> availableProperties = new();
@@ -238,7 +239,7 @@
 
     private async Task OnPropertyChanged()
     {
-        if (leaseModel.PropertyId > 0)
+        if (leaseModel.PropertyId != Guid.Empty)
         {
             selectedProperty = availableProperties.FirstOrDefault(p => p.Id == leaseModel.PropertyId);
             if (selectedProperty != null)
@@ -345,15 +346,13 @@
 
     public class LeaseModel
     {
-        [Required(ErrorMessage = "Property is required")]
-        [Range(1, int.MaxValue, ErrorMessage = "Please select a property")]
-        public int PropertyId { get; set; }
+        [RequiredGuid(ErrorMessage = "Property is required")]
+        public Guid PropertyId { get; set; }
 
         public string PropertyAddress { get; set; } = string.Empty;
 
-        [Required(ErrorMessage = "Tenant is required")]
-        [Range(1, int.MaxValue, ErrorMessage = "Please select a tenant")]
-        public int TenantId { get; set; }
+        [RequiredGuid(ErrorMessage = "Tenant is required")]
+        public Guid TenantId { get; set; }
 
         [Required(ErrorMessage = "Start date is required")]
         public DateTime StartDate { get; set; } = DateTime.Today;
diff --git a/Aquiis.SimpleStart/Features/PropertyManagement/Leases/Pages/EditLease.razor b/Aquiis.SimpleStart/Features/PropertyManagement/Leases/Pages/EditLease.razor
index bcf5081..057b539 100644
--- a/Aquiis.SimpleStart/Features/PropertyManagement/Leases/Pages/EditLease.razor
+++ b/Aquiis.SimpleStart/Features/PropertyManagement/Leases/Pages/EditLease.razor
@@ -1,4 +1,4 @@
-@page "/propertymanagement/leases/edit/{Id:int}"
+@page "/propertymanagement/leases/edit/{Id:guid}"
 
 @using Aquiis.SimpleStart.Core.Entities
 @using Microsoft.AspNetCore.Components.Authorization
@@ -118,9 +118,7 @@ else
 
                         <div class="row">
                             <div class="col-md-12 mb-3">
-                                <label class="form-label">Notes</label>
-                                <InputTextArea @bind-Value="leaseModel.Notes" class="form-control" rows="3" placeholder="Additional notes" />
-                                <ValidationMessage For="() => leaseModel.Notes" class="text-danger" />
+                                <NotesTimeline EntityType="Lease" EntityId="@lease.Id" />
                             </div>
                         </div>
 
@@ -192,7 +190,7 @@ else
 }
 
 @code {
-    [Parameter] public int Id { get; set; }
+    [Parameter] public Guid Id { get; set; }
     
     private Lease? lease;
     private LeaseModel leaseModel = new();
@@ -229,7 +227,6 @@ else
             SecurityDeposit = lease.SecurityDeposit,
             Status = lease.Status,
             Terms = lease.Terms,
-            Notes = lease.Notes
         };
     }
 
@@ -250,7 +247,6 @@ else
             lease.SecurityDeposit = leaseModel.SecurityDeposit;
             lease.Status = leaseModel.Status;
             lease.Terms = leaseModel.Terms;
-            lease.Notes = leaseModel.Notes;
             
             // Update property availability based on lease status change
             if (lease.Property != null && oldStatus != leaseModel.Status)
@@ -354,10 +350,8 @@ else
         [StringLength(50)]
         public string Status { get; set; } = "Active";
 
-        [StringLength(1000, ErrorMessage = "Terms cannot exceed 1000 characters")]
+        [StringLength(5000, ErrorMessage = "Terms cannot exceed 2000 characters")]
         public string Terms { get; set; } = string.Empty;
 
-        [StringLength(500, ErrorMessage = "Notes cannot exceed 500 characters")]
-        public string Notes { get; set; } = string.Empty;
     }
 }
\ No newline at end of file
diff --git a/Aquiis.SimpleStart/Features/PropertyManagement/Leases/Pages/Leases.razor b/Aquiis.SimpleStart/Features/PropertyManagement/Leases/Pages/Leases.razor
index 7fe42d4..e9bc97a 100644
--- a/Aquiis.SimpleStart/Features/PropertyManagement/Leases/Pages/Leases.razor
+++ b/Aquiis.SimpleStart/Features/PropertyManagement/Leases/Pages/Leases.razor
@@ -89,7 +89,7 @@ else if (!leases.Any())
         else
         {
             <h4>No Leases Found</h4>
-            <p>Get started by creating your first lease agreement.</p>
+            <p>Get started by converting a lease offer to your first lease agreement.</p>
             <button class="btn btn-primary" @onclick="CreateLease">Create First Lease</button>
         }
     </div>
@@ -178,7 +178,7 @@ else
                     var property = propertyGroup.First().Property;
                     var propertyLeaseCount = propertyGroup.Count();
                     var activeLeaseCount = propertyGroup.Count(l => l.Status == "Active");
-                    var isExpanded = expandedProperties.Contains(propertyGroup.Key);
+                    var isExpanded = expandedProperties.Contains(propertyGroup.Key.GetHashCode());
                     
                     <div class="card mb-3">
                         <div class="card-header" style="cursor: pointer;" @onclick="() => TogglePropertyGroup(propertyGroup.Key)">
@@ -496,11 +496,11 @@ else
     private List<Lease>? leases;
     private List<Lease> filteredLeases = new();
     private List<Lease> pagedLeases = new();
-    private IEnumerable<IGrouping<int, Lease>> groupedLeases = Enumerable.Empty<IGrouping<int, Lease>>();
+    private IEnumerable<IGrouping<Guid, Lease>> groupedLeases = Enumerable.Empty<IGrouping<Guid, Lease>>();
     private HashSet<int> expandedProperties = new();
     private string searchTerm = string.Empty;
     private string selectedLeaseStatus = string.Empty;
-    private int? selectedTenantId;
+    private Guid? selectedTenantId;
     private List<Tenant>? availableTenants;
     private int activeCount = 0;
     private int expiringSoonCount = 0;
@@ -521,11 +521,11 @@ else
 
     [Parameter]
     [SupplyParameterFromQuery]
-    public int? TenantId { get; set; }
+    public Guid? TenantId { get; set; }
 
     [Parameter]
     [SupplyParameterFromQuery]
-    public int? PropertyId { get; set; }
+    public Guid? PropertyId { get; set; }
 
     [Parameter]
     [SupplyParameterFromQuery]
@@ -640,7 +640,7 @@ else
         if (groupByProperty)
         {
             groupedLeases = filteredLeases
-                .Where(l => l.PropertyId > 0)
+                .Where(l => l.PropertyId != Guid.Empty)
                 .GroupBy(l => l.PropertyId)
                 .OrderBy(g => g.First().Property?.Address)
                 .ToList();
@@ -661,15 +661,15 @@ else
         CalculateMetrics();
     }
     
-    private void TogglePropertyGroup(int propertyId)
+    private void TogglePropertyGroup(Guid propertyId)
     {
-        if (expandedProperties.Contains(propertyId))
+        if (expandedProperties.Contains(propertyId.GetHashCode()))
         {
-            expandedProperties.Remove(propertyId);
+            expandedProperties.Remove(propertyId.GetHashCode());
         }
         else
         {
-            expandedProperties.Add(propertyId);
+            expandedProperties.Add(propertyId.GetHashCode());
         }
     }
     
@@ -765,31 +765,33 @@ else
 
     private void CreateLease()
     {
-        NavigationManager.NavigateTo("/propertymanagement/leases/create");
+        NavigationManager.NavigateTo("/propertymanagement/leaseoffers");
     }
 
     private void CreateLeaseForTenant()
     {
-        if (TenantId.HasValue)
+        @* if (TenantId.HasValue)
         {
             NavigationManager.NavigateTo($"/propertymanagement/leases/create?tenantId={TenantId.Value}");
         }
         else
         {
             NavigationManager.NavigateTo("/propertymanagement/leases/create");
-        }
+        } *@
+        NavigationManager.NavigateTo("/propertymanagement/leaseoffers");
     }
 
     private void CreateLeaseForProperty()
     {
-        if (PropertyId.HasValue)
+        @* if (PropertyId.HasValue)
         {
             NavigationManager.NavigateTo($"/propertymanagement/leases/create?propertyId={PropertyId.Value}");
         }
         else
         {
             NavigationManager.NavigateTo("/propertymanagement/leases/create");
-        }
+        } *@
+        NavigationManager.NavigateTo("/propertymanagement/leaseoffers");
     }
 
     private void ClearFilter()
@@ -804,17 +806,17 @@ else
         NavigationManager.NavigateTo("/propertymanagement/leases", forceLoad: true);
     }
 
-    private void ViewLease(int id)
+    private void ViewLease(Guid id)
     {
         NavigationManager.NavigateTo($"/propertymanagement/leases/view/{id}");
     }
 
-    private void EditLease(int id)
+    private void EditLease(Guid id)
     {
         NavigationManager.NavigateTo($"/propertymanagement/leases/edit/{id}");
     }
 
-    private async Task DeleteLease(int id)
+    private async Task DeleteLease(Guid id)
     {
         var authState = await AuthenticationStateTask;
         var userId = authState.User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value;
diff --git a/Aquiis.SimpleStart/Features/PropertyManagement/Leases/Pages/ViewLease.razor b/Aquiis.SimpleStart/Features/PropertyManagement/Leases/Pages/ViewLease.razor
index fb82e0f..5ef4f00 100644
--- a/Aquiis.SimpleStart/Features/PropertyManagement/Leases/Pages/ViewLease.razor
+++ b/Aquiis.SimpleStart/Features/PropertyManagement/Leases/Pages/ViewLease.razor
@@ -1,6 +1,7 @@
-@page "/propertymanagement/leases/view/{Id:int}"
+@page "/propertymanagement/leases/view/{Id:guid}"
 
 @using Aquiis.SimpleStart.Core.Entities
+@using Aquiis.SimpleStart.Core.Validation
 @using Microsoft.AspNetCore.Authorization
 @using Microsoft.AspNetCore.Components.Authorization
 @using Microsoft.AspNetCore.Components
@@ -330,7 +331,18 @@ else
             </div>
         </div>
     </div>
-
+    <div class="row">
+        <div class="col-md-8 mt-4">
+            <div class="card">
+                <div class="card-header d-flex justify-content-between align-items-center">
+                    <h5 class="mb-0">Notes</h5>
+                </div>
+                <div class="card-body">
+                    <NotesTimeline EntityType="Lease" EntityId="@lease.Id" />
+                </div>
+            </div>
+        </div>
+    </div>
     @* Renewal Offer Modal *@
     @if (showRenewalModal && lease != null)
     {
@@ -389,15 +401,14 @@ else
 }
 
 @code {
-    [Parameter] public int Id { get; set; }
+    [Parameter] public Guid Id { get; set; }
 
     [Parameter]
     [SupplyParameterFromQuery]
-    public int? PropertyId { get; set; }
-
+    public Guid? PropertyId { get; set; }
     [Parameter]
     [SupplyParameterFromQuery]
-    public int? TenantId { get; set; }
+    public Guid? TenantId { get; set; }
 
     private Lease? lease;
     private List<Invoice> recentInvoices = new();
@@ -642,7 +653,7 @@ else
 
     private async Task OnPropertyChanged()
     {
-        if (leaseModel.PropertyId > 0)
+        if (leaseModel.PropertyId != Guid.Empty)
         {
             selectedProperty = availableProperties.FirstOrDefault(p => p.Id == leaseModel.PropertyId);
             if (selectedProperty != null)
@@ -762,13 +773,11 @@ else
 
     public class LeaseModel
     {
-        [Required(ErrorMessage = "Property is required")]
-        [Range(1, int.MaxValue, ErrorMessage = "Please select a property")]
-        public int PropertyId { get; set; }
+        [RequiredGuid(ErrorMessage = "Property is required")]
+        public Guid PropertyId { get; set; }
 
-        [Required(ErrorMessage = "Tenant is required")]
-        [Range(1, int.MaxValue, ErrorMessage = "Please select a tenant")]
-        public int TenantId { get; set; }
+        [RequiredGuid(ErrorMessage = "Tenant is required")]
+        public Guid TenantId { get; set; }
 
         [Required(ErrorMessage = "Start date is required")]
         public DateTime StartDate { get; set; } = DateTime.Today;
diff --git a/Aquiis.SimpleStart/Features/PropertyManagement/MaintenanceRequests/Pages/CreateMaintenanceRequest.razor b/Aquiis.SimpleStart/Features/PropertyManagement/MaintenanceRequests/Pages/CreateMaintenanceRequest.razor
index 621e500..6bb8372 100644
--- a/Aquiis.SimpleStart/Features/PropertyManagement/MaintenanceRequests/Pages/CreateMaintenanceRequest.razor
+++ b/Aquiis.SimpleStart/Features/PropertyManagement/MaintenanceRequests/Pages/CreateMaintenanceRequest.razor
@@ -51,14 +51,17 @@
                                     <ValidationMessage For="@(() => maintenanceRequest.PropertyId)" />
                                 </div>
                                 <div class="col-md-6">
-                                    <label class="form-label">Lease (Optional)</label>
-                                    <InputSelect class="form-select" @bind-Value="maintenanceRequest.LeaseId">
-                                        <option value="">-- No Lease --</option>
-                                        @foreach (var lease in availableLeases)
+                                    <label class="form-label">Active Lease</label>
+                                    <div class="form-control bg-light">
+                                        @if (currentLease != null)
                                         {
-                                            <option value="@lease.Id">Lease #@lease.Id - @lease.Tenant?.FullName</option>
+                                            <text>@currentLease.Tenant?.FullName - @currentLease.Status</text>
                                         }
-                                    </InputSelect>
+                                        else
+                                        {
+                                            <em>No active leases</em>
+                                        }
+                                    </div>
                                 </div>
                             </div>
 
@@ -202,15 +205,14 @@
 @code {
     [Parameter]
     [SupplyParameterFromQuery]
-    public int? PropertyId { get; set; }
+    public Guid? PropertyId { get; set; }
 
     [Parameter]
     [SupplyParameterFromQuery]
-    public int? LeaseId { get; set; }
-
+    public Guid? LeaseId { get; set; }
     private MaintenanceRequestModel maintenanceRequest = new();
     private List<Property> properties = new();
-    private List<Lease> availableLeases = new();
+    private Lease? currentLease = null;
     private bool isLoading = true;
     private bool isSaving = false;
 
@@ -221,15 +223,15 @@
 
     protected override async Task OnParametersSetAsync()
     {
-        if (PropertyId.HasValue && PropertyId.Value > 0 && maintenanceRequest.PropertyId != PropertyId.Value)
+        if (PropertyId.HasValue && PropertyId.Value != Guid.Empty && maintenanceRequest.PropertyId != PropertyId.Value)
         {
             maintenanceRequest.PropertyId = PropertyId.Value;
             if (properties.Any())
             {
-                await LoadLeasesForProperty(PropertyId.Value);
+                await LoadLeaseForProperty(PropertyId.Value);
             }
         }
-        if (LeaseId.HasValue && LeaseId.Value > 0 && maintenanceRequest.LeaseId != LeaseId.Value)
+        if (LeaseId.HasValue && LeaseId.Value != Guid.Empty && maintenanceRequest.LeaseId != LeaseId.Value)
         {
             maintenanceRequest.LeaseId = LeaseId.Value;
         }
@@ -242,12 +244,12 @@
         {
             properties = await PropertyManagementService.GetPropertiesAsync();
             
-            if (PropertyId.HasValue && PropertyId.Value > 0)
+            if (PropertyId.HasValue && PropertyId.Value != Guid.Empty)
             {
                 maintenanceRequest.PropertyId = PropertyId.Value;
-                await LoadLeasesForProperty(PropertyId.Value);
+                await LoadLeaseForProperty(PropertyId.Value);
             }
-            if (LeaseId.HasValue && LeaseId.Value > 0)
+            if (LeaseId.HasValue && LeaseId.Value != Guid.Empty)
             {
                 maintenanceRequest.LeaseId = LeaseId.Value;
             }
@@ -260,20 +262,22 @@
 
     private async Task OnPropertyChangedAsync()
     {
-        if (maintenanceRequest.PropertyId > 0)
+        if (maintenanceRequest.PropertyId != Guid.Empty)
         {
-            await LoadLeasesForProperty(maintenanceRequest.PropertyId);
+            await LoadLeaseForProperty(maintenanceRequest.PropertyId);
         }
         else
         {
-            availableLeases.Clear();
+            currentLease = null;
+            maintenanceRequest.LeaseId = null;
         }
     }
 
-    private async Task LoadLeasesForProperty(int propertyId)
+    private async Task LoadLeaseForProperty(Guid propertyId)
     {
-        var allLeases = await PropertyManagementService.GetLeasesByPropertyIdAsync(propertyId);
-        availableLeases = allLeases.Where(l => l.Status == "Active" || l.Status == "Pending").ToList();
+        var leases = await PropertyManagementService.GetCurrentAndUpcomingLeasesByPropertyIdAsync(propertyId);
+        currentLease = leases.FirstOrDefault();
+        maintenanceRequest.LeaseId = currentLease?.Id;
     }
 
     private async Task HandleValidSubmit()
@@ -315,10 +319,9 @@
     public class MaintenanceRequestModel
     {
         [Required(ErrorMessage = "Property is required")]
-        [Range(1, int.MaxValue, ErrorMessage = "Please select a property")]
-        public int PropertyId { get; set; }
+        public Guid PropertyId { get; set; }
 
-        public int? LeaseId { get; set; }
+        public Guid? LeaseId { get; set; }
 
         [Required(ErrorMessage = "Title is required")]
         [StringLength(100, ErrorMessage = "Title cannot exceed 100 characters")]
diff --git a/Aquiis.SimpleStart/Features/PropertyManagement/MaintenanceRequests/Pages/EditMaintenanceRequest.razor b/Aquiis.SimpleStart/Features/PropertyManagement/MaintenanceRequests/Pages/EditMaintenanceRequest.razor
index 52bebe0..414455c 100644
--- a/Aquiis.SimpleStart/Features/PropertyManagement/MaintenanceRequests/Pages/EditMaintenanceRequest.razor
+++ b/Aquiis.SimpleStart/Features/PropertyManagement/MaintenanceRequests/Pages/EditMaintenanceRequest.razor
@@ -1,4 +1,4 @@
-@page "/propertymanagement/maintenance/edit/{Id:int}"
+@page "/propertymanagement/maintenance/edit/{Id:guid}"
 @inject PropertyManagementService PropertyManagementService
 @inject NavigationManager NavigationManager
 @inject IJSRuntime JSRuntime
@@ -219,7 +219,7 @@
 
 @code {
     [Parameter]
-    public int Id { get; set; }
+    public Guid Id { get; set; }
 
     private MaintenanceRequest? maintenanceRequest;
     private List<Property> properties = new();
@@ -253,7 +253,7 @@
 
     private async Task OnPropertyChanged(ChangeEventArgs e)
     {
-        if (int.TryParse(e.Value?.ToString(), out int propertyId) && propertyId > 0)
+        if (Guid.TryParse(e.Value?.ToString(), out Guid propertyId) && propertyId != Guid.Empty)
         {
             await LoadLeasesForProperty(propertyId);
         }
@@ -263,7 +263,7 @@
         }
     }
 
-    private async Task LoadLeasesForProperty(int propertyId)
+    private async Task LoadLeasesForProperty(Guid propertyId)
     {
         var allLeases = await PropertyManagementService.GetLeasesByPropertyIdAsync(propertyId);
         availableLeases = allLeases.Where(l => l.Status == "Active" || l.Status == "Pending").ToList();
diff --git a/Aquiis.SimpleStart/Features/PropertyManagement/MaintenanceRequests/Pages/MaintenanceRequests.razor b/Aquiis.SimpleStart/Features/PropertyManagement/MaintenanceRequests/Pages/MaintenanceRequests.razor
index 83f27c4..07101b2 100644
--- a/Aquiis.SimpleStart/Features/PropertyManagement/MaintenanceRequests/Pages/MaintenanceRequests.razor
+++ b/Aquiis.SimpleStart/Features/PropertyManagement/MaintenanceRequests/Pages/MaintenanceRequests.razor
@@ -253,7 +253,7 @@ else
 
     [Parameter]
     [SupplyParameterFromQuery]
-    public int? PropertyId { get; set; }
+    public Guid? PropertyId { get; set; }
 
     protected override async Task OnInitializedAsync()
     {
@@ -338,12 +338,12 @@ else
         NavigationManager.NavigateTo("/propertymanagement/maintenance/create");
     }
 
-    private void ViewRequest(int requestId)
+    private void ViewRequest(Guid requestId)
     {
         NavigationManager.NavigateTo($"/propertymanagement/maintenance/view/{requestId}");
     }
 
-    private void ViewProperty(int propertyId)
+    private void ViewProperty(Guid propertyId)
     {
         NavigationManager.NavigateTo($"/propertymanagement/properties/view/{propertyId}");
     }
diff --git a/Aquiis.SimpleStart/Features/PropertyManagement/MaintenanceRequests/Pages/ViewMaintenanceRequest.razor b/Aquiis.SimpleStart/Features/PropertyManagement/MaintenanceRequests/Pages/ViewMaintenanceRequest.razor
index b9fd298..c1ef3fc 100644
--- a/Aquiis.SimpleStart/Features/PropertyManagement/MaintenanceRequests/Pages/ViewMaintenanceRequest.razor
+++ b/Aquiis.SimpleStart/Features/PropertyManagement/MaintenanceRequests/Pages/ViewMaintenanceRequest.razor
@@ -1,4 +1,4 @@
-@page "/propertymanagement/maintenance/view/{Id:int}"
+@page "/propertymanagement/maintenance/view/{Id:guid}"
 
 @using Aquiis.SimpleStart.Application.Services
 @using Aquiis.SimpleStart.Shared.Services
@@ -256,7 +256,7 @@ else
 
 @code {
     [Parameter]
-    public int Id { get; set; }
+    public Guid Id { get; set; }
 
     private MaintenanceRequest? maintenanceRequest;
     private bool isLoading = true;
diff --git a/Aquiis.SimpleStart/Features/PropertyManagement/Payments/Pages/CreatePayment.razor b/Aquiis.SimpleStart/Features/PropertyManagement/Payments/Pages/CreatePayment.razor
index 6d6a9a4..6ca2219 100644
--- a/Aquiis.SimpleStart/Features/PropertyManagement/Payments/Pages/CreatePayment.razor
+++ b/Aquiis.SimpleStart/Features/PropertyManagement/Payments/Pages/CreatePayment.razor
@@ -201,7 +201,7 @@
 
     [Parameter]
     [SupplyParameterFromQuery]
-    public int? InvoiceId { get; set; }
+    public Guid? InvoiceId { get; set; }
 
     protected override async Task OnInitializedAsync()
     {
@@ -226,7 +226,7 @@
 
     private async Task OnInvoiceSelected()
     {
-        if (paymentModel.InvoiceId > 0)
+        if (paymentModel.InvoiceId != Guid.Empty)
         {
             selectedInvoice = invoices?.FirstOrDefault(i => i.Id == paymentModel.InvoiceId);
             if (selectedInvoice != null)
@@ -266,8 +266,7 @@
     public class PaymentModel
     {
         [Required(ErrorMessage = "Please select an invoice.")]
-        [Range(1, int.MaxValue, ErrorMessage = "Please select an invoice.")]
-        public int InvoiceId { get; set; }
+        public Guid InvoiceId { get; set; }
 
         [Required(ErrorMessage = "Payment date is required.")]
         public DateTime PaidOn { get; set; } = DateTime.Now;
diff --git a/Aquiis.SimpleStart/Features/PropertyManagement/Payments/Pages/EditPayment.razor b/Aquiis.SimpleStart/Features/PropertyManagement/Payments/Pages/EditPayment.razor
index e7d8e2a..208e312 100644
--- a/Aquiis.SimpleStart/Features/PropertyManagement/Payments/Pages/EditPayment.razor
+++ b/Aquiis.SimpleStart/Features/PropertyManagement/Payments/Pages/EditPayment.razor
@@ -1,4 +1,4 @@
-@page "/propertymanagement/payments/edit/{PaymentId:int}"
+@page "/propertymanagement/payments/edit/{PaymentId:guid}"
 @using Aquiis.SimpleStart.Features.PropertyManagement
 @using Microsoft.AspNetCore.Authorization
 @using Microsoft.AspNetCore.Components.Web
@@ -214,7 +214,7 @@ else
 
 @code {
     [Parameter]
-    public int PaymentId { get; set; }
+    public Guid PaymentId { get; set; }
 
     private Payment? payment;
     private PaymentModel? paymentModel;
diff --git a/Aquiis.SimpleStart/Features/PropertyManagement/Payments/Pages/Payments.razor b/Aquiis.SimpleStart/Features/PropertyManagement/Payments/Pages/Payments.razor
index 369f2fc..36c378d 100644
--- a/Aquiis.SimpleStart/Features/PropertyManagement/Payments/Pages/Payments.razor
+++ b/Aquiis.SimpleStart/Features/PropertyManagement/Payments/Pages/Payments.razor
@@ -301,8 +301,8 @@ else
     private List<Payment>? payments;
     private List<Payment> filteredPayments = new();
     private List<Payment> pagedPayments = new();
-    private IEnumerable<IGrouping<int, Payment>> groupedPayments = Enumerable.Empty<IGrouping<int, Payment>>();
-    private HashSet<int> expandedInvoices = new();
+    private IEnumerable<IGrouping<Guid, Payment>> groupedPayments = Enumerable.Empty<IGrouping<Guid, Payment>>();
+    private HashSet<Guid> expandedInvoices = new();
     private string searchTerm = string.Empty;
     private string selectedMethod = string.Empty;
     private string sortColumn = nameof(Payment.PaidOn);
@@ -376,7 +376,7 @@ else
         }
     }
 
-    private void ToggleInvoiceGroup(int invoiceId)
+    private void ToggleInvoiceGroup(Guid invoiceId)
     {
         if (expandedInvoices.Contains(invoiceId))
         {
@@ -471,12 +471,12 @@ else
         Navigation.NavigateTo("/propertymanagement/payments/create");
     }
 
-    private void ViewPayment(int id)
+    private void ViewPayment(Guid id)
     {
         Navigation.NavigateTo($"/propertymanagement/payments/view/{id}");
     }
 
-    private void EditPayment(int id)
+    private void EditPayment(Guid id)
     {
         Navigation.NavigateTo($"/propertymanagement/payments/edit/{id}");
     }
diff --git a/Aquiis.SimpleStart/Features/PropertyManagement/Payments/Pages/ViewPayment.razor b/Aquiis.SimpleStart/Features/PropertyManagement/Payments/Pages/ViewPayment.razor
index e50652c..c03332d 100644
--- a/Aquiis.SimpleStart/Features/PropertyManagement/Payments/Pages/ViewPayment.razor
+++ b/Aquiis.SimpleStart/Features/PropertyManagement/Payments/Pages/ViewPayment.razor
@@ -1,4 +1,4 @@
-@page "/propertymanagement/payments/view/{PaymentId:int}"
+@page "/propertymanagement/payments/view/{PaymentId:guid}"
 
 @using Aquiis.SimpleStart.Features.PropertyManagement
 @using Aquiis.SimpleStart.Core.Entities
@@ -306,7 +306,7 @@ else
 
 @code {
     [Parameter]
-    public int PaymentId { get; set; }
+    public Guid PaymentId { get; set; }
 
     private Payment? payment;
     private bool isGenerating = false;
diff --git a/Aquiis.SimpleStart/Features/PropertyManagement/Properties/Pages/Edit.razor b/Aquiis.SimpleStart/Features/PropertyManagement/Properties/Pages/Edit.razor
index 9c344df..e5f20bf 100644
--- a/Aquiis.SimpleStart/Features/PropertyManagement/Properties/Pages/Edit.razor
+++ b/Aquiis.SimpleStart/Features/PropertyManagement/Properties/Pages/Edit.razor
@@ -1,4 +1,4 @@
-@page "/propertymanagement/properties/edit/{PropertyId:int}"
+@page "/propertymanagement/properties/edit/{PropertyId:guid}"
 
 @using System.ComponentModel.DataAnnotations
 @using Aquiis.SimpleStart.Core.Entities
@@ -226,7 +226,7 @@ else
 
 @code {
     [Parameter]
-    public int PropertyId { get; set; }
+    public Guid PropertyId { get; set; }
 
     private string currentUserId = string.Empty;
     private string errorMessage = string.Empty;
diff --git a/Aquiis.SimpleStart/Features/PropertyManagement/Properties/Pages/Index.razor b/Aquiis.SimpleStart/Features/PropertyManagement/Properties/Pages/Index.razor
index 1629a7a..e485074 100644
--- a/Aquiis.SimpleStart/Features/PropertyManagement/Properties/Pages/Index.razor
+++ b/Aquiis.SimpleStart/Features/PropertyManagement/Properties/Pages/Index.razor
@@ -424,17 +424,17 @@ else
         Navigation.NavigateTo("/propertymanagement/properties/create");
     }
 
-    private void ViewProperty(int propertyId)
+    private void ViewProperty(Guid propertyId)
     {
         Navigation.NavigateTo($"/propertymanagement/properties/view/{propertyId}");
     }
 
-   private void EditProperty(int propertyId)
+   private void EditProperty(Guid propertyId)
    {
        Navigation.NavigateTo($"/propertymanagement/properties/edit/{propertyId}");
    }
 
-   private async Task DeleteProperty(int propertyId)
+   private async Task DeleteProperty(Guid propertyId)
    {
        var authState = await AuthenticationStateTask;
         var userId = authState.User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value;
diff --git a/Aquiis.SimpleStart/Features/PropertyManagement/Properties/Pages/View.razor b/Aquiis.SimpleStart/Features/PropertyManagement/Properties/Pages/View.razor
index 48a5593..93508cf 100644
--- a/Aquiis.SimpleStart/Features/PropertyManagement/Properties/Pages/View.razor
+++ b/Aquiis.SimpleStart/Features/PropertyManagement/Properties/Pages/View.razor
@@ -1,4 +1,4 @@
-@page "/propertymanagement/properties/view/{PropertyId:int}"
+@page "/propertymanagement/properties/view/{PropertyId:guid}"
 @using Aquiis.SimpleStart.Features.PropertyManagement
 @using Aquiis.SimpleStart.Core.Constants
 @using Aquiis.SimpleStart.Core.Entities
@@ -432,9 +432,9 @@ else
 }
 @code {
     [Parameter]
-    public int PropertyId { get; set; }
+    public Guid PropertyId { get; set; }
 
-    public int LeaseId { get; set; }
+    public Guid LeaseId { get; set; }
 
     List<Lease> activeLeases = new();
     List<Document> propertyDocuments = new();
@@ -529,7 +529,7 @@ else
         NavigationManager.NavigateTo($"/propertymanagement/maintenance/create?PropertyId={PropertyId}");
     }
 
-    private void ViewMaintenanceRequest(int requestId)
+    private void ViewMaintenanceRequest(Guid requestId)
     {
         NavigationManager.NavigateTo($"/propertymanagement/maintenance/view/{requestId}");
     }
@@ -612,12 +612,12 @@ else
         NavigationManager.NavigateTo("/propertymanagement/checklists");
     }
 
-    private void ViewChecklist(int checklistId)
+    private void ViewChecklist(Guid checklistId)
     {
         NavigationManager.NavigateTo($"/propertymanagement/checklists/view/{checklistId}");
     }
 
-    private void CompleteChecklist(int checklistId)
+    private void CompleteChecklist(Guid checklistId)
     {
         NavigationManager.NavigateTo($"/propertymanagement/checklists/complete/{checklistId}");
     }
diff --git a/Aquiis.SimpleStart/Features/PropertyManagement/Reports/Pages/IncomeStatementReport.razor b/Aquiis.SimpleStart/Features/PropertyManagement/Reports/Pages/IncomeStatementReport.razor
index 051268e..c1f12b7 100644
--- a/Aquiis.SimpleStart/Features/PropertyManagement/Reports/Pages/IncomeStatementReport.razor
+++ b/Aquiis.SimpleStart/Features/PropertyManagement/Reports/Pages/IncomeStatementReport.razor
@@ -164,12 +164,12 @@
 @code {
     private DateTime startDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, 1);
     private DateTime endDate = DateTime.Now;
-    private string? selectedPropertyId;
+    private Guid? selectedPropertyId;
     private List<Property> properties = new();
     private IncomeStatement? statement;
     private bool isLoading = false;
 
-    private string? organizationId = string.Empty;
+    private Guid? organizationId = Guid.Empty;
 
     [CascadingParameter]
     private Task<AuthenticationState>? AuthenticationStateTask { get; set; }
@@ -183,7 +183,7 @@
 
         organizationId = await UserContextService.GetActiveOrganizationIdAsync();
 
-        if (!string.IsNullOrEmpty(organizationId))
+        if (organizationId.HasValue)
         {
             properties = await PropertyManagementService.GetPropertiesAsync();
         }
@@ -201,16 +201,16 @@
             var authState = await AuthenticationStateTask;
             var userId = authState.User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value;
 
-            if (!string.IsNullOrEmpty(organizationId))
+            if (organizationId.HasValue)
             {
-                int? propertyId = null;
-                if (!string.IsNullOrEmpty(selectedPropertyId) && int.TryParse(selectedPropertyId, out int pid))
+                @* Guid? propertyId = null;
+                if (selectedPropertyId.HasValue && Guid.TryParse(selectedPropertyId, out Guid pid))
                 {
                     propertyId = pid;
-                }
+                } *@
 
                 statement = await FinancialReportService.GenerateIncomeStatementAsync(
-                    organizationId, startDate, endDate, propertyId);
+                    organizationId.Value, startDate, endDate, selectedPropertyId);
             }
         }
         finally
diff --git a/Aquiis.SimpleStart/Features/PropertyManagement/Reports/Pages/PropertyPerformanceReport.razor b/Aquiis.SimpleStart/Features/PropertyManagement/Reports/Pages/PropertyPerformanceReport.razor
index e3df60f..066ea29 100644
--- a/Aquiis.SimpleStart/Features/PropertyManagement/Reports/Pages/PropertyPerformanceReport.razor
+++ b/Aquiis.SimpleStart/Features/PropertyManagement/Reports/Pages/PropertyPerformanceReport.razor
@@ -10,6 +10,8 @@
 @inject AuthenticationStateProvider AuthenticationStateProvider
 
 @inject UserContextService UserContextService
+
+@inject ToastService ToastService
 @inject IJSRuntime JSRuntime
 @rendermode InteractiveServer
 
@@ -206,10 +208,13 @@
             var userId = authState.User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value;
             var organizationId = await UserContextService.GetActiveOrganizationIdAsync();
 
-            if (!string.IsNullOrEmpty(organizationId))
+            if (organizationId.HasValue)
             {
                 performanceItems = await FinancialReportService.GeneratePropertyPerformanceAsync(
-                    organizationId, startDate, endDate);
+                    organizationId.Value, startDate, endDate);
+            }
+            else {
+                ToastService.ShowError("Unable to determine active organization.");
             }
         }
         finally
diff --git a/Aquiis.SimpleStart/Features/PropertyManagement/Reports/Pages/RentRollReport.razor b/Aquiis.SimpleStart/Features/PropertyManagement/Reports/Pages/RentRollReport.razor
index e24fa0f..f3790f8 100644
--- a/Aquiis.SimpleStart/Features/PropertyManagement/Reports/Pages/RentRollReport.razor
+++ b/Aquiis.SimpleStart/Features/PropertyManagement/Reports/Pages/RentRollReport.razor
@@ -178,7 +178,7 @@
     [CascadingParameter]
     private Task<AuthenticationState>? AuthenticationStateTask { get; set; }
 
-    private string? organizationId = string.Empty;
+    private Guid? organizationId = Guid.Empty;
 
     private async Task GenerateReport()
     {
@@ -191,9 +191,9 @@
         {
             organizationId = await UserContextService.GetActiveOrganizationIdAsync();
 
-            if (!string.IsNullOrEmpty(organizationId))
+            if (organizationId.HasValue)
             {
-                rentRollItems = await FinancialReportService.GenerateRentRollAsync(organizationId, asOfDate);
+                rentRollItems = await FinancialReportService.GenerateRentRollAsync(organizationId.Value, asOfDate);
             }
         }
         finally
diff --git a/Aquiis.SimpleStart/Features/PropertyManagement/Reports/Pages/TaxReport.razor b/Aquiis.SimpleStart/Features/PropertyManagement/Reports/Pages/TaxReport.razor
index 3a14d44..8d0c511 100644
--- a/Aquiis.SimpleStart/Features/PropertyManagement/Reports/Pages/TaxReport.razor
+++ b/Aquiis.SimpleStart/Features/PropertyManagement/Reports/Pages/TaxReport.razor
@@ -214,12 +214,12 @@
 
 @code {
     private int taxYear = DateTime.Now.Month >= 11 ? DateTime.Now.Year : DateTime.Now.Year - 1;
-    private string? selectedPropertyId;
+    private Guid? selectedPropertyId;
     private List<Property> properties = new();
     private List<TaxReportData> taxReports = new();
     private bool isLoading = false;
 
-    private string? organizationId = string.Empty;
+    private Guid? organizationId = Guid.Empty;
 
     [CascadingParameter]
     private Task<AuthenticationState>? AuthenticationStateTask { get; set; }
@@ -251,15 +251,10 @@
             var authState = await AuthenticationStateTask;
             var userId = authState.User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value;
 
-            if (!string.IsNullOrEmpty(userId) && !string.IsNullOrEmpty(organizationId))
+            if (!string.IsNullOrEmpty(userId) && organizationId.HasValue)
             {
-                int? propertyId = null;
-                if (!string.IsNullOrEmpty(selectedPropertyId) && int.TryParse(selectedPropertyId, out int pid))
-                {
-                    propertyId = pid;
-                }
 
-                taxReports = await FinancialReportService.GenerateTaxReportAsync(organizationId, taxYear, propertyId);
+                taxReports = await FinancialReportService.GenerateTaxReportAsync(organizationId.Value, taxYear, selectedPropertyId);
             }
         }
         finally
diff --git a/Aquiis.SimpleStart/Features/PropertyManagement/SecurityDeposits/Pages/CalculateDividends.razor b/Aquiis.SimpleStart/Features/PropertyManagement/SecurityDeposits/Pages/CalculateDividends.razor
index 1de6120..a8a3cd6 100644
--- a/Aquiis.SimpleStart/Features/PropertyManagement/SecurityDeposits/Pages/CalculateDividends.razor
+++ b/Aquiis.SimpleStart/Features/PropertyManagement/SecurityDeposits/Pages/CalculateDividends.razor
@@ -1,4 +1,4 @@
-@page "/property-management/security-deposits/calculate-dividends/{PoolId:int}"
+@page "/property-management/security-deposits/calculate-dividends/{PoolId:guid}"
 @using Aquiis.SimpleStart.Core.Entities
 @using Aquiis.SimpleStart.Application.Services
 @using Aquiis.SimpleStart.Shared.Services
@@ -235,7 +235,7 @@
 
 @code {
     [Parameter]
-    public int PoolId { get; set; }
+    public Guid PoolId { get; set; }
 
     private SecurityDepositInvestmentPool? pool;
     private List<DividendCalculation> calculationPreview = new();
@@ -325,8 +325,8 @@
 
     private class DividendCalculation
     {
-        public int TenantId { get; set; }
-        public int LeaseId { get; set; }
+        public Guid TenantId { get; set; }
+        public Guid LeaseId { get; set; }
         public DateTime LeaseStartDate { get; set; }
         public DateTime? LeaseEndDate { get; set; }
         public int MonthsInPool { get; set; }
diff --git a/Aquiis.SimpleStart/Features/PropertyManagement/SecurityDeposits/Pages/InvestmentPools.razor b/Aquiis.SimpleStart/Features/PropertyManagement/SecurityDeposits/Pages/InvestmentPools.razor
index fc28679..ad90293 100644
--- a/Aquiis.SimpleStart/Features/PropertyManagement/SecurityDeposits/Pages/InvestmentPools.razor
+++ b/Aquiis.SimpleStart/Features/PropertyManagement/SecurityDeposits/Pages/InvestmentPools.razor
@@ -312,17 +312,17 @@
         NavigationManager.NavigateTo("/property-management/security-deposits/record-performance");
     }
 
-    private void ViewPoolDetails(int poolId)
+    private void ViewPoolDetails(Guid poolId)
     {
         NavigationManager.NavigateTo($"/property-management/security-deposits/investment-pool/{poolId}");
     }
 
-    private void CalculateDividends(int poolId)
+    private void CalculateDividends(Guid poolId)
     {
         NavigationManager.NavigateTo($"/property-management/security-deposits/calculate-dividends/{poolId}");
     }
 
-    private async Task ClosePool(int poolId, int year)
+    private async Task ClosePool(Guid poolId, int year)
     {
         try
         {
diff --git a/Aquiis.SimpleStart/Features/PropertyManagement/SecurityDeposits/Pages/SecurityDeposits.razor b/Aquiis.SimpleStart/Features/PropertyManagement/SecurityDeposits/Pages/SecurityDeposits.razor
index 07c1a99..bcac3da 100644
--- a/Aquiis.SimpleStart/Features/PropertyManagement/SecurityDeposits/Pages/SecurityDeposits.razor
+++ b/Aquiis.SimpleStart/Features/PropertyManagement/SecurityDeposits/Pages/SecurityDeposits.razor
@@ -365,7 +365,7 @@
         FilterDeposits();
     }
 
-    private async Task AddToPool(int depositId)
+    private async Task AddToPool(Guid depositId)
     {
         try
         {
@@ -379,7 +379,7 @@
         }
     }
 
-    private async Task RemoveFromPool(int depositId)
+    private async Task RemoveFromPool(Guid depositId)
     {
         try
         {
@@ -393,7 +393,7 @@
         }
     }
 
-    private void InitiateRefund(int depositId)
+    private void InitiateRefund(Guid depositId)
     {
         // TODO: Navigate to refund workflow page when implemented
         ToastService.ShowInfo("Refund workflow coming soon");
diff --git a/Aquiis.SimpleStart/Features/PropertyManagement/SecurityDeposits/Pages/ViewInvestmentPool.razor b/Aquiis.SimpleStart/Features/PropertyManagement/SecurityDeposits/Pages/ViewInvestmentPool.razor
index ecaf620..15575be 100644
--- a/Aquiis.SimpleStart/Features/PropertyManagement/SecurityDeposits/Pages/ViewInvestmentPool.razor
+++ b/Aquiis.SimpleStart/Features/PropertyManagement/SecurityDeposits/Pages/ViewInvestmentPool.razor
@@ -1,4 +1,4 @@
-@page "/property-management/security-deposits/investment-pool/{PoolId:int}"
+@page "/property-management/security-deposits/investment-pool/{PoolId:guid}"
 @using Aquiis.SimpleStart.Core.Entities
 @using Aquiis.SimpleStart.Application.Services
 @using Aquiis.SimpleStart.Shared.Services
@@ -379,7 +379,7 @@
 
 @code {
     [Parameter]
-    public int PoolId { get; set; }
+    public Guid PoolId { get; set; }
 
     private SecurityDepositInvestmentPool? pool;
     private List<SecurityDepositDividend> dividends = new();
diff --git a/Aquiis.SimpleStart/Features/PropertyManagement/Tenants/Pages/EditTenant.razor b/Aquiis.SimpleStart/Features/PropertyManagement/Tenants/Pages/EditTenant.razor
index 4c1e5fe..f9f4cb2 100644
--- a/Aquiis.SimpleStart/Features/PropertyManagement/Tenants/Pages/EditTenant.razor
+++ b/Aquiis.SimpleStart/Features/PropertyManagement/Tenants/Pages/EditTenant.razor
@@ -1,4 +1,4 @@
-@page "/propertymanagement/tenants/edit/{Id:int}"
+@page "/propertymanagement/tenants/edit/{Id:guid}"
 @using Aquiis.SimpleStart.Core.Entities
 @using System.ComponentModel.DataAnnotations
 @using Microsoft.AspNetCore.Authorization
@@ -174,7 +174,7 @@ else
 }
 
 @code {
-    [Parameter] public int Id { get; set; }
+    [Parameter] public Guid Id { get; set; }
     
     private Tenant? tenant;
     private TenantModel tenantModel = new();
diff --git a/Aquiis.SimpleStart/Features/PropertyManagement/Tenants/Pages/Tenants.razor b/Aquiis.SimpleStart/Features/PropertyManagement/Tenants/Pages/Tenants.razor
index d73262f..6bbf4f7 100644
--- a/Aquiis.SimpleStart/Features/PropertyManagement/Tenants/Pages/Tenants.razor
+++ b/Aquiis.SimpleStart/Features/PropertyManagement/Tenants/Pages/Tenants.razor
@@ -31,7 +31,7 @@ else if (!tenants.Any())
 {
     <div class="alert alert-info">
         <h4>No Tenants Found</h4>
-        <p>Get started by adding your first tenant to the system.</p>
+        <p>Get started by converting a Prospective Tenant to your first tenant in the system.</p>
         <button class="btn btn-primary" @onclick="CreateTenant">Add First Tenant</button>
     </div>
 }
@@ -345,20 +345,20 @@ else
 
     private void CreateTenant()
     {
-        Navigation.NavigateTo("/propertymanagement/tenants/create");
+        Navigation.NavigateTo("/propertymanagement/prospectivetenants");
     }
 
-    private void ViewTenant(int id)
+    private void ViewTenant(Guid id)
     {
         Navigation.NavigateTo($"/propertymanagement/tenants/view/{id}");
     }
 
-    private void EditTenant(int id)
+    private void EditTenant(Guid id)
     {
         Navigation.NavigateTo($"/propertymanagement/tenants/edit/{id}");
     }
 
-    private async Task DeleteTenant(int id)
+    private async Task DeleteTenant(Guid id)
     {
         var authState = await AuthenticationStateTask;
         var userId = authState.User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value;
diff --git a/Aquiis.SimpleStart/Features/PropertyManagement/Tenants/Pages/View.razor b/Aquiis.SimpleStart/Features/PropertyManagement/Tenants/Pages/View.razor
index 8d76970..88da40f 100644
--- a/Aquiis.SimpleStart/Features/PropertyManagement/Tenants/Pages/View.razor
+++ b/Aquiis.SimpleStart/Features/PropertyManagement/Tenants/Pages/View.razor
@@ -1,4 +1,4 @@
-@page "/propertymanagement/tenants/view/{Id:int}"
+@page "/propertymanagement/tenants/view/{Id:guid}"
 @using Aquiis.SimpleStart.Core.Entities
 @using Microsoft.AspNetCore.Authorization
 @inject NavigationManager NavigationManager
@@ -175,7 +175,8 @@ else
 }
 
 @code {
-    [Parameter] public int Id { get; set; }
+    [Parameter]
+    public Guid Id { get; set; }
     
     private Tenant? tenant;
     private List<Lease> tenantLeases = new();
diff --git a/Aquiis.SimpleStart/Infrastructure/Data/ApplicationDbContext.cs b/Aquiis.SimpleStart/Infrastructure/Data/ApplicationDbContext.cs
index bc70385..110583e 100644
--- a/Aquiis.SimpleStart/Infrastructure/Data/ApplicationDbContext.cs
+++ b/Aquiis.SimpleStart/Infrastructure/Data/ApplicationDbContext.cs
@@ -527,52 +527,58 @@ private void SeedChecklistTemplates(ModelBuilder modelBuilder)
         {
             var systemTimestamp = DateTime.Parse("2025-11-30T00:00:00Z").ToUniversalTime();
             
+            // Fixed GUIDs for system templates (consistent across deployments)
+            var propertyTourTemplateId = Guid.Parse("00000000-0000-0000-0001-000000000001");
+            var moveInTemplateId = Guid.Parse("00000000-0000-0000-0001-000000000002");
+            var moveOutTemplateId = Guid.Parse("00000000-0000-0000-0001-000000000003");
+            var openHouseTemplateId = Guid.Parse("00000000-0000-0000-0001-000000000004");
+            
             // Seed ChecklistTemplates
             modelBuilder.Entity<ChecklistTemplate>().HasData(
                 new ChecklistTemplate
                 {
-                    Id = 1,
+                    Id = propertyTourTemplateId,
                     Name = "Property Tour",
                     Description = "Standard property showing checklist",
                     Category = "Tour",
                     IsSystemTemplate = true,
-                    OrganizationId = string.Empty,
+                    OrganizationId = Guid.Empty,
                     CreatedOn = systemTimestamp,
                     CreatedBy = string.Empty,
                     IsDeleted = false
                 },
                 new ChecklistTemplate
                 {
-                    Id = 2,
+                    Id = moveInTemplateId,
                     Name = "Move-In",
                     Description = "Move-in inspection checklist",
                     Category = "MoveIn",
                     IsSystemTemplate = true,
-                    OrganizationId = string.Empty,
+                    OrganizationId = Guid.Empty,
                     CreatedOn = systemTimestamp,
                     CreatedBy = string.Empty,
                     IsDeleted = false
                 },
                 new ChecklistTemplate
                 {
-                    Id = 3,
+                    Id = moveOutTemplateId,
                     Name = "Move-Out",
                     Description = "Move-out inspection checklist",
                     Category = "MoveOut",
                     IsSystemTemplate = true,
-                    OrganizationId = string.Empty,
+                    OrganizationId = Guid.Empty,
                     CreatedOn = systemTimestamp,
                     CreatedBy = string.Empty,
                     IsDeleted = false
                 },
                 new ChecklistTemplate
                 {
-                    Id = 4,
+                    Id = openHouseTemplateId,
                     Name = "Open House",
                     Description = "Open house event checklist",
                     Category = "Tour",
                     IsSystemTemplate = true,
-                    OrganizationId = string.Empty,
+                    OrganizationId = Guid.Empty,
                     CreatedOn = systemTimestamp,
                     CreatedBy = string.Empty,
                     IsDeleted = false
@@ -582,52 +588,52 @@ private void SeedChecklistTemplates(ModelBuilder modelBuilder)
             // Seed Property Tour Checklist Items
             modelBuilder.Entity<ChecklistTemplateItem>().HasData(
                 // Arrival & Introduction (Section 1)
-                new ChecklistTemplateItem { Id = 1, ChecklistTemplateId = 1, ItemText = "Greeted prospect and verified appointment", ItemOrder = 1, CategorySection = "Arrival & Introduction", SectionOrder = 1, IsRequired = true, RequiresValue = false, AllowsNotes = true, OrganizationId = string.Empty, CreatedOn = systemTimestamp, CreatedBy = string.Empty, IsDeleted = false },
-                new ChecklistTemplateItem { Id = 2, ChecklistTemplateId = 1, ItemText = "Reviewed property exterior and curb appeal", ItemOrder = 2, CategorySection = "Arrival & Introduction", SectionOrder = 1, IsRequired = true, RequiresValue = false, AllowsNotes = true, OrganizationId = string.Empty, CreatedOn = systemTimestamp, CreatedBy = string.Empty, IsDeleted = false },
-                new ChecklistTemplateItem { Id = 3, ChecklistTemplateId = 1, ItemText = "Showed parking area/garage", ItemOrder = 3, CategorySection = "Arrival & Introduction", SectionOrder = 1, IsRequired = true, RequiresValue = false, AllowsNotes = true, OrganizationId = string.Empty, CreatedOn = systemTimestamp, CreatedBy = string.Empty, IsDeleted = false },
+                new ChecklistTemplateItem { Id = Guid.Parse("00000000-0000-0000-0002-000000000001"), ChecklistTemplateId = propertyTourTemplateId, ItemText = "Greeted prospect and verified appointment", ItemOrder = 1, CategorySection = "Arrival & Introduction", SectionOrder = 1, IsRequired = true, RequiresValue = false, AllowsNotes = true, OrganizationId = Guid.Empty, CreatedOn = systemTimestamp, CreatedBy = string.Empty, IsDeleted = false },
+                new ChecklistTemplateItem { Id = Guid.Parse("00000000-0000-0000-0002-000000000002"), ChecklistTemplateId = propertyTourTemplateId, ItemText = "Reviewed property exterior and curb appeal", ItemOrder = 2, CategorySection = "Arrival & Introduction", SectionOrder = 1, IsRequired = true, RequiresValue = false, AllowsNotes = true, OrganizationId = Guid.Empty, CreatedOn = systemTimestamp, CreatedBy = string.Empty, IsDeleted = false },
+                new ChecklistTemplateItem { Id = Guid.Parse("00000000-0000-0000-0002-000000000003"), ChecklistTemplateId = propertyTourTemplateId, ItemText = "Showed parking area/garage", ItemOrder = 3, CategorySection = "Arrival & Introduction", SectionOrder = 1, IsRequired = true, RequiresValue = false, AllowsNotes = true, OrganizationId = Guid.Empty, CreatedOn = systemTimestamp, CreatedBy = string.Empty, IsDeleted = false },
 
                 // Interior Tour (Section 2)
-                new ChecklistTemplateItem { Id = 4, ChecklistTemplateId = 1, ItemText = "Toured living room/common areas", ItemOrder = 4, CategorySection = "Interior Tour", SectionOrder = 2, IsRequired = true, RequiresValue = false, AllowsNotes = true, OrganizationId = string.Empty, CreatedOn = systemTimestamp, CreatedBy = string.Empty, IsDeleted = false },
-                new ChecklistTemplateItem { Id = 5, ChecklistTemplateId = 1, ItemText = "Showed all bedrooms", ItemOrder = 5, CategorySection = "Interior Tour", SectionOrder = 2, IsRequired = true, RequiresValue = false, AllowsNotes = true, OrganizationId = string.Empty, CreatedOn = systemTimestamp, CreatedBy = string.Empty, IsDeleted = false },
-                new ChecklistTemplateItem { Id = 6, ChecklistTemplateId = 1, ItemText = "Showed all bathrooms", ItemOrder = 6, CategorySection = "Interior Tour", SectionOrder = 2, IsRequired = true, RequiresValue = false, AllowsNotes = true, OrganizationId = string.Empty, CreatedOn = systemTimestamp, CreatedBy = string.Empty, IsDeleted = false },
+                new ChecklistTemplateItem { Id = Guid.Parse("00000000-0000-0000-0002-000000000004"), ChecklistTemplateId = propertyTourTemplateId, ItemText = "Toured living room/common areas", ItemOrder = 4, CategorySection = "Interior Tour", SectionOrder = 2, IsRequired = true, RequiresValue = false, AllowsNotes = true, OrganizationId = Guid.Empty, CreatedOn = systemTimestamp, CreatedBy = string.Empty, IsDeleted = false },
+                new ChecklistTemplateItem { Id = Guid.Parse("00000000-0000-0000-0002-000000000005"), ChecklistTemplateId = propertyTourTemplateId, ItemText = "Showed all bedrooms", ItemOrder = 5, CategorySection = "Interior Tour", SectionOrder = 2, IsRequired = true, RequiresValue = false, AllowsNotes = true, OrganizationId = Guid.Empty, CreatedOn = systemTimestamp, CreatedBy = string.Empty, IsDeleted = false },
+                new ChecklistTemplateItem { Id = Guid.Parse("00000000-0000-0000-0002-000000000006"), ChecklistTemplateId = propertyTourTemplateId, ItemText = "Showed all bathrooms", ItemOrder = 6, CategorySection = "Interior Tour", SectionOrder = 2, IsRequired = true, RequiresValue = false, AllowsNotes = true, OrganizationId = Guid.Empty, CreatedOn = systemTimestamp, CreatedBy = string.Empty, IsDeleted = false },
 
                 // Kitchen & Appliances (Section 3)
-                new ChecklistTemplateItem { Id = 7, ChecklistTemplateId = 1, ItemText = "Toured kitchen and demonstrated appliances", ItemOrder = 7, CategorySection = "Kitchen & Appliances", SectionOrder = 3, IsRequired = true, RequiresValue = false, AllowsNotes = true, OrganizationId = string.Empty, CreatedOn = systemTimestamp, CreatedBy = string.Empty, IsDeleted = false },
-                new ChecklistTemplateItem { Id = 8, ChecklistTemplateId = 1, ItemText = "Explained which appliances are included", ItemOrder = 8, CategorySection = "Kitchen & Appliances", SectionOrder = 3, IsRequired = true, RequiresValue = false, AllowsNotes = true, OrganizationId = string.Empty, CreatedOn = systemTimestamp, CreatedBy = string.Empty, IsDeleted = false },
+                new ChecklistTemplateItem { Id = Guid.Parse("00000000-0000-0000-0002-000000000007"), ChecklistTemplateId = propertyTourTemplateId, ItemText = "Toured kitchen and demonstrated appliances", ItemOrder = 7, CategorySection = "Kitchen & Appliances", SectionOrder = 3, IsRequired = true, RequiresValue = false, AllowsNotes = true, OrganizationId = Guid.Empty, CreatedOn = systemTimestamp, CreatedBy = string.Empty, IsDeleted = false },
+                new ChecklistTemplateItem { Id = Guid.Parse("00000000-0000-0000-0002-000000000008"), ChecklistTemplateId = propertyTourTemplateId, ItemText = "Explained which appliances are included", ItemOrder = 8, CategorySection = "Kitchen & Appliances", SectionOrder = 3, IsRequired = true, RequiresValue = false, AllowsNotes = true, OrganizationId = Guid.Empty, CreatedOn = systemTimestamp, CreatedBy = string.Empty, IsDeleted = false },
                 // Utilities & Systems (Section 4)
-                new ChecklistTemplateItem { Id = 9, ChecklistTemplateId = 1, ItemText = "Explained HVAC system and thermostat controls", ItemOrder = 9, CategorySection = "Utilities & Systems", SectionOrder = 4, IsRequired = true, RequiresValue = false, AllowsNotes = true, OrganizationId = string.Empty, CreatedOn = systemTimestamp, CreatedBy = string.Empty, IsDeleted = false },
-                new ChecklistTemplateItem { Id = 10, ChecklistTemplateId = 1, ItemText = "Reviewed utility responsibilities (tenant vs landlord)", ItemOrder = 10, CategorySection = "Utilities & Systems", SectionOrder = 4, IsRequired = true, RequiresValue = false, AllowsNotes = true, OrganizationId = string.Empty, CreatedOn = systemTimestamp, CreatedBy = string.Empty, IsDeleted = false },
-                new ChecklistTemplateItem { Id = 11, ChecklistTemplateId = 1, ItemText = "Showed water heater location", ItemOrder = 11, CategorySection = "Utilities & Systems", SectionOrder = 4, IsRequired = true, RequiresValue = false, AllowsNotes = true, OrganizationId = string.Empty, CreatedOn = systemTimestamp, CreatedBy = string.Empty, IsDeleted = false },
+                new ChecklistTemplateItem { Id = Guid.Parse("00000000-0000-0000-0002-000000000009"), ChecklistTemplateId = propertyTourTemplateId, ItemText = "Explained HVAC system and thermostat controls", ItemOrder = 9, CategorySection = "Utilities & Systems", SectionOrder = 4, IsRequired = true, RequiresValue = false, AllowsNotes = true, OrganizationId = Guid.Empty, CreatedOn = systemTimestamp, CreatedBy = string.Empty, IsDeleted = false },
+                new ChecklistTemplateItem { Id = Guid.Parse("00000000-0000-0000-0002-000000000010"), ChecklistTemplateId = propertyTourTemplateId, ItemText = "Reviewed utility responsibilities (tenant vs landlord)", ItemOrder = 10, CategorySection = "Utilities & Systems", SectionOrder = 4, IsRequired = true, RequiresValue = false, AllowsNotes = true, OrganizationId = Guid.Empty, CreatedOn = systemTimestamp, CreatedBy = string.Empty, IsDeleted = false },
+                new ChecklistTemplateItem { Id = Guid.Parse("00000000-0000-0000-0002-000000000011"), ChecklistTemplateId = propertyTourTemplateId, ItemText = "Showed water heater location", ItemOrder = 11, CategorySection = "Utilities & Systems", SectionOrder = 4, IsRequired = true, RequiresValue = false, AllowsNotes = true, OrganizationId = Guid.Empty, CreatedOn = systemTimestamp, CreatedBy = string.Empty, IsDeleted = false },
                 // Storage & Amenities (Section 5)
-                new ChecklistTemplateItem { Id = 12, ChecklistTemplateId = 1, ItemText = "Showed storage areas (closets, attic, basement)", ItemOrder = 12, CategorySection = "Storage & Amenities", SectionOrder = 5, IsRequired = true, RequiresValue = false, AllowsNotes = true, OrganizationId = string.Empty, CreatedOn = systemTimestamp, CreatedBy = string.Empty, IsDeleted = false },
-                new ChecklistTemplateItem { Id = 13, ChecklistTemplateId = 1, ItemText = "Showed laundry facilities", ItemOrder = 13, CategorySection = "Storage & Amenities", SectionOrder = 5, IsRequired = true, RequiresValue = false, AllowsNotes = true, OrganizationId = string.Empty, CreatedOn = systemTimestamp, CreatedBy = string.Empty, IsDeleted = false },
-                new ChecklistTemplateItem { Id = 14, ChecklistTemplateId = 1, ItemText = "Showed outdoor space (yard, patio, balcony)", ItemOrder = 14, CategorySection = "Storage & Amenities", SectionOrder = 5, IsRequired = true, RequiresValue = false, AllowsNotes = true, OrganizationId = string.Empty, CreatedOn = systemTimestamp, CreatedBy = string.Empty, IsDeleted = false },
+                new ChecklistTemplateItem { Id = Guid.Parse("00000000-0000-0000-0002-000000000012"), ChecklistTemplateId = propertyTourTemplateId, ItemText = "Showed storage areas (closets, attic, basement)", ItemOrder = 12, CategorySection = "Storage & Amenities", SectionOrder = 5, IsRequired = true, RequiresValue = false, AllowsNotes = true, OrganizationId = Guid.Empty, CreatedOn = systemTimestamp, CreatedBy = string.Empty, IsDeleted = false },
+                new ChecklistTemplateItem { Id = Guid.Parse("00000000-0000-0000-0002-000000000013"), ChecklistTemplateId = propertyTourTemplateId, ItemText = "Showed laundry facilities", ItemOrder = 13, CategorySection = "Storage & Amenities", SectionOrder = 5, IsRequired = true, RequiresValue = false, AllowsNotes = true, OrganizationId = Guid.Empty, CreatedOn = systemTimestamp, CreatedBy = string.Empty, IsDeleted = false },
+                new ChecklistTemplateItem { Id = Guid.Parse("00000000-0000-0000-0002-000000000014"), ChecklistTemplateId = propertyTourTemplateId, ItemText = "Showed outdoor space (yard, patio, balcony)", ItemOrder = 14, CategorySection = "Storage & Amenities", SectionOrder = 5, IsRequired = true, RequiresValue = false, AllowsNotes = true, OrganizationId = Guid.Empty, CreatedOn = systemTimestamp, CreatedBy = string.Empty, IsDeleted = false },
                 // Lease Terms (Section 6)
-                new ChecklistTemplateItem { Id = 15, ChecklistTemplateId = 1, ItemText = "Discussed monthly rent amount", ItemOrder = 15, CategorySection = "Lease Terms", SectionOrder = 6, IsRequired = true, RequiresValue = true, AllowsNotes = true, OrganizationId = string.Empty, CreatedOn = systemTimestamp, CreatedBy = string.Empty, IsDeleted = false },
-                new ChecklistTemplateItem { Id = 16, ChecklistTemplateId = 1, ItemText = "Explained security deposit and move-in costs", ItemOrder = 16, CategorySection = "Lease Terms", SectionOrder = 6, IsRequired = true, RequiresValue = true, AllowsNotes = true, OrganizationId = string.Empty, CreatedOn = systemTimestamp, CreatedBy = string.Empty, IsDeleted = false },
-                new ChecklistTemplateItem { Id = 17, ChecklistTemplateId = 1, ItemText = "Reviewed lease term length and start date", ItemOrder = 17, CategorySection = "Lease Terms", SectionOrder = 6, IsRequired = true, RequiresValue = false, AllowsNotes = true, OrganizationId = string.Empty, CreatedOn = systemTimestamp, CreatedBy = string.Empty, IsDeleted = false },
-                new ChecklistTemplateItem { Id = 18, ChecklistTemplateId = 1, ItemText = "Explained pet policy", ItemOrder = 18, CategorySection = "Lease Terms", SectionOrder = 6, IsRequired = true, RequiresValue = false, AllowsNotes = true, OrganizationId = string.Empty, CreatedOn = systemTimestamp, CreatedBy = string.Empty, IsDeleted = false },
+                new ChecklistTemplateItem { Id = Guid.Parse("00000000-0000-0000-0002-000000000015"), ChecklistTemplateId = propertyTourTemplateId, ItemText = "Discussed monthly rent amount", ItemOrder = 15, CategorySection = "Lease Terms", SectionOrder = 6, IsRequired = true, RequiresValue = true, AllowsNotes = true, OrganizationId = Guid.Empty, CreatedOn = systemTimestamp, CreatedBy = string.Empty, IsDeleted = false },
+                new ChecklistTemplateItem { Id = Guid.Parse("00000000-0000-0000-0002-000000000016"), ChecklistTemplateId = propertyTourTemplateId, ItemText = "Explained security deposit and move-in costs", ItemOrder = 16, CategorySection = "Lease Terms", SectionOrder = 6, IsRequired = true, RequiresValue = true, AllowsNotes = true, OrganizationId = Guid.Empty, CreatedOn = systemTimestamp, CreatedBy = string.Empty, IsDeleted = false },
+                new ChecklistTemplateItem { Id = Guid.Parse("00000000-0000-0000-0002-000000000017"), ChecklistTemplateId = propertyTourTemplateId, ItemText = "Reviewed lease term length and start date", ItemOrder = 17, CategorySection = "Lease Terms", SectionOrder = 6, IsRequired = true, RequiresValue = false, AllowsNotes = true, OrganizationId = Guid.Empty, CreatedOn = systemTimestamp, CreatedBy = string.Empty, IsDeleted = false },
+                new ChecklistTemplateItem { Id = Guid.Parse("00000000-0000-0000-0002-000000000018"), ChecklistTemplateId = propertyTourTemplateId, ItemText = "Explained pet policy", ItemOrder = 18, CategorySection = "Lease Terms", SectionOrder = 6, IsRequired = true, RequiresValue = false, AllowsNotes = true, OrganizationId = Guid.Empty, CreatedOn = systemTimestamp, CreatedBy = string.Empty, IsDeleted = false },
 
                 // Next Steps (Section 7)
-                new ChecklistTemplateItem { Id = 19, ChecklistTemplateId = 1, ItemText = "Explained application process and requirements", ItemOrder = 19, CategorySection = "Next Steps", SectionOrder = 7, IsRequired = true, RequiresValue = false, AllowsNotes = true, OrganizationId = string.Empty, CreatedOn = systemTimestamp, CreatedBy = string.Empty, IsDeleted = false },
-                new ChecklistTemplateItem { Id = 20, ChecklistTemplateId = 1, ItemText = "Reviewed screening process (background, credit check)", ItemOrder = 20, CategorySection = "Next Steps", SectionOrder = 7, IsRequired = true, RequiresValue = false, AllowsNotes = true, OrganizationId = string.Empty, CreatedOn = systemTimestamp, CreatedBy = string.Empty, IsDeleted = false },
-                new ChecklistTemplateItem { Id = 21, ChecklistTemplateId = 1, ItemText = "Answered all prospect questions", ItemOrder = 21, CategorySection = "Next Steps", SectionOrder = 7, IsRequired = true, RequiresValue = false, AllowsNotes = true, OrganizationId = string.Empty, CreatedOn = systemTimestamp, CreatedBy = string.Empty, IsDeleted = false },
+                new ChecklistTemplateItem { Id = Guid.Parse("00000000-0000-0000-0002-000000000019"), ChecklistTemplateId = propertyTourTemplateId, ItemText = "Explained application process and requirements", ItemOrder = 19, CategorySection = "Next Steps", SectionOrder = 7, IsRequired = true, RequiresValue = false, AllowsNotes = true, OrganizationId = Guid.Empty, CreatedOn = systemTimestamp, CreatedBy = string.Empty, IsDeleted = false },
+                new ChecklistTemplateItem { Id = Guid.Parse("00000000-0000-0000-0002-000000000020"), ChecklistTemplateId = propertyTourTemplateId, ItemText = "Reviewed screening process (background, credit check)", ItemOrder = 20, CategorySection = "Next Steps", SectionOrder = 7, IsRequired = true, RequiresValue = false, AllowsNotes = true, OrganizationId = Guid.Empty, CreatedOn = systemTimestamp, CreatedBy = string.Empty, IsDeleted = false },
+                new ChecklistTemplateItem { Id = Guid.Parse("00000000-0000-0000-0002-000000000021"), ChecklistTemplateId = propertyTourTemplateId, ItemText = "Answered all prospect questions", ItemOrder = 21, CategorySection = "Next Steps", SectionOrder = 7, IsRequired = true, RequiresValue = false, AllowsNotes = true, OrganizationId = Guid.Empty, CreatedOn = systemTimestamp, CreatedBy = string.Empty, IsDeleted = false },
 
                 // Assessment (Section 8)
-                new ChecklistTemplateItem { Id = 22, ChecklistTemplateId = 1, ItemText = "Prospect Interest Level", ItemOrder = 22, CategorySection = "Assessment", SectionOrder = 8, IsRequired = true, RequiresValue = true, AllowsNotes = true, OrganizationId = string.Empty, CreatedOn = systemTimestamp, CreatedBy = string.Empty, IsDeleted = false },
-                new ChecklistTemplateItem { Id = 23, ChecklistTemplateId = 1, ItemText = "Overall showing feedback and notes", ItemOrder = 23, CategorySection = "Assessment", SectionOrder = 8, IsRequired = true, RequiresValue = true, AllowsNotes = true, OrganizationId = string.Empty, CreatedOn = systemTimestamp, CreatedBy = string.Empty, IsDeleted = false },
+                new ChecklistTemplateItem { Id = Guid.Parse("00000000-0000-0000-0002-000000000022"), ChecklistTemplateId = propertyTourTemplateId, ItemText = "Prospect Interest Level", ItemOrder = 22, CategorySection = "Assessment", SectionOrder = 8, IsRequired = true, RequiresValue = true, AllowsNotes = true, OrganizationId = Guid.Empty, CreatedOn = systemTimestamp, CreatedBy = string.Empty, IsDeleted = false },
+                new ChecklistTemplateItem { Id = Guid.Parse("00000000-0000-0000-0002-000000000023"), ChecklistTemplateId = propertyTourTemplateId, ItemText = "Overall showing feedback and notes", ItemOrder = 23, CategorySection = "Assessment", SectionOrder = 8, IsRequired = true, RequiresValue = true, AllowsNotes = true, OrganizationId = Guid.Empty, CreatedOn = systemTimestamp, CreatedBy = string.Empty, IsDeleted = false },
                 // Move-In Checklist Items (Placeholders)
-                new ChecklistTemplateItem { Id = 24, ChecklistTemplateId = 2, ItemText = "Document property condition", ItemOrder = 1, CategorySection = "General", SectionOrder = 1, IsRequired = true, RequiresValue = false, AllowsNotes = true, OrganizationId = string.Empty, CreatedOn = systemTimestamp, CreatedBy = string.Empty, IsDeleted = false },
-                new ChecklistTemplateItem { Id = 25, ChecklistTemplateId = 2, ItemText = "Collect keys and access codes", ItemOrder = 2, CategorySection = "General", SectionOrder = 1, IsRequired = true, RequiresValue = false, AllowsNotes = true, OrganizationId = string.Empty, CreatedOn = systemTimestamp, CreatedBy = string.Empty, IsDeleted = false },
-                new ChecklistTemplateItem { Id = 26, ChecklistTemplateId = 2, ItemText = "Review lease terms with tenant", ItemOrder = 3, CategorySection = "General", SectionOrder = 1, IsRequired = true, RequiresValue = false, AllowsNotes = true, OrganizationId = string.Empty, CreatedOn = systemTimestamp, CreatedBy = string.Empty, IsDeleted = false },
+                new ChecklistTemplateItem { Id = Guid.Parse("00000000-0000-0000-0002-000000000024"), ChecklistTemplateId = moveInTemplateId, ItemText = "Document property condition", ItemOrder = 1, CategorySection = "General", SectionOrder = 1, IsRequired = true, RequiresValue = false, AllowsNotes = true, OrganizationId = Guid.Empty, CreatedOn = systemTimestamp, CreatedBy = string.Empty, IsDeleted = false },
+                new ChecklistTemplateItem { Id = Guid.Parse("00000000-0000-0000-0002-000000000025"), ChecklistTemplateId = moveInTemplateId, ItemText = "Collect keys and access codes", ItemOrder = 2, CategorySection = "General", SectionOrder = 1, IsRequired = true, RequiresValue = false, AllowsNotes = true, OrganizationId = Guid.Empty, CreatedOn = systemTimestamp, CreatedBy = string.Empty, IsDeleted = false },
+                new ChecklistTemplateItem { Id = Guid.Parse("00000000-0000-0000-0002-000000000026"), ChecklistTemplateId = moveInTemplateId, ItemText = "Review lease terms with tenant", ItemOrder = 3, CategorySection = "General", SectionOrder = 1, IsRequired = true, RequiresValue = false, AllowsNotes = true, OrganizationId = Guid.Empty, CreatedOn = systemTimestamp, CreatedBy = string.Empty, IsDeleted = false },
                 // Move-Out Checklist Items (Placeholders)
-                new ChecklistTemplateItem { Id = 27, ChecklistTemplateId = 3, ItemText = "Inspect property condition", ItemOrder = 1, CategorySection = "General", SectionOrder = 1, IsRequired = true, RequiresValue = false, AllowsNotes = true, OrganizationId = string.Empty, CreatedOn = systemTimestamp, CreatedBy = string.Empty, IsDeleted = false },
-                new ChecklistTemplateItem { Id = 28, ChecklistTemplateId = 3, ItemText = "Collect all keys and access devices", ItemOrder = 2, CategorySection = "General", SectionOrder = 1, IsRequired = true, RequiresValue = false, AllowsNotes = true, OrganizationId = string.Empty, CreatedOn = systemTimestamp, CreatedBy = string.Empty, IsDeleted = false },
-                new ChecklistTemplateItem { Id = 29, ChecklistTemplateId = 3, ItemText = "Document damages and needed repairs", ItemOrder = 3, CategorySection = "General", SectionOrder = 1, IsRequired = true, RequiresValue = false, AllowsNotes = true, OrganizationId = string.Empty, CreatedOn = systemTimestamp, CreatedBy = string.Empty, IsDeleted = false },
+                new ChecklistTemplateItem { Id = Guid.Parse("00000000-0000-0000-0002-000000000027"), ChecklistTemplateId = moveOutTemplateId, ItemText = "Inspect property condition", ItemOrder = 1, CategorySection = "General", SectionOrder = 1, IsRequired = true, RequiresValue = false, AllowsNotes = true, OrganizationId = Guid.Empty, CreatedOn = systemTimestamp, CreatedBy = string.Empty, IsDeleted = false },
+                new ChecklistTemplateItem { Id = Guid.Parse("00000000-0000-0000-0002-000000000028"), ChecklistTemplateId = moveOutTemplateId, ItemText = "Collect all keys and access devices", ItemOrder = 2, CategorySection = "General", SectionOrder = 1, IsRequired = true, RequiresValue = false, AllowsNotes = true, OrganizationId = Guid.Empty, CreatedOn = systemTimestamp, CreatedBy = string.Empty, IsDeleted = false },
+                new ChecklistTemplateItem { Id = Guid.Parse("00000000-0000-0000-0002-000000000029"), ChecklistTemplateId = moveOutTemplateId, ItemText = "Document damages and needed repairs", ItemOrder = 3, CategorySection = "General", SectionOrder = 1, IsRequired = true, RequiresValue = false, AllowsNotes = true, OrganizationId = Guid.Empty, CreatedOn = systemTimestamp, CreatedBy = string.Empty, IsDeleted = false },
                 // Open House Checklist Items (Placeholders)
-                new ChecklistTemplateItem { Id = 30, ChecklistTemplateId = 4, ItemText = "Set up signage and directional markers", ItemOrder = 1, CategorySection = "Preparation", SectionOrder = 1, IsRequired = true, RequiresValue = false, AllowsNotes = true, OrganizationId = string.Empty, CreatedOn = systemTimestamp, CreatedBy = string.Empty, IsDeleted = false },
-                new ChecklistTemplateItem { Id = 31, ChecklistTemplateId = 4, ItemText = "Prepare information packets", ItemOrder = 2, CategorySection = "Preparation", SectionOrder = 1, IsRequired = true, RequiresValue = false, AllowsNotes = true, OrganizationId = string.Empty, CreatedOn = systemTimestamp, CreatedBy = string.Empty, IsDeleted = false },
-                new ChecklistTemplateItem { Id = 32, ChecklistTemplateId = 4, ItemText = "Set up visitor sign-in sheet", ItemOrder = 3, CategorySection = "Preparation", SectionOrder = 1, IsRequired = true, RequiresValue = false, AllowsNotes = true, OrganizationId = string.Empty, CreatedOn = systemTimestamp, CreatedBy = string.Empty, IsDeleted = false }
+                new ChecklistTemplateItem { Id = Guid.Parse("00000000-0000-0000-0002-000000000030"), ChecklistTemplateId = openHouseTemplateId, ItemText = "Set up signage and directional markers", ItemOrder = 1, CategorySection = "Preparation", SectionOrder = 1, IsRequired = true, RequiresValue = false, AllowsNotes = true, OrganizationId = Guid.Empty, CreatedOn = systemTimestamp, CreatedBy = string.Empty, IsDeleted = false },
+                new ChecklistTemplateItem { Id = Guid.Parse("00000000-0000-0000-0002-000000000031"), ChecklistTemplateId = openHouseTemplateId, ItemText = "Prepare information packets", ItemOrder = 2, CategorySection = "Preparation", SectionOrder = 1, IsRequired = true, RequiresValue = false, AllowsNotes = true, OrganizationId = Guid.Empty, CreatedOn = systemTimestamp, CreatedBy = string.Empty, IsDeleted = false },
+                new ChecklistTemplateItem { Id = Guid.Parse("00000000-0000-0000-0002-000000000032"), ChecklistTemplateId = openHouseTemplateId, ItemText = "Set up visitor sign-in sheet", ItemOrder = 3, CategorySection = "Preparation", SectionOrder = 1, IsRequired = true, RequiresValue = false, AllowsNotes = true, OrganizationId = Guid.Empty, CreatedOn = systemTimestamp, CreatedBy = string.Empty, IsDeleted = false }
             );
         }
 
diff --git a/Aquiis.SimpleStart/Infrastructure/Data/Migrations/20251204004153_InitialCreate.Designer.cs b/Aquiis.SimpleStart/Infrastructure/Data/Migrations/20251204004153_InitialCreate.Designer.cs
deleted file mode 100644
index c3cc947..0000000
--- a/Aquiis.SimpleStart/Infrastructure/Data/Migrations/20251204004153_InitialCreate.Designer.cs
+++ /dev/null
@@ -1,3886 +0,0 @@
-// <auto-generated />
-using System;
-using Aquiis.SimpleStart.Infrastructure.Data;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-
-#nullable disable
-
-namespace Aquiis.SimpleStart.Infrastructure.Data.Migrations
-{
-    [DbContext(typeof(ApplicationDbContext))]
-    [Migration("20251204004153_InitialCreate")]
-    partial class InitialCreate
-    {
-        /// <inheritdoc />
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder.HasAnnotation("ProductVersion", "9.0.11");
-
-            modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.ApplicationScreening", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
-
-                    b.Property<DateTime?>("BackgroundCheckCompletedOn")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("BackgroundCheckNotes")
-                        .HasMaxLength(1000)
-                        .HasColumnType("TEXT");
-
-                    b.Property<bool?>("BackgroundCheckPassed")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<bool>("BackgroundCheckRequested")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<DateTime?>("BackgroundCheckRequestedOn")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime>("CreatedOn")
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime?>("CreditCheckCompletedOn")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("CreditCheckNotes")
-                        .HasMaxLength(1000)
-                        .HasColumnType("TEXT");
-
-                    b.Property<bool?>("CreditCheckPassed")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<bool>("CreditCheckRequested")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<DateTime?>("CreditCheckRequestedOn")
-                        .HasColumnType("TEXT");
-
-                    b.Property<int?>("CreditScore")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<bool>("IsDeleted")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("LastModifiedBy")
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime?>("LastModifiedOn")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("OrganizationId")
-                        .IsRequired()
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("OverallResult")
-                        .IsRequired()
-                        .HasMaxLength(50)
-                        .HasColumnType("TEXT");
-
-                    b.Property<int>("RentalApplicationId")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("ResultNotes")
-                        .HasMaxLength(2000)
-                        .HasColumnType("TEXT");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("OrganizationId");
-
-                    b.HasIndex("OverallResult");
-
-                    b.HasIndex("RentalApplicationId")
-                        .IsUnique();
-
-                    b.ToTable("ApplicationScreenings");
-                });
-
-            modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.CalendarEvent", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("Color")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime>("CreatedOn")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Description")
-                        .HasMaxLength(2000)
-                        .HasColumnType("TEXT");
-
-                    b.Property<int>("DurationMinutes")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<DateTime?>("EndOn")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("EventType")
-                        .IsRequired()
-                        .HasMaxLength(50)
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Icon")
-                        .IsRequired()
-                        .HasMaxLength(50)
-                        .HasColumnType("TEXT");
-
-                    b.Property<bool>("IsDeleted")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("LastModifiedBy")
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime?>("LastModifiedOn")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Location")
-                        .HasMaxLength(500)
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("OrganizationId")
-                        .IsRequired()
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<int?>("PropertyId")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<int?>("SourceEntityId")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("SourceEntityType")
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime>("StartOn")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .HasMaxLength(50)
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Title")
-                        .IsRequired()
-                        .HasMaxLength(200)
-                        .HasColumnType("TEXT");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("EventType");
-
-                    b.HasIndex("OrganizationId");
-
-                    b.HasIndex("PropertyId");
-
-                    b.HasIndex("SourceEntityId");
-
-                    b.HasIndex("StartOn");
-
-                    b.HasIndex("SourceEntityType", "SourceEntityId");
-
-                    b.ToTable("CalendarEvents");
-                });
-
-            modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.CalendarSettings", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
-
-                    b.Property<bool>("AutoCreateEvents")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime>("CreatedOn")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("DefaultColor")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("DefaultIcon")
-                        .HasColumnType("TEXT");
-
-                    b.Property<int>("DisplayOrder")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("EntityType")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.Property<bool>("IsDeleted")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("LastModifiedBy")
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime?>("LastModifiedOn")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("OrganizationId")
-                        .IsRequired()
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<bool>("ShowOnCalendar")
-                        .HasColumnType("INTEGER");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("OrganizationId");
-
-                    b.HasIndex("OrganizationId", "EntityType")
-                        .IsUnique();
-
-                    b.ToTable("CalendarSettings");
-                });
-
-            modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.Checklist", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
-
-                    b.Property<int>("ChecklistTemplateId")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("ChecklistType")
-                        .IsRequired()
-                        .HasMaxLength(50)
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("CompletedBy")
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime?>("CompletedOn")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime>("CreatedOn")
-                        .HasColumnType("TEXT");
-
-                    b.Property<int?>("DocumentId")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("GeneralNotes")
-                        .HasMaxLength(2000)
-                        .HasColumnType("TEXT");
-
-                    b.Property<bool>("IsDeleted")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("LastModifiedBy")
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime?>("LastModifiedOn")
-                        .HasColumnType("TEXT");
-
-                    b.Property<int?>("LeaseId")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(200)
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("OrganizationId")
-                        .IsRequired()
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<int?>("PropertyId")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .HasMaxLength(50)
-                        .HasColumnType("TEXT");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("ChecklistTemplateId");
-
-                    b.HasIndex("ChecklistType");
-
-                    b.HasIndex("CompletedOn");
-
-                    b.HasIndex("DocumentId");
-
-                    b.HasIndex("LeaseId");
-
-                    b.HasIndex("PropertyId");
-
-                    b.HasIndex("Status");
-
-                    b.ToTable("Checklists");
-                });
-
-            modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.ChecklistItem", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("CategorySection")
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<int>("ChecklistId")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime>("CreatedOn")
-                        .HasColumnType("TEXT");
-
-                    b.Property<bool>("IsChecked")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<bool>("IsDeleted")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<int>("ItemOrder")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("ItemText")
-                        .IsRequired()
-                        .HasMaxLength(500)
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("LastModifiedBy")
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime?>("LastModifiedOn")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(1000)
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("OrganizationId")
-                        .IsRequired()
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("PhotoUrl")
-                        .HasMaxLength(500)
-                        .HasColumnType("TEXT");
-
-                    b.Property<bool>("RequiresValue")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<int>("SectionOrder")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("Value")
-                        .HasMaxLength(200)
-                        .HasColumnType("TEXT");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("ChecklistId");
-
-                    b.ToTable("ChecklistItems");
-                });
-
-            modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.ChecklistTemplate", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("Category")
-                        .IsRequired()
-                        .HasMaxLength(50)
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime>("CreatedOn")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Description")
-                        .HasMaxLength(500)
-                        .HasColumnType("TEXT");
-
-                    b.Property<bool>("IsDeleted")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<bool>("IsSystemTemplate")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("LastModifiedBy")
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime?>("LastModifiedOn")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("OrganizationId")
-                        .IsRequired()
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("Category");
-
-                    b.HasIndex("OrganizationId");
-
-                    b.ToTable("ChecklistTemplates");
-
-                    b.HasData(
-                        new
-                        {
-                            Id = 1,
-                            Category = "Tour",
-                            CreatedBy = "",
-                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
-                            Description = "Standard property showing checklist",
-                            IsDeleted = false,
-                            IsSystemTemplate = true,
-                            LastModifiedBy = "",
-                            Name = "Property Tour",
-                            OrganizationId = ""
-                        },
-                        new
-                        {
-                            Id = 2,
-                            Category = "MoveIn",
-                            CreatedBy = "",
-                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
-                            Description = "Move-in inspection checklist",
-                            IsDeleted = false,
-                            IsSystemTemplate = true,
-                            LastModifiedBy = "",
-                            Name = "Move-In",
-                            OrganizationId = ""
-                        },
-                        new
-                        {
-                            Id = 3,
-                            Category = "MoveOut",
-                            CreatedBy = "",
-                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
-                            Description = "Move-out inspection checklist",
-                            IsDeleted = false,
-                            IsSystemTemplate = true,
-                            LastModifiedBy = "",
-                            Name = "Move-Out",
-                            OrganizationId = ""
-                        },
-                        new
-                        {
-                            Id = 4,
-                            Category = "Tour",
-                            CreatedBy = "",
-                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
-                            Description = "Open house event checklist",
-                            IsDeleted = false,
-                            IsSystemTemplate = true,
-                            LastModifiedBy = "",
-                            Name = "Open House",
-                            OrganizationId = ""
-                        });
-                });
-
-            modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.ChecklistTemplateItem", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
-
-                    b.Property<bool>("AllowsNotes")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("CategorySection")
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<int>("ChecklistTemplateId")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime>("CreatedOn")
-                        .HasColumnType("TEXT");
-
-                    b.Property<bool>("IsDeleted")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<bool>("IsRequired")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<int>("ItemOrder")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("ItemText")
-                        .IsRequired()
-                        .HasMaxLength(500)
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("LastModifiedBy")
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime?>("LastModifiedOn")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("OrganizationId")
-                        .IsRequired()
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<bool>("RequiresValue")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<int>("SectionOrder")
-                        .HasColumnType("INTEGER");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("ChecklistTemplateId");
-
-                    b.ToTable("ChecklistTemplateItems");
-
-                    b.HasData(
-                        new
-                        {
-                            Id = 1,
-                            AllowsNotes = true,
-                            CategorySection = "Arrival & Introduction",
-                            ChecklistTemplateId = 1,
-                            CreatedBy = "",
-                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
-                            IsDeleted = false,
-                            IsRequired = true,
-                            ItemOrder = 1,
-                            ItemText = "Greeted prospect and verified appointment",
-                            LastModifiedBy = "",
-                            OrganizationId = "",
-                            RequiresValue = false,
-                            SectionOrder = 1
-                        },
-                        new
-                        {
-                            Id = 2,
-                            AllowsNotes = true,
-                            CategorySection = "Arrival & Introduction",
-                            ChecklistTemplateId = 1,
-                            CreatedBy = "",
-                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
-                            IsDeleted = false,
-                            IsRequired = true,
-                            ItemOrder = 2,
-                            ItemText = "Reviewed property exterior and curb appeal",
-                            LastModifiedBy = "",
-                            OrganizationId = "",
-                            RequiresValue = false,
-                            SectionOrder = 1
-                        },
-                        new
-                        {
-                            Id = 3,
-                            AllowsNotes = true,
-                            CategorySection = "Arrival & Introduction",
-                            ChecklistTemplateId = 1,
-                            CreatedBy = "",
-                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
-                            IsDeleted = false,
-                            IsRequired = true,
-                            ItemOrder = 3,
-                            ItemText = "Showed parking area/garage",
-                            LastModifiedBy = "",
-                            OrganizationId = "",
-                            RequiresValue = false,
-                            SectionOrder = 1
-                        },
-                        new
-                        {
-                            Id = 4,
-                            AllowsNotes = true,
-                            CategorySection = "Interior Tour",
-                            ChecklistTemplateId = 1,
-                            CreatedBy = "",
-                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
-                            IsDeleted = false,
-                            IsRequired = true,
-                            ItemOrder = 4,
-                            ItemText = "Toured living room/common areas",
-                            LastModifiedBy = "",
-                            OrganizationId = "",
-                            RequiresValue = false,
-                            SectionOrder = 2
-                        },
-                        new
-                        {
-                            Id = 5,
-                            AllowsNotes = true,
-                            CategorySection = "Interior Tour",
-                            ChecklistTemplateId = 1,
-                            CreatedBy = "",
-                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
-                            IsDeleted = false,
-                            IsRequired = true,
-                            ItemOrder = 5,
-                            ItemText = "Showed all bedrooms",
-                            LastModifiedBy = "",
-                            OrganizationId = "",
-                            RequiresValue = false,
-                            SectionOrder = 2
-                        },
-                        new
-                        {
-                            Id = 6,
-                            AllowsNotes = true,
-                            CategorySection = "Interior Tour",
-                            ChecklistTemplateId = 1,
-                            CreatedBy = "",
-                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
-                            IsDeleted = false,
-                            IsRequired = true,
-                            ItemOrder = 6,
-                            ItemText = "Showed all bathrooms",
-                            LastModifiedBy = "",
-                            OrganizationId = "",
-                            RequiresValue = false,
-                            SectionOrder = 2
-                        },
-                        new
-                        {
-                            Id = 7,
-                            AllowsNotes = true,
-                            CategorySection = "Kitchen & Appliances",
-                            ChecklistTemplateId = 1,
-                            CreatedBy = "",
-                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
-                            IsDeleted = false,
-                            IsRequired = true,
-                            ItemOrder = 7,
-                            ItemText = "Toured kitchen and demonstrated appliances",
-                            LastModifiedBy = "",
-                            OrganizationId = "",
-                            RequiresValue = false,
-                            SectionOrder = 3
-                        },
-                        new
-                        {
-                            Id = 8,
-                            AllowsNotes = true,
-                            CategorySection = "Kitchen & Appliances",
-                            ChecklistTemplateId = 1,
-                            CreatedBy = "",
-                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
-                            IsDeleted = false,
-                            IsRequired = true,
-                            ItemOrder = 8,
-                            ItemText = "Explained which appliances are included",
-                            LastModifiedBy = "",
-                            OrganizationId = "",
-                            RequiresValue = false,
-                            SectionOrder = 3
-                        },
-                        new
-                        {
-                            Id = 9,
-                            AllowsNotes = true,
-                            CategorySection = "Utilities & Systems",
-                            ChecklistTemplateId = 1,
-                            CreatedBy = "",
-                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
-                            IsDeleted = false,
-                            IsRequired = true,
-                            ItemOrder = 9,
-                            ItemText = "Explained HVAC system and thermostat controls",
-                            LastModifiedBy = "",
-                            OrganizationId = "",
-                            RequiresValue = false,
-                            SectionOrder = 4
-                        },
-                        new
-                        {
-                            Id = 10,
-                            AllowsNotes = true,
-                            CategorySection = "Utilities & Systems",
-                            ChecklistTemplateId = 1,
-                            CreatedBy = "",
-                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
-                            IsDeleted = false,
-                            IsRequired = true,
-                            ItemOrder = 10,
-                            ItemText = "Reviewed utility responsibilities (tenant vs landlord)",
-                            LastModifiedBy = "",
-                            OrganizationId = "",
-                            RequiresValue = false,
-                            SectionOrder = 4
-                        },
-                        new
-                        {
-                            Id = 11,
-                            AllowsNotes = true,
-                            CategorySection = "Utilities & Systems",
-                            ChecklistTemplateId = 1,
-                            CreatedBy = "",
-                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
-                            IsDeleted = false,
-                            IsRequired = true,
-                            ItemOrder = 11,
-                            ItemText = "Showed water heater location",
-                            LastModifiedBy = "",
-                            OrganizationId = "",
-                            RequiresValue = false,
-                            SectionOrder = 4
-                        },
-                        new
-                        {
-                            Id = 12,
-                            AllowsNotes = true,
-                            CategorySection = "Storage & Amenities",
-                            ChecklistTemplateId = 1,
-                            CreatedBy = "",
-                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
-                            IsDeleted = false,
-                            IsRequired = true,
-                            ItemOrder = 12,
-                            ItemText = "Showed storage areas (closets, attic, basement)",
-                            LastModifiedBy = "",
-                            OrganizationId = "",
-                            RequiresValue = false,
-                            SectionOrder = 5
-                        },
-                        new
-                        {
-                            Id = 13,
-                            AllowsNotes = true,
-                            CategorySection = "Storage & Amenities",
-                            ChecklistTemplateId = 1,
-                            CreatedBy = "",
-                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
-                            IsDeleted = false,
-                            IsRequired = true,
-                            ItemOrder = 13,
-                            ItemText = "Showed laundry facilities",
-                            LastModifiedBy = "",
-                            OrganizationId = "",
-                            RequiresValue = false,
-                            SectionOrder = 5
-                        },
-                        new
-                        {
-                            Id = 14,
-                            AllowsNotes = true,
-                            CategorySection = "Storage & Amenities",
-                            ChecklistTemplateId = 1,
-                            CreatedBy = "",
-                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
-                            IsDeleted = false,
-                            IsRequired = true,
-                            ItemOrder = 14,
-                            ItemText = "Showed outdoor space (yard, patio, balcony)",
-                            LastModifiedBy = "",
-                            OrganizationId = "",
-                            RequiresValue = false,
-                            SectionOrder = 5
-                        },
-                        new
-                        {
-                            Id = 15,
-                            AllowsNotes = true,
-                            CategorySection = "Lease Terms",
-                            ChecklistTemplateId = 1,
-                            CreatedBy = "",
-                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
-                            IsDeleted = false,
-                            IsRequired = true,
-                            ItemOrder = 15,
-                            ItemText = "Discussed monthly rent amount",
-                            LastModifiedBy = "",
-                            OrganizationId = "",
-                            RequiresValue = true,
-                            SectionOrder = 6
-                        },
-                        new
-                        {
-                            Id = 16,
-                            AllowsNotes = true,
-                            CategorySection = "Lease Terms",
-                            ChecklistTemplateId = 1,
-                            CreatedBy = "",
-                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
-                            IsDeleted = false,
-                            IsRequired = true,
-                            ItemOrder = 16,
-                            ItemText = "Explained security deposit and move-in costs",
-                            LastModifiedBy = "",
-                            OrganizationId = "",
-                            RequiresValue = true,
-                            SectionOrder = 6
-                        },
-                        new
-                        {
-                            Id = 17,
-                            AllowsNotes = true,
-                            CategorySection = "Lease Terms",
-                            ChecklistTemplateId = 1,
-                            CreatedBy = "",
-                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
-                            IsDeleted = false,
-                            IsRequired = true,
-                            ItemOrder = 17,
-                            ItemText = "Reviewed lease term length and start date",
-                            LastModifiedBy = "",
-                            OrganizationId = "",
-                            RequiresValue = false,
-                            SectionOrder = 6
-                        },
-                        new
-                        {
-                            Id = 18,
-                            AllowsNotes = true,
-                            CategorySection = "Lease Terms",
-                            ChecklistTemplateId = 1,
-                            CreatedBy = "",
-                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
-                            IsDeleted = false,
-                            IsRequired = true,
-                            ItemOrder = 18,
-                            ItemText = "Explained pet policy",
-                            LastModifiedBy = "",
-                            OrganizationId = "",
-                            RequiresValue = false,
-                            SectionOrder = 6
-                        },
-                        new
-                        {
-                            Id = 19,
-                            AllowsNotes = true,
-                            CategorySection = "Next Steps",
-                            ChecklistTemplateId = 1,
-                            CreatedBy = "",
-                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
-                            IsDeleted = false,
-                            IsRequired = true,
-                            ItemOrder = 19,
-                            ItemText = "Explained application process and requirements",
-                            LastModifiedBy = "",
-                            OrganizationId = "",
-                            RequiresValue = false,
-                            SectionOrder = 7
-                        },
-                        new
-                        {
-                            Id = 20,
-                            AllowsNotes = true,
-                            CategorySection = "Next Steps",
-                            ChecklistTemplateId = 1,
-                            CreatedBy = "",
-                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
-                            IsDeleted = false,
-                            IsRequired = true,
-                            ItemOrder = 20,
-                            ItemText = "Reviewed screening process (background, credit check)",
-                            LastModifiedBy = "",
-                            OrganizationId = "",
-                            RequiresValue = false,
-                            SectionOrder = 7
-                        },
-                        new
-                        {
-                            Id = 21,
-                            AllowsNotes = true,
-                            CategorySection = "Next Steps",
-                            ChecklistTemplateId = 1,
-                            CreatedBy = "",
-                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
-                            IsDeleted = false,
-                            IsRequired = true,
-                            ItemOrder = 21,
-                            ItemText = "Answered all prospect questions",
-                            LastModifiedBy = "",
-                            OrganizationId = "",
-                            RequiresValue = false,
-                            SectionOrder = 7
-                        },
-                        new
-                        {
-                            Id = 22,
-                            AllowsNotes = true,
-                            CategorySection = "Assessment",
-                            ChecklistTemplateId = 1,
-                            CreatedBy = "",
-                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
-                            IsDeleted = false,
-                            IsRequired = true,
-                            ItemOrder = 22,
-                            ItemText = "Prospect Interest Level",
-                            LastModifiedBy = "",
-                            OrganizationId = "",
-                            RequiresValue = true,
-                            SectionOrder = 8
-                        },
-                        new
-                        {
-                            Id = 23,
-                            AllowsNotes = true,
-                            CategorySection = "Assessment",
-                            ChecklistTemplateId = 1,
-                            CreatedBy = "",
-                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
-                            IsDeleted = false,
-                            IsRequired = true,
-                            ItemOrder = 23,
-                            ItemText = "Overall showing feedback and notes",
-                            LastModifiedBy = "",
-                            OrganizationId = "",
-                            RequiresValue = true,
-                            SectionOrder = 8
-                        },
-                        new
-                        {
-                            Id = 24,
-                            AllowsNotes = true,
-                            CategorySection = "General",
-                            ChecklistTemplateId = 2,
-                            CreatedBy = "",
-                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
-                            IsDeleted = false,
-                            IsRequired = true,
-                            ItemOrder = 1,
-                            ItemText = "Document property condition",
-                            LastModifiedBy = "",
-                            OrganizationId = "",
-                            RequiresValue = false,
-                            SectionOrder = 1
-                        },
-                        new
-                        {
-                            Id = 25,
-                            AllowsNotes = true,
-                            CategorySection = "General",
-                            ChecklistTemplateId = 2,
-                            CreatedBy = "",
-                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
-                            IsDeleted = false,
-                            IsRequired = true,
-                            ItemOrder = 2,
-                            ItemText = "Collect keys and access codes",
-                            LastModifiedBy = "",
-                            OrganizationId = "",
-                            RequiresValue = false,
-                            SectionOrder = 1
-                        },
-                        new
-                        {
-                            Id = 26,
-                            AllowsNotes = true,
-                            CategorySection = "General",
-                            ChecklistTemplateId = 2,
-                            CreatedBy = "",
-                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
-                            IsDeleted = false,
-                            IsRequired = true,
-                            ItemOrder = 3,
-                            ItemText = "Review lease terms with tenant",
-                            LastModifiedBy = "",
-                            OrganizationId = "",
-                            RequiresValue = false,
-                            SectionOrder = 1
-                        },
-                        new
-                        {
-                            Id = 27,
-                            AllowsNotes = true,
-                            CategorySection = "General",
-                            ChecklistTemplateId = 3,
-                            CreatedBy = "",
-                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
-                            IsDeleted = false,
-                            IsRequired = true,
-                            ItemOrder = 1,
-                            ItemText = "Inspect property condition",
-                            LastModifiedBy = "",
-                            OrganizationId = "",
-                            RequiresValue = false,
-                            SectionOrder = 1
-                        },
-                        new
-                        {
-                            Id = 28,
-                            AllowsNotes = true,
-                            CategorySection = "General",
-                            ChecklistTemplateId = 3,
-                            CreatedBy = "",
-                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
-                            IsDeleted = false,
-                            IsRequired = true,
-                            ItemOrder = 2,
-                            ItemText = "Collect all keys and access devices",
-                            LastModifiedBy = "",
-                            OrganizationId = "",
-                            RequiresValue = false,
-                            SectionOrder = 1
-                        },
-                        new
-                        {
-                            Id = 29,
-                            AllowsNotes = true,
-                            CategorySection = "General",
-                            ChecklistTemplateId = 3,
-                            CreatedBy = "",
-                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
-                            IsDeleted = false,
-                            IsRequired = true,
-                            ItemOrder = 3,
-                            ItemText = "Document damages and needed repairs",
-                            LastModifiedBy = "",
-                            OrganizationId = "",
-                            RequiresValue = false,
-                            SectionOrder = 1
-                        },
-                        new
-                        {
-                            Id = 30,
-                            AllowsNotes = true,
-                            CategorySection = "Preparation",
-                            ChecklistTemplateId = 4,
-                            CreatedBy = "",
-                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
-                            IsDeleted = false,
-                            IsRequired = true,
-                            ItemOrder = 1,
-                            ItemText = "Set up signage and directional markers",
-                            LastModifiedBy = "",
-                            OrganizationId = "",
-                            RequiresValue = false,
-                            SectionOrder = 1
-                        },
-                        new
-                        {
-                            Id = 31,
-                            AllowsNotes = true,
-                            CategorySection = "Preparation",
-                            ChecklistTemplateId = 4,
-                            CreatedBy = "",
-                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
-                            IsDeleted = false,
-                            IsRequired = true,
-                            ItemOrder = 2,
-                            ItemText = "Prepare information packets",
-                            LastModifiedBy = "",
-                            OrganizationId = "",
-                            RequiresValue = false,
-                            SectionOrder = 1
-                        },
-                        new
-                        {
-                            Id = 32,
-                            AllowsNotes = true,
-                            CategorySection = "Preparation",
-                            ChecklistTemplateId = 4,
-                            CreatedBy = "",
-                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
-                            IsDeleted = false,
-                            IsRequired = true,
-                            ItemOrder = 3,
-                            ItemText = "Set up visitor sign-in sheet",
-                            LastModifiedBy = "",
-                            OrganizationId = "",
-                            RequiresValue = false,
-                            SectionOrder = 1
-                        });
-                });
-
-            modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.Document", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("ContentType")
-                        .IsRequired()
-                        .HasMaxLength(500)
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime>("CreatedOn")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Description")
-                        .IsRequired()
-                        .HasMaxLength(500)
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("DocumentType")
-                        .IsRequired()
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<byte[]>("FileData")
-                        .IsRequired()
-                        .HasColumnType("BLOB");
-
-                    b.Property<string>("FileExtension")
-                        .IsRequired()
-                        .HasMaxLength(10)
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("FileName")
-                        .IsRequired()
-                        .HasMaxLength(255)
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("FilePath")
-                        .IsRequired()
-                        .HasMaxLength(255)
-                        .HasColumnType("TEXT");
-
-                    b.Property<long>("FileSize")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("FileType")
-                        .IsRequired()
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<int?>("InvoiceId")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<bool>("IsDeleted")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("LastModifiedBy")
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime?>("LastModifiedOn")
-                        .HasColumnType("TEXT");
-
-                    b.Property<int?>("LeaseId")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("OrganizationId")
-                        .IsRequired()
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<int?>("PaymentId")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<int?>("PropertyId")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<int?>("TenantId")
-                        .HasColumnType("INTEGER");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("InvoiceId");
-
-                    b.HasIndex("LeaseId");
-
-                    b.HasIndex("OrganizationId");
-
-                    b.HasIndex("PaymentId");
-
-                    b.HasIndex("PropertyId");
-
-                    b.HasIndex("TenantId");
-
-                    b.ToTable("Documents");
-                });
-
-            modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.Inspection", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("ActionItemsRequired")
-                        .HasMaxLength(2000)
-                        .HasColumnType("TEXT");
-
-                    b.Property<bool>("BathroomSinkGood")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("BathroomSinkNotes")
-                        .HasColumnType("TEXT");
-
-                    b.Property<bool>("BathroomToiletGood")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("BathroomToiletNotes")
-                        .HasColumnType("TEXT");
-
-                    b.Property<bool>("BathroomTubShowerGood")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("BathroomTubShowerNotes")
-                        .HasColumnType("TEXT");
-
-                    b.Property<bool>("BathroomVentilationGood")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("BathroomVentilationNotes")
-                        .HasColumnType("TEXT");
-
-                    b.Property<int?>("CalendarEventId")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<bool>("CarbonMonoxideDetectorsGood")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("CarbonMonoxideDetectorsNotes")
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime>("CompletedOn")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime>("CreatedOn")
-                        .HasColumnType("TEXT");
-
-                    b.Property<int?>("DocumentId")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<bool>("ElectricalSystemGood")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("ElectricalSystemNotes")
-                        .HasColumnType("TEXT");
-
-                    b.Property<bool>("ExteriorDoorsGood")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("ExteriorDoorsNotes")
-                        .HasColumnType("TEXT");
-
-                    b.Property<bool>("ExteriorFoundationGood")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("ExteriorFoundationNotes")
-                        .HasColumnType("TEXT");
-
-                    b.Property<bool>("ExteriorGuttersGood")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("ExteriorGuttersNotes")
-                        .HasColumnType("TEXT");
-
-                    b.Property<bool>("ExteriorRoofGood")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("ExteriorRoofNotes")
-                        .HasColumnType("TEXT");
-
-                    b.Property<bool>("ExteriorSidingGood")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("ExteriorSidingNotes")
-                        .HasColumnType("TEXT");
-
-                    b.Property<bool>("ExteriorWindowsGood")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("ExteriorWindowsNotes")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("GeneralNotes")
-                        .HasMaxLength(2000)
-                        .HasColumnType("TEXT");
-
-                    b.Property<bool>("HvacSystemGood")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("HvacSystemNotes")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("InspectedBy")
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("InspectionType")
-                        .IsRequired()
-                        .HasMaxLength(50)
-                        .HasColumnType("TEXT");
-
-                    b.Property<bool>("InteriorCeilingsGood")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("InteriorCeilingsNotes")
-                        .HasColumnType("TEXT");
-
-                    b.Property<bool>("InteriorDoorsGood")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("InteriorDoorsNotes")
-                        .HasColumnType("TEXT");
-
-                    b.Property<bool>("InteriorFloorsGood")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("InteriorFloorsNotes")
-                        .HasColumnType("TEXT");
-
-                    b.Property<bool>("InteriorWallsGood")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("InteriorWallsNotes")
-                        .HasColumnType("TEXT");
-
-                    b.Property<bool>("InteriorWindowsGood")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("InteriorWindowsNotes")
-                        .HasColumnType("TEXT");
-
-                    b.Property<bool>("IsDeleted")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<bool>("KitchenAppliancesGood")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("KitchenAppliancesNotes")
-                        .HasColumnType("TEXT");
-
-                    b.Property<bool>("KitchenCabinetsGood")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("KitchenCabinetsNotes")
-                        .HasColumnType("TEXT");
-
-                    b.Property<bool>("KitchenCountersGood")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("KitchenCountersNotes")
-                        .HasColumnType("TEXT");
-
-                    b.Property<bool>("KitchenSinkPlumbingGood")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("KitchenSinkPlumbingNotes")
-                        .HasColumnType("TEXT");
-
-                    b.Property<bool>("LandscapingGood")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("LandscapingNotes")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("LastModifiedBy")
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime?>("LastModifiedOn")
-                        .HasColumnType("TEXT");
-
-                    b.Property<int?>("LeaseId")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("OrganizationId")
-                        .IsRequired()
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("OverallCondition")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("TEXT");
-
-                    b.Property<bool>("PlumbingSystemGood")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("PlumbingSystemNotes")
-                        .HasColumnType("TEXT");
-
-                    b.Property<int>("PropertyId")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<bool>("SmokeDetectorsGood")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("SmokeDetectorsNotes")
-                        .HasColumnType("TEXT");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("CompletedOn");
-
-                    b.HasIndex("DocumentId");
-
-                    b.HasIndex("LeaseId");
-
-                    b.HasIndex("PropertyId");
-
-                    b.ToTable("Inspections");
-                });
-
-            modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.Invoice", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
-
-                    b.Property<decimal>("Amount")
-                        .HasPrecision(18, 2)
-                        .HasColumnType("decimal(18,2)");
-
-                    b.Property<decimal>("AmountPaid")
-                        .HasPrecision(18, 2)
-                        .HasColumnType("decimal(18,2)");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime>("CreatedOn")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Description")
-                        .IsRequired()
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<int?>("DocumentId")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<DateTime>("DueOn")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("InvoiceNumber")
-                        .IsRequired()
-                        .HasMaxLength(50)
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime>("InvoicedOn")
-                        .HasColumnType("TEXT");
-
-                    b.Property<bool>("IsDeleted")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("LastModifiedBy")
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime?>("LastModifiedOn")
-                        .HasColumnType("TEXT");
-
-                    b.Property<decimal?>("LateFeeAmount")
-                        .HasColumnType("decimal(18,2)");
-
-                    b.Property<bool?>("LateFeeApplied")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<DateTime?>("LateFeeAppliedOn")
-                        .HasColumnType("TEXT");
-
-                    b.Property<int>("LeaseId")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("Notes")
-                        .IsRequired()
-                        .HasMaxLength(500)
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("OrganizationId")
-                        .IsRequired()
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime?>("PaidOn")
-                        .HasColumnType("TEXT");
-
-                    b.Property<bool?>("ReminderSent")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<DateTime?>("ReminderSentOn")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .HasMaxLength(50)
-                        .HasColumnType("TEXT");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("DocumentId");
-
-                    b.HasIndex("InvoiceNumber")
-                        .IsUnique();
-
-                    b.HasIndex("LeaseId");
-
-                    b.HasIndex("OrganizationId");
-
-                    b.ToTable("Invoices");
-                });
-
-            modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.Lease", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime>("CreatedOn")
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime?>("DeclinedOn")
-                        .HasColumnType("TEXT");
-
-                    b.Property<int?>("DocumentId")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<DateTime>("EndDate")
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime?>("ExpiresOn")
-                        .HasColumnType("TEXT");
-
-                    b.Property<bool>("IsDeleted")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("LastModifiedBy")
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime?>("LastModifiedOn")
-                        .HasColumnType("TEXT");
-
-                    b.Property<int?>("LeaseOfferId")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<decimal>("MonthlyRent")
-                        .HasPrecision(18, 2)
-                        .HasColumnType("decimal(18,2)");
-
-                    b.Property<string>("Notes")
-                        .IsRequired()
-                        .HasMaxLength(500)
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime?>("OfferedOn")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("OrganizationId")
-                        .IsRequired()
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<int?>("PreviousLeaseId")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<int>("PropertyId")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<decimal?>("ProposedRenewalRent")
-                        .HasColumnType("decimal(18,2)");
-
-                    b.Property<string>("RenewalNotes")
-                        .HasMaxLength(1000)
-                        .HasColumnType("TEXT");
-
-                    b.Property<bool?>("RenewalNotificationSent")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<DateTime?>("RenewalNotificationSentOn")
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime?>("RenewalOfferedOn")
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime?>("RenewalReminderSentOn")
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime?>("RenewalResponseOn")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("RenewalStatus")
-                        .HasMaxLength(50)
-                        .HasColumnType("TEXT");
-
-                    b.Property<decimal>("SecurityDeposit")
-                        .HasPrecision(18, 2)
-                        .HasColumnType("decimal(18,2)");
-
-                    b.Property<DateTime?>("SignedOn")
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime>("StartDate")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .HasMaxLength(50)
-                        .HasColumnType("TEXT");
-
-                    b.Property<int>("TenantId")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("Terms")
-                        .IsRequired()
-                        .HasMaxLength(1000)
-                        .HasColumnType("TEXT");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("DocumentId");
-
-                    b.HasIndex("OrganizationId");
-
-                    b.HasIndex("PropertyId");
-
-                    b.HasIndex("TenantId");
-
-                    b.ToTable("Leases");
-                });
-
-            modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.LeaseOffer", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
-
-                    b.Property<int?>("ConvertedLeaseId")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime>("CreatedOn")
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime>("EndDate")
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime>("ExpiresOn")
-                        .HasColumnType("TEXT");
-
-                    b.Property<bool>("IsDeleted")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("LastModifiedBy")
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime?>("LastModifiedOn")
-                        .HasColumnType("TEXT");
-
-                    b.Property<decimal>("MonthlyRent")
-                        .HasColumnType("decimal(18,2)");
-
-                    b.Property<string>("Notes")
-                        .IsRequired()
-                        .HasMaxLength(1000)
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime>("OfferedOn")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("OrganizationId")
-                        .IsRequired()
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<int>("PropertyId")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<int>("ProspectiveTenantId")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<int>("RentalApplicationId")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<DateTime?>("RespondedOn")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("ResponseNotes")
-                        .HasMaxLength(500)
-                        .HasColumnType("TEXT");
-
-                    b.Property<decimal>("SecurityDeposit")
-                        .HasColumnType("decimal(18,2)");
-
-                    b.Property<DateTime>("StartDate")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .HasMaxLength(50)
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Terms")
-                        .IsRequired()
-                        .HasMaxLength(2000)
-                        .HasColumnType("TEXT");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("PropertyId");
-
-                    b.HasIndex("ProspectiveTenantId");
-
-                    b.HasIndex("RentalApplicationId");
-
-                    b.ToTable("LeaseOffers");
-                });
-
-            modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.MaintenanceRequest", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
-
-                    b.Property<decimal>("ActualCost")
-                        .HasPrecision(18, 2)
-                        .HasColumnType("decimal(18,2)");
-
-                    b.Property<string>("AssignedTo")
-                        .IsRequired()
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<int?>("CalendarEventId")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<DateTime?>("CompletedOn")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime>("CreatedOn")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Description")
-                        .IsRequired()
-                        .HasMaxLength(2000)
-                        .HasColumnType("TEXT");
-
-                    b.Property<decimal>("EstimatedCost")
-                        .HasPrecision(18, 2)
-                        .HasColumnType("decimal(18,2)");
-
-                    b.Property<bool>("IsDeleted")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("LastModifiedBy")
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime?>("LastModifiedOn")
-                        .HasColumnType("TEXT");
-
-                    b.Property<int?>("LeaseId")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("OrganizationId")
-                        .IsRequired()
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Priority")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("TEXT");
-
-                    b.Property<int>("PropertyId")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("RequestType")
-                        .IsRequired()
-                        .HasMaxLength(50)
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("RequestedBy")
-                        .IsRequired()
-                        .HasMaxLength(500)
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("RequestedByEmail")
-                        .IsRequired()
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("RequestedByPhone")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime>("RequestedOn")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("ResolutionNotes")
-                        .IsRequired()
-                        .HasMaxLength(2000)
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime?>("ScheduledOn")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Title")
-                        .IsRequired()
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("LeaseId");
-
-                    b.HasIndex("Priority");
-
-                    b.HasIndex("PropertyId");
-
-                    b.HasIndex("RequestedOn");
-
-                    b.HasIndex("Status");
-
-                    b.ToTable("MaintenanceRequests");
-                });
-
-            modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.Note", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("Content")
-                        .IsRequired()
-                        .HasMaxLength(5000)
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime>("CreatedOn")
-                        .HasColumnType("TEXT");
-
-                    b.Property<int>("EntityId")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("EntityType")
-                        .IsRequired()
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<bool>("IsDeleted")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("LastModifiedBy")
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime?>("LastModifiedOn")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("OrganizationId")
-                        .IsRequired()
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("UserFullName")
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("CreatedBy");
-
-                    b.ToTable("Notes");
-                });
-
-            modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.Organization", b =>
-                {
-                    b.Property<string>("Id")
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime>("CreatedOn")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("DisplayName")
-                        .HasColumnType("TEXT");
-
-                    b.Property<bool>("IsActive")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<bool>("IsDeleted")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("LastModifiedBy")
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime?>("LastModifiedOn")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("OwnerId")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("State")
-                        .HasColumnType("TEXT");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("IsActive");
-
-                    b.HasIndex("OwnerId");
-
-                    b.ToTable("Organizations");
-                });
-
-            modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.OrganizationSettings", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
-
-                    b.Property<bool>("AllowTenantDividendChoice")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<int>("ApplicationExpirationDays")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<bool>("ApplicationFeeEnabled")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<bool>("AutoCalculateSecurityDeposit")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime>("CreatedOn")
-                        .HasColumnType("TEXT");
-
-                    b.Property<decimal>("DefaultApplicationFee")
-                        .HasPrecision(18, 2)
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("DefaultDividendPaymentMethod")
-                        .IsRequired()
-                        .HasMaxLength(50)
-                        .HasColumnType("TEXT");
-
-                    b.Property<int>("DividendDistributionMonth")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<bool>("IsDeleted")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("LastModifiedBy")
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime?>("LastModifiedOn")
-                        .HasColumnType("TEXT");
-
-                    b.Property<bool>("LateFeeAutoApply")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<bool>("LateFeeEnabled")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<int>("LateFeeGracePeriodDays")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<decimal>("LateFeePercentage")
-                        .HasPrecision(5, 4)
-                        .HasColumnType("TEXT");
-
-                    b.Property<decimal>("MaxLateFeeAmount")
-                        .HasPrecision(18, 2)
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Name")
-                        .HasMaxLength(200)
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("OrganizationId")
-                        .IsRequired()
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<decimal>("OrganizationSharePercentage")
-                        .HasPrecision(18, 6)
-                        .HasColumnType("decimal(18,6)");
-
-                    b.Property<int>("PaymentReminderDaysBefore")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<bool>("PaymentReminderEnabled")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<int>("RefundProcessingDays")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<bool>("SecurityDepositInvestmentEnabled")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<decimal>("SecurityDepositMultiplier")
-                        .HasPrecision(18, 2)
-                        .HasColumnType("decimal(18,2)");
-
-                    b.Property<int>("TourNoShowGracePeriodHours")
-                        .HasColumnType("INTEGER");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("OrganizationId")
-                        .IsUnique();
-
-                    b.ToTable("OrganizationSettings");
-                });
-
-            modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.Payment", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
-
-                    b.Property<decimal>("Amount")
-                        .HasPrecision(18, 2)
-                        .HasColumnType("decimal(18,2)");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime>("CreatedOn")
-                        .HasColumnType("TEXT");
-
-                    b.Property<int?>("DocumentId")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<int>("InvoiceId")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<bool>("IsDeleted")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("LastModifiedBy")
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime?>("LastModifiedOn")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Notes")
-                        .IsRequired()
-                        .HasMaxLength(1000)
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("OrganizationId")
-                        .IsRequired()
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime>("PaidOn")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("PaymentMethod")
-                        .IsRequired()
-                        .HasMaxLength(50)
-                        .HasColumnType("TEXT");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("DocumentId");
-
-                    b.HasIndex("InvoiceId");
-
-                    b.HasIndex("OrganizationId");
-
-                    b.ToTable("Payments");
-                });
-
-            modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.Property", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("Address")
-                        .IsRequired()
-                        .HasMaxLength(200)
-                        .HasColumnType("TEXT");
-
-                    b.Property<decimal>("Bathrooms")
-                        .HasMaxLength(3)
-                        .HasColumnType("decimal(3,1)");
-
-                    b.Property<int>("Bedrooms")
-                        .HasMaxLength(3)
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("City")
-                        .IsRequired()
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime>("CreatedOn")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Description")
-                        .IsRequired()
-                        .HasMaxLength(1000)
-                        .HasColumnType("TEXT");
-
-                    b.Property<bool>("IsAvailable")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<bool>("IsDeleted")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("LastModifiedBy")
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime?>("LastModifiedOn")
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime?>("LastRoutineInspectionDate")
-                        .HasColumnType("TEXT");
-
-                    b.Property<decimal>("MonthlyRent")
-                        .HasPrecision(18, 2)
-                        .HasColumnType("decimal(18,2)");
-
-                    b.Property<DateTime?>("NextRoutineInspectionDueDate")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("OrganizationId")
-                        .IsRequired()
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("PropertyType")
-                        .IsRequired()
-                        .HasMaxLength(50)
-                        .HasColumnType("TEXT");
-
-                    b.Property<int>("RoutineInspectionIntervalMonths")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<int>("SquareFeet")
-                        .HasMaxLength(7)
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("State")
-                        .IsRequired()
-                        .HasMaxLength(50)
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .HasMaxLength(50)
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("UnitNumber")
-                        .HasMaxLength(50)
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("ZipCode")
-                        .IsRequired()
-                        .HasMaxLength(10)
-                        .HasColumnType("TEXT");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("Address");
-
-                    b.HasIndex("OrganizationId");
-
-                    b.ToTable("Properties");
-                });
-
-            modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.ProspectiveTenant", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime>("CreatedOn")
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime?>("DateOfBirth")
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime?>("DesiredMoveInDate")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Email")
-                        .IsRequired()
-                        .HasMaxLength(200)
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime?>("FirstContactedOn")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("FirstName")
-                        .IsRequired()
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("IdentificationNumber")
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("IdentificationState")
-                        .HasMaxLength(2)
-                        .HasColumnType("TEXT");
-
-                    b.Property<int?>("InterestedPropertyId")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<bool>("IsDeleted")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("LastModifiedBy")
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime?>("LastModifiedOn")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("LastName")
-                        .IsRequired()
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(2000)
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("OrganizationId")
-                        .IsRequired()
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Phone")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Source")
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .HasMaxLength(50)
-                        .HasColumnType("TEXT");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("Email");
-
-                    b.HasIndex("InterestedPropertyId");
-
-                    b.HasIndex("OrganizationId");
-
-                    b.HasIndex("Status");
-
-                    b.ToTable("ProspectiveTenants");
-                });
-
-            modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.RentalApplication", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
-
-                    b.Property<decimal>("ApplicationFee")
-                        .HasPrecision(18, 2)
-                        .HasColumnType("decimal(18,2)");
-
-                    b.Property<bool>("ApplicationFeePaid")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<DateTime?>("ApplicationFeePaidOn")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("ApplicationFeePaymentMethod")
-                        .HasMaxLength(50)
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime>("AppliedOn")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime>("CreatedOn")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("CurrentAddress")
-                        .IsRequired()
-                        .HasMaxLength(200)
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("CurrentCity")
-                        .IsRequired()
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<decimal>("CurrentRent")
-                        .HasPrecision(18, 2)
-                        .HasColumnType("decimal(18,2)");
-
-                    b.Property<string>("CurrentState")
-                        .IsRequired()
-                        .HasMaxLength(2)
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("CurrentZipCode")
-                        .IsRequired()
-                        .HasMaxLength(10)
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime?>("DecidedOn")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("DecisionBy")
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("DenialReason")
-                        .HasMaxLength(1000)
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("EmployerName")
-                        .IsRequired()
-                        .HasMaxLength(200)
-                        .HasColumnType("TEXT");
-
-                    b.Property<int>("EmploymentLengthMonths")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<DateTime?>("ExpiresOn")
-                        .HasColumnType("TEXT");
-
-                    b.Property<bool>("IsDeleted")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("JobTitle")
-                        .IsRequired()
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("LandlordName")
-                        .IsRequired()
-                        .HasMaxLength(200)
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("LandlordPhone")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("LastModifiedBy")
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime?>("LastModifiedOn")
-                        .HasColumnType("TEXT");
-
-                    b.Property<decimal>("MonthlyIncome")
-                        .HasPrecision(18, 2)
-                        .HasColumnType("decimal(18,2)");
-
-                    b.Property<string>("OrganizationId")
-                        .IsRequired()
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<int>("PropertyId")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<int>("ProspectiveTenantId")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("Reference1Name")
-                        .IsRequired()
-                        .HasMaxLength(200)
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Reference1Phone")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Reference1Relationship")
-                        .IsRequired()
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Reference2Name")
-                        .HasMaxLength(200)
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Reference2Phone")
-                        .HasMaxLength(20)
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Reference2Relationship")
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .HasMaxLength(50)
-                        .HasColumnType("TEXT");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("AppliedOn");
-
-                    b.HasIndex("OrganizationId");
-
-                    b.HasIndex("PropertyId");
-
-                    b.HasIndex("ProspectiveTenantId")
-                        .IsUnique();
-
-                    b.HasIndex("Status");
-
-                    b.ToTable("RentalApplications");
-                });
-
-            modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.SchemaVersion", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
-
-                    b.Property<DateTime>("AppliedOn")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Description")
-                        .IsRequired()
-                        .HasMaxLength(500)
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Version")
-                        .IsRequired()
-                        .HasMaxLength(50)
-                        .HasColumnType("TEXT");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("SchemaVersions");
-                });
-
-            modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.SecurityDeposit", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
-
-                    b.Property<decimal>("Amount")
-                        .HasPrecision(18, 2)
-                        .HasColumnType("decimal(18,2)");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime>("CreatedOn")
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime>("DateReceived")
-                        .HasColumnType("TEXT");
-
-                    b.Property<decimal?>("DeductionsAmount")
-                        .HasPrecision(18, 2)
-                        .HasColumnType("decimal(18,2)");
-
-                    b.Property<string>("DeductionsReason")
-                        .HasMaxLength(1000)
-                        .HasColumnType("TEXT");
-
-                    b.Property<bool>("InInvestmentPool")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<bool>("IsDeleted")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("LastModifiedBy")
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime?>("LastModifiedOn")
-                        .HasColumnType("TEXT");
-
-                    b.Property<int>("LeaseId")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(500)
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("OrganizationId")
-                        .IsRequired()
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("PaymentMethod")
-                        .IsRequired()
-                        .HasMaxLength(50)
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime?>("PoolEntryDate")
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime?>("PoolExitDate")
-                        .HasColumnType("TEXT");
-
-                    b.Property<decimal?>("RefundAmount")
-                        .HasPrecision(18, 2)
-                        .HasColumnType("decimal(18,2)");
-
-                    b.Property<string>("RefundMethod")
-                        .HasMaxLength(50)
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime?>("RefundProcessedDate")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("RefundReference")
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .HasMaxLength(50)
-                        .HasColumnType("TEXT");
-
-                    b.Property<int>("TenantId")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("TransactionReference")
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("InInvestmentPool");
-
-                    b.HasIndex("LeaseId")
-                        .IsUnique();
-
-                    b.HasIndex("Status");
-
-                    b.HasIndex("TenantId");
-
-                    b.ToTable("SecurityDeposits");
-                });
-
-            modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.SecurityDepositDividend", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
-
-                    b.Property<decimal>("BaseDividendAmount")
-                        .HasPrecision(18, 2)
-                        .HasColumnType("decimal(18,2)");
-
-                    b.Property<DateTime?>("ChoiceMadeOn")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime>("CreatedOn")
-                        .HasColumnType("TEXT");
-
-                    b.Property<decimal>("DividendAmount")
-                        .HasPrecision(18, 2)
-                        .HasColumnType("decimal(18,2)");
-
-                    b.Property<int>("InvestmentPoolId")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<bool>("IsDeleted")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("LastModifiedBy")
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime?>("LastModifiedOn")
-                        .HasColumnType("TEXT");
-
-                    b.Property<int>("LeaseId")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("MailingAddress")
-                        .HasMaxLength(500)
-                        .HasColumnType("TEXT");
-
-                    b.Property<int>("MonthsInPool")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(500)
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("OrganizationId")
-                        .IsRequired()
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("PaymentMethod")
-                        .IsRequired()
-                        .HasMaxLength(50)
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime?>("PaymentProcessedOn")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("PaymentReference")
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<decimal>("ProrationFactor")
-                        .HasPrecision(18, 6)
-                        .HasColumnType("decimal(18,6)");
-
-                    b.Property<int>("SecurityDepositId")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .HasMaxLength(50)
-                        .HasColumnType("TEXT");
-
-                    b.Property<int>("TenantId")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<int>("Year")
-                        .HasColumnType("INTEGER");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("InvestmentPoolId");
-
-                    b.HasIndex("LeaseId");
-
-                    b.HasIndex("SecurityDepositId");
-
-                    b.HasIndex("Status");
-
-                    b.HasIndex("TenantId");
-
-                    b.HasIndex("Year");
-
-                    b.ToTable("SecurityDepositDividends");
-                });
-
-            modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.SecurityDepositInvestmentPool", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
-
-                    b.Property<int>("ActiveLeaseCount")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime>("CreatedOn")
-                        .HasColumnType("TEXT");
-
-                    b.Property<decimal>("DividendPerLease")
-                        .HasPrecision(18, 2)
-                        .HasColumnType("decimal(18,2)");
-
-                    b.Property<DateTime?>("DividendsCalculatedOn")
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime?>("DividendsDistributedOn")
-                        .HasColumnType("TEXT");
-
-                    b.Property<decimal>("EndingBalance")
-                        .HasPrecision(18, 2)
-                        .HasColumnType("decimal(18,2)");
-
-                    b.Property<bool>("IsDeleted")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("LastModifiedBy")
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime?>("LastModifiedOn")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(1000)
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("OrganizationId")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.Property<decimal>("OrganizationShare")
-                        .HasPrecision(18, 2)
-                        .HasColumnType("decimal(18,2)");
-
-                    b.Property<decimal>("OrganizationSharePercentage")
-                        .HasPrecision(18, 6)
-                        .HasColumnType("decimal(18,6)");
-
-                    b.Property<decimal>("ReturnRate")
-                        .HasPrecision(18, 6)
-                        .HasColumnType("decimal(18,6)");
-
-                    b.Property<decimal>("StartingBalance")
-                        .HasPrecision(18, 2)
-                        .HasColumnType("decimal(18,2)");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .HasMaxLength(50)
-                        .HasColumnType("TEXT");
-
-                    b.Property<decimal>("TenantShareTotal")
-                        .HasPrecision(18, 2)
-                        .HasColumnType("decimal(18,2)");
-
-                    b.Property<decimal>("TotalEarnings")
-                        .HasPrecision(18, 2)
-                        .HasColumnType("decimal(18,2)");
-
-                    b.Property<int>("Year")
-                        .HasColumnType("INTEGER");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("OrganizationId");
-
-                    b.HasIndex("Status");
-
-                    b.HasIndex("Year")
-                        .IsUnique();
-
-                    b.ToTable("SecurityDepositInvestmentPools");
-                });
-
-            modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.Tenant", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime>("CreatedOn")
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime?>("DateOfBirth")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Email")
-                        .IsRequired()
-                        .HasMaxLength(255)
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("EmergencyContactName")
-                        .IsRequired()
-                        .HasMaxLength(200)
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("EmergencyContactPhone")
-                        .HasMaxLength(20)
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("FirstName")
-                        .IsRequired()
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("IdentificationNumber")
-                        .IsRequired()
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<bool>("IsActive")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<bool>("IsDeleted")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("LastModifiedBy")
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime?>("LastModifiedOn")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("LastName")
-                        .IsRequired()
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Notes")
-                        .IsRequired()
-                        .HasMaxLength(500)
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("OrganizationId")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("PhoneNumber")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("TEXT");
-
-                    b.Property<int?>("ProspectiveTenantId")
-                        .HasColumnType("INTEGER");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("Email")
-                        .IsUnique();
-
-                    b.HasIndex("IdentificationNumber")
-                        .IsUnique();
-
-                    b.HasIndex("OrganizationId");
-
-                    b.ToTable("Tenants");
-                });
-
-            modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.Tour", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
-
-                    b.Property<int?>("CalendarEventId")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<int?>("ChecklistId")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("ConductedBy")
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime>("CreatedOn")
-                        .HasColumnType("TEXT");
-
-                    b.Property<int>("DurationMinutes")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("Feedback")
-                        .HasMaxLength(2000)
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("InterestLevel")
-                        .HasMaxLength(50)
-                        .HasColumnType("TEXT");
-
-                    b.Property<bool>("IsDeleted")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("LastModifiedBy")
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime?>("LastModifiedOn")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("OrganizationId")
-                        .IsRequired()
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<int>("PropertyId")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<int>("ProspectiveTenantId")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<DateTime>("ScheduledOn")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .HasMaxLength(50)
-                        .HasColumnType("TEXT");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("ChecklistId");
-
-                    b.HasIndex("OrganizationId");
-
-                    b.HasIndex("PropertyId");
-
-                    b.HasIndex("ProspectiveTenantId");
-
-                    b.HasIndex("ScheduledOn");
-
-                    b.HasIndex("Status");
-
-                    b.ToTable("Tours");
-                });
-
-            modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.UserOrganization", b =>
-                {
-                    b.Property<string>("Id")
-                        .HasMaxLength(100)
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime>("CreatedOn")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("GrantedBy")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime>("GrantedOn")
-                        .HasColumnType("TEXT");
-
-                    b.Property<bool>("IsActive")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<bool>("IsDeleted")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("LastModifiedBy")
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime?>("LastModifiedOn")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("OrganizationId")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime?>("RevokedOn")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Role")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("UserId")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("GrantedBy");
-
-                    b.HasIndex("IsActive");
-
-                    b.HasIndex("OrganizationId");
-
-                    b.HasIndex("Role");
-
-                    b.HasIndex("UserId", "OrganizationId")
-                        .IsUnique();
-
-                    b.ToTable("UserOrganizations");
-                });
-
-            modelBuilder.Entity("Aquiis.SimpleStart.Shared.Components.Account.ApplicationUser", b =>
-                {
-                    b.Property<string>("Id")
-                        .HasColumnType("TEXT");
-
-                    b.Property<int>("AccessFailedCount")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("ActiveOrganizationId")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("ConcurrencyStamp")
-                        .IsConcurrencyToken()
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Email")
-                        .HasMaxLength(256)
-                        .HasColumnType("TEXT");
-
-                    b.Property<bool>("EmailConfirmed")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("FirstName")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime?>("LastLoginDate")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("LastLoginIP")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("LastName")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.Property<bool>("LockoutEnabled")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<DateTimeOffset?>("LockoutEnd")
-                        .HasColumnType("TEXT");
-
-                    b.Property<int>("LoginCount")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("NormalizedEmail")
-                        .HasMaxLength(256)
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("NormalizedUserName")
-                        .HasMaxLength(256)
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("OrganizationId")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("PasswordHash")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("PhoneNumber")
-                        .HasColumnType("TEXT");
-
-                    b.Property<bool>("PhoneNumberConfirmed")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<DateTime?>("PreviousLoginDate")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("SecurityStamp")
-                        .HasColumnType("TEXT");
-
-                    b.Property<bool>("TwoFactorEnabled")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("UserName")
-                        .HasMaxLength(256)
-                        .HasColumnType("TEXT");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("NormalizedEmail")
-                        .HasDatabaseName("EmailIndex");
-
-                    b.HasIndex("NormalizedUserName")
-                        .IsUnique()
-                        .HasDatabaseName("UserNameIndex");
-
-                    b.ToTable("AspNetUsers", (string)null);
-                });
-
-            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b =>
-                {
-                    b.Property<string>("Id")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("ConcurrencyStamp")
-                        .IsConcurrencyToken()
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Name")
-                        .HasMaxLength(256)
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("NormalizedName")
-                        .HasMaxLength(256)
-                        .HasColumnType("TEXT");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("NormalizedName")
-                        .IsUnique()
-                        .HasDatabaseName("RoleNameIndex");
-
-                    b.ToTable("AspNetRoles", (string)null);
-                });
-
-            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("ClaimType")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("ClaimValue")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("RoleId")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("RoleId");
-
-                    b.ToTable("AspNetRoleClaims", (string)null);
-                });
-
-            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("ClaimType")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("ClaimValue")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("UserId")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("UserId");
-
-                    b.ToTable("AspNetUserClaims", (string)null);
-                });
-
-            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
-                {
-                    b.Property<string>("LoginProvider")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("ProviderKey")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("ProviderDisplayName")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("UserId")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.HasKey("LoginProvider", "ProviderKey");
-
-                    b.HasIndex("UserId");
-
-                    b.ToTable("AspNetUserLogins", (string)null);
-                });
-
-            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
-                {
-                    b.Property<string>("UserId")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("RoleId")
-                        .HasColumnType("TEXT");
-
-                    b.HasKey("UserId", "RoleId");
-
-                    b.HasIndex("RoleId");
-
-                    b.ToTable("AspNetUserRoles", (string)null);
-                });
-
-            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
-                {
-                    b.Property<string>("UserId")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("LoginProvider")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Name")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Value")
-                        .HasColumnType("TEXT");
-
-                    b.HasKey("UserId", "LoginProvider", "Name");
-
-                    b.ToTable("AspNetUserTokens", (string)null);
-                });
-
-            modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.ApplicationScreening", b =>
-                {
-                    b.HasOne("Aquiis.SimpleStart.Core.Entities.RentalApplication", "RentalApplication")
-                        .WithOne("Screening")
-                        .HasForeignKey("Aquiis.SimpleStart.Core.Entities.ApplicationScreening", "RentalApplicationId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("RentalApplication");
-                });
-
-            modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.CalendarEvent", b =>
-                {
-                    b.HasOne("Aquiis.SimpleStart.Core.Entities.Property", "Property")
-                        .WithMany()
-                        .HasForeignKey("PropertyId")
-                        .OnDelete(DeleteBehavior.SetNull);
-
-                    b.Navigation("Property");
-                });
-
-            modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.Checklist", b =>
-                {
-                    b.HasOne("Aquiis.SimpleStart.Core.Entities.ChecklistTemplate", "ChecklistTemplate")
-                        .WithMany("Checklists")
-                        .HasForeignKey("ChecklistTemplateId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("Aquiis.SimpleStart.Core.Entities.Document", "Document")
-                        .WithMany()
-                        .HasForeignKey("DocumentId")
-                        .OnDelete(DeleteBehavior.SetNull);
-
-                    b.HasOne("Aquiis.SimpleStart.Core.Entities.Lease", "Lease")
-                        .WithMany()
-                        .HasForeignKey("LeaseId")
-                        .OnDelete(DeleteBehavior.SetNull);
-
-                    b.HasOne("Aquiis.SimpleStart.Core.Entities.Property", "Property")
-                        .WithMany()
-                        .HasForeignKey("PropertyId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.Navigation("ChecklistTemplate");
-
-                    b.Navigation("Document");
-
-                    b.Navigation("Lease");
-
-                    b.Navigation("Property");
-                });
-
-            modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.ChecklistItem", b =>
-                {
-                    b.HasOne("Aquiis.SimpleStart.Core.Entities.Checklist", "Checklist")
-                        .WithMany("Items")
-                        .HasForeignKey("ChecklistId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Checklist");
-                });
-
-            modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.ChecklistTemplateItem", b =>
-                {
-                    b.HasOne("Aquiis.SimpleStart.Core.Entities.ChecklistTemplate", "ChecklistTemplate")
-                        .WithMany("Items")
-                        .HasForeignKey("ChecklistTemplateId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("ChecklistTemplate");
-                });
-
-            modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.Document", b =>
-                {
-                    b.HasOne("Aquiis.SimpleStart.Core.Entities.Invoice", "Invoice")
-                        .WithMany()
-                        .HasForeignKey("InvoiceId")
-                        .OnDelete(DeleteBehavior.SetNull);
-
-                    b.HasOne("Aquiis.SimpleStart.Core.Entities.Lease", "Lease")
-                        .WithMany("Documents")
-                        .HasForeignKey("LeaseId")
-                        .OnDelete(DeleteBehavior.SetNull);
-
-                    b.HasOne("Aquiis.SimpleStart.Core.Entities.Organization", null)
-                        .WithMany()
-                        .HasForeignKey("OrganizationId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("Aquiis.SimpleStart.Core.Entities.Payment", "Payment")
-                        .WithMany()
-                        .HasForeignKey("PaymentId")
-                        .OnDelete(DeleteBehavior.SetNull);
-
-                    b.HasOne("Aquiis.SimpleStart.Core.Entities.Property", "Property")
-                        .WithMany("Documents")
-                        .HasForeignKey("PropertyId")
-                        .OnDelete(DeleteBehavior.SetNull);
-
-                    b.HasOne("Aquiis.SimpleStart.Core.Entities.Tenant", "Tenant")
-                        .WithMany()
-                        .HasForeignKey("TenantId")
-                        .OnDelete(DeleteBehavior.SetNull);
-
-                    b.Navigation("Invoice");
-
-                    b.Navigation("Lease");
-
-                    b.Navigation("Payment");
-
-                    b.Navigation("Property");
-
-                    b.Navigation("Tenant");
-                });
-
-            modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.Inspection", b =>
-                {
-                    b.HasOne("Aquiis.SimpleStart.Core.Entities.Document", "Document")
-                        .WithMany()
-                        .HasForeignKey("DocumentId")
-                        .OnDelete(DeleteBehavior.SetNull);
-
-                    b.HasOne("Aquiis.SimpleStart.Core.Entities.Lease", "Lease")
-                        .WithMany()
-                        .HasForeignKey("LeaseId")
-                        .OnDelete(DeleteBehavior.SetNull);
-
-                    b.HasOne("Aquiis.SimpleStart.Core.Entities.Property", "Property")
-                        .WithMany()
-                        .HasForeignKey("PropertyId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Document");
-
-                    b.Navigation("Lease");
-
-                    b.Navigation("Property");
-                });
-
-            modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.Invoice", b =>
-                {
-                    b.HasOne("Aquiis.SimpleStart.Core.Entities.Document", "Document")
-                        .WithMany()
-                        .HasForeignKey("DocumentId")
-                        .OnDelete(DeleteBehavior.SetNull);
-
-                    b.HasOne("Aquiis.SimpleStart.Core.Entities.Lease", "Lease")
-                        .WithMany("Invoices")
-                        .HasForeignKey("LeaseId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("Aquiis.SimpleStart.Core.Entities.Organization", null)
-                        .WithMany()
-                        .HasForeignKey("OrganizationId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Document");
-
-                    b.Navigation("Lease");
-                });
-
-            modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.Lease", b =>
-                {
-                    b.HasOne("Aquiis.SimpleStart.Core.Entities.Document", "Document")
-                        .WithMany()
-                        .HasForeignKey("DocumentId")
-                        .OnDelete(DeleteBehavior.SetNull);
-
-                    b.HasOne("Aquiis.SimpleStart.Core.Entities.Organization", null)
-                        .WithMany("Leases")
-                        .HasForeignKey("OrganizationId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("Aquiis.SimpleStart.Core.Entities.Property", "Property")
-                        .WithMany("Leases")
-                        .HasForeignKey("PropertyId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("Aquiis.SimpleStart.Core.Entities.Tenant", "Tenant")
-                        .WithMany("Leases")
-                        .HasForeignKey("TenantId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Document");
-
-                    b.Navigation("Property");
-
-                    b.Navigation("Tenant");
-                });
-
-            modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.LeaseOffer", b =>
-                {
-                    b.HasOne("Aquiis.SimpleStart.Core.Entities.Property", "Property")
-                        .WithMany()
-                        .HasForeignKey("PropertyId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("Aquiis.SimpleStart.Core.Entities.ProspectiveTenant", "ProspectiveTenant")
-                        .WithMany()
-                        .HasForeignKey("ProspectiveTenantId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("Aquiis.SimpleStart.Core.Entities.RentalApplication", "RentalApplication")
-                        .WithMany()
-                        .HasForeignKey("RentalApplicationId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Property");
-
-                    b.Navigation("ProspectiveTenant");
-
-                    b.Navigation("RentalApplication");
-                });
-
-            modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.MaintenanceRequest", b =>
-                {
-                    b.HasOne("Aquiis.SimpleStart.Core.Entities.Lease", "Lease")
-                        .WithMany()
-                        .HasForeignKey("LeaseId")
-                        .OnDelete(DeleteBehavior.SetNull);
-
-                    b.HasOne("Aquiis.SimpleStart.Core.Entities.Property", "Property")
-                        .WithMany()
-                        .HasForeignKey("PropertyId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Lease");
-
-                    b.Navigation("Property");
-                });
-
-            modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.Note", b =>
-                {
-                    b.HasOne("Aquiis.SimpleStart.Shared.Components.Account.ApplicationUser", "User")
-                        .WithMany()
-                        .HasForeignKey("CreatedBy")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("User");
-                });
-
-            modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.Organization", b =>
-                {
-                    b.HasOne("Aquiis.SimpleStart.Shared.Components.Account.ApplicationUser", null)
-                        .WithMany()
-                        .HasForeignKey("OwnerId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-                });
-
-            modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.Payment", b =>
-                {
-                    b.HasOne("Aquiis.SimpleStart.Core.Entities.Document", "Document")
-                        .WithMany()
-                        .HasForeignKey("DocumentId")
-                        .OnDelete(DeleteBehavior.SetNull);
-
-                    b.HasOne("Aquiis.SimpleStart.Core.Entities.Invoice", "Invoice")
-                        .WithMany("Payments")
-                        .HasForeignKey("InvoiceId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("Aquiis.SimpleStart.Core.Entities.Organization", null)
-                        .WithMany()
-                        .HasForeignKey("OrganizationId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Document");
-
-                    b.Navigation("Invoice");
-                });
-
-            modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.Property", b =>
-                {
-                    b.HasOne("Aquiis.SimpleStart.Core.Entities.Organization", null)
-                        .WithMany("Properties")
-                        .HasForeignKey("OrganizationId")
-                        .OnDelete(DeleteBehavior.NoAction)
-                        .IsRequired();
-                });
-
-            modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.ProspectiveTenant", b =>
-                {
-                    b.HasOne("Aquiis.SimpleStart.Core.Entities.Property", "InterestedProperty")
-                        .WithMany()
-                        .HasForeignKey("InterestedPropertyId")
-                        .OnDelete(DeleteBehavior.SetNull);
-
-                    b.Navigation("InterestedProperty");
-                });
-
-            modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.RentalApplication", b =>
-                {
-                    b.HasOne("Aquiis.SimpleStart.Core.Entities.Property", "Property")
-                        .WithMany()
-                        .HasForeignKey("PropertyId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("Aquiis.SimpleStart.Core.Entities.ProspectiveTenant", "ProspectiveTenant")
-                        .WithOne("Application")
-                        .HasForeignKey("Aquiis.SimpleStart.Core.Entities.RentalApplication", "ProspectiveTenantId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Property");
-
-                    b.Navigation("ProspectiveTenant");
-                });
-
-            modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.SecurityDeposit", b =>
-                {
-                    b.HasOne("Aquiis.SimpleStart.Core.Entities.Lease", "Lease")
-                        .WithMany()
-                        .HasForeignKey("LeaseId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("Aquiis.SimpleStart.Core.Entities.Tenant", "Tenant")
-                        .WithMany()
-                        .HasForeignKey("TenantId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Lease");
-
-                    b.Navigation("Tenant");
-                });
-
-            modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.SecurityDepositDividend", b =>
-                {
-                    b.HasOne("Aquiis.SimpleStart.Core.Entities.SecurityDepositInvestmentPool", "InvestmentPool")
-                        .WithMany("Dividends")
-                        .HasForeignKey("InvestmentPoolId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("Aquiis.SimpleStart.Core.Entities.Lease", "Lease")
-                        .WithMany()
-                        .HasForeignKey("LeaseId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("Aquiis.SimpleStart.Core.Entities.SecurityDeposit", "SecurityDeposit")
-                        .WithMany("Dividends")
-                        .HasForeignKey("SecurityDepositId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("Aquiis.SimpleStart.Core.Entities.Tenant", "Tenant")
-                        .WithMany()
-                        .HasForeignKey("TenantId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("InvestmentPool");
-
-                    b.Navigation("Lease");
-
-                    b.Navigation("SecurityDeposit");
-
-                    b.Navigation("Tenant");
-                });
-
-            modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.Tenant", b =>
-                {
-                    b.HasOne("Aquiis.SimpleStart.Core.Entities.Organization", null)
-                        .WithMany("Tenants")
-                        .HasForeignKey("OrganizationId")
-                        .OnDelete(DeleteBehavior.NoAction)
-                        .IsRequired();
-                });
-
-            modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.Tour", b =>
-                {
-                    b.HasOne("Aquiis.SimpleStart.Core.Entities.Checklist", "Checklist")
-                        .WithMany()
-                        .HasForeignKey("ChecklistId");
-
-                    b.HasOne("Aquiis.SimpleStart.Core.Entities.Property", "Property")
-                        .WithMany()
-                        .HasForeignKey("PropertyId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("Aquiis.SimpleStart.Core.Entities.ProspectiveTenant", "ProspectiveTenant")
-                        .WithMany("Tours")
-                        .HasForeignKey("ProspectiveTenantId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Checklist");
-
-                    b.Navigation("Property");
-
-                    b.Navigation("ProspectiveTenant");
-                });
-
-            modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.UserOrganization", b =>
-                {
-                    b.HasOne("Aquiis.SimpleStart.Shared.Components.Account.ApplicationUser", null)
-                        .WithMany()
-                        .HasForeignKey("GrantedBy")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("Aquiis.SimpleStart.Core.Entities.Organization", "Organization")
-                        .WithMany("UserOrganizations")
-                        .HasForeignKey("OrganizationId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("Aquiis.SimpleStart.Shared.Components.Account.ApplicationUser", null)
-                        .WithMany()
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Organization");
-                });
-
-            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
-                {
-                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
-                        .WithMany()
-                        .HasForeignKey("RoleId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-                });
-
-            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
-                {
-                    b.HasOne("Aquiis.SimpleStart.Shared.Components.Account.ApplicationUser", null)
-                        .WithMany()
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-                });
-
-            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
-                {
-                    b.HasOne("Aquiis.SimpleStart.Shared.Components.Account.ApplicationUser", null)
-                        .WithMany()
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-                });
-
-            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
-                {
-                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
-                        .WithMany()
-                        .HasForeignKey("RoleId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("Aquiis.SimpleStart.Shared.Components.Account.ApplicationUser", null)
-                        .WithMany()
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-                });
-
-            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
-                {
-                    b.HasOne("Aquiis.SimpleStart.Shared.Components.Account.ApplicationUser", null)
-                        .WithMany()
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-                });
-
-            modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.Checklist", b =>
-                {
-                    b.Navigation("Items");
-                });
-
-            modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.ChecklistTemplate", b =>
-                {
-                    b.Navigation("Checklists");
-
-                    b.Navigation("Items");
-                });
-
-            modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.Invoice", b =>
-                {
-                    b.Navigation("Payments");
-                });
-
-            modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.Lease", b =>
-                {
-                    b.Navigation("Documents");
-
-                    b.Navigation("Invoices");
-                });
-
-            modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.Organization", b =>
-                {
-                    b.Navigation("Leases");
-
-                    b.Navigation("Properties");
-
-                    b.Navigation("Tenants");
-
-                    b.Navigation("UserOrganizations");
-                });
-
-            modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.Property", b =>
-                {
-                    b.Navigation("Documents");
-
-                    b.Navigation("Leases");
-                });
-
-            modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.ProspectiveTenant", b =>
-                {
-                    b.Navigation("Application");
-
-                    b.Navigation("Tours");
-                });
-
-            modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.RentalApplication", b =>
-                {
-                    b.Navigation("Screening");
-                });
-
-            modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.SecurityDeposit", b =>
-                {
-                    b.Navigation("Dividends");
-                });
-
-            modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.SecurityDepositInvestmentPool", b =>
-                {
-                    b.Navigation("Dividends");
-                });
-
-            modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.Tenant", b =>
-                {
-                    b.Navigation("Leases");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}
diff --git a/Aquiis.SimpleStart/Infrastructure/Data/Migrations/20251206163651_AddWorkflowAuditLog.cs b/Aquiis.SimpleStart/Infrastructure/Data/Migrations/20251206163651_AddWorkflowAuditLog.cs
deleted file mode 100644
index f52d333..0000000
--- a/Aquiis.SimpleStart/Infrastructure/Data/Migrations/20251206163651_AddWorkflowAuditLog.cs
+++ /dev/null
@@ -1,84 +0,0 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace Aquiis.SimpleStart.Infrastructure.Data.Migrations
-{
-    /// <inheritdoc />
-    public partial class AddWorkflowAuditLog : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.CreateTable(
-                name: "WorkflowAuditLogs",
-                columns: table => new
-                {
-                    Id = table.Column<int>(type: "INTEGER", nullable: false)
-                        .Annotation("Sqlite:Autoincrement", true),
-                    EntityType = table.Column<string>(type: "TEXT", nullable: false),
-                    EntityId = table.Column<int>(type: "INTEGER", nullable: false),
-                    FromStatus = table.Column<string>(type: "TEXT", nullable: true),
-                    ToStatus = table.Column<string>(type: "TEXT", nullable: false),
-                    Action = table.Column<string>(type: "TEXT", nullable: false),
-                    Reason = table.Column<string>(type: "TEXT", nullable: true),
-                    PerformedBy = table.Column<string>(type: "TEXT", nullable: false),
-                    PerformedOn = table.Column<DateTime>(type: "TEXT", nullable: false),
-                    OrganizationId = table.Column<int>(type: "INTEGER", nullable: false),
-                    Metadata = table.Column<string>(type: "TEXT", nullable: true),
-                    CreatedOn = table.Column<DateTime>(type: "TEXT", nullable: false),
-                    CreatedBy = table.Column<string>(type: "TEXT", maxLength: 100, nullable: false),
-                    LastModifiedOn = table.Column<DateTime>(type: "TEXT", nullable: true),
-                    LastModifiedBy = table.Column<string>(type: "TEXT", maxLength: 100, nullable: true),
-                    IsDeleted = table.Column<bool>(type: "INTEGER", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_WorkflowAuditLogs", x => x.Id);
-                });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_WorkflowAuditLogs_Action",
-                table: "WorkflowAuditLogs",
-                column: "Action");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_WorkflowAuditLogs_EntityId",
-                table: "WorkflowAuditLogs",
-                column: "EntityId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_WorkflowAuditLogs_EntityType",
-                table: "WorkflowAuditLogs",
-                column: "EntityType");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_WorkflowAuditLogs_EntityType_EntityId",
-                table: "WorkflowAuditLogs",
-                columns: new[] { "EntityType", "EntityId" });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_WorkflowAuditLogs_OrganizationId",
-                table: "WorkflowAuditLogs",
-                column: "OrganizationId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_WorkflowAuditLogs_PerformedBy",
-                table: "WorkflowAuditLogs",
-                column: "PerformedBy");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_WorkflowAuditLogs_PerformedOn",
-                table: "WorkflowAuditLogs",
-                column: "PerformedOn");
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropTable(
-                name: "WorkflowAuditLogs");
-        }
-    }
-}
diff --git a/Aquiis.SimpleStart/Infrastructure/Data/Migrations/20251206163651_AddWorkflowAuditLog.Designer.cs b/Aquiis.SimpleStart/Infrastructure/Data/Migrations/20251209234246_InitialCreate.Designer.cs
similarity index 87%
rename from Aquiis.SimpleStart/Infrastructure/Data/Migrations/20251206163651_AddWorkflowAuditLog.Designer.cs
rename to Aquiis.SimpleStart/Infrastructure/Data/Migrations/20251209234246_InitialCreate.Designer.cs
index 7b7d901..d31342b 100644
--- a/Aquiis.SimpleStart/Infrastructure/Data/Migrations/20251206163651_AddWorkflowAuditLog.Designer.cs
+++ b/Aquiis.SimpleStart/Infrastructure/Data/Migrations/20251209234246_InitialCreate.Designer.cs
@@ -8,11 +8,11 @@
 
 #nullable disable
 
-namespace Aquiis.SimpleStart.Infrastructure.Data.Migrations
+namespace Aquiis.SimpleStart.Migrations
 {
     [DbContext(typeof(ApplicationDbContext))]
-    [Migration("20251206163651_AddWorkflowAuditLog")]
-    partial class AddWorkflowAuditLog
+    [Migration("20251209234246_InitialCreate")]
+    partial class InitialCreate
     {
         /// <inheritdoc />
         protected override void BuildTargetModel(ModelBuilder modelBuilder)
@@ -22,9 +22,8 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
 
             modelBuilder.Entity("Aquiis.SimpleStart.Application.Services.Workflows.WorkflowAuditLog", b =>
                 {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
 
                     b.Property<string>("Action")
                         .IsRequired()
@@ -38,8 +37,8 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                     b.Property<DateTime>("CreatedOn")
                         .HasColumnType("TEXT");
 
-                    b.Property<int>("EntityId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("EntityId")
+                        .HasColumnType("TEXT");
 
                     b.Property<string>("EntityType")
                         .IsRequired()
@@ -61,8 +60,8 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                     b.Property<string>("Metadata")
                         .HasColumnType("TEXT");
 
-                    b.Property<int>("OrganizationId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
 
                     b.Property<string>("PerformedBy")
                         .IsRequired()
@@ -99,9 +98,8 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
 
             modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.ApplicationScreening", b =>
                 {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
 
                     b.Property<DateTime?>("BackgroundCheckCompletedOn")
                         .HasColumnType("TEXT");
@@ -156,8 +154,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                     b.Property<DateTime?>("LastModifiedOn")
                         .HasColumnType("TEXT");
 
-                    b.Property<string>("OrganizationId")
-                        .IsRequired()
+                    b.Property<Guid>("OrganizationId")
                         .HasMaxLength(100)
                         .HasColumnType("TEXT");
 
@@ -166,8 +163,8 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasMaxLength(50)
                         .HasColumnType("TEXT");
 
-                    b.Property<int>("RentalApplicationId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("RentalApplicationId")
+                        .HasColumnType("TEXT");
 
                     b.Property<string>("ResultNotes")
                         .HasMaxLength(2000)
@@ -187,9 +184,8 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
 
             modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.CalendarEvent", b =>
                 {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
 
                     b.Property<string>("Color")
                         .IsRequired()
@@ -238,16 +234,15 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasMaxLength(500)
                         .HasColumnType("TEXT");
 
-                    b.Property<string>("OrganizationId")
-                        .IsRequired()
+                    b.Property<Guid>("OrganizationId")
                         .HasMaxLength(100)
                         .HasColumnType("TEXT");
 
-                    b.Property<int?>("PropertyId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid?>("PropertyId")
+                        .HasColumnType("TEXT");
 
-                    b.Property<int?>("SourceEntityId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid?>("SourceEntityId")
+                        .HasColumnType("TEXT");
 
                     b.Property<string>("SourceEntityType")
                         .HasMaxLength(100)
@@ -285,9 +280,8 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
 
             modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.CalendarSettings", b =>
                 {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
 
                     b.Property<bool>("AutoCreateEvents")
                         .HasColumnType("INTEGER");
@@ -323,8 +317,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                     b.Property<DateTime?>("LastModifiedOn")
                         .HasColumnType("TEXT");
 
-                    b.Property<string>("OrganizationId")
-                        .IsRequired()
+                    b.Property<Guid>("OrganizationId")
                         .HasMaxLength(100)
                         .HasColumnType("TEXT");
 
@@ -343,12 +336,11 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
 
             modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.Checklist", b =>
                 {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
 
-                    b.Property<int>("ChecklistTemplateId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("ChecklistTemplateId")
+                        .HasColumnType("TEXT");
 
                     b.Property<string>("ChecklistType")
                         .IsRequired()
@@ -370,8 +362,8 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                     b.Property<DateTime>("CreatedOn")
                         .HasColumnType("TEXT");
 
-                    b.Property<int?>("DocumentId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid?>("DocumentId")
+                        .HasColumnType("TEXT");
 
                     b.Property<string>("GeneralNotes")
                         .HasMaxLength(2000)
@@ -387,21 +379,20 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                     b.Property<DateTime?>("LastModifiedOn")
                         .HasColumnType("TEXT");
 
-                    b.Property<int?>("LeaseId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid?>("LeaseId")
+                        .HasColumnType("TEXT");
 
                     b.Property<string>("Name")
                         .IsRequired()
                         .HasMaxLength(200)
                         .HasColumnType("TEXT");
 
-                    b.Property<string>("OrganizationId")
-                        .IsRequired()
+                    b.Property<Guid>("OrganizationId")
                         .HasMaxLength(100)
                         .HasColumnType("TEXT");
 
-                    b.Property<int?>("PropertyId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid?>("PropertyId")
+                        .HasColumnType("TEXT");
 
                     b.Property<string>("Status")
                         .IsRequired()
@@ -429,16 +420,15 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
 
             modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.ChecklistItem", b =>
                 {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
 
                     b.Property<string>("CategorySection")
                         .HasMaxLength(100)
                         .HasColumnType("TEXT");
 
-                    b.Property<int>("ChecklistId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("ChecklistId")
+                        .HasColumnType("TEXT");
 
                     b.Property<string>("CreatedBy")
                         .IsRequired()
@@ -473,8 +463,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasMaxLength(1000)
                         .HasColumnType("TEXT");
 
-                    b.Property<string>("OrganizationId")
-                        .IsRequired()
+                    b.Property<Guid>("OrganizationId")
                         .HasMaxLength(100)
                         .HasColumnType("TEXT");
 
@@ -501,9 +490,8 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
 
             modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.ChecklistTemplate", b =>
                 {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
 
                     b.Property<string>("Category")
                         .IsRequired()
@@ -540,8 +528,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasMaxLength(100)
                         .HasColumnType("TEXT");
 
-                    b.Property<string>("OrganizationId")
-                        .IsRequired()
+                    b.Property<Guid>("OrganizationId")
                         .HasMaxLength(100)
                         .HasColumnType("TEXT");
 
@@ -556,7 +543,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                     b.HasData(
                         new
                         {
-                            Id = 1,
+                            Id = new Guid("00000000-0000-0000-0001-000000000001"),
                             Category = "Tour",
                             CreatedBy = "",
                             CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
@@ -565,11 +552,11 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                             IsSystemTemplate = true,
                             LastModifiedBy = "",
                             Name = "Property Tour",
-                            OrganizationId = ""
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000")
                         },
                         new
                         {
-                            Id = 2,
+                            Id = new Guid("00000000-0000-0000-0001-000000000002"),
                             Category = "MoveIn",
                             CreatedBy = "",
                             CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
@@ -578,11 +565,11 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                             IsSystemTemplate = true,
                             LastModifiedBy = "",
                             Name = "Move-In",
-                            OrganizationId = ""
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000")
                         },
                         new
                         {
-                            Id = 3,
+                            Id = new Guid("00000000-0000-0000-0001-000000000003"),
                             Category = "MoveOut",
                             CreatedBy = "",
                             CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
@@ -591,11 +578,11 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                             IsSystemTemplate = true,
                             LastModifiedBy = "",
                             Name = "Move-Out",
-                            OrganizationId = ""
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000")
                         },
                         new
                         {
-                            Id = 4,
+                            Id = new Guid("00000000-0000-0000-0001-000000000004"),
                             Category = "Tour",
                             CreatedBy = "",
                             CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
@@ -604,15 +591,14 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                             IsSystemTemplate = true,
                             LastModifiedBy = "",
                             Name = "Open House",
-                            OrganizationId = ""
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000")
                         });
                 });
 
             modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.ChecklistTemplateItem", b =>
                 {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
 
                     b.Property<bool>("AllowsNotes")
                         .HasColumnType("INTEGER");
@@ -621,8 +607,8 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasMaxLength(100)
                         .HasColumnType("TEXT");
 
-                    b.Property<int>("ChecklistTemplateId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("ChecklistTemplateId")
+                        .HasColumnType("TEXT");
 
                     b.Property<string>("CreatedBy")
                         .IsRequired()
@@ -653,8 +639,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                     b.Property<DateTime?>("LastModifiedOn")
                         .HasColumnType("TEXT");
 
-                    b.Property<string>("OrganizationId")
-                        .IsRequired()
+                    b.Property<Guid>("OrganizationId")
                         .HasMaxLength(100)
                         .HasColumnType("TEXT");
 
@@ -673,10 +658,10 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                     b.HasData(
                         new
                         {
-                            Id = 1,
+                            Id = new Guid("00000000-0000-0000-0002-000000000001"),
                             AllowsNotes = true,
                             CategorySection = "Arrival & Introduction",
-                            ChecklistTemplateId = 1,
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
                             CreatedBy = "",
                             CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
                             IsDeleted = false,
@@ -684,16 +669,16 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                             ItemOrder = 1,
                             ItemText = "Greeted prospect and verified appointment",
                             LastModifiedBy = "",
-                            OrganizationId = "",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
                             RequiresValue = false,
                             SectionOrder = 1
                         },
                         new
                         {
-                            Id = 2,
+                            Id = new Guid("00000000-0000-0000-0002-000000000002"),
                             AllowsNotes = true,
                             CategorySection = "Arrival & Introduction",
-                            ChecklistTemplateId = 1,
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
                             CreatedBy = "",
                             CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
                             IsDeleted = false,
@@ -701,16 +686,16 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                             ItemOrder = 2,
                             ItemText = "Reviewed property exterior and curb appeal",
                             LastModifiedBy = "",
-                            OrganizationId = "",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
                             RequiresValue = false,
                             SectionOrder = 1
                         },
                         new
                         {
-                            Id = 3,
+                            Id = new Guid("00000000-0000-0000-0002-000000000003"),
                             AllowsNotes = true,
                             CategorySection = "Arrival & Introduction",
-                            ChecklistTemplateId = 1,
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
                             CreatedBy = "",
                             CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
                             IsDeleted = false,
@@ -718,16 +703,16 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                             ItemOrder = 3,
                             ItemText = "Showed parking area/garage",
                             LastModifiedBy = "",
-                            OrganizationId = "",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
                             RequiresValue = false,
                             SectionOrder = 1
                         },
                         new
                         {
-                            Id = 4,
+                            Id = new Guid("00000000-0000-0000-0002-000000000004"),
                             AllowsNotes = true,
                             CategorySection = "Interior Tour",
-                            ChecklistTemplateId = 1,
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
                             CreatedBy = "",
                             CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
                             IsDeleted = false,
@@ -735,16 +720,16 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                             ItemOrder = 4,
                             ItemText = "Toured living room/common areas",
                             LastModifiedBy = "",
-                            OrganizationId = "",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
                             RequiresValue = false,
                             SectionOrder = 2
                         },
                         new
                         {
-                            Id = 5,
+                            Id = new Guid("00000000-0000-0000-0002-000000000005"),
                             AllowsNotes = true,
                             CategorySection = "Interior Tour",
-                            ChecklistTemplateId = 1,
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
                             CreatedBy = "",
                             CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
                             IsDeleted = false,
@@ -752,16 +737,16 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                             ItemOrder = 5,
                             ItemText = "Showed all bedrooms",
                             LastModifiedBy = "",
-                            OrganizationId = "",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
                             RequiresValue = false,
                             SectionOrder = 2
                         },
                         new
                         {
-                            Id = 6,
+                            Id = new Guid("00000000-0000-0000-0002-000000000006"),
                             AllowsNotes = true,
                             CategorySection = "Interior Tour",
-                            ChecklistTemplateId = 1,
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
                             CreatedBy = "",
                             CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
                             IsDeleted = false,
@@ -769,16 +754,16 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                             ItemOrder = 6,
                             ItemText = "Showed all bathrooms",
                             LastModifiedBy = "",
-                            OrganizationId = "",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
                             RequiresValue = false,
                             SectionOrder = 2
                         },
                         new
                         {
-                            Id = 7,
+                            Id = new Guid("00000000-0000-0000-0002-000000000007"),
                             AllowsNotes = true,
                             CategorySection = "Kitchen & Appliances",
-                            ChecklistTemplateId = 1,
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
                             CreatedBy = "",
                             CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
                             IsDeleted = false,
@@ -786,16 +771,16 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                             ItemOrder = 7,
                             ItemText = "Toured kitchen and demonstrated appliances",
                             LastModifiedBy = "",
-                            OrganizationId = "",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
                             RequiresValue = false,
                             SectionOrder = 3
                         },
                         new
                         {
-                            Id = 8,
+                            Id = new Guid("00000000-0000-0000-0002-000000000008"),
                             AllowsNotes = true,
                             CategorySection = "Kitchen & Appliances",
-                            ChecklistTemplateId = 1,
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
                             CreatedBy = "",
                             CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
                             IsDeleted = false,
@@ -803,16 +788,16 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                             ItemOrder = 8,
                             ItemText = "Explained which appliances are included",
                             LastModifiedBy = "",
-                            OrganizationId = "",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
                             RequiresValue = false,
                             SectionOrder = 3
                         },
                         new
                         {
-                            Id = 9,
+                            Id = new Guid("00000000-0000-0000-0002-000000000009"),
                             AllowsNotes = true,
                             CategorySection = "Utilities & Systems",
-                            ChecklistTemplateId = 1,
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
                             CreatedBy = "",
                             CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
                             IsDeleted = false,
@@ -820,16 +805,16 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                             ItemOrder = 9,
                             ItemText = "Explained HVAC system and thermostat controls",
                             LastModifiedBy = "",
-                            OrganizationId = "",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
                             RequiresValue = false,
                             SectionOrder = 4
                         },
                         new
                         {
-                            Id = 10,
+                            Id = new Guid("00000000-0000-0000-0002-000000000010"),
                             AllowsNotes = true,
                             CategorySection = "Utilities & Systems",
-                            ChecklistTemplateId = 1,
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
                             CreatedBy = "",
                             CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
                             IsDeleted = false,
@@ -837,16 +822,16 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                             ItemOrder = 10,
                             ItemText = "Reviewed utility responsibilities (tenant vs landlord)",
                             LastModifiedBy = "",
-                            OrganizationId = "",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
                             RequiresValue = false,
                             SectionOrder = 4
                         },
                         new
                         {
-                            Id = 11,
+                            Id = new Guid("00000000-0000-0000-0002-000000000011"),
                             AllowsNotes = true,
                             CategorySection = "Utilities & Systems",
-                            ChecklistTemplateId = 1,
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
                             CreatedBy = "",
                             CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
                             IsDeleted = false,
@@ -854,16 +839,16 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                             ItemOrder = 11,
                             ItemText = "Showed water heater location",
                             LastModifiedBy = "",
-                            OrganizationId = "",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
                             RequiresValue = false,
                             SectionOrder = 4
                         },
                         new
                         {
-                            Id = 12,
+                            Id = new Guid("00000000-0000-0000-0002-000000000012"),
                             AllowsNotes = true,
                             CategorySection = "Storage & Amenities",
-                            ChecklistTemplateId = 1,
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
                             CreatedBy = "",
                             CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
                             IsDeleted = false,
@@ -871,16 +856,16 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                             ItemOrder = 12,
                             ItemText = "Showed storage areas (closets, attic, basement)",
                             LastModifiedBy = "",
-                            OrganizationId = "",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
                             RequiresValue = false,
                             SectionOrder = 5
                         },
                         new
                         {
-                            Id = 13,
+                            Id = new Guid("00000000-0000-0000-0002-000000000013"),
                             AllowsNotes = true,
                             CategorySection = "Storage & Amenities",
-                            ChecklistTemplateId = 1,
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
                             CreatedBy = "",
                             CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
                             IsDeleted = false,
@@ -888,16 +873,16 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                             ItemOrder = 13,
                             ItemText = "Showed laundry facilities",
                             LastModifiedBy = "",
-                            OrganizationId = "",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
                             RequiresValue = false,
                             SectionOrder = 5
                         },
                         new
                         {
-                            Id = 14,
+                            Id = new Guid("00000000-0000-0000-0002-000000000014"),
                             AllowsNotes = true,
                             CategorySection = "Storage & Amenities",
-                            ChecklistTemplateId = 1,
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
                             CreatedBy = "",
                             CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
                             IsDeleted = false,
@@ -905,16 +890,16 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                             ItemOrder = 14,
                             ItemText = "Showed outdoor space (yard, patio, balcony)",
                             LastModifiedBy = "",
-                            OrganizationId = "",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
                             RequiresValue = false,
                             SectionOrder = 5
                         },
                         new
                         {
-                            Id = 15,
+                            Id = new Guid("00000000-0000-0000-0002-000000000015"),
                             AllowsNotes = true,
                             CategorySection = "Lease Terms",
-                            ChecklistTemplateId = 1,
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
                             CreatedBy = "",
                             CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
                             IsDeleted = false,
@@ -922,16 +907,16 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                             ItemOrder = 15,
                             ItemText = "Discussed monthly rent amount",
                             LastModifiedBy = "",
-                            OrganizationId = "",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
                             RequiresValue = true,
                             SectionOrder = 6
                         },
                         new
                         {
-                            Id = 16,
+                            Id = new Guid("00000000-0000-0000-0002-000000000016"),
                             AllowsNotes = true,
                             CategorySection = "Lease Terms",
-                            ChecklistTemplateId = 1,
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
                             CreatedBy = "",
                             CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
                             IsDeleted = false,
@@ -939,16 +924,16 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                             ItemOrder = 16,
                             ItemText = "Explained security deposit and move-in costs",
                             LastModifiedBy = "",
-                            OrganizationId = "",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
                             RequiresValue = true,
                             SectionOrder = 6
                         },
                         new
                         {
-                            Id = 17,
+                            Id = new Guid("00000000-0000-0000-0002-000000000017"),
                             AllowsNotes = true,
                             CategorySection = "Lease Terms",
-                            ChecklistTemplateId = 1,
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
                             CreatedBy = "",
                             CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
                             IsDeleted = false,
@@ -956,16 +941,16 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                             ItemOrder = 17,
                             ItemText = "Reviewed lease term length and start date",
                             LastModifiedBy = "",
-                            OrganizationId = "",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
                             RequiresValue = false,
                             SectionOrder = 6
                         },
                         new
                         {
-                            Id = 18,
+                            Id = new Guid("00000000-0000-0000-0002-000000000018"),
                             AllowsNotes = true,
                             CategorySection = "Lease Terms",
-                            ChecklistTemplateId = 1,
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
                             CreatedBy = "",
                             CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
                             IsDeleted = false,
@@ -973,16 +958,16 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                             ItemOrder = 18,
                             ItemText = "Explained pet policy",
                             LastModifiedBy = "",
-                            OrganizationId = "",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
                             RequiresValue = false,
                             SectionOrder = 6
                         },
                         new
                         {
-                            Id = 19,
+                            Id = new Guid("00000000-0000-0000-0002-000000000019"),
                             AllowsNotes = true,
                             CategorySection = "Next Steps",
-                            ChecklistTemplateId = 1,
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
                             CreatedBy = "",
                             CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
                             IsDeleted = false,
@@ -990,16 +975,16 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                             ItemOrder = 19,
                             ItemText = "Explained application process and requirements",
                             LastModifiedBy = "",
-                            OrganizationId = "",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
                             RequiresValue = false,
                             SectionOrder = 7
                         },
                         new
                         {
-                            Id = 20,
+                            Id = new Guid("00000000-0000-0000-0002-000000000020"),
                             AllowsNotes = true,
                             CategorySection = "Next Steps",
-                            ChecklistTemplateId = 1,
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
                             CreatedBy = "",
                             CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
                             IsDeleted = false,
@@ -1007,16 +992,16 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                             ItemOrder = 20,
                             ItemText = "Reviewed screening process (background, credit check)",
                             LastModifiedBy = "",
-                            OrganizationId = "",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
                             RequiresValue = false,
                             SectionOrder = 7
                         },
                         new
                         {
-                            Id = 21,
+                            Id = new Guid("00000000-0000-0000-0002-000000000021"),
                             AllowsNotes = true,
                             CategorySection = "Next Steps",
-                            ChecklistTemplateId = 1,
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
                             CreatedBy = "",
                             CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
                             IsDeleted = false,
@@ -1024,16 +1009,16 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                             ItemOrder = 21,
                             ItemText = "Answered all prospect questions",
                             LastModifiedBy = "",
-                            OrganizationId = "",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
                             RequiresValue = false,
                             SectionOrder = 7
                         },
                         new
                         {
-                            Id = 22,
+                            Id = new Guid("00000000-0000-0000-0002-000000000022"),
                             AllowsNotes = true,
                             CategorySection = "Assessment",
-                            ChecklistTemplateId = 1,
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
                             CreatedBy = "",
                             CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
                             IsDeleted = false,
@@ -1041,16 +1026,16 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                             ItemOrder = 22,
                             ItemText = "Prospect Interest Level",
                             LastModifiedBy = "",
-                            OrganizationId = "",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
                             RequiresValue = true,
                             SectionOrder = 8
                         },
                         new
                         {
-                            Id = 23,
+                            Id = new Guid("00000000-0000-0000-0002-000000000023"),
                             AllowsNotes = true,
                             CategorySection = "Assessment",
-                            ChecklistTemplateId = 1,
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
                             CreatedBy = "",
                             CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
                             IsDeleted = false,
@@ -1058,16 +1043,16 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                             ItemOrder = 23,
                             ItemText = "Overall showing feedback and notes",
                             LastModifiedBy = "",
-                            OrganizationId = "",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
                             RequiresValue = true,
                             SectionOrder = 8
                         },
                         new
                         {
-                            Id = 24,
+                            Id = new Guid("00000000-0000-0000-0002-000000000024"),
                             AllowsNotes = true,
                             CategorySection = "General",
-                            ChecklistTemplateId = 2,
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000002"),
                             CreatedBy = "",
                             CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
                             IsDeleted = false,
@@ -1075,16 +1060,16 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                             ItemOrder = 1,
                             ItemText = "Document property condition",
                             LastModifiedBy = "",
-                            OrganizationId = "",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
                             RequiresValue = false,
                             SectionOrder = 1
                         },
                         new
                         {
-                            Id = 25,
+                            Id = new Guid("00000000-0000-0000-0002-000000000025"),
                             AllowsNotes = true,
                             CategorySection = "General",
-                            ChecklistTemplateId = 2,
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000002"),
                             CreatedBy = "",
                             CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
                             IsDeleted = false,
@@ -1092,16 +1077,16 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                             ItemOrder = 2,
                             ItemText = "Collect keys and access codes",
                             LastModifiedBy = "",
-                            OrganizationId = "",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
                             RequiresValue = false,
                             SectionOrder = 1
                         },
                         new
                         {
-                            Id = 26,
+                            Id = new Guid("00000000-0000-0000-0002-000000000026"),
                             AllowsNotes = true,
                             CategorySection = "General",
-                            ChecklistTemplateId = 2,
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000002"),
                             CreatedBy = "",
                             CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
                             IsDeleted = false,
@@ -1109,16 +1094,16 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                             ItemOrder = 3,
                             ItemText = "Review lease terms with tenant",
                             LastModifiedBy = "",
-                            OrganizationId = "",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
                             RequiresValue = false,
                             SectionOrder = 1
                         },
                         new
                         {
-                            Id = 27,
+                            Id = new Guid("00000000-0000-0000-0002-000000000027"),
                             AllowsNotes = true,
                             CategorySection = "General",
-                            ChecklistTemplateId = 3,
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000003"),
                             CreatedBy = "",
                             CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
                             IsDeleted = false,
@@ -1126,16 +1111,16 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                             ItemOrder = 1,
                             ItemText = "Inspect property condition",
                             LastModifiedBy = "",
-                            OrganizationId = "",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
                             RequiresValue = false,
                             SectionOrder = 1
                         },
                         new
                         {
-                            Id = 28,
+                            Id = new Guid("00000000-0000-0000-0002-000000000028"),
                             AllowsNotes = true,
                             CategorySection = "General",
-                            ChecklistTemplateId = 3,
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000003"),
                             CreatedBy = "",
                             CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
                             IsDeleted = false,
@@ -1143,16 +1128,16 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                             ItemOrder = 2,
                             ItemText = "Collect all keys and access devices",
                             LastModifiedBy = "",
-                            OrganizationId = "",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
                             RequiresValue = false,
                             SectionOrder = 1
                         },
                         new
                         {
-                            Id = 29,
+                            Id = new Guid("00000000-0000-0000-0002-000000000029"),
                             AllowsNotes = true,
                             CategorySection = "General",
-                            ChecklistTemplateId = 3,
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000003"),
                             CreatedBy = "",
                             CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
                             IsDeleted = false,
@@ -1160,16 +1145,16 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                             ItemOrder = 3,
                             ItemText = "Document damages and needed repairs",
                             LastModifiedBy = "",
-                            OrganizationId = "",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
                             RequiresValue = false,
                             SectionOrder = 1
                         },
                         new
                         {
-                            Id = 30,
+                            Id = new Guid("00000000-0000-0000-0002-000000000030"),
                             AllowsNotes = true,
                             CategorySection = "Preparation",
-                            ChecklistTemplateId = 4,
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000004"),
                             CreatedBy = "",
                             CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
                             IsDeleted = false,
@@ -1177,16 +1162,16 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                             ItemOrder = 1,
                             ItemText = "Set up signage and directional markers",
                             LastModifiedBy = "",
-                            OrganizationId = "",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
                             RequiresValue = false,
                             SectionOrder = 1
                         },
                         new
                         {
-                            Id = 31,
+                            Id = new Guid("00000000-0000-0000-0002-000000000031"),
                             AllowsNotes = true,
                             CategorySection = "Preparation",
-                            ChecklistTemplateId = 4,
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000004"),
                             CreatedBy = "",
                             CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
                             IsDeleted = false,
@@ -1194,16 +1179,16 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                             ItemOrder = 2,
                             ItemText = "Prepare information packets",
                             LastModifiedBy = "",
-                            OrganizationId = "",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
                             RequiresValue = false,
                             SectionOrder = 1
                         },
                         new
                         {
-                            Id = 32,
+                            Id = new Guid("00000000-0000-0000-0002-000000000032"),
                             AllowsNotes = true,
                             CategorySection = "Preparation",
-                            ChecklistTemplateId = 4,
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000004"),
                             CreatedBy = "",
                             CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
                             IsDeleted = false,
@@ -1211,7 +1196,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                             ItemOrder = 3,
                             ItemText = "Set up visitor sign-in sheet",
                             LastModifiedBy = "",
-                            OrganizationId = "",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
                             RequiresValue = false,
                             SectionOrder = 1
                         });
@@ -1219,9 +1204,8 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
 
             modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.Document", b =>
                 {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
 
                     b.Property<string>("ContentType")
                         .IsRequired()
@@ -1273,8 +1257,8 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasMaxLength(100)
                         .HasColumnType("TEXT");
 
-                    b.Property<int?>("InvoiceId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid?>("InvoiceId")
+                        .HasColumnType("TEXT");
 
                     b.Property<bool>("IsDeleted")
                         .HasColumnType("INTEGER");
@@ -1286,22 +1270,21 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                     b.Property<DateTime?>("LastModifiedOn")
                         .HasColumnType("TEXT");
 
-                    b.Property<int?>("LeaseId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid?>("LeaseId")
+                        .HasColumnType("TEXT");
 
-                    b.Property<string>("OrganizationId")
-                        .IsRequired()
+                    b.Property<Guid>("OrganizationId")
                         .HasMaxLength(100)
                         .HasColumnType("TEXT");
 
-                    b.Property<int?>("PaymentId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid?>("PaymentId")
+                        .HasColumnType("TEXT");
 
-                    b.Property<int?>("PropertyId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid?>("PropertyId")
+                        .HasColumnType("TEXT");
 
-                    b.Property<int?>("TenantId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("TEXT");
 
                     b.HasKey("Id");
 
@@ -1322,9 +1305,8 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
 
             modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.Inspection", b =>
                 {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
 
                     b.Property<string>("ActionItemsRequired")
                         .HasMaxLength(2000)
@@ -1354,8 +1336,8 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                     b.Property<string>("BathroomVentilationNotes")
                         .HasColumnType("TEXT");
 
-                    b.Property<int?>("CalendarEventId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid?>("CalendarEventId")
+                        .HasColumnType("TEXT");
 
                     b.Property<bool>("CarbonMonoxideDetectorsGood")
                         .HasColumnType("INTEGER");
@@ -1374,8 +1356,8 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                     b.Property<DateTime>("CreatedOn")
                         .HasColumnType("TEXT");
 
-                    b.Property<int?>("DocumentId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid?>("DocumentId")
+                        .HasColumnType("TEXT");
 
                     b.Property<bool>("ElectricalSystemGood")
                         .HasColumnType("INTEGER");
@@ -1508,11 +1490,10 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                     b.Property<DateTime?>("LastModifiedOn")
                         .HasColumnType("TEXT");
 
-                    b.Property<int?>("LeaseId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid?>("LeaseId")
+                        .HasColumnType("TEXT");
 
-                    b.Property<string>("OrganizationId")
-                        .IsRequired()
+                    b.Property<Guid>("OrganizationId")
                         .HasMaxLength(100)
                         .HasColumnType("TEXT");
 
@@ -1527,8 +1508,8 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                     b.Property<string>("PlumbingSystemNotes")
                         .HasColumnType("TEXT");
 
-                    b.Property<int>("PropertyId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("PropertyId")
+                        .HasColumnType("TEXT");
 
                     b.Property<bool>("SmokeDetectorsGood")
                         .HasColumnType("INTEGER");
@@ -1551,9 +1532,8 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
 
             modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.Invoice", b =>
                 {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
 
                     b.Property<decimal>("Amount")
                         .HasPrecision(18, 2)
@@ -1576,8 +1556,8 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasMaxLength(100)
                         .HasColumnType("TEXT");
 
-                    b.Property<int?>("DocumentId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid?>("DocumentId")
+                        .HasColumnType("TEXT");
 
                     b.Property<DateTime>("DueOn")
                         .HasColumnType("TEXT");
@@ -1609,16 +1589,15 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                     b.Property<DateTime?>("LateFeeAppliedOn")
                         .HasColumnType("TEXT");
 
-                    b.Property<int>("LeaseId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("LeaseId")
+                        .HasColumnType("TEXT");
 
                     b.Property<string>("Notes")
                         .IsRequired()
                         .HasMaxLength(500)
                         .HasColumnType("TEXT");
 
-                    b.Property<string>("OrganizationId")
-                        .IsRequired()
+                    b.Property<Guid>("OrganizationId")
                         .HasMaxLength(100)
                         .HasColumnType("TEXT");
 
@@ -1652,9 +1631,8 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
 
             modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.Lease", b =>
                 {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
 
                     b.Property<string>("CreatedBy")
                         .IsRequired()
@@ -1667,8 +1645,8 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                     b.Property<DateTime?>("DeclinedOn")
                         .HasColumnType("TEXT");
 
-                    b.Property<int?>("DocumentId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid?>("DocumentId")
+                        .HasColumnType("TEXT");
 
                     b.Property<DateTime>("EndDate")
                         .HasColumnType("TEXT");
@@ -1686,8 +1664,8 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                     b.Property<DateTime?>("LastModifiedOn")
                         .HasColumnType("TEXT");
 
-                    b.Property<int?>("LeaseOfferId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid?>("LeaseOfferId")
+                        .HasColumnType("TEXT");
 
                     b.Property<decimal>("MonthlyRent")
                         .HasPrecision(18, 2)
@@ -1701,16 +1679,15 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                     b.Property<DateTime?>("OfferedOn")
                         .HasColumnType("TEXT");
 
-                    b.Property<string>("OrganizationId")
-                        .IsRequired()
+                    b.Property<Guid>("OrganizationId")
                         .HasMaxLength(100)
                         .HasColumnType("TEXT");
 
-                    b.Property<int?>("PreviousLeaseId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid?>("PreviousLeaseId")
+                        .HasColumnType("TEXT");
 
-                    b.Property<int>("PropertyId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("PropertyId")
+                        .HasColumnType("TEXT");
 
                     b.Property<decimal?>("ProposedRenewalRent")
                         .HasColumnType("decimal(18,2)");
@@ -1753,8 +1730,8 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasMaxLength(50)
                         .HasColumnType("TEXT");
 
-                    b.Property<int>("TenantId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("TEXT");
 
                     b.Property<string>("Terms")
                         .IsRequired()
@@ -1776,12 +1753,11 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
 
             modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.LeaseOffer", b =>
                 {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
 
-                    b.Property<int?>("ConvertedLeaseId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid?>("ConvertedLeaseId")
+                        .HasColumnType("TEXT");
 
                     b.Property<string>("CreatedBy")
                         .IsRequired()
@@ -1818,19 +1794,18 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                     b.Property<DateTime>("OfferedOn")
                         .HasColumnType("TEXT");
 
-                    b.Property<string>("OrganizationId")
-                        .IsRequired()
+                    b.Property<Guid>("OrganizationId")
                         .HasMaxLength(100)
                         .HasColumnType("TEXT");
 
-                    b.Property<int>("PropertyId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("PropertyId")
+                        .HasColumnType("TEXT");
 
-                    b.Property<int>("ProspectiveTenantId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("ProspectiveTenantId")
+                        .HasColumnType("TEXT");
 
-                    b.Property<int>("RentalApplicationId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("RentalApplicationId")
+                        .HasColumnType("TEXT");
 
                     b.Property<DateTime?>("RespondedOn")
                         .HasColumnType("TEXT");
@@ -1868,9 +1843,8 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
 
             modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.MaintenanceRequest", b =>
                 {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
 
                     b.Property<decimal>("ActualCost")
                         .HasPrecision(18, 2)
@@ -1881,8 +1855,8 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasMaxLength(100)
                         .HasColumnType("TEXT");
 
-                    b.Property<int?>("CalendarEventId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid?>("CalendarEventId")
+                        .HasColumnType("TEXT");
 
                     b.Property<DateTime?>("CompletedOn")
                         .HasColumnType("TEXT");
@@ -1914,11 +1888,10 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                     b.Property<DateTime?>("LastModifiedOn")
                         .HasColumnType("TEXT");
 
-                    b.Property<int?>("LeaseId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid?>("LeaseId")
+                        .HasColumnType("TEXT");
 
-                    b.Property<string>("OrganizationId")
-                        .IsRequired()
+                    b.Property<Guid>("OrganizationId")
                         .HasMaxLength(100)
                         .HasColumnType("TEXT");
 
@@ -1927,8 +1900,8 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasMaxLength(20)
                         .HasColumnType("TEXT");
 
-                    b.Property<int>("PropertyId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("PropertyId")
+                        .HasColumnType("TEXT");
 
                     b.Property<string>("RequestType")
                         .IsRequired()
@@ -1988,9 +1961,8 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
 
             modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.Note", b =>
                 {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
 
                     b.Property<string>("Content")
                         .IsRequired()
@@ -2005,8 +1977,8 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                     b.Property<DateTime>("CreatedOn")
                         .HasColumnType("TEXT");
 
-                    b.Property<int>("EntityId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("EntityId")
+                        .HasColumnType("TEXT");
 
                     b.Property<string>("EntityType")
                         .IsRequired()
@@ -2023,8 +1995,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                     b.Property<DateTime?>("LastModifiedOn")
                         .HasColumnType("TEXT");
 
-                    b.Property<string>("OrganizationId")
-                        .IsRequired()
+                    b.Property<Guid>("OrganizationId")
                         .HasMaxLength(100)
                         .HasColumnType("TEXT");
 
@@ -2041,7 +2012,8 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
 
             modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.Organization", b =>
                 {
-                    b.Property<string>("Id")
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
                         .HasMaxLength(100)
                         .HasColumnType("TEXT");
 
@@ -2089,9 +2061,8 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
 
             modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.OrganizationSettings", b =>
                 {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
 
                     b.Property<bool>("AllowTenantDividendChoice")
                         .HasColumnType("INTEGER");
@@ -2194,9 +2165,8 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
 
             modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.Payment", b =>
                 {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
 
                     b.Property<decimal>("Amount")
                         .HasPrecision(18, 2)
@@ -2210,11 +2180,11 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                     b.Property<DateTime>("CreatedOn")
                         .HasColumnType("TEXT");
 
-                    b.Property<int?>("DocumentId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid?>("DocumentId")
+                        .HasColumnType("TEXT");
 
-                    b.Property<int>("InvoiceId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("InvoiceId")
+                        .HasColumnType("TEXT");
 
                     b.Property<bool>("IsDeleted")
                         .HasColumnType("INTEGER");
@@ -2231,8 +2201,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasMaxLength(1000)
                         .HasColumnType("TEXT");
 
-                    b.Property<string>("OrganizationId")
-                        .IsRequired()
+                    b.Property<Guid>("OrganizationId")
                         .HasMaxLength(100)
                         .HasColumnType("TEXT");
 
@@ -2257,9 +2226,8 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
 
             modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.Property", b =>
                 {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
 
                     b.Property<string>("Address")
                         .IsRequired()
@@ -2315,8 +2283,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                     b.Property<DateTime?>("NextRoutineInspectionDueDate")
                         .HasColumnType("TEXT");
 
-                    b.Property<string>("OrganizationId")
-                        .IsRequired()
+                    b.Property<Guid>("OrganizationId")
                         .HasMaxLength(100)
                         .HasColumnType("TEXT");
 
@@ -2362,9 +2329,8 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
 
             modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.ProspectiveTenant", b =>
                 {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
 
                     b.Property<string>("CreatedBy")
                         .IsRequired()
@@ -2401,8 +2367,8 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasMaxLength(2)
                         .HasColumnType("TEXT");
 
-                    b.Property<int?>("InterestedPropertyId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid?>("InterestedPropertyId")
+                        .HasColumnType("TEXT");
 
                     b.Property<bool>("IsDeleted")
                         .HasColumnType("INTEGER");
@@ -2423,8 +2389,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasMaxLength(2000)
                         .HasColumnType("TEXT");
 
-                    b.Property<string>("OrganizationId")
-                        .IsRequired()
+                    b.Property<Guid>("OrganizationId")
                         .HasMaxLength(100)
                         .HasColumnType("TEXT");
 
@@ -2457,9 +2422,8 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
 
             modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.RentalApplication", b =>
                 {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
 
                     b.Property<decimal>("ApplicationFee")
                         .HasPrecision(18, 2)
@@ -2561,16 +2525,15 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasPrecision(18, 2)
                         .HasColumnType("decimal(18,2)");
 
-                    b.Property<string>("OrganizationId")
-                        .IsRequired()
+                    b.Property<Guid>("OrganizationId")
                         .HasMaxLength(100)
                         .HasColumnType("TEXT");
 
-                    b.Property<int>("PropertyId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("PropertyId")
+                        .HasColumnType("TEXT");
 
-                    b.Property<int>("ProspectiveTenantId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("ProspectiveTenantId")
+                        .HasColumnType("TEXT");
 
                     b.Property<string>("Reference1Name")
                         .IsRequired()
@@ -2646,9 +2609,8 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
 
             modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.SecurityDeposit", b =>
                 {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
 
                     b.Property<decimal>("Amount")
                         .HasPrecision(18, 2)
@@ -2686,15 +2648,14 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                     b.Property<DateTime?>("LastModifiedOn")
                         .HasColumnType("TEXT");
 
-                    b.Property<int>("LeaseId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("LeaseId")
+                        .HasColumnType("TEXT");
 
                     b.Property<string>("Notes")
                         .HasMaxLength(500)
                         .HasColumnType("TEXT");
 
-                    b.Property<string>("OrganizationId")
-                        .IsRequired()
+                    b.Property<Guid>("OrganizationId")
                         .HasMaxLength(100)
                         .HasColumnType("TEXT");
 
@@ -2729,8 +2690,8 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasMaxLength(50)
                         .HasColumnType("TEXT");
 
-                    b.Property<int>("TenantId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("TEXT");
 
                     b.Property<string>("TransactionReference")
                         .HasMaxLength(100)
@@ -2752,9 +2713,8 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
 
             modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.SecurityDepositDividend", b =>
                 {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
 
                     b.Property<decimal>("BaseDividendAmount")
                         .HasPrecision(18, 2)
@@ -2775,8 +2735,8 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasPrecision(18, 2)
                         .HasColumnType("decimal(18,2)");
 
-                    b.Property<int>("InvestmentPoolId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("InvestmentPoolId")
+                        .HasColumnType("TEXT");
 
                     b.Property<bool>("IsDeleted")
                         .HasColumnType("INTEGER");
@@ -2788,8 +2748,8 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                     b.Property<DateTime?>("LastModifiedOn")
                         .HasColumnType("TEXT");
 
-                    b.Property<int>("LeaseId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("LeaseId")
+                        .HasColumnType("TEXT");
 
                     b.Property<string>("MailingAddress")
                         .HasMaxLength(500)
@@ -2802,8 +2762,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasMaxLength(500)
                         .HasColumnType("TEXT");
 
-                    b.Property<string>("OrganizationId")
-                        .IsRequired()
+                    b.Property<Guid>("OrganizationId")
                         .HasMaxLength(100)
                         .HasColumnType("TEXT");
 
@@ -2823,16 +2782,16 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasPrecision(18, 6)
                         .HasColumnType("decimal(18,6)");
 
-                    b.Property<int>("SecurityDepositId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("SecurityDepositId")
+                        .HasColumnType("TEXT");
 
                     b.Property<string>("Status")
                         .IsRequired()
                         .HasMaxLength(50)
                         .HasColumnType("TEXT");
 
-                    b.Property<int>("TenantId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("TEXT");
 
                     b.Property<int>("Year")
                         .HasColumnType("INTEGER");
@@ -2856,9 +2815,8 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
 
             modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.SecurityDepositInvestmentPool", b =>
                 {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
 
                     b.Property<int>("ActiveLeaseCount")
                         .HasColumnType("INTEGER");
@@ -2899,8 +2857,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasMaxLength(1000)
                         .HasColumnType("TEXT");
 
-                    b.Property<string>("OrganizationId")
-                        .IsRequired()
+                    b.Property<Guid>("OrganizationId")
                         .HasColumnType("TEXT");
 
                     b.Property<decimal>("OrganizationShare")
@@ -2949,9 +2906,8 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
 
             modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.Tenant", b =>
                 {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
 
                     b.Property<string>("CreatedBy")
                         .IsRequired()
@@ -3011,8 +2967,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasMaxLength(500)
                         .HasColumnType("TEXT");
 
-                    b.Property<string>("OrganizationId")
-                        .IsRequired()
+                    b.Property<Guid>("OrganizationId")
                         .HasColumnType("TEXT");
 
                     b.Property<string>("PhoneNumber")
@@ -3020,8 +2975,8 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasMaxLength(20)
                         .HasColumnType("TEXT");
 
-                    b.Property<int?>("ProspectiveTenantId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid?>("ProspectiveTenantId")
+                        .HasColumnType("TEXT");
 
                     b.HasKey("Id");
 
@@ -3038,15 +2993,14 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
 
             modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.Tour", b =>
                 {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
 
-                    b.Property<int?>("CalendarEventId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid?>("CalendarEventId")
+                        .HasColumnType("TEXT");
 
-                    b.Property<int?>("ChecklistId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid?>("ChecklistId")
+                        .HasColumnType("TEXT");
 
                     b.Property<string>("ConductedBy")
                         .HasMaxLength(100)
@@ -3081,16 +3035,15 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                     b.Property<DateTime?>("LastModifiedOn")
                         .HasColumnType("TEXT");
 
-                    b.Property<string>("OrganizationId")
-                        .IsRequired()
+                    b.Property<Guid>("OrganizationId")
                         .HasMaxLength(100)
                         .HasColumnType("TEXT");
 
-                    b.Property<int>("PropertyId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("PropertyId")
+                        .HasColumnType("TEXT");
 
-                    b.Property<int>("ProspectiveTenantId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("ProspectiveTenantId")
+                        .HasColumnType("TEXT");
 
                     b.Property<DateTime>("ScheduledOn")
                         .HasColumnType("TEXT");
@@ -3119,7 +3072,8 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
 
             modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.UserOrganization", b =>
                 {
-                    b.Property<string>("Id")
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
                         .HasMaxLength(100)
                         .HasColumnType("TEXT");
 
@@ -3149,8 +3103,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                     b.Property<DateTime?>("LastModifiedOn")
                         .HasColumnType("TEXT");
 
-                    b.Property<string>("OrganizationId")
-                        .IsRequired()
+                    b.Property<Guid>("OrganizationId")
                         .HasColumnType("TEXT");
 
                     b.Property<DateTime?>("RevokedOn")
@@ -3188,8 +3141,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                     b.Property<int>("AccessFailedCount")
                         .HasColumnType("INTEGER");
 
-                    b.Property<string>("ActiveOrganizationId")
-                        .IsRequired()
+                    b.Property<Guid>("ActiveOrganizationId")
                         .HasColumnType("TEXT");
 
                     b.Property<string>("ConcurrencyStamp")
@@ -3234,8 +3186,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasMaxLength(256)
                         .HasColumnType("TEXT");
 
-                    b.Property<string>("OrganizationId")
-                        .IsRequired()
+                    b.Property<Guid>("OrganizationId")
                         .HasColumnType("TEXT");
 
                     b.Property<string>("PasswordHash")
diff --git a/Aquiis.SimpleStart/Infrastructure/Data/Migrations/20251204004153_InitialCreate.cs b/Aquiis.SimpleStart/Infrastructure/Data/Migrations/20251209234246_InitialCreate.cs
similarity index 81%
rename from Aquiis.SimpleStart/Infrastructure/Data/Migrations/20251204004153_InitialCreate.cs
rename to Aquiis.SimpleStart/Infrastructure/Data/Migrations/20251209234246_InitialCreate.cs
index c08e126..3db4d21 100644
--- a/Aquiis.SimpleStart/Infrastructure/Data/Migrations/20251204004153_InitialCreate.cs
+++ b/Aquiis.SimpleStart/Infrastructure/Data/Migrations/20251209234246_InitialCreate.cs
@@ -5,7 +5,7 @@
 
 #pragma warning disable CA1814 // Prefer jagged arrays over multidimensional
 
-namespace Aquiis.SimpleStart.Infrastructure.Data.Migrations
+namespace Aquiis.SimpleStart.Migrations
 {
     /// <inheritdoc />
     public partial class InitialCreate : Migration
@@ -32,8 +32,8 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 columns: table => new
                 {
                     Id = table.Column<string>(type: "TEXT", nullable: false),
-                    ActiveOrganizationId = table.Column<string>(type: "TEXT", nullable: false),
-                    OrganizationId = table.Column<string>(type: "TEXT", nullable: false),
+                    ActiveOrganizationId = table.Column<Guid>(type: "TEXT", nullable: false),
+                    OrganizationId = table.Column<Guid>(type: "TEXT", nullable: false),
                     FirstName = table.Column<string>(type: "TEXT", nullable: false),
                     LastName = table.Column<string>(type: "TEXT", nullable: false),
                     LastLoginDate = table.Column<DateTime>(type: "TEXT", nullable: true),
@@ -64,9 +64,8 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 name: "CalendarSettings",
                 columns: table => new
                 {
-                    Id = table.Column<int>(type: "INTEGER", nullable: false)
-                        .Annotation("Sqlite:Autoincrement", true),
-                    OrganizationId = table.Column<string>(type: "TEXT", maxLength: 100, nullable: false),
+                    Id = table.Column<Guid>(type: "TEXT", nullable: false),
+                    OrganizationId = table.Column<Guid>(type: "TEXT", maxLength: 100, nullable: false),
                     EntityType = table.Column<string>(type: "TEXT", nullable: false),
                     AutoCreateEvents = table.Column<bool>(type: "INTEGER", nullable: false),
                     ShowOnCalendar = table.Column<bool>(type: "INTEGER", nullable: false),
@@ -88,9 +87,8 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 name: "ChecklistTemplates",
                 columns: table => new
                 {
-                    Id = table.Column<int>(type: "INTEGER", nullable: false)
-                        .Annotation("Sqlite:Autoincrement", true),
-                    OrganizationId = table.Column<string>(type: "TEXT", maxLength: 100, nullable: false),
+                    Id = table.Column<Guid>(type: "TEXT", nullable: false),
+                    OrganizationId = table.Column<Guid>(type: "TEXT", maxLength: 100, nullable: false),
                     Name = table.Column<string>(type: "TEXT", maxLength: 100, nullable: false),
                     Description = table.Column<string>(type: "TEXT", maxLength: 500, nullable: true),
                     Category = table.Column<string>(type: "TEXT", maxLength: 50, nullable: false),
@@ -110,8 +108,7 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 name: "OrganizationSettings",
                 columns: table => new
                 {
-                    Id = table.Column<int>(type: "INTEGER", nullable: false)
-                        .Annotation("Sqlite:Autoincrement", true),
+                    Id = table.Column<Guid>(type: "TEXT", nullable: false),
                     OrganizationId = table.Column<string>(type: "TEXT", maxLength: 100, nullable: false),
                     Name = table.Column<string>(type: "TEXT", maxLength: 200, nullable: true),
                     LateFeeEnabled = table.Column<bool>(type: "INTEGER", nullable: false),
@@ -163,9 +160,8 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 name: "SecurityDepositInvestmentPools",
                 columns: table => new
                 {
-                    Id = table.Column<int>(type: "INTEGER", nullable: false)
-                        .Annotation("Sqlite:Autoincrement", true),
-                    OrganizationId = table.Column<string>(type: "TEXT", nullable: false),
+                    Id = table.Column<Guid>(type: "TEXT", nullable: false),
+                    OrganizationId = table.Column<Guid>(type: "TEXT", nullable: false),
                     Year = table.Column<int>(type: "INTEGER", nullable: false),
                     StartingBalance = table.Column<decimal>(type: "decimal(18,2)", precision: 18, scale: 2, nullable: false),
                     EndingBalance = table.Column<decimal>(type: "decimal(18,2)", precision: 18, scale: 2, nullable: false),
@@ -191,6 +187,32 @@ protected override void Up(MigrationBuilder migrationBuilder)
                     table.PrimaryKey("PK_SecurityDepositInvestmentPools", x => x.Id);
                 });
 
+            migrationBuilder.CreateTable(
+                name: "WorkflowAuditLogs",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "TEXT", nullable: false),
+                    EntityType = table.Column<string>(type: "TEXT", nullable: false),
+                    EntityId = table.Column<Guid>(type: "TEXT", nullable: false),
+                    FromStatus = table.Column<string>(type: "TEXT", nullable: true),
+                    ToStatus = table.Column<string>(type: "TEXT", nullable: false),
+                    Action = table.Column<string>(type: "TEXT", nullable: false),
+                    Reason = table.Column<string>(type: "TEXT", nullable: true),
+                    PerformedBy = table.Column<string>(type: "TEXT", nullable: false),
+                    PerformedOn = table.Column<DateTime>(type: "TEXT", nullable: false),
+                    OrganizationId = table.Column<Guid>(type: "TEXT", nullable: false),
+                    Metadata = table.Column<string>(type: "TEXT", nullable: true),
+                    CreatedOn = table.Column<DateTime>(type: "TEXT", nullable: false),
+                    CreatedBy = table.Column<string>(type: "TEXT", maxLength: 100, nullable: false),
+                    LastModifiedOn = table.Column<DateTime>(type: "TEXT", nullable: true),
+                    LastModifiedBy = table.Column<string>(type: "TEXT", maxLength: 100, nullable: true),
+                    IsDeleted = table.Column<bool>(type: "INTEGER", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_WorkflowAuditLogs", x => x.Id);
+                });
+
             migrationBuilder.CreateTable(
                 name: "AspNetRoleClaims",
                 columns: table => new
@@ -301,12 +323,11 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 name: "Notes",
                 columns: table => new
                 {
-                    Id = table.Column<int>(type: "INTEGER", nullable: false)
-                        .Annotation("Sqlite:Autoincrement", true),
-                    OrganizationId = table.Column<string>(type: "TEXT", maxLength: 100, nullable: false),
+                    Id = table.Column<Guid>(type: "TEXT", nullable: false),
+                    OrganizationId = table.Column<Guid>(type: "TEXT", maxLength: 100, nullable: false),
                     Content = table.Column<string>(type: "TEXT", maxLength: 5000, nullable: false),
                     EntityType = table.Column<string>(type: "TEXT", maxLength: 100, nullable: false),
-                    EntityId = table.Column<int>(type: "INTEGER", nullable: false),
+                    EntityId = table.Column<Guid>(type: "TEXT", nullable: false),
                     UserFullName = table.Column<string>(type: "TEXT", maxLength: 100, nullable: true),
                     CreatedOn = table.Column<DateTime>(type: "TEXT", nullable: false),
                     CreatedBy = table.Column<string>(type: "TEXT", maxLength: 100, nullable: false),
@@ -329,7 +350,7 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 name: "Organizations",
                 columns: table => new
                 {
-                    Id = table.Column<string>(type: "TEXT", maxLength: 100, nullable: false),
+                    Id = table.Column<Guid>(type: "TEXT", maxLength: 100, nullable: false),
                     OwnerId = table.Column<string>(type: "TEXT", nullable: false),
                     Name = table.Column<string>(type: "TEXT", nullable: false),
                     DisplayName = table.Column<string>(type: "TEXT", nullable: true),
@@ -356,10 +377,9 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 name: "ChecklistTemplateItems",
                 columns: table => new
                 {
-                    Id = table.Column<int>(type: "INTEGER", nullable: false)
-                        .Annotation("Sqlite:Autoincrement", true),
-                    OrganizationId = table.Column<string>(type: "TEXT", maxLength: 100, nullable: false),
-                    ChecklistTemplateId = table.Column<int>(type: "INTEGER", nullable: false),
+                    Id = table.Column<Guid>(type: "TEXT", nullable: false),
+                    OrganizationId = table.Column<Guid>(type: "TEXT", maxLength: 100, nullable: false),
+                    ChecklistTemplateId = table.Column<Guid>(type: "TEXT", nullable: false),
                     ItemText = table.Column<string>(type: "TEXT", maxLength: 500, nullable: false),
                     ItemOrder = table.Column<int>(type: "INTEGER", nullable: false),
                     CategorySection = table.Column<string>(type: "TEXT", maxLength: 100, nullable: true),
@@ -388,9 +408,8 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 name: "Properties",
                 columns: table => new
                 {
-                    Id = table.Column<int>(type: "INTEGER", nullable: false)
-                        .Annotation("Sqlite:Autoincrement", true),
-                    OrganizationId = table.Column<string>(type: "TEXT", maxLength: 100, nullable: false),
+                    Id = table.Column<Guid>(type: "TEXT", nullable: false),
+                    OrganizationId = table.Column<Guid>(type: "TEXT", maxLength: 100, nullable: false),
                     Address = table.Column<string>(type: "TEXT", maxLength: 200, nullable: false),
                     UnitNumber = table.Column<string>(type: "TEXT", maxLength: 50, nullable: true),
                     City = table.Column<string>(type: "TEXT", maxLength: 100, nullable: false),
@@ -427,9 +446,8 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 name: "Tenants",
                 columns: table => new
                 {
-                    Id = table.Column<int>(type: "INTEGER", nullable: false)
-                        .Annotation("Sqlite:Autoincrement", true),
-                    OrganizationId = table.Column<string>(type: "TEXT", nullable: false),
+                    Id = table.Column<Guid>(type: "TEXT", nullable: false),
+                    OrganizationId = table.Column<Guid>(type: "TEXT", nullable: false),
                     FirstName = table.Column<string>(type: "TEXT", maxLength: 100, nullable: false),
                     LastName = table.Column<string>(type: "TEXT", maxLength: 100, nullable: false),
                     IdentificationNumber = table.Column<string>(type: "TEXT", maxLength: 100, nullable: false),
@@ -440,7 +458,7 @@ protected override void Up(MigrationBuilder migrationBuilder)
                     EmergencyContactName = table.Column<string>(type: "TEXT", maxLength: 200, nullable: false),
                     EmergencyContactPhone = table.Column<string>(type: "TEXT", maxLength: 20, nullable: true),
                     Notes = table.Column<string>(type: "TEXT", maxLength: 500, nullable: false),
-                    ProspectiveTenantId = table.Column<int>(type: "INTEGER", nullable: true),
+                    ProspectiveTenantId = table.Column<Guid>(type: "TEXT", nullable: true),
                     CreatedOn = table.Column<DateTime>(type: "TEXT", nullable: false),
                     CreatedBy = table.Column<string>(type: "TEXT", maxLength: 100, nullable: false),
                     LastModifiedOn = table.Column<DateTime>(type: "TEXT", nullable: true),
@@ -461,9 +479,9 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 name: "UserOrganizations",
                 columns: table => new
                 {
-                    Id = table.Column<string>(type: "TEXT", maxLength: 100, nullable: false),
+                    Id = table.Column<Guid>(type: "TEXT", maxLength: 100, nullable: false),
                     UserId = table.Column<string>(type: "TEXT", nullable: false),
-                    OrganizationId = table.Column<string>(type: "TEXT", nullable: false),
+                    OrganizationId = table.Column<Guid>(type: "TEXT", nullable: false),
                     Role = table.Column<string>(type: "TEXT", nullable: false),
                     GrantedBy = table.Column<string>(type: "TEXT", nullable: false),
                     GrantedOn = table.Column<DateTime>(type: "TEXT", nullable: false),
@@ -502,9 +520,8 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 name: "CalendarEvents",
                 columns: table => new
                 {
-                    Id = table.Column<int>(type: "INTEGER", nullable: false)
-                        .Annotation("Sqlite:Autoincrement", true),
-                    OrganizationId = table.Column<string>(type: "TEXT", maxLength: 100, nullable: false),
+                    Id = table.Column<Guid>(type: "TEXT", nullable: false),
+                    OrganizationId = table.Column<Guid>(type: "TEXT", maxLength: 100, nullable: false),
                     Title = table.Column<string>(type: "TEXT", maxLength: 200, nullable: false),
                     StartOn = table.Column<DateTime>(type: "TEXT", nullable: false),
                     EndOn = table.Column<DateTime>(type: "TEXT", nullable: true),
@@ -512,11 +529,11 @@ protected override void Up(MigrationBuilder migrationBuilder)
                     EventType = table.Column<string>(type: "TEXT", maxLength: 50, nullable: false),
                     Status = table.Column<string>(type: "TEXT", maxLength: 50, nullable: false),
                     Description = table.Column<string>(type: "TEXT", maxLength: 2000, nullable: true),
-                    PropertyId = table.Column<int>(type: "INTEGER", nullable: true),
+                    PropertyId = table.Column<Guid>(type: "TEXT", nullable: true),
                     Location = table.Column<string>(type: "TEXT", maxLength: 500, nullable: true),
                     Color = table.Column<string>(type: "TEXT", maxLength: 20, nullable: false),
                     Icon = table.Column<string>(type: "TEXT", maxLength: 50, nullable: false),
-                    SourceEntityId = table.Column<int>(type: "INTEGER", nullable: true),
+                    SourceEntityId = table.Column<Guid>(type: "TEXT", nullable: true),
                     SourceEntityType = table.Column<string>(type: "TEXT", maxLength: 100, nullable: true),
                     CreatedOn = table.Column<DateTime>(type: "TEXT", nullable: false),
                     CreatedBy = table.Column<string>(type: "TEXT", maxLength: 100, nullable: false),
@@ -539,9 +556,8 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 name: "ProspectiveTenants",
                 columns: table => new
                 {
-                    Id = table.Column<int>(type: "INTEGER", nullable: false)
-                        .Annotation("Sqlite:Autoincrement", true),
-                    OrganizationId = table.Column<string>(type: "TEXT", maxLength: 100, nullable: false),
+                    Id = table.Column<Guid>(type: "TEXT", nullable: false),
+                    OrganizationId = table.Column<Guid>(type: "TEXT", maxLength: 100, nullable: false),
                     FirstName = table.Column<string>(type: "TEXT", maxLength: 100, nullable: false),
                     LastName = table.Column<string>(type: "TEXT", maxLength: 100, nullable: false),
                     Email = table.Column<string>(type: "TEXT", maxLength: 200, nullable: false),
@@ -552,7 +568,7 @@ protected override void Up(MigrationBuilder migrationBuilder)
                     Status = table.Column<string>(type: "TEXT", maxLength: 50, nullable: false),
                     Source = table.Column<string>(type: "TEXT", maxLength: 100, nullable: true),
                     Notes = table.Column<string>(type: "TEXT", maxLength: 2000, nullable: true),
-                    InterestedPropertyId = table.Column<int>(type: "INTEGER", nullable: true),
+                    InterestedPropertyId = table.Column<Guid>(type: "TEXT", nullable: true),
                     DesiredMoveInDate = table.Column<DateTime>(type: "TEXT", nullable: true),
                     FirstContactedOn = table.Column<DateTime>(type: "TEXT", nullable: true),
                     CreatedOn = table.Column<DateTime>(type: "TEXT", nullable: false),
@@ -576,11 +592,10 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 name: "RentalApplications",
                 columns: table => new
                 {
-                    Id = table.Column<int>(type: "INTEGER", nullable: false)
-                        .Annotation("Sqlite:Autoincrement", true),
-                    OrganizationId = table.Column<string>(type: "TEXT", maxLength: 100, nullable: false),
-                    ProspectiveTenantId = table.Column<int>(type: "INTEGER", nullable: false),
-                    PropertyId = table.Column<int>(type: "INTEGER", nullable: false),
+                    Id = table.Column<Guid>(type: "TEXT", nullable: false),
+                    OrganizationId = table.Column<Guid>(type: "TEXT", maxLength: 100, nullable: false),
+                    ProspectiveTenantId = table.Column<Guid>(type: "TEXT", nullable: false),
+                    PropertyId = table.Column<Guid>(type: "TEXT", nullable: false),
                     AppliedOn = table.Column<DateTime>(type: "TEXT", nullable: false),
                     Status = table.Column<string>(type: "TEXT", maxLength: 50, nullable: false),
                     CurrentAddress = table.Column<string>(type: "TEXT", maxLength: 200, nullable: false),
@@ -635,10 +650,9 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 name: "ApplicationScreenings",
                 columns: table => new
                 {
-                    Id = table.Column<int>(type: "INTEGER", nullable: false)
-                        .Annotation("Sqlite:Autoincrement", true),
-                    OrganizationId = table.Column<string>(type: "TEXT", maxLength: 100, nullable: false),
-                    RentalApplicationId = table.Column<int>(type: "INTEGER", nullable: false),
+                    Id = table.Column<Guid>(type: "TEXT", nullable: false),
+                    OrganizationId = table.Column<Guid>(type: "TEXT", maxLength: 100, nullable: false),
+                    RentalApplicationId = table.Column<Guid>(type: "TEXT", nullable: false),
                     BackgroundCheckRequested = table.Column<bool>(type: "INTEGER", nullable: false),
                     BackgroundCheckRequestedOn = table.Column<DateTime>(type: "TEXT", nullable: true),
                     BackgroundCheckPassed = table.Column<bool>(type: "INTEGER", nullable: true),
@@ -673,12 +687,11 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 name: "LeaseOffers",
                 columns: table => new
                 {
-                    Id = table.Column<int>(type: "INTEGER", nullable: false)
-                        .Annotation("Sqlite:Autoincrement", true),
-                    OrganizationId = table.Column<string>(type: "TEXT", maxLength: 100, nullable: false),
-                    RentalApplicationId = table.Column<int>(type: "INTEGER", nullable: false),
-                    PropertyId = table.Column<int>(type: "INTEGER", nullable: false),
-                    ProspectiveTenantId = table.Column<int>(type: "INTEGER", nullable: false),
+                    Id = table.Column<Guid>(type: "TEXT", nullable: false),
+                    OrganizationId = table.Column<Guid>(type: "TEXT", maxLength: 100, nullable: false),
+                    RentalApplicationId = table.Column<Guid>(type: "TEXT", nullable: false),
+                    PropertyId = table.Column<Guid>(type: "TEXT", nullable: false),
+                    ProspectiveTenantId = table.Column<Guid>(type: "TEXT", nullable: false),
                     StartDate = table.Column<DateTime>(type: "TEXT", nullable: false),
                     EndDate = table.Column<DateTime>(type: "TEXT", nullable: false),
                     MonthlyRent = table.Column<decimal>(type: "decimal(18,2)", nullable: false),
@@ -690,7 +703,7 @@ protected override void Up(MigrationBuilder migrationBuilder)
                     Status = table.Column<string>(type: "TEXT", maxLength: 50, nullable: false),
                     RespondedOn = table.Column<DateTime>(type: "TEXT", nullable: true),
                     ResponseNotes = table.Column<string>(type: "TEXT", maxLength: 500, nullable: true),
-                    ConvertedLeaseId = table.Column<int>(type: "INTEGER", nullable: true),
+                    ConvertedLeaseId = table.Column<Guid>(type: "TEXT", nullable: true),
                     CreatedOn = table.Column<DateTime>(type: "TEXT", nullable: false),
                     CreatedBy = table.Column<string>(type: "TEXT", maxLength: 100, nullable: false),
                     LastModifiedOn = table.Column<DateTime>(type: "TEXT", nullable: true),
@@ -724,10 +737,9 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 name: "ChecklistItems",
                 columns: table => new
                 {
-                    Id = table.Column<int>(type: "INTEGER", nullable: false)
-                        .Annotation("Sqlite:Autoincrement", true),
-                    OrganizationId = table.Column<string>(type: "TEXT", maxLength: 100, nullable: false),
-                    ChecklistId = table.Column<int>(type: "INTEGER", nullable: false),
+                    Id = table.Column<Guid>(type: "TEXT", nullable: false),
+                    OrganizationId = table.Column<Guid>(type: "TEXT", maxLength: 100, nullable: false),
+                    ChecklistId = table.Column<Guid>(type: "TEXT", nullable: false),
                     ItemText = table.Column<string>(type: "TEXT", maxLength: 500, nullable: false),
                     ItemOrder = table.Column<int>(type: "INTEGER", nullable: false),
                     CategorySection = table.Column<string>(type: "TEXT", maxLength: 100, nullable: true),
@@ -752,18 +764,17 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 name: "Checklists",
                 columns: table => new
                 {
-                    Id = table.Column<int>(type: "INTEGER", nullable: false)
-                        .Annotation("Sqlite:Autoincrement", true),
-                    OrganizationId = table.Column<string>(type: "TEXT", maxLength: 100, nullable: false),
-                    PropertyId = table.Column<int>(type: "INTEGER", nullable: true),
-                    LeaseId = table.Column<int>(type: "INTEGER", nullable: true),
-                    ChecklistTemplateId = table.Column<int>(type: "INTEGER", nullable: false),
+                    Id = table.Column<Guid>(type: "TEXT", nullable: false),
+                    OrganizationId = table.Column<Guid>(type: "TEXT", maxLength: 100, nullable: false),
+                    PropertyId = table.Column<Guid>(type: "TEXT", nullable: true),
+                    LeaseId = table.Column<Guid>(type: "TEXT", nullable: true),
+                    ChecklistTemplateId = table.Column<Guid>(type: "TEXT", nullable: false),
                     Name = table.Column<string>(type: "TEXT", maxLength: 200, nullable: false),
                     ChecklistType = table.Column<string>(type: "TEXT", maxLength: 50, nullable: false),
                     Status = table.Column<string>(type: "TEXT", maxLength: 50, nullable: false),
                     CompletedBy = table.Column<string>(type: "TEXT", maxLength: 100, nullable: true),
                     CompletedOn = table.Column<DateTime>(type: "TEXT", nullable: true),
-                    DocumentId = table.Column<int>(type: "INTEGER", nullable: true),
+                    DocumentId = table.Column<Guid>(type: "TEXT", nullable: true),
                     GeneralNotes = table.Column<string>(type: "TEXT", maxLength: 2000, nullable: true),
                     CreatedOn = table.Column<DateTime>(type: "TEXT", nullable: false),
                     CreatedBy = table.Column<string>(type: "TEXT", maxLength: 100, nullable: false),
@@ -792,19 +803,18 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 name: "Tours",
                 columns: table => new
                 {
-                    Id = table.Column<int>(type: "INTEGER", nullable: false)
-                        .Annotation("Sqlite:Autoincrement", true),
-                    OrganizationId = table.Column<string>(type: "TEXT", maxLength: 100, nullable: false),
-                    ProspectiveTenantId = table.Column<int>(type: "INTEGER", nullable: false),
-                    PropertyId = table.Column<int>(type: "INTEGER", nullable: false),
+                    Id = table.Column<Guid>(type: "TEXT", nullable: false),
+                    OrganizationId = table.Column<Guid>(type: "TEXT", maxLength: 100, nullable: false),
+                    ProspectiveTenantId = table.Column<Guid>(type: "TEXT", nullable: false),
+                    PropertyId = table.Column<Guid>(type: "TEXT", nullable: false),
                     ScheduledOn = table.Column<DateTime>(type: "TEXT", nullable: false),
                     DurationMinutes = table.Column<int>(type: "INTEGER", nullable: false),
                     Status = table.Column<string>(type: "TEXT", maxLength: 50, nullable: false),
                     Feedback = table.Column<string>(type: "TEXT", maxLength: 2000, nullable: true),
                     InterestLevel = table.Column<string>(type: "TEXT", maxLength: 50, nullable: true),
                     ConductedBy = table.Column<string>(type: "TEXT", maxLength: 100, nullable: true),
-                    ChecklistId = table.Column<int>(type: "INTEGER", nullable: true),
-                    CalendarEventId = table.Column<int>(type: "INTEGER", nullable: true),
+                    ChecklistId = table.Column<Guid>(type: "TEXT", nullable: true),
+                    CalendarEventId = table.Column<Guid>(type: "TEXT", nullable: true),
                     CreatedOn = table.Column<DateTime>(type: "TEXT", nullable: false),
                     CreatedBy = table.Column<string>(type: "TEXT", maxLength: 100, nullable: false),
                     LastModifiedOn = table.Column<DateTime>(type: "TEXT", nullable: true),
@@ -837,9 +847,8 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 name: "Documents",
                 columns: table => new
                 {
-                    Id = table.Column<int>(type: "INTEGER", nullable: false)
-                        .Annotation("Sqlite:Autoincrement", true),
-                    OrganizationId = table.Column<string>(type: "TEXT", maxLength: 100, nullable: false),
+                    Id = table.Column<Guid>(type: "TEXT", nullable: false),
+                    OrganizationId = table.Column<Guid>(type: "TEXT", maxLength: 100, nullable: false),
                     FileName = table.Column<string>(type: "TEXT", maxLength: 255, nullable: false),
                     FileExtension = table.Column<string>(type: "TEXT", maxLength: 10, nullable: false),
                     FileData = table.Column<byte[]>(type: "BLOB", nullable: false),
@@ -849,11 +858,11 @@ protected override void Up(MigrationBuilder migrationBuilder)
                     FileSize = table.Column<long>(type: "INTEGER", nullable: false),
                     DocumentType = table.Column<string>(type: "TEXT", maxLength: 100, nullable: false),
                     Description = table.Column<string>(type: "TEXT", maxLength: 500, nullable: false),
-                    PropertyId = table.Column<int>(type: "INTEGER", nullable: true),
-                    TenantId = table.Column<int>(type: "INTEGER", nullable: true),
-                    LeaseId = table.Column<int>(type: "INTEGER", nullable: true),
-                    InvoiceId = table.Column<int>(type: "INTEGER", nullable: true),
-                    PaymentId = table.Column<int>(type: "INTEGER", nullable: true),
+                    PropertyId = table.Column<Guid>(type: "TEXT", nullable: true),
+                    TenantId = table.Column<Guid>(type: "TEXT", nullable: true),
+                    LeaseId = table.Column<Guid>(type: "TEXT", nullable: true),
+                    InvoiceId = table.Column<Guid>(type: "TEXT", nullable: true),
+                    PaymentId = table.Column<Guid>(type: "TEXT", nullable: true),
                     CreatedOn = table.Column<DateTime>(type: "TEXT", nullable: false),
                     CreatedBy = table.Column<string>(type: "TEXT", maxLength: 100, nullable: false),
                     LastModifiedOn = table.Column<DateTime>(type: "TEXT", nullable: true),
@@ -887,12 +896,11 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 name: "Leases",
                 columns: table => new
                 {
-                    Id = table.Column<int>(type: "INTEGER", nullable: false)
-                        .Annotation("Sqlite:Autoincrement", true),
-                    OrganizationId = table.Column<string>(type: "TEXT", maxLength: 100, nullable: false),
-                    PropertyId = table.Column<int>(type: "INTEGER", nullable: false),
-                    TenantId = table.Column<int>(type: "INTEGER", nullable: false),
-                    LeaseOfferId = table.Column<int>(type: "INTEGER", nullable: true),
+                    Id = table.Column<Guid>(type: "TEXT", nullable: false),
+                    OrganizationId = table.Column<Guid>(type: "TEXT", maxLength: 100, nullable: false),
+                    PropertyId = table.Column<Guid>(type: "TEXT", nullable: false),
+                    TenantId = table.Column<Guid>(type: "TEXT", nullable: false),
+                    LeaseOfferId = table.Column<Guid>(type: "TEXT", nullable: true),
                     StartDate = table.Column<DateTime>(type: "TEXT", nullable: false),
                     EndDate = table.Column<DateTime>(type: "TEXT", nullable: false),
                     MonthlyRent = table.Column<decimal>(type: "decimal(18,2)", precision: 18, scale: 2, nullable: false),
@@ -912,8 +920,8 @@ protected override void Up(MigrationBuilder migrationBuilder)
                     RenewalResponseOn = table.Column<DateTime>(type: "TEXT", nullable: true),
                     ProposedRenewalRent = table.Column<decimal>(type: "decimal(18,2)", nullable: true),
                     RenewalNotes = table.Column<string>(type: "TEXT", maxLength: 1000, nullable: true),
-                    PreviousLeaseId = table.Column<int>(type: "INTEGER", nullable: true),
-                    DocumentId = table.Column<int>(type: "INTEGER", nullable: true),
+                    PreviousLeaseId = table.Column<Guid>(type: "TEXT", nullable: true),
+                    DocumentId = table.Column<Guid>(type: "TEXT", nullable: true),
                     CreatedOn = table.Column<DateTime>(type: "TEXT", nullable: false),
                     CreatedBy = table.Column<string>(type: "TEXT", maxLength: 100, nullable: false),
                     LastModifiedOn = table.Column<DateTime>(type: "TEXT", nullable: true),
@@ -953,12 +961,11 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 name: "Inspections",
                 columns: table => new
                 {
-                    Id = table.Column<int>(type: "INTEGER", nullable: false)
-                        .Annotation("Sqlite:Autoincrement", true),
-                    OrganizationId = table.Column<string>(type: "TEXT", maxLength: 100, nullable: false),
-                    PropertyId = table.Column<int>(type: "INTEGER", nullable: false),
-                    CalendarEventId = table.Column<int>(type: "INTEGER", nullable: true),
-                    LeaseId = table.Column<int>(type: "INTEGER", nullable: true),
+                    Id = table.Column<Guid>(type: "TEXT", nullable: false),
+                    OrganizationId = table.Column<Guid>(type: "TEXT", maxLength: 100, nullable: false),
+                    PropertyId = table.Column<Guid>(type: "TEXT", nullable: false),
+                    CalendarEventId = table.Column<Guid>(type: "TEXT", nullable: true),
+                    LeaseId = table.Column<Guid>(type: "TEXT", nullable: true),
                     CompletedOn = table.Column<DateTime>(type: "TEXT", nullable: false),
                     InspectionType = table.Column<string>(type: "TEXT", maxLength: 50, nullable: false),
                     InspectedBy = table.Column<string>(type: "TEXT", maxLength: 100, nullable: true),
@@ -1015,7 +1022,7 @@ protected override void Up(MigrationBuilder migrationBuilder)
                     OverallCondition = table.Column<string>(type: "TEXT", maxLength: 20, nullable: false),
                     GeneralNotes = table.Column<string>(type: "TEXT", maxLength: 2000, nullable: true),
                     ActionItemsRequired = table.Column<string>(type: "TEXT", maxLength: 2000, nullable: true),
-                    DocumentId = table.Column<int>(type: "INTEGER", nullable: true),
+                    DocumentId = table.Column<Guid>(type: "TEXT", nullable: true),
                     CreatedOn = table.Column<DateTime>(type: "TEXT", nullable: false),
                     CreatedBy = table.Column<string>(type: "TEXT", maxLength: 100, nullable: false),
                     LastModifiedOn = table.Column<DateTime>(type: "TEXT", nullable: true),
@@ -1049,10 +1056,9 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 name: "Invoices",
                 columns: table => new
                 {
-                    Id = table.Column<int>(type: "INTEGER", nullable: false)
-                        .Annotation("Sqlite:Autoincrement", true),
-                    OrganizationId = table.Column<string>(type: "TEXT", maxLength: 100, nullable: false),
-                    LeaseId = table.Column<int>(type: "INTEGER", nullable: false),
+                    Id = table.Column<Guid>(type: "TEXT", nullable: false),
+                    OrganizationId = table.Column<Guid>(type: "TEXT", maxLength: 100, nullable: false),
+                    LeaseId = table.Column<Guid>(type: "TEXT", nullable: false),
                     InvoiceNumber = table.Column<string>(type: "TEXT", maxLength: 50, nullable: false),
                     InvoicedOn = table.Column<DateTime>(type: "TEXT", nullable: false),
                     DueOn = table.Column<DateTime>(type: "TEXT", nullable: false),
@@ -1067,7 +1073,7 @@ protected override void Up(MigrationBuilder migrationBuilder)
                     LateFeeAppliedOn = table.Column<DateTime>(type: "TEXT", nullable: true),
                     ReminderSent = table.Column<bool>(type: "INTEGER", nullable: true),
                     ReminderSentOn = table.Column<DateTime>(type: "TEXT", nullable: true),
-                    DocumentId = table.Column<int>(type: "INTEGER", nullable: true),
+                    DocumentId = table.Column<Guid>(type: "TEXT", nullable: true),
                     CreatedOn = table.Column<DateTime>(type: "TEXT", nullable: false),
                     CreatedBy = table.Column<string>(type: "TEXT", maxLength: 100, nullable: false),
                     LastModifiedOn = table.Column<DateTime>(type: "TEXT", nullable: true),
@@ -1101,12 +1107,11 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 name: "MaintenanceRequests",
                 columns: table => new
                 {
-                    Id = table.Column<int>(type: "INTEGER", nullable: false)
-                        .Annotation("Sqlite:Autoincrement", true),
-                    OrganizationId = table.Column<string>(type: "TEXT", maxLength: 100, nullable: false),
-                    PropertyId = table.Column<int>(type: "INTEGER", nullable: false),
-                    CalendarEventId = table.Column<int>(type: "INTEGER", nullable: true),
-                    LeaseId = table.Column<int>(type: "INTEGER", nullable: true),
+                    Id = table.Column<Guid>(type: "TEXT", nullable: false),
+                    OrganizationId = table.Column<Guid>(type: "TEXT", maxLength: 100, nullable: false),
+                    PropertyId = table.Column<Guid>(type: "TEXT", nullable: false),
+                    CalendarEventId = table.Column<Guid>(type: "TEXT", nullable: true),
+                    LeaseId = table.Column<Guid>(type: "TEXT", nullable: true),
                     Title = table.Column<string>(type: "TEXT", maxLength: 100, nullable: false),
                     Description = table.Column<string>(type: "TEXT", maxLength: 2000, nullable: false),
                     RequestType = table.Column<string>(type: "TEXT", maxLength: 50, nullable: false),
@@ -1149,11 +1154,10 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 name: "SecurityDeposits",
                 columns: table => new
                 {
-                    Id = table.Column<int>(type: "INTEGER", nullable: false)
-                        .Annotation("Sqlite:Autoincrement", true),
-                    OrganizationId = table.Column<string>(type: "TEXT", maxLength: 100, nullable: false),
-                    LeaseId = table.Column<int>(type: "INTEGER", nullable: false),
-                    TenantId = table.Column<int>(type: "INTEGER", nullable: false),
+                    Id = table.Column<Guid>(type: "TEXT", nullable: false),
+                    OrganizationId = table.Column<Guid>(type: "TEXT", maxLength: 100, nullable: false),
+                    LeaseId = table.Column<Guid>(type: "TEXT", nullable: false),
+                    TenantId = table.Column<Guid>(type: "TEXT", nullable: false),
                     Amount = table.Column<decimal>(type: "decimal(18,2)", precision: 18, scale: 2, nullable: false),
                     DateReceived = table.Column<DateTime>(type: "TEXT", nullable: false),
                     PaymentMethod = table.Column<string>(type: "TEXT", maxLength: 50, nullable: false),
@@ -1196,15 +1200,14 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 name: "Payments",
                 columns: table => new
                 {
-                    Id = table.Column<int>(type: "INTEGER", nullable: false)
-                        .Annotation("Sqlite:Autoincrement", true),
-                    OrganizationId = table.Column<string>(type: "TEXT", maxLength: 100, nullable: false),
-                    InvoiceId = table.Column<int>(type: "INTEGER", nullable: false),
+                    Id = table.Column<Guid>(type: "TEXT", nullable: false),
+                    OrganizationId = table.Column<Guid>(type: "TEXT", maxLength: 100, nullable: false),
+                    InvoiceId = table.Column<Guid>(type: "TEXT", nullable: false),
                     PaidOn = table.Column<DateTime>(type: "TEXT", nullable: false),
                     Amount = table.Column<decimal>(type: "decimal(18,2)", precision: 18, scale: 2, nullable: false),
                     PaymentMethod = table.Column<string>(type: "TEXT", maxLength: 50, nullable: false),
                     Notes = table.Column<string>(type: "TEXT", maxLength: 1000, nullable: false),
-                    DocumentId = table.Column<int>(type: "INTEGER", nullable: true),
+                    DocumentId = table.Column<Guid>(type: "TEXT", nullable: true),
                     CreatedOn = table.Column<DateTime>(type: "TEXT", nullable: false),
                     CreatedBy = table.Column<string>(type: "TEXT", maxLength: 100, nullable: false),
                     LastModifiedOn = table.Column<DateTime>(type: "TEXT", nullable: true),
@@ -1238,13 +1241,12 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 name: "SecurityDepositDividends",
                 columns: table => new
                 {
-                    Id = table.Column<int>(type: "INTEGER", nullable: false)
-                        .Annotation("Sqlite:Autoincrement", true),
-                    OrganizationId = table.Column<string>(type: "TEXT", maxLength: 100, nullable: false),
-                    SecurityDepositId = table.Column<int>(type: "INTEGER", nullable: false),
-                    InvestmentPoolId = table.Column<int>(type: "INTEGER", nullable: false),
-                    LeaseId = table.Column<int>(type: "INTEGER", nullable: false),
-                    TenantId = table.Column<int>(type: "INTEGER", nullable: false),
+                    Id = table.Column<Guid>(type: "TEXT", nullable: false),
+                    OrganizationId = table.Column<Guid>(type: "TEXT", maxLength: 100, nullable: false),
+                    SecurityDepositId = table.Column<Guid>(type: "TEXT", nullable: false),
+                    InvestmentPoolId = table.Column<Guid>(type: "TEXT", nullable: false),
+                    LeaseId = table.Column<Guid>(type: "TEXT", nullable: false),
+                    TenantId = table.Column<Guid>(type: "TEXT", nullable: false),
                     Year = table.Column<int>(type: "INTEGER", nullable: false),
                     BaseDividendAmount = table.Column<decimal>(type: "decimal(18,2)", precision: 18, scale: 2, nullable: false),
                     ProrationFactor = table.Column<decimal>(type: "decimal(18,6)", precision: 18, scale: 6, nullable: false),
@@ -1297,10 +1299,10 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 columns: new[] { "Id", "Category", "CreatedBy", "CreatedOn", "Description", "IsDeleted", "IsSystemTemplate", "LastModifiedBy", "LastModifiedOn", "Name", "OrganizationId" },
                 values: new object[,]
                 {
-                    { 1, "Tour", "", new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc), "Standard property showing checklist", false, true, "", null, "Property Tour", "" },
-                    { 2, "MoveIn", "", new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc), "Move-in inspection checklist", false, true, "", null, "Move-In", "" },
-                    { 3, "MoveOut", "", new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc), "Move-out inspection checklist", false, true, "", null, "Move-Out", "" },
-                    { 4, "Tour", "", new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc), "Open house event checklist", false, true, "", null, "Open House", "" }
+                    { new Guid("00000000-0000-0000-0001-000000000001"), "Tour", "", new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc), "Standard property showing checklist", false, true, "", null, "Property Tour", new Guid("00000000-0000-0000-0000-000000000000") },
+                    { new Guid("00000000-0000-0000-0001-000000000002"), "MoveIn", "", new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc), "Move-in inspection checklist", false, true, "", null, "Move-In", new Guid("00000000-0000-0000-0000-000000000000") },
+                    { new Guid("00000000-0000-0000-0001-000000000003"), "MoveOut", "", new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc), "Move-out inspection checklist", false, true, "", null, "Move-Out", new Guid("00000000-0000-0000-0000-000000000000") },
+                    { new Guid("00000000-0000-0000-0001-000000000004"), "Tour", "", new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc), "Open house event checklist", false, true, "", null, "Open House", new Guid("00000000-0000-0000-0000-000000000000") }
                 });
 
             migrationBuilder.InsertData(
@@ -1308,38 +1310,38 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 columns: new[] { "Id", "AllowsNotes", "CategorySection", "ChecklistTemplateId", "CreatedBy", "CreatedOn", "IsDeleted", "IsRequired", "ItemOrder", "ItemText", "LastModifiedBy", "LastModifiedOn", "OrganizationId", "RequiresValue", "SectionOrder" },
                 values: new object[,]
                 {
-                    { 1, true, "Arrival & Introduction", 1, "", new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc), false, true, 1, "Greeted prospect and verified appointment", "", null, "", false, 1 },
-                    { 2, true, "Arrival & Introduction", 1, "", new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc), false, true, 2, "Reviewed property exterior and curb appeal", "", null, "", false, 1 },
-                    { 3, true, "Arrival & Introduction", 1, "", new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc), false, true, 3, "Showed parking area/garage", "", null, "", false, 1 },
-                    { 4, true, "Interior Tour", 1, "", new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc), false, true, 4, "Toured living room/common areas", "", null, "", false, 2 },
-                    { 5, true, "Interior Tour", 1, "", new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc), false, true, 5, "Showed all bedrooms", "", null, "", false, 2 },
-                    { 6, true, "Interior Tour", 1, "", new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc), false, true, 6, "Showed all bathrooms", "", null, "", false, 2 },
-                    { 7, true, "Kitchen & Appliances", 1, "", new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc), false, true, 7, "Toured kitchen and demonstrated appliances", "", null, "", false, 3 },
-                    { 8, true, "Kitchen & Appliances", 1, "", new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc), false, true, 8, "Explained which appliances are included", "", null, "", false, 3 },
-                    { 9, true, "Utilities & Systems", 1, "", new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc), false, true, 9, "Explained HVAC system and thermostat controls", "", null, "", false, 4 },
-                    { 10, true, "Utilities & Systems", 1, "", new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc), false, true, 10, "Reviewed utility responsibilities (tenant vs landlord)", "", null, "", false, 4 },
-                    { 11, true, "Utilities & Systems", 1, "", new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc), false, true, 11, "Showed water heater location", "", null, "", false, 4 },
-                    { 12, true, "Storage & Amenities", 1, "", new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc), false, true, 12, "Showed storage areas (closets, attic, basement)", "", null, "", false, 5 },
-                    { 13, true, "Storage & Amenities", 1, "", new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc), false, true, 13, "Showed laundry facilities", "", null, "", false, 5 },
-                    { 14, true, "Storage & Amenities", 1, "", new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc), false, true, 14, "Showed outdoor space (yard, patio, balcony)", "", null, "", false, 5 },
-                    { 15, true, "Lease Terms", 1, "", new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc), false, true, 15, "Discussed monthly rent amount", "", null, "", true, 6 },
-                    { 16, true, "Lease Terms", 1, "", new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc), false, true, 16, "Explained security deposit and move-in costs", "", null, "", true, 6 },
-                    { 17, true, "Lease Terms", 1, "", new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc), false, true, 17, "Reviewed lease term length and start date", "", null, "", false, 6 },
-                    { 18, true, "Lease Terms", 1, "", new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc), false, true, 18, "Explained pet policy", "", null, "", false, 6 },
-                    { 19, true, "Next Steps", 1, "", new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc), false, true, 19, "Explained application process and requirements", "", null, "", false, 7 },
-                    { 20, true, "Next Steps", 1, "", new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc), false, true, 20, "Reviewed screening process (background, credit check)", "", null, "", false, 7 },
-                    { 21, true, "Next Steps", 1, "", new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc), false, true, 21, "Answered all prospect questions", "", null, "", false, 7 },
-                    { 22, true, "Assessment", 1, "", new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc), false, true, 22, "Prospect Interest Level", "", null, "", true, 8 },
-                    { 23, true, "Assessment", 1, "", new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc), false, true, 23, "Overall showing feedback and notes", "", null, "", true, 8 },
-                    { 24, true, "General", 2, "", new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc), false, true, 1, "Document property condition", "", null, "", false, 1 },
-                    { 25, true, "General", 2, "", new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc), false, true, 2, "Collect keys and access codes", "", null, "", false, 1 },
-                    { 26, true, "General", 2, "", new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc), false, true, 3, "Review lease terms with tenant", "", null, "", false, 1 },
-                    { 27, true, "General", 3, "", new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc), false, true, 1, "Inspect property condition", "", null, "", false, 1 },
-                    { 28, true, "General", 3, "", new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc), false, true, 2, "Collect all keys and access devices", "", null, "", false, 1 },
-                    { 29, true, "General", 3, "", new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc), false, true, 3, "Document damages and needed repairs", "", null, "", false, 1 },
-                    { 30, true, "Preparation", 4, "", new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc), false, true, 1, "Set up signage and directional markers", "", null, "", false, 1 },
-                    { 31, true, "Preparation", 4, "", new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc), false, true, 2, "Prepare information packets", "", null, "", false, 1 },
-                    { 32, true, "Preparation", 4, "", new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc), false, true, 3, "Set up visitor sign-in sheet", "", null, "", false, 1 }
+                    { new Guid("00000000-0000-0000-0002-000000000001"), true, "Arrival & Introduction", new Guid("00000000-0000-0000-0001-000000000001"), "", new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc), false, true, 1, "Greeted prospect and verified appointment", "", null, new Guid("00000000-0000-0000-0000-000000000000"), false, 1 },
+                    { new Guid("00000000-0000-0000-0002-000000000002"), true, "Arrival & Introduction", new Guid("00000000-0000-0000-0001-000000000001"), "", new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc), false, true, 2, "Reviewed property exterior and curb appeal", "", null, new Guid("00000000-0000-0000-0000-000000000000"), false, 1 },
+                    { new Guid("00000000-0000-0000-0002-000000000003"), true, "Arrival & Introduction", new Guid("00000000-0000-0000-0001-000000000001"), "", new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc), false, true, 3, "Showed parking area/garage", "", null, new Guid("00000000-0000-0000-0000-000000000000"), false, 1 },
+                    { new Guid("00000000-0000-0000-0002-000000000004"), true, "Interior Tour", new Guid("00000000-0000-0000-0001-000000000001"), "", new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc), false, true, 4, "Toured living room/common areas", "", null, new Guid("00000000-0000-0000-0000-000000000000"), false, 2 },
+                    { new Guid("00000000-0000-0000-0002-000000000005"), true, "Interior Tour", new Guid("00000000-0000-0000-0001-000000000001"), "", new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc), false, true, 5, "Showed all bedrooms", "", null, new Guid("00000000-0000-0000-0000-000000000000"), false, 2 },
+                    { new Guid("00000000-0000-0000-0002-000000000006"), true, "Interior Tour", new Guid("00000000-0000-0000-0001-000000000001"), "", new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc), false, true, 6, "Showed all bathrooms", "", null, new Guid("00000000-0000-0000-0000-000000000000"), false, 2 },
+                    { new Guid("00000000-0000-0000-0002-000000000007"), true, "Kitchen & Appliances", new Guid("00000000-0000-0000-0001-000000000001"), "", new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc), false, true, 7, "Toured kitchen and demonstrated appliances", "", null, new Guid("00000000-0000-0000-0000-000000000000"), false, 3 },
+                    { new Guid("00000000-0000-0000-0002-000000000008"), true, "Kitchen & Appliances", new Guid("00000000-0000-0000-0001-000000000001"), "", new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc), false, true, 8, "Explained which appliances are included", "", null, new Guid("00000000-0000-0000-0000-000000000000"), false, 3 },
+                    { new Guid("00000000-0000-0000-0002-000000000009"), true, "Utilities & Systems", new Guid("00000000-0000-0000-0001-000000000001"), "", new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc), false, true, 9, "Explained HVAC system and thermostat controls", "", null, new Guid("00000000-0000-0000-0000-000000000000"), false, 4 },
+                    { new Guid("00000000-0000-0000-0002-000000000010"), true, "Utilities & Systems", new Guid("00000000-0000-0000-0001-000000000001"), "", new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc), false, true, 10, "Reviewed utility responsibilities (tenant vs landlord)", "", null, new Guid("00000000-0000-0000-0000-000000000000"), false, 4 },
+                    { new Guid("00000000-0000-0000-0002-000000000011"), true, "Utilities & Systems", new Guid("00000000-0000-0000-0001-000000000001"), "", new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc), false, true, 11, "Showed water heater location", "", null, new Guid("00000000-0000-0000-0000-000000000000"), false, 4 },
+                    { new Guid("00000000-0000-0000-0002-000000000012"), true, "Storage & Amenities", new Guid("00000000-0000-0000-0001-000000000001"), "", new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc), false, true, 12, "Showed storage areas (closets, attic, basement)", "", null, new Guid("00000000-0000-0000-0000-000000000000"), false, 5 },
+                    { new Guid("00000000-0000-0000-0002-000000000013"), true, "Storage & Amenities", new Guid("00000000-0000-0000-0001-000000000001"), "", new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc), false, true, 13, "Showed laundry facilities", "", null, new Guid("00000000-0000-0000-0000-000000000000"), false, 5 },
+                    { new Guid("00000000-0000-0000-0002-000000000014"), true, "Storage & Amenities", new Guid("00000000-0000-0000-0001-000000000001"), "", new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc), false, true, 14, "Showed outdoor space (yard, patio, balcony)", "", null, new Guid("00000000-0000-0000-0000-000000000000"), false, 5 },
+                    { new Guid("00000000-0000-0000-0002-000000000015"), true, "Lease Terms", new Guid("00000000-0000-0000-0001-000000000001"), "", new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc), false, true, 15, "Discussed monthly rent amount", "", null, new Guid("00000000-0000-0000-0000-000000000000"), true, 6 },
+                    { new Guid("00000000-0000-0000-0002-000000000016"), true, "Lease Terms", new Guid("00000000-0000-0000-0001-000000000001"), "", new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc), false, true, 16, "Explained security deposit and move-in costs", "", null, new Guid("00000000-0000-0000-0000-000000000000"), true, 6 },
+                    { new Guid("00000000-0000-0000-0002-000000000017"), true, "Lease Terms", new Guid("00000000-0000-0000-0001-000000000001"), "", new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc), false, true, 17, "Reviewed lease term length and start date", "", null, new Guid("00000000-0000-0000-0000-000000000000"), false, 6 },
+                    { new Guid("00000000-0000-0000-0002-000000000018"), true, "Lease Terms", new Guid("00000000-0000-0000-0001-000000000001"), "", new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc), false, true, 18, "Explained pet policy", "", null, new Guid("00000000-0000-0000-0000-000000000000"), false, 6 },
+                    { new Guid("00000000-0000-0000-0002-000000000019"), true, "Next Steps", new Guid("00000000-0000-0000-0001-000000000001"), "", new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc), false, true, 19, "Explained application process and requirements", "", null, new Guid("00000000-0000-0000-0000-000000000000"), false, 7 },
+                    { new Guid("00000000-0000-0000-0002-000000000020"), true, "Next Steps", new Guid("00000000-0000-0000-0001-000000000001"), "", new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc), false, true, 20, "Reviewed screening process (background, credit check)", "", null, new Guid("00000000-0000-0000-0000-000000000000"), false, 7 },
+                    { new Guid("00000000-0000-0000-0002-000000000021"), true, "Next Steps", new Guid("00000000-0000-0000-0001-000000000001"), "", new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc), false, true, 21, "Answered all prospect questions", "", null, new Guid("00000000-0000-0000-0000-000000000000"), false, 7 },
+                    { new Guid("00000000-0000-0000-0002-000000000022"), true, "Assessment", new Guid("00000000-0000-0000-0001-000000000001"), "", new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc), false, true, 22, "Prospect Interest Level", "", null, new Guid("00000000-0000-0000-0000-000000000000"), true, 8 },
+                    { new Guid("00000000-0000-0000-0002-000000000023"), true, "Assessment", new Guid("00000000-0000-0000-0001-000000000001"), "", new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc), false, true, 23, "Overall showing feedback and notes", "", null, new Guid("00000000-0000-0000-0000-000000000000"), true, 8 },
+                    { new Guid("00000000-0000-0000-0002-000000000024"), true, "General", new Guid("00000000-0000-0000-0001-000000000002"), "", new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc), false, true, 1, "Document property condition", "", null, new Guid("00000000-0000-0000-0000-000000000000"), false, 1 },
+                    { new Guid("00000000-0000-0000-0002-000000000025"), true, "General", new Guid("00000000-0000-0000-0001-000000000002"), "", new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc), false, true, 2, "Collect keys and access codes", "", null, new Guid("00000000-0000-0000-0000-000000000000"), false, 1 },
+                    { new Guid("00000000-0000-0000-0002-000000000026"), true, "General", new Guid("00000000-0000-0000-0001-000000000002"), "", new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc), false, true, 3, "Review lease terms with tenant", "", null, new Guid("00000000-0000-0000-0000-000000000000"), false, 1 },
+                    { new Guid("00000000-0000-0000-0002-000000000027"), true, "General", new Guid("00000000-0000-0000-0001-000000000003"), "", new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc), false, true, 1, "Inspect property condition", "", null, new Guid("00000000-0000-0000-0000-000000000000"), false, 1 },
+                    { new Guid("00000000-0000-0000-0002-000000000028"), true, "General", new Guid("00000000-0000-0000-0001-000000000003"), "", new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc), false, true, 2, "Collect all keys and access devices", "", null, new Guid("00000000-0000-0000-0000-000000000000"), false, 1 },
+                    { new Guid("00000000-0000-0000-0002-000000000029"), true, "General", new Guid("00000000-0000-0000-0001-000000000003"), "", new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc), false, true, 3, "Document damages and needed repairs", "", null, new Guid("00000000-0000-0000-0000-000000000000"), false, 1 },
+                    { new Guid("00000000-0000-0000-0002-000000000030"), true, "Preparation", new Guid("00000000-0000-0000-0001-000000000004"), "", new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc), false, true, 1, "Set up signage and directional markers", "", null, new Guid("00000000-0000-0000-0000-000000000000"), false, 1 },
+                    { new Guid("00000000-0000-0000-0002-000000000031"), true, "Preparation", new Guid("00000000-0000-0000-0001-000000000004"), "", new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc), false, true, 2, "Prepare information packets", "", null, new Guid("00000000-0000-0000-0000-000000000000"), false, 1 },
+                    { new Guid("00000000-0000-0000-0002-000000000032"), true, "Preparation", new Guid("00000000-0000-0000-0001-000000000004"), "", new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc), false, true, 3, "Set up visitor sign-in sheet", "", null, new Guid("00000000-0000-0000-0000-000000000000"), false, 1 }
                 });
 
             migrationBuilder.CreateIndex(
@@ -1854,6 +1856,41 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 columns: new[] { "UserId", "OrganizationId" },
                 unique: true);
 
+            migrationBuilder.CreateIndex(
+                name: "IX_WorkflowAuditLogs_Action",
+                table: "WorkflowAuditLogs",
+                column: "Action");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_WorkflowAuditLogs_EntityId",
+                table: "WorkflowAuditLogs",
+                column: "EntityId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_WorkflowAuditLogs_EntityType",
+                table: "WorkflowAuditLogs",
+                column: "EntityType");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_WorkflowAuditLogs_EntityType_EntityId",
+                table: "WorkflowAuditLogs",
+                columns: new[] { "EntityType", "EntityId" });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_WorkflowAuditLogs_OrganizationId",
+                table: "WorkflowAuditLogs",
+                column: "OrganizationId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_WorkflowAuditLogs_PerformedBy",
+                table: "WorkflowAuditLogs",
+                column: "PerformedBy");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_WorkflowAuditLogs_PerformedOn",
+                table: "WorkflowAuditLogs",
+                column: "PerformedOn");
+
             migrationBuilder.AddForeignKey(
                 name: "FK_ChecklistItems_Checklists_ChecklistId",
                 table: "ChecklistItems",
@@ -1987,6 +2024,9 @@ protected override void Down(MigrationBuilder migrationBuilder)
             migrationBuilder.DropTable(
                 name: "UserOrganizations");
 
+            migrationBuilder.DropTable(
+                name: "WorkflowAuditLogs");
+
             migrationBuilder.DropTable(
                 name: "AspNetRoles");
 
diff --git a/Aquiis.SimpleStart/Infrastructure/Data/Migrations/ApplicationDbContextModelSnapshot.cs b/Aquiis.SimpleStart/Infrastructure/Data/Migrations/ApplicationDbContextModelSnapshot.cs
index fbe8ab2..a40935e 100644
--- a/Aquiis.SimpleStart/Infrastructure/Data/Migrations/ApplicationDbContextModelSnapshot.cs
+++ b/Aquiis.SimpleStart/Infrastructure/Data/Migrations/ApplicationDbContextModelSnapshot.cs
@@ -7,7 +7,7 @@
 
 #nullable disable
 
-namespace Aquiis.SimpleStart.Infrastructure.Data.Migrations
+namespace Aquiis.SimpleStart.Migrations
 {
     [DbContext(typeof(ApplicationDbContext))]
     partial class ApplicationDbContextModelSnapshot : ModelSnapshot
@@ -19,9 +19,8 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
             modelBuilder.Entity("Aquiis.SimpleStart.Application.Services.Workflows.WorkflowAuditLog", b =>
                 {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
 
                     b.Property<string>("Action")
                         .IsRequired()
@@ -35,8 +34,8 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<DateTime>("CreatedOn")
                         .HasColumnType("TEXT");
 
-                    b.Property<int>("EntityId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("EntityId")
+                        .HasColumnType("TEXT");
 
                     b.Property<string>("EntityType")
                         .IsRequired()
@@ -58,8 +57,8 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<string>("Metadata")
                         .HasColumnType("TEXT");
 
-                    b.Property<int>("OrganizationId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
 
                     b.Property<string>("PerformedBy")
                         .IsRequired()
@@ -96,9 +95,8 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
             modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.ApplicationScreening", b =>
                 {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
 
                     b.Property<DateTime?>("BackgroundCheckCompletedOn")
                         .HasColumnType("TEXT");
@@ -153,8 +151,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<DateTime?>("LastModifiedOn")
                         .HasColumnType("TEXT");
 
-                    b.Property<string>("OrganizationId")
-                        .IsRequired()
+                    b.Property<Guid>("OrganizationId")
                         .HasMaxLength(100)
                         .HasColumnType("TEXT");
 
@@ -163,8 +160,8 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasMaxLength(50)
                         .HasColumnType("TEXT");
 
-                    b.Property<int>("RentalApplicationId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("RentalApplicationId")
+                        .HasColumnType("TEXT");
 
                     b.Property<string>("ResultNotes")
                         .HasMaxLength(2000)
@@ -184,9 +181,8 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
             modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.CalendarEvent", b =>
                 {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
 
                     b.Property<string>("Color")
                         .IsRequired()
@@ -235,16 +231,15 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasMaxLength(500)
                         .HasColumnType("TEXT");
 
-                    b.Property<string>("OrganizationId")
-                        .IsRequired()
+                    b.Property<Guid>("OrganizationId")
                         .HasMaxLength(100)
                         .HasColumnType("TEXT");
 
-                    b.Property<int?>("PropertyId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid?>("PropertyId")
+                        .HasColumnType("TEXT");
 
-                    b.Property<int?>("SourceEntityId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid?>("SourceEntityId")
+                        .HasColumnType("TEXT");
 
                     b.Property<string>("SourceEntityType")
                         .HasMaxLength(100)
@@ -282,9 +277,8 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
             modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.CalendarSettings", b =>
                 {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
 
                     b.Property<bool>("AutoCreateEvents")
                         .HasColumnType("INTEGER");
@@ -320,8 +314,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<DateTime?>("LastModifiedOn")
                         .HasColumnType("TEXT");
 
-                    b.Property<string>("OrganizationId")
-                        .IsRequired()
+                    b.Property<Guid>("OrganizationId")
                         .HasMaxLength(100)
                         .HasColumnType("TEXT");
 
@@ -340,12 +333,11 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
             modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.Checklist", b =>
                 {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
 
-                    b.Property<int>("ChecklistTemplateId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("ChecklistTemplateId")
+                        .HasColumnType("TEXT");
 
                     b.Property<string>("ChecklistType")
                         .IsRequired()
@@ -367,8 +359,8 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<DateTime>("CreatedOn")
                         .HasColumnType("TEXT");
 
-                    b.Property<int?>("DocumentId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid?>("DocumentId")
+                        .HasColumnType("TEXT");
 
                     b.Property<string>("GeneralNotes")
                         .HasMaxLength(2000)
@@ -384,21 +376,20 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<DateTime?>("LastModifiedOn")
                         .HasColumnType("TEXT");
 
-                    b.Property<int?>("LeaseId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid?>("LeaseId")
+                        .HasColumnType("TEXT");
 
                     b.Property<string>("Name")
                         .IsRequired()
                         .HasMaxLength(200)
                         .HasColumnType("TEXT");
 
-                    b.Property<string>("OrganizationId")
-                        .IsRequired()
+                    b.Property<Guid>("OrganizationId")
                         .HasMaxLength(100)
                         .HasColumnType("TEXT");
 
-                    b.Property<int?>("PropertyId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid?>("PropertyId")
+                        .HasColumnType("TEXT");
 
                     b.Property<string>("Status")
                         .IsRequired()
@@ -426,16 +417,15 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
             modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.ChecklistItem", b =>
                 {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
 
                     b.Property<string>("CategorySection")
                         .HasMaxLength(100)
                         .HasColumnType("TEXT");
 
-                    b.Property<int>("ChecklistId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("ChecklistId")
+                        .HasColumnType("TEXT");
 
                     b.Property<string>("CreatedBy")
                         .IsRequired()
@@ -470,8 +460,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasMaxLength(1000)
                         .HasColumnType("TEXT");
 
-                    b.Property<string>("OrganizationId")
-                        .IsRequired()
+                    b.Property<Guid>("OrganizationId")
                         .HasMaxLength(100)
                         .HasColumnType("TEXT");
 
@@ -498,9 +487,8 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
             modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.ChecklistTemplate", b =>
                 {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
 
                     b.Property<string>("Category")
                         .IsRequired()
@@ -537,8 +525,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasMaxLength(100)
                         .HasColumnType("TEXT");
 
-                    b.Property<string>("OrganizationId")
-                        .IsRequired()
+                    b.Property<Guid>("OrganizationId")
                         .HasMaxLength(100)
                         .HasColumnType("TEXT");
 
@@ -553,7 +540,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.HasData(
                         new
                         {
-                            Id = 1,
+                            Id = new Guid("00000000-0000-0000-0001-000000000001"),
                             Category = "Tour",
                             CreatedBy = "",
                             CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
@@ -562,11 +549,11 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                             IsSystemTemplate = true,
                             LastModifiedBy = "",
                             Name = "Property Tour",
-                            OrganizationId = ""
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000")
                         },
                         new
                         {
-                            Id = 2,
+                            Id = new Guid("00000000-0000-0000-0001-000000000002"),
                             Category = "MoveIn",
                             CreatedBy = "",
                             CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
@@ -575,11 +562,11 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                             IsSystemTemplate = true,
                             LastModifiedBy = "",
                             Name = "Move-In",
-                            OrganizationId = ""
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000")
                         },
                         new
                         {
-                            Id = 3,
+                            Id = new Guid("00000000-0000-0000-0001-000000000003"),
                             Category = "MoveOut",
                             CreatedBy = "",
                             CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
@@ -588,11 +575,11 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                             IsSystemTemplate = true,
                             LastModifiedBy = "",
                             Name = "Move-Out",
-                            OrganizationId = ""
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000")
                         },
                         new
                         {
-                            Id = 4,
+                            Id = new Guid("00000000-0000-0000-0001-000000000004"),
                             Category = "Tour",
                             CreatedBy = "",
                             CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
@@ -601,15 +588,14 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                             IsSystemTemplate = true,
                             LastModifiedBy = "",
                             Name = "Open House",
-                            OrganizationId = ""
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000")
                         });
                 });
 
             modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.ChecklistTemplateItem", b =>
                 {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
 
                     b.Property<bool>("AllowsNotes")
                         .HasColumnType("INTEGER");
@@ -618,8 +604,8 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasMaxLength(100)
                         .HasColumnType("TEXT");
 
-                    b.Property<int>("ChecklistTemplateId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("ChecklistTemplateId")
+                        .HasColumnType("TEXT");
 
                     b.Property<string>("CreatedBy")
                         .IsRequired()
@@ -650,8 +636,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<DateTime?>("LastModifiedOn")
                         .HasColumnType("TEXT");
 
-                    b.Property<string>("OrganizationId")
-                        .IsRequired()
+                    b.Property<Guid>("OrganizationId")
                         .HasMaxLength(100)
                         .HasColumnType("TEXT");
 
@@ -670,10 +655,10 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.HasData(
                         new
                         {
-                            Id = 1,
+                            Id = new Guid("00000000-0000-0000-0002-000000000001"),
                             AllowsNotes = true,
                             CategorySection = "Arrival & Introduction",
-                            ChecklistTemplateId = 1,
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
                             CreatedBy = "",
                             CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
                             IsDeleted = false,
@@ -681,16 +666,16 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                             ItemOrder = 1,
                             ItemText = "Greeted prospect and verified appointment",
                             LastModifiedBy = "",
-                            OrganizationId = "",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
                             RequiresValue = false,
                             SectionOrder = 1
                         },
                         new
                         {
-                            Id = 2,
+                            Id = new Guid("00000000-0000-0000-0002-000000000002"),
                             AllowsNotes = true,
                             CategorySection = "Arrival & Introduction",
-                            ChecklistTemplateId = 1,
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
                             CreatedBy = "",
                             CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
                             IsDeleted = false,
@@ -698,16 +683,16 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                             ItemOrder = 2,
                             ItemText = "Reviewed property exterior and curb appeal",
                             LastModifiedBy = "",
-                            OrganizationId = "",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
                             RequiresValue = false,
                             SectionOrder = 1
                         },
                         new
                         {
-                            Id = 3,
+                            Id = new Guid("00000000-0000-0000-0002-000000000003"),
                             AllowsNotes = true,
                             CategorySection = "Arrival & Introduction",
-                            ChecklistTemplateId = 1,
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
                             CreatedBy = "",
                             CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
                             IsDeleted = false,
@@ -715,16 +700,16 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                             ItemOrder = 3,
                             ItemText = "Showed parking area/garage",
                             LastModifiedBy = "",
-                            OrganizationId = "",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
                             RequiresValue = false,
                             SectionOrder = 1
                         },
                         new
                         {
-                            Id = 4,
+                            Id = new Guid("00000000-0000-0000-0002-000000000004"),
                             AllowsNotes = true,
                             CategorySection = "Interior Tour",
-                            ChecklistTemplateId = 1,
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
                             CreatedBy = "",
                             CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
                             IsDeleted = false,
@@ -732,16 +717,16 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                             ItemOrder = 4,
                             ItemText = "Toured living room/common areas",
                             LastModifiedBy = "",
-                            OrganizationId = "",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
                             RequiresValue = false,
                             SectionOrder = 2
                         },
                         new
                         {
-                            Id = 5,
+                            Id = new Guid("00000000-0000-0000-0002-000000000005"),
                             AllowsNotes = true,
                             CategorySection = "Interior Tour",
-                            ChecklistTemplateId = 1,
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
                             CreatedBy = "",
                             CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
                             IsDeleted = false,
@@ -749,16 +734,16 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                             ItemOrder = 5,
                             ItemText = "Showed all bedrooms",
                             LastModifiedBy = "",
-                            OrganizationId = "",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
                             RequiresValue = false,
                             SectionOrder = 2
                         },
                         new
                         {
-                            Id = 6,
+                            Id = new Guid("00000000-0000-0000-0002-000000000006"),
                             AllowsNotes = true,
                             CategorySection = "Interior Tour",
-                            ChecklistTemplateId = 1,
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
                             CreatedBy = "",
                             CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
                             IsDeleted = false,
@@ -766,16 +751,16 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                             ItemOrder = 6,
                             ItemText = "Showed all bathrooms",
                             LastModifiedBy = "",
-                            OrganizationId = "",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
                             RequiresValue = false,
                             SectionOrder = 2
                         },
                         new
                         {
-                            Id = 7,
+                            Id = new Guid("00000000-0000-0000-0002-000000000007"),
                             AllowsNotes = true,
                             CategorySection = "Kitchen & Appliances",
-                            ChecklistTemplateId = 1,
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
                             CreatedBy = "",
                             CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
                             IsDeleted = false,
@@ -783,16 +768,16 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                             ItemOrder = 7,
                             ItemText = "Toured kitchen and demonstrated appliances",
                             LastModifiedBy = "",
-                            OrganizationId = "",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
                             RequiresValue = false,
                             SectionOrder = 3
                         },
                         new
                         {
-                            Id = 8,
+                            Id = new Guid("00000000-0000-0000-0002-000000000008"),
                             AllowsNotes = true,
                             CategorySection = "Kitchen & Appliances",
-                            ChecklistTemplateId = 1,
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
                             CreatedBy = "",
                             CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
                             IsDeleted = false,
@@ -800,16 +785,16 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                             ItemOrder = 8,
                             ItemText = "Explained which appliances are included",
                             LastModifiedBy = "",
-                            OrganizationId = "",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
                             RequiresValue = false,
                             SectionOrder = 3
                         },
                         new
                         {
-                            Id = 9,
+                            Id = new Guid("00000000-0000-0000-0002-000000000009"),
                             AllowsNotes = true,
                             CategorySection = "Utilities & Systems",
-                            ChecklistTemplateId = 1,
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
                             CreatedBy = "",
                             CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
                             IsDeleted = false,
@@ -817,16 +802,16 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                             ItemOrder = 9,
                             ItemText = "Explained HVAC system and thermostat controls",
                             LastModifiedBy = "",
-                            OrganizationId = "",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
                             RequiresValue = false,
                             SectionOrder = 4
                         },
                         new
                         {
-                            Id = 10,
+                            Id = new Guid("00000000-0000-0000-0002-000000000010"),
                             AllowsNotes = true,
                             CategorySection = "Utilities & Systems",
-                            ChecklistTemplateId = 1,
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
                             CreatedBy = "",
                             CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
                             IsDeleted = false,
@@ -834,16 +819,16 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                             ItemOrder = 10,
                             ItemText = "Reviewed utility responsibilities (tenant vs landlord)",
                             LastModifiedBy = "",
-                            OrganizationId = "",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
                             RequiresValue = false,
                             SectionOrder = 4
                         },
                         new
                         {
-                            Id = 11,
+                            Id = new Guid("00000000-0000-0000-0002-000000000011"),
                             AllowsNotes = true,
                             CategorySection = "Utilities & Systems",
-                            ChecklistTemplateId = 1,
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
                             CreatedBy = "",
                             CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
                             IsDeleted = false,
@@ -851,16 +836,16 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                             ItemOrder = 11,
                             ItemText = "Showed water heater location",
                             LastModifiedBy = "",
-                            OrganizationId = "",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
                             RequiresValue = false,
                             SectionOrder = 4
                         },
                         new
                         {
-                            Id = 12,
+                            Id = new Guid("00000000-0000-0000-0002-000000000012"),
                             AllowsNotes = true,
                             CategorySection = "Storage & Amenities",
-                            ChecklistTemplateId = 1,
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
                             CreatedBy = "",
                             CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
                             IsDeleted = false,
@@ -868,16 +853,16 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                             ItemOrder = 12,
                             ItemText = "Showed storage areas (closets, attic, basement)",
                             LastModifiedBy = "",
-                            OrganizationId = "",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
                             RequiresValue = false,
                             SectionOrder = 5
                         },
                         new
                         {
-                            Id = 13,
+                            Id = new Guid("00000000-0000-0000-0002-000000000013"),
                             AllowsNotes = true,
                             CategorySection = "Storage & Amenities",
-                            ChecklistTemplateId = 1,
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
                             CreatedBy = "",
                             CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
                             IsDeleted = false,
@@ -885,16 +870,16 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                             ItemOrder = 13,
                             ItemText = "Showed laundry facilities",
                             LastModifiedBy = "",
-                            OrganizationId = "",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
                             RequiresValue = false,
                             SectionOrder = 5
                         },
                         new
                         {
-                            Id = 14,
+                            Id = new Guid("00000000-0000-0000-0002-000000000014"),
                             AllowsNotes = true,
                             CategorySection = "Storage & Amenities",
-                            ChecklistTemplateId = 1,
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
                             CreatedBy = "",
                             CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
                             IsDeleted = false,
@@ -902,16 +887,16 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                             ItemOrder = 14,
                             ItemText = "Showed outdoor space (yard, patio, balcony)",
                             LastModifiedBy = "",
-                            OrganizationId = "",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
                             RequiresValue = false,
                             SectionOrder = 5
                         },
                         new
                         {
-                            Id = 15,
+                            Id = new Guid("00000000-0000-0000-0002-000000000015"),
                             AllowsNotes = true,
                             CategorySection = "Lease Terms",
-                            ChecklistTemplateId = 1,
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
                             CreatedBy = "",
                             CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
                             IsDeleted = false,
@@ -919,16 +904,16 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                             ItemOrder = 15,
                             ItemText = "Discussed monthly rent amount",
                             LastModifiedBy = "",
-                            OrganizationId = "",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
                             RequiresValue = true,
                             SectionOrder = 6
                         },
                         new
                         {
-                            Id = 16,
+                            Id = new Guid("00000000-0000-0000-0002-000000000016"),
                             AllowsNotes = true,
                             CategorySection = "Lease Terms",
-                            ChecklistTemplateId = 1,
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
                             CreatedBy = "",
                             CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
                             IsDeleted = false,
@@ -936,16 +921,16 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                             ItemOrder = 16,
                             ItemText = "Explained security deposit and move-in costs",
                             LastModifiedBy = "",
-                            OrganizationId = "",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
                             RequiresValue = true,
                             SectionOrder = 6
                         },
                         new
                         {
-                            Id = 17,
+                            Id = new Guid("00000000-0000-0000-0002-000000000017"),
                             AllowsNotes = true,
                             CategorySection = "Lease Terms",
-                            ChecklistTemplateId = 1,
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
                             CreatedBy = "",
                             CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
                             IsDeleted = false,
@@ -953,16 +938,16 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                             ItemOrder = 17,
                             ItemText = "Reviewed lease term length and start date",
                             LastModifiedBy = "",
-                            OrganizationId = "",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
                             RequiresValue = false,
                             SectionOrder = 6
                         },
                         new
                         {
-                            Id = 18,
+                            Id = new Guid("00000000-0000-0000-0002-000000000018"),
                             AllowsNotes = true,
                             CategorySection = "Lease Terms",
-                            ChecklistTemplateId = 1,
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
                             CreatedBy = "",
                             CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
                             IsDeleted = false,
@@ -970,16 +955,16 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                             ItemOrder = 18,
                             ItemText = "Explained pet policy",
                             LastModifiedBy = "",
-                            OrganizationId = "",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
                             RequiresValue = false,
                             SectionOrder = 6
                         },
                         new
                         {
-                            Id = 19,
+                            Id = new Guid("00000000-0000-0000-0002-000000000019"),
                             AllowsNotes = true,
                             CategorySection = "Next Steps",
-                            ChecklistTemplateId = 1,
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
                             CreatedBy = "",
                             CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
                             IsDeleted = false,
@@ -987,16 +972,16 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                             ItemOrder = 19,
                             ItemText = "Explained application process and requirements",
                             LastModifiedBy = "",
-                            OrganizationId = "",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
                             RequiresValue = false,
                             SectionOrder = 7
                         },
                         new
                         {
-                            Id = 20,
+                            Id = new Guid("00000000-0000-0000-0002-000000000020"),
                             AllowsNotes = true,
                             CategorySection = "Next Steps",
-                            ChecklistTemplateId = 1,
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
                             CreatedBy = "",
                             CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
                             IsDeleted = false,
@@ -1004,16 +989,16 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                             ItemOrder = 20,
                             ItemText = "Reviewed screening process (background, credit check)",
                             LastModifiedBy = "",
-                            OrganizationId = "",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
                             RequiresValue = false,
                             SectionOrder = 7
                         },
                         new
                         {
-                            Id = 21,
+                            Id = new Guid("00000000-0000-0000-0002-000000000021"),
                             AllowsNotes = true,
                             CategorySection = "Next Steps",
-                            ChecklistTemplateId = 1,
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
                             CreatedBy = "",
                             CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
                             IsDeleted = false,
@@ -1021,16 +1006,16 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                             ItemOrder = 21,
                             ItemText = "Answered all prospect questions",
                             LastModifiedBy = "",
-                            OrganizationId = "",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
                             RequiresValue = false,
                             SectionOrder = 7
                         },
                         new
                         {
-                            Id = 22,
+                            Id = new Guid("00000000-0000-0000-0002-000000000022"),
                             AllowsNotes = true,
                             CategorySection = "Assessment",
-                            ChecklistTemplateId = 1,
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
                             CreatedBy = "",
                             CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
                             IsDeleted = false,
@@ -1038,16 +1023,16 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                             ItemOrder = 22,
                             ItemText = "Prospect Interest Level",
                             LastModifiedBy = "",
-                            OrganizationId = "",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
                             RequiresValue = true,
                             SectionOrder = 8
                         },
                         new
                         {
-                            Id = 23,
+                            Id = new Guid("00000000-0000-0000-0002-000000000023"),
                             AllowsNotes = true,
                             CategorySection = "Assessment",
-                            ChecklistTemplateId = 1,
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
                             CreatedBy = "",
                             CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
                             IsDeleted = false,
@@ -1055,16 +1040,16 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                             ItemOrder = 23,
                             ItemText = "Overall showing feedback and notes",
                             LastModifiedBy = "",
-                            OrganizationId = "",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
                             RequiresValue = true,
                             SectionOrder = 8
                         },
                         new
                         {
-                            Id = 24,
+                            Id = new Guid("00000000-0000-0000-0002-000000000024"),
                             AllowsNotes = true,
                             CategorySection = "General",
-                            ChecklistTemplateId = 2,
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000002"),
                             CreatedBy = "",
                             CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
                             IsDeleted = false,
@@ -1072,16 +1057,16 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                             ItemOrder = 1,
                             ItemText = "Document property condition",
                             LastModifiedBy = "",
-                            OrganizationId = "",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
                             RequiresValue = false,
                             SectionOrder = 1
                         },
                         new
                         {
-                            Id = 25,
+                            Id = new Guid("00000000-0000-0000-0002-000000000025"),
                             AllowsNotes = true,
                             CategorySection = "General",
-                            ChecklistTemplateId = 2,
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000002"),
                             CreatedBy = "",
                             CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
                             IsDeleted = false,
@@ -1089,16 +1074,16 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                             ItemOrder = 2,
                             ItemText = "Collect keys and access codes",
                             LastModifiedBy = "",
-                            OrganizationId = "",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
                             RequiresValue = false,
                             SectionOrder = 1
                         },
                         new
                         {
-                            Id = 26,
+                            Id = new Guid("00000000-0000-0000-0002-000000000026"),
                             AllowsNotes = true,
                             CategorySection = "General",
-                            ChecklistTemplateId = 2,
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000002"),
                             CreatedBy = "",
                             CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
                             IsDeleted = false,
@@ -1106,16 +1091,16 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                             ItemOrder = 3,
                             ItemText = "Review lease terms with tenant",
                             LastModifiedBy = "",
-                            OrganizationId = "",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
                             RequiresValue = false,
                             SectionOrder = 1
                         },
                         new
                         {
-                            Id = 27,
+                            Id = new Guid("00000000-0000-0000-0002-000000000027"),
                             AllowsNotes = true,
                             CategorySection = "General",
-                            ChecklistTemplateId = 3,
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000003"),
                             CreatedBy = "",
                             CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
                             IsDeleted = false,
@@ -1123,16 +1108,16 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                             ItemOrder = 1,
                             ItemText = "Inspect property condition",
                             LastModifiedBy = "",
-                            OrganizationId = "",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
                             RequiresValue = false,
                             SectionOrder = 1
                         },
                         new
                         {
-                            Id = 28,
+                            Id = new Guid("00000000-0000-0000-0002-000000000028"),
                             AllowsNotes = true,
                             CategorySection = "General",
-                            ChecklistTemplateId = 3,
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000003"),
                             CreatedBy = "",
                             CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
                             IsDeleted = false,
@@ -1140,16 +1125,16 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                             ItemOrder = 2,
                             ItemText = "Collect all keys and access devices",
                             LastModifiedBy = "",
-                            OrganizationId = "",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
                             RequiresValue = false,
                             SectionOrder = 1
                         },
                         new
                         {
-                            Id = 29,
+                            Id = new Guid("00000000-0000-0000-0002-000000000029"),
                             AllowsNotes = true,
                             CategorySection = "General",
-                            ChecklistTemplateId = 3,
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000003"),
                             CreatedBy = "",
                             CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
                             IsDeleted = false,
@@ -1157,16 +1142,16 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                             ItemOrder = 3,
                             ItemText = "Document damages and needed repairs",
                             LastModifiedBy = "",
-                            OrganizationId = "",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
                             RequiresValue = false,
                             SectionOrder = 1
                         },
                         new
                         {
-                            Id = 30,
+                            Id = new Guid("00000000-0000-0000-0002-000000000030"),
                             AllowsNotes = true,
                             CategorySection = "Preparation",
-                            ChecklistTemplateId = 4,
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000004"),
                             CreatedBy = "",
                             CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
                             IsDeleted = false,
@@ -1174,16 +1159,16 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                             ItemOrder = 1,
                             ItemText = "Set up signage and directional markers",
                             LastModifiedBy = "",
-                            OrganizationId = "",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
                             RequiresValue = false,
                             SectionOrder = 1
                         },
                         new
                         {
-                            Id = 31,
+                            Id = new Guid("00000000-0000-0000-0002-000000000031"),
                             AllowsNotes = true,
                             CategorySection = "Preparation",
-                            ChecklistTemplateId = 4,
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000004"),
                             CreatedBy = "",
                             CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
                             IsDeleted = false,
@@ -1191,16 +1176,16 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                             ItemOrder = 2,
                             ItemText = "Prepare information packets",
                             LastModifiedBy = "",
-                            OrganizationId = "",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
                             RequiresValue = false,
                             SectionOrder = 1
                         },
                         new
                         {
-                            Id = 32,
+                            Id = new Guid("00000000-0000-0000-0002-000000000032"),
                             AllowsNotes = true,
                             CategorySection = "Preparation",
-                            ChecklistTemplateId = 4,
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000004"),
                             CreatedBy = "",
                             CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
                             IsDeleted = false,
@@ -1208,7 +1193,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                             ItemOrder = 3,
                             ItemText = "Set up visitor sign-in sheet",
                             LastModifiedBy = "",
-                            OrganizationId = "",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
                             RequiresValue = false,
                             SectionOrder = 1
                         });
@@ -1216,9 +1201,8 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
             modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.Document", b =>
                 {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
 
                     b.Property<string>("ContentType")
                         .IsRequired()
@@ -1270,8 +1254,8 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasMaxLength(100)
                         .HasColumnType("TEXT");
 
-                    b.Property<int?>("InvoiceId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid?>("InvoiceId")
+                        .HasColumnType("TEXT");
 
                     b.Property<bool>("IsDeleted")
                         .HasColumnType("INTEGER");
@@ -1283,22 +1267,21 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<DateTime?>("LastModifiedOn")
                         .HasColumnType("TEXT");
 
-                    b.Property<int?>("LeaseId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid?>("LeaseId")
+                        .HasColumnType("TEXT");
 
-                    b.Property<string>("OrganizationId")
-                        .IsRequired()
+                    b.Property<Guid>("OrganizationId")
                         .HasMaxLength(100)
                         .HasColumnType("TEXT");
 
-                    b.Property<int?>("PaymentId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid?>("PaymentId")
+                        .HasColumnType("TEXT");
 
-                    b.Property<int?>("PropertyId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid?>("PropertyId")
+                        .HasColumnType("TEXT");
 
-                    b.Property<int?>("TenantId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("TEXT");
 
                     b.HasKey("Id");
 
@@ -1319,9 +1302,8 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
             modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.Inspection", b =>
                 {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
 
                     b.Property<string>("ActionItemsRequired")
                         .HasMaxLength(2000)
@@ -1351,8 +1333,8 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<string>("BathroomVentilationNotes")
                         .HasColumnType("TEXT");
 
-                    b.Property<int?>("CalendarEventId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid?>("CalendarEventId")
+                        .HasColumnType("TEXT");
 
                     b.Property<bool>("CarbonMonoxideDetectorsGood")
                         .HasColumnType("INTEGER");
@@ -1371,8 +1353,8 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<DateTime>("CreatedOn")
                         .HasColumnType("TEXT");
 
-                    b.Property<int?>("DocumentId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid?>("DocumentId")
+                        .HasColumnType("TEXT");
 
                     b.Property<bool>("ElectricalSystemGood")
                         .HasColumnType("INTEGER");
@@ -1505,11 +1487,10 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<DateTime?>("LastModifiedOn")
                         .HasColumnType("TEXT");
 
-                    b.Property<int?>("LeaseId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid?>("LeaseId")
+                        .HasColumnType("TEXT");
 
-                    b.Property<string>("OrganizationId")
-                        .IsRequired()
+                    b.Property<Guid>("OrganizationId")
                         .HasMaxLength(100)
                         .HasColumnType("TEXT");
 
@@ -1524,8 +1505,8 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<string>("PlumbingSystemNotes")
                         .HasColumnType("TEXT");
 
-                    b.Property<int>("PropertyId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("PropertyId")
+                        .HasColumnType("TEXT");
 
                     b.Property<bool>("SmokeDetectorsGood")
                         .HasColumnType("INTEGER");
@@ -1548,9 +1529,8 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
             modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.Invoice", b =>
                 {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
 
                     b.Property<decimal>("Amount")
                         .HasPrecision(18, 2)
@@ -1573,8 +1553,8 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasMaxLength(100)
                         .HasColumnType("TEXT");
 
-                    b.Property<int?>("DocumentId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid?>("DocumentId")
+                        .HasColumnType("TEXT");
 
                     b.Property<DateTime>("DueOn")
                         .HasColumnType("TEXT");
@@ -1606,16 +1586,15 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<DateTime?>("LateFeeAppliedOn")
                         .HasColumnType("TEXT");
 
-                    b.Property<int>("LeaseId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("LeaseId")
+                        .HasColumnType("TEXT");
 
                     b.Property<string>("Notes")
                         .IsRequired()
                         .HasMaxLength(500)
                         .HasColumnType("TEXT");
 
-                    b.Property<string>("OrganizationId")
-                        .IsRequired()
+                    b.Property<Guid>("OrganizationId")
                         .HasMaxLength(100)
                         .HasColumnType("TEXT");
 
@@ -1649,9 +1628,8 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
             modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.Lease", b =>
                 {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
 
                     b.Property<string>("CreatedBy")
                         .IsRequired()
@@ -1664,8 +1642,8 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<DateTime?>("DeclinedOn")
                         .HasColumnType("TEXT");
 
-                    b.Property<int?>("DocumentId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid?>("DocumentId")
+                        .HasColumnType("TEXT");
 
                     b.Property<DateTime>("EndDate")
                         .HasColumnType("TEXT");
@@ -1683,8 +1661,8 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<DateTime?>("LastModifiedOn")
                         .HasColumnType("TEXT");
 
-                    b.Property<int?>("LeaseOfferId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid?>("LeaseOfferId")
+                        .HasColumnType("TEXT");
 
                     b.Property<decimal>("MonthlyRent")
                         .HasPrecision(18, 2)
@@ -1698,16 +1676,15 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<DateTime?>("OfferedOn")
                         .HasColumnType("TEXT");
 
-                    b.Property<string>("OrganizationId")
-                        .IsRequired()
+                    b.Property<Guid>("OrganizationId")
                         .HasMaxLength(100)
                         .HasColumnType("TEXT");
 
-                    b.Property<int?>("PreviousLeaseId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid?>("PreviousLeaseId")
+                        .HasColumnType("TEXT");
 
-                    b.Property<int>("PropertyId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("PropertyId")
+                        .HasColumnType("TEXT");
 
                     b.Property<decimal?>("ProposedRenewalRent")
                         .HasColumnType("decimal(18,2)");
@@ -1750,8 +1727,8 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasMaxLength(50)
                         .HasColumnType("TEXT");
 
-                    b.Property<int>("TenantId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("TEXT");
 
                     b.Property<string>("Terms")
                         .IsRequired()
@@ -1773,12 +1750,11 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
             modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.LeaseOffer", b =>
                 {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
 
-                    b.Property<int?>("ConvertedLeaseId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid?>("ConvertedLeaseId")
+                        .HasColumnType("TEXT");
 
                     b.Property<string>("CreatedBy")
                         .IsRequired()
@@ -1815,19 +1791,18 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<DateTime>("OfferedOn")
                         .HasColumnType("TEXT");
 
-                    b.Property<string>("OrganizationId")
-                        .IsRequired()
+                    b.Property<Guid>("OrganizationId")
                         .HasMaxLength(100)
                         .HasColumnType("TEXT");
 
-                    b.Property<int>("PropertyId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("PropertyId")
+                        .HasColumnType("TEXT");
 
-                    b.Property<int>("ProspectiveTenantId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("ProspectiveTenantId")
+                        .HasColumnType("TEXT");
 
-                    b.Property<int>("RentalApplicationId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("RentalApplicationId")
+                        .HasColumnType("TEXT");
 
                     b.Property<DateTime?>("RespondedOn")
                         .HasColumnType("TEXT");
@@ -1865,9 +1840,8 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
             modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.MaintenanceRequest", b =>
                 {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
 
                     b.Property<decimal>("ActualCost")
                         .HasPrecision(18, 2)
@@ -1878,8 +1852,8 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasMaxLength(100)
                         .HasColumnType("TEXT");
 
-                    b.Property<int?>("CalendarEventId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid?>("CalendarEventId")
+                        .HasColumnType("TEXT");
 
                     b.Property<DateTime?>("CompletedOn")
                         .HasColumnType("TEXT");
@@ -1911,11 +1885,10 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<DateTime?>("LastModifiedOn")
                         .HasColumnType("TEXT");
 
-                    b.Property<int?>("LeaseId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid?>("LeaseId")
+                        .HasColumnType("TEXT");
 
-                    b.Property<string>("OrganizationId")
-                        .IsRequired()
+                    b.Property<Guid>("OrganizationId")
                         .HasMaxLength(100)
                         .HasColumnType("TEXT");
 
@@ -1924,8 +1897,8 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasMaxLength(20)
                         .HasColumnType("TEXT");
 
-                    b.Property<int>("PropertyId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("PropertyId")
+                        .HasColumnType("TEXT");
 
                     b.Property<string>("RequestType")
                         .IsRequired()
@@ -1985,9 +1958,8 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
             modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.Note", b =>
                 {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
 
                     b.Property<string>("Content")
                         .IsRequired()
@@ -2002,8 +1974,8 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<DateTime>("CreatedOn")
                         .HasColumnType("TEXT");
 
-                    b.Property<int>("EntityId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("EntityId")
+                        .HasColumnType("TEXT");
 
                     b.Property<string>("EntityType")
                         .IsRequired()
@@ -2020,8 +1992,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<DateTime?>("LastModifiedOn")
                         .HasColumnType("TEXT");
 
-                    b.Property<string>("OrganizationId")
-                        .IsRequired()
+                    b.Property<Guid>("OrganizationId")
                         .HasMaxLength(100)
                         .HasColumnType("TEXT");
 
@@ -2038,7 +2009,8 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
             modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.Organization", b =>
                 {
-                    b.Property<string>("Id")
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
                         .HasMaxLength(100)
                         .HasColumnType("TEXT");
 
@@ -2086,9 +2058,8 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
             modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.OrganizationSettings", b =>
                 {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
 
                     b.Property<bool>("AllowTenantDividendChoice")
                         .HasColumnType("INTEGER");
@@ -2191,9 +2162,8 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
             modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.Payment", b =>
                 {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
 
                     b.Property<decimal>("Amount")
                         .HasPrecision(18, 2)
@@ -2207,11 +2177,11 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<DateTime>("CreatedOn")
                         .HasColumnType("TEXT");
 
-                    b.Property<int?>("DocumentId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid?>("DocumentId")
+                        .HasColumnType("TEXT");
 
-                    b.Property<int>("InvoiceId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("InvoiceId")
+                        .HasColumnType("TEXT");
 
                     b.Property<bool>("IsDeleted")
                         .HasColumnType("INTEGER");
@@ -2228,8 +2198,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasMaxLength(1000)
                         .HasColumnType("TEXT");
 
-                    b.Property<string>("OrganizationId")
-                        .IsRequired()
+                    b.Property<Guid>("OrganizationId")
                         .HasMaxLength(100)
                         .HasColumnType("TEXT");
 
@@ -2254,9 +2223,8 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
             modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.Property", b =>
                 {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
 
                     b.Property<string>("Address")
                         .IsRequired()
@@ -2312,8 +2280,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<DateTime?>("NextRoutineInspectionDueDate")
                         .HasColumnType("TEXT");
 
-                    b.Property<string>("OrganizationId")
-                        .IsRequired()
+                    b.Property<Guid>("OrganizationId")
                         .HasMaxLength(100)
                         .HasColumnType("TEXT");
 
@@ -2359,9 +2326,8 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
             modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.ProspectiveTenant", b =>
                 {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
 
                     b.Property<string>("CreatedBy")
                         .IsRequired()
@@ -2398,8 +2364,8 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasMaxLength(2)
                         .HasColumnType("TEXT");
 
-                    b.Property<int?>("InterestedPropertyId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid?>("InterestedPropertyId")
+                        .HasColumnType("TEXT");
 
                     b.Property<bool>("IsDeleted")
                         .HasColumnType("INTEGER");
@@ -2420,8 +2386,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasMaxLength(2000)
                         .HasColumnType("TEXT");
 
-                    b.Property<string>("OrganizationId")
-                        .IsRequired()
+                    b.Property<Guid>("OrganizationId")
                         .HasMaxLength(100)
                         .HasColumnType("TEXT");
 
@@ -2454,9 +2419,8 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
             modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.RentalApplication", b =>
                 {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
 
                     b.Property<decimal>("ApplicationFee")
                         .HasPrecision(18, 2)
@@ -2558,16 +2522,15 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasPrecision(18, 2)
                         .HasColumnType("decimal(18,2)");
 
-                    b.Property<string>("OrganizationId")
-                        .IsRequired()
+                    b.Property<Guid>("OrganizationId")
                         .HasMaxLength(100)
                         .HasColumnType("TEXT");
 
-                    b.Property<int>("PropertyId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("PropertyId")
+                        .HasColumnType("TEXT");
 
-                    b.Property<int>("ProspectiveTenantId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("ProspectiveTenantId")
+                        .HasColumnType("TEXT");
 
                     b.Property<string>("Reference1Name")
                         .IsRequired()
@@ -2643,9 +2606,8 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
             modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.SecurityDeposit", b =>
                 {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
 
                     b.Property<decimal>("Amount")
                         .HasPrecision(18, 2)
@@ -2683,15 +2645,14 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<DateTime?>("LastModifiedOn")
                         .HasColumnType("TEXT");
 
-                    b.Property<int>("LeaseId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("LeaseId")
+                        .HasColumnType("TEXT");
 
                     b.Property<string>("Notes")
                         .HasMaxLength(500)
                         .HasColumnType("TEXT");
 
-                    b.Property<string>("OrganizationId")
-                        .IsRequired()
+                    b.Property<Guid>("OrganizationId")
                         .HasMaxLength(100)
                         .HasColumnType("TEXT");
 
@@ -2726,8 +2687,8 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasMaxLength(50)
                         .HasColumnType("TEXT");
 
-                    b.Property<int>("TenantId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("TEXT");
 
                     b.Property<string>("TransactionReference")
                         .HasMaxLength(100)
@@ -2749,9 +2710,8 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
             modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.SecurityDepositDividend", b =>
                 {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
 
                     b.Property<decimal>("BaseDividendAmount")
                         .HasPrecision(18, 2)
@@ -2772,8 +2732,8 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasPrecision(18, 2)
                         .HasColumnType("decimal(18,2)");
 
-                    b.Property<int>("InvestmentPoolId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("InvestmentPoolId")
+                        .HasColumnType("TEXT");
 
                     b.Property<bool>("IsDeleted")
                         .HasColumnType("INTEGER");
@@ -2785,8 +2745,8 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<DateTime?>("LastModifiedOn")
                         .HasColumnType("TEXT");
 
-                    b.Property<int>("LeaseId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("LeaseId")
+                        .HasColumnType("TEXT");
 
                     b.Property<string>("MailingAddress")
                         .HasMaxLength(500)
@@ -2799,8 +2759,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasMaxLength(500)
                         .HasColumnType("TEXT");
 
-                    b.Property<string>("OrganizationId")
-                        .IsRequired()
+                    b.Property<Guid>("OrganizationId")
                         .HasMaxLength(100)
                         .HasColumnType("TEXT");
 
@@ -2820,16 +2779,16 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasPrecision(18, 6)
                         .HasColumnType("decimal(18,6)");
 
-                    b.Property<int>("SecurityDepositId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("SecurityDepositId")
+                        .HasColumnType("TEXT");
 
                     b.Property<string>("Status")
                         .IsRequired()
                         .HasMaxLength(50)
                         .HasColumnType("TEXT");
 
-                    b.Property<int>("TenantId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("TEXT");
 
                     b.Property<int>("Year")
                         .HasColumnType("INTEGER");
@@ -2853,9 +2812,8 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
             modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.SecurityDepositInvestmentPool", b =>
                 {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
 
                     b.Property<int>("ActiveLeaseCount")
                         .HasColumnType("INTEGER");
@@ -2896,8 +2854,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasMaxLength(1000)
                         .HasColumnType("TEXT");
 
-                    b.Property<string>("OrganizationId")
-                        .IsRequired()
+                    b.Property<Guid>("OrganizationId")
                         .HasColumnType("TEXT");
 
                     b.Property<decimal>("OrganizationShare")
@@ -2946,9 +2903,8 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
             modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.Tenant", b =>
                 {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
 
                     b.Property<string>("CreatedBy")
                         .IsRequired()
@@ -3008,8 +2964,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasMaxLength(500)
                         .HasColumnType("TEXT");
 
-                    b.Property<string>("OrganizationId")
-                        .IsRequired()
+                    b.Property<Guid>("OrganizationId")
                         .HasColumnType("TEXT");
 
                     b.Property<string>("PhoneNumber")
@@ -3017,8 +2972,8 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasMaxLength(20)
                         .HasColumnType("TEXT");
 
-                    b.Property<int?>("ProspectiveTenantId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid?>("ProspectiveTenantId")
+                        .HasColumnType("TEXT");
 
                     b.HasKey("Id");
 
@@ -3035,15 +2990,14 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
             modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.Tour", b =>
                 {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
 
-                    b.Property<int?>("CalendarEventId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid?>("CalendarEventId")
+                        .HasColumnType("TEXT");
 
-                    b.Property<int?>("ChecklistId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid?>("ChecklistId")
+                        .HasColumnType("TEXT");
 
                     b.Property<string>("ConductedBy")
                         .HasMaxLength(100)
@@ -3078,16 +3032,15 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<DateTime?>("LastModifiedOn")
                         .HasColumnType("TEXT");
 
-                    b.Property<string>("OrganizationId")
-                        .IsRequired()
+                    b.Property<Guid>("OrganizationId")
                         .HasMaxLength(100)
                         .HasColumnType("TEXT");
 
-                    b.Property<int>("PropertyId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("PropertyId")
+                        .HasColumnType("TEXT");
 
-                    b.Property<int>("ProspectiveTenantId")
-                        .HasColumnType("INTEGER");
+                    b.Property<Guid>("ProspectiveTenantId")
+                        .HasColumnType("TEXT");
 
                     b.Property<DateTime>("ScheduledOn")
                         .HasColumnType("TEXT");
@@ -3116,7 +3069,8 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
             modelBuilder.Entity("Aquiis.SimpleStart.Core.Entities.UserOrganization", b =>
                 {
-                    b.Property<string>("Id")
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
                         .HasMaxLength(100)
                         .HasColumnType("TEXT");
 
@@ -3146,8 +3100,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<DateTime?>("LastModifiedOn")
                         .HasColumnType("TEXT");
 
-                    b.Property<string>("OrganizationId")
-                        .IsRequired()
+                    b.Property<Guid>("OrganizationId")
                         .HasColumnType("TEXT");
 
                     b.Property<DateTime?>("RevokedOn")
@@ -3185,8 +3138,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<int>("AccessFailedCount")
                         .HasColumnType("INTEGER");
 
-                    b.Property<string>("ActiveOrganizationId")
-                        .IsRequired()
+                    b.Property<Guid>("ActiveOrganizationId")
                         .HasColumnType("TEXT");
 
                     b.Property<string>("ConcurrencyStamp")
@@ -3231,8 +3183,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasMaxLength(256)
                         .HasColumnType("TEXT");
 
-                    b.Property<string>("OrganizationId")
-                        .IsRequired()
+                    b.Property<Guid>("OrganizationId")
                         .HasColumnType("TEXT");
 
                     b.Property<string>("PasswordHash")
diff --git a/Aquiis.SimpleStart/Shared/Components/Account/ApplicationUser.cs b/Aquiis.SimpleStart/Shared/Components/Account/ApplicationUser.cs
index 23b8705..3a956a7 100644
--- a/Aquiis.SimpleStart/Shared/Components/Account/ApplicationUser.cs
+++ b/Aquiis.SimpleStart/Shared/Components/Account/ApplicationUser.cs
@@ -9,10 +9,10 @@ public class ApplicationUser : IdentityUser
     /// <summary>
     /// The currently active organization ID for this user session
     /// </summary>
-    public string ActiveOrganizationId { get; set; } = string.Empty;
+    public Guid ActiveOrganizationId { get; set; } = Guid.Empty;
 
     // The organization ID this user belongs to
-    public string OrganizationId { get; set; } = string.Empty;
+    public Guid OrganizationId { get; set; } = Guid.Empty;
 
     public string FirstName { get; set; } = string.Empty;
     public string LastName { get; set; } = string.Empty;
diff --git a/Aquiis.SimpleStart/Shared/Components/NotesTimeline.razor b/Aquiis.SimpleStart/Shared/Components/NotesTimeline.razor
index ec64d89..8980f20 100644
--- a/Aquiis.SimpleStart/Shared/Components/NotesTimeline.razor
+++ b/Aquiis.SimpleStart/Shared/Components/NotesTimeline.razor
@@ -9,6 +9,8 @@
 @inject ToastService ToastService
 @inject IJSRuntime JSRuntime
 
+@rendermode InteractiveServer
+
 <div class="notes-timeline">
     <div class="mb-3">
         <label class="form-label"><i class="bi bi-chat-left-text"></i> Add Note</label>
@@ -113,7 +115,7 @@
     public string EntityType { get; set; } = string.Empty;
 
     [Parameter, EditorRequired]
-    public int EntityId { get; set; }
+    public Guid EntityId { get; set; }
 
     [Parameter]
     public bool CanDelete { get; set; } = true;
@@ -136,7 +138,7 @@
     protected override async Task OnParametersSetAsync()
     {
         // Reload notes when EntityId changes
-        if (EntityId > 0)
+        if (EntityId != Guid.Empty)
         {
             await LoadNotes();
         }
@@ -147,8 +149,7 @@
         isLoading = true;
         try
         {
-            var organizationId = await UserContext.GetOrganizationIdAsync();
-            if (!string.IsNullOrEmpty(organizationId) && EntityId > 0)
+            if (EntityId != Guid.Empty)
             {
                 notes = await NoteService.GetNotesAsync(EntityType, EntityId);
             }
@@ -194,26 +195,22 @@
         }
     }
 
-    private async Task DeleteNote(int noteId)
+    private async Task DeleteNote(Guid noteId)
     {
         if (!await JSRuntime.InvokeAsync<bool>("confirm", "Are you sure you want to delete this note?"))
             return;
 
         try
         {
-            var organizationId = await UserContext.GetOrganizationIdAsync();
-            if (!string.IsNullOrEmpty(organizationId))
+            var success = await NoteService.DeleteNoteAsync(noteId);
+            if (success)
+            {
+                notes.RemoveAll(n => n.Id == noteId);
+                ToastService.ShowSuccess("Note deleted successfully");
+            }
+            else
             {
-                var success = await NoteService.DeleteNoteAsync(noteId);
-                if (success)
-                {
-                    notes.RemoveAll(n => n.Id == noteId);
-                    ToastService.ShowSuccess("Note deleted successfully");
-                }
-                else
-                {
-                    ToastService.ShowError("Note not found or already deleted");
-                }
+                ToastService.ShowError("Note not found or already deleted");
             }
         }
         catch (Exception ex)
diff --git a/Aquiis.SimpleStart/Shared/Components/OrganizationSwitcher.razor b/Aquiis.SimpleStart/Shared/Components/OrganizationSwitcher.razor
index 36b2e59..7b7e9f9 100644
--- a/Aquiis.SimpleStart/Shared/Components/OrganizationSwitcher.razor
+++ b/Aquiis.SimpleStart/Shared/Components/OrganizationSwitcher.razor
@@ -149,7 +149,7 @@ else if (accessibleOrganizations.Count > 0)
         }
     }
 
-    private async Task SwitchOrganizationAsync(string organizationId)
+    private async Task SwitchOrganizationAsync(Guid organizationId)
     {
         isDropdownOpen = false; // Close dropdown
         
diff --git a/Aquiis.SimpleStart/Shared/Components/Pages/Home.razor b/Aquiis.SimpleStart/Shared/Components/Pages/Home.razor
index f3e2756..7ddfdb6 100644
--- a/Aquiis.SimpleStart/Shared/Components/Pages/Home.razor
+++ b/Aquiis.SimpleStart/Shared/Components/Pages/Home.razor
@@ -364,55 +364,69 @@
 
     private async Task LoadDashboardData()
     {
-        var userId = await UserContextService.GetUserIdAsync();
-        var organizationId = await UserContextService.GetActiveOrganizationIdAsync();
-        
-        if(string.IsNullOrEmpty(userId) || string.IsNullOrEmpty(organizationId))
-            return;
+        try
+        {
+            // Check authentication first
+            if (!await UserContextService.IsAuthenticatedAsync())
+                return;
+                
+            var userId = await UserContextService.GetUserIdAsync();
+            if (string.IsNullOrEmpty(userId))
+                return;
+                
+            var organizationId = await UserContextService.GetActiveOrganizationIdAsync();
+            if (!organizationId.HasValue)
+                return;
 
-        // Load summary counts
-        var allProperties = await PropertyManagementService.GetPropertiesAsync();
-        properties = allProperties.Where(p => !p.IsDeleted).ToList();
-        totalProperties = properties.Count;
-        availableProperties = properties.Count(p => p.IsAvailable);
+            // Load summary counts
+            var allProperties = await PropertyManagementService.GetPropertiesAsync();
+            properties = allProperties.Where(p => !p.IsDeleted).ToList();
+            totalProperties = properties.Count;
+            availableProperties = properties.Count(p => p.IsAvailable);
     
-        var allTenants = await PropertyManagementService.GetTenantsAsync();
-        tenants = allTenants.Where(t => !t.IsDeleted).ToList();
-        totalTenants = tenants.Count;
+            var allTenants = await PropertyManagementService.GetTenantsAsync();
+            tenants = allTenants.Where(t => !t.IsDeleted).ToList();
+            totalTenants = tenants.Count;
 
-        var allLeases = await PropertyManagementService.GetLeasesAsync();
-        leases = allLeases.Where(l => !l.IsDeleted).ToList();
-        activeLeases = leases.Count(l => l.Status == "Active");
+            var allLeases = await PropertyManagementService.GetLeasesAsync();
+            leases = allLeases.Where(l => !l.IsDeleted).ToList();
+            activeLeases = leases.Count(l => l.Status == "Active");
 
-        // Load available properties and pending leases
-        availablePropertiesList = properties
-            .Where(p => p.OrganizationId == organizationId && p.IsAvailable)
-            .OrderByDescending(p => p.CreatedOn)
-            .Take(5)
-            .ToList();
+            // Load available properties and pending leases
+            availablePropertiesList = properties
+                .Where(p => p.OrganizationId == organizationId && p.IsAvailable)
+                .OrderByDescending(p => p.CreatedOn)
+                .Take(5)
+                .ToList();
 
-        pendingLeases = leases
-            .Where(l => l.OrganizationId == organizationId && l.Status == "Pending")
-            .OrderByDescending(l => l.CreatedOn)
-            .Take(5)
-            .ToList();
+            pendingLeases = leases
+                .Where(l => l.OrganizationId == organizationId && l.Status == "Pending")
+                .OrderByDescending(l => l.CreatedOn)
+                .Take(5)
+                .ToList();
 
-        // Load open maintenance requests
-        var allMaintenanceRequests = await PropertyManagementService.GetMaintenanceRequestsAsync();
-        openMaintenanceRequests = allMaintenanceRequests
-            .Where(m => m.OrganizationId == organizationId && m.Status != "Completed" && m.Status != "Cancelled")
-            .OrderByDescending(m => m.Priority == "Urgent" ? 1 : m.Priority == "High" ? 2 : 3)
-            .ThenByDescending(m => m.RequestedOn)
-            .Take(5)
-            .ToList();
+            // Load open maintenance requests
+            var allMaintenanceRequests = await PropertyManagementService.GetMaintenanceRequestsAsync();
+            openMaintenanceRequests = allMaintenanceRequests
+                .Where(m => m.OrganizationId == organizationId && m.Status != "Completed" && m.Status != "Cancelled")
+                .OrderByDescending(m => m.Priority == "Urgent" ? 1 : m.Priority == "High" ? 2 : 3)
+                .ThenByDescending(m => m.RequestedOn)
+                .Take(5)
+                .ToList();
 
-        // Load recent invoices
-        var allInvoices = await PropertyManagementService.GetInvoicesAsync();
-        recentInvoices = allInvoices
-            .Where(i => i.Status != "Paid" && i.Status != "Cancelled")
-            .OrderByDescending(i => i.InvoicedOn)
-            .Take(5)
-            .ToList();
+            // Load recent invoices
+            var allInvoices = await PropertyManagementService.GetInvoicesAsync();
+            recentInvoices = allInvoices
+                .Where(i => i.Status != "Paid" && i.Status != "Cancelled")
+                .OrderByDescending(i => i.InvoicedOn)
+                .Take(5)
+                .ToList();
+        }
+        catch (InvalidOperationException)
+        {
+            // UserContext not yet initialized - silent return
+            return;
+        }
     }
 
     private string GetInvoiceStatusBadgeClass(string status)
diff --git a/Aquiis.SimpleStart/Shared/Services/DocumentService.cs b/Aquiis.SimpleStart/Shared/Services/DocumentService.cs
index 4bf5812..ab7214b 100644
--- a/Aquiis.SimpleStart/Shared/Services/DocumentService.cs
+++ b/Aquiis.SimpleStart/Shared/Services/DocumentService.cs
@@ -22,7 +22,7 @@ public async Task<Document> UploadDocumentAsync(Document document)
             return document;
         }
 
-        public async Task DeleteDocumentAsync(int documentId)
+        public async Task DeleteDocumentAsync(Guid documentId)
         {
             var document = await _dbContext.Documents.FindAsync(documentId);
             if (document != null)
@@ -32,7 +32,7 @@ public async Task DeleteDocumentAsync(int documentId)
             }
         }
 
-        public async Task<Document?> GetDocumentByIdAsync(int documentId)
+        public async Task<Document?> GetDocumentByIdAsync(Guid documentId)
         {
             return await _dbContext.Documents.FindAsync(documentId);
         }
diff --git a/Aquiis.SimpleStart/Shared/Services/UserContextService.cs b/Aquiis.SimpleStart/Shared/Services/UserContextService.cs
index ff99912..572dfc8 100644
--- a/Aquiis.SimpleStart/Shared/Services/UserContextService.cs
+++ b/Aquiis.SimpleStart/Shared/Services/UserContextService.cs
@@ -20,8 +20,8 @@ public class UserContextService
 
         // Cached values
         private string? _userId;
-        private string? _organizationId;
-        private string? _activeOrganizationId;
+        private Guid? _organizationId;
+        private Guid? _activeOrganizationId;
         private ApplicationUser? _currentUser;
         private bool _isInitialized = false;
 
@@ -53,7 +53,7 @@ public UserContextService(
         /// Gets the current user's OrganizationId. Cached after first access.
         /// DEPRECATED: Use GetActiveOrganizationIdAsync() for multi-org support
         /// </summary>
-        public async Task<string?> GetOrganizationIdAsync()
+        public async Task<Guid?> GetOrganizationIdAsync()
         {
             await EnsureInitializedAsync();
             return _organizationId;
@@ -63,11 +63,11 @@ public UserContextService(
         /// Gets the current user's active organization ID (new multi-org support).
         /// Throws InvalidOperationException if user has no active organization.
         /// </summary>
-        public async Task<string?> GetActiveOrganizationIdAsync()
+        public async Task<Guid?> GetActiveOrganizationIdAsync()
         {
             await EnsureInitializedAsync();
             
-            if (string.IsNullOrEmpty(_activeOrganizationId))
+            if (!_activeOrganizationId.HasValue || _activeOrganizationId == Guid.Empty)
             {
                 throw new InvalidOperationException("User does not have an active organization. This is a critical security issue.");
             }
@@ -147,11 +147,11 @@ public async Task<List<UserOrganization>> GetAccessibleOrganizationsAsync()
             var userId = await GetUserIdAsync();
             var activeOrganizationId = await GetActiveOrganizationIdAsync();
 
-            if (string.IsNullOrEmpty(userId) || string.IsNullOrEmpty(activeOrganizationId))
+            if (string.IsNullOrEmpty(userId) || !activeOrganizationId.HasValue || activeOrganizationId == Guid.Empty)
                 return null;
 
             var organizationService = await _organizationServiceFactory();
-            return await organizationService.GetUserRoleForOrganizationAsync(userId, activeOrganizationId);
+            return await organizationService.GetUserRoleForOrganizationAsync(userId, activeOrganizationId.Value);
         }
 
         /// <summary>
@@ -160,19 +160,19 @@ public async Task<List<UserOrganization>> GetAccessibleOrganizationsAsync()
         public async Task<Organization?> GetActiveOrganizationAsync()
         {
             var activeOrganizationId = await GetActiveOrganizationIdAsync();
-            if (string.IsNullOrEmpty(activeOrganizationId))
+            if (!activeOrganizationId.HasValue || activeOrganizationId == Guid.Empty)
                 return null;
 
             var organizationService = await _organizationServiceFactory();
-            return await organizationService.GetOrganizationByIdAsync(activeOrganizationId);
+            return await organizationService.GetOrganizationByIdAsync(activeOrganizationId.Value);
         }
 
         /// <summary>
         /// Get the organization entity by ID
         /// </summary>
-        public async Task<Organization?> GetOrganizationByIdAsync(string organizationId)
+        public async Task<Organization?> GetOrganizationByIdAsync(Guid organizationId)
         {
-            if (string.IsNullOrEmpty(organizationId))
+            if (organizationId == Guid.Empty)
                 return null;
 
             var organizationService = await _organizationServiceFactory();
@@ -182,7 +182,7 @@ public async Task<List<UserOrganization>> GetAccessibleOrganizationsAsync()
         /// <summary>
         /// Switch the user's active organization
         /// </summary>
-        public async Task<bool> SwitchOrganizationAsync(string organizationId)
+        public async Task<bool> SwitchOrganizationAsync(Guid organizationId)
         {
             var userId = await GetUserIdAsync();
             if (string.IsNullOrEmpty(userId))
diff --git a/Aquiis.SimpleStart/wwwroot/js/theme.js b/Aquiis.SimpleStart/wwwroot/js/theme.js
index 677fc03..168c1bf 100644
--- a/Aquiis.SimpleStart/wwwroot/js/theme.js
+++ b/Aquiis.SimpleStart/wwwroot/js/theme.js
@@ -1,6 +1,6 @@
 window.themeManager = {
   setTheme: function (theme) {
-    console.log("Setting theme to:", theme);
+    //console.log("Setting theme to:", theme);
     document.documentElement.setAttribute("data-bs-theme", theme);
     localStorage.setItem("theme", theme);
 
@@ -10,15 +10,15 @@ window.themeManager = {
     void document.documentElement.offsetHeight; // Trigger reflow
     document.documentElement.style.display = "";
 
-    console.log(
-      "Theme set. Current attribute:",
-      document.documentElement.getAttribute("data-bs-theme")
-    );
+    // console.log(
+    //   "Theme set. Current attribute:",
+    //   document.documentElement.getAttribute("data-bs-theme")
+    // );
   },
 
   getTheme: function () {
     const theme = localStorage.getItem("theme") || "light";
-    console.log("Getting theme from localStorage:", theme);
+    //console.log("Getting theme from localStorage:", theme);
     return theme;
   },
 
@@ -44,7 +44,7 @@ if (typeof localStorage !== "undefined") {
       document.documentElement.style.display = "none";
       void document.documentElement.offsetHeight;
       document.documentElement.style.display = "";
-      console.log("Theme re-applied after DOM mutation:", currentTheme);
+      //console.log("Theme re-applied after DOM mutation:", currentTheme);
     }
   });
 
diff --git a/Aquiis.Tests/AccountTests.cs b/Aquiis.Tests/AccountTests.cs
new file mode 100644
index 0000000..9c492ed
--- /dev/null
+++ b/Aquiis.Tests/AccountTests.cs
@@ -0,0 +1,416 @@
+using Microsoft.Playwright.NUnit;
+using Microsoft.Playwright;
+using NUnit.Framework;
+using System.IO;
+using System.Threading.Tasks;
+
+namespace Aquiis.Tests;
+
+[Parallelizable(ParallelScope.Self)]
+[TestFixture]
+
+public class AccountManagementTests : PageTest
+{
+
+    private const string BaseUrl = "http://localhost:5197";
+    private const int KeepBrowserOpenSeconds = 30; // Set to 0 to close immediately
+    
+    public override BrowserNewContextOptions ContextOptions()
+    {
+        return new BrowserNewContextOptions
+        {
+            IgnoreHTTPSErrors = true,
+            BaseURL = BaseUrl,
+            RecordVideoDir = Path.Combine(Directory.GetCurrentDirectory(), "test-videos"),
+            RecordVideoSize = new RecordVideoSize { Width = 1280, Height = 720 }
+        };
+    }
+
+    [Test, Order(1)]
+    public async Task CreateNewAccount()
+    {
+        await Page.GotoAsync("http://localhost:5197/");
+        await Page.GetByRole(AriaRole.Button, new() { Name = "Create Account" }).ClickAsync();
+        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Organization Name" }).ClickAsync();
+        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Organization Name" }).FillAsync("Aquiis");
+        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Organization Name" }).PressAsync("Tab");
+        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Email" }).FillAsync("owner1@aquiis.com");
+        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Email" }).PressAsync("Tab");
+        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Password", Exact = true }).FillAsync("Today123");
+        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Password", Exact = true }).PressAsync("Tab");
+        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Confirm Password" }).FillAsync("Today123");
+        await Page.GetByRole(AriaRole.Button, new() { Name = "Register" }).ClickAsync();
+
+        await Page.WaitForSelectorAsync("h1:has-text('Register confirmation')");
+
+        // await Page.GetByRole(AriaRole.Heading, new() { Name = "Register confirmation" }).ClickAsync();
+        await Page.GetByRole(AriaRole.Link, new() { Name = "Click here to confirm your account" }).ClickAsync();
+
+        await Page.WaitForSelectorAsync("h1:has-text('Confirm email')");
+
+        // await Page.GetByText("Thank you for confirming your").ClickAsync();
+        await Page.GetByRole(AriaRole.Link, new() { Name = "Home" }).ClickAsync();
+        await Page.GetByRole(AriaRole.Button, new() { Name = "Sign In" }).ClickAsync();
+
+        await Page.WaitForSelectorAsync("h1:has-text('Log in')");
+
+        // await Page.GetByRole(AriaRole.Heading, new() { Name = "Log in", Exact = true }).ClickAsync();
+        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Email" }).ClickAsync();
+        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Email" }).FillAsync("owner1@aquiis.com");
+        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Email" }).PressAsync("Tab");
+        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Password" }).FillAsync("Today123");
+        await Page.GetByRole(AriaRole.Button, new() { Name = "Log in" }).ClickAsync();
+
+        await Page.WaitForSelectorAsync("text=Dashboard");
+
+        await Page.GetByRole(AriaRole.Heading, new() { Name = "Property Management Dashboard", Exact= true }).ClickAsync();
+        
+        //Keep browser open for review/recording
+        // if (KeepBrowserOpenSeconds > 0)
+        //     await Task.Delay(KeepBrowserOpenSeconds * 1000);
+    }
+
+    [Test, Order(2)]
+    public async Task AddProperty()
+    {
+        await Page.GotoAsync("http://localhost:5197/");
+        await Page.GetByRole(AriaRole.Button, new() { Name = "Sign In" }).ClickAsync();
+        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Email" }).ClickAsync();
+        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Email" }).FillAsync("owner1@aquiis.com");
+        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Email" }).PressAsync("Tab");
+        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Password" }).FillAsync("Today123");
+        await Page.GetByRole(AriaRole.Button, new() { Name = "Log in" }).ClickAsync();
+        
+        // Wait for login to complete
+        await Page.WaitForLoadStateAsync(LoadState.DOMContentLoaded);
+        await Page.WaitForSelectorAsync("h1:has-text('Property Management Dashboard')");
+        
+        await Page.GetByRole(AriaRole.Link, new() { Name = "Properties" }).ClickAsync();
+        await Page.GetByRole(AriaRole.Button, new() { Name = "Add Property" }).ClickAsync();
+        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Enter property address" }).ClickAsync();
+        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Enter property address" }).FillAsync("369 Crescent Drive");
+        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Enter property address" }).PressAsync("Tab");
+        await Page.GetByRole(AriaRole.Textbox, new() { Name = "e.g., Apt 2B, Unit" }).PressAsync("Tab");
+        await Page.GetByRole(AriaRole.Textbox, new() { Name = "City" }).FillAsync("New Orleans");
+        await Page.GetByRole(AriaRole.Textbox, new() { Name = "City" }).PressAsync("Tab");
+        await Page.Locator("select[name=\"propertyModel.State\"]").SelectOptionAsync(new[] { "LA" });
+        await Page.Locator("select[name=\"propertyModel.State\"]").PressAsync("Tab");
+        await Page.GetByRole(AriaRole.Textbox, new() { Name = "#####-####" }).FillAsync("70119");
+        await Page.Locator("select[name=\"propertyModel.PropertyType\"]").SelectOptionAsync(new[] { "House" });
+        await Page.GetByPlaceholder("0.00").ClickAsync();
+        await Page.GetByPlaceholder("0.00").FillAsync("1800");
+        await Page.Locator("input[name=\"propertyModel.Bedrooms\"]").ClickAsync();
+        await Page.Locator("input[name=\"propertyModel.Bedrooms\"]").FillAsync("4");
+        await Page.Locator("input[name=\"propertyModel.Bedrooms\"]").PressAsync("Tab");
+        await Page.Locator("input[name=\"propertyModel.Bathrooms\"]").FillAsync("4.5");
+        await Page.Locator("input[name=\"propertyModel.Bathrooms\"]").PressAsync("Tab");
+        await Page.Locator("input[name=\"propertyModel.SquareFeet\"]").FillAsync("2500");
+        await Page.Locator("input[name=\"propertyModel.SquareFeet\"]").PressAsync("Tab");
+        await Page.GetByRole(AriaRole.Button, new() { Name = "Create Property" }).ClickAsync();
+        
+        // Verify property was created successfully
+        await Page.WaitForLoadStateAsync(LoadState.DOMContentLoaded);
+        await Expect(Page.GetByText("369 Crescent Drive").First).ToBeVisibleAsync();
+
+        await Page.GetByRole(AriaRole.Button, new() { Name = "Add Property" }).ClickAsync();
+        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Enter property address" }).ClickAsync();
+        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Enter property address" }).FillAsync("354 Maple Avenue");
+        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Enter property address" }).PressAsync("Tab");
+        await Page.GetByRole(AriaRole.Textbox, new() { Name = "e.g., Apt 2B, Unit" }).PressAsync("Tab");
+        await Page.GetByRole(AriaRole.Textbox, new() { Name = "City" }).FillAsync("Los Angeles");
+        await Page.GetByRole(AriaRole.Textbox, new() { Name = "City" }).PressAsync("Tab");
+        await Page.Locator("select[name=\"propertyModel.State\"]").SelectOptionAsync(new[] { "CA" });
+        await Page.Locator("select[name=\"propertyModel.State\"]").PressAsync("Tab");
+        await Page.GetByRole(AriaRole.Textbox, new() { Name = "#####-####" }).FillAsync("90210");
+        await Page.Locator("select[name=\"propertyModel.PropertyType\"]").SelectOptionAsync(new[] { "House" });
+        await Page.GetByPlaceholder("0.00").ClickAsync();
+        await Page.GetByPlaceholder("0.00").FillAsync("4900");
+        await Page.Locator("input[name=\"propertyModel.Bedrooms\"]").ClickAsync();
+        await Page.Locator("input[name=\"propertyModel.Bedrooms\"]").FillAsync("4");
+        await Page.Locator("input[name=\"propertyModel.Bedrooms\"]").PressAsync("Tab");
+        await Page.Locator("input[name=\"propertyModel.Bathrooms\"]").FillAsync("4.5");
+        await Page.Locator("input[name=\"propertyModel.Bathrooms\"]").PressAsync("Tab");
+        await Page.Locator("input[name=\"propertyModel.SquareFeet\"]").FillAsync("3200");
+        await Page.Locator("input[name=\"propertyModel.SquareFeet\"]").PressAsync("Tab");
+        await Page.GetByRole(AriaRole.Button, new() { Name = "Create Property" }).ClickAsync();
+
+        // Verify property was created successfully
+        await Page.WaitForLoadStateAsync(LoadState.DOMContentLoaded);
+        await Expect(Page.GetByText("354 Maple Avenue").First).ToBeVisibleAsync();
+    }
+
+    [Test, Order(3)]
+    public async Task AddProspect()
+    {
+        await Page.GotoAsync("http://localhost:5197/");
+        await Page.GetByRole(AriaRole.Button, new() { Name = "Sign In" }).ClickAsync();
+        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Email" }).ClickAsync();
+        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Email" }).FillAsync("owner1@aquiis.com");
+        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Email" }).PressAsync("Tab");
+        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Password" }).FillAsync("Today123");
+        await Page.GetByRole(AriaRole.Button, new() { Name = "Log in" }).ClickAsync();
+
+        await Page.GetByRole(AriaRole.Link, new() { Name = "Prospects" }).ClickAsync();
+        await Page.GetByRole(AriaRole.Button, new() { Name = " Add New Prospect" }).ClickAsync();
+
+        await Page.Locator("input[name=\"newProspect.FirstName\"]").ClickAsync();
+        await Page.Locator("input[name=\"newProspect.FirstName\"]").FillAsync("Mya");
+        await Page.Locator("input[name=\"newProspect.FirstName\"]").PressAsync("Tab");
+        await Page.Locator("input[name=\"newProspect.LastName\"]").ClickAsync();
+        await Page.Locator("input[name=\"newProspect.LastName\"]").FillAsync("Smith");
+        await Page.Locator("input[name=\"newProspect.LastName\"]").PressAsync("Tab");
+        await Page.Locator("input[name=\"newProspect.Email\"]").FillAsync("mya@gmail.com");
+        await Page.Locator("input[name=\"newProspect.Email\"]").PressAsync("Tab");
+        await Page.Locator("input[name=\"newProspect.Phone\"]").FillAsync("504-234-3600");
+        await Page.Locator("input[name=\"newProspect.Phone\"]").PressAsync("Tab");
+        await Page.Locator("input[name=\"newProspect.DateOfBirth\"]").FillAsync("1993-09-29");
+        await Page.GetByRole(AriaRole.Textbox, new() { Name = "e.g., Driver's License #" }).ClickAsync();
+        await Page.GetByRole(AriaRole.Textbox, new() { Name = "e.g., Driver's License #" }).FillAsync("12345678");
+        await Page.Locator("select[name=\"newProspect.IdentificationState\"]").SelectOptionAsync(new[] { "LA" });
+        await Page.Locator("select[name=\"newProspect.Source\"]").SelectOptionAsync(new[] { "Zillow" });
+        await Page.Locator("select[name=\"newProspect.InterestedPropertyId\"]").SelectOptionAsync(new[] { "354 Maple Avenue" });
+        await Page.Locator("input[name=\"newProspect.DesiredMoveInDate\"]").FillAsync("2026-01-01");
+        await Page.GetByRole(AriaRole.Button, new() { Name = "Save Prospect" }).ClickAsync();
+
+         // Verify property was created successfully
+        await Page.WaitForSelectorAsync("h1:has-text('Prospective Tenants')");
+        await Expect(Page.GetByText("Mya Smith").First).ToBeVisibleAsync();
+    }
+
+    [Test, Order(4)]
+    public async Task ScheduleAndCompleteTour()
+    {
+        await Page.GotoAsync("http://localhost:5197/");
+        await Page.GetByRole(AriaRole.Button, new() { Name = "Sign In" }).ClickAsync();
+        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Email" }).ClickAsync();
+        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Email" }).FillAsync("owner1@aquiis.com");
+        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Email" }).PressAsync("Tab");
+        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Password" }).FillAsync("Today123");
+        await Page.GetByRole(AriaRole.Button, new() { Name = "Log in" }).ClickAsync();
+
+        await Page.WaitForLoadStateAsync(LoadState.DOMContentLoaded);
+
+        await Page.GetByRole(AriaRole.Link, new() { Name = "Prospects" }).ClickAsync();
+        await Page.GetByTitle("Schedule Tour").ClickAsync();
+
+        await Page.WaitForLoadStateAsync(LoadState.DOMContentLoaded);
+
+        await Page.GetByRole(AriaRole.Button, new() { Name = "Schedule Tour" }).ClickAsync();
+
+        await Page.WaitForLoadStateAsync(LoadState.DOMContentLoaded);
+
+        await Page.GetByRole(AriaRole.Button, new() { Name = "Complete Tour", Exact = true }).ClickAsync();
+
+        await Page.WaitForLoadStateAsync(LoadState.DOMContentLoaded);
+
+        await Page.GetByRole(AriaRole.Button, new() { Name = " Continue Editing" }).ClickAsync();
+        await Page.GetByRole(AriaRole.Button, new() { Name = " Check All" }).First.ClickAsync();
+        await Page.GetByRole(AriaRole.Button, new() { Name = " Check All" }).Nth(1).ClickAsync();
+        await Page.GetByRole(AriaRole.Button, new() { Name = " Check All" }).Nth(2).ClickAsync();
+        await Page.GetByRole(AriaRole.Button, new() { Name = " Check All" }).Nth(3).ClickAsync();
+        await Page.GetByRole(AriaRole.Button, new() { Name = " Check All" }).Nth(4).ClickAsync();
+        await Page.GetByRole(AriaRole.Button, new() { Name = " Check All" }).Nth(5).ClickAsync();
+
+        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Enter value" }).First.ClickAsync();
+        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Enter value" }).First.FillAsync("1800");
+        await Page.GetByRole(AriaRole.Textbox, new() { Name = "e.g., $" }).ClickAsync();
+        await Page.GetByRole(AriaRole.Textbox, new() { Name = "e.g., $" }).FillAsync("1800");
+
+        await Page.Locator("div:nth-child(10) > .card-header > .btn").ClickAsync();
+        await Page.Locator("div:nth-child(11) > .card-header > .btn").ClickAsync();
+
+        await Page.GetByText("Interested", new() { Exact = true }).ClickAsync();
+
+        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Enter value" }).Nth(1).ClickAsync();
+        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Enter value" }).Nth(1).FillAsync("None");
+
+        await Page.GetByRole(AriaRole.Button, new() { Name = " Save Progress" }).ClickAsync();
+
+        await Page.WaitForLoadStateAsync(LoadState.DOMContentLoaded);
+
+        await Page.GetByRole(AriaRole.Button, new() { Name = " Mark as Complete" }).ClickAsync();
+
+        await Page.WaitForLoadStateAsync(LoadState.DOMContentLoaded);
+
+        await Page.GetByRole(AriaRole.Button, new() { Name = " Generate PDF" }).ClickAsync();
+
+        await Page.WaitForLoadStateAsync(LoadState.DOMContentLoaded);
+
+        //await Task.Delay(5000); // Wait for PDF generation
+
+        var page1 = await Page.RunAndWaitForPopupAsync(async () =>
+        {
+            await Page.GetByRole(AriaRole.Button, new() { Name = " View PDF" }).ClickAsync();
+        });
+
+        await Page.WaitForLoadStateAsync(LoadState.DOMContentLoaded);
+
+        await Page.GetByRole(AriaRole.Link, new() { Name = "Dashboard" }).ClickAsync();
+        await Page.GetByRole(AriaRole.Button, new() { Name = "Logout" }).ClickAsync();
+    }
+
+    [Test, Order(5)]
+    public async Task SubmitApplication()
+    {
+        await Page.GotoAsync("http://localhost:5197/");
+        await Page.GetByRole(AriaRole.Button, new() { Name = "Sign In" }).ClickAsync();
+        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Email" }).ClickAsync();
+        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Email" }).FillAsync("owner1@aquiis.com");
+        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Email" }).PressAsync("Tab");
+        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Password" }).FillAsync("Today123");
+        await Page.GetByRole(AriaRole.Button, new() { Name = "Log in" }).ClickAsync();
+
+        await Page.WaitForLoadStateAsync(LoadState.DOMContentLoaded);
+
+        await Page.GetByRole(AriaRole.Link, new() { Name = "Prospects" }).ClickAsync();
+
+        await Page.WaitForLoadStateAsync(LoadState.DOMContentLoaded);
+
+        await Page.GetByRole(AriaRole.Button, new() { Name = " Apply" }).ClickAsync();
+
+        await Page.WaitForLoadStateAsync(LoadState.DOMContentLoaded);
+
+        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Main St" }).ClickAsync();
+        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Main St" }).FillAsync("123 Main Street");
+        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Main St" }).PressAsync("Tab");
+        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Los Angeles" }).FillAsync("Los Angeles");
+        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Los Angeles" }).PressAsync("Tab");
+        await Page.Locator("select[name=\"applicationModel.CurrentState\"]").SelectOptionAsync(new[] { "CA" });
+        await Page.Locator("select[name=\"applicationModel.CurrentState\"]").PressAsync("Tab");
+        await Page.GetByRole(AriaRole.Textbox, new() { Name = "90210" }).FillAsync("90210");
+        await Page.GetByRole(AriaRole.Textbox, new() { Name = "90210" }).PressAsync("Tab");
+        await Page.Locator("input[name=\"applicationModel.CurrentRent\"]").FillAsync("1500");
+        await Page.Locator("input[name=\"applicationModel.CurrentRent\"]").PressAsync("Tab");
+        await Page.GetByRole(AriaRole.Textbox, new() { Name = "John Smith" }).FillAsync("John Smith");
+        await Page.GetByRole(AriaRole.Textbox, new() { Name = "John Smith" }).PressAsync("Tab");
+        await Page.GetByRole(AriaRole.Textbox, new() { Name = "(555) 123-" }).FillAsync("555-123-4567");
+        await Page.GetByRole(AriaRole.Textbox, new() { Name = "(555) 123-" }).PressAsync("Tab");
+        await Page.GetByRole(AriaRole.Textbox, new() { Name = "ABC Company" }).PressAsync("CapsLock");
+        await Page.GetByRole(AriaRole.Textbox, new() { Name = "ABC Company" }).FillAsync("ABC");
+        await Page.GetByRole(AriaRole.Textbox, new() { Name = "ABC Company" }).PressAsync("CapsLock");
+        await Page.GetByRole(AriaRole.Textbox, new() { Name = "ABC Company" }).FillAsync("ABC Company");
+        await Page.GetByRole(AriaRole.Textbox, new() { Name = "ABC Company" }).PressAsync("Tab");
+        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Software Engineer" }).FillAsync("Software Engineer");
+        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Software Engineer" }).PressAsync("Tab");
+        await Page.Locator("input[name=\"applicationModel.MonthlyIncome\"]").FillAsync("9600");
+        await Page.Locator("input[name=\"applicationModel.MonthlyIncome\"]").PressAsync("Tab");
+        await Page.Locator("input[name=\"applicationModel.EmploymentLengthMonths\"]").FillAsync("15");
+        await Page.Locator("input[name=\"applicationModel.EmploymentLengthMonths\"]").PressAsync("Tab");
+        await Page.Locator("input[name=\"applicationModel.Reference1Name\"]").FillAsync("Richard");
+        await Page.Locator("input[name=\"applicationModel.Reference1Name\"]").PressAsync("Tab");
+        await Page.Locator("input[name=\"applicationModel.Reference1Phone\"]").FillAsync("Zachary");
+        await Page.Locator("input[name=\"applicationModel.Reference1Phone\"]").PressAsync("Tab");
+        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Friend, Coworker, etc." }).FillAsync("Spouse");
+        await Page.GetByRole(AriaRole.Button, new() { Name = "Submit Application" }).ClickAsync();
+
+        // Verify property was created successfully
+        await Expect(Page.GetByText("Application submitted successfully")).ToBeVisibleAsync();
+
+        await Page.WaitForLoadStateAsync(LoadState.DOMContentLoaded);
+
+        await Page.GetByRole(AriaRole.Link, new() { Name = "Prospects" }).ClickAsync();
+
+        await Page.WaitForLoadStateAsync(LoadState.DOMContentLoaded);
+
+        await Page.WaitForSelectorAsync("h1:has-text('Prospective Tenants')");
+
+        await Page.GetByRole(AriaRole.Link, new() { Name = "Dashboard" }).ClickAsync();
+
+        await Page.WaitForLoadStateAsync(LoadState.DOMContentLoaded);
+
+        await Page.GetByRole(AriaRole.Button, new() { Name = "Logout" }).ClickAsync();
+    }
+
+    [Test, Order(6)]
+    public async Task ApproveApplication()
+    {
+        await Page.GotoAsync("http://localhost:5197/");
+        await Page.GetByRole(AriaRole.Button, new() { Name = "Sign In" }).ClickAsync();
+        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Email" }).ClickAsync();
+        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Email" }).FillAsync("owner1@aquiis.com");
+        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Email" }).PressAsync("Tab");
+        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Password" }).FillAsync("Today123");
+        await Page.GetByRole(AriaRole.Button, new() { Name = "Log in" }).ClickAsync();
+       
+        await Page.WaitForLoadStateAsync(LoadState.DOMContentLoaded);
+
+        await Page.GetByRole(AriaRole.Link, new() { Name = "Prospects" }).ClickAsync();
+
+        await Page.WaitForLoadStateAsync(LoadState.DOMContentLoaded);
+
+        await Page.GetByTitle("View Details").ClickAsync();
+
+        await Page.WaitForLoadStateAsync(LoadState.DOMContentLoaded);
+
+        await Page.GetByRole(AriaRole.Button, new() { Name = " View Application" }).ClickAsync();
+
+        await Page.WaitForLoadStateAsync(LoadState.DOMContentLoaded);
+
+        await Page.GetByRole(AriaRole.Button, new() { Name = " Collect Application Fee" }).ClickAsync();
+        await Page.GetByRole(AriaRole.Combobox).SelectOptionAsync(new[] { "Online Payment" });
+        await Page.GetByRole(AriaRole.Button, new() { Name = " Confirm Payment" }).ClickAsync();
+
+        await Page.WaitForLoadStateAsync(LoadState.DOMContentLoaded);
+
+        await Page.GetByRole(AriaRole.Button, new() { Name = " Initiate Screening" }).ClickAsync();
+        await Page.GetByRole(AriaRole.Button, new() { Name = " Pass" }).First.ClickAsync();
+        await Page.GetByRole(AriaRole.Button, new() { Name = " Confirm Pass" }).ClickAsync();
+        await Page.GetByRole(AriaRole.Button, new() { Name = " Pass" }).Nth(1).ClickAsync();
+        await Page.GetByRole(AriaRole.Button, new() { Name = " Confirm Pass" }).ClickAsync();
+
+        await Page.GetByRole(AriaRole.Button, new() { Name = " Approve Application" }).ClickAsync();
+
+        await Page.WaitForLoadStateAsync(LoadState.DOMContentLoaded);
+
+        await Page.GetByRole(AriaRole.Link, new() { Name = "Dashboard" }).ClickAsync();
+        await Page.GetByRole(AriaRole.Button, new() { Name = "Logout" }).ClickAsync();
+    }
+
+    [Test]
+    public async Task GenerateLeaseOfferAndConvertToLease()
+    {
+        await Page.GotoAsync("http://localhost:5197/");
+        await Page.GetByRole(AriaRole.Button, new() { Name = "Sign In" }).ClickAsync();
+        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Email" }).ClickAsync();
+        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Email" }).FillAsync("owner1@aquiis.com");
+        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Email" }).PressAsync("Tab");
+        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Password" }).FillAsync("Today123");
+        await Page.GetByRole(AriaRole.Button, new() { Name = "Log in" }).ClickAsync();
+
+        await Page.WaitForLoadStateAsync(LoadState.DOMContentLoaded);
+
+        await Page.GetByRole(AriaRole.Link, new() { Name = "Prospects" }).ClickAsync();
+
+        await Page.WaitForLoadStateAsync(LoadState.DOMContentLoaded);
+
+        await Page.GetByTitle("View Details").ClickAsync();
+
+        await Page.WaitForLoadStateAsync(LoadState.DOMContentLoaded);
+
+        await Page.GetByRole(AriaRole.Button, new() { Name = " View Application" }).ClickAsync();
+
+        await Page.WaitForLoadStateAsync(LoadState.DOMContentLoaded);
+
+        await Page.GetByRole(AriaRole.Button, new() { Name = " Generate Lease Offer" }).ClickAsync();
+
+        await Page.WaitForLoadStateAsync(LoadState.DOMContentLoaded);
+
+        await Page.GetByRole(AriaRole.Button, new() { Name = " Generate Lease Offer" }).ClickAsync();
+
+        await Page.WaitForLoadStateAsync(LoadState.DOMContentLoaded);
+
+        await Page.GetByRole(AriaRole.Button, new() { Name = " Accept Offer (Convert to Lease" }).ClickAsync();
+
+        await Page.GetByRole(AriaRole.Combobox).SelectOptionAsync(new[] { "Online Payment" });
+        await Page.GetByRole(AriaRole.Button, new() { Name = " Accept & Create Lease" }).ClickAsync();
+
+        await Page.WaitForLoadStateAsync(LoadState.DOMContentLoaded);
+
+        await Page.GetByRole(AriaRole.Link, new() { Name = "Dashboard" }).ClickAsync();
+
+        await Page.WaitForLoadStateAsync(LoadState.DOMContentLoaded);
+
+        await Page.GetByRole(AriaRole.Button, new() { Name = "Logout" }).ClickAsync();
+    }
+
+}
\ No newline at end of file
diff --git a/Aquiis.Tests/AddProperty.cs b/Aquiis.Tests/ApplicationTests.cs
similarity index 60%
rename from Aquiis.Tests/AddProperty.cs
rename to Aquiis.Tests/ApplicationTests.cs
index 489fadf..9db0bb6 100644
--- a/Aquiis.Tests/AddProperty.cs
+++ b/Aquiis.Tests/ApplicationTests.cs
@@ -1,10 +1,26 @@
 using Microsoft.Playwright.NUnit;
 using Microsoft.Playwright;
 
+namespace Aquiis.Tests;
+
 [Parallelizable(ParallelScope.Self)]
 [TestFixture]
-public class AddProperty : PageTest
+public class PropertyManagementTests : PageTest
 {
+    private const string BaseUrl = "http://localhost:5197";
+    private const int KeepBrowserOpenSeconds = 30; // Set to 0 to close immediately
+    
+    public override BrowserNewContextOptions ContextOptions()
+    {
+        return new BrowserNewContextOptions
+        {
+            IgnoreHTTPSErrors = true,
+            BaseURL = BaseUrl,
+            RecordVideoDir = Path.Combine(Directory.GetCurrentDirectory(), "test-videos"),
+            RecordVideoSize = new RecordVideoSize { Width = 1280, Height = 720 }
+        };
+    }
+
     [Test]
     public async Task CanAddProperty()
     {
@@ -46,4 +62,34 @@ public async Task CanAddProperty()
         await Page.WaitForSelectorAsync("h1:has-text('Properties')");
         await Expect(Page.GetByText("3535 Delaney").First).ToBeVisibleAsync();
     }
+
+     [Test]
+    public async Task CanRemoveProperty()
+    {
+        await Page.GotoAsync("http://localhost:5197/");
+        await Page.GetByRole(AriaRole.Button, new() { Name = "Sign In" }).ClickAsync();
+        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Email" }).ClickAsync();
+        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Email" }).FillAsync("owner1@aquiis.com");
+        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Email" }).PressAsync("Tab");
+        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Password" }).FillAsync("Today123");
+        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Password" }).PressAsync("Enter");
+
+        // Wait for login to complete
+        await Page.WaitForSelectorAsync("text=Dashboard");
+
+        await Page.GetByRole(AriaRole.Link, new() { Name = "Properties" }).ClickAsync();
+
+        // Wait for properties page to load
+        await Page.WaitForSelectorAsync("h1:has-text('Properties')");
+
+        // Find the property "3535 Delaney" and click its delete button
+        await Page.Locator("[id^='property-']", new() { HasText = "3535 Delaney" })
+            .GetByTitle("Delete").First.ClickAsync();
+        
+        // Confirm deletion
+        //await Page.GetByRole(AriaRole.Button, new() { Name = "Delete", Exact = true }).ClickAsync();
+        
+        // Verify property was deleted
+        //await Expect(Page.GetByText("3535 Delaney")).Not.ToBeVisibleAsync();
+    }
 }
diff --git a/Aquiis.Tests/Aquiis.Tests.csproj b/Aquiis.Tests/Aquiis.Tests.csproj
index 6a7a234..e2be57f 100644
--- a/Aquiis.Tests/Aquiis.Tests.csproj
+++ b/Aquiis.Tests/Aquiis.Tests.csproj
@@ -21,4 +21,8 @@
     <Using Include="NUnit.Framework" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\Aquiis.SimpleStart\Aquiis.SimpleStart.csproj" />
+  </ItemGroup>
+
 </Project>
diff --git a/Aquiis.Tests/Core/Validation/GuidValidationAttributeTests.cs b/Aquiis.Tests/Core/Validation/GuidValidationAttributeTests.cs
new file mode 100644
index 0000000..ddc5e42
--- /dev/null
+++ b/Aquiis.Tests/Core/Validation/GuidValidationAttributeTests.cs
@@ -0,0 +1,200 @@
+using Aquiis.SimpleStart.Core.Validation;
+using System.ComponentModel.DataAnnotations;
+using NUnit.Framework;
+
+namespace Aquiis.Tests.Core.Validation;
+
+public class RequiredGuidAttributeTests
+{
+    [Test]
+    public void RequiredGuid_GuidEmpty_ReturnsFalse()
+    {
+        // Arrange
+        var attribute = new RequiredGuidAttribute();
+        var value = Guid.Empty;
+
+        // Act
+        var result = attribute.IsValid(value);
+
+        // Assert
+        Assert.That(result, Is.False);
+    }
+
+    [Test]
+    public void RequiredGuid_ValidGuid_ReturnsTrue()
+    {
+        // Arrange
+        var attribute = new RequiredGuidAttribute();
+        var value = Guid.NewGuid();
+
+        // Act
+        var result = attribute.IsValid(value);
+
+        // Assert
+        Assert.That(result, Is.True);
+    }
+
+    [Test]
+    public void RequiredGuid_Null_ReturnsFalse()
+    {
+        // Arrange
+        var attribute = new RequiredGuidAttribute();
+        object? value = null;
+
+        // Act
+        var result = attribute.IsValid(value);
+
+        // Assert
+        Assert.That(result, Is.False);
+    }
+
+    [Test]
+    public void RequiredGuid_WithContext_GuidEmpty_ReturnsValidationError()
+    {
+        // Arrange
+        var model = new TestModel { Id = Guid.Empty };
+        var context = new ValidationContext(model) { MemberName = nameof(TestModel.Id) };
+        var attribute = new RequiredGuidAttribute();
+
+        // Act
+        var result = attribute.GetValidationResult(Guid.Empty, context);
+
+        // Assert
+        Assert.That(result, Is.Not.Null);
+        Assert.That(result, Is.Not.EqualTo(ValidationResult.Success));
+    }
+
+    [Test]
+    public void RequiredGuid_WithContext_ValidGuid_ReturnsSuccess()
+    {
+        // Arrange
+        var model = new TestModel { Id = Guid.NewGuid() };
+        var context = new ValidationContext(model) { MemberName = nameof(TestModel.Id) };
+        var attribute = new RequiredGuidAttribute();
+
+        // Act
+        var result = attribute.GetValidationResult(model.Id, context);
+
+        // Assert
+        Assert.That(result, Is.EqualTo(ValidationResult.Success));
+    }
+
+    [Test]
+    public void RequiredGuid_CustomErrorMessage_UsesCustomMessage()
+    {
+        // Arrange
+        var customMessage = "Custom error message";
+        var attribute = new RequiredGuidAttribute(customMessage);
+        var model = new TestModel { Id = Guid.Empty };
+        var context = new ValidationContext(model) { MemberName = nameof(TestModel.Id) };
+
+        // Act
+        var result = attribute.GetValidationResult(Guid.Empty, context);
+
+        // Assert
+        Assert.That(result, Is.Not.Null);
+        Assert.That(result!.ErrorMessage, Is.EqualTo(customMessage));
+    }
+
+    private class TestModel
+    {
+        public Guid Id { get; set; }
+    }
+}
+
+public class OptionalGuidAttributeTests
+{
+    [Test]
+    public void OptionalGuid_Null_ReturnsTrue()
+    {
+        // Arrange
+        var attribute = new OptionalGuidAttribute();
+        object? value = null;
+
+        // Act
+        var result = attribute.IsValid(value);
+
+        // Assert
+        Assert.That(result, Is.True);
+    }
+
+    [Test]
+    public void OptionalGuid_GuidEmpty_ReturnsFalse()
+    {
+        // Arrange
+        var attribute = new OptionalGuidAttribute();
+        var value = Guid.Empty;
+
+        // Act
+        var result = attribute.IsValid(value);
+
+        // Assert
+        Assert.That(result, Is.False);
+    }
+
+    [Test]
+    public void OptionalGuid_ValidGuid_ReturnsTrue()
+    {
+        // Arrange
+        var attribute = new OptionalGuidAttribute();
+        var value = Guid.NewGuid();
+
+        // Act
+        var result = attribute.IsValid(value);
+
+        // Assert
+        Assert.That(result, Is.True);
+    }
+
+    [Test]
+    public void OptionalGuid_WithContext_Null_ReturnsSuccess()
+    {
+        // Arrange
+        var model = new TestModel { OptionalId = null };
+        var context = new ValidationContext(model) { MemberName = nameof(TestModel.OptionalId) };
+        var attribute = new OptionalGuidAttribute();
+
+        // Act
+        var result = attribute.GetValidationResult(null, context);
+
+        // Assert
+        Assert.That(result, Is.EqualTo(ValidationResult.Success));
+    }
+
+    [Test]
+    public void OptionalGuid_WithContext_GuidEmpty_ReturnsValidationError()
+    {
+        // Arrange
+        var model = new TestModel { OptionalId = Guid.Empty };
+        var context = new ValidationContext(model) { MemberName = nameof(TestModel.OptionalId) };
+        var attribute = new OptionalGuidAttribute();
+
+        // Act
+        var result = attribute.GetValidationResult(Guid.Empty, context);
+
+        // Assert
+        Assert.That(result, Is.Not.Null);
+        Assert.That(result, Is.Not.EqualTo(ValidationResult.Success));
+    }
+
+    [Test]
+    public void OptionalGuid_WithContext_ValidGuid_ReturnsSuccess()
+    {
+        // Arrange
+        var validGuid = Guid.NewGuid();
+        var model = new TestModel { OptionalId = validGuid };
+        var context = new ValidationContext(model) { MemberName = nameof(TestModel.OptionalId) };
+        var attribute = new OptionalGuidAttribute();
+
+        // Act
+        var result = attribute.GetValidationResult(validGuid, context);
+
+        // Assert
+        Assert.That(result, Is.EqualTo(ValidationResult.Success));
+    }
+
+    private class TestModel
+    {
+        public Guid? OptionalId { get; set; }
+    }
+}
diff --git a/Aquiis.Tests/RemoveProperty.cs b/Aquiis.Tests/RemoveProperty.cs
deleted file mode 100644
index 3662881..0000000
--- a/Aquiis.Tests/RemoveProperty.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using Microsoft.Playwright.NUnit;
-using Microsoft.Playwright;
-
-[Parallelizable(ParallelScope.Self)]
-[TestFixture]
-public class RemoveProperty : PageTest
-{
-    [Test]
-    public async Task CanRemoveProperty()
-    {
-        await Page.GotoAsync("http://localhost:5197/");
-        await Page.GetByRole(AriaRole.Button, new() { Name = "Sign In" }).ClickAsync();
-        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Email" }).ClickAsync();
-        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Email" }).FillAsync("owner1@aquiis.com");
-        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Email" }).PressAsync("Tab");
-        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Password" }).FillAsync("Today123");
-        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Password" }).PressAsync("Enter");
-
-        // Wait for login to complete
-        await Page.WaitForSelectorAsync("text=Dashboard");
-
-        await Page.GetByRole(AriaRole.Link, new() { Name = "Properties" }).ClickAsync();
-
-        // Wait for properties page to load
-        await Page.WaitForSelectorAsync("h1:has-text('Properties')");
-
-        // Find the property "3535 Delaney" and click its delete button
-        await Page.Locator("[id^='property-']", new() { HasText = "3535 Delaney" })
-            .GetByTitle("Delete").First.ClickAsync();
-        
-        // Confirm deletion
-        //await Page.GetByRole(AriaRole.Button, new() { Name = "Delete", Exact = true }).ClickAsync();
-        
-        // Verify property was deleted
-        //await Expect(Page.GetByText("3535 Delaney")).Not.ToBeVisibleAsync();
-    }
-}
\ No newline at end of file
diff --git a/Aquiis.Tests/UnitTest1.cs b/Aquiis.Tests/UnitTest1.cs.bak
similarity index 99%
rename from Aquiis.Tests/UnitTest1.cs
rename to Aquiis.Tests/UnitTest1.cs.bak
index 0bb1438..e461f17 100644
--- a/Aquiis.Tests/UnitTest1.cs
+++ b/Aquiis.Tests/UnitTest1.cs.bak
@@ -9,7 +9,7 @@ namespace Aquiis.Tests;
 /// </summary>
 [Parallelizable(ParallelScope.Self)]
 [TestFixture]
-public class PropertyManagementTests : PageTest
+public class PropertyManagementTestExamples : PageTest
 {
     private const string BaseUrl = "http://localhost:5197";
     private const int KeepBrowserOpenSeconds = 30; // Set to 0 to close immediately
diff --git a/Aquiis.sln b/Aquiis.sln
index b33e56f..dc6c83a 100644
--- a/Aquiis.sln
+++ b/Aquiis.sln
@@ -7,6 +7,8 @@ Project("{C69B6EFE-BB20-41DE-8CBA-044207EBDCE1}") = "Aquiis.SimpleStart", "Aquii
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aquiis.Tests", "Aquiis.Tests\Aquiis.Tests.csproj", "{81401A51-BBA1-4B6B-8771-9C26A7B5356E}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aquiis.SimpleStart.Tests", "Aquiis.SimpleStart.Tests\Aquiis.SimpleStart.Tests.csproj", "{D1111111-1111-4111-8111-111111111111}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU