diff --git a/NumberSearch.DataAccess/InternetBundle.sql b/NumberSearch.DataAccess/InternetBundle.sql
new file mode 100644
index 00000000..308aec2e
--- /dev/null
+++ b/NumberSearch.DataAccess/InternetBundle.sql
@@ -0,0 +1,17 @@
+-- Fiber internet contract terms and the phone bundle discount, in support of https://acceleratenetworks.com/Internet.
+-- Run this against the PostgresqlProd database with psql before deploying. Safe to run again.
+
+-- Stop at the first failed statement, however this file is run, so a failed CREATE never falls through to a later DROP.
+\set ON_ERROR_STOP on
+
+-- The contract term (2, 3 or 5 years) chosen for fiber internet on an order, 0 when the order has no fiber internet.
+ALTER TABLE public."Orders"
+    ADD COLUMN IF NOT EXISTS "InternetTermYears" integer NOT NULL DEFAULT 0,
+    -- The listed service address the fiber was qualified at, and the provider's building key, which survives re-importing the building lists.
+    ADD COLUMN IF NOT EXISTS "InternetServiceAddress" text NOT NULL DEFAULT '',
+    ADD COLUMN IF NOT EXISTS "InternetBuildingKey" text NOT NULL DEFAULT '';
+
+-- The Partner coupon now also takes $15/mo off each fiber internet connection, see InternetBundle.cs.
+UPDATE public."Coupons"
+SET "Description" = '5G service and fiber internet at partner pricing.'
+WHERE "CouponId" = '245e1c8a-0208-4016-acd1-a36f45315e88';
diff --git a/NumberSearch.DataAccess/Models/InternetBundle.cs b/NumberSearch.DataAccess/Models/InternetBundle.cs
new file mode 100644
index 00000000..82ea6879
--- /dev/null
+++ b/NumberSearch.DataAccess/Models/InternetBundle.cs
@@ -0,0 +1,100 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace NumberSearch.DataAccess
+{
+    /// <summary>
+    /// Fiber internet is $15/mo less per connection when it's bundled with phone service, or when the Partner coupon is applied.
+    /// </summary>
+    public static class InternetBundle
+    {
+        public static readonly Guid FiberInternet300ServiceId = new("cbcf5128-5164-40de-8dff-e71d0f152cab");
+        public static readonly Guid FiberInternet1GServiceId = new("708c3885-6dab-4a60-9e42-05cf13530076");
+        public static readonly Guid StandardLinesServiceId = new("16e2c639-445b-4ae6-9925-07300318206b");
+        public static readonly Guid ConcurrentSeatsServiceId = new("48eb4627-8692-4a3b-8be1-be64bbeea534");
+        public static readonly Guid PartnerCouponId = new("245e1c8a-0208-4016-acd1-a36f45315e88");
+
+        public const int DiscountPerConnection = 15;
+        public const string Name = "Fiber + Phone Bundle";
+        public const string Description = "$15/mo off fiber internet when bundled with phone service.";
+        public const string PartnerDescription = "$15/mo off fiber internet at partner pricing.";
+
+        /// <summary>
+        /// The contract terms fiber internet can be sold on, in years.
+        /// </summary>
+        public static readonly int[] TermYears = [2, 3, 5];
+
+        public static bool IsFiberInternet(Guid serviceId) => serviceId == FiberInternet300ServiceId || serviceId == FiberInternet1GServiceId;
+
+        /// <summary>
+        /// The speed in Mbps a building must be listed at to sell this fiber tier, or 0 when the service isn't fiber internet.
+        /// </summary>
+        public static int RequiredMbps(Guid serviceId) => serviceId == FiberInternet1GServiceId ? 1000 : serviceId == FiberInternet300ServiceId ? 300 : 0;
+
+        /// <summary>
+        /// Whether a fiber tier can be sold at a listed address: only WFI Sellable buildings listed at or above the tier's speed,
+        /// with a building key so Cart/Add can re-qualify the building.
+        /// </summary>
+        public static bool CanSellAt(Guid serviceId, ServiceAddress address) =>
+            IsFiberInternet(serviceId) && address.Product is "WFI" && address.Status is "Sellable" && !string.IsNullOrWhiteSpace(address.BuildingKey)
+            && ServiceAddress.ParseMbps(address.MaxSpeed) >= RequiredMbps(serviceId);
+
+        /// <summary>
+        /// The listed row a fiber tier can be sold at, or null. Both the Internet page and Cart/Add ask "can any of these rows sell this tier",
+        /// so they agree however many rows a building has and whatever order they come back in.
+        /// </summary>
+        public static ServiceAddress? QualifyingAddress(Guid serviceId, IEnumerable<ServiceAddress> addresses) =>
+            addresses.Where(x => CanSellAt(serviceId, x)).OrderByDescending(x => ServiceAddress.ParseMbps(x.MaxSpeed)).FirstOrDefault();
+
+        public static bool IsPhoneService(Guid serviceId) => serviceId == StandardLinesServiceId || serviceId == ConcurrentSeatsServiceId;
+
+        /// <summary>
+        /// The invoice notes for a fiber internet line, with the contract term and the address it was qualified at.
+        /// </summary>
+        public static string FiberNotes(int termYears, string serviceAddress, string description)
+        {
+            var term = termYears > 0 ? $"{termYears} year term. " : string.Empty;
+            var address = string.IsNullOrWhiteSpace(serviceAddress) ? string.Empty : $"Service address: {serviceAddress}. ";
+            return $"{term}{address}{description}";
+        }
+
+        /// <summary>
+        /// The parts of a product order the bundle depends on, so the Ops site's own ProductOrder model can use the same rules.
+        /// </summary>
+        public readonly record struct Line(Guid ServiceId, long Quantity, Guid? CouponId);
+
+        public static Line[] ToLines(IEnumerable<ProductOrder> productOrders) => [.. productOrders.Select(x => new Line(x.ServiceId, x.Quantity, x.CouponId))];
+
+        /// <summary>
+        /// The number of fiber internet connections in the cart.
+        /// </summary>
+        public static int FiberConnections(IEnumerable<ProductOrder> productOrders) => FiberConnections(ToLines(productOrders));
+
+        public static int FiberConnections(IEnumerable<Line> lines) =>
+            (int)lines.Where(x => IsFiberInternet(x.ServiceId)).Sum(x => Math.Max(x.Quantity, 0));
+
+        /// <summary>
+        /// Whether the bundle discount comes from the Partner coupon rather than phone service.
+        /// </summary>
+        public static bool IsPartnerOnly(IEnumerable<ProductOrder> productOrders) => IsPartnerOnly(ToLines(productOrders));
+
+        public static bool IsPartnerOnly(IEnumerable<Line> lines) => !HasPhoneService(lines) && HasPartnerCoupon(lines);
+
+        /// <summary>
+        /// The total monthly bundle discount in dollars, as a positive number. Applied once per fiber connection no matter how many phone services or coupons qualify it.
+        /// </summary>
+        public static int Discount(IEnumerable<ProductOrder> productOrders) => Discount(ToLines(productOrders));
+
+        public static int Discount(IEnumerable<Line> lines)
+        {
+            var all = lines as ICollection<Line> ?? [.. lines];
+            return HasPhoneService(all) || HasPartnerCoupon(all) ? FiberConnections(all) * DiscountPerConnection : 0;
+        }
+
+        private static bool HasPhoneService(IEnumerable<Line> lines) => lines.Any(x => IsPhoneService(x.ServiceId) && x.Quantity > 0);
+
+        // Coupons don't carry a meaningful quantity, so any Partner coupon line qualifies, unlike phone service which must have at least one line or seat.
+        private static bool HasPartnerCoupon(IEnumerable<Line> lines) => lines.Any(x => x.CouponId == PartnerCouponId);
+    }
+}
diff --git a/NumberSearch.DataAccess/Models/Order.cs b/NumberSearch.DataAccess/Models/Order.cs
index 5f7f31f1..d55c6012 100644
--- a/NumberSearch.DataAccess/Models/Order.cs
+++ b/NumberSearch.DataAccess/Models/Order.cs
@@ -52,13 +52,25 @@ public record Order
         public string QuoteStatus { get; set; } = string.Empty;
         public bool VoiceProductAcknowledged { get; set; }
         public DateTime? VoiceProductAcknowledgedUtc { get; set; } = null;
+        /// <summary>
+        /// The contract term in years for fiber internet on this order, or 0 when the order has no fiber internet.
+        /// </summary>
+        public int InternetTermYears { get; set; }
+        /// <summary>
+        /// The listed service address the fiber internet on this order was qualified at, from the provider's building list.
+        /// </summary>
+        public string InternetServiceAddress { get; set; } = string.Empty;
+        /// <summary>
+        /// The provider's key for that building, which stays the same when a new building list is imported.
+        /// </summary>
+        public string InternetBuildingKey { get; set; } = string.Empty;
 
         public static async Task<Order?> GetByIdAsync(Guid orderId, string connectionString)
         {
             await using var connection = new NpgsqlConnection(connectionString);
 
             var result = await connection
-                .QueryFirstOrDefaultAsync<Order>("SELECT \"OrderId\", \"FirstName\", \"LastName\", \"Email\", \"Address\", \"Address2\", \"City\", \"State\", \"Zip\", \"DateSubmitted\", \"BusinessName\", \"CustomerNotes\", \"BillingClientId\", \"BillingInvoiceId\", \"Quote\", \"BillingInvoiceReoccuringId\", \"SalesEmail\", \"BackgroundWorkCompleted\", \"Completed\", \"InstallDate\", \"UpfrontInvoiceLink\", \"ReoccuringInvoiceLink\", \"OnsiteInstallation\", \"AddressUnitType\", \"AddressUnitNumber\", \"UnparsedAddress\", \"MergedOrderId\", \"E911ServiceNumber\", \"DateConvertedFromQuote\", \"DateCompleted\", \"ContactPhoneNumber\", \"DateUpfrontInvoicePaid\", \"InternalNotes\", \"QuoteStatus\", \"VoiceProductAcknowledged\", \"VoiceProductAcknowledgedUtc\" FROM public.\"Orders\" " +
+                .QueryFirstOrDefaultAsync<Order>("SELECT \"OrderId\", \"FirstName\", \"LastName\", \"Email\", \"Address\", \"Address2\", \"City\", \"State\", \"Zip\", \"DateSubmitted\", \"BusinessName\", \"CustomerNotes\", \"BillingClientId\", \"BillingInvoiceId\", \"Quote\", \"BillingInvoiceReoccuringId\", \"SalesEmail\", \"BackgroundWorkCompleted\", \"Completed\", \"InstallDate\", \"UpfrontInvoiceLink\", \"ReoccuringInvoiceLink\", \"OnsiteInstallation\", \"AddressUnitType\", \"AddressUnitNumber\", \"UnparsedAddress\", \"MergedOrderId\", \"E911ServiceNumber\", \"DateConvertedFromQuote\", \"DateCompleted\", \"ContactPhoneNumber\", \"DateUpfrontInvoicePaid\", \"InternalNotes\", \"QuoteStatus\", \"VoiceProductAcknowledged\", \"VoiceProductAcknowledgedUtc\", \"InternetTermYears\", \"InternetServiceAddress\", \"InternetBuildingKey\" FROM public.\"Orders\" " +
                 "WHERE \"OrderId\" = @orderId " +
                 "ORDER BY \"DateSubmitted\" DESC",
                 new { orderId })
@@ -72,7 +84,7 @@ public static async Task<IEnumerable<Order>> GetByEmailAsync(string email, strin
             await using var connection = new NpgsqlConnection(connectionString);
 
             var result = await connection
-                .QueryAsync<Order>("SELECT \"OrderId\", \"FirstName\", \"LastName\", \"Email\", \"Address\", \"Address2\", \"City\", \"State\", \"Zip\", \"DateSubmitted\", \"BusinessName\", \"CustomerNotes\", \"BillingClientId\", \"BillingInvoiceId\", \"Quote\", \"BillingInvoiceReoccuringId\", \"SalesEmail\", \"BackgroundWorkCompleted\", \"Completed\", \"InstallDate\", \"UpfrontInvoiceLink\", \"ReoccuringInvoiceLink\", \"OnsiteInstallation\", \"AddressUnitType\", \"AddressUnitNumber\", \"UnparsedAddress\", \"MergedOrderId\", \"E911ServiceNumber\", \"DateConvertedFromQuote\", \"DateCompleted\", \"ContactPhoneNumber\", \"DateUpfrontInvoicePaid\", \"InternalNotes\", \"QuoteStatus\", \"VoiceProductAcknowledged\", \"VoiceProductAcknowledgedUtc\" FROM public.\"Orders\" " +
+                .QueryAsync<Order>("SELECT \"OrderId\", \"FirstName\", \"LastName\", \"Email\", \"Address\", \"Address2\", \"City\", \"State\", \"Zip\", \"DateSubmitted\", \"BusinessName\", \"CustomerNotes\", \"BillingClientId\", \"BillingInvoiceId\", \"Quote\", \"BillingInvoiceReoccuringId\", \"SalesEmail\", \"BackgroundWorkCompleted\", \"Completed\", \"InstallDate\", \"UpfrontInvoiceLink\", \"ReoccuringInvoiceLink\", \"OnsiteInstallation\", \"AddressUnitType\", \"AddressUnitNumber\", \"UnparsedAddress\", \"MergedOrderId\", \"E911ServiceNumber\", \"DateConvertedFromQuote\", \"DateCompleted\", \"ContactPhoneNumber\", \"DateUpfrontInvoicePaid\", \"InternalNotes\", \"QuoteStatus\", \"VoiceProductAcknowledged\", \"VoiceProductAcknowledgedUtc\", \"InternetTermYears\", \"InternetServiceAddress\", \"InternetBuildingKey\" FROM public.\"Orders\" " +
                 "WHERE \"Email\" = @email " +
                 "ORDER BY \"DateSubmitted\" DESC",
                 new { email })
@@ -87,7 +99,7 @@ public static async Task<IEnumerable<Order>> GetAllAsync(string connectionString
 
             var result = await connection
                 .QueryAsync<Order>
-                ("SELECT \"OrderId\", \"FirstName\", \"LastName\", \"Email\", \"Address\", \"Address2\", \"City\", \"State\", \"Zip\", \"DateSubmitted\", \"BusinessName\", \"CustomerNotes\", \"BillingClientId\", \"BillingInvoiceId\", \"Quote\", \"BillingInvoiceReoccuringId\", \"SalesEmail\", \"BackgroundWorkCompleted\", \"Completed\", \"InstallDate\", \"UpfrontInvoiceLink\", \"ReoccuringInvoiceLink\", \"OnsiteInstallation\", \"AddressUnitType\", \"AddressUnitNumber\", \"UnparsedAddress\", \"MergedOrderId\", \"E911ServiceNumber\", \"DateConvertedFromQuote\", \"DateCompleted\", \"ContactPhoneNumber\", \"DateUpfrontInvoicePaid\", \"InternalNotes\", \"QuoteStatus\", \"VoiceProductAcknowledged\", \"VoiceProductAcknowledgedUtc\" " +
+                ("SELECT \"OrderId\", \"FirstName\", \"LastName\", \"Email\", \"Address\", \"Address2\", \"City\", \"State\", \"Zip\", \"DateSubmitted\", \"BusinessName\", \"CustomerNotes\", \"BillingClientId\", \"BillingInvoiceId\", \"Quote\", \"BillingInvoiceReoccuringId\", \"SalesEmail\", \"BackgroundWorkCompleted\", \"Completed\", \"InstallDate\", \"UpfrontInvoiceLink\", \"ReoccuringInvoiceLink\", \"OnsiteInstallation\", \"AddressUnitType\", \"AddressUnitNumber\", \"UnparsedAddress\", \"MergedOrderId\", \"E911ServiceNumber\", \"DateConvertedFromQuote\", \"DateCompleted\", \"ContactPhoneNumber\", \"DateUpfrontInvoicePaid\", \"InternalNotes\", \"QuoteStatus\", \"VoiceProductAcknowledged\", \"VoiceProductAcknowledgedUtc\", \"InternetTermYears\", \"InternetServiceAddress\", \"InternetBuildingKey\" " +
                 "FROM public.\"Orders\" " +
                 "ORDER BY \"DateSubmitted\" DESC")
                 .ConfigureAwait(false);
@@ -101,7 +113,7 @@ public static async Task<IEnumerable<Order>> GetAllQuotesAsync(string connection
 
             var result = await connection
                 .QueryAsync<Order>
-                ("SELECT \"OrderId\", \"FirstName\", \"LastName\", \"Email\", \"Address\", \"Address2\", \"City\", \"State\", \"Zip\", \"DateSubmitted\", \"BusinessName\", \"CustomerNotes\", \"BillingClientId\", \"BillingInvoiceId\", \"Quote\", \"BillingInvoiceReoccuringId\", \"SalesEmail\", \"BackgroundWorkCompleted\", \"Completed\", \"InstallDate\", \"UpfrontInvoiceLink\", \"ReoccuringInvoiceLink\", \"OnsiteInstallation\", \"AddressUnitType\", \"AddressUnitNumber\", \"UnparsedAddress\", \"MergedOrderId\", \"E911ServiceNumber\", \"DateConvertedFromQuote\", \"DateCompleted\", \"ContactPhoneNumber\", \"DateUpfrontInvoicePaid\", \"InternalNotes\", \"QuoteStatus\", \"VoiceProductAcknowledged\", \"VoiceProductAcknowledgedUtc\" " +
+                ("SELECT \"OrderId\", \"FirstName\", \"LastName\", \"Email\", \"Address\", \"Address2\", \"City\", \"State\", \"Zip\", \"DateSubmitted\", \"BusinessName\", \"CustomerNotes\", \"BillingClientId\", \"BillingInvoiceId\", \"Quote\", \"BillingInvoiceReoccuringId\", \"SalesEmail\", \"BackgroundWorkCompleted\", \"Completed\", \"InstallDate\", \"UpfrontInvoiceLink\", \"ReoccuringInvoiceLink\", \"OnsiteInstallation\", \"AddressUnitType\", \"AddressUnitNumber\", \"UnparsedAddress\", \"MergedOrderId\", \"E911ServiceNumber\", \"DateConvertedFromQuote\", \"DateCompleted\", \"ContactPhoneNumber\", \"DateUpfrontInvoicePaid\", \"InternalNotes\", \"QuoteStatus\", \"VoiceProductAcknowledged\", \"VoiceProductAcknowledgedUtc\", \"InternetTermYears\", \"InternetServiceAddress\", \"InternetBuildingKey\" " +
                 "FROM public.\"Orders\" " +
                 "WHERE \"Quote\" = true " +
                 "ORDER BY \"DateSubmitted\" DESC")
@@ -116,7 +128,7 @@ public static async Task<IEnumerable<Order>> GetByBackGroundworkNotCompletedAsyn
 
             var result = await connection
                 .QueryAsync<Order>
-                ("SELECT \"OrderId\", \"FirstName\", \"LastName\", \"Email\", \"Address\", \"Address2\", \"City\", \"State\", \"Zip\", \"DateSubmitted\", \"BusinessName\", \"CustomerNotes\", \"BillingClientId\", \"BillingInvoiceId\", \"Quote\", \"BillingInvoiceReoccuringId\", \"SalesEmail\", \"BackgroundWorkCompleted\", \"Completed\", \"InstallDate\", \"UpfrontInvoiceLink\", \"ReoccuringInvoiceLink\", \"OnsiteInstallation\", \"AddressUnitType\", \"AddressUnitNumber\", \"UnparsedAddress\", \"MergedOrderId\", \"E911ServiceNumber\", \"DateConvertedFromQuote\", \"DateCompleted\", \"ContactPhoneNumber\", \"DateUpfrontInvoicePaid\", \"InternalNotes\", \"QuoteStatus\", \"VoiceProductAcknowledged\", \"VoiceProductAcknowledgedUtc\" " +
+                ("SELECT \"OrderId\", \"FirstName\", \"LastName\", \"Email\", \"Address\", \"Address2\", \"City\", \"State\", \"Zip\", \"DateSubmitted\", \"BusinessName\", \"CustomerNotes\", \"BillingClientId\", \"BillingInvoiceId\", \"Quote\", \"BillingInvoiceReoccuringId\", \"SalesEmail\", \"BackgroundWorkCompleted\", \"Completed\", \"InstallDate\", \"UpfrontInvoiceLink\", \"ReoccuringInvoiceLink\", \"OnsiteInstallation\", \"AddressUnitType\", \"AddressUnitNumber\", \"UnparsedAddress\", \"MergedOrderId\", \"E911ServiceNumber\", \"DateConvertedFromQuote\", \"DateCompleted\", \"ContactPhoneNumber\", \"DateUpfrontInvoicePaid\", \"InternalNotes\", \"QuoteStatus\", \"VoiceProductAcknowledged\", \"VoiceProductAcknowledgedUtc\", \"InternetTermYears\", \"InternetServiceAddress\", \"InternetBuildingKey\" " +
                 "FROM public.\"Orders\" " +
                 "WHERE \"BackgroundWorkCompleted\" = false " +
                 "ORDER BY \"DateSubmitted\" DESC")
@@ -130,9 +142,9 @@ public async Task<bool> PostAsync(string connectionString)
             await using var connection = new NpgsqlConnection(connectionString);
 
             var result = await connection
-                .ExecuteAsync("INSERT INTO public.\"Orders\"(\"OrderId\", \"FirstName\", \"LastName\", \"Email\", \"Address\", \"Address2\", \"City\", \"State\", \"Zip\", \"DateSubmitted\", \"BusinessName\", \"CustomerNotes\", \"BillingClientId\", \"BillingInvoiceId\", \"Quote\", \"BillingInvoiceReoccuringId\", \"SalesEmail\", \"BackgroundWorkCompleted\", \"Completed\", \"InstallDate\", \"UpfrontInvoiceLink\", \"ReoccuringInvoiceLink\", \"OnsiteInstallation\", \"AddressUnitType\", \"AddressUnitNumber\", \"UnparsedAddress\", \"MergedOrderId\", \"E911ServiceNumber\", \"DateConvertedFromQuote\", \"DateCompleted\", \"ContactPhoneNumber\", \"DateUpfrontInvoicePaid\", \"InternalNotes\", \"QuoteStatus\", \"VoiceProductAcknowledged\", \"VoiceProductAcknowledgedUtc\" ) " +
-                "VALUES(@OrderId, @FirstName, @LastName, @Email, @Address, @Address2, @City, @State, @Zip, @DateSubmitted, @BusinessName, @CustomerNotes, @BillingClientId, @BillingInvoiceId, @Quote, @BillingInvoiceReoccuringId, @SalesEmail, @BackgroundWorkCompleted, @Completed, @InstallDate, @UpfrontInvoiceLink, @ReoccuringInvoiceLink, @OnsiteInstallation, @AddressUnitType, @AddressUnitNumber, @UnparsedAddress, @MergedOrderId, @E911ServiceNumber, @DateConvertedFromQuote, @DateCompleted, @ContactPhoneNumber, @DateUpfrontInvoicePaid, @InternalNotes, @QuoteStatus, @VoiceProductAcknowledged, @VoiceProductAcknowledgedUtc )",
-                new { OrderId, FirstName, LastName, Email, Address, Address2, City, State, Zip, DateSubmitted, BusinessName, CustomerNotes, BillingClientId, BillingInvoiceId, Quote, BillingInvoiceReoccuringId, SalesEmail, BackgroundWorkCompleted, Completed, InstallDate, UpfrontInvoiceLink, ReoccuringInvoiceLink, OnsiteInstallation, AddressUnitType, AddressUnitNumber, UnparsedAddress, MergedOrderId, E911ServiceNumber, DateConvertedFromQuote, DateCompleted, ContactPhoneNumber, DateUpfrontInvoicePaid, InternalNotes, QuoteStatus, VoiceProductAcknowledged, VoiceProductAcknowledgedUtc })
+                .ExecuteAsync("INSERT INTO public.\"Orders\"(\"OrderId\", \"FirstName\", \"LastName\", \"Email\", \"Address\", \"Address2\", \"City\", \"State\", \"Zip\", \"DateSubmitted\", \"BusinessName\", \"CustomerNotes\", \"BillingClientId\", \"BillingInvoiceId\", \"Quote\", \"BillingInvoiceReoccuringId\", \"SalesEmail\", \"BackgroundWorkCompleted\", \"Completed\", \"InstallDate\", \"UpfrontInvoiceLink\", \"ReoccuringInvoiceLink\", \"OnsiteInstallation\", \"AddressUnitType\", \"AddressUnitNumber\", \"UnparsedAddress\", \"MergedOrderId\", \"E911ServiceNumber\", \"DateConvertedFromQuote\", \"DateCompleted\", \"ContactPhoneNumber\", \"DateUpfrontInvoicePaid\", \"InternalNotes\", \"QuoteStatus\", \"VoiceProductAcknowledged\", \"VoiceProductAcknowledgedUtc\", \"InternetTermYears\", \"InternetServiceAddress\", \"InternetBuildingKey\" ) " +
+                "VALUES(@OrderId, @FirstName, @LastName, @Email, @Address, @Address2, @City, @State, @Zip, @DateSubmitted, @BusinessName, @CustomerNotes, @BillingClientId, @BillingInvoiceId, @Quote, @BillingInvoiceReoccuringId, @SalesEmail, @BackgroundWorkCompleted, @Completed, @InstallDate, @UpfrontInvoiceLink, @ReoccuringInvoiceLink, @OnsiteInstallation, @AddressUnitType, @AddressUnitNumber, @UnparsedAddress, @MergedOrderId, @E911ServiceNumber, @DateConvertedFromQuote, @DateCompleted, @ContactPhoneNumber, @DateUpfrontInvoicePaid, @InternalNotes, @QuoteStatus, @VoiceProductAcknowledged, @VoiceProductAcknowledgedUtc, @InternetTermYears, @InternetServiceAddress, @InternetBuildingKey )",
+                new { OrderId, FirstName, LastName, Email, Address, Address2, City, State, Zip, DateSubmitted, BusinessName, CustomerNotes, BillingClientId, BillingInvoiceId, Quote, BillingInvoiceReoccuringId, SalesEmail, BackgroundWorkCompleted, Completed, InstallDate, UpfrontInvoiceLink, ReoccuringInvoiceLink, OnsiteInstallation, AddressUnitType, AddressUnitNumber, UnparsedAddress, MergedOrderId, E911ServiceNumber, DateConvertedFromQuote, DateCompleted, ContactPhoneNumber, DateUpfrontInvoicePaid, InternalNotes, QuoteStatus, VoiceProductAcknowledged, VoiceProductAcknowledgedUtc, InternetTermYears, InternetServiceAddress, InternetBuildingKey })
                 .ConfigureAwait(false);
 
             if (result == 1)
@@ -151,9 +163,9 @@ public async Task<bool> PutAsync(string connectionString)
 
             var result = await connection
                 .ExecuteAsync("UPDATE public.\"Orders\" " +
-                "SET \"FirstName\" = @FirstName, \"LastName\" = @LastName, \"Email\" = @Email, \"Address\" = @Address, \"Address2\" = @Address2, \"City\" = @City, \"State\" = @State, \"Zip\" = @Zip, \"DateSubmitted\" = @DateSubmitted, \"BusinessName\" = @BusinessName, \"CustomerNotes\" = @CustomerNotes, \"BillingClientId\" = @BillingClientId, \"BillingInvoiceId\" = @BillingInvoiceId, \"Quote\" = @Quote, \"BillingInvoiceReoccuringId\" = @BillingInvoiceReoccuringId, \"SalesEmail\" = @SalesEmail, \"BackgroundWorkCompleted\" = @BackgroundWorkCompleted, \"Completed\" = @Completed, \"InstallDate\" = @InstallDate, \"UpfrontInvoiceLink\" = @UpfrontInvoiceLink, \"ReoccuringInvoiceLink\" = @ReoccuringInvoiceLink, \"OnsiteInstallation\" = @OnsiteInstallation, \"AddressUnitType\" = @AddressUnitType, \"AddressUnitNumber\" = @AddressUnitNumber, \"UnparsedAddress\" = @UnparsedAddress, \"MergedOrderId\" = @MergedOrderId, \"E911ServiceNumber\" = @E911ServiceNumber, \"DateConvertedFromQuote\" = @DateConvertedFromQuote, \"DateCompleted\" = @DateCompleted, \"ContactPhoneNumber\" = @ContactPhoneNumber, \"DateUpfrontInvoicePaid\" = @DateUpfrontInvoicePaid, \"InternalNotes\" = @InternalNotes, \"QuoteStatus\" = @QuoteStatus, \"VoiceProductAcknowledged\" = @VoiceProductAcknowledged, \"VoiceProductAcknowledgedUtc\" = @VoiceProductAcknowledgedUtc " +
+                "SET \"FirstName\" = @FirstName, \"LastName\" = @LastName, \"Email\" = @Email, \"Address\" = @Address, \"Address2\" = @Address2, \"City\" = @City, \"State\" = @State, \"Zip\" = @Zip, \"DateSubmitted\" = @DateSubmitted, \"BusinessName\" = @BusinessName, \"CustomerNotes\" = @CustomerNotes, \"BillingClientId\" = @BillingClientId, \"BillingInvoiceId\" = @BillingInvoiceId, \"Quote\" = @Quote, \"BillingInvoiceReoccuringId\" = @BillingInvoiceReoccuringId, \"SalesEmail\" = @SalesEmail, \"BackgroundWorkCompleted\" = @BackgroundWorkCompleted, \"Completed\" = @Completed, \"InstallDate\" = @InstallDate, \"UpfrontInvoiceLink\" = @UpfrontInvoiceLink, \"ReoccuringInvoiceLink\" = @ReoccuringInvoiceLink, \"OnsiteInstallation\" = @OnsiteInstallation, \"AddressUnitType\" = @AddressUnitType, \"AddressUnitNumber\" = @AddressUnitNumber, \"UnparsedAddress\" = @UnparsedAddress, \"MergedOrderId\" = @MergedOrderId, \"E911ServiceNumber\" = @E911ServiceNumber, \"DateConvertedFromQuote\" = @DateConvertedFromQuote, \"DateCompleted\" = @DateCompleted, \"ContactPhoneNumber\" = @ContactPhoneNumber, \"DateUpfrontInvoicePaid\" = @DateUpfrontInvoicePaid, \"InternalNotes\" = @InternalNotes, \"QuoteStatus\" = @QuoteStatus, \"VoiceProductAcknowledged\" = @VoiceProductAcknowledged, \"VoiceProductAcknowledgedUtc\" = @VoiceProductAcknowledgedUtc, \"InternetTermYears\" = @InternetTermYears, \"InternetServiceAddress\" = @InternetServiceAddress, \"InternetBuildingKey\" = @InternetBuildingKey " +
                 "WHERE \"OrderId\" = @OrderId",
-                new { FirstName, LastName, Email, Address, Address2, City, State, Zip, DateSubmitted, BusinessName, CustomerNotes, BillingClientId, BillingInvoiceId, Quote, BillingInvoiceReoccuringId, SalesEmail, BackgroundWorkCompleted, Completed, InstallDate, UpfrontInvoiceLink, ReoccuringInvoiceLink, OnsiteInstallation, AddressUnitType, AddressUnitNumber, UnparsedAddress, MergedOrderId, E911ServiceNumber, DateConvertedFromQuote, DateCompleted, ContactPhoneNumber, DateUpfrontInvoicePaid, InternalNotes, QuoteStatus, VoiceProductAcknowledged, VoiceProductAcknowledgedUtc, OrderId })
+                new { FirstName, LastName, Email, Address, Address2, City, State, Zip, DateSubmitted, BusinessName, CustomerNotes, BillingClientId, BillingInvoiceId, Quote, BillingInvoiceReoccuringId, SalesEmail, BackgroundWorkCompleted, Completed, InstallDate, UpfrontInvoiceLink, ReoccuringInvoiceLink, OnsiteInstallation, AddressUnitType, AddressUnitNumber, UnparsedAddress, MergedOrderId, E911ServiceNumber, DateConvertedFromQuote, DateCompleted, ContactPhoneNumber, DateUpfrontInvoicePaid, InternalNotes, QuoteStatus, VoiceProductAcknowledged, VoiceProductAcknowledgedUtc, InternetTermYears, InternetServiceAddress, InternetBuildingKey, OrderId })
                 .ConfigureAwait(false);
 
             if (result == 1)
diff --git a/NumberSearch.DataAccess/Models/ServiceAddress.cs b/NumberSearch.DataAccess/Models/ServiceAddress.cs
new file mode 100644
index 00000000..ed2736c0
--- /dev/null
+++ b/NumberSearch.DataAccess/Models/ServiceAddress.cs
@@ -0,0 +1,182 @@
+using Dapper;
+
+using Npgsql;
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+
+namespace NumberSearch.DataAccess
+{
+    /// <summary>
+    /// An address where a provider has told us a product can be sold, loaded from their building lists by Ziply/import_ziply_building_list.py.
+    /// </summary>
+    public class ServiceAddress
+    {
+        public long ServiceAddressId { get; set; }
+        public string Provider { get; set; } = string.Empty;
+        public string Product { get; set; } = string.Empty;
+        public string Status { get; set; } = string.Empty;
+        public string HouseNumber { get; set; } = string.Empty;
+        public string StreetKey { get; set; } = string.Empty;
+        public string StreetAddress { get; set; } = string.Empty;
+        public string City { get; set; } = string.Empty;
+        public string State { get; set; } = string.Empty;
+        public string Postal { get; set; } = string.Empty;
+        public double Latitude { get; set; }
+        public double Longitude { get; set; }
+        public string MaxSpeed { get; set; } = string.Empty;
+        public string BuildingKey { get; set; } = string.Empty;
+        public string SourceFile { get; set; } = string.Empty;
+        public DateTime DateIngested { get; set; }
+
+        private const string Columns = "\"ServiceAddressId\", \"Provider\", \"Product\", \"Status\", \"HouseNumber\", \"StreetKey\", \"StreetAddress\", \"City\", \"State\", \"Postal\", \"Latitude\", \"Longitude\", \"MaxSpeed\", \"BuildingKey\", \"SourceFile\", \"DateIngested\"";
+
+        /// <summary>
+        /// How far a geocoded point may be from a listed building and still count as that building, when the street address doesn't match.
+        /// </summary>
+        public const double MaxDistanceMeters = 30;
+
+        /// <summary>
+        /// Lowercase the street name and drop everything but letters and digits, ex. "Pine Cliff" -> "pinecliff". Must match street_key() in the import script.
+        /// </summary>
+        public static string ToStreetKey(string streetName)
+        {
+            var key = new StringBuilder(streetName.Length);
+            foreach (var c in streetName)
+            {
+                if (char.IsAsciiLetterOrDigit(c))
+                {
+                    key.Append(char.ToLowerInvariant(c));
+                }
+            }
+            return key.ToString();
+        }
+
+        /// <summary>
+        /// The leading building number of a house number, without leading zeros, ex. "0512" -> "512", "512 1/2" -> "512", "1250A" -> "1250".
+        /// Only used when the exact house number doesn't match, because it can't tell 512 from 512 1/2.
+        /// </summary>
+        public static string ToHouseKey(string houseNumber)
+        {
+            var digits = Regex.Match(houseNumber.Trim(), @"^\d+").Value.TrimStart('0');
+            return digits.Length > 0 ? digits : string.Empty;
+        }
+
+        /// <summary>
+        /// The download speed in Mbps from a building list speed like "1.0G/1.0G" or "300.0M/300.0M", or 0 when it can't be read.
+        /// </summary>
+        public static int ParseMbps(string maxSpeed)
+        {
+            var match = Regex.Match(maxSpeed, @"^\s*(\d+(?:\.\d+)?)\s*([GM])", RegexOptions.IgnoreCase);
+            if (!match.Success || !decimal.TryParse(match.Groups[1].Value, System.Globalization.NumberStyles.Number, System.Globalization.CultureInfo.InvariantCulture, out var value))
+            {
+                return 0;
+            }
+            var mbps = char.ToUpperInvariant(match.Groups[2].Value[0]) is 'G' ? value * 1000 : value;
+            // Saturate rather than overflow on an absurd value, ex. a misaligned column.
+            return (int)Math.Min(mbps, int.MaxValue);
+        }
+
+        /// <summary>
+        /// How a lookup matched the listed addresses. Only an Exact match is precise enough to sell at the listed price.
+        /// </summary>
+        public enum MatchType { None, Exact, HouseNumber, Nearby }
+
+        public readonly record struct LookupResult(MatchType Match, ServiceAddress[] Addresses);
+
+        /// <summary>
+        /// Get the listed rows for a building by the provider's building key. Unlike ServiceAddressId, the key stays the same when the building lists are re-imported.
+        /// The import enforces one row per product and key, but callers treat this as a set so they never depend on which row comes back.
+        /// </summary>
+        public static async Task<ServiceAddress[]> GetAllByBuildingKeyAsync(string product, string buildingKey, string connectionString)
+        {
+            if (string.IsNullOrWhiteSpace(buildingKey))
+            {
+                return [];
+            }
+
+            await using var connection = new NpgsqlConnection(connectionString);
+
+            // The BuildingKey <> '' predicate lets the planner use the partial unique index for every plan, not just custom ones.
+            var result = await connection
+                .QueryAsync<ServiceAddress>($"SELECT {Columns} FROM public.\"ServiceAddresses\" WHERE \"Product\" = @product AND \"BuildingKey\" = @buildingKey AND \"BuildingKey\" <> ''",
+                new { product, buildingKey })
+                .ConfigureAwait(false);
+
+            return [.. result];
+        }
+
+        /// <summary>
+        /// Find the listed addresses matching a street address. Failing an exact house number, try the building number without suffixes or fractions,
+        /// and failing that the nearest listed building within MaxDistanceMeters of the point.
+        /// </summary>
+        public static async Task<LookupResult> LookupAsync(string houseNumber, string streetName, string postal, double latitude, double longitude, string connectionString)
+        {
+            await using var connection = new NpgsqlConnection(connectionString);
+
+            var streetKey = ToStreetKey(streetName);
+            if (!string.IsNullOrWhiteSpace(houseNumber) && !string.IsNullOrWhiteSpace(streetKey) && !string.IsNullOrWhiteSpace(postal))
+            {
+                var street = (await connection
+                    .QueryAsync<ServiceAddress>($"SELECT {Columns} FROM public.\"ServiceAddresses\" " +
+                    "WHERE \"Postal\" = @postal AND \"StreetKey\" = @streetKey",
+                    new { postal = postal.Trim(), streetKey })
+                    .ConfigureAwait(false)).ToArray();
+
+                var exact = street.Where(x => string.Equals(x.HouseNumber.Trim(), houseNumber.Trim(), StringComparison.OrdinalIgnoreCase)).ToArray();
+                if (exact.Length > 0)
+                {
+                    return new(MatchType.Exact, exact);
+                }
+
+                var houseKey = ToHouseKey(houseNumber);
+                var sameBuilding = houseKey.Length > 0 ? street.Where(x => ToHouseKey(x.HouseNumber) == houseKey).ToArray() : [];
+                if (sameBuilding.Length > 0)
+                {
+                    return new(MatchType.HouseNumber, sameBuilding);
+                }
+            }
+
+            if (latitude is 0 && longitude is 0)
+            {
+                return new(MatchType.None, []);
+            }
+
+            // Search a small box around the point using the index, then keep only the closest building's rows.
+            var latDelta = MaxDistanceMeters / 111_320d;
+            var lonDelta = MaxDistanceMeters / (111_320d * Math.Cos(latitude * Math.PI / 180));
+            var nearby = await connection
+                .QueryAsync<ServiceAddress>($"SELECT {Columns} FROM public.\"ServiceAddresses\" " +
+                "WHERE \"Latitude\" BETWEEN @minLat AND @maxLat AND \"Longitude\" BETWEEN @minLon AND @maxLon",
+                new { minLat = latitude - latDelta, maxLat = latitude + latDelta, minLon = longitude - lonDelta, maxLon = longitude + lonDelta })
+                .ConfigureAwait(false);
+
+            var closest = nearby
+                .Select(x => (Address: x, Meters: DistanceMeters(latitude, longitude, x.Latitude, x.Longitude)))
+                .Where(x => x.Meters <= MaxDistanceMeters)
+                .OrderBy(x => x.Meters)
+                .FirstOrDefault();
+
+            if (closest.Address is null)
+            {
+                return new(MatchType.None, []);
+            }
+
+            return new(MatchType.Nearby, [.. nearby.Where(x => x.Latitude == closest.Address.Latitude && x.Longitude == closest.Address.Longitude)]);
+        }
+
+        /// <summary>
+        /// Equirectangular approximation, accurate to well under a meter at these distances.
+        /// </summary>
+        public static double DistanceMeters(double lat1, double lon1, double lat2, double lon2)
+        {
+            var x = (lon2 - lon1) * Math.PI / 180 * Math.Cos((lat1 + lat2) / 2 * Math.PI / 180);
+            var y = (lat2 - lat1) * Math.PI / 180;
+            return Math.Sqrt(x * x + y * y) * 6_371_000;
+        }
+    }
+}
diff --git a/NumberSearch.DataAccess/ServiceAddresses.sql b/NumberSearch.DataAccess/ServiceAddresses.sql
new file mode 100644
index 00000000..1eb39909
--- /dev/null
+++ b/NumberSearch.DataAccess/ServiceAddresses.sql
@@ -0,0 +1,47 @@
+-- Address-level service availability, in support of https://acceleratenetworks.com/Internet.
+-- Replaces the FCC census block lookup, which showed providers for every address in a block rather than the addresses we can actually sell.
+-- Run this against the PostgresqlProd database with psql before deploying, then load the building lists with Ziply/import_ziply_building_list.py. Safe to run again.
+
+-- Stop at the first failed statement, however this file is run, so a failed CREATE never falls through to a later DROP.
+\set ON_ERROR_STOP on
+
+CREATE TABLE IF NOT EXISTS public."ServiceAddresses"
+(
+    "ServiceAddressId" bigserial NOT NULL,
+    "Provider" text NOT NULL DEFAULT '',
+    -- WFI (wholesale fiber internet) or EIA (ethernet internet access)
+    "Product" text NOT NULL DEFAULT '',
+    -- Sellable: both of the provider's serviceability flags agree, quote the listed price.
+    -- Confirm: only one flag is set, ask the customer to contact us before quoting.
+    -- Quote: on-net for a custom priced product like EIA.
+    "Status" text NOT NULL DEFAULT '',
+    "HouseNumber" text NOT NULL DEFAULT '',
+    -- Street name lowercased with everything but letters and digits removed, ex. "Pine Cliff" -> "pinecliff"
+    "StreetKey" text NOT NULL DEFAULT '',
+    "StreetAddress" text NOT NULL DEFAULT '',
+    "City" text NOT NULL DEFAULT '',
+    "State" text NOT NULL DEFAULT '',
+    "Postal" text NOT NULL DEFAULT '',
+    "Latitude" double precision NOT NULL DEFAULT 0,
+    "Longitude" double precision NOT NULL DEFAULT 0,
+    "MaxSpeed" text NOT NULL DEFAULT '',
+    "BuildingKey" text NOT NULL DEFAULT '',
+    "SourceFile" text NOT NULL DEFAULT '',
+    "DateIngested" timestamp without time zone NOT NULL DEFAULT now(),
+    CONSTRAINT "ServiceAddresses_pkey" PRIMARY KEY ("ServiceAddressId")
+);
+
+CREATE INDEX IF NOT EXISTS "ServiceAddresses_Address_idx" ON public."ServiceAddresses" ("Postal", "HouseNumber");
+CREATE INDEX IF NOT EXISTS "ServiceAddresses_Street_idx" ON public."ServiceAddresses" ("Postal", "StreetKey");
+-- One row per product and building, so Cart/Add re-qualifies the same building the Internet page offered. A list that breaks this fails the import, which leaves the existing rows in place.
+CREATE UNIQUE INDEX IF NOT EXISTS "ServiceAddresses_Product_BuildingKey_key" ON public."ServiceAddresses" ("Product", "BuildingKey") WHERE "BuildingKey" <> '';
+DROP INDEX IF EXISTS public."ServiceAddresses_BuildingKey_idx";
+CREATE INDEX IF NOT EXISTS "ServiceAddresses_Location_idx" ON public."ServiceAddresses" ("Latitude", "Longitude");
+
+ALTER TABLE public."ServiceAddresses" OWNER TO "numberSearch";
+
+-- The fiber internet tiers sold at WFI Sellable addresses. $15 off when bundled with any phone service, on a 2, 3 or 5 year term.
+INSERT INTO public."Services" ("ServiceId", "Name", "Price", "Description")
+VALUES ('cbcf5128-5164-40de-8dff-e71d0f152cab', 'Fiber Internet 300 Mbps', 75, '300/300 Mbps fiber internet on a 2, 3 or 5 year term. $15 off when bundled with phone service.'),
+       ('708c3885-6dab-4a60-9e42-05cf13530076', 'Fiber Internet 1 Gbps', 115, '1/1 Gbps fiber internet on a 2, 3 or 5 year term. $15 off when bundled with phone service.')
+ON CONFLICT ("ServiceId") DO NOTHING;
diff --git a/NumberSearch.DataAccess/Ziply/import_ziply_building_list.py b/NumberSearch.DataAccess/Ziply/import_ziply_building_list.py
new file mode 100644
index 00000000..c4d78d90
--- /dev/null
+++ b/NumberSearch.DataAccess/Ziply/import_ziply_building_list.py
@@ -0,0 +1,190 @@
+#!/usr/bin/env python3
+"""Load a Ziply Fiber building list (.xlsx) into public."ServiceAddresses".
+
+Usage: import_ziply_building_list.py WFI|EIA "<building list>.xlsx" [psql connection args...]
+  ex. import_ziply_building_list.py WFI "/WFI 24635_20260920050445.xlsx" -d numberSearch
+
+The lists are 500MB+ of inline string XML once unzipped, so rows are streamed and cleared as they
+are read rather than loaded with openpyxl. Peak memory is about 45MB for the 117k row WFI list, most of it the
+building keys held to catch duplicates. Only the rows we can sell
+or quote are kept, and the previous rows for the same product are replaced in a single transaction.
+Uses only the standard library and psql.
+"""
+import csv
+import os
+import re
+import subprocess
+import sys
+import tempfile
+import zipfile
+from xml.etree.ElementTree import iterparse
+
+NS = '{http://schemas.openxmlformats.org/spreadsheetml/2006/main}'
+COLUMNS = ['Provider', 'Product', 'Status', 'HouseNumber', 'StreetKey', 'StreetAddress', 'City', 'State',
+           'Postal', 'Latitude', 'Longitude', 'MaxSpeed', 'BuildingKey', 'SourceFile']
+
+
+def street_key(name):
+    # Must match ServiceAddress.ToStreetKey in NumberSearch.DataAccess.
+    return re.sub(r'[^a-z0-9]', '', name.lower())
+
+
+def column_index(ref):
+    n = 0
+    for ch in re.match(r'[A-Z]+', ref).group():
+        n = n * 26 + ord(ch) - 64
+    return n - 1
+
+
+def shared_strings(z):
+    """The workbook's shared string table. Ziply's exports use inline strings, but a list re-saved in Excel uses this."""
+    if 'xl/sharedStrings.xml' not in z.namelist():
+        return []
+    strings = []
+    with z.open('xl/sharedStrings.xml') as f:
+        for _, el in iterparse(f, events=('end',)):
+            if el.tag == NS + 'si':
+                strings.append(''.join(t.text or '' for t in el.iter(NS + 't')))
+                el.clear()
+    return strings
+
+
+def cell_text(c, strings):
+    if c.get('t') == 's':
+        v = c.find(NS + 'v')
+        return strings[int(v.text)] if v is not None and v.text else ''
+    text = ''.join(t.text or '' for t in c.iter(NS + 't'))
+    if not text:
+        v = c.find(NS + 'v')
+        text = v.text or '' if v is not None else ''
+    return text
+
+
+class NoHeader(Exception):
+    pass
+
+
+def rows(path):
+    """Yield each row after the header as a dict keyed by column name."""
+    header = None
+    with zipfile.ZipFile(path) as z:
+        strings = shared_strings(z)
+        with z.open('xl/worksheets/sheet1.xml') as sheet:
+            for _, el in iterparse(sheet, events=('end',)):
+                if el.tag != NS + 'row':
+                    continue
+                values = {}
+                for position, c in enumerate(el.findall(NS + 'c')):
+                    # The cell reference is optional, in which case cells are in column order.
+                    ref = c.get('r')
+                    values[column_index(ref) if ref else position] = cell_text(c, strings).strip()
+                el.clear()
+                if header is None:
+                    if 'Building Name' in values.values() and 'Street Address' in values.values():
+                        header = values
+                    continue
+                if values:
+                    yield {name: values.get(i, '') for i, name in header.items()}
+    if header is None:
+        raise NoHeader(f'No header row with "Building Name" and "Street Address" found in {path}. Is this a Ziply building list?')
+
+
+def list_rows(path):
+    """rows(), but reading the header before any row is written so a missing header fails before the database is touched."""
+    it = rows(path)
+    first = next(it, None)
+    if first is None:
+        return iter(())
+    return _chain(first, it)
+
+
+def _chain(first, it):
+    yield first
+    yield from it
+
+
+def status(product, row):
+    if product == 'WFI':
+        serviceable = row.get('BFI/WFI serviceable') == 'Y'
+        offered = row.get('PRODUCT') == 'BFI/WFI'
+        if serviceable and offered:
+            return 'Sellable'
+        if serviceable or offered:
+            return 'Confirm'
+        return None
+    return 'Quote' if row.get('EIA On-Net') == 'Y' else None
+
+
+def main():
+    if len(sys.argv) < 3 or sys.argv[1] not in ('WFI', 'EIA'):
+        sys.exit(__doc__)
+    product, path, psql_args = sys.argv[1], sys.argv[2], sys.argv[3:]
+    source = os.path.basename(path)
+    kept = skipped = blank_sellable = 0
+    # Cart/Add re-qualifies a building by its key, so each key must be one row. Checked here so a bad list fails before the database is touched.
+    seen_keys = {}
+    duplicate_keys = []
+
+    with tempfile.NamedTemporaryFile('w', newline='', suffix='.csv', delete=False) as out:
+        # Quote everything so empty values load as empty strings rather than NULL.
+        writer = csv.writer(out, quoting=csv.QUOTE_ALL)
+        try:
+            listed = list_rows(path)
+        except NoHeader as e:
+            os.unlink(out.name)
+            sys.exit(f'{e} Leaving the existing rows in place.')
+        for row in listed:
+            s = status(product, row)
+            if s is None:
+                skipped += 1
+                continue
+            try:
+                lat, lon = float(row.get('Latitude') or 0), float(row.get('Longitude') or 0)
+            except ValueError:
+                lat = lon = 0.0
+            key = row.get('C2F Building Key', '')
+            if key:
+                if key in seen_keys and len(duplicate_keys) < 5:
+                    duplicate_keys.append(f"{key} ({seen_keys[key]} and {row.get('Street Address', '').strip()})")
+                seen_keys.setdefault(key, row.get('Street Address', '').strip())
+            elif s == 'Sellable':
+                blank_sellable += 1
+            writer.writerow([row.get('Provider') or 'Ziply Fiber', product, s, row.get('Primary Number', ''),
+                             street_key(row.get('Street Name', '')), row.get('Street Address', ''),
+                             row.get('City', ''), row.get('State', ''), row.get('Postal', '')[:5], lat, lon,
+                             row.get('BFI Max Serviceable Speed', ''), row.get('C2F Building Key', ''), source])
+            kept += 1
+
+    if duplicate_keys:
+        os.unlink(out.name)
+        sys.exit(f'{path} lists the same C2F Building Key on more than one {product} row, ex. {"; ".join(duplicate_keys)}. '
+                 'Leaving the existing rows in place.')
+
+    if blank_sellable:
+        print(f'Warning: {blank_sellable} Sellable {product} rows have no C2F Building Key. The Internet page will ask those customers to contact us.')
+
+    if kept == 0:
+        os.unlink(out.name)
+        sys.exit(f'Found the header in {path} but no {product} rows we can sell or quote, leaving the existing rows in place.')
+
+    columns = ', '.join(f'"{c}"' for c in COLUMNS)
+    script = (
+        'BEGIN;\n'
+        f"DELETE FROM public.\"ServiceAddresses\" WHERE \"Product\" = '{product}';\n"
+        f"\\copy public.\"ServiceAddresses\" ({columns}) FROM '{out.name}' WITH (FORMAT csv)\n"
+        'COMMIT;\n'
+        'ANALYZE public."ServiceAddresses";\n'
+    )
+    try:
+        subprocess.run(['psql', '-v', 'ON_ERROR_STOP=1', *psql_args], input=script, text=True, check=True)
+    except subprocess.CalledProcessError:
+        sys.exit(f'psql failed loading {source}, see the error above. The import runs in one transaction, so the existing rows are still in place.')
+    except FileNotFoundError:
+        sys.exit(f'psql is not installed or not on the PATH, so {source} was not loaded. The existing rows are still in place.')
+    finally:
+        os.unlink(out.name)
+    print(f'Loaded {kept} {product} addresses from {source}, skipped {skipped} not serviceable.')
+
+
+if __name__ == '__main__':
+    main()
diff --git a/NumberSearch.Mvc/Controllers/CartAPIController.cs b/NumberSearch.Mvc/Controllers/CartAPIController.cs
index c6b4b1d3..f218bbea 100644
--- a/NumberSearch.Mvc/Controllers/CartAPIController.cs
+++ b/NumberSearch.Mvc/Controllers/CartAPIController.cs
@@ -441,7 +441,7 @@ public async Task<IActionResult> RemoveNewClientPhoneMenuOptionAsync([FromRoute]
         [ApiExplorerSettings(IgnoreApi = true)]
         [HttpGet("Cart/Add/{type}/{id}/{quantity}")]
         [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
-        public async Task<IActionResult> AddToCartAsync([FromRoute] string type, [FromRoute] string id, [FromRoute] int quantity)
+        public async Task<IActionResult> AddToCartAsync([FromRoute] string type, [FromRoute] string id, [FromRoute] int quantity, [FromQuery] string? buildingKey)
         {
             if (!ModelState.IsValid && !string.IsNullOrWhiteSpace(type) && !string.IsNullOrWhiteSpace(id))
             {
@@ -478,7 +478,19 @@ public async Task<IActionResult> AddToCartAsync([FromRoute] string type, [FromRo
                     break;
                 case "Service":
                     var checkService = Guid.TryParse(id, out var serviceId);
-                    if (checkService)
+                    if (checkService && InternetBundle.IsFiberInternet(serviceId))
+                    {
+                        // Fiber can only be bought at an address the Internet page qualified, so we know which building we're installing at.
+                        // Ask whether any listed row for the building can sell this tier, the same rule the Internet page used to offer it.
+                        var rows = await ServiceAddress.GetAllByBuildingKeyAsync("WFI", buildingKey?.Trim() ?? string.Empty, mvcConfiguration.PostgresqlProd);
+                        var qualified = InternetBundle.QualifyingAddress(serviceId, rows);
+                        if (qualified is null)
+                        {
+                            return BadRequest("Check your address on the Internet page before adding fiber internet to your cart.");
+                        }
+                        result = await cart.BuyServiceAsync(serviceId, quantity, qualified);
+                    }
+                    else if (checkService)
                     {
                         result = await cart.BuyServiceAsync(serviceId, quantity);
                     }
@@ -907,7 +919,7 @@ public async Task<IActionResult> BuyProductAsync(Guid productId, int Quantity)
             return BadRequest($"Failed to purchase product {productId}.");
         }
 
-        public async Task<IActionResult> BuyServiceAsync(Guid serviceId, int Quantity)
+        public async Task<IActionResult> BuyServiceAsync(Guid serviceId, int Quantity, ServiceAddress? qualifiedAt = null)
         {
             if (!ModelState.IsValid)
             {
@@ -926,8 +938,22 @@ public async Task<IActionResult> BuyServiceAsync(Guid serviceId, int Quantity)
 
                 await httpContext.Session.LoadAsync();
                 var cart = Cart.GetFromSession(httpContext.Session);
+
+                // An order records a single fiber service address, so fiber at a second building needs its own order.
+                if (qualifiedAt is not null && InternetBundle.FiberConnections(cart.ProductOrders) > 0
+                    && !string.IsNullOrWhiteSpace(cart.Order.InternetBuildingKey) && cart.Order.InternetBuildingKey != qualifiedAt.BuildingKey)
+                {
+                    return new BadRequestObjectResult($"Your cart already has fiber internet at {cart.Order.InternetServiceAddress}. Please place a separate order for fiber at another address.");
+                }
+
                 var checkAdd = cart.AddService(ref service, ref productOrder);
 
+                if (qualifiedAt is not null)
+                {
+                    cart.Order.InternetServiceAddress = $"{qualifiedAt.StreetAddress.Trim()}, {qualifiedAt.City}, {qualifiedAt.State} {qualifiedAt.Postal}";
+                    cart.Order.InternetBuildingKey = qualifiedAt.BuildingKey;
+                }
+
                 var stdSeat = new Guid("16e2c639-445b-4ae6-9925-07300318206b");
                 var concurrentSeat = new Guid("48eb4627-8692-4a3b-8be1-be64bbeea534");
 
diff --git a/NumberSearch.Mvc/Controllers/CartController.cs b/NumberSearch.Mvc/Controllers/CartController.cs
index b2390989..a7c8c66a 100644
--- a/NumberSearch.Mvc/Controllers/CartController.cs
+++ b/NumberSearch.Mvc/Controllers/CartController.cs
@@ -688,6 +688,9 @@ public async Task<IActionResult> SubmitAsync(CartResult input)
                 await HttpContext.Session.LoadAsync();
                 Cart cart = Cart.GetFromSession(HttpContext.Session);
 
+                // The qualified fiber address is set by Cart/Add, never by the form, so carry it over from the session.
+                order.InternetServiceAddress = cart.Order?.InternetServiceAddress ?? string.Empty;
+                order.InternetBuildingKey = cart.Order?.InternetBuildingKey ?? string.Empty;
                 cart.Order = order;
 
                 // This is purely so that we can isolate the state of this call when it fails out.
@@ -828,6 +831,31 @@ public async Task<IActionResult> SubmitAsync(CartResult input)
                     order.VoiceProductAcknowledgedUtc = DateTime.Now;
                 }
 
+                if (InternetBundle.FiberConnections(cart.ProductOrders) > 0)
+                {
+                    if (string.IsNullOrWhiteSpace(order.InternetServiceAddress))
+                    {
+                        _ = cart.SetToSession(HttpContext.Session);
+                        Log.Error("[Checkout] Fiber internet is in the cart without a qualified service address.");
+                        var message = "💀 Please check your address on the Internet page before ordering fiber internet.";
+                        return View("Order", new CartResult { Message = message, Cart = cart });
+                    }
+
+                    if (!InternetBundle.TermYears.Contains(order.InternetTermYears))
+                    {
+                        _ = cart.SetToSession(HttpContext.Session);
+                        Log.Error("[Checkout] No contract term was selected for an order containing fiber internet.");
+                        var message = "💀 Please select a 2, 3 or 5 year term for your fiber internet before submitting your order.";
+                        return View("Order", new CartResult { Message = message, Cart = cart });
+                    }
+                }
+                else
+                {
+                    order.InternetTermYears = 0;
+                    order.InternetServiceAddress = string.Empty;
+                    order.InternetBuildingKey = string.Empty;
+                }
+
                 order.DateSubmitted = DateTime.Now;
 
                 if (order.OrderId != Guid.Empty)
@@ -1233,7 +1261,7 @@ public static ProductOrderSummary GetInvoiceItemsFromProductOrders(ref Order ord
                         reoccuringItems.Add(new Line_Items
                         {
                             product_key = service.Name,
-                            notes = $"{service.Description}",
+                            notes = InternetBundle.IsFiberInternet(service.ServiceId) ? InternetBundle.FiberNotes(order.InternetTermYears, order.InternetServiceAddress, service.Description) : $"{service.Description}",
                             cost = service.Price,
                             quantity = productOrder.Quantity
                         });
@@ -1328,13 +1356,17 @@ public static ProductOrderSummary GetInvoiceItemsFromProductOrders(ref Order ord
                                     }
                                 }
                                 totalCost -= partnerDiscount;
-                                reoccuringItems.Add(new Line_Items
+                                // With no 5G in the order the Partner coupon only qualifies fiber for the bundle discount, which has its own line.
+                                if (partnerDiscount > 0)
                                 {
-                                    product_key = coupon.Name,
-                                    notes = coupon.Description,
-                                    cost = partnerDiscount * -1,
-                                    quantity = 1
-                                });
+                                    reoccuringItems.Add(new Line_Items
+                                    {
+                                        product_key = coupon.Name,
+                                        notes = coupon.Description,
+                                        cost = partnerDiscount * -1,
+                                        quantity = 1
+                                    });
+                                }
                             }
                         }
                         else
@@ -1353,6 +1385,18 @@ public static ProductOrderSummary GetInvoiceItemsFromProductOrders(ref Order ord
                 }
             }
 
+            var bundleOrders = cart?.ProductOrders ?? [];
+            if (InternetBundle.Discount(bundleOrders) > 0)
+            {
+                reoccuringItems.Add(new Line_Items
+                {
+                    product_key = InternetBundle.Name,
+                    notes = InternetBundle.IsPartnerOnly(bundleOrders) ? InternetBundle.PartnerDescription : InternetBundle.Description,
+                    cost = InternetBundle.DiscountPerConnection * -1,
+                    quantity = InternetBundle.FiberConnections(bundleOrders)
+                });
+            }
+
             return new ProductOrderSummary(emailSubject ?? string.Empty, totalCost, totalPortingCost, totalNumberPurchasingCost);
         }
 
diff --git a/NumberSearch.Mvc/Controllers/Endpoints.cs b/NumberSearch.Mvc/Controllers/Endpoints.cs
index 40f9802b..093dd7e7 100644
--- a/NumberSearch.Mvc/Controllers/Endpoints.cs
+++ b/NumberSearch.Mvc/Controllers/Endpoints.cs
@@ -1,18 +1,16 @@
 using Microsoft.AspNetCore.Http.HttpResults;
 using Microsoft.AspNetCore.Mvc;
 
-using nietras.SeparatedValues;
-
 using NumberSearch.DataAccess;
-using NumberSearch.DataAccess.FCC;
 using NumberSearch.DataAccess.FusionPBX;
 using NumberSearch.Mvc.Models;
 
 using PhoneNumbersNA;
 
+using Serilog;
+
 using System.Collections.Concurrent;
 using System.ComponentModel.DataAnnotations;
-using System.IO.Compression;
 
 using ZLinq;
 
@@ -205,122 +203,84 @@ await Parallel.ForEachAsync(relatedNumbers, async (number, token) =>
         }
 
         /// <summary>
-        /// Represents the speeds for a provider in a specific geographic area.
+        /// A service we can sell at an address.
         /// </summary>
-        /// <param name="geoid"></param>
-        /// <param name="frn"></param>
-        /// <param name="provider"></param>
-        /// <param name="technology"></param>
-        /// <param name="techdesc"></param>
-        /// <param name="down"></param>
-        /// <param name="up"></param>
-        /// <param name="serviceId"></param>
-        public readonly record struct ProviderGeoSpeeds(string geoid, string frn, string provider, string technology, string techdesc, decimal down, decimal up, Guid serviceId);
+        /// <param name="product">WFI (fiber internet) or EIA (ethernet internet access).</param>
+        /// <param name="status">Sellable (add to cart at the listed price), Confirm (contact us to confirm availability), or Quote (custom priced, request a quote).</param>
+        /// <param name="name">The name of the service.</param>
+        /// <param name="speed">The symmetrical speed of the service.</param>
+        /// <param name="price">The monthly price in dollars, or 0 when the price must be quoted.</param>
+        /// <param name="serviceId">The ServiceId to add to the cart, or empty when it can't be added to the cart directly.</param>
+        /// <param name="note">Terms and details to show alongside the service.</param>
+        public readonly record struct InternetOffer(string product, string status, string name, string speed, int price, Guid serviceId, string note);
 
         /// <summary>
-        /// Represents the technical description for a specific technology.
+        /// The services available at an address.
         /// </summary>
-        /// <param name="code">The code for the technology.</param>
-        /// <param name="name">The name of the technology.</param>
-        /// <param name="description">The description of the technology.</param>
-        public readonly record struct TechDesc(string code, string name, string description);
+        /// <param name="serviceable">Whether any service is available at the address.</param>
+        /// <param name="matchedAddress">The address from the provider's building list that matched the query, to show the customer what we checked.</param>
+        /// <param name="exactMatch">Whether the matched address is the one searched for, rather than the same building number or the nearest listed building.</param>
+        /// <param name="matchType">How the address matched: Exact, HouseNumber (same building number on the street, ex. 512 for 512 1/2), Nearby (the closest listed building within 30m), or None.</param>
+        /// <param name="buildingKey">The provider's key for the listed building, to pass to Cart/Add when adding a Sellable fiber tier, or empty.</param>
+        /// <param name="offers">The services available at the address.</param>
+        public readonly record struct InternetAvailability(bool serviceable, string matchedAddress, bool exactMatch, string matchType, string buildingKey, InternetOffer[] offers);
+
+        private const string FiberTerms = "2, 3 or 5 year term. $15/mo off when bundled with any phone service.";
 
         /// <summary>
-        /// Looks up geographic information for a specific state.
+        /// Look up the internet services we can sell at an address, using the building lists from our providers.
         /// </summary>
-        /// <param name="state">The state for which to look up geographic information.</param>
-        /// <param name="geoid">The geographic identifier within that state.</param>
+        /// <param name="houseNumber">The house or building number, ex. 1250</param>
+        /// <param name="street">The street name without the direction or suffix, ex. 1st</param>
+        /// <param name="postal">The 5 digit ZIP code, ex. 98134</param>
+        /// <param name="latitude">The latitude of the address, used when the street address doesn't match exactly.</param>
+        /// <param name="longitude">The longitude of the address, used when the street address doesn't match exactly.</param>
         /// <param name="mvcConfiguration">The configuration for the application.</param>
-        /// <returns>An array of ProviderGeoSpeeds.</returns>
-        public static async Task<Results<Ok<ProviderGeoSpeeds[]>, BadRequest<string>>> FCCStateGeoIdLookup([Required] string state, string geoid, [FromServices] MvcConfiguration mvcConfiguration)
+        /// <returns>The services available at the address.</returns>
+        public static async Task<Results<Ok<InternetAvailability>, BadRequest<string>>> InternetAvailabilityAsync(string? houseNumber, string? street, string? postal, double? latitude, double? longitude, [FromServices] MvcConfiguration mvcConfiguration)
         {
-            if (string.IsNullOrWhiteSpace(state))
+            if ((string.IsNullOrWhiteSpace(houseNumber) || string.IsNullOrWhiteSpace(street) || string.IsNullOrWhiteSpace(postal)) && (latitude is null || longitude is null))
             {
-                return TypedResults.BadRequest("No state provided (ex: Washington). Please try a different query. 🥺👉👈");
+                return TypedResults.BadRequest("Provide a houseNumber, street, and postal code or a latitude and longitude (ex: houseNumber=1250&street=1st&postal=98134). Please try a different query. 🥺👉👈");
             }
 
-            // Add portable numbers to cart in bulk
-            if (!string.IsNullOrWhiteSpace(geoid))
-            {
-                var canidates = new List<ProviderGeoSpeeds>();
-
-                var techDesc = new List<TechDesc>() {
-                    new("10", "Copper", "Fixed wireline service using copper wire (e.g., Asymmetric or Symmetric DSL, ethernet over copper, T-1, etc.)."),
-                    new("40","Cable","Fixed wireline service using coaxial cable or hybrid fiber-coaxial (e.g., DOCSISx)."),
-                    new("50","Fiber to the Premises","Fixed wireline service using fiber to the home or business end user, but does not include \"fiber to the curb\"."),
-                    new("70","Unlicensed Fixed Wireless","Fixed terrestrial wireless service using entirely unlicensed spectrum, including services provided over WiFi as a fixed solution."),
-                    new("71","Licensed Fixed Wireless","Fixed wireless service using entirely licensed spectrum (including priority access licenses in the 3.5 GHz band) or a hybrid of licensed, unlicensed, and licensed-by-rule spectrum to make last-mile connections to fixed locations. This includes service provided over a 4G LTE or 5G-NR mobile network but sold as a fixed solution."),
-                    new("72","LBR Fixed Wireless","Fixed wireless services using entirely licensed-by-rule spectrum or a hybrid of licensed-by-rule and unlicensed spectrum to make last-mile connections to fixed locations. Licensed-by-rule spectrum users include operators providing last-mile connections through general authorized access (GAA) in the 3.5 GHz Citizens Broadband Radio Service (CBRS) band."),};
-
-                var result = await ListAsOfDates.GetAsync(mvcConfiguration.FCCUsername.AsMemory(), mvcConfiguration.FCCAPIToken.AsMemory());
-                var date = result.data.AsValueEnumerable().OrderByDescending(x => x.as_of_date).Where(x => x.data_type is "availability").FirstOrDefault();
-                var listing = await ListAvailabilityData.GetAsync(date.as_of_date.AsMemory(), mvcConfiguration.FCCUsername.AsMemory(), mvcConfiguration.FCCAPIToken.AsMemory());
-                var toGet = listing.data.Where(x => x.state_name.Equals(state, StringComparison.InvariantCultureIgnoreCase)).Where(x => x.technology_code is not "60" && x.technology_code is not "61");
-                string downloadsPath = Path.GetTempPath();
-                var services = await Service.GetAllAsync(mvcConfiguration.PostgresqlProd);
-                var toLoop = toGet.ToArray();
-                foreach (var item in toLoop)
-                {
-                    var files = Directory.GetFiles(downloadsPath);
-                    var file = files.FirstOrDefault(x => x.Contains(item.file_name) && x.EndsWith(".csv"));
+            var lookup = await ServiceAddress.LookupAsync(houseNumber ?? string.Empty, street ?? string.Empty, postal ?? string.Empty, latitude ?? 0, longitude ?? 0, mvcConfiguration.PostgresqlProd);
+            var exact = lookup.Match is ServiceAddress.MatchType.Exact;
+            var offers = new List<InternetOffer>();
 
-                    // Download and unzip, if required.
-                    if (string.IsNullOrWhiteSpace(file))
-                    {
-                        string filePath = await item.DownloadFileAsync(downloadsPath, mvcConfiguration.FCCUsername.AsMemory(), mvcConfiguration.FCCAPIToken.AsMemory());
-                        await ZipFile.ExtractToDirectoryAsync(filePath, downloadsPath);
-                        System.IO.File.Delete(filePath);
-                        files = Directory.GetFiles(downloadsPath);
-                        file = files.FirstOrDefault(x => x.Contains(item.file_name) && x.EndsWith(".csv"));
-                    }
-
-                    if (!string.IsNullOrWhiteSpace(file))
-                    {
-                        using var reader = Sep.Reader().FromFile(file);
-                        foreach (var readRow in reader)
-                        {
-                            if (MemoryExtensions.Equals(readRow["block_geoid"].Span, geoid.AsSpan(), StringComparison.Ordinal))
-                            {
-                                var id = readRow["block_geoid"].ToString();
-                                var frn = readRow["frn"].ToString();
-                                var provider = readRow["brand_name"].ToString();
-                                var down = readRow["max_advertised_download_speed"].Parse<decimal>();
-                                var up = readRow["max_advertised_upload_speed"].Parse<decimal>();
-                                var desc = techDesc.FirstOrDefault(x => x.code == item.technology_code);
-                                var service = services.FirstOrDefault(x => x.Name == item.technology_code_desc);
-                                canidates.Add(new ProviderGeoSpeeds(id, frn, provider, item.technology_code_desc, desc.description, down, up, service.ServiceId));
-                            }
-                        }
-                    }
-                }
-
-                var providers = canidates.AsValueEnumerable().Select(x => x.provider).Distinct();
-                var results = new List<ProviderGeoSpeeds>();
-                var quantumPresent = providers.Any(x => x is "Quantum Fiber");
-                foreach (var p in providers)
-                {
-                    var winner = canidates.AsValueEnumerable().Where(x => x.provider == p).MaxBy(x => x.up);
-                    if (!(winner.provider is "CenturyLink" && quantumPresent))
-                    {
-                        results.Add(winner);
-                    }
-                }
-
-                var techs = results.AsValueEnumerable().Select(x => x.technology).Distinct();
-                var singlePerTech = new List<ProviderGeoSpeeds>();
+            var wfi = lookup.Addresses.AsValueEnumerable().Where(x => x.Product is "WFI").ToArray();
+            // Only an exact address match is sold at the listed price. The same building number or a nearby building might be the building next door.
+            // The fastest row that can sell the slowest tier qualifies every tier any row can, since CanSellAt only differs between rows by speed.
+            // Cart/Add re-qualifies the same building by its key with the same rule, so the two always agree.
+            var sellable = exact ? InternetBundle.QualifyingAddress(InternetBundle.FiberInternet300ServiceId, wfi) : null;
+            var tiers = sellable is null ? [] : new[]
+            {
+                new InternetOffer("WFI", "Sellable", "Fiber Internet 300 Mbps", "300/300 Mbps", 75, InternetBundle.FiberInternet300ServiceId, FiberTerms),
+                new InternetOffer("WFI", "Sellable", "Fiber Internet 1 Gbps", "1/1 Gbps", 115, InternetBundle.FiberInternet1GServiceId, FiberTerms),
+            }.AsValueEnumerable().Where(x => InternetBundle.CanSellAt(x.serviceId, sellable)).ToArray();
 
-                foreach (var p in techs)
+            if (tiers.Length > 0)
+            {
+                offers.AddRange(tiers);
+            }
+            else if (wfi.Length > 0)
+            {
+                foreach (var unsellable in exact ? wfi.AsValueEnumerable().Where(x => x.Status is "Sellable").ToArray() : [])
                 {
-                    var speedWinner = canidates.AsValueEnumerable().Where(x => x.technology == p).MaxBy(x => x.up);
-                    singlePerTech.Add(speedWinner);
+                    Log.Warning("[Internet] Sellable building {BuildingKey} at {StreetAddress} {Postal} is listed at {MaxSpeed}, which is below every fiber tier, can't be read, or has no building key.", unsellable.BuildingKey, unsellable.StreetAddress, unsellable.Postal, unsellable.MaxSpeed);
                 }
-
-                return TypedResults.Ok(singlePerTech.AsValueEnumerable().Where(x => x.up > 0).OrderByDescending(x => x.down).ToArray());
+                offers.Add(new("WFI", "Confirm", "Fiber Internet", "Up to 1/1 Gbps", 0, Guid.Empty, "Fiber may be available here. Contact us to confirm before ordering."));
             }
-            else
+
+            if (lookup.Addresses.AsValueEnumerable().Any(x => x.Product is "EIA" && x.Status is "Quote"))
             {
-                return TypedResults.BadRequest("No geoid provided (ex: 530330060001014). Please try a different query. 🥺👉👈");
+                offers.Add(new("EIA", "Quote", "Ethernet Internet Access", "Dedicated, custom speeds", 0, Guid.Empty, "Dedicated fiber with an SLA. Contact us for a quote."));
             }
+
+            // Name the building the fiber offers came from, so the address shown always matches the offers.
+            var shown = tiers.Length > 0 ? sellable : wfi.AsValueEnumerable().FirstOrDefault() ?? lookup.Addresses.AsValueEnumerable().FirstOrDefault();
+            var matched = shown is null ? string.Empty : $"{shown.StreetAddress.Trim()}, {shown.City}, {shown.State} {shown.Postal}";
+            return TypedResults.Ok(new InternetAvailability(offers.Count > 0, matched, exact, lookup.Match.ToString(), tiers.Length > 0 ? sellable!.BuildingKey : string.Empty, offers.ToArray()));
         }
 
         /// <summary>
diff --git a/NumberSearch.Mvc/Startup.cs b/NumberSearch.Mvc/Startup.cs
index be1939a6..fea20a87 100644
--- a/NumberSearch.Mvc/Startup.cs
+++ b/NumberSearch.Mvc/Startup.cs
@@ -272,11 +272,11 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
                     return Task.CompletedTask;
                 });
 
-                endpoints.MapGet("/Internet/Providers/Availability​", Endpoints.FCCStateGeoIdLookup)
+                endpoints.MapGet("/Internet/Availability", Endpoints.InternetAvailabilityAsync)
                 .AddOpenApiOperationTransformer((operation, context, ct) =>
                 {
-                    operation.Summary = "Lookup internet provider availability by state and geo ID";
-                    operation.Description = "Get information about internet provider availability in a specific state and geographic area.";
+                    operation.Summary = "Lookup the internet services available at an address";
+                    operation.Description = "Get the fiber and ethernet internet services Accelerate Networks can sell at a specific address, from our providers' building lists. Match by house number, street name, and ZIP code, or by latitude and longitude.";
                     return Task.CompletedTask;
                 }).CacheOutput();
 
diff --git a/NumberSearch.Mvc/Views/Cart/Order.cshtml b/NumberSearch.Mvc/Views/Cart/Order.cshtml
index be32abef..9ca057e5 100644
--- a/NumberSearch.Mvc/Views/Cart/Order.cshtml
+++ b/NumberSearch.Mvc/Views/Cart/Order.cshtml
@@ -1,4 +1,5 @@
-@using PhoneNumbersNA
+@using NumberSearch.DataAccess
+@using PhoneNumbersNA
 @using System
 @model NumberSearch.Mvc.CartResult;
 
@@ -14,6 +15,9 @@
     var verified = Model?.Cart?.VerifiedPhoneNumbers?.OrderByDescending(x => x.VerifiedDialedNumber).ToArray();
     var coupons = Model?.Cart?.Coupons?.ToArray();
     var productOrders = Model?.Cart?.ProductOrdersToDictionary();
+    var productOrderList = Model?.Cart?.ProductOrders ?? [];
+    var fiberConnections = InternetBundle.FiberConnections(productOrderList);
+    var bundleDiscount = InternetBundle.Discount(productOrderList);
 
     var stdSeatId = new Guid("16e2c639-445b-4ae6-9925-07300318206b");
     var concurrentSeatId = new Guid("48eb4627-8692-4a3b-8be1-be64bbeea534");
@@ -536,6 +540,12 @@
                                     localTotal = coupon.Value;
                                     couponTotal += localTotal * -1;
                                 }
+
+                                // With no 5G in the order the Partner coupon only qualifies fiber for the bundle discount, which has its own line.
+                                if (coupon.Type == "Service" && localTotal == 0)
+                                {
+                                    continue;
+                                }
                                 <li class="list-group-item d-flex justify-content-between lh-condensed bg-light">
                                     <div class="text-success">
                                         <h6 class="my-0">
@@ -547,6 +557,24 @@
                                 </li>
                             }
                         }
+
+                        if (bundleDiscount > 0)
+                        {
+                            couponTotal += bundleDiscount * -1;
+                            <li class="list-group-item d-flex justify-content-between lh-condensed bg-light">
+                                <div class="text-success">
+                                    <h6 class="my-0">
+                                        @InternetBundle.Name
+                                        @if (fiberConnections > 1)
+                                        {
+                                            <small>x @fiberConnections</small>
+                                        }
+                                    </h6>
+                                    <small class="text-success">@(InternetBundle.IsPartnerOnly(productOrderList) ? InternetBundle.PartnerDescription : InternetBundle.Description)</small>
+                                </div>
+                                <span class="text-success">$@bundleDiscount</span>
+                            </li>
+                        }
                     }
                     <li class="list-group-item d-flex justify-content-between lh-condensed">
                         <div>
@@ -656,6 +684,28 @@
                         </small>
                     </div>
 
+                    @if (fiberConnections > 0)
+                    {
+                        var selectedTerm = Model?.Cart?.Order?.InternetTermYears ?? 0;
+                        <div class="mb-3">
+                            <label for="internetTermYears">Fiber Internet Term</label>
+                            <select name="Cart.Order.InternetTermYears" class="form-control" id="internetTermYears" required disabled="@submitted">
+                                <option value="" selected="@(selectedTerm == 0)" disabled>Select a term</option>
+                                @foreach (var years in InternetBundle.TermYears)
+                                {
+                                    <option value="@years" selected="@(selectedTerm == years)">@years years</option>
+                                }
+                            </select>
+                            <small class="text-muted">
+                                Fiber internet is billed monthly on a 2, 3 or 5 year term
+                            </small>
+                            @if (!string.IsNullOrWhiteSpace(Model?.Cart?.Order?.InternetServiceAddress))
+                            {
+                                <div><small class="text-muted">Service address: @Model?.Cart?.Order?.InternetServiceAddress</small></div>
+                            }
+                        </div>
+                    }
+
                     <div class="row">
                         <div class="col-md-6">
                             <div class="mb-3">
diff --git a/NumberSearch.Mvc/Views/Services/Internet.cshtml b/NumberSearch.Mvc/Views/Services/Internet.cshtml
index 7b404bd4..5a77e10c 100644
--- a/NumberSearch.Mvc/Views/Services/Internet.cshtml
+++ b/NumberSearch.Mvc/Views/Services/Internet.cshtml
@@ -6,163 +6,90 @@
 }
 
 <script type="text/javascript">
+    function escapeHtml(text) {
+        const div = document.createElement('div');
+        div.textContent = text;
+        return div.innerHTML;
+    }
+
     function handleSearchQuery(textBox) {
         const route = 'https://geocode.arcgis.com/arcgis/rest/services/World/GeocodeServer/suggest?text=';
-        const suffix = '&maxSuggestions=5&countryCode=USA,CAN&f=pjson';
-        fetch(`${route}${textBox.value}${suffix}`)
-            .then(
-                function (response) {
-                    if (response.status !== 200) {
-                        console.log('Looks like there was a problem. Status Code: ' +
-                            response.status);
-                        return;
-                    }
-
-                    // Examine the text in the response
-                    response.json().then(function (data) {
-                        let options = '';
-                        let longestResult = 0;
-                        if (data.suggestions != undefined) {
-                            for (let i = 0; i < data.suggestions.length; i++) {
-                                options += `<li class='list-group-item' onclick='setAddress(this.innerHTML)'>${data.suggestions[i].text}</li>`;
-                                if (longestResult < data.suggestions[i].text.length) {
-                                    longestResult = data.suggestions[i].text.length;
-                                }
-                            }
-
-                            let datalist = document.getElementById("addressOptions");
-                            datalist.innerHTML = options;
-                            datalist.hidden = false;
-                        }
-
-                        let textBox = document.getElementById("address");
-                        textBox.focus();
-
-                        //console.log(datalist);
-                    });
+        const suffix = '&maxSuggestions=5&countryCode=USA&f=pjson';
+        fetch(`${route}${encodeURIComponent(textBox.value)}${suffix}`)
+            .then(response => response.json())
+            .then(data => {
+                if (data.suggestions == undefined) {
+                    return;
                 }
-            )
-            .catch(function (err) {
-                console.log('Fetch Error :-S', err);
-            });
+                const datalist = document.getElementById("addressOptions");
+                datalist.innerHTML = data.suggestions
+                    .map(s => `<li class='list-group-item' onclick='setAddress(this.textContent)'>${escapeHtml(s.text)}</li>`)
+                    .join('');
+                datalist.hidden = false;
+            })
+            .catch(err => console.log('Fetch Error :-S', err));
     }
 
-    function setAddress(address) {
-        let textBox = document.getElementById("address");
-        textBox.value = address;
-        let datalist = document.getElementById("addressOptions");
-        datalist.hidden = true;
-
-        // Spinner
-                    const spinner = document.getElementById("spinner");
-                    spinner.hidden = false;
-        // TODO: Get the list of service providers here.
-        console.log(address);
-        const getCoordinatesService = `https://geocode.arcgis.com/arcgis/rest/services/World/GeocodeServer/findAddressCandidates?SingleLine=${address}&maxSuggestions=5&countryCode=USA,CAN&f=pjson`;
-        fetch(getCoordinatesService)
-        .then(
-                function (response) {
-                    if (response.status !== 200) {
-                        console.log('Looks like there was a problem. Status Code: ' +
-                            response.status);
-                        return;
-                    }
-
-                    // Examine the text in the response
-                    response.json().then(function (data) {
-                        console.log(data);
-                        const coordinates = `${data.candidates[0].location.x},${data.candidates[0].location.y}`
-                        const getObjectIdService = `https://services.arcgis.com/jIL9msH9OI208GCb/arcgis/rest/services/FCC_Broadband_Data_Collection_June_2022/FeatureServer/4/query?where=1%3D1&objectIds=&geometry=${coordinates}&geometryType=esriGeometryPoint&inSR=4326&spatialRel=esriSpatialRelIntersects&resultType=tile&distance=0.0&units=esriSRUnit_Meter&outDistance=&relationParam=&returnGeodetic=false&outFields=OBJECTID%2CUnderservedBSLs%2CUnservedBSLs&returnGeometry=true&returnCentroid=false&returnEnvelope=false&featureEncoding=esriDefault&multipatchOption=xyFootprint&maxAllowableOffset=&geometryPrecision=&outSR=&defaultSR=%7B%22wkid%22%3A102100%2C%22falseM%22%3A-100000%2C%22falseX%22%3A-20037700%2C%22falseY%22%3A-30241100%2C%22falseZ%22%3A-100000%2C%22mTolerance%22%3A0.001%2C%22mUnits%22%3A10000%2C%22xyTolerance%22%3A0.001%2C%22xyUnits%22%3A10000%2C%22zTolerance%22%3A0.001%2C%22zUnits%22%3A10000%7D&datumTransformation=&applyVCSProjection=false&returnIdsOnly=false&returnUniqueIdsOnly=false&returnCountOnly=false&returnExtentOnly=false&returnQueryGeometry=false&returnDistinctValues=false&cacheHint=false&collation=&orderByFields=OBJECTID+ASC&groupByFieldsForStatistics=&returnAggIds=false&outStatistics=&having=&resultOffset=0&resultRecordCount=8000&returnZ=false&returnM=false&returnTrueCurves=false&returnExceededLimitFeatures=true&quantizationParameters=%7B%22extent%22%3A%7B%22xmin%22%3A-13620466.944191558%2C%22ymin%22%3A6045863.189245708%2C%22xmax%22%3A-13619855.447965277%2C%22ymax%22%3A6046474.685471989%7D%2C%22mode%22%3A%22view%22%2C%22originPosition%22%3A%22upperLeft%22%2C%22tolerance%22%3A1.1943285669555674%7D&sqlFormat=none&f=pjson&token=`;
-                        console.log(getObjectIdService);
-                        fetch(getObjectIdService)
-                        .then(
-                                function (response) {
-                                    if (response.status !== 200) {
-                                        console.log('Looks like there was a problem. Status Code: ' +
-                                            response.status);
-                                        return;
-                                    }
-
-                                    // Examine the text in the response
-                                    response.json().then(function (data) {
-                                        console.log(data);
-                                        const objectId = `${data.features[0].attributes.OBJECTID}`
-                                        const getGeoIdService = `https://services.arcgis.com/jIL9msH9OI208GCb/arcgis/rest/services/FCC_Broadband_Data_Collection_June_2022/FeatureServer/4/query?f=pjson&objectIds=${objectId}&outFields=CountyName%2CGEOID%2CServedBSLs%2CServedBSLsCable%2CServedBSLsCopper%2CServedBSLsFiber%2CServedBSLsLTFW%2CStateAbbr%2CTotalBSLs%2CTotalPop%2CUnderservedBSLs%2CUniqueProviders%2CUniqueProvidersCable%2CUniqueProvidersCopper%2CUniqueProvidersFiber%2CUniqueProvidersLBRTFW%2CUniqueProvidersLTFW%2CUnservedBSLs%2COBJECTID&outSR=%7B%22wkid%22%3A102100%2C%22falseM%22%3A-100000%2C%22falseX%22%3A-20037700%2C%22falseY%22%3A-30241100%2C%22falseZ%22%3A-100000%2C%22mTolerance%22%3A0.001%2C%22mUnits%22%3A10000%2C%22xyTolerance%22%3A0.001%2C%22xyUnits%22%3A10000%2C%22zTolerance%22%3A0.001%2C%22zUnits%22%3A10000%7D&returnGeometry=false&spatialRel=esriSpatialRelIntersects&where=1%3D1`;
-                                        console.log(getGeoIdService);
-                                        fetch(getGeoIdService)
-                                        .then(
-                                                function (response) {
-                                                    if (response.status !== 200) {
-                                                        console.log('Looks like there was a problem. Status Code: ' +
-                                                            response.status);
-                                                        return;
-                                                    }
-
-                                                    // Examine the text in the response
-                                                    response.json().then(function (data) {
-                                                        console.log(data);
-                                                        const geoid = `${data.features[0].attributes.GEOID}`
-                                                        let state = "Washington";
-                                                        if(data.features[0].attributes.StateAbbr == "OR"){
-                                                            state = "Oregon";
-                                                        } else if (data.features[0].attributes.StateAbbr == "CA") {
-                                                            state = "California";
-                                                        }
-                                                        const getProvidersService = `/Internet/Providers/Availability?state=${state}&geoid=${geoid}`;
-                                                        console.log(getProvidersService);
-                                                        fetch(getProvidersService)
-                                                        .then(
-                                                                function (response) {
-                                                                    if (response.status !== 200) {
-                                                                        console.log('Looks like there was a problem. Status Code: ' +
-                                                                            response.status);
-                                                                        return;
-                                                                    }
-
-                                                                    // Examine the text in the response
-                                                                    response.json().then(function (data) {
-                                                                        console.log(data);
-                                                                        let options = '';
-                                                                        if (data != undefined) {
-                                                                            for (let i = 0; i < data.length; i++) {
-                                                                                    const addtocart = `<button onclick="AddToCart('Service', '${data[i].serviceId}', 1, this)" class="btn btn-outline-primary"> <span class="d-none spinner-border spinner-border-sm mr-2" role="status">&nbsp;</span> Add to Cart </button>`;
-                                                                                options += `<tr><td>${data[i].technology}</td><td>${data[i].down}</td><td>${data[i].up}</td><td>${addtocart}</td></tr>`;
-                                                                            }
-
-                                                                            let resultsTable = document.getElementById("resultstablebody");
-                                                                            resultsTable.innerHTML = options;
-                                                                            resultsTable.hidden = false;
-                                                                            spinner.hidden = true;
-
-                                                                        }
-                                                                    });
-                                                                }
-                                                            )
-                                                        .catch(function (err) {
-                                                                console.log('Fetch Error :-S', err);
-                                                            });
-                                                    });
-                                                }
-                                            )
-                                        .catch(function (err) {
-                                                console.log('Fetch Error :-S', err);
-                                            });
-
-                                    });
-                                }
-                            )
-                        .catch(function (err) {
-                                console.log('Fetch Error :-S', err);
-                            });
+    function showMessage(html) {
+        document.getElementById("resultstablebody").innerHTML = `<tr><td colspan="4">${html}</td></tr>`;
+        document.getElementById("spinner").hidden = true;
+    }
 
-                    });
+    function setAddress(address) {
+        document.getElementById("address").value = address;
+        document.getElementById("addressOptions").hidden = true;
+        document.getElementById("resultstablebody").innerHTML = '';
+        document.getElementById("spinner").hidden = false;
+
+        const contact = `<a href="/Support">contact us</a>`;
+        const geocode = `https://geocode.arcgis.com/arcgis/rest/services/World/GeocodeServer/findAddressCandidates?SingleLine=${encodeURIComponent(address)}&outFields=AddNum,StName,Postal&maxLocations=1&countryCode=USA&f=pjson`;
+        fetch(geocode)
+            .then(response => response.json())
+            .then(data => {
+                if (data.candidates == undefined || data.candidates.length == 0) {
+                    showMessage(`We couldn't find that address. Please pick one of the suggestions or ${contact}.`);
+                    return;
                 }
-            )
-        .catch(function (err) {
+                const candidate = data.candidates[0];
+                const params = new URLSearchParams({
+                    houseNumber: candidate.attributes.AddNum ?? '',
+                    street: candidate.attributes.StName ?? '',
+                    postal: candidate.attributes.Postal ?? '',
+                    latitude: candidate.location.y,
+                    longitude: candidate.location.x
+                });
+                return fetch(`/Internet/Availability?${params}`)
+                    .then(response => response.json())
+                    .then(availability => {
+                        if (!availability.serviceable) {
+                            showMessage(`We don't have internet service listed at this address yet. Please ${contact} and we'll check for you.`);
+                            return;
+                        }
+                        const qualified = `buildingKey=${encodeURIComponent(availability.buildingKey)}`;
+                        const rows = availability.offers.map(offer => {
+                            const price = offer.price > 0 ? `$${offer.price}/mo` : 'Quote';
+                            const action = offer.status == 'Sellable'
+                                ? `<button onclick="AddToCart('Service', '${offer.serviceId}', 1, this, '${qualified}')" class="btn btn-outline-primary"> <span class="d-none spinner-border spinner-border-sm mr-2" role="status">&nbsp;</span> Add to Cart </button>`
+                                : `<a href="/Support" class="btn btn-outline-secondary">${offer.status == 'Quote' ? 'Request a Quote' : 'Contact Us'}</a>`;
+                            return `<tr><td>${escapeHtml(offer.name)}<br /><small class="text-muted">${escapeHtml(offer.note)}</small></td><td>${escapeHtml(offer.speed)}</td><td>${price}</td><td>${action}</td></tr>`;
+                        });
+                        // Say which listed building we checked, since a near match might not be the address that was typed.
+                        const matched = escapeHtml(availability.matchedAddress);
+                        const checked = availability.matchType == 'Exact'
+                            ? `Showing services for ${matched}.`
+                            : availability.matchType == 'HouseNumber'
+                                ? `We found ${matched} on your street, which may be a different unit or lot. Please ${contact} to confirm before ordering.`
+                                : `We couldn't find this exact address, the closest listed building is ${matched}. Please ${contact} to confirm before ordering.`;
+                        rows.unshift(`<tr><td colspan="4"><small class="text-muted">${checked}</small></td></tr>`);
+                        document.getElementById("resultstablebody").innerHTML = rows.join('');
+                        document.getElementById("spinner").hidden = true;
+                    });
+            })
+            .catch(err => {
                 console.log('Fetch Error :-S', err);
+                showMessage(`Something went wrong looking up this address. Please try again or ${contact}.`);
             });
     }
-
 </script>
 
 <!-- Pricing Hero-->
@@ -172,7 +99,7 @@
             <div class="col-lg-10 col-md-11">
                 <h1 class="display-3 text-light d-none d-sm-block">The best internet</h1>
                 <h4 class="display-4 text-light d-block d-sm-none">The best internet</h4>
-                <p class="lead text-white">With the FCC's help we'll scour the county and find you the best internet possible for your business.</p>
+                <p class="lead text-white">Symmetrical fiber internet for your business across Washington, Oregon, Idaho, and Montana.</p>
             </div>
         </div>
     </div>
@@ -182,20 +109,19 @@
         <div class="row">
             <div class="col-md-6">
                 <p>🪨 Your internet connection is the bedrock of your business.</p>
-                <p>🆕 Let us accelerate your business with the latest Fiber to the Premises technology or tried and tested Copper and Cable connectivity.</p>
-                <p>🎺 With 5G networks we can also offer you Licensed or Unlicensed Fixed Wireless alternatives to suit your needs.</p>
+                <p>🆕 Let us accelerate your business with symmetrical fiber internet at 300 Mbps for $75/mo or 1 Gbps for $115/mo on a 2, 3 or 5 year term.</p>
+                <p>📞 Save $15/mo on fiber internet when you bundle it with any of our phone services.</p>
+                <p>🏢 Need dedicated bandwidth with an SLA? Ethernet internet access is available at many business addresses, contact us for a quote.</p>
                 <p>🤝 Whatever technology you choose, rest assured that Accelerate Networks will handle all the details with our Seattle-based support and installation teams.</p>
             </div>
             <div class="col-md-6">
                 <h1 class="display-4">
                     Accelerate Your Business</h2>
                     <ul style="list-style: none; padding: 0px;">
-                        <li>🌾 Fiber to the Premises</li>
-                        <li>⛷️ Cable</li>
-                        <li>💨 Copper</li>
-                        <li>📶 Licensed Fixed Wireless</li>
-                        <li>🛜 Unlicensed Fixed Wireless</li>
-                        <li>🔮 LBR Fixed Wireless</li>
+                        <li>🌾 Fiber Internet 300 Mbps - $75/mo</li>
+                        <li>🚀 Fiber Internet 1 Gbps - $115/mo</li>
+                        <li>📞 $15/mo off when bundled with phone service</li>
+                        <li>🏢 Ethernet Internet Access - quoted</li>
                     </ul>
             </div>
         </div>
@@ -229,7 +155,7 @@
         @if (Model?.Cart?.Order?.OrderId != Guid.Empty && Model?.Cart?.Order?.DateSubmitted > DateTime.MinValue)
         {
             <div class="mb-3" id="searchForm">
-                <label for="address">Address in Washington, Oregon, or California</label>
+                <label for="address">Address in Washington, Oregon, Idaho, or Montana</label>
                 <input asp-for="Cart.Order!.UnparsedAddress" type="text" class="form-control" id="address" readonly>
                 <small class="text-muted">
                     Enter the service address or, the address of the installation location (ex. 1250 1st Ave S, Seattle, WA, 98134, USA)
@@ -239,7 +165,7 @@
         else
         {
             <div class="mb-3" id="searchForm">
-                <label for="address">Address in Washington, Oregon, or California</label>
+                <label for="address">Address in Washington, Oregon, Idaho, or Montana</label>
                 <input asp-for="Cart.Order!.UnparsedAddress" type="text" class="form-control" id="address" placeholder="Enter your address to search for internet options" pattern=".+[,].+" oninput="handleSearchQuery(this)" onfocus="handleSearchQuery(this)" list="addressOptions" autocomplete="off" data-toggle="dropdown" required>
                 <ul class="list-group" role="menu" aria-labelledby="menu1" id="addressOptions">
                 </ul>
@@ -253,9 +179,9 @@
             <table class="table table-striped table-borderless table-hover">
                 <thead>
                     <tr>
-                        <th>Technology</th>
-                        <th>Down</th>
-                        <th>Up</th>
+                        <th>Service</th>
+                        <th>Speed</th>
+                        <th>Price</th>
                         <th>Action</th>
                     </tr>
                 </thead>
diff --git a/NumberSearch.Mvc/wwwroot/js/site.js b/NumberSearch.Mvc/wwwroot/js/site.js
index 896c01e0..a6eaf1f3 100644
--- a/NumberSearch.Mvc/wwwroot/js/site.js
+++ b/NumberSearch.Mvc/wwwroot/js/site.js
@@ -34,7 +34,7 @@ function escapeHtml(value) {
         .replace(/'/g, '&#39;');
 }
 
-function AddToCart(type, id, quantity, element) {
+function AddToCart(type, id, quantity, element, query) {
     // Default to 1 unit if the "Add to Cart" button is pressed.
     const quantityDisplay = document.getElementById(id);
     if (quantityDisplay == null || quantityDisplay.value == null || quantityDisplay.value.length == 0) {
@@ -56,13 +56,19 @@ function AddToCart(type, id, quantity, element) {
     let spinner = $(element).find('span');
     spinner.removeClass('d-none');
     let route = `/Cart/Add/${type}/${id}/${quantity}`;
+    if (query) {
+        route += `?${query}`;
+    }
     fetch(route)
         .then(response => {
             if (!response.ok) {
-                throw new Error(`HTTP error! status: ${response.status}`);
-                console.log(`Failed to add ${type} ${id} to cart.`)
-                alert(`Failed to add ${type} ${id} to cart.`);
-                spinner.addClass('d-none')
+                // Plain text errors are written for the customer, ex. fiber that needs an address check first.
+                const plainText = (response.headers.get('content-type') ?? '').startsWith('text/plain');
+                return response.text().then(text => {
+                    const error = new Error(`HTTP error! status: ${response.status}`);
+                    error.userMessage = plainText ? text : '';
+                    throw error;
+                });
             }
             return response.text(); // or .text(), .blob(), etc.
         })
@@ -89,7 +95,7 @@ function AddToCart(type, id, quantity, element) {
         .catch(error => {
             console.error('There was a problem with the fetch operation:', error);
             console.log(`Failed to add ${type} ${id} to cart.`)
-            alert(`Failed to add ${type} ${id} to cart.`);
+            alert(error.userMessage || `Failed to add ${type} ${id} to cart.`);
             spinner.addClass('d-none')
         });
 }
diff --git a/NumberSearch.Ops/Controllers/OrdersController.cs b/NumberSearch.Ops/Controllers/OrdersController.cs
index 9993df74..d8b42a4d 100644
--- a/NumberSearch.Ops/Controllers/OrdersController.cs
+++ b/NumberSearch.Ops/Controllers/OrdersController.cs
@@ -1526,7 +1526,7 @@ public async Task<IActionResult> OrderNewInvoicesAsync(Guid orderId)
                                     reoccurringItems.Add(new Line_Items
                                     {
                                         product_key = service.Name ?? string.Empty,
-                                        notes = $"{service.Description}",
+                                        notes = NumberSearch.DataAccess.InternetBundle.IsFiberInternet(service.ServiceId) ? NumberSearch.DataAccess.InternetBundle.FiberNotes(order.InternetTermYears, order.InternetServiceAddress, service.Description ?? string.Empty) : $"{service.Description}",
                                         cost = price,
                                         quantity = Convert.ToInt32(productOrder.Quantity)
                                     });
@@ -1617,6 +1617,19 @@ public async Task<IActionResult> OrderNewInvoicesAsync(Guid orderId)
                             }
                         }
 
+                        // Fiber internet is discounted once per connection when bundled with phone service or the Partner coupon.
+                        var bundleLines = (cart?.ProductOrders ?? []).Select(x => new NumberSearch.DataAccess.InternetBundle.Line(x.ServiceId ?? Guid.Empty, x.Quantity, x.CouponId)).ToArray();
+                        if (NumberSearch.DataAccess.InternetBundle.Discount(bundleLines) > 0)
+                        {
+                            reoccurringItems.Add(new Line_Items
+                            {
+                                product_key = NumberSearch.DataAccess.InternetBundle.Name,
+                                notes = NumberSearch.DataAccess.InternetBundle.IsPartnerOnly(bundleLines) ? NumberSearch.DataAccess.InternetBundle.PartnerDescription : NumberSearch.DataAccess.InternetBundle.Description,
+                                cost = NumberSearch.DataAccess.InternetBundle.DiscountPerConnection * -1,
+                                quantity = NumberSearch.DataAccess.InternetBundle.FiberConnections(bundleLines)
+                            });
+                        }
+
                         // Handle hardware installation scenarios, if hardware is in the order.
                         if (cart is not null && cart.Products.Count != 0)
                         {
diff --git a/NumberSearch.Ops/PostgreSQL/Order.cs b/NumberSearch.Ops/PostgreSQL/Order.cs
index 3b96535c..71b4be77 100644
--- a/NumberSearch.Ops/PostgreSQL/Order.cs
+++ b/NumberSearch.Ops/PostgreSQL/Order.cs
@@ -38,5 +38,11 @@ public partial class Order
         public DateTime? DateUpfrontInvoicePaid { get; set; }
         public string? InternalNotes { get; set; }
         public string? QuoteStatus { get; set; }
+        /// <summary>
+        /// Chosen by the customer at checkout, read only here so editing an order can't clear it.
+        /// </summary>
+        public int InternetTermYears { get; set; }
+        public string InternetServiceAddress { get; set; } = string.Empty;
+        public string InternetBuildingKey { get; set; } = string.Empty;
     }
 }
diff --git a/NumberSearch.Ops/PostgreSQL/numberSearchContext.cs b/NumberSearch.Ops/PostgreSQL/numberSearchContext.cs
index 560587e5..c5c23ddd 100644
--- a/NumberSearch.Ops/PostgreSQL/numberSearchContext.cs
+++ b/NumberSearch.Ops/PostgreSQL/numberSearchContext.cs
@@ -438,6 +438,14 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
             entity.Property(e => e.InternalNotes).HasColumnType("character varying");
 
             entity.Property(e => e.QuoteStatus).HasColumnType("character varying");
+
+            // Set by the customer at checkout, never written from here.
+            entity.Property(e => e.InternetTermYears).Metadata.SetAfterSaveBehavior(Microsoft.EntityFrameworkCore.Metadata.PropertySaveBehavior.Ignore);
+            entity.Property(e => e.InternetTermYears).Metadata.SetBeforeSaveBehavior(Microsoft.EntityFrameworkCore.Metadata.PropertySaveBehavior.Ignore);
+            entity.Property(e => e.InternetServiceAddress).Metadata.SetAfterSaveBehavior(Microsoft.EntityFrameworkCore.Metadata.PropertySaveBehavior.Ignore);
+            entity.Property(e => e.InternetServiceAddress).Metadata.SetBeforeSaveBehavior(Microsoft.EntityFrameworkCore.Metadata.PropertySaveBehavior.Ignore);
+            entity.Property(e => e.InternetBuildingKey).Metadata.SetAfterSaveBehavior(Microsoft.EntityFrameworkCore.Metadata.PropertySaveBehavior.Ignore);
+            entity.Property(e => e.InternetBuildingKey).Metadata.SetBeforeSaveBehavior(Microsoft.EntityFrameworkCore.Metadata.PropertySaveBehavior.Ignore);
         });
 
         modelBuilder.Entity<OwnedPhoneNumber>(entity =>
diff --git a/NumberSearch.Ops/Views/Orders/OrderEdit.cshtml b/NumberSearch.Ops/Views/Orders/OrderEdit.cshtml
index e78f0b35..d1de936f 100644
--- a/NumberSearch.Ops/Views/Orders/OrderEdit.cshtml
+++ b/NumberSearch.Ops/Views/Orders/OrderEdit.cshtml
@@ -374,6 +374,36 @@
             </div>
         </div>
     </div>
+    @if (!string.IsNullOrWhiteSpace(Model?.Order?.InternetServiceAddress) || Model?.Order?.InternetTermYears > 0)
+    {
+        // Set by the customer at checkout from the Ziply building list, so these are shown but never posted back.
+        var serviceAddress = Model?.Order?.InternetServiceAddress ?? string.Empty;
+        <h5 class="mb-3">Fiber Internet</h5>
+        <div class="row">
+            <div class="col-12 col-md-6 mb-3">
+                <div class="form-floating">
+                    <input type="text" class="form-control" id="internetServiceAddress" value="@serviceAddress" readonly>
+                    <label for="internetServiceAddress">Service Address</label>
+                </div>
+                @if (!string.IsNullOrWhiteSpace(serviceAddress))
+                {
+                    <div class="form-text"><a href="https://www.google.com/maps/search/?api=1&query=@Uri.EscapeDataString(serviceAddress)" target="_blank" rel="noopener noreferrer">View on a map</a></div>
+                }
+            </div>
+            <div class="col-6 col-md-2 mb-3">
+                <div class="form-floating">
+                    <input type="text" class="form-control" id="internetTermYears" value="@(Model?.Order?.InternetTermYears > 0 ? $"{Model?.Order?.InternetTermYears} years" : "Not set")" readonly>
+                    <label for="internetTermYears">Contract Term</label>
+                </div>
+            </div>
+            <div class="col-6 col-md-4 mb-3">
+                <div class="form-floating">
+                    <input type="text" class="form-control font-monospace" id="internetBuildingKey" value="@Model?.Order?.InternetBuildingKey" readonly>
+                    <label for="internetBuildingKey">Ziply Building Key</label>
+                </div>
+            </div>
+        </div>
+    }
     <div class="row">
         <div class="col-12 col-md-6">
             <div class="form-floating mb-3">
diff --git a/NumberSearch.Ops/Views/Orders/Orders.cshtml b/NumberSearch.Ops/Views/Orders/Orders.cshtml
index e78ae114..20625015 100644
--- a/NumberSearch.Ops/Views/Orders/Orders.cshtml
+++ b/NumberSearch.Ops/Views/Orders/Orders.cshtml
@@ -193,6 +193,17 @@
 
                                 @order?.Order?.Zip
                             </p>
+                            @if (!string.IsNullOrWhiteSpace(order?.Order?.InternetServiceAddress))
+                            {
+                                <strong>Fiber Internet</strong>
+                                <p>
+                                    @order.Order.InternetServiceAddress
+                                    @if (order.Order.InternetTermYears > 0)
+                                    {
+                                        <span class="badge bg-info text-dark">@order.Order.InternetTermYears year term</span>
+                                    }
+                                </p>
+                            }
                         </td>
                         <td>
                             @if (order?.ProductOrders is not null)
diff --git a/NumberSearch.Tests/Integration.cs b/NumberSearch.Tests/Integration.cs
index 9232d06f..b3b20512 100644
--- a/NumberSearch.Tests/Integration.cs
+++ b/NumberSearch.Tests/Integration.cs
@@ -969,7 +969,7 @@ public async Task BulkVSRESTValidatePortabilityAsync()
         public async Task TeleDynamicsProductCheckQuantityAsync()
         {
             // Arrange
-            var partNumber = "yea-sip-t54w";
+            var partNumber = "yea-sip-t87w";
             // Act
             var results = await VendorProduct.GetAsync(partNumber, _teleDynamicsUsername, _teleDynamicsPassword);
 
@@ -2420,4 +2420,4 @@ public void ParseAddressForOrder()
         //    Assert.False(string.IsNullOrWhiteSpace(result.EmailSubject));
         //}
     }
-}
\ No newline at end of file
+}
diff --git a/NumberSearch.Tests/Unit.cs b/NumberSearch.Tests/Unit.cs
index d0e05bdb..4580aa27 100644
--- a/NumberSearch.Tests/Unit.cs
+++ b/NumberSearch.Tests/Unit.cs
@@ -26,5 +26,136 @@ public void PortPinTest()
             Assert.True(pin > 0);
             Assert.True(pin > 100000);
         }
+
+        [Theory]
+        [InlineData("Pine Cliff", "pinecliff")]
+        [InlineData("1st", "1st")]
+        [InlineData("Bothell-Everett ", "bothelleverett")]
+        [InlineData("O'Neil", "oneil")]
+        [InlineData("", "")]
+        public void ServiceAddressStreetKeyTest(string streetName, string expected)
+        {
+            Assert.Equal(expected, NumberSearch.DataAccess.ServiceAddress.ToStreetKey(streetName));
+        }
+
+        [Fact]
+        public void InternetBundleDiscountTest()
+        {
+            var fiber = new NumberSearch.DataAccess.ProductOrder { ServiceId = NumberSearch.DataAccess.InternetBundle.FiberInternet1GServiceId, Quantity = 1 };
+            var twoFiber = new NumberSearch.DataAccess.ProductOrder { ServiceId = NumberSearch.DataAccess.InternetBundle.FiberInternet300ServiceId, Quantity = 2 };
+            var lines = new NumberSearch.DataAccess.ProductOrder { ServiceId = NumberSearch.DataAccess.InternetBundle.StandardLinesServiceId, Quantity = 3 };
+            var seats = new NumberSearch.DataAccess.ProductOrder { ServiceId = NumberSearch.DataAccess.InternetBundle.ConcurrentSeatsServiceId, Quantity = 1 };
+            var noLines = new NumberSearch.DataAccess.ProductOrder { ServiceId = NumberSearch.DataAccess.InternetBundle.StandardLinesServiceId, Quantity = 0 };
+            var partner = new NumberSearch.DataAccess.ProductOrder { CouponId = NumberSearch.DataAccess.InternetBundle.PartnerCouponId, Quantity = 1 };
+            var otherCoupon = new NumberSearch.DataAccess.ProductOrder { CouponId = Guid.NewGuid(), Quantity = 1 };
+
+            // Fiber on its own, or with a coupon that isn't Partner, pays full price.
+            Assert.Equal(0, NumberSearch.DataAccess.InternetBundle.Discount([fiber]));
+            Assert.Equal(0, NumberSearch.DataAccess.InternetBundle.Discount([fiber, otherCoupon, noLines]));
+            // Phone service or the Partner coupon take $15 off each fiber connection, never more.
+            Assert.Equal(15, NumberSearch.DataAccess.InternetBundle.Discount([fiber, lines]));
+            Assert.Equal(15, NumberSearch.DataAccess.InternetBundle.Discount([fiber, lines, seats, partner]));
+            Assert.Equal(15, NumberSearch.DataAccess.InternetBundle.Discount([fiber, partner]));
+            Assert.Equal(45, NumberSearch.DataAccess.InternetBundle.Discount([fiber, twoFiber, seats]));
+            // Phone service without fiber has nothing to discount.
+            Assert.Equal(0, NumberSearch.DataAccess.InternetBundle.Discount([lines, partner]));
+
+            // Coupons don't carry a meaningful quantity, so a Partner line qualifies whatever its quantity.
+            var partnerNoQuantity = new NumberSearch.DataAccess.ProductOrder { CouponId = NumberSearch.DataAccess.InternetBundle.PartnerCouponId, Quantity = 0 };
+            Assert.Equal(15, NumberSearch.DataAccess.InternetBundle.Discount([fiber, partnerNoQuantity]));
+
+            Assert.True(NumberSearch.DataAccess.InternetBundle.IsPartnerOnly([fiber, partner]));
+            Assert.False(NumberSearch.DataAccess.InternetBundle.IsPartnerOnly([fiber, lines, partner]));
+        }
+
+        [Theory]
+        [InlineData("1.0G/1.0G", 1000)]
+        [InlineData("300.0M/300.0M", 300)]
+        [InlineData("2.0G/2.0G", 2000)]
+        [InlineData("10G", 10000)]
+        [InlineData("1000M", 1000)]
+        [InlineData("50.0M/50.0M", 50)]
+        [InlineData("1 Gbps", 1000)]
+        [InlineData("", 0)]
+        [InlineData("fast", 0)]
+        [InlineData("3000000G", int.MaxValue)]
+        public void ServiceAddressParseMbpsTest(string maxSpeed, int expected)
+        {
+            Assert.Equal(expected, NumberSearch.DataAccess.ServiceAddress.ParseMbps(maxSpeed));
+        }
+
+        [Theory]
+        [InlineData("512", "512")]
+        [InlineData("0512", "512")]
+        [InlineData("512 1/2", "512")]
+        [InlineData("1250A", "1250")]
+        [InlineData("N123", "")]
+        [InlineData("", "")]
+        public void ServiceAddressHouseKeyTest(string houseNumber, string expected)
+        {
+            Assert.Equal(expected, NumberSearch.DataAccess.ServiceAddress.ToHouseKey(houseNumber));
+        }
+
+        [Fact]
+        public void InternetBundleCanSellAtTest()
+        {
+            var gig = new NumberSearch.DataAccess.ServiceAddress { Product = "WFI", Status = "Sellable", MaxSpeed = "1.0G/1.0G", BuildingKey = "BK-1" };
+            var slow = new NumberSearch.DataAccess.ServiceAddress { Product = "WFI", Status = "Sellable", MaxSpeed = "300.0M/300.0M", BuildingKey = "BK-2" };
+            var slower = new NumberSearch.DataAccess.ServiceAddress { Product = "WFI", Status = "Sellable", MaxSpeed = "100.0M/100.0M", BuildingKey = "BK-3" };
+            var unreadable = new NumberSearch.DataAccess.ServiceAddress { Product = "WFI", Status = "Sellable", MaxSpeed = "", BuildingKey = "BK-4" };
+            var confirm = new NumberSearch.DataAccess.ServiceAddress { Product = "WFI", Status = "Confirm", MaxSpeed = "1.0G/1.0G", BuildingKey = "BK-5" };
+            var eia = new NumberSearch.DataAccess.ServiceAddress { Product = "EIA", Status = "Quote", MaxSpeed = "1.0G/1.0G", BuildingKey = "BK-6" };
+            var noKey = new NumberSearch.DataAccess.ServiceAddress { Product = "WFI", Status = "Sellable", MaxSpeed = "1.0G/1.0G", BuildingKey = "" };
+            var t300 = NumberSearch.DataAccess.InternetBundle.FiberInternet300ServiceId;
+            var t1g = NumberSearch.DataAccess.InternetBundle.FiberInternet1GServiceId;
+
+            Assert.True(NumberSearch.DataAccess.InternetBundle.CanSellAt(t300, gig));
+            Assert.True(NumberSearch.DataAccess.InternetBundle.CanSellAt(t1g, gig));
+            Assert.True(NumberSearch.DataAccess.InternetBundle.CanSellAt(t300, slow));
+            Assert.False(NumberSearch.DataAccess.InternetBundle.CanSellAt(t1g, slow));
+            Assert.False(NumberSearch.DataAccess.InternetBundle.CanSellAt(t300, slower));
+            Assert.False(NumberSearch.DataAccess.InternetBundle.CanSellAt(t300, unreadable));
+            Assert.False(NumberSearch.DataAccess.InternetBundle.CanSellAt(t300, confirm));
+            Assert.False(NumberSearch.DataAccess.InternetBundle.CanSellAt(t300, eia));
+            Assert.False(NumberSearch.DataAccess.InternetBundle.CanSellAt(NumberSearch.DataAccess.InternetBundle.StandardLinesServiceId, gig));
+            // Without a building key Cart/Add can't re-qualify the building, so it's never offered at a price.
+            Assert.False(NumberSearch.DataAccess.InternetBundle.CanSellAt(t300, noKey));
+        }
+
+        [Fact]
+        public void InternetBundleQualifyingAddressTest()
+        {
+            var t300 = NumberSearch.DataAccess.InternetBundle.FiberInternet300ServiceId;
+            var t1g = NumberSearch.DataAccess.InternetBundle.FiberInternet1GServiceId;
+            var sellable = new NumberSearch.DataAccess.ServiceAddress { Product = "WFI", Status = "Sellable", MaxSpeed = "1.0G/1.0G", BuildingKey = "BK-1" };
+            var confirm = new NumberSearch.DataAccess.ServiceAddress { Product = "WFI", Status = "Confirm", MaxSpeed = "300.0M/300.0M", BuildingKey = "BK-1" };
+            var slow = new NumberSearch.DataAccess.ServiceAddress { Product = "WFI", Status = "Sellable", MaxSpeed = "300.0M/300.0M", BuildingKey = "BK-1" };
+            var noKey = new NumberSearch.DataAccess.ServiceAddress { Product = "WFI", Status = "Sellable", MaxSpeed = "1.0G/1.0G", BuildingKey = "" };
+
+            // Rows sharing a key qualify the same way whichever order they come back in.
+            Assert.Same(sellable, NumberSearch.DataAccess.InternetBundle.QualifyingAddress(t1g, [confirm, sellable]));
+            Assert.Same(sellable, NumberSearch.DataAccess.InternetBundle.QualifyingAddress(t1g, [sellable, confirm]));
+            Assert.Same(sellable, NumberSearch.DataAccess.InternetBundle.QualifyingAddress(t300, [slow, confirm, sellable]));
+            Assert.Same(slow, NumberSearch.DataAccess.InternetBundle.QualifyingAddress(t300, [confirm, slow]));
+            Assert.Null(NumberSearch.DataAccess.InternetBundle.QualifyingAddress(t1g, [confirm, slow]));
+            Assert.Null(NumberSearch.DataAccess.InternetBundle.QualifyingAddress(t300, [noKey]));
+            Assert.Null(NumberSearch.DataAccess.InternetBundle.QualifyingAddress(t300, []));
+        }
+
+        [Fact]
+        public void InternetBundleFiberNotesTest()
+        {
+            Assert.Equal("3 year term. Service address: 71 Pine Cliff Dr, Naches, Washington 98937. Fiber.", NumberSearch.DataAccess.InternetBundle.FiberNotes(3, "71 Pine Cliff Dr, Naches, Washington 98937", "Fiber."));
+            Assert.Equal("Fiber.", NumberSearch.DataAccess.InternetBundle.FiberNotes(0, "", "Fiber."));
+        }
+
+        [Fact]
+        public void ServiceAddressDistanceTest()
+        {
+            // 0.0001 degrees of latitude is about 11 meters.
+            var meters = NumberSearch.DataAccess.ServiceAddress.DistanceMeters(46.8993, -121.0128, 46.8994, -121.0128);
+            Assert.InRange(meters, 10.5, 11.5);
+            Assert.Equal(0, NumberSearch.DataAccess.ServiceAddress.DistanceMeters(46.8993, -121.0128, 46.8993, -121.0128));
+        }
     }
 }