diff --git a/HTMLTemplates/certifications.mako b/HTMLTemplates/certifications.mako
index 8881e64..e387440 100644
--- a/HTMLTemplates/certifications.mako
+++ b/HTMLTemplates/certifications.mako
@@ -1,42 +1,492 @@
-<%def name="scripts()">
-</%def>
-<%def name="head()">
-<meta http-equiv="refresh" content="60">
-</%def>
-
-<%def name="title()">Certifications</%def>
-<%inherit file="base.mako"/>
-
-
-% if message:
-<H1>${message}</H1>
-% endif
-
-<TABLE class="certifications">
-% if show_table_header:
-<TR>
-% if show_left_names:
-   <TH></TH>
-% endif
-% for tool in tools:
-   <TH>${tool[1]}</TH>
-% endfor
-% if show_right_names:
-   <TH></TH>
-% endif
-</TR>
-% endif
-% for user, user_tools in certifications.items():
-   <TR>
-   % if show_left_names:
-   <TD>${user_tools.displayName}</TD>
-   % endif
-   % for tool in tools:
-      ${user_tools.getHTMLCellTool(tool[0]) | n}
-   % endfor
-   % if show_right_names:
-   <TD>${user_tools.displayName}</TD>
-   % endif
-   </TR>
-% endfor
-</TABLE>
\ No newline at end of file
+<%def name="scripts()">
+<script>
+// ===== FEATURE FLAGS =====
+const ENABLE_RESOURCE_PAGE = false;  // Set to false to disable resource page
+const SCROLL_CYCLES_BEFORE_RESOURCE = 1;  // Show resource page every N full scrolls (1 = every time)
+
+// ===== AUTO-SCROLL CONFIGURATION =====
+const SCROLL_SPEED = 30; // pixels per second for certification grid
+const PAUSE_DURATION = 1; // milliseconds to pause when new row enters view
+const ROW_HEIGHT = 50; // approximate height of one row in pixels
+const RESOURCE_PAGE_DURATION = 12000; // milliseconds to show resource page
+const RESOURCE_SCROLL_SPEED = 40; // pixels per second for resource page (no pauses, so can be faster)
+const RESTART_PAUSE = 2000; // pause before restarting scroll cycle
+
+// ===== STATE VARIABLES =====
+let scrollPosition = 0;
+let resourceScrollPosition = 0;
+let isPaused = false;
+let lastRowCrossed = 0;
+let isShowingResourcePage = false;
+let hasCompletedCycle = false;
+let completedCycleCount = 0;
+let contentDuplicated = false;
+
+function smoothScroll() {
+    if (isPaused || isShowingResourcePage) return;
+    
+    const tableBody = document.getElementById('scrolling-body');
+    const container = document.querySelector('.table-container');
+    
+    if (!tableBody || !container) return;
+    
+    // Duplicate content for seamless looping (only once)
+    if (!contentDuplicated) {
+        const rows = Array.from(tableBody.querySelectorAll('tr'));
+        rows.forEach(row => {
+            const clone = row.cloneNode(true);
+            tableBody.appendChild(clone);
+        });
+        contentDuplicated = true;
+    }
+    
+    // Calculate scroll boundaries
+    const singleSetHeight = tableBody.offsetHeight / 2; // Height of original content (before duplication)
+    
+    if (singleSetHeight <= container.offsetHeight) {
+        // Content fits on screen, handle resource page
+        if (!hasCompletedCycle && ENABLE_RESOURCE_PAGE) {
+            hasCompletedCycle = true;
+            completedCycleCount++;
+            if (completedCycleCount >= SCROLL_CYCLES_BEFORE_RESOURCE) {
+                setTimeout(showResourcePage, PAUSE_DURATION * 2);
+            } else {
+                hasCompletedCycle = false;
+            }
+        }
+        return;
+    }
+    
+    // Increment scroll position
+    scrollPosition += SCROLL_SPEED / 60;
+    
+    // Check if we have crossed into a new row
+    const currentRow = Math.floor(scrollPosition / ROW_HEIGHT);
+    if (currentRow > lastRowCrossed) {
+        lastRowCrossed = currentRow;
+        isPaused = true;
+        setTimeout(() => {
+            isPaused = false;
+        }, PAUSE_DURATION);
+    }
+    
+    // Seamless loop: when we have scrolled through one complete set, jump back to start
+    // The duplicate content is now visible, so the jump is invisible
+    if (scrollPosition >= singleSetHeight) {
+        // Mark that we have completed a cycle
+        completedCycleCount++;
+        
+        // Reset to start (seamlessly)
+        scrollPosition = 0;
+        lastRowCrossed = 0;
+        container.scrollTop = 0;
+        
+        // Check if we should show resource page
+        if (ENABLE_RESOURCE_PAGE && completedCycleCount >= SCROLL_CYCLES_BEFORE_RESOURCE) {
+            hasCompletedCycle = true;
+            isPaused = true;
+            setTimeout(showResourcePage, RESTART_PAUSE);
+        }
+        return;
+    }
+    
+    container.scrollTop = scrollPosition;
+}
+
+function smoothScrollResourcePage() {
+    if (!isShowingResourcePage) return;
+    
+    const container = document.getElementById('resource-page');
+    if (!container) return;
+    
+    // Calculate total scrollable height
+    const maxScroll = container.scrollHeight - container.clientHeight;
+    
+    if (maxScroll <= 0) {
+        // Content fits on screen, no scrolling needed
+        return;
+    }
+    
+    // Increment scroll position (continuous, no pauses)
+    resourceScrollPosition += RESOURCE_SCROLL_SPEED / 60;
+    
+    // Loop back to top when we reach the end
+    if (resourceScrollPosition >= maxScroll) {
+        resourceScrollPosition = 0;
+    }
+    
+    container.scrollTop = resourceScrollPosition;
+}
+
+function showResourcePage() {
+    isShowingResourcePage = true;
+    completedCycleCount = 0; // Reset the cycle counter
+    
+    // Save current scroll position before switching
+    sessionStorage.setItem('certScrollBeforeResource', scrollPosition.toString());
+    
+    document.querySelector('.table-container').style.display = 'none';
+    document.getElementById('resource-page').style.display = 'block';
+    
+    // Resume from where we left off
+    document.getElementById('resource-page').scrollTop = resourceScrollPosition;
+    
+    // Return to grid after duration
+    setTimeout(hideResourcePage, RESOURCE_PAGE_DURATION);
+}
+
+function hideResourcePage() {
+    isShowingResourcePage = false;
+    hasCompletedCycle = false;
+    // Do not reset resourceScrollPosition - it will continue from here next time
+    
+    document.getElementById('resource-page').style.display = 'none';
+    document.querySelector('.table-container').style.display = 'block';
+    
+    // Restore the cylinder position (do not reset to 0)
+    const savedPosition = sessionStorage.getItem('certScrollBeforeResource');
+    if (savedPosition !== null) {
+        scrollPosition = parseFloat(savedPosition);
+        document.querySelector('.table-container').scrollTop = scrollPosition;
+    }
+    
+    // Pause briefly, then resume scrolling
+    isPaused = true;
+    setTimeout(() => {
+        isPaused = false;
+    }, RESTART_PAUSE);
+}
+
+// Save scroll position before page unload
+window.addEventListener('beforeunload', () => {
+    sessionStorage.setItem('certScrollPosition', scrollPosition.toString());
+    sessionStorage.setItem('certCompletedCycles', completedCycleCount.toString());
+    sessionStorage.setItem('certResourceScrollPosition', resourceScrollPosition.toString());
+    sessionStorage.setItem('certIsShowingResourcePage', isShowingResourcePage.toString());
+});
+
+// Start scrolling when page loads
+window.addEventListener('load', () => {
+    // Restore saved state if it exists
+    const savedScroll = sessionStorage.getItem('certScrollPosition');
+    const savedCycles = sessionStorage.getItem('certCompletedCycles');
+    const savedResourceScroll = sessionStorage.getItem('certResourceScrollPosition');
+    const savedShowingResource = sessionStorage.getItem('certIsShowingResourcePage');
+    
+    if (savedScroll !== null) {
+        scrollPosition = parseFloat(savedScroll);
+    }
+    
+    if (savedCycles !== null) {
+        completedCycleCount = parseInt(savedCycles);
+    }
+    
+    if (savedResourceScroll !== null) {
+        resourceScrollPosition = parseFloat(savedResourceScroll);
+    }
+    
+    // If we were showing resource page when reload happened, show it again
+    if (savedShowingResource === 'true') {
+        showResourcePage();
+    } else {
+        // Restore scroll position for certification grid
+        if (savedScroll !== null) {
+            // Wait for content duplication to happen first
+            setTimeout(() => {
+                document.querySelector('.table-container').scrollTop = scrollPosition;
+            }, 100);
+        }
+    }
+    
+    // Start scrolling
+    setInterval(() => {
+        smoothScroll();
+        smoothScrollResourcePage();
+    }, 1000 / 60);
+});
+</script>
+
+<style>
+.table-container {
+    height: calc(100vh - 20px);
+    overflow: hidden;
+    position: relative;
+}
+
+.certifications {
+    width: 100%;
+    border-collapse: collapse;
+}
+
+.certifications thead {
+    position: sticky;
+    top: 0;
+    background: #1a1a1a;
+    z-index: 10;
+    box-shadow: 0 2px 4px rgba(0,0,0,0.3);
+}
+
+.certifications th {
+    padding: 8px 4px;
+    font-size: 1.0vw;
+    font-weight: bold;
+    border: 2px solid #333;
+    white-space: wrap;
+}
+
+.certifications td {
+    padding: 6px 4px;
+    font-size: 1.2em;
+    border: 1px solid #444;
+    text-align: center;
+}
+
+.certifications td.user-name {
+    font-weight: bold;
+    font-size: 1.0vw;
+    position: sticky;
+    background: inherit;
+}
+
+.certifications td.user-name.left {
+    left: 0;
+    z-index: 5;
+}
+
+.certifications td.user-name.right {
+    right: 0;
+    z-index: 5;
+}
+
+/* Certification cell font sizes */
+.certifications td.clNone,
+.certifications td.clBasic,
+.certifications td.clCertified,
+.certifications td.clDOF,
+.certifications td.clInstructor,
+.certifications td.clCertifier {
+    font-size: 1.0vw !important;
+}
+
+/* Resource Page Styles */
+#resource-page {
+    display: none;
+    height: calc(100vh - 20px);
+    overflow-y: auto;
+    overflow-x: hidden;
+    background: #1a1a1a;
+    padding: 20px;
+    scroll-behavior: smooth;
+}
+
+/* Hide scrollbar for resource page but keep functionality */
+#resource-page::-webkit-scrollbar {
+    display: none;
+}
+
+#resource-page {
+    -ms-overflow-style: none;  /* IE and Edge */
+    scrollbar-width: none;  /* Firefox */
+}
+
+#resource-page h1 {
+    text-align: center;
+    font-size: 2.5em;
+    margin: 20px 0 40px 0;
+    border-bottom: 4px solid #444;
+    padding-bottom: 20px;
+    color: #fff;
+}
+
+.tool-help-section {
+    margin-bottom: 25px;
+    padding: 15px;
+    background: #2a2a2a;
+    border-radius: 8px;
+    border-left: 5px solid #555;
+}
+
+.tool-name {
+    font-size: 1.8em;
+    font-weight: bold;
+    color: #fff;
+    margin-bottom: 10px;
+}
+
+.helper-group {
+    margin: 8px 0;
+    font-size: 1.4em;
+}
+
+.helper-label {
+    display: inline-block;
+    width: 200px;
+    font-weight: bold;
+}
+
+.helper-label.dof {
+    color: #ff9933; /* Orange for DoF */
+}
+
+.helper-label.instructor {
+    color: #4da6ff; /* Blue for Instructor */
+}
+
+.helper-label.certifier {
+    color: #999; /* Grey for Certifier */
+}
+
+.helper-names {
+    display: inline;
+    color: #ddd;
+}
+
+.no-helpers {
+    color: #666;
+    font-style: italic;
+}
+
+/* Two-column layout for resource page on wide screens */
+@media (min-width: 1400px) {
+    .tools-grid {
+        display: grid;
+        grid-template-columns: 1fr 1fr;
+        gap: 20px;
+    }
+}
+
+/* Gradient hint at bottom of resource page */
+#resource-page::after {
+    content: '';
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    height: 60px;
+    background: linear-gradient(to bottom, transparent, rgba(0,0,0,0.8));
+    pointer-events: none;
+}
+</style>
+</%def>
+
+<%def name="head()">
+<meta http-equiv="refresh" content="60">
+</%def>
+
+<%def name="title()">Certifications</%def>
+<%inherit file="base.mako"/>
+
+% if message:
+<H1>${message}</H1>
+% endif
+
+<!-- Main Certification Grid -->
+<div class="table-container">
+    <table class="certifications">
+        <thead>
+            <tr>
+                % if show_left_names:
+                <th class="name-column">Name</th>
+                % endif
+                % for tool in tools:
+                <th>${tool[1]}</th>
+                % endfor
+                % if show_right_names:
+                <th class="name-column">Name</th>
+                % endif
+            </tr>
+        </thead>
+        <tbody id="scrolling-body">
+            % for user, user_tools in certifications.items():
+            <tr>
+                % if show_left_names:
+                <td class="user-name left">${user_tools.displayName}</td>
+                % endif
+                % for tool in tools:
+                ${user_tools.getHTMLCellTool(tool[0]) | n}
+                % endfor
+                % if show_right_names:
+                <td class="user-name right">${user_tools.displayName}</td>
+                % endif
+            </tr>
+            % endfor
+        </tbody>
+    </table>
+</div>
+
+<!-- Resource Page: Who Can Help -->
+<div id="resource-page">
+    <h1>WHO CAN HELP YOU RIGHT NOW</h1>
+    
+    <div class="tools-grid">
+    <%
+        # Import the CertificationLevels enum
+        from certifications import CertificationLevels
+        
+        # Build helper data structure
+        # This organizes users by their certification level on each tool
+        tool_helpers = {}
+        for tool in tools:
+            tool_id = tool[0]
+            tool_name = tool[1]
+            tool_helpers[tool_id] = {
+                'name': tool_name,
+                'dof': [],
+                'instructor': [],
+                'certifier': []
+            }
+        
+        # Iterate through all present users and categorize them
+        for user, user_tools in certifications.items():
+            for tool in tools:
+                tool_id = tool[0]
+                # Get the certification tuple (date, level)
+                date, level = user_tools.getTool(tool_id)
+                
+                # Categorize by level
+                if level == CertificationLevels.DOF:
+                    tool_helpers[tool_id]['dof'].append(user_tools.displayName)
+                elif level == CertificationLevels.INSTRUCTOR:
+                    tool_helpers[tool_id]['instructor'].append(user_tools.displayName)
+                elif level == CertificationLevels.CERTIFIER:
+                    tool_helpers[tool_id]['certifier'].append(user_tools.displayName)
+    %>
+    
+    % for tool in tools:
+    <%
+        tool_id = tool[0]
+        tool_name = tool[1]
+    %>
+        <div class="tool-help-section">
+            <div class="tool-name">${tool_name}</div>
+            
+            <div class="helper-group">
+                <span class="helper-label dof">Defenders of Fingers:</span>
+                % if tool_helpers[tool_id]['dof']:
+                    <span class="helper-names">${', '.join(tool_helpers[tool_id]['dof'])}</span>
+                % else:
+                    <span class="no-helpers">None available</span>
+                % endif
+            </div>
+            
+            <div class="helper-group">
+                <span class="helper-label instructor">Instructors:</span>
+                % if tool_helpers[tool_id]['instructor']:
+                    <span class="helper-names">${', '.join(tool_helpers[tool_id]['instructor'])}</span>
+                % else:
+                    <span class="no-helpers">None available</span>
+                % endif
+            </div>
+            
+            <div class="helper-group">
+                <span class="helper-label certifier">Certifiers:</span>
+                % if tool_helpers[tool_id]['certifier']:
+                    <span class="helper-names">${', '.join(tool_helpers[tool_id]['certifier'])}</span>
+                % else:
+                    <span class="no-helpers">None available</span>
+                % endif
+            </div>
+        </div>
+    % endfor
+    </div>
+</div>
diff --git a/HTMLTemplates/certifications_v2.mako b/HTMLTemplates/certifications_v2.mako
new file mode 100644
index 0000000..5c8bd1d
--- /dev/null
+++ b/HTMLTemplates/certifications_v2.mako
@@ -0,0 +1,161 @@
+<%def name="scripts()">
+<script>
+// Pagination: show one page at a time with a 15s timer progress bar
+const PAGE_SECONDS = 10;
+let pageIndex = 0;
+let pageTimer = null;
+let progressTimer = null;
+
+// Data from server (pre-serialized JSON)
+function getToolsData(){
+  const el = document.getElementById('tools-json');
+  if(!el) return [];
+  try { return JSON.parse(el.textContent || '[]'); } catch(e){ return []; }
+}
+let toolsData = [];
+
+function renderPage(idx){
+  const container = document.getElementById('cards-grid');
+  if(!container) return;
+  const pageSize = 5; // exactly 5 tools per page
+  const start = (idx * pageSize) % toolsData.length;
+  const slice = toolsData.slice(start, start + pageSize);
+  const items = slice.length < pageSize ? slice.concat(toolsData.slice(0, pageSize - slice.length)) : slice;
+  var html = '';
+  items.forEach(function(tool){
+    var sources = '';
+    if (tool.image_url) { sources += '<source srcset="' + tool.image_url + '" type="image/avif"/>'; }
+    if (tool.img_avif)  { sources += '<source srcset="' + tool.img_avif  + '" type="image/avif"/>'; }
+    if (tool.img_png)   { sources += '<source srcset="' + tool.img_png   + '" type="image/png"/>'; }
+    if (tool.img_jpg)   { sources += '<source srcset="' + tool.img_jpg   + '" type="image/jpeg"/>'; }
+    var imgSrc = tool.img_png || tool.img_jpg || tool.image_url || '/static/tools/placeholder.svg';
+    var membersHtml = '';
+    if (!tool.members || tool.members.length === 0) {
+      membersHtml = "<div class='member' style='color:var(--muted)'>No certified members</div>";
+    } else {
+      for (var i=0;i<tool.members.length;i++){
+        var m = tool.members[i];
+        membersHtml += "<div class='member level-" + m.level + "'>" +
+                       "<div class='name'>" + m.displayName + "</div>" +
+                       "<div class='level-chip level-" + m.level + "'>" + m.level_name + "</div>" +
+                       "</div>";
+      }
+    }
+    html += '<div class="card">' +
+              '<div class="card-top">' +
+                '<picture class="tool-hero">' + sources +
+                  '<img class="tool-hero" src="' + imgSrc + '" alt="' + tool.name + '" onerror="this.onerror=null; this.src=\'/static/tools/placeholder.svg\';"/>' +
+                '</picture>' +
+                '<div class="card-header">' +
+                  '<div class="card-title">' + tool.name + '</div>' +
+                '</div>' +
+              '</div>' +
+              '<div class="card-body">' +
+                membersHtml +
+              '</div>' +
+            '</div>';
+  });
+  container.innerHTML = html;
+}
+
+function startPagination(){
+  const bar = document.getElementById('progress-bar');
+  const inner = document.getElementById('progress-inner');
+  // Load tools data now that DOM is ready
+  toolsData = getToolsData();
+  function tick(){
+    // advance page
+    pageIndex = (pageIndex + 1) % Math.ceil(toolsData.length / 5);
+    renderPage(pageIndex);
+    // restart progress
+    inner.style.transition = 'none';
+    inner.style.width = '0%';
+    requestAnimationFrame(function(){
+      requestAnimationFrame(function(){
+        inner.style.transition = 'width ' + PAGE_SECONDS + 's linear';
+        inner.style.width = '100%';
+      });
+    });
+  }
+  // initial render and animate
+  renderPage(pageIndex);
+  inner.style.transition = 'width ' + PAGE_SECONDS + 's linear';
+  inner.style.width = '100%';
+  if(pageTimer) clearInterval(pageTimer);
+  pageTimer = setInterval(tick, PAGE_SECONDS * 1000);
+}
+
+window.addEventListener('load', startPagination);
+
+// Live clock in header (right side)
+function updateClock(){
+  const el = document.getElementById('cm-clock');
+  if(!el) return;
+  const now = new Date();
+  el.textContent = now.toLocaleString();
+}
+setInterval(updateClock, 1000);
+window.addEventListener('load', updateClock);
+</script>
+</%def>
+<%def name="head()">
+<style>
+:root{ --c10:#0e7490; --c20:#166534; --c30:#92400e; --c40:#7f1d1d; --card:#0b1220; --text:#e5e7eb; --muted:#94a3b8; --bg:#0a0f1a; --border:#1f2937; --accent:#60a5fa; --basic:#ef4444; --certified:#22c55e; --dof:#eab308; --instructor:#3b82f6; --certifier:#9ca3af; }
+body{ font-family: system-ui, -apple-system, Segoe UI, Roboto, Arial, sans-serif; background: var(--bg); color: var(--text); }
+/* Member row accents per level */
+.member.level-1{ background: rgba(239,68,68,.12); border-left:4px solid var(--basic); }
+.member.level-10{ background: rgba(34,197,94,.12); border-left:4px solid var(--certified); }
+.member.level-20{ background: rgba(234,179,8,.12); border-left:4px solid var(--dof); }
+.member.level-30{ background: rgba(59,130,246,.12); border-left:4px solid var(--instructor); }
+.member.level-40{ background: rgba(156,163,175,.12); border-left:4px solid var(--certifier); }
+.grid{ display:grid; grid-template-columns: repeat(1, minmax(0, 1fr)); gap:16px; }
+@media(min-width:640px){ .grid{ grid-template-columns: repeat(2, minmax(0, 1fr)); } }
+@media(min-width:900px){ .grid{ grid-template-columns: repeat(3, minmax(0, 1fr)); } }
+@media(min-width:1200px){ .grid{ grid-template-columns: repeat(4, minmax(0, 1fr)); } }
+@media(min-width:1440px){ .grid{ grid-template-columns: repeat(5, minmax(0, 1fr)); } }
+.card{ background:var(--card); border-radius:12px; box-shadow: 0 2px 12px rgba(0,0,0,.4); border:1px solid var(--border); overflow:hidden; display:flex; flex-direction:column; }
+.card-top{ position:sticky; top:0; z-index:1; background: var(--card); border-bottom:1px solid var(--border); }
+.card-header{ display:flex; align-items:center; justify-content:center; gap:12px; padding:12px 14px; }
+.card-title{ font-weight:700; color:var(--text); font-size:24px; text-align:center; width:100%; }
+.tool-hero{ width:100%; height:200px; object-fit:contain; background:#0b1220; border-bottom:1px solid var(--border); }
+.card-body{ padding:10px 14px; display:flex; flex-direction:column; gap:8px; }
+.member{ display:flex; align-items:center; justify-content:space-between; padding:6px 8px; border-radius:8px; }
+.name{ font-size:14px; color:var(--text); font-weight:500; }
+.level-chip{ font-size:12px; padding:2px 8px; border-radius:9999px; border:1px solid var(--border); color:#0a0a0a; background:#e5e7eb; }
+/* Chips per level */
+.level-chip.level-1{ background: var(--basic); }
+.level-chip.level-10{ background: var(--certified); }
+.level-chip.level-20{ background: var(--dof); }
+.level-chip.level-30{ background: var(--instructor); }
+.level-chip.level-40{ background: var(--certifier); }
+#cards-container{ max-height: calc(100vh - 160px); overflow:hidden; padding-right:6px; }
+.header{ display:flex; align-items:center; justify-content:space-between; gap:12px; flex-wrap:wrap; margin: 6px 0 10px; }
+.masthead{ display:grid; grid-template-columns: 1fr auto 1fr; align-items:center; gap:12px; margin: 6px 0 6px; }
+.masthead .left{ justify-self:start; }
+.masthead .center{ justify-self:center; }
+.masthead .right{ justify-self:end; }
+.title{ font-size:40px; font-weight:700; color: var(--text); }
+.clock{ color: var(--muted); font-size: 28px; }
+.progress { height: 6px; width: 100%; background: #111827; border-radius: 9999px; overflow: hidden; border:1px solid var(--border); }
+.progress > .bar { height: 100%; width: 0%; background: var(--accent); }
+.logo-bar{ display:flex; align-items:center; justify-content:center; padding:0; }
+.logo-bar img{ max-height:80px; width:auto; opacity:.9; }
+</style>
+</%def>
+
+<%def name="title()">Certification Monitor</%def>
+<%inherit file="base.mako"/>
+
+<div class="masthead">
+  <div class="left title">Certification Monitor</div>
+  <div class="center logo-bar">
+    <img src="https://photos.smugmug.com/Logos/TFD-TFI-TUF-Logos/i-dDKzxPw/0/NcCVLCWrFZQczNXLvBsB4qgHDSC7bxX4P8mSH7DS3/XL/TFI%20logo%20BLACK%20high%20quality%20no%20tagline-XL.jpg" alt="TFI logo" />
+  </div>
+  <div class="right clock" id="cm-clock"></div>
+  </div>
+
+<div id="cards-container">
+  <script id="tools-json" type="application/json">${ (tools_json if tools_json is not UNDEFINED else '[]') | n }</script>
+  <div class="progress" id="progress-bar"><div class="bar" id="progress-inner"></div></div>
+  <div class="grid" id="cards-grid"></div>
+</div>
diff --git a/HTMLTemplates/links.mako b/HTMLTemplates/links.mako
index 6494fbc..fa84084 100644
--- a/HTMLTemplates/links.mako
+++ b/HTMLTemplates/links.mako
@@ -23,9 +23,9 @@ ${self.logo()}<br/>
    <fieldset><legend>Personal</legend>
    <UL>
    % if inBuilding:
-      <LI><A HREF="/station/checkout?barcode=${barcode}">Check out of BFF</A>
+      <LI><A HREF="/station/checkout?barcode=${barcode}">Check out of The Forge</A>
    % else:
-      <LI><A HREF="/station/checkin?barcode=${barcode}">Check into BFF</A>
+      <LI><A HREF="/station/checkin?barcode=${barcode}">Check into The Forge</A>
    % endif
    <LI><A HREF="/certifications/user?barcode=${barcode}">My Shop Certifications</A>
    % if role.value != 0:
@@ -37,7 +37,7 @@ ${self.logo()}<br/>
    </fieldset><br/>
    <fieldset><legend>General</legend>
    <UL>
-      <LI><A HREF="/whoishere">See who is at BFF</A>
+      <LI><A HREF="/whoishere">See who is at The Forge</A>
       <LI><A HREF="https://calendar.google.com/calendar/embed?src=h75eigkfjvngvpff1dq0af74mk%40group.calendar.google.com&ctz=America%2FNew_York">TFI Calendar</A>
       <LI><A HREF="https://app.theforgeinitiative.org/">Forge Member App</A>
    </UL>
@@ -47,9 +47,7 @@ ${self.logo()}<br/>
    <fieldset>
    <legend>Keyholder</legend>
    <UL>
-      <LI><A HREF="http://192.168.1.10">Downstairs Door (Works ONLY when at BFF)</A></LI>
-      <LI><A HREF="http://10.0.0.10">Upstairs Door (Works ONLY when at BFF)</A></LI>
-
+      <LI><A HREF="http://192.168.1.10">Front Door (Works ONLY when at The Forge)</A></LI>
       <LI><A HREF="/station/makeKeyholder?barcode=${barcode}">Make ME Keyholder</A></LI>
       <LI><A HREF="/station/updatePresent">Update who is in building</A></LI>
       <LI><A HREF="/admin/oops">Oops (Didn't meant to close building)</A></LI>
@@ -88,7 +86,7 @@ ${self.logo()}<br/>
    </fieldset><br/>
    % endif
 % endif
-<fieldset><legend>BFF Stations</legend>
+<fieldset><legend>Check-in Stations</legend>
 <UL>
    <LI><A HREF="/station">Main Station</A></LI>
    <LI><A HREF="/guests">Guest Station</A></LI>
@@ -97,4 +95,4 @@ ${self.logo()}<br/>
 </fieldset></br/>
 <hr/>
    To add feature requests or report issues, please go to:<A HREF="https://github.com/alan412/CheckMeIn/issues">https://github.com/alan412/CheckMeIn/issues</A>
-<br/>
\ No newline at end of file
+<br/>
diff --git a/README.md b/README.md
index c712858..1c41823 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,7 @@
 a system for checking into and out of a building
 
 # Setup
+Start in the repo. e.g. ```cd .../CheckMeIn``` for wherever you clone the repo.
 You'll need a python venv, set it up like this:
   1. ```python3 -m venv venv```
   2. ```source venv/bin/activate```
@@ -23,13 +24,13 @@ DO NOT push these renamed files to the origin repository.
 Once you are satisfied that you have the dependencies met, and the unit tests are passing, then to run the
 server, you will execute:
 
-```python3 checkmein.py development.conf```
+```python3 checkMeIn.py development.conf```
 
 You can connect to your server using a local browser at "http://localhost:8089"
 Note: 
-* When first starting, assuming you ran the tests, you may choose to
-```mkdir data```
-```cp testData test.db data/checkmein.db```
+* When first starting, assuming you ran the tests, you may choose to     
+```mkdir data```     
+```cp testData/test.db data/checkMeIn.db```    
 This gives you a database with a couple of members and an admin user whose name 
 is 'admin' and password is 'password'. 
 
diff --git a/checkMeIn.py b/checkMeIn.py
index 12302d8..ed41cd4 100644
--- a/checkMeIn.py
+++ b/checkMeIn.py
@@ -3,6 +3,7 @@
 from mako.lookup import TemplateLookup
 import cherrypy
 import cherrypy.process.plugins
+import os
 
 import engine
 from webBase import WebBase, Cookie
@@ -24,8 +25,9 @@ def update(self, msg):
         cherrypy.engine.publish(self.updateChannel, fullMessage)
 
     def __init__(self):
+        templates_dir = os.path.join(os.path.dirname(__file__), 'HTMLTemplates')
         self.lookup = TemplateLookup(
-            directories=['HTMLTemplates'], default_filters=['h'])
+            directories=[templates_dir], default_filters=['h'], filesystem_checks=True)
         self.updateChannel = 'updates'
         self.engine = engine.Engine(
             cherrypy.config["database.path"], cherrypy.config["database.name"], self.update)
diff --git a/docs.py b/docs.py
index 1114eb9..5409c4a 100644
--- a/docs.py
+++ b/docs.py
@@ -25,7 +25,7 @@ def getDocumentation():
             returns="Returns a webpage",
             notes=["This shows a list of links that barcode might find useful based off their role",
                    "If barcode is left off, it is a list of links for display stations"]),
-        Doc('Unlock', '/unlock?location=BFF&barcode=<barcode>',
+        Doc('Unlock', '/unlock?location=TFI&barcode=<barcode>',
             returns="Returns the station webpage",
             notes=["This records the door was unlocked and checks the person that unlocks it in.  For use of door app ONLY"]),
         Doc('Get Keyholder list', '/admin/getKeyholderJSON',
diff --git a/etc/Caddyfile b/etc/Caddyfile
new file mode 100644
index 0000000..92658be
--- /dev/null
+++ b/etc/Caddyfile
@@ -0,0 +1,4 @@
+checkmein.stage.theforgeinitiative.org {
+    tls
+    reverse_proxy localhost:8447
+}
\ No newline at end of file
diff --git a/etc/caddy.service b/etc/caddy.service
new file mode 100644
index 0000000..966c85d
--- /dev/null
+++ b/etc/caddy.service
@@ -0,0 +1,20 @@
+[Unit]
+Description=Caddy
+Documentation=https://caddyserver.com/docs/
+After=network.target network-online.target
+Requires=network-online.target
+
+[Service]
+Type=notify
+User=caddy
+Group=caddy
+ExecStart=/usr/local/bin/caddy run --environ --config /opt/caddy/Caddyfile
+ExecReload=/usr/local/bin/caddy reload --config /opt/caddy/Caddyfile --force
+TimeoutStopSec=5s
+LimitNOFILE=1048576
+PrivateTmp=true
+ProtectSystem=full
+AmbientCapabilities=CAP_NET_ADMIN CAP_NET_BIND_SERVICE
+
+[Install]
+WantedBy=multi-user.target
diff --git a/etc/checkmein.service b/etc/checkmein.service
new file mode 100644
index 0000000..9369d98
--- /dev/null
+++ b/etc/checkmein.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=CheckMeIn
+After=network-online.target
+Requires=network-online.target
+
+[Service]
+User=checkmein
+Restart=on-failure
+RestartSec=30
+AmbientCapabilities=CAP_NET_BIND_SERVICE
+WorkingDirectory=/opt/checkmein/src
+ExecStart=/opt/checkmein/venv/bin/python3 checkMeIn.py production.conf
+
+[Install]
+WantedBy=multi-user.target
diff --git a/production.conf b/production.conf
index 4fa4de7..e1f85fd 100644
--- a/production.conf
+++ b/production.conf
@@ -1,7 +1,4 @@
 [global]
-log.error_file : os.path.join(os.getcwd(), 'checkMeIn.log')
-log.access_file : ''
-log.screen : False
 server.socket_host : '127.0.0.1'
 server.socket_port : 8447
 database.path : 'data/'
diff --git a/static/tools/3dprinter.webp b/static/tools/3dprinter.webp
new file mode 100644
index 0000000..74f90fd
Binary files /dev/null and b/static/tools/3dprinter.webp differ
diff --git a/static/tools/Stretcher shrinker.webp b/static/tools/Stretcher shrinker.webp
new file mode 100644
index 0000000..0d8c1e2
Binary files /dev/null and b/static/tools/Stretcher shrinker.webp differ
diff --git a/static/tools/blind rivet gun.webp b/static/tools/blind rivet gun.webp
new file mode 100644
index 0000000..b5ad45f
Binary files /dev/null and b/static/tools/blind rivet gun.webp differ
diff --git a/static/tools/cnc.webp b/static/tools/cnc.webp
new file mode 100644
index 0000000..d160751
Binary files /dev/null and b/static/tools/cnc.webp differ
diff --git a/static/tools/dremel.webp b/static/tools/dremel.webp
new file mode 100644
index 0000000..4a748ac
Binary files /dev/null and b/static/tools/dremel.webp differ
diff --git a/static/tools/drill.webp b/static/tools/drill.webp
new file mode 100644
index 0000000..4351838
Binary files /dev/null and b/static/tools/drill.webp differ
diff --git a/static/tools/drillpress.webp b/static/tools/drillpress.webp
new file mode 100644
index 0000000..fcf03d7
Binary files /dev/null and b/static/tools/drillpress.webp differ
diff --git a/static/tools/grinder.webp b/static/tools/grinder.webp
new file mode 100644
index 0000000..cbb12f6
Binary files /dev/null and b/static/tools/grinder.webp differ
diff --git a/static/tools/images.json b/static/tools/images.json
new file mode 100644
index 0000000..487ad23
--- /dev/null
+++ b/static/tools/images.json
@@ -0,0 +1,21 @@
+{
+  "1": "/static/tools/sheet%20metal%20brake.webp",
+  "2": "/static/tools/blind%20rivet%20gun.webp",
+  "3": "/static/tools/Stretcher%20shrinker.webp",
+  "4": "/static/tools/3dprinter.webp",
+  "5": "/static/tools/drill.webp",
+  "6": "/static/tools/solderingiron.webp",
+  "7": "/static/tools/dremel.webp",
+  "8": "/static/tools/8.svg",
+  "9": "/static/tools/drillpress.webp",
+  "10": "/static/tools/10.svg",
+  "11": "/static/tools/11.svg",
+  "12": "/static/tools/tablemountedjigsaw.webp",
+  "13": "/static/tools/13.svg",
+  "14": "/static/tools/14.svg",
+  "15": "/static/tools/cnc.webp",
+  "16": "/static/tools/lathe.webp",
+  "17": "/static/tools/tablesaw.webp",
+  "18": "/static/tools/miter.webp",
+  "19": "/static/tools/grinder.webp"
+}
diff --git a/static/tools/lathe.webp b/static/tools/lathe.webp
new file mode 100644
index 0000000..9044fb7
Binary files /dev/null and b/static/tools/lathe.webp differ
diff --git a/static/tools/miter.webp b/static/tools/miter.webp
new file mode 100644
index 0000000..6606086
Binary files /dev/null and b/static/tools/miter.webp differ
diff --git a/static/tools/scrollsaw.webp b/static/tools/scrollsaw.webp
new file mode 100644
index 0000000..0bbc6ea
Binary files /dev/null and b/static/tools/scrollsaw.webp differ
diff --git a/static/tools/sheet metal brake.webp b/static/tools/sheet metal brake.webp
new file mode 100644
index 0000000..127e13f
Binary files /dev/null and b/static/tools/sheet metal brake.webp differ
diff --git a/static/tools/solderingiron.webp b/static/tools/solderingiron.webp
new file mode 100644
index 0000000..4bd64b6
Binary files /dev/null and b/static/tools/solderingiron.webp differ
diff --git a/static/tools/tablemountedjigsaw.webp b/static/tools/tablemountedjigsaw.webp
new file mode 100644
index 0000000..19be3f7
Binary files /dev/null and b/static/tools/tablemountedjigsaw.webp differ
diff --git a/static/tools/tablesaw.webp b/static/tools/tablesaw.webp
new file mode 100644
index 0000000..2d98a7a
Binary files /dev/null and b/static/tools/tablesaw.webp differ
diff --git a/tests/misc_tests.py b/tests/misc_tests.py
index 49cda73..a0f064e 100644
--- a/tests/misc_tests.py
+++ b/tests/misc_tests.py
@@ -29,5 +29,5 @@ def test_metrics(self):
 
     def test_unlock(self):
         with self.patch_session():
-            self.getPage("/unlock?location=BFF&barcode=100091")
+            self.getPage("/unlock?location=TFI&barcode=100091")
         self.assertStatus('303 See Other')
diff --git a/tests/sampleData.py b/tests/sampleData.py
index bb31dd1..db5a446 100644
--- a/tests/sampleData.py
+++ b/tests/sampleData.py
@@ -6,7 +6,7 @@ def timeAgo(days=0, hours=0):
 
 
 def testData():
-    return{
+    d = {
         "visits": [
             {
                 "start": timeAgo(days=7, hours=1),
@@ -123,21 +123,54 @@ def testData():
 
         ],
         "certifications": [
-            {"barcode": "100091",
-             "tool_id": 1,
-             "level": 30,
-             "date": "",
-             "certifier": "LEGACY"},
-            {"barcode": "100091",
-             "tool_id": 1,
-             "level": 40,
-             "date": timeAgo(days=8),
-             "certifier": "LEGACY"},
-            {"barcode": "100032",
-             "tool_id": 1,
-             "level": 10,
-             "date": timeAgo(days=10),
-             "certifier": "100091"}
+            # Member 100091 across many tools with increasing levels
+            {"barcode": "100091", "tool_id": 1,  "level": 10, "date": timeAgo(days=60), "certifier": "LEGACY"},
+            {"barcode": "100091", "tool_id": 2,  "level": 20, "date": timeAgo(days=50), "certifier": "LEGACY"},
+            {"barcode": "100091", "tool_id": 3,  "level": 30, "date": timeAgo(days=40), "certifier": "LEGACY"},
+            {"barcode": "100091", "tool_id": 4,  "level": 40, "date": timeAgo(days=30), "certifier": "LEGACY"},
+            {"barcode": "100091", "tool_id": 5,  "level": 10, "date": timeAgo(days=25), "certifier": "100091"},
+            {"barcode": "100091", "tool_id": 6,  "level": 20, "date": timeAgo(days=20), "certifier": "100091"},
+            {"barcode": "100091", "tool_id": 7,  "level": 30, "date": timeAgo(days=15), "certifier": "100091"},
+            {"barcode": "100091", "tool_id": 8,  "level": 40, "date": timeAgo(days=14), "certifier": "100091"},
+            {"barcode": "100091", "tool_id": 9,  "level": 10, "date": timeAgo(days=13), "certifier": "100091"},
+            {"barcode": "100091", "tool_id": 10, "level": 20, "date": timeAgo(days=12), "certifier": "100091"},
+            {"barcode": "100091", "tool_id": 11, "level": 30, "date": timeAgo(days=11), "certifier": "100091"},
+            {"barcode": "100091", "tool_id": 12, "level": 40, "date": timeAgo(days=10), "certifier": "100091"},
+            {"barcode": "100091", "tool_id": 13, "level": 10, "date": timeAgo(days=9),  "certifier": "100091"},
+            {"barcode": "100091", "tool_id": 14, "level": 20, "date": timeAgo(days=8),  "certifier": "100091"},
+            {"barcode": "100091", "tool_id": 15, "level": 30, "date": timeAgo(days=7),  "certifier": "100091"},
+            {"barcode": "100091", "tool_id": 16, "level": 40, "date": timeAgo(days=6),  "certifier": "100091"},
+            {"barcode": "100091", "tool_id": 17, "level": 10, "date": timeAgo(days=5),  "certifier": "100091"},
+            {"barcode": "100091", "tool_id": 18, "level": 20, "date": timeAgo(days=4),  "certifier": "100091"},
+            {"barcode": "100091", "tool_id": 19, "level": 30, "date": timeAgo(days=3),  "certifier": "100091"},
+
+            # Member 100032 with a mix including NONE to show absence, and CERTIFIED
+            {"barcode": "100032", "tool_id": 1,  "level": 0,  "date": "",                 "certifier": "LEGACY"},
+            {"barcode": "100032", "tool_id": 4,  "level": 10, "date": timeAgo(days=20),    "certifier": "100091"},
+            {"barcode": "100032", "tool_id": 10, "level": 10, "date": timeAgo(days=18),    "certifier": "100091"},
+            {"barcode": "100032", "tool_id": 15, "level": 20, "date": timeAgo(days=10),    "certifier": "100091"},
+            {"barcode": "100032", "tool_id": 18, "level": 10, "date": timeAgo(days=2),     "certifier": "100091"}
+            ,
+            {"barcode": "100091", "tool_id": 1,  "level": 30, "date": timeAgo(days=2),  "certifier": "100091"},
+            {"barcode": "100091", "tool_id": 2,  "level": 40, "date": timeAgo(days=2),  "certifier": "100091"},
+            {"barcode": "100091", "tool_id": 3,  "level": 10, "date": timeAgo(days=1),  "certifier": "100091"},
+            {"barcode": "100091", "tool_id": 4,  "level": 20, "date": timeAgo(days=1),  "certifier": "100091"},
+            {"barcode": "100032", "tool_id": 5,  "level": 30, "date": timeAgo(days=12), "certifier": "100091"},
+            {"barcode": "100032", "tool_id": 6,  "level": 20, "date": timeAgo(days=9),  "certifier": "100091"},
+            {"barcode": "100032", "tool_id": 7,  "level": 30, "date": timeAgo(days=7),  "certifier": "100091"},
+            {"barcode": "100032", "tool_id": 8,  "level": 40, "date": timeAgo(days=6),  "certifier": "100091"},
+            {"barcode": "100090", "tool_id": 1,  "level": 10, "date": timeAgo(days=14), "certifier": "100091"},
+            {"barcode": "100090", "tool_id": 4,  "level": 10, "date": timeAgo(days=13), "certifier": "100091"},
+            {"barcode": "100090", "tool_id": 10, "level": 20, "date": timeAgo(days=11), "certifier": "100091"},
+            {"barcode": "100090", "tool_id": 15, "level": 30, "date": timeAgo(days=10), "certifier": "100091"},
+            {"barcode": "100090", "tool_id": 17, "level": 10, "date": timeAgo(days=5),  "certifier": "100091"},
+            {"barcode": "100093", "tool_id": 3,  "level": 20, "date": timeAgo(days=16), "certifier": "100091"},
+            {"barcode": "100093", "tool_id": 6,  "level": 30, "date": timeAgo(days=15), "certifier": "100091"},
+            {"barcode": "100093", "tool_id": 9,  "level": 10, "date": timeAgo(days=12), "certifier": "100091"},
+            {"barcode": "100093", "tool_id": 12, "level": 20, "date": timeAgo(days=11), "certifier": "100091"},
+            {"barcode": "100093", "tool_id": 14, "level": 30, "date": timeAgo(days=8),  "certifier": "100091"},
+            {"barcode": "100093", "tool_id": 18, "level": 10, "date": timeAgo(days=4),  "certifier": "100091"},
+            {"barcode": "100093", "tool_id": 19, "level": 20, "date": timeAgo(days=3),  "certifier": "100091"}
         ],
         "customReports": [{
             "report_id": 1,
@@ -151,7 +184,7 @@ def testData():
         }],
         "unlocks": [{
             "time": timeAgo(hours=1),
-            "location": "BFF",
+            "location": "TFI",
             "barcode": "100091"
         }],
         "guests": [{
@@ -174,3 +207,100 @@ def testData():
             "value": "15"
         }]
     }
+    extra_members = []
+    base_id = 200000
+    first_names = [
+        "Alex","Jordan","Taylor","Casey","Riley","Morgan","Avery","Quinn","Skyler","Reese",
+        "Jamie","Cameron","Drew","Peyton","Rowan","Hayden","Emerson","Parker","Sage","Charlie"
+    ]
+    last_names = [
+        "Smith","Johnson","Brown","Taylor","Anderson","Thomas","Jackson","White","Harris","Martin",
+        "Thompson","Garcia","Martinez","Robinson","Clark","Rodriguez","Lewis","Lee","Walker","Hall"
+    ]
+    def gen_name(idx):
+        fn = first_names[idx % len(first_names)]
+        ln = last_names[(idx // len(first_names)) % len(last_names)]
+        return fn, ln
+    for i in range(1, 251):
+        b = str(base_id + i)
+        fn, ln = gen_name(i)
+        extra_members.append({
+            "barcode": b,
+            "displayName": f"{fn} {ln}",
+            "firstName": fn,
+            "lastName": ln,
+            "email": f"{fn.lower()}.{ln.lower()}@email.com",
+            "membershipExpires": timeAgo(days=-30),
+        })
+    for i in range(251, 271):
+        b = str(base_id + i)
+        fn, ln = gen_name(i)
+        extra_members.append({
+            "barcode": b,
+            "displayName": f"{fn} {ln}",
+            "firstName": fn,
+            "lastName": ln,
+            "email": f"{fn.lower()}.{ln.lower()}@email.com",
+            "membershipExpires": timeAgo(days=-30),
+        })
+    d["members"].extend(extra_members)
+    for m in d["members"]:
+        dn = str(m.get("displayName", ""))
+        if dn.startswith("Member ") or dn.startswith("Member"):
+            fn, ln = gen_name(int(m["barcode"]) % 1000)
+            m["firstName"], m["lastName"] = fn, ln
+            m["displayName"] = f"{fn} {ln}"
+            m["email"] = f"{fn.lower()}.{ln.lower()}@email.com"
+    levels = [10, 20, 30, 40]
+    tool_ids = list(range(1, 20))
+    extra_certs = []
+    count = 0
+    for idx, m in enumerate(extra_members):
+        for j in range(2):
+            if count >= 50:
+                break
+            t = tool_ids[(idx + j) % len(tool_ids)]
+            lvl = levels[(idx + j) % len(levels)]
+            extra_certs.append({
+                "barcode": m["barcode"],
+                "tool_id": t,
+                "level": lvl,
+                "date": timeAgo(days=idx % 30 + 1),
+                "certifier": "100091"
+            })
+            count += 1
+        if count >= 50:
+            break
+    d["certifications"].extend(extra_certs)
+    # Add 5 more Basic (Red Dot) certifications for 3D printers (tool_id 4)
+    extra_basic = []
+    for i, m in enumerate(extra_members[:5], start=1):
+        extra_basic.append({
+            "barcode": m["barcode"],
+            "tool_id": 4,
+            "level": 1,  # Basic (Red Dot)
+            "date": timeAgo(days=i),
+            "certifier": "100091"
+        })
+    d["certifications"].extend(extra_basic)
+    extra_visits = []
+    now_start = timeAgo(hours=1)
+    # Ensure a couple of baseline members are checked in as well
+    extra_visits.append({
+        "start": now_start,
+        "barcode": "100091",
+        "status": "In"
+    })
+    extra_visits.append({
+        "start": now_start,
+        "barcode": "100032",
+        "status": "In"
+    })
+    for m in extra_members[:50]:
+        extra_visits.append({
+            "start": now_start,
+            "barcode": m["barcode"],
+            "status": "In"
+        })
+    d["visits"].extend(extra_visits)
+    return d
diff --git a/utils.py b/utils.py
index ece8ff6..de6b7e9 100644
--- a/utils.py
+++ b/utils.py
@@ -2,7 +2,7 @@
 import email.utils
 import smtplib
 
-FROM_EMAIL = "tfi@checkmein.site"
+FROM_EMAIL = "noreply@theforgeinitiative.org"
 FROM_NAME = "TFI CheckMeIn"
 
 
diff --git a/webCertifications.py b/webCertifications.py
index 4abf55e..c4c5570 100644
--- a/webCertifications.py
+++ b/webCertifications.py
@@ -1,10 +1,12 @@
 import cherrypy
 from webBase import WebBase
+import os
+import json
 
 
 class WebCertifications(WebBase):
     # Certifications
-    def showCertifications(self, message, tools, certifications, show_table_header=True, show_left_names=True, show_right_names=True):
+    def showCertifications(self, message, tools, certifications, show_table_header=True, show_left_names=True, show_right_names=False):
         return self.template('certifications.mako',
                              message=message,
                              tools=tools,
@@ -127,3 +129,70 @@ def all(self):
                 dbConnection)
 
             return self.showCertifications(message, tools, certifications)
+
+    @cherrypy.expose
+    def v2(self, debug=None):
+        with self.dbConnect() as dbConnection:
+            tools = self.engine.certifications.getAllTools(dbConnection)
+            users = self.engine.certifications.getInBuildingUserList(dbConnection)
+        # Load curated images mapping if available
+        images_map = {}
+        try:
+            static_root = os.path.join(os.getcwd(), 'static', 'tools')
+            with open(os.path.join(static_root, 'images.json'), 'r', encoding='utf-8') as f:
+                images_map = json.load(f)
+        except Exception:
+            images_map = {}
+        tool_map = {}
+        for t in tools:
+            tool_id = t[0]
+            tool_name = t[1]
+            # Resolve curated image: by id first, then by lowercased name
+            curated_url = (
+                images_map.get(str(tool_id))
+                or images_map.get(tool_name)
+                or images_map.get(tool_name.lower())
+                or images_map.get(tool_name.replace(' ', '_').lower())
+            )
+            base_static = f"/static/tools/{tool_id}"
+            tool_map[t[0]] = {
+                'id': t[0],
+                'name': tool_name,
+                'group': t[2],
+                'members': [],
+                'image_url': curated_url or f"{base_static}.avif",
+                'img_avif': f"{base_static}.avif",
+                'img_png': f"{base_static}.png",
+                'img_jpg': f"{base_static}.jpg"
+            }
+        for user_id, tooluser in users.items():
+            for tid, tl in tooluser.tools.items():
+                level = int(tl[1]) if tl and tl[1] is not None else 0
+                if level > 0:
+                    base_label = self.engine.certifications.getLevelName(level)
+                    # Customize labels per request
+                    if level == 1:
+                        label = 'Basic (Red Dot)'
+                    elif level == 10:
+                        label = 'Certified (Green Dot)'
+                    else:
+                        label = base_label
+                    tool_map.get(tid, {}).get('members', []).append({
+                        'displayName': tooluser.displayName,
+                        'barcode': tooluser.barcode,
+                        'level': level,
+                        'level_name': label
+                    })
+        for v in tool_map.values():
+            v['members'] = sorted(v['members'], key=lambda m: (m['level'], m['displayName']))
+        tools_data = [tool_map[t[0]] for t in tools]
+        levels = [
+            {'value': 10, 'name': self.engine.certifications.getLevelName(10), 'class': 'level-10'},
+            {'value': 20, 'name': self.engine.certifications.getLevelName(20), 'class': 'level-20'},
+            {'value': 30, 'name': self.engine.certifications.getLevelName(30), 'class': 'level-30'},
+            {'value': 40, 'name': self.engine.certifications.getLevelName(40), 'class': 'level-40'},
+        ]
+        if debug:
+            cherrypy.response.headers['Content-Type'] = 'application/json; charset=utf-8'
+            return json.dumps(tools_data).encode('utf-8')
+        return self.template('certifications_v2.mako', tools=tools_data, levels=levels, tools_json=json.dumps(tools_data))