diff --git a/.devcontainer/setup.sh b/.devcontainer/setup.sh
old mode 100644
new mode 100755
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 8b28612..c168ca9 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -10,7 +10,7 @@
       "request": "launch",
       "mode": "debug",
       "program": "cmd/openbooks",
-      "args": ["server", "--log", "--server", "localhost", "--persist"]
+      "args": ["server", "--log", "--tls", "false", "--server", "localhost:6667", "--name", "dev-user"]
     },
     {
       "name": "Launch OpenBooks CLI",
diff --git a/go.mod b/go.mod
index 2ce44e2..f54695c 100644
--- a/go.mod
+++ b/go.mod
@@ -7,7 +7,6 @@ require (
 	github.com/go-chi/chi/v5 v5.0.7
 	github.com/golang/snappy v0.0.4 // indirect
 	github.com/google/uuid v1.3.0
-	github.com/gorilla/websocket v1.5.0
 	github.com/mholt/archiver/v3 v3.5.1
 	github.com/nwaples/rardecode v1.1.3 // indirect
 	github.com/rs/cors v1.8.2
@@ -28,6 +27,7 @@ require (
 require (
 	github.com/davecgh/go-spew v1.1.1
 	github.com/inkeliz/gowebview v1.0.1
+	github.com/r3labs/sse/v2 v2.10.0
 	github.com/testcontainers/testcontainers-go v0.17.0
 	gopkg.in/irc.v4 v4.0.0
 )
@@ -73,5 +73,6 @@ require (
 	google.golang.org/genproto v0.0.0-20220617124728-180714bec0ad // indirect
 	google.golang.org/grpc v1.47.0 // indirect
 	google.golang.org/protobuf v1.28.0 // indirect
+	gopkg.in/cenkalti/backoff.v1 v1.1.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
diff --git a/go.sum b/go.sum
index 58c87b2..3cf41e8 100644
--- a/go.sum
+++ b/go.sum
@@ -96,8 +96,6 @@ github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
 github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
-github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
 github.com/inconshreveable/mousetrap v1.0.1 h1:U3uMjPSQEBMNp1lFxmllqCPM6P5u/Xq7Pgzkat/bFNc=
@@ -160,6 +158,8 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/r3labs/sse/v2 v2.10.0 h1:hFEkLLFY4LDifoHdiCN/LlGBAdVJYsANaLqNYa1l/v0=
+github.com/r3labs/sse/v2 v2.10.0/go.mod h1:Igau6Whc+F17QUgML1fYe1VPZzTV6EMCnYktEmkNJ7I=
 github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/rivo/uniseg v0.3.4 h1:3Z3Eu6FGHZWSfNKJTOUiPatWwfc7DzJRU04jFUqJODw=
 github.com/rivo/uniseg v0.3.4/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
@@ -228,6 +228,7 @@ golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73r
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20191116160921-f9c825593386/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
@@ -318,6 +319,8 @@ google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQ
 google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw=
 google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+gopkg.in/cenkalti/backoff.v1 v1.1.0 h1:Arh75ttbsvlpVA7WtVpH4u9h6Zl46xuptxqLxPiSo4Y=
+gopkg.in/cenkalti/backoff.v1 v1.1.0/go.mod h1:J6Vskwqd+OMVJl8C33mmtxTBs2gyzfv7UDAkHu8BrjI=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/irc.v4 v4.0.0 h1:5jsLkU2Tg+R2nGNqmkGCrciasyi4kNkDXhyZD+C31yY=
diff --git a/mock/operator.go b/mock/operator.go
index aa5b8d0..654954e 100644
--- a/mock/operator.go
+++ b/mock/operator.go
@@ -2,13 +2,14 @@ package mock
 
 import (
 	"context"
-	"gopkg.in/irc.v4"
 	"log"
 	"math/rand"
 	"net"
 	"os"
 	"strings"
 	"time"
+
+	"gopkg.in/irc.v4"
 )
 
 type Config struct {
@@ -58,8 +59,11 @@ func NewOperator(config *Config) *Operator {
 
 func (o *Operator) Handler(client *irc.Client, message *irc.Message) {
 	if strings.HasPrefix(message.Trailing(), "@search") {
-		query := strings.SplitN(message.Trailing(), " ", 2)[1]
-		o.log.Printf("Search for '%s'\n", query)
+		queryParts := strings.SplitN(message.Trailing(), " ", 2)
+		if len(queryParts) == 1 {
+			return
+		}
+		o.log.Printf("Search for '%s'\n", queryParts[1])
 
 		dccString := o.dccManager.ServeFile("SearchBot_results_for_ the great gatsby.txt.zip")
 
diff --git a/server/app/package-lock.json b/server/app/package-lock.json
index 25fee82..b387bb8 100644
--- a/server/app/package-lock.json
+++ b/server/app/package-lock.json
@@ -13,7 +13,7 @@
         "@mantine/hooks": "^7.1.2",
         "@mantine/notifications": "^7.1.2",
         "@phosphor-icons/react": "^2.0.13",
-        "@reduxjs/toolkit": "^1.9.6",
+        "@reduxjs/toolkit": "^2.2.6",
         "@tanstack/match-sorter-utils": "^8.8.4",
         "@tanstack/react-table": "^8.10.3",
         "@tanstack/react-virtual": "^3.0.0-beta.62",
@@ -1106,18 +1106,18 @@
       }
     },
     "node_modules/@reduxjs/toolkit": {
-      "version": "1.9.6",
-      "resolved": "https://registry.npmjs.org/@reduxjs/toolkit/-/toolkit-1.9.6.tgz",
-      "integrity": "sha512-Gc4ikl90ORF4viIdAkY06JNUnODjKfGxZRwATM30EdHq8hLSVoSrwXne5dd739yenP5bJxAX7tLuOWK5RPGtrw==",
+      "version": "2.2.6",
+      "resolved": "https://registry.npmjs.org/@reduxjs/toolkit/-/toolkit-2.2.6.tgz",
+      "integrity": "sha512-kH0r495c5z1t0g796eDQAkYbEQ3a1OLYN9o8jQQVZyKyw367pfRGS+qZLkHYvFHiUUdafpoSlQ2QYObIApjPWA==",
       "dependencies": {
-        "immer": "^9.0.21",
-        "redux": "^4.2.1",
-        "redux-thunk": "^2.4.2",
-        "reselect": "^4.1.8"
+        "immer": "^10.0.3",
+        "redux": "^5.0.1",
+        "redux-thunk": "^3.1.0",
+        "reselect": "^5.1.0"
       },
       "peerDependencies": {
         "react": "^16.9.0 || ^17.0.0 || ^18",
-        "react-redux": "^7.2.1 || ^8.0.2"
+        "react-redux": "^7.2.1 || ^8.1.3 || ^9.0.0"
       },
       "peerDependenciesMeta": {
         "react": {
@@ -3432,9 +3432,9 @@
       }
     },
     "node_modules/immer": {
-      "version": "9.0.21",
-      "resolved": "https://registry.npmjs.org/immer/-/immer-9.0.21.tgz",
-      "integrity": "sha512-bc4NBHqOqSfRW7POMkHd51LvClaeMXpm8dx0e8oE2GORbq5aRK7Bxl4FyzVLdGtLmvLKL7BTDBG5ACQm4HWjTA==",
+      "version": "10.1.1",
+      "resolved": "https://registry.npmjs.org/immer/-/immer-10.1.1.tgz",
+      "integrity": "sha512-s2MPrmjovJcoMaHtx6K11Ra7oD05NT97w1IC5zpMkT6Atjr7H8LjaDd81iIxUYpMKSRRNMJE703M1Fhr/TctHw==",
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/immer"
@@ -7965,19 +7965,16 @@
       }
     },
     "node_modules/redux": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/redux/-/redux-4.2.1.tgz",
-      "integrity": "sha512-LAUYz4lc+Do8/g7aeRa8JkyDErK6ekstQaqWQrNRW//MY1TvCEpMtpTWvlQ+FPbWCx+Xixu/6SHt5N0HR+SB4w==",
-      "dependencies": {
-        "@babel/runtime": "^7.9.2"
-      }
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/redux/-/redux-5.0.1.tgz",
+      "integrity": "sha512-M9/ELqF6fy8FwmkpnF0S3YKOqMyoWJ4+CS5Efg2ct3oY9daQvd/Pc71FpGZsVsbl3Cpb+IIcjBDUnnyBdQbq4w=="
     },
     "node_modules/redux-thunk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/redux-thunk/-/redux-thunk-2.4.2.tgz",
-      "integrity": "sha512-+P3TjtnP0k/FEjcBL5FZpoovtvrTNT/UXd4/sluaSyrURlSlhLSzEdfsTBW7WsKB6yPvgd7q/iZPICFjW4o57Q==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/redux-thunk/-/redux-thunk-3.1.0.tgz",
+      "integrity": "sha512-NW2r5T6ksUKXCabzhL9z+h206HQw/NJkcLm1GPImRQ8IzfXwRGqjVhKJGauHirT0DAuyy6hjdnMZaRoAcy0Klw==",
       "peerDependencies": {
-        "redux": "^4"
+        "redux": "^5.0.0"
       }
     },
     "node_modules/reflect.getprototypeof": {
@@ -8028,9 +8025,9 @@
       "integrity": "sha512-7pXIJqJOq5tFgG1A2Zxti3Ht8jJF337m4sowbuHsW30ZnkQFnDzy9qBNhgzX8ZLW4+UBcXiiR7SwR6pokHsxiA=="
     },
     "node_modules/reselect": {
-      "version": "4.1.8",
-      "resolved": "https://registry.npmjs.org/reselect/-/reselect-4.1.8.tgz",
-      "integrity": "sha512-ab9EmR80F/zQTMNeneUr4cv+jSwPJgIlvEmVwLerwrWVbpLlBuls9XHzIeTFy4cegU2NHBp3va0LKOzU5qFEYQ=="
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/reselect/-/reselect-5.1.1.tgz",
+      "integrity": "sha512-K/BG6eIky/SBpzfHZv/dd+9JBFiS4SWV7FIujVyJRux6e45+73RaUHXLmIR1f7WOMaQ0U1km6qwklRQxpJJY0w=="
     },
     "node_modules/resolve": {
       "version": "2.0.0-next.4",
@@ -9733,14 +9730,14 @@
       }
     },
     "@reduxjs/toolkit": {
-      "version": "1.9.6",
-      "resolved": "https://registry.npmjs.org/@reduxjs/toolkit/-/toolkit-1.9.6.tgz",
-      "integrity": "sha512-Gc4ikl90ORF4viIdAkY06JNUnODjKfGxZRwATM30EdHq8hLSVoSrwXne5dd739yenP5bJxAX7tLuOWK5RPGtrw==",
+      "version": "2.2.6",
+      "resolved": "https://registry.npmjs.org/@reduxjs/toolkit/-/toolkit-2.2.6.tgz",
+      "integrity": "sha512-kH0r495c5z1t0g796eDQAkYbEQ3a1OLYN9o8jQQVZyKyw367pfRGS+qZLkHYvFHiUUdafpoSlQ2QYObIApjPWA==",
       "requires": {
-        "immer": "^9.0.21",
-        "redux": "^4.2.1",
-        "redux-thunk": "^2.4.2",
-        "reselect": "^4.1.8"
+        "immer": "^10.0.3",
+        "redux": "^5.0.1",
+        "redux-thunk": "^3.1.0",
+        "reselect": "^5.1.0"
       }
     },
     "@remix-run/router": {
@@ -11418,9 +11415,9 @@
       "dev": true
     },
     "immer": {
-      "version": "9.0.21",
-      "resolved": "https://registry.npmjs.org/immer/-/immer-9.0.21.tgz",
-      "integrity": "sha512-bc4NBHqOqSfRW7POMkHd51LvClaeMXpm8dx0e8oE2GORbq5aRK7Bxl4FyzVLdGtLmvLKL7BTDBG5ACQm4HWjTA=="
+      "version": "10.1.1",
+      "resolved": "https://registry.npmjs.org/immer/-/immer-10.1.1.tgz",
+      "integrity": "sha512-s2MPrmjovJcoMaHtx6K11Ra7oD05NT97w1IC5zpMkT6Atjr7H8LjaDd81iIxUYpMKSRRNMJE703M1Fhr/TctHw=="
     },
     "import-fresh": {
       "version": "3.3.0",
@@ -14351,17 +14348,14 @@
       }
     },
     "redux": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/redux/-/redux-4.2.1.tgz",
-      "integrity": "sha512-LAUYz4lc+Do8/g7aeRa8JkyDErK6ekstQaqWQrNRW//MY1TvCEpMtpTWvlQ+FPbWCx+Xixu/6SHt5N0HR+SB4w==",
-      "requires": {
-        "@babel/runtime": "^7.9.2"
-      }
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/redux/-/redux-5.0.1.tgz",
+      "integrity": "sha512-M9/ELqF6fy8FwmkpnF0S3YKOqMyoWJ4+CS5Efg2ct3oY9daQvd/Pc71FpGZsVsbl3Cpb+IIcjBDUnnyBdQbq4w=="
     },
     "redux-thunk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/redux-thunk/-/redux-thunk-2.4.2.tgz",
-      "integrity": "sha512-+P3TjtnP0k/FEjcBL5FZpoovtvrTNT/UXd4/sluaSyrURlSlhLSzEdfsTBW7WsKB6yPvgd7q/iZPICFjW4o57Q==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/redux-thunk/-/redux-thunk-3.1.0.tgz",
+      "integrity": "sha512-NW2r5T6ksUKXCabzhL9z+h206HQw/NJkcLm1GPImRQ8IzfXwRGqjVhKJGauHirT0DAuyy6hjdnMZaRoAcy0Klw==",
       "requires": {}
     },
     "reflect.getprototypeof": {
@@ -14400,9 +14394,9 @@
       "integrity": "sha512-7pXIJqJOq5tFgG1A2Zxti3Ht8jJF337m4sowbuHsW30ZnkQFnDzy9qBNhgzX8ZLW4+UBcXiiR7SwR6pokHsxiA=="
     },
     "reselect": {
-      "version": "4.1.8",
-      "resolved": "https://registry.npmjs.org/reselect/-/reselect-4.1.8.tgz",
-      "integrity": "sha512-ab9EmR80F/zQTMNeneUr4cv+jSwPJgIlvEmVwLerwrWVbpLlBuls9XHzIeTFy4cegU2NHBp3va0LKOzU5qFEYQ=="
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/reselect/-/reselect-5.1.1.tgz",
+      "integrity": "sha512-K/BG6eIky/SBpzfHZv/dd+9JBFiS4SWV7FIujVyJRux6e45+73RaUHXLmIR1f7WOMaQ0U1km6qwklRQxpJJY0w=="
     },
     "resolve": {
       "version": "2.0.0-next.4",
diff --git a/server/app/package.json b/server/app/package.json
index 89f1b70..29001ea 100644
--- a/server/app/package.json
+++ b/server/app/package.json
@@ -15,7 +15,7 @@
     "@mantine/hooks": "^7.1.2",
     "@mantine/notifications": "^7.1.2",
     "@phosphor-icons/react": "^2.0.13",
-    "@reduxjs/toolkit": "^1.9.6",
+    "@reduxjs/toolkit": "^2.2.6",
     "@tanstack/match-sorter-utils": "^8.8.4",
     "@tanstack/react-table": "^8.10.3",
     "@tanstack/react-virtual": "^3.0.0-beta.62",
diff --git a/server/app/src/components/sidebar/History.tsx b/server/app/src/components/sidebar/History.tsx
index 0c4d6a2..18c09f2 100644
--- a/server/app/src/components/sidebar/History.tsx
+++ b/server/app/src/components/sidebar/History.tsx
@@ -1,3 +1,4 @@
+import { useAutoAnimate } from "@formkit/auto-animate/react";
 import {
   Badge,
   Button,
@@ -9,22 +10,18 @@ import {
   Tooltip
 } from "@mantine/core";
 import { Eye, EyeSlash, MagnifyingGlass, Trash } from "@phosphor-icons/react";
-import { useSelector } from "react-redux";
 import {
-  deleteHistoryItem,
   HistoryItem,
-  selectHistory
+  removeResults,
+  setActiveItem
 } from "../../state/historySlice";
-import { setActiveItem } from "../../state/stateSlice";
 import { AppDispatch, useAppDispatch, useAppSelector } from "../../state/store";
-import classes from "./SidebarButton.module.css";
 import { conditionalAttribute } from "../../utils/attribute-helper";
-import { useAutoAnimate } from "@formkit/auto-animate/react";
+import classes from "./SidebarButton.module.css";
 
 export default function History() {
-  const history = useSelector(selectHistory);
-  const activeTS =
-    useAppSelector((store) => store.state.activeItem?.timestamp) ?? -1;
+  const history = useAppSelector((store) => store.history.items);
+  const activeTS = useAppSelector((store) => store.history.active);
   const dispatch = useAppDispatch();
   const [parent] = useAutoAnimate(/* optional config */);
 
@@ -51,7 +48,7 @@ export default function History() {
 }
 
 type Props = {
-  activeTS: number;
+  activeTS: number | undefined;
   item: HistoryItem;
   dispatch: AppDispatch;
 };
@@ -107,7 +104,7 @@ function HistoryCard({ activeTS, item, dispatch }: Props) {
         <Menu.Item
           color="red"
           leftSection={<Trash size={18} weight="bold" />}
-          onClick={() => dispatch(deleteHistoryItem(item.timestamp))}>
+          onClick={() => dispatch(removeResults(item.timestamp))}>
           Delete item
         </Menu.Item>
       </Menu.Dropdown>
diff --git a/server/app/src/components/sidebar/Library.tsx b/server/app/src/components/sidebar/Library.tsx
index 0bf99e2..5e05ac6 100644
--- a/server/app/src/components/sidebar/Library.tsx
+++ b/server/app/src/components/sidebar/Library.tsx
@@ -15,7 +15,7 @@ import classes from "./SidebarButton.module.css";
 import { useAutoAnimate } from "@formkit/auto-animate/react";
 
 export default function Library() {
-  const { data, isLoading, isSuccess, isError } = useGetBooksQuery(null);
+  const { data, isLoading, isSuccess, isError } = useGetBooksQuery();
   const [parent] = useAutoAnimate(/* optional config */);
 
   if (isLoading && !data) {
diff --git a/server/app/src/components/tables/BookTable.tsx b/server/app/src/components/tables/BookTable.tsx
index a400515..efff738 100644
--- a/server/app/src/components/tables/BookTable.tsx
+++ b/server/app/src/components/tables/BookTable.tsx
@@ -1,11 +1,10 @@
 import { Button, Indicator, Loader, Text, Tooltip } from "@mantine/core";
-import { createColumnHelper, Table } from "@tanstack/react-table";
-import React, { useCallback, useMemo, useState } from "react";
+import { Table, createColumnHelper } from "@tanstack/react-table";
+import { useCallback, useMemo, useState } from "react";
 import { useSelector } from "react-redux";
-import { useGetServersQuery } from "../../state/api";
+import { useDownloadMutation, useGetServersQuery } from "../../state/api";
 import { BookDetail } from "../../state/messages";
-import { sendDownload } from "../../state/stateSlice";
-import { RootState, useAppDispatch } from "../../state/store";
+import { RootState } from "../../state/store";
 import { DataTableColumnHeader } from "./DataTable/ColumnHeader";
 import DataTable from "./DataTable/DataTable";
 import ToolbarFacetFilter from "./DataTable/ToolbarFacetFilter";
@@ -18,7 +17,10 @@ interface BookTableProps {
 }
 
 export default function BookTable({ books }: BookTableProps) {
-  const { data: servers } = useGetServersQuery(null);
+  const { data: servers } = useGetServersQuery(undefined, {
+    pollingInterval: 5000,
+    skipPollingIfUnfocused: true
+  });
 
   const columns = useMemo(
     () => [
@@ -27,7 +29,7 @@ export default function BookTable({ books }: BookTableProps) {
           <DataTableColumnHeader column={props.column} title="Server" />
         ),
         cell: (props) => {
-          const online = servers?.includes(props.getValue());
+          const online = servers && servers.has(props.getValue());
           return (
             <Tooltip position="top-start" label={online ? "Online" : "Offline"}>
               <Indicator
@@ -123,7 +125,7 @@ export default function BookTable({ books }: BookTableProps) {
 }
 
 function DownloadButton({ book }: { book: string }) {
-  const dispatch = useAppDispatch();
+  const [downloadMutation] = useDownloadMutation();
 
   const [clicked, setClicked] = useState(false);
   const isInFlight = useSelector((state: RootState) =>
@@ -133,7 +135,7 @@ function DownloadButton({ book }: { book: string }) {
   // Prevent hitting the same button multiple times
   const onClick = () => {
     if (clicked) return;
-    dispatch(sendDownload(book));
+    downloadMutation(book);
     setClicked(true);
   };
 
diff --git a/server/app/src/components/tables/Facets.tsx b/server/app/src/components/tables/Facets.tsx
index 0d63798..8a89d7b 100644
--- a/server/app/src/components/tables/Facets.tsx
+++ b/server/app/src/components/tables/Facets.tsx
@@ -12,8 +12,8 @@ export function ServerFacetEntry({
   selected,
   style
 }: FacetEntryProps) {
-  const { data: servers } = useGetServersQuery(null);
-  const serverOnline = servers?.includes(entry) ?? false;
+  const { data: servers } = useGetServersQuery();
+  const serverOnline = servers && servers.has(entry);
 
   return (
     <Button
diff --git a/server/app/src/pages/SearchPage.tsx b/server/app/src/pages/SearchPage.tsx
index 56e3160..d4bd565 100644
--- a/server/app/src/pages/SearchPage.tsx
+++ b/server/app/src/pages/SearchPage.tsx
@@ -1,4 +1,3 @@
-import React, { FormEvent, useEffect, useMemo, useState } from "react";
 import {
   ActionIcon,
   Button,
@@ -11,19 +10,23 @@ import {
   useMantineColorScheme
 } from "@mantine/core";
 import { MagnifyingGlass, Sidebar, Warning } from "@phosphor-icons/react";
+import { FormEvent, useEffect, useMemo, useState } from "react";
 import image from "../assets/reading.svg";
 import BookTable from "../components/tables/BookTable";
 import ErrorTable from "../components/tables/ErrorTable";
-import { MessageType } from "../state/messages";
-import { sendMessage, sendSearch, toggleSidebar } from "../state/stateSlice";
+import { useDownloadMutation, useSearchMutation } from "../state/api";
+import { toggleSidebar } from "../state/stateSlice";
 import { useAppDispatch, useAppSelector } from "../state/store";
-import classes from "./SearchPage.module.css";
 import { conditionalAttribute } from "../utils/attribute-helper";
+import classes from "./SearchPage.module.css";
+import { selectActiveItem } from "../state/historySlice";
 
 export default function SearchPage() {
   const dispatch = useAppDispatch();
-  const activeItem = useAppSelector((store) => store.state.activeItem);
+  const activeItem = useAppSelector(selectActiveItem);
   const opened = useAppSelector((store) => store.state.isSidebarOpen);
+  const [searchMutation] = useSearchMutation();
+  const [downloadMutation] = useDownloadMutation();
 
   const { colorScheme } = useMantineColorScheme();
 
@@ -44,14 +47,9 @@ export default function SearchPage() {
     event.preventDefault();
 
     if (errorMode) {
-      dispatch(
-        sendMessage({
-          type: MessageType.DOWNLOAD,
-          payload: { book: searchQuery }
-        })
-      );
+      downloadMutation(searchQuery);
     } else {
-      dispatch(sendSearch(searchQuery));
+      searchMutation(searchQuery);
     }
 
     setSearchQuery("");
@@ -84,7 +82,7 @@ export default function SearchPage() {
           <TextInput
             w="100%"
             variant="filled"
-            disabled={activeItem !== null && !activeItem.results}
+            disabled={activeItem && !activeItem.results}
             value={searchQuery}
             onChange={(e) => setSearchQuery(e.target.value)}
             placeholder={
diff --git a/server/app/src/state/api.ts b/server/app/src/state/api.ts
index b35089a..666fe0b 100644
--- a/server/app/src/state/api.ts
+++ b/server/app/src/state/api.ts
@@ -12,7 +12,7 @@ export interface Book {
   time: string;
 }
 
-export const openbooksApi = createApi({
+export const api = createApi({
   baseQuery: fetchBaseQuery({
     baseUrl: getApiURL().href,
     credentials: "include",
@@ -20,25 +20,44 @@ export const openbooksApi = createApi({
   }),
   tagTypes: ["books", "servers"],
   endpoints: (builder) => ({
-    getServers: builder.query<string[], null>({
+    getServers: builder.query<Set<string>, void>({
       query: () => `servers`,
       transformResponse: (ircServers: IrcServer) => {
-        return ircServers.elevatedUsers ?? [];
+        return new Set(ircServers.elevatedUsers ?? []);
       }
     }),
-    getBooks: builder.query<Book[], null>({
+    getBooks: builder.query<Book[], void>({
       query: () => `library`,
       providesTags: ["books"]
     }),
-    deleteBook: builder.mutation<null, string>({
+    deleteBook: builder.mutation<void, string>({
       query: (book) => ({
         url: `library/${book}`,
         method: "DELETE"
       }),
       invalidatesTags: ["books"]
+    }),
+    search: builder.mutation<void, string>({
+      query: (query) => ({
+        url: `search`,
+        method: "POST",
+        params: { query }
+      })
+    }),
+    download: builder.mutation<void, string>({
+      query: (book) => ({
+        url: `download`,
+        params: { book },
+        method: "POST"
+      })
     })
   })
 });
 
-export const { useGetServersQuery, useGetBooksQuery, useDeleteBookMutation } =
-  openbooksApi;
+export const {
+  useGetServersQuery,
+  useGetBooksQuery,
+  useDeleteBookMutation,
+  useSearchMutation,
+  useDownloadMutation
+} = api;
diff --git a/server/app/src/state/historySlice.ts b/server/app/src/state/historySlice.ts
index 070a4f6..cdb7ca2 100644
--- a/server/app/src/state/historySlice.ts
+++ b/server/app/src/state/historySlice.ts
@@ -1,17 +1,18 @@
-import { createAsyncThunk, createSlice, PayloadAction } from "@reduxjs/toolkit";
-import { BookDetail, ParseError } from "./messages";
-import { setActiveItem } from "./stateSlice";
-import { AppDispatch, RootState } from "./store";
+import { createSelector, createSlice, PayloadAction } from "@reduxjs/toolkit";
+import { api } from "./api";
+import { BookDetail, ParseError, SearchResponse } from "./messages";
+import { RootState } from "./store";
 
 // HistoryItem represents a single search history item
-type HistoryItem = {
+export type HistoryItem = {
   query: string;
   timestamp: number;
   results?: BookDetail[];
   errors?: ParseError[];
 };
 
-interface HistoryState {
+export interface HistoryState {
+  active: number | undefined;
   items: HistoryItem[];
 }
 
@@ -24,6 +25,7 @@ const loadState = (): HistoryItem[] => {
 };
 
 const initialState: HistoryState = {
+  active: undefined,
   items: loadState()
 };
 
@@ -31,53 +33,41 @@ export const historySlice = createSlice({
   name: "history",
   initialState,
   reducers: {
-    addHistoryItem: (state, action: PayloadAction<HistoryItem>) => {
-      state.items = [action.payload, ...state.items].slice(0, 16);
+    setActiveItem(state, action: PayloadAction<HistoryItem | null>) {
+      state.active = action.payload?.timestamp;
     },
-    deleteByTimetamp: (state, action: PayloadAction<number>) => {
-      state.items = state.items.filter((x) => x.timestamp !== action.payload);
-    },
-    updateHistoryItem: (state, action: PayloadAction<HistoryItem>) => {
-      const pendingItemIndex = state.items.findIndex(
-        (x) => x.timestamp === action.payload.timestamp
-      );
-      state.items = [
-        ...state.items.slice(0, pendingItemIndex),
-        action.payload,
-        ...state.items.slice(pendingItemIndex + 1)
-      ];
-    }
-  }
-});
+    removeResults: (state, action: PayloadAction<number>) => {
+      const timestamp = action.payload;
+
+      if (state.active === timestamp) {
+        state.active = undefined;
+      }
 
-// Delete an item from history. Clear current item and loading state if deleting active search
-const deleteHistoryItem = createAsyncThunk<
-  Promise<void>,
-  number | undefined,
-  { dispatch: AppDispatch; state: RootState }
->("history/delete_item", async (timeStamp, { dispatch, getState }) => {
-  if (timeStamp === undefined) {
-    dispatch(setActiveItem(null));
-    const toRemove = getState().history.items.at(0)?.timestamp;
-    if (toRemove) {
-      dispatch(historySlice.actions.deleteByTimetamp(toRemove));
+      state.items = state.items.filter((x) => x.timestamp !== timestamp);
+    },
+    resultsReceived: (state, action: PayloadAction<SearchResponse>) => {
+      state.items[0].results = action.payload.books;
+      state.items[0].errors = action.payload.errors;
     }
-    return;
-  }
+  },
+  extraReducers: (builder) => {
+    builder.addMatcher(api.endpoints.search.matchFulfilled, (state, action) => {
+      const timestamp = new Date().getTime();
+      const query = action.meta.arg.originalArgs;
 
-  const activeItem = getState().state.activeItem;
-  if (activeItem?.timestamp === timeStamp) {
-    dispatch(setActiveItem(null));
+      state.active = timestamp;
+      state.items = [{ query, timestamp }, ...state.items].slice(0, 16);
+    });
   }
-
-  dispatch(historySlice.actions.deleteByTimetamp(timeStamp));
 });
 
-const { addHistoryItem, updateHistoryItem } = historySlice.actions;
-
-const selectHistory = (state: RootState) => state.history.items;
+export const selectActiveItem = createSelector(
+  (state: RootState) => state.history.items,
+  (state: RootState) => state.history.active,
+  (items, active) => items.find((x) => x.timestamp === active)
+);
 
-export type { HistoryItem };
-export { deleteHistoryItem, addHistoryItem, updateHistoryItem, selectHistory };
+export const { setActiveItem, removeResults, resultsReceived } =
+  historySlice.actions;
 
 export default historySlice.reducer;
diff --git a/server/app/src/state/notificationSlice.ts b/server/app/src/state/notificationSlice.ts
index f2055dd..3c4105e 100644
--- a/server/app/src/state/notificationSlice.ts
+++ b/server/app/src/state/notificationSlice.ts
@@ -1,7 +1,7 @@
 import { createSlice, PayloadAction } from "@reduxjs/toolkit";
 import { Notification } from "./messages";
 
-interface NotificationState {
+export interface NotificationState {
   isOpen: boolean;
   notifications: Notification[];
 }
diff --git a/server/app/src/state/socketMiddleware.ts b/server/app/src/state/socketMiddleware.ts
deleted file mode 100644
index a7cb80b..0000000
--- a/server/app/src/state/socketMiddleware.ts
+++ /dev/null
@@ -1,110 +0,0 @@
-import { Middleware, MiddlewareAPI, PayloadAction } from "@reduxjs/toolkit";
-import { openbooksApi } from "./api";
-import { deleteHistoryItem } from "./historySlice";
-import {
-  ConnectionResponse,
-  DownloadResponse,
-  MessageType,
-  Notification,
-  NotificationType,
-  Response,
-  SearchResponse
-} from "./messages";
-import { addNotification } from "./notificationSlice";
-import {
-  removeInFlightDownload,
-  sendMessage,
-  setConnectionState,
-  setSearchResults,
-  setUsername
-} from "./stateSlice";
-import { AppDispatch, RootState } from "./store";
-import { displayNotification, downloadFile } from "./util";
-
-// Web socket redux middleware.
-// Listens to socket and dispatches handlers.
-// Handles send_message actions by sending to socket.
-export const websocketConn =
-  (wsUrl: string): Middleware =>
-  ({ dispatch }: MiddlewareAPI<AppDispatch, RootState>) => {
-    const socket = new WebSocket(wsUrl);
-
-    socket.onopen = () => onOpen(dispatch);
-    socket.onclose = () => onClose(dispatch);
-    socket.onmessage = (message) => route(dispatch, message);
-    socket.onerror = () =>
-      displayNotification({
-        appearance: NotificationType.DANGER,
-        title: "Unable to connect to server.",
-        timestamp: new Date().getTime()
-      });
-
-    return (next: AppDispatch) => (action: PayloadAction<unknown>) => {
-      // Send Message action? Send data to the socket.
-      if (sendMessage.match(action)) {
-        if (socket.readyState === socket.OPEN) {
-          socket.send(action.payload.message);
-        } else {
-          displayNotification({
-            appearance: NotificationType.WARNING,
-            title: "Server connection closed. Reload page.",
-            timestamp: new Date().getTime()
-          });
-        }
-      }
-
-      return next(action);
-    };
-  };
-
-const onOpen = (dispatch: AppDispatch): void => {
-  console.log("WebSocket connected.");
-  dispatch(setConnectionState(true));
-  dispatch(sendMessage({ type: MessageType.CONNECT, payload: {} }));
-};
-
-const onClose = (dispatch: AppDispatch): void => {
-  console.log("WebSocket closed.");
-  dispatch(setConnectionState(false));
-};
-
-const route = (dispatch: AppDispatch, msg: MessageEvent<string>): void => {
-  const getNotif = (): Notification => {
-    const response = JSON.parse(msg.data) as Response;
-    const timestamp = new Date().getTime();
-    const notification: Notification = {
-      ...response,
-      timestamp
-    };
-
-    switch (response.type) {
-      case MessageType.STATUS:
-        return notification;
-      case MessageType.CONNECT:
-        dispatch(setUsername((response as ConnectionResponse).name));
-        return notification;
-      case MessageType.SEARCH:
-        dispatch(setSearchResults(response as SearchResponse));
-        return notification;
-      case MessageType.DOWNLOAD:
-        downloadFile((response as DownloadResponse)?.downloadPath);
-        dispatch(openbooksApi.util.invalidateTags(["books"]));
-        dispatch(removeInFlightDownload());
-        return notification;
-      case MessageType.RATELIMIT:
-        dispatch(deleteHistoryItem());
-        return notification;
-      default:
-        console.error(response);
-        return {
-          appearance: NotificationType.DANGER,
-          title: "Unknown message type. See console.",
-          timestamp
-        };
-    }
-  };
-
-  const notif = getNotif();
-  dispatch(addNotification(notif));
-  displayNotification(notif);
-};
diff --git a/server/app/src/state/sseMiddleware.ts b/server/app/src/state/sseMiddleware.ts
new file mode 100644
index 0000000..d9373fb
--- /dev/null
+++ b/server/app/src/state/sseMiddleware.ts
@@ -0,0 +1,98 @@
+import { Middleware, ThunkDispatch, UnknownAction } from "@reduxjs/toolkit";
+import { api } from "./api";
+import { resultsReceived } from "./historySlice";
+import {
+  ConnectionResponse,
+  DownloadResponse,
+  MessageType,
+  Notification,
+  NotificationType,
+  Response,
+  SearchResponse
+} from "./messages";
+import { addNotification } from "./notificationSlice";
+import {
+  removeInFlightDownload,
+  setConnectionState,
+  setUsername
+} from "./stateSlice";
+import { displayNotification, downloadFile } from "./util";
+
+// SSE redux middleware.
+// Listens to events and dispatches handlers.
+export const sseMiddleware =
+  (
+    sseUrl: string
+  ): Middleware<
+    Record<string, never>,
+    unknown,
+    ThunkDispatch<unknown, unknown, UnknownAction>
+  > =>
+  ({ dispatch }) => {
+    const eventSource = new EventSource(sseUrl, {
+      withCredentials: true
+    });
+
+    eventSource.onopen = () => onOpen(dispatch);
+    eventSource.onmessage = (message) => route(dispatch, message);
+    eventSource.onerror = () => {
+      dispatch(setConnectionState(false));
+      displayNotification({
+        appearance: NotificationType.DANGER,
+        title: "Unable to connect to server.",
+        timestamp: new Date().getTime()
+      });
+    };
+
+    return (next) => (action) => next(action);
+  };
+
+const onOpen = (
+  dispatch: ThunkDispatch<unknown, unknown, UnknownAction>
+): void => {
+  console.log("Event Source connected.");
+  dispatch(setConnectionState(true));
+};
+
+const route = (
+  dispatch: ThunkDispatch<unknown, unknown, UnknownAction>,
+  msg: MessageEvent<string>
+): void => {
+  const getNotif = (): Notification => {
+    const response = JSON.parse(msg.data) as Response;
+    const timestamp = new Date().getTime();
+    const notification: Notification = {
+      ...response,
+      timestamp
+    };
+
+    switch (response.type) {
+      case MessageType.STATUS:
+        return notification;
+      case MessageType.CONNECT:
+        dispatch(setUsername((response as ConnectionResponse).name));
+        return notification;
+      case MessageType.SEARCH:
+        dispatch(resultsReceived(response as SearchResponse));
+        return notification;
+      case MessageType.DOWNLOAD:
+        downloadFile((response as DownloadResponse)?.downloadPath);
+        dispatch(api.util.invalidateTags(["books"]));
+        dispatch(removeInFlightDownload());
+        return notification;
+      case MessageType.RATELIMIT:
+        return notification;
+      default:
+        console.error(response);
+        return {
+          appearance: NotificationType.DANGER,
+          title: "Unknown message type. See console.",
+          timestamp
+        };
+    }
+  };
+
+  const notif = getNotif();
+  dispatch(addNotification(notif));
+  displayNotification(notif);
+};
diff --git a/server/app/src/state/stateSlice.ts b/server/app/src/state/stateSlice.ts
index 20907fd..7b8e571 100644
--- a/server/app/src/state/stateSlice.ts
+++ b/server/app/src/state/stateSlice.ts
@@ -1,134 +1,53 @@
-import {
-  createAction,
-  createAsyncThunk,
-  createSlice,
-  PayloadAction
-} from "@reduxjs/toolkit";
-import { addHistoryItem, HistoryItem, updateHistoryItem } from "./historySlice";
-import { MessageType, SearchResponse } from "./messages";
-import { AppDispatch, RootState } from "./store";
+import { createSlice, PayloadAction } from "@reduxjs/toolkit";
+import { api } from "./api";
 
-interface AppState {
+export interface AppState {
   isConnected: boolean;
   isSidebarOpen: boolean;
-  activeItem: HistoryItem | null;
   username?: string;
   inFlightDownloads: string[];
 }
 
-const loadActive = (): HistoryItem | null => {
-  try {
-    return JSON.parse(localStorage.getItem("active")!) ?? null;
-  } catch (err) {
-    return null;
-  }
-};
-
 const initialState: AppState = {
   isConnected: false,
   isSidebarOpen: true,
-  activeItem: loadActive(),
   username: undefined,
   inFlightDownloads: []
 };
 
-const stateSlice = createSlice({
+export const stateSlice = createSlice({
   name: "state",
   initialState,
   reducers: {
-    setActiveItem(state, action: PayloadAction<HistoryItem | null>) {
-      state.activeItem = action.payload;
-    },
     setConnectionState(state, action: PayloadAction<boolean>) {
       state.isConnected = action.payload;
     },
     setUsername(state, action: PayloadAction<string>) {
       state.username = action.payload;
     },
-    addInFlightDownload(state, action: PayloadAction<string>) {
-      state.inFlightDownloads.push(action.payload);
-    },
     removeInFlightDownload(state) {
       state.inFlightDownloads.shift();
     },
     toggleSidebar(state) {
       state.isSidebarOpen = !state.isSidebarOpen;
     }
-  }
-});
-
-// Action that sends a websocket message to the server
-const sendMessage = createAction("socket/send_message", (message: unknown) => ({
-  payload: { message: JSON.stringify(message) }
-}));
-
-const sendDownload = createAsyncThunk(
-  "state/send_download",
-  (book: string, { dispatch }) => {
-    dispatch(addInFlightDownload(book));
-    dispatch(
-      sendMessage({
-        type: MessageType.DOWNLOAD,
-        payload: { book }
-      })
-    );
-  }
-);
-
-// Send a search to the server. Add to query history and set loading.
-const sendSearch = createAsyncThunk(
-  "state/send_sendSearch",
-  (queryString: string, { dispatch }) => {
-    // Send the books search query to the server
-    dispatch(
-      sendMessage({
-        type: MessageType.SEARCH,
-        payload: {
-          query: queryString
-        }
-      })
+  },
+  extraReducers: (builder) => {
+    builder.addMatcher(
+      api.endpoints.download.matchFulfilled,
+      (state, action) => {
+        const book = action.meta.arg.originalArgs;
+        state.inFlightDownloads.push(book);
+      }
     );
-
-    const timestamp = new Date().getTime();
-
-    // Add query to item history.
-    dispatch(addHistoryItem({ query: queryString, timestamp }));
-    dispatch(setActiveItem({ query: queryString, timestamp: timestamp }));
-  }
-);
-
-const setSearchResults = createAsyncThunk<
-  Promise<void>,
-  SearchResponse,
-  { dispatch: AppDispatch; state: RootState }
->(
-  "state/set_search_results",
-  async ({ books, errors }: SearchResponse, { dispatch, getState }) => {
-    const activeItem = getState().state.activeItem;
-    if (activeItem === null) {
-      return;
-    }
-    const updatedItem: HistoryItem = {
-      query: activeItem.query,
-      timestamp: activeItem.timestamp,
-      results: books,
-      errors: errors
-    };
-
-    dispatch(setActiveItem(updatedItem));
-    dispatch(updateHistoryItem(updatedItem));
   }
-);
+});
 
 export const {
-  setActiveItem,
   setConnectionState,
   setUsername,
-  addInFlightDownload,
   removeInFlightDownload,
   toggleSidebar
 } = stateSlice.actions;
 
-export { stateSlice, sendMessage, sendDownload, sendSearch, setSearchResults };
-
 export default stateSlice.reducer;
diff --git a/server/app/src/state/store.ts b/server/app/src/state/store.ts
index af33631..c0677a9 100644
--- a/server/app/src/state/store.ts
+++ b/server/app/src/state/store.ts
@@ -3,12 +3,12 @@ import { setupListeners } from "@reduxjs/toolkit/query/react";
 import { enableMapSet } from "immer";
 import throttle from "lodash/throttle";
 import { TypedUseSelectorHook, useDispatch, useSelector } from "react-redux";
-import { openbooksApi } from "./api";
+import { api } from "./api";
 import historyReducer from "./historySlice";
 import notificationReducer from "./notificationSlice";
-import { websocketConn } from "./socketMiddleware";
+import { sseMiddleware } from "./sseMiddleware";
 import stateReducer from "./stateSlice";
-import { getWebsocketURL } from "./util";
+import { getApiURL } from "./util";
 
 enableMapSet();
 
@@ -17,12 +17,12 @@ export const store = configureStore({
     state: stateReducer,
     history: historyReducer,
     notifications: notificationReducer,
-    [openbooksApi.reducerPath]: openbooksApi.reducer
+    [api.reducerPath]: api.reducer
   },
   middleware: (getDefaultMiddleware) =>
     getDefaultMiddleware().concat(
-      websocketConn(getWebsocketURL().href),
-      openbooksApi.middleware
+      sseMiddleware(getApiURL().href + "events"),
+      api.middleware
     )
 });
 
@@ -40,7 +40,7 @@ const saveState = (key: string, state: unknown): void => {
 store.subscribe(
   throttle(() => {
     saveState("history", store.getState().history.items);
-    saveState("active", store.getState().state.activeItem);
+    saveState("active", store.getState().history.active);
   }, 1000)
 );
 
diff --git a/server/app/src/state/util.ts b/server/app/src/state/util.ts
index 9b8dbf6..851fa12 100644
--- a/server/app/src/state/util.ts
+++ b/server/app/src/state/util.ts
@@ -1,21 +1,6 @@
 import { showNotification } from "@mantine/notifications";
 import { Notification, NotificationType } from "./messages";
 
-export const getWebsocketURL = (): URL => {
-  const websocketURL = new URL(window.location.href + "ws");
-  if (websocketURL.protocol.startsWith("https")) {
-    websocketURL.protocol = websocketURL.protocol.replace("https", "wss");
-  } else {
-    websocketURL.protocol = websocketURL.protocol.replace("http", "ws");
-  }
-
-  if (import.meta.env.DEV) {
-    websocketURL.port = "5228";
-  }
-
-  return websocketURL;
-};
-
 export const getApiURL = (): URL => {
   const apiURL = new URL(window.location.href);
   if (import.meta.env.DEV) {
diff --git a/server/client.go b/server/client.go
index d8f6c57..d4a3595 100644
--- a/server/client.go
+++ b/server/client.go
@@ -2,41 +2,23 @@ package server
 
 import (
 	"context"
+	"encoding/json"
+	"fmt"
 	"log"
-	"time"
 
+	"github.com/evan-buss/openbooks/core"
 	"github.com/evan-buss/openbooks/irc"
+	"github.com/evan-buss/openbooks/util"
 	"github.com/google/uuid"
-
-	"github.com/gorilla/websocket"
-)
-
-const (
-	// Time allowed to write a message to the peer.
-	writeWait = 10 * time.Second
-
-	// Time allowed to read the next pong message from the peer.
-	pongWait = 60 * time.Second
-
-	// Send pings to peer with this period. Must be less than pongWait.
-	pingPeriod = (pongWait * 9) / 10
-
-	// Maximum message size allowed from peer.
-	maxMessageSize = 512
+	"github.com/r3labs/sse/v2"
 )
 
-var upgrader = websocket.Upgrader{
-	ReadBufferSize:  1024,
-	WriteBufferSize: 1024,
-}
-
 // Client is a middleman between the websocket connection and the hub.
 type Client struct {
 	// Unique ID for the client
 	uuid uuid.UUID
 
-	// The websocket connection.
-	conn *websocket.Conn
+	sse *sse.Server
 
 	// Signal to indicate the connection should be terminated.
 	// disconnect chan struct{}
@@ -53,72 +35,77 @@ type Client struct {
 	ctx context.Context
 }
 
-// readPump pumps messages from the websocket connection to the hub.
-//
-// The application runs readPump in a per-connection goroutine. The application
-// ensures that there is at most one reader on a connection by executing all
-// reads from this goroutine.
-func (server *server) readPump(c *Client) {
-	defer func() {
-		c.conn.Close()
-		server.unregister <- c
-	}()
-	c.conn.SetReadLimit(maxMessageSize)
-	c.conn.SetReadDeadline(time.Now().Add(pongWait))
-	c.conn.SetPongHandler(func(string) error { c.conn.SetReadDeadline(time.Now().Add(pongWait)); return nil })
-	for {
-		select {
-		case <-c.ctx.Done():
-			return
-		default:
-			var request Request
-			err := c.conn.ReadJSON(&request)
-
-			if err != nil {
-				c.log.Printf("Connection Closed: %v", err)
-				return
-			}
-
-			c.log.Printf("%s Message Received\n", request.MessageType)
-
-			server.routeMessage(request, c)
-		}
-	}
-}
-
+// TODO: we don't really need clients anymore as SSE handles it for us and we aren't allowing
+// multiple IRC connections simulatenously.
 // writePump pumps messages from the hub to the websocket connection.
 //
 // A goroutine running writePump is started for each connection. The
 // application ensures that there is at most one writer to a connection by
 // executing all writes from this goroutine.
 func (server *server) writePump(c *Client) {
-	ticker := time.NewTicker(pingPeriod)
-	defer func() {
-		ticker.Stop()
-	}()
-
 	for {
 		select {
 		case message, ok := <-c.send:
-			c.conn.SetWriteDeadline(time.Now().Add(writeWait))
 			if !ok {
-				// The hub closed the channel.
-				c.conn.WriteMessage(websocket.CloseMessage, []byte{})
-				return
+				continue
 			}
 
-			err := c.conn.WriteJSON(message)
+			byteMessage, err := json.Marshal(message)
 			if err != nil {
-				c.log.Printf("Error writing JSON to websocket: %s\n", err)
+				c.log.Printf("Error marshalling message to JSON: %s\n", err)
 				return
 			}
+			c.sse.Publish(c.uuid.String(), &sse.Event{
+				Data: byteMessage,
+			})
 		case <-c.ctx.Done():
 			return
-		case <-ticker.C:
-			c.conn.SetWriteDeadline(time.Now().Add(writeWait))
-			if err := c.conn.WriteMessage(websocket.PingMessage, nil); err != nil {
-				return
+		}
+	}
+}
+
+func (server *server) connectIRC(client *Client) {
+	// The IRC connection could be re-used if it is already connected
+	if !client.irc.IsConnected() {
+		err := core.Join(client.irc, server.config.Server, server.config.EnableTLS)
+		if err != nil {
+			client.log.Println(err)
+			client.send <- newErrorResponse("Unable to connect to IRC server.")
+			return
+		}
+
+		handler := server.NewIrcEventHandler(client)
+
+		if server.config.Log {
+			logger, _, err := util.CreateLogFile(client.irc.Username, server.config.DownloadDir)
+			if err != nil {
+				server.log.Println(err)
 			}
+			handler[core.Message] = func(text string) { logger.Println(text) }
+		}
+
+		go core.StartReader(client.ctx, client.irc, handler)
+
+		client.send <- ConnectionResponse{
+			StatusResponse: StatusResponse{
+				MessageType:      CONNECT,
+				NotificationType: SUCCESS,
+				Title:            "Welcome, connection established.",
+				Detail:           fmt.Sprintf("IRC username %s", client.irc.Username),
+			},
+			Name: client.irc.Username,
 		}
+
+		return
+	}
+
+	client.send <- ConnectionResponse{
+		StatusResponse: StatusResponse{
+			MessageType:      CONNECT,
+			NotificationType: NOTIFY,
+			Title:            "Welcome back, re-using open IRC connection.",
+			Detail:           fmt.Sprintf("IRC username %s", client.irc.Username),
+		},
+		Name: client.irc.Username,
 	}
 }
diff --git a/server/routes.go b/server/routes.go
index 57b94bf..080f9b1 100644
--- a/server/routes.go
+++ b/server/routes.go
@@ -16,6 +16,7 @@ import (
 	"strings"
 	"time"
 
+	"github.com/evan-buss/openbooks/core"
 	"github.com/evan-buss/openbooks/irc"
 
 	"github.com/go-chi/chi/v5"
@@ -28,12 +29,15 @@ var reactClient embed.FS
 func (server *server) registerRoutes() *chi.Mux {
 	router := chi.NewRouter()
 	router.Handle("/*", server.staticFilesHandler("app/dist"))
-	router.Get("/ws", server.serveWs())
+	router.HandleFunc("/events", server.eventsHandler())
 	router.Get("/stats", server.statsHandler())
 	router.Get("/servers", server.serverListHandler())
 
 	router.Group(func(r chi.Router) {
 		r.Use(server.requireUser)
+		r.Post("/search", server.searchHandler())
+		r.Post("/download", server.downloadHandler())
+
 		r.Get("/library", server.getAllBooksHandler())
 		r.Delete("/library/{fileName}", server.deleteBooksHandler())
 		r.Get("/library/*", server.getBookHandler())
@@ -42,8 +46,7 @@ func (server *server) registerRoutes() *chi.Mux {
 	return router
 }
 
-// serveWs handles websocket requests from the peer.
-func (server *server) serveWs() http.HandlerFunc {
+func (server *server) eventsHandler() http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		cookie, err := r.Cookie("OpenBooks")
 		if errors.Is(err, http.ErrNoCookie) {
@@ -59,27 +62,24 @@ func (server *server) serveWs() http.HandlerFunc {
 		}
 
 		userId, err := uuid.Parse(cookie.Value)
-		_, alreadyConnected := server.clients[userId]
-
-		// If invalid UUID or the same browser tries to connect again or multiple browser connections
-		// Don't connect to IRC or create new client
-		if err != nil || alreadyConnected || len(server.clients) > 0 {
-			w.WriteHeader(http.StatusBadRequest)
+		if err != nil {
+			http.Error(w, "Invalid user ID.", http.StatusBadRequest)
 			return
 		}
 
-		upgrader.CheckOrigin = func(req *http.Request) bool {
-			return true
+		_, alreadyConnected := server.clients[userId]
+		if alreadyConnected {
+			http.Error(w, "Already connected.", http.StatusBadRequest)
+			return
 		}
 
-		conn, err := upgrader.Upgrade(w, r, w.Header())
-		if err != nil {
-			server.log.Println(err)
+		if len(server.clients) > 0 {
+			http.Error(w, "Multiple connections not allowed.", http.StatusBadRequest)
 			return
 		}
 
 		client := &Client{
-			conn: conn,
+			sse:  server.sse,
 			send: make(chan interface{}, 128),
 			uuid: userId,
 			irc:  irc.New(server.config.UserName, server.config.UserAgent),
@@ -87,10 +87,20 @@ func (server *server) serveWs() http.HandlerFunc {
 			ctx:  context.Background(),
 		}
 
-		server.log.Printf("Client connected from %s\n", conn.RemoteAddr().String())
-		client.log.Println("New client created.")
+		server.log.Printf("Client connected from %s\n", r.RemoteAddr)
+
+		// The SSE library expects a "stream" query parameter to be set
+		newQuery := r.URL.Query()
+		newQuery.Set("stream", client.uuid.String())
+		r.URL.RawQuery = newQuery.Encode()
+
+		go func() {
+			<-r.Context().Done()
+			server.unregister <- client
+		}()
 
 		server.register <- client
+		server.sse.ServeHTTP(w, r)
 	}
 }
 
@@ -108,7 +118,6 @@ func (server *server) staticFilesHandler(assetPath string) http.Handler {
 func (server *server) statsHandler() http.HandlerFunc {
 	type statsReponse struct {
 		UUID string `json:"uuid"`
-		IP   string `json:"ip"`
 		Name string `json:"name"`
 	}
 
@@ -119,7 +128,6 @@ func (server *server) statsHandler() http.HandlerFunc {
 			details := statsReponse{
 				UUID: client.uuid.String(),
 				Name: client.irc.Username,
-				IP:   client.conn.RemoteAddr().String(),
 			}
 
 			result = append(result, details)
@@ -210,3 +218,62 @@ func (server *server) deleteBooksHandler() http.HandlerFunc {
 		}
 	}
 }
+
+func (server *server) searchHandler() http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		client := server.getClient(r.Context())
+		if client == nil {
+			http.Error(w, "Unable to find client.", http.StatusBadRequest)
+			return
+		}
+
+		server.lastSearchMutex.Lock()
+		defer server.lastSearchMutex.Unlock()
+
+		nextAvailableSearch := server.lastSearch.Add(server.config.SearchTimeout)
+
+		if time.Now().Before(nextAvailableSearch) {
+			remainingSeconds := time.Until(nextAvailableSearch).Seconds()
+			// TODO: Show HTTP errors on client instead of sending SSE message
+			http.Error(w, "Rate limited.", http.StatusTooManyRequests)
+			client.send <- newRateLimitResponse(remainingSeconds)
+			return
+		}
+
+		query := r.URL.Query().Get("query")
+		if query == "" {
+			http.Error(w, "No search query provided.", http.StatusBadRequest)
+			client.send <- newErrorResponse("No search query provided.")
+			return
+		}
+
+		core.SearchBook(client.irc, server.config.SearchBot, query)
+		server.lastSearch = time.Now()
+
+		w.WriteHeader(http.StatusAccepted)
+
+		client.send <- newStatusResponse(NOTIFY, "Search request sent.")
+	}
+}
+
+func (server *server) downloadHandler() http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		client := server.getClient(r.Context())
+		if client == nil {
+			http.Error(w, "Unable to find client.", http.StatusBadRequest)
+			return
+		}
+
+		book := r.URL.Query().Get("book")
+		if book == "" {
+			http.Error(w, "No book provided.", http.StatusBadRequest)
+			client.send <- newErrorResponse("No book provided.")
+			return
+		}
+
+		core.DownloadBook(client.irc, book)
+		w.WriteHeader(http.StatusAccepted)
+
+		client.send <- newStatusResponse(NOTIFY, "Download request received.")
+	}
+}
diff --git a/server/server.go b/server/server.go
index 8fe31e1..aec0d10 100644
--- a/server/server.go
+++ b/server/server.go
@@ -14,6 +14,7 @@ import (
 	"github.com/go-chi/chi/v5"
 	"github.com/go-chi/chi/v5/middleware"
 	"github.com/google/uuid"
+	"github.com/r3labs/sse/v2"
 	"github.com/rs/cors"
 )
 
@@ -27,6 +28,8 @@ type server struct {
 	// Registered clients.
 	clients map[uuid.UUID]*Client
 
+	sse *sse.Server
+
 	// Register requests from the clients.
 	register chan *Client
 
@@ -59,7 +62,12 @@ type Config struct {
 }
 
 func New(config Config) *server {
+	sseServer := sse.New()
+	sseServer.AutoReplay = false
+	sseServer.AutoStream = true
+
 	return &server{
+		sse:        sseServer,
 		repository: NewRepository(),
 		config:     &config,
 		register:   make(chan *Client),
@@ -79,9 +87,9 @@ func Start(config Config) {
 
 	corsConfig := cors.Options{
 		AllowCredentials: true,
-		AllowedOrigins:   []string{"http://127.0.0.1:5173"},
+		AllowedOrigins:   []string{"http://localhost:5173"},
 		AllowedHeaders:   []string{"*"},
-		AllowedMethods:   []string{"GET", "DELETE"},
+		AllowedMethods:   []string{"GET", "POST", "DELETE"},
 	}
 	router.Use(cors.New(corsConfig).Handler)
 
@@ -117,16 +125,14 @@ func (server *server) startClientHub(ctx context.Context) {
 				destructor.timer.Stop()
 				server.log.Printf("Client %s reconnected\n", client.uuid.String())
 
-				// Update the existing client's websocket connection to the new one
-				destructor.client.conn = client.conn
-				client = destructor.client
+				client.irc = destructor.client.irc
 
 				delete(selfDestructors, client.uuid)
 			}
 
 			server.clients[client.uuid] = client
+			server.connectIRC(client)
 			go server.writePump(client)
-			go server.readPump(client)
 
 		case client := <-server.unregister:
 			// Keep the client and IRC connection alive for 3 minutes in case the client reconnects
diff --git a/server/websocket_requests.go b/server/websocket_requests.go
deleted file mode 100644
index 1e14132..0000000
--- a/server/websocket_requests.go
+++ /dev/null
@@ -1,122 +0,0 @@
-package server
-
-import (
-	"encoding/json"
-	"fmt"
-	"time"
-
-	"github.com/evan-buss/openbooks/core"
-	"github.com/evan-buss/openbooks/util"
-)
-
-// RequestHandler defines a generic handle() method that is called when a specific request type is made
-type RequestHandler interface {
-	handle(c *Client)
-}
-
-// messageRouter is used to parse the incoming request and respond appropriately
-func (server *server) routeMessage(message Request, c *Client) {
-	var obj interface{}
-
-	switch message.MessageType {
-	case SEARCH:
-		obj = new(SearchRequest)
-	case DOWNLOAD:
-		obj = new(DownloadRequest)
-	}
-
-	err := json.Unmarshal(message.Payload, &obj)
-	if err != nil {
-		server.log.Printf("Invalid request payload. %s.\n", err.Error())
-		c.send <- StatusResponse{
-			MessageType:      STATUS,
-			NotificationType: DANGER,
-			Title:            "Unknown request payload.",
-		}
-	}
-
-	switch message.MessageType {
-	case CONNECT:
-		c.startIrcConnection(server)
-	case SEARCH:
-		c.sendSearchRequest(obj.(*SearchRequest), server)
-	case DOWNLOAD:
-		c.sendDownloadRequest(obj.(*DownloadRequest))
-	default:
-		server.log.Println("Unknown request type received.")
-	}
-}
-
-// handle ConnectionRequests and either connect to the server or do nothing
-func (c *Client) startIrcConnection(server *server) {
-	// The IRC connection could be re-used if it is already connected
-	if !c.irc.IsConnected() {
-		err := core.Join(c.irc, server.config.Server, server.config.EnableTLS)
-		if err != nil {
-			c.log.Println(err)
-			c.send <- newErrorResponse("Unable to connect to IRC server.")
-			return
-		}
-
-		handler := server.NewIrcEventHandler(c)
-
-		if server.config.Log {
-			logger, _, err := util.CreateLogFile(c.irc.Username, server.config.DownloadDir)
-			if err != nil {
-				server.log.Println(err)
-			}
-			handler[core.Message] = func(text string) { logger.Println(text) }
-		}
-
-		go core.StartReader(c.ctx, c.irc, handler)
-
-		c.send <- ConnectionResponse{
-			StatusResponse: StatusResponse{
-				MessageType:      CONNECT,
-				NotificationType: SUCCESS,
-				Title:            "Welcome, connection established.",
-				Detail:           fmt.Sprintf("IRC username %s", c.irc.Username),
-			},
-			Name: c.irc.Username,
-		}
-
-		return
-	}
-
-	c.send <- ConnectionResponse{
-		StatusResponse: StatusResponse{
-			MessageType:      CONNECT,
-			NotificationType: NOTIFY,
-			Title:            "Welcome back, re-using open IRC connection.",
-			Detail:           fmt.Sprintf("IRC username %s", c.irc.Username),
-		},
-		Name: c.irc.Username,
-	}
-
-}
-
-// handle SearchRequests and send the query to the book server
-func (c *Client) sendSearchRequest(s *SearchRequest, server *server) {
-	server.lastSearchMutex.Lock()
-	defer server.lastSearchMutex.Unlock()
-
-	nextAvailableSearch := server.lastSearch.Add(server.config.SearchTimeout)
-
-	if time.Now().Before(nextAvailableSearch) {
-		remainingSeconds := time.Until(nextAvailableSearch).Seconds()
-		c.send <- newRateLimitResponse(remainingSeconds)
-
-		return
-	}
-
-	core.SearchBook(c.irc, server.config.SearchBot, s.Query)
-	server.lastSearch = time.Now()
-
-	c.send <- newStatusResponse(NOTIFY, "Search request sent.")
-}
-
-// handle DownloadRequests by sending the request to the book server
-func (c *Client) sendDownloadRequest(d *DownloadRequest) {
-	core.DownloadBook(c.irc, d.Book)
-	c.send <- newStatusResponse(NOTIFY, "Download request received.")
-}