diff --git a/app/components/AuthProvider.tsx b/app/components/AuthProvider.tsx
index a375334..1602989 100644
--- a/app/components/AuthProvider.tsx
+++ b/app/components/AuthProvider.tsx
@@ -3,6 +3,7 @@
 import { DynamicContextProvider, DynamicWidget, useDynamicContext } from '@dynamic-labs/sdk-react-core';
 import { EthereumWalletConnectors } from '@dynamic-labs/ethereum';
 import { createContext, useContext, useEffect, useState, useCallback, ReactNode } from 'react';
+import { trackUserLoggedIn } from '@/lib/analytics';
 
 interface SubscriptionData {
   isActive: boolean;
@@ -148,6 +149,8 @@ export function AuthProvider({ children }: { children: ReactNode }) {
 
   const handleAuthStateChange = useCallback((isAuth: boolean, dynamicUser: any) => {
     console.log('[AuthProvider] Auth state changed:', { isAuth, hasUser: !!dynamicUser, userAddress: dynamicUser?.verifiedCredentials?.[0]?.address });
+
+    const wasAuthenticated = isAuthenticated;
     setIsAuthenticated(isAuth);
     setUser(dynamicUser);
 
@@ -157,14 +160,20 @@ export function AuthProvider({ children }: { children: ReactNode }) {
       setSubscriptionData(null);
       setCheckingSubscription(false);
     } else if (dynamicUser && isDynamicInitialized) {
-      // User logged in and Dynamic is initialized, check subscription
+      // User logged in
       const walletAddress = dynamicUser?.verifiedCredentials?.[0]?.address;
       if (walletAddress) {
         console.log('[AuthProvider] User logged in, checking subscription:', walletAddress);
+
+        // Track login event (only on new login, not on page refresh)
+        if (!wasAuthenticated) {
+          trackUserLoggedIn();
+        }
+
         checkSubscription(walletAddress);
       }
     }
-  }, [isDynamicInitialized, checkSubscription]);
+  }, [isDynamicInitialized, checkSubscription, isAuthenticated]);
 
   // If Dynamic is not enabled (no environment ID), render children with default auth context
   if (!isDynamicEnabled) {
diff --git a/app/components/CustomizationModal.tsx b/app/components/CustomizationModal.tsx
index a219824..dd67326 100644
--- a/app/components/CustomizationModal.tsx
+++ b/app/components/CustomizationModal.tsx
@@ -3,6 +3,7 @@
 import { useState, useEffect } from "react";
 import { createPortal } from "react-dom";
 import { useCustomization, UserCustomization } from "./CustomizationContext";
+import { trackPersonalizationUpdated } from "@/lib/analytics";
 
 type CustomizationModalProps = {
   isOpen: boolean;
@@ -137,6 +138,10 @@ export default function CustomizationModal({ isOpen, onClose }: CustomizationMod
       };
 
       await saveCustomization(data, password);
+
+      // Track personalization update
+      trackPersonalizationUpdated();
+
       // Don't close - let user decide with buttons
     } catch (err) {
       setError(err instanceof Error ? err.message : 'Failed to save customization');
diff --git a/app/components/DisclaimerModal.tsx b/app/components/DisclaimerModal.tsx
index 844da58..722b8fd 100644
--- a/app/components/DisclaimerModal.tsx
+++ b/app/components/DisclaimerModal.tsx
@@ -2,7 +2,6 @@
 
 import { useEffect, useState } from "react";
 import { createPortal } from "react-dom";
-import { trackModalOpen, trackModalClose, trackDisclaimerView } from "@/lib/analytics";
 
 type DisclaimerModalProps = {
   isOpen: boolean;
@@ -21,8 +20,7 @@ export default function DisclaimerModal({ isOpen, onClose, type, onAccept }: Dis
 
   useEffect(() => {
     if (isOpen) {
-      trackModalOpen(type === 'initial' ? 'disclaimer_initial' : 'disclaimer_result');
-      trackDisclaimerView();
+      // Removed granular modal tracking - no longer needed
     } else {
       setHasScrolledToBottom(false);
     }
@@ -99,7 +97,6 @@ export default function DisclaimerModal({ isOpen, onClose, type, onAccept }: Dis
         <button
           className="disclaimer-button primary"
           onClick={() => {
-            trackModalClose('disclaimer_initial', 'accept');
             if (onAccept) {
               onAccept();
             } else {
@@ -150,7 +147,6 @@ export default function DisclaimerModal({ isOpen, onClose, type, onAccept }: Dis
         <button
           className="disclaimer-button secondary"
           onClick={() => {
-            trackModalClose('disclaimer_result', 'decline');
             onClose();
           }}
         >
@@ -159,7 +155,6 @@ export default function DisclaimerModal({ isOpen, onClose, type, onAccept }: Dis
         <button
           className="disclaimer-button primary"
           onClick={() => {
-            trackModalClose('disclaimer_result', 'accept');
             (onAccept || onClose)();
           }}
           disabled={!hasScrolledToBottom}
diff --git a/app/components/LLMChatInline.tsx b/app/components/LLMChatInline.tsx
index 1974615..42e2047 100644
--- a/app/components/LLMChatInline.tsx
+++ b/app/components/LLMChatInline.tsx
@@ -10,6 +10,7 @@ import ReactMarkdown from 'react-markdown';
 import remarkGfm from 'remark-gfm';
 import { callLLM, getLLMDescription } from "@/lib/llm-client";
 import { RobotIcon } from "./Icons";
+import { trackLLMQuestionAsked } from "@/lib/analytics";
 
 type Message = {
   role: 'user' | 'assistant';
@@ -180,6 +181,9 @@ export default function AIChatInline() {
     setIsLoading(true);
     setError(null);
 
+    // Track LLM question
+    trackLLMQuestionAsked();
+
     try {
       let relevantResults: SavedResult[] = [];
 
diff --git a/app/components/LLMConfigModal.tsx b/app/components/LLMConfigModal.tsx
index 8c34b6d..b3547b0 100644
--- a/app/components/LLMConfigModal.tsx
+++ b/app/components/LLMConfigModal.tsx
@@ -9,6 +9,7 @@ import {
   saveLLMConfig,
   isConfigValid,
 } from "@/lib/llm-config";
+import { trackAIProviderSwitched } from "@/lib/analytics";
 
 type LLMConfigModalProps = {
   isOpen: boolean;
@@ -19,11 +20,14 @@ type LLMConfigModalProps = {
 export default function LLMConfigModal({ isOpen, onClose, onSave }: LLMConfigModalProps) {
   const [config, setConfig] = useState<LLMConfig>(getLLMConfig());
   const [showApiKey, setShowApiKey] = useState(false);
+  const [initialProvider, setInitialProvider] = useState<LLMProvider>(getLLMConfig().provider);
 
   useEffect(() => {
     if (isOpen) {
-      // Reload config when modal opens
-      setConfig(getLLMConfig());
+      // Reload config when modal opens and track initial provider
+      const currentConfig = getLLMConfig();
+      setConfig(currentConfig);
+      setInitialProvider(currentConfig.provider);
     }
   }, [isOpen]);
 
@@ -35,6 +39,12 @@ export default function LLMConfigModal({ isOpen, onClose, onSave }: LLMConfigMod
     }
 
     saveLLMConfig(config);
+
+    // Track if provider was changed
+    if (config.provider !== initialProvider) {
+      trackAIProviderSwitched(config.provider);
+    }
+
     onSave?.();
     onClose();
   };
diff --git a/app/components/NilAIConsentModal.tsx b/app/components/NilAIConsentModal.tsx
index 8b1037b..05d4526 100644
--- a/app/components/NilAIConsentModal.tsx
+++ b/app/components/NilAIConsentModal.tsx
@@ -1,7 +1,6 @@
 "use client";
 
-import { useState, useEffect } from "react";
-import { trackModalOpen, trackAIConsentGiven, trackAIConsentDeclined } from "@/lib/analytics";
+import { useEffect } from "react";
 
 type NilAIConsentModalProps = {
   isOpen: boolean;
@@ -14,11 +13,7 @@ export default function NilAIConsentModal({
   onAccept,
   onDecline,
 }: NilAIConsentModalProps) {
-  useEffect(() => {
-    if (isOpen) {
-      trackModalOpen('ai_consent');
-    }
-  }, [isOpen]);
+  // Removed modal tracking - not needed for simplified analytics
 
   if (!isOpen) return null;
 
@@ -93,7 +88,6 @@ export default function NilAIConsentModal({
           <button
             className="secondary"
             onClick={() => {
-              trackAIConsentDeclined();
               onDecline();
             }}
           >
@@ -102,7 +96,6 @@ export default function NilAIConsentModal({
           <button
             className="primary"
             onClick={() => {
-              trackAIConsentGiven();
               onAccept();
             }}
           >
diff --git a/app/components/OverviewReportModal.tsx b/app/components/OverviewReportModal.tsx
index a807628..2f04efa 100644
--- a/app/components/OverviewReportModal.tsx
+++ b/app/components/OverviewReportModal.tsx
@@ -6,6 +6,7 @@ import { useCustomization } from "./CustomizationContext";
 import { useAuth } from "./AuthProvider";
 import ReactMarkdown from 'react-markdown';
 import remarkGfm from 'remark-gfm';
+import { trackOverviewReportGenerated } from "@/lib/analytics";
 
 type GenerationPhase = 'idle' | 'map' | 'reduce' | 'complete' | 'error';
 
@@ -90,6 +91,8 @@ export default function OverviewReportModal({ isOpen, onClose }: OverviewReportM
           if (update.phase === 'complete') {
             clearInterval(timerInterval);
             setIsGenerating(false);
+            // Track overview report generation
+            trackOverviewReportGenerated(savedResults.length);
           } else if (update.phase === 'error') {
             clearInterval(timerInterval);
             setIsGenerating(false);
diff --git a/app/components/PaymentModal.tsx b/app/components/PaymentModal.tsx
index 1e5e5e0..52bfe0b 100644
--- a/app/components/PaymentModal.tsx
+++ b/app/components/PaymentModal.tsx
@@ -6,6 +6,7 @@ import { parseUnits, encodeFunctionData, createPublicClient, http, formatUnits }
 import { mainnet, base, arbitrum, optimism, polygon } from 'viem/chains';
 import { verifyPromoCode } from '@/lib/prime-verification';
 import StripeSubscriptionForm from './StripeSubscriptionForm';
+import { trackSubscribedWithPromoCode, trackSubscribedWithCreditCard, trackSubscribedWithStablecoin } from '@/lib/analytics';
 
 interface PaymentModalProps {
   isOpen: boolean;
@@ -143,6 +144,9 @@ export default function PaymentModal({ isOpen, onClose, onSuccess }: PaymentModa
       localStorage.setItem('promo_access', JSON.stringify({ code: promoCode, granted: Date.now() }));
       setPromoMessage({ type: 'success', text: result.message });
 
+      // Track promo code subscription
+      trackSubscribedWithPromoCode(promoCode);
+
       // Success - trigger callback and close modal
       setTimeout(() => {
         onSuccess();
@@ -161,6 +165,10 @@ export default function PaymentModal({ isOpen, onClose, onSuccess }: PaymentModa
     // Show success message
     setStep('card-success');
 
+    // Track credit card subscription
+    const durationDays = Math.round((parseFloat(amount || '0') / 4.99) * 30);
+    trackSubscribedWithCreditCard(durationDays);
+
     // Close modal after 3 seconds and trigger success callback
     setTimeout(() => {
       onClose();
@@ -261,6 +269,10 @@ export default function PaymentModal({ isOpen, onClose, onSuccess }: PaymentModa
         data: transferData,
       });
 
+      // Track stablecoin subscription
+      const durationDays = Math.round((parseFloat(amount || '0') / 4.99) * 30);
+      trackSubscribedWithStablecoin(durationDays);
+
       // Success
       setTimeout(() => {
         onSuccess();
diff --git a/app/components/PremiumPaywall.tsx b/app/components/PremiumPaywall.tsx
index f8989c9..320ac23 100644
--- a/app/components/PremiumPaywall.tsx
+++ b/app/components/PremiumPaywall.tsx
@@ -4,6 +4,7 @@ import { useState, useEffect } from 'react';
 import dynamic from 'next/dynamic';
 import { useAuth } from './AuthProvider';
 import { verifyPromoCode } from '@/lib/prime-verification';
+import { trackPremiumSectionViewed } from '@/lib/analytics';
 
 // Lazy load PaymentModal to reduce initial bundle size (viem + @dynamic-labs = ~86MB)
 const PaymentModal = dynamic(() => import('./PaymentModal'), {
@@ -46,6 +47,8 @@ export function PremiumPaywall({ children }: PremiumPaywallProps) {
   useEffect(() => {
     const handleOpenPaymentModal = () => {
       setShowPaymentModal(true);
+      // Track when user views premium section
+      trackPremiumSectionViewed();
     };
     window.addEventListener('openPaymentModal', handleOpenPaymentModal);
     return () => window.removeEventListener('openPaymentModal', handleOpenPaymentModal);
diff --git a/app/components/ResultsContext.tsx b/app/components/ResultsContext.tsx
index 25c2ca0..058bdd3 100644
--- a/app/components/ResultsContext.tsx
+++ b/app/components/ResultsContext.tsx
@@ -9,6 +9,7 @@ import {
   selectAndSaveResultsFile,
   markResultsUsed,
 } from "@/lib/dev-mode";
+import { trackResultsFileLoaded, trackResultsFileSaved } from "@/lib/analytics";
 
 type ResultsContextType = {
   savedResults: SavedResult[];
@@ -154,6 +155,9 @@ export function ResultsProvider({ children }: { children: ReactNode }) {
 
     // Regular save
     ResultsManager.saveResultsToFile(session);
+
+    // Track results file save
+    trackResultsFileSaved(savedResults.length);
   };
 
   const loadFromFile = async (currentFileHash?: string | null) => {
@@ -185,6 +189,9 @@ export function ResultsProvider({ children }: { children: ReactNode }) {
         markResultsUsed();
       }
 
+      // Track results file load
+      trackResultsFileLoaded(session.results.length);
+
       // Call the callback if it exists
       if (onResultsLoaded) {
         onResultsLoaded();
diff --git a/app/components/TermsAcceptanceModal.tsx b/app/components/TermsAcceptanceModal.tsx
index f7bb12e..61ac5b9 100644
--- a/app/components/TermsAcceptanceModal.tsx
+++ b/app/components/TermsAcceptanceModal.tsx
@@ -1,7 +1,7 @@
 "use client";
 
-import { useState, useEffect } from "react";
-import { trackModalOpen, trackTermsAcceptance } from "@/lib/analytics";
+import { useState } from "react";
+import { trackTermsAcceptance } from "@/lib/analytics";
 
 type TermsAcceptanceModalProps = {
   isOpen: boolean;
@@ -11,12 +11,6 @@ type TermsAcceptanceModalProps = {
 export default function TermsAcceptanceModal({ isOpen, onAccept }: TermsAcceptanceModalProps) {
   const [dontShowAgain, setDontShowAgain] = useState(false);
 
-  useEffect(() => {
-    if (isOpen) {
-      trackModalOpen('terms_acceptance');
-    }
-  }, [isOpen]);
-
   if (!isOpen) return null;
 
   const handleAccept = () => {
diff --git a/app/components/UserDataUpload.tsx b/app/components/UserDataUpload.tsx
index 9ff0719..dcffa90 100644
--- a/app/components/UserDataUpload.tsx
+++ b/app/components/UserDataUpload.tsx
@@ -4,10 +4,8 @@ import { useState, useRef, createContext, useContext, useCallback, useEffect } f
 import { GenotypeData, detectAndParseGenotypeFile, validateFileSize, validateFileFormat } from "@/lib/genotype-parser";
 import { calculateFileHash } from "@/lib/file-hash";
 import {
-  trackFileUploadStart,
   trackFileUploadSuccess,
-  trackFileUploadError,
-  trackFileCleared,
+  trackGenotypeFileLoaded,
 } from "@/lib/analytics";
 import {
   isDevModeEnabled,
@@ -79,9 +77,6 @@ export function GenotypeProvider({ children }: { children: React.ReactNode }) {
     setIsLoading(true);
     setError(null);
 
-    // Track upload start
-    trackFileUploadStart(file.size, fileExtension);
-
     try {
       // Validate file size (50MB limit)
       if (!validateFileSize(file, 50)) {
@@ -112,8 +107,8 @@ export function GenotypeProvider({ children }: { children: React.ReactNode }) {
 
       const parseDuration = performance.now() - startTime;
 
-      // Track successful upload
-      trackFileUploadSuccess(file.size, genotypeMap.size, parseDuration);
+      // Track successful genotype file load
+      trackGenotypeFileLoaded(file.size, genotypeMap.size);
 
       setGenotypeData(genotypeMap);
       setFileHash(hash);
@@ -131,9 +126,6 @@ export function GenotypeProvider({ children }: { children: React.ReactNode }) {
     } catch (err) {
       const errorMessage = err instanceof Error ? err.message : 'Upload failed';
       setError(errorMessage);
-
-      // Track upload error
-      trackFileUploadError(errorMessage, file.size);
     } finally {
       setIsLoading(false);
     }
@@ -144,9 +136,6 @@ export function GenotypeProvider({ children }: { children: React.ReactNode }) {
     setError(null);
     setFileHash(null);
     setOriginalFileName(null);
-
-    // Track file cleared
-    trackFileCleared();
   };
 
   const setOnDataLoadedCallback = useCallback((cb: (() => void) | null) => {
diff --git a/app/components/VariantChips.tsx b/app/components/VariantChips.tsx
index c3040c0..cba469e 100644
--- a/app/components/VariantChips.tsx
+++ b/app/components/VariantChips.tsx
@@ -1,7 +1,6 @@
 "use client";
 
 import { useGenotype } from "./UserDataUpload";
-import { trackVariantClick } from "@/lib/analytics";
 import { CheckIcon } from "./Icons";
 
 type VariantChipsProps = {
@@ -28,7 +27,6 @@ export default function VariantChips({ snps, riskAllele }: VariantChipsProps) {
           target="_blank"
           rel="noreferrer"
           title={userHasData ? `${riskAllele} - You have data for this variant` : riskAllele || undefined}
-          onClick={() => trackVariantClick(riskSnpId)}
           aria-label={userHasData ? `${riskAllele} - You have data for this variant` : riskAllele || riskSnpId}
         >
           {riskAllele}
diff --git a/app/page.tsx b/app/page.tsx
index d36636c..ea37074 100644
--- a/app/page.tsx
+++ b/app/page.tsx
@@ -21,12 +21,8 @@ import { analyzeStudyClientSide } from "@/lib/risk-calculator";
 import { isDevModeEnabled } from "@/lib/dev-mode";
 import {
   trackSearch,
-  trackFilterChange,
-  trackFilterReset,
-  trackSort,
-  trackStudyClick,
-  trackFeatureToggle,
-  trackAPITiming,
+  trackRunAllStarted,
+  trackQueryRun,
 } from "@/lib/analytics";
 
 type SortOption = "relevance" | "power" | "recent" | "alphabetical";
@@ -324,10 +320,7 @@ function MainContent() {
         next.offset = 0;
       }
 
-      // Track filter changes (with debouncing for search handled separately)
-      if (key !== 'search' && value !== null) {
-        trackFilterChange(key, value);
-      }
+      // Filter tracking removed for simplified analytics
 
       return next;
     });
@@ -378,17 +371,13 @@ function MainContent() {
 
         if (!response.ok) {
           const payload = await response.json().catch(() => ({}));
-          trackAPITiming('/api/studies', apiDuration, false);
           throw new Error(payload.error ?? "Failed to load studies");
         }
         const payload = (await response.json()) as StudiesResponse;
         if (payload.error) {
-          trackAPITiming('/api/studies', apiDuration, false);
           throw new Error(payload.error);
         }
 
-        trackAPITiming('/api/studies', apiDuration, true);
-
         let filteredData = payload.data ?? [];
 
         // Client-side filtering for user SNPs
@@ -479,7 +468,6 @@ function MainContent() {
   const resetFilters = () => {
     setFilters(defaultFilters);
     setDebouncedSearch(defaultFilters.search);
-    trackFilterReset();
   };
 
 
@@ -496,9 +484,6 @@ function MainContent() {
       updateFilter("sort", sortKey);
       updateFilter("sortDirection", newDirection);
     }
-
-    // Track sort change
-    trackSort(sortKey, newDirection);
   };
 
   const handleStudyColumnSort = () => {
@@ -509,7 +494,6 @@ function MainContent() {
       // Toggle direction for recent
       const newDirection = filters.sortDirection === "asc" ? "desc" : "asc";
       updateFilter("sortDirection", newDirection);
-      trackSort("recent", newDirection);
     } else {
       // Start with alphabetical
       handleColumnSort("alphabetical");
@@ -567,6 +551,9 @@ function MainContent() {
     });
     setRunAllProgress({ current: 0, total: 0 });
 
+    // Track Run All started (with estimated study count)
+    trackRunAllStarted(metadata?.totalStudies || 0);
+
     try {
       // Check if genotype data is loaded
       if (!genotypeData) {
@@ -978,7 +965,6 @@ function MainContent() {
                             href={studyLink}
                             target="_blank"
                             rel="noreferrer"
-                            onClick={() => trackStudyClick(study.study_accession, trait, study.confidenceBand)}
                           >
                             {study.study ?? "Untitled study"}
                           </a>
diff --git a/lib/analytics.ts b/lib/analytics.ts
index 3802e4c..b8c21bc 100644
--- a/lib/analytics.ts
+++ b/lib/analytics.ts
@@ -1,8 +1,8 @@
 /**
- * Google Analytics Event Tracking
+ * Simplified User Journey Analytics
  *
- * Privacy-compliant event tracking for user behavior insights.
- * All events are anonymized and contain no PII.
+ * Tracks only the core user journey milestones.
+ * Privacy-compliant with no PII tracking.
  */
 
 // Extend Window interface to include gtag
@@ -31,218 +31,201 @@ function trackEvent(eventName: string, params?: Record<string, any>) {
 }
 
 // ============================================================================
-// FILE OPERATIONS
+// CORE USER JOURNEY EVENTS (12 total)
 // ============================================================================
 
-export function trackFileUploadStart(fileSize: number, fileExtension: string) {
-  trackEvent('file_upload_start', {
-    file_size_kb: Math.round(fileSize / 1024),
-    file_extension: fileExtension.toLowerCase(),
-  });
-}
-
-export function trackFileUploadSuccess(
-  fileSize: number,
-  variantCount: number,
-  parseDuration: number
-) {
-  trackEvent('file_upload_success', {
-    file_size_kb: Math.round(fileSize / 1024),
-    variant_count: variantCount,
-    parse_duration_ms: Math.round(parseDuration),
-  });
-}
-
-export function trackFileUploadError(error: string, fileSize?: number) {
-  trackEvent('file_upload_error', {
-    error_type: error.substring(0, 100), // Limit length
-    file_size_kb: fileSize ? Math.round(fileSize / 1024) : undefined,
-  });
-}
-
-export function trackFileCleared() {
-  trackEvent('file_cleared');
+/**
+ * User accepted terms and moved past initial modal
+ */
+export function trackTermsAccepted() {
+  trackEvent('terms_accepted');
 }
 
-// ============================================================================
-// SEARCH & FILTERS
-// ============================================================================
-
-export function trackSearch(query: string, resultCount: number, loadTime: number) {
-  // Anonymize query - only track length and result count
-  trackEvent('search', {
-    query_length: query.length,
+/**
+ * User ran a search query to find studies
+ */
+export function trackQueryRun(resultCount: number) {
+  trackEvent('query_run', {
     result_count: resultCount,
-    load_time_ms: Math.round(loadTime),
   });
 }
 
-export function trackFilterChange(
-  filterType: string,
-  filterValue: string | number | boolean
-) {
-  const sanitizedValue =
-    typeof filterValue === 'string'
-      ? filterValue.substring(0, 50) // Limit string length
-      : filterValue;
-
-  trackEvent('filter_change', {
-    filter_type: filterType,
-    filter_value: String(sanitizedValue),
+/**
+ * User revealed/analyzed a study match
+ */
+export function trackMatchRevealed(hasUserData: boolean, matchCount: number) {
+  trackEvent('match_revealed', {
+    has_user_data: hasUserData,
+    match_count: matchCount,
   });
 }
 
-export function trackFilterReset() {
-  trackEvent('filter_reset');
+/**
+ * User ran AI analysis on a specific match
+ */
+export function trackAIAnalysisRun() {
+  trackEvent('ai_analysis_run');
 }
 
-export function trackSort(sortBy: string, direction: string) {
-  trackEvent('sort_change', {
-    sort_by: sortBy,
-    direction,
+/**
+ * User loaded a genotype file (DNA data)
+ */
+export function trackGenotypeFileLoaded(fileSize: number, variantCount: number) {
+  trackEvent('genotype_file_loaded', {
+    file_size_kb: Math.round(fileSize / 1024),
+    variant_count: variantCount,
   });
 }
 
-// ============================================================================
-// STUDY INTERACTIONS
-// ============================================================================
-
-export function trackStudyClick(
-  studyAccession: string | null,
-  trait: string | null,
-  confidenceBand: string
-) {
-  trackEvent('study_click', {
-    has_accession: !!studyAccession,
-    trait_category: trait?.substring(0, 50) || 'unknown',
-    confidence_band: confidenceBand,
+/**
+ * User loaded a previously saved results file
+ */
+export function trackResultsFileLoaded(resultCount: number) {
+  trackEvent('results_file_loaded', {
+    result_count: resultCount,
   });
 }
 
-export function trackStudyResultReveal(
-  hasUserData: boolean,
-  matchCount: number,
-  confidenceBand: string
-) {
-  trackEvent('study_result_reveal', {
-    has_user_data: hasUserData,
-    match_count: matchCount,
-    confidence_band: confidenceBand,
+/**
+ * User saved their results to a file
+ */
+export function trackResultsFileSaved(resultCount: number) {
+  trackEvent('results_file_saved', {
+    result_count: resultCount,
   });
 }
 
-export function trackVariantClick(rsid: string) {
-  trackEvent('variant_click', {
-    rsid,
-  });
+/**
+ * User navigated to the Premium section
+ */
+export function trackPremiumSectionViewed() {
+  trackEvent('premium_section_viewed');
 }
 
-// ============================================================================
-// MODAL INTERACTIONS
-// ============================================================================
-
-export function trackModalOpen(modalName: string) {
-  trackEvent('modal_open', {
-    modal_name: modalName,
-  });
+/**
+ * User logged in using Dynamic wallet authentication
+ */
+export function trackUserLoggedIn() {
+  trackEvent('user_logged_in');
 }
 
-export function trackModalClose(modalName: string, action: 'accept' | 'decline' | 'dismiss') {
-  trackEvent('modal_close', {
-    modal_name: modalName,
-    action,
+/**
+ * User clicked "Run All" to analyze all studies
+ */
+export function trackRunAllStarted(studyCount: number) {
+  trackEvent('run_all_started', {
+    study_count: studyCount,
   });
 }
 
-export function trackTermsAcceptance() {
-  trackEvent('terms_accepted');
-}
-
-export function trackDisclaimerView() {
-  trackEvent('disclaimer_viewed');
-}
-
-export function trackAIConsentGiven() {
-  trackEvent('ai_consent_given');
+/**
+ * User asked the LLM a question in chat
+ */
+export function trackLLMQuestionAsked() {
+  trackEvent('llm_question_asked');
 }
 
-export function trackAIConsentDeclined() {
-  trackEvent('ai_consent_declined');
+/**
+ * User generated an Overview Report
+ */
+export function trackOverviewReportGenerated(resultCount: number) {
+  trackEvent('overview_report_generated', {
+    result_count: resultCount,
+  });
 }
 
-// ============================================================================
-// LLM ANALYSIS
-// ============================================================================
-
-export function trackAIAnalysisStart(studyCount: number) {
-  trackEvent('llm_analysis_start', {
-    study_count: studyCount,
+/**
+ * User subscribed using a promo code
+ */
+export function trackSubscribedWithPromoCode(promoCode: string) {
+  trackEvent('subscribed_promo_code', {
+    promo_code: promoCode,
   });
 }
 
-export function trackAIAnalysisSuccess(duration: number, studyCount: number) {
-  trackEvent('llm_analysis_success', {
-    duration_ms: Math.round(duration),
-    study_count: studyCount,
+/**
+ * User subscribed with credit card payment
+ */
+export function trackSubscribedWithCreditCard(durationDays: number) {
+  trackEvent('subscribed_credit_card', {
+    duration_days: durationDays,
   });
 }
 
-export function trackAIAnalysisError(error: string) {
-  trackEvent('llm_analysis_error', {
-    error_type: error.substring(0, 100),
+/**
+ * User subscribed with stablecoin payment
+ */
+export function trackSubscribedWithStablecoin(durationDays: number) {
+  trackEvent('subscribed_stablecoin', {
+    duration_days: durationDays,
   });
 }
 
-// ============================================================================
-// PERFORMANCE METRICS
-// ============================================================================
-
-export function trackAPITiming(endpoint: string, duration: number, success: boolean) {
-  trackEvent('api_timing', {
-    endpoint,
-    duration_ms: Math.round(duration),
-    success,
-  });
+/**
+ * User updated their personalization settings
+ */
+export function trackPersonalizationUpdated() {
+  trackEvent('personalization_updated');
 }
 
-export function trackPageLoad(loadTime: number) {
-  trackEvent('page_load', {
-    load_time_ms: Math.round(loadTime),
+/**
+ * User switched AI provider
+ */
+export function trackAIProviderSwitched(newProvider: string) {
+  trackEvent('ai_provider_switched', {
+    provider: newProvider,
   });
 }
 
 // ============================================================================
-// FEATURE USAGE
+// DEPRECATED FUNCTIONS (for backwards compatibility during migration)
+// These will be removed once all components are updated
 // ============================================================================
 
-export function trackFeatureToggle(featureName: string, enabled: boolean) {
-  trackEvent('feature_toggle', {
-    feature: featureName,
-    enabled,
-  });
+/** @deprecated Use trackGenotypeFileLoaded instead */
+export function trackFileUploadSuccess(fileSize: number, variantCount: number) {
+  trackGenotypeFileLoaded(fileSize, variantCount);
 }
 
-export function trackExport(exportType: string, itemCount: number) {
-  trackEvent('export', {
-    export_type: exportType,
-    item_count: itemCount,
-  });
+/** @deprecated Use trackQueryRun instead */
+export function trackSearch(query: string, resultCount: number, loadTime: number) {
+  trackQueryRun(resultCount);
 }
 
-// ============================================================================
-// USER JOURNEY
-// ============================================================================
-
-export function trackUserJourneyStep(step: string, metadata?: Record<string, any>) {
-  trackEvent('user_journey', {
-    step,
-    ...metadata,
-  });
+/** @deprecated Use trackMatchRevealed instead */
+export function trackStudyResultReveal(hasUserData: boolean, matchCount: number, confidenceBand: string) {
+  trackMatchRevealed(hasUserData, matchCount);
 }
 
-export function trackEngagement(action: string, value?: number) {
-  trackEvent('engagement', {
-    action,
-    value,
-  });
+/** @deprecated Use trackAIAnalysisRun instead */
+export function trackAIAnalysisStart(studyCount: number) {
+  trackAIAnalysisRun();
 }
+
+/** @deprecated Use trackTermsAccepted instead */
+export function trackTermsAcceptance() {
+  trackTermsAccepted();
+}
+
+// Stub out removed functions to prevent errors during migration
+export function trackFileUploadStart() {}
+export function trackFileUploadError() {}
+export function trackFileCleared() {}
+export function trackFilterChange() {}
+export function trackFilterReset() {}
+export function trackSort() {}
+export function trackStudyClick() {}
+export function trackVariantClick() {}
+export function trackModalOpen() {}
+export function trackModalClose() {}
+export function trackDisclaimerView() {}
+export function trackAIConsentGiven() {}
+export function trackAIConsentDeclined() {}
+export function trackAIAnalysisSuccess() {}
+export function trackAIAnalysisError() {}
+export function trackAPITiming() {}
+export function trackPageLoad() {}
+export function trackFeatureToggle() {}
+export function trackExport() {}
+export function trackUserJourneyStep() {}
+export function trackEngagement() {}