diff --git a/web/templates/layout.templ b/web/templates/layout.templ
index 0339687..dadf8de 100644
--- a/web/templates/layout.templ
+++ b/web/templates/layout.templ
@@ -9,6 +9,7 @@ templ Layout(title string) {
 			<title>{ title } - Derby Race Manager</title>
 			<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" rel="stylesheet"/>
 			<script src="/static/js/htmx.min.js"></script>
+			<script src="/static/js/sse.min.js"></script>
 		</head>
 		<body class="bg-light min-vh-100">
 			<nav class="navbar navbar-expand-lg navbar-dark bg-primary">
diff --git a/web/templates/layout_public.templ b/web/templates/layout_public.templ
index ec16c30..598fba9 100644
--- a/web/templates/layout_public.templ
+++ b/web/templates/layout_public.templ
@@ -9,6 +9,7 @@ templ LayoutPublic(title string) {
 			<title>{ title } - Derby Race Manager</title>
 			<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" rel="stylesheet"/>
 			<script src="/static/js/htmx.min.js"></script>
+			<script src="/static/js/sse.min.js"></script>
 		</head>
 		<body class="bg-light min-vh-100">
 			<main>
diff --git a/web/templates/layout_public_templ.go b/web/templates/layout_public_templ.go
index 07442b5..c07b4dc 100644
--- a/web/templates/layout_public_templ.go
+++ b/web/templates/layout_public_templ.go
@@ -42,7 +42,7 @@ func LayoutPublic(title string) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 2, " - Derby Race Manager</title><link href=\"https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css\" rel=\"stylesheet\"><script src=\"/static/js/htmx.min.js\"></script></head><body class=\"bg-light min-vh-100\"><main>")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 2, " - Derby Race Manager</title><link href=\"https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css\" rel=\"stylesheet\"><script src=\"/static/js/htmx.min.js\"></script><script src=\"/static/js/sse.min.js\"></script></head><body class=\"bg-light min-vh-100\"><main>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
diff --git a/web/templates/layout_templ.go b/web/templates/layout_templ.go
index 7db7e1d..c7e82e4 100644
--- a/web/templates/layout_templ.go
+++ b/web/templates/layout_templ.go
@@ -42,7 +42,7 @@ func Layout(title string) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 2, " - Derby Race Manager</title><link href=\"https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css\" rel=\"stylesheet\"><script src=\"/static/js/htmx.min.js\"></script></head><body class=\"bg-light min-vh-100\"><nav class=\"navbar navbar-expand-lg navbar-dark bg-primary\"><div class=\"container\"><a href=\"/\" class=\"navbar-brand\">Derby Race Manager</a> <button class=\"navbar-toggler\" type=\"button\" data-bs-toggle=\"collapse\" data-bs-target=\"#navbarNav\"><span class=\"navbar-toggler-icon\"></span></button><div class=\"collapse navbar-collapse\" id=\"navbarNav\"><ul class=\"navbar-nav\"><li class=\"nav-item\"><a href=\"/race\" class=\"nav-link\">Race View</a></li><li class=\"nav-item\"><a href=\"/race/manage\" class=\"nav-link\">Race Manager</a></li><li class=\"nav-item\"><a href=\"/admin\" class=\"nav-link\">Admin</a></li><li class=\"nav-item\"><a href=\"/register\" class=\"nav-link\">Register</a></li><li class=\"nav-item\"><a href=\"/heats\" class=\"nav-link\">Heats</a></li></ul></div></div></nav><main>")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 2, " - Derby Race Manager</title><link href=\"https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css\" rel=\"stylesheet\"><script src=\"/static/js/htmx.min.js\"></script><script src=\"/static/js/sse.min.js\"></script></head><body class=\"bg-light min-vh-100\"><nav class=\"navbar navbar-expand-lg navbar-dark bg-primary\"><div class=\"container\"><a href=\"/\" class=\"navbar-brand\">Derby Race Manager</a> <button class=\"navbar-toggler\" type=\"button\" data-bs-toggle=\"collapse\" data-bs-target=\"#navbarNav\"><span class=\"navbar-toggler-icon\"></span></button><div class=\"collapse navbar-collapse\" id=\"navbarNav\"><ul class=\"navbar-nav\"><li class=\"nav-item\"><a href=\"/race\" class=\"nav-link\">Race View</a></li><li class=\"nav-item\"><a href=\"/race/manage\" class=\"nav-link\">Race Manager</a></li><li class=\"nav-item\"><a href=\"/admin\" class=\"nav-link\">Admin</a></li><li class=\"nav-item\"><a href=\"/register\" class=\"nav-link\">Register</a></li><li class=\"nav-item\"><a href=\"/heats\" class=\"nav-link\">Heats</a></li></ul></div></div></nav><main>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
diff --git a/web/templates/race_manage_templ.go b/web/templates/race_manage_templ.go
index 5ab7f64..e575244 100644
--- a/web/templates/race_manage_templ.go
+++ b/web/templates/race_manage_templ.go
@@ -484,27 +484,27 @@ func raceLaneInfo(laneData models.LaneData) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 36, "</p><div class=\"d-flex justify-content-between\"><div><strong>Time:</strong> <span>")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 36, "</p><div class=\"d-flex justify-content-between\"><div><strong>Time:</strong> <span hx-ext=\"sse\" sse-connect=\"/api/events\" sse-swap=\"lane-{ laneData.Lane }-time\">")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
 		var templ_7745c5c3_Var25 string
 		templ_7745c5c3_Var25, templ_7745c5c3_Err = templ.JoinStringErrs(fmt.Sprintf("%.3f", laneData.Time))
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/templates/race_manage.templ`, Line: 157, Col: 89}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/templates/race_manage.templ`, Line: 157, Col: 167}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var25))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 37, "</span></div><div><strong>Position:</strong> <span>")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 37, "</span></div><div><strong>Position:</strong> <span hx-ext=\"sse\" sse-connect=\"/api/events\" sse-swap=\"lane-{ laneData.Lane }-position\">")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
 		var templ_7745c5c3_Var26 string
 		templ_7745c5c3_Var26, templ_7745c5c3_Err = templ.JoinStringErrs(strconv.Itoa(laneData.Place))
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/templates/race_manage.templ`, Line: 160, Col: 87}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/templates/race_manage.templ`, Line: 160, Col: 169}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var26))
 		if templ_7745c5c3_Err != nil {
diff --git a/web/templates/race_public_templ.go b/web/templates/race_public_templ.go
index 72d7c40..62f4d23 100644
--- a/web/templates/race_public_templ.go
+++ b/web/templates/race_public_templ.go
@@ -271,7 +271,7 @@ func raceLaneCard(laneData models.LaneData) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 16, "</p><div class=\"result-area\"><div class=\"row\"><div class=\"col-6\"><div class=\"text-center\"><h6>Time</h6><div class=\"display-6\">")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 16, "</p><div class=\"result-area\"><div class=\"row\"><div class=\"col-6\"><div class=\"text-center\"><h6>Time</h6><div class=\"display-6\" hx-ext=\"sse\" sse-connect=\"/api/events\" sse-swap=\"lane-{ laneData.Lane }-time\">")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -284,7 +284,7 @@ func raceLaneCard(laneData models.LaneData) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 17, "</div></div></div><div class=\"col-6\"><div class=\"text-center\"><h6>Position</h6><div class=\"display-6\">")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 17, "</div></div></div><div class=\"col-6\"><div class=\"text-center\"><h6>Position</h6><div class=\"display-6\" hx-ext=\"sse\" sse-connect=\"/api/events\" sse-swap=\"lane-{ laneData.Lane }-position\">")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
