diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
new file mode 100644
index 00000000000..d7ab87e460a
--- /dev/null
+++ b/.github/workflows/cd.yml
@@ -0,0 +1,39 @@
+name: cd
+
+on:
+  push:
+    branches: [main]
+
+jobs:
+  deploy:
+    name: Deploy
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v4
+
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: "1.25.1"
+
+      - name: Build app
+        run: ./scripts/buildprod.sh
+      
+      - id: 'auth'
+        uses: 'google-github-actions/auth@v2'
+        with:
+          credentials_json: '${{ secrets.GCP_CREDENTIALS }}'
+
+      - name: Set up Cloud SDK
+        uses: 'google-github-actions/setup-gcloud@v3'
+
+      - name: Use gcloud CLI
+        run: 'gcloud info'
+
+      - name: Build and Push Image
+        run: gcloud builds submit --tag us-central1-docker.pkg.dev/notely-484317/notely-ar-repo/notely:latest
+
+      - name: Deploy to Cloud Run
+        run: gcloud run deploy notely --image us-central1-docker.pkg.dev/notely-484317/notely-ar-repo/notely:latest --region us-central1 --allow-unauthenticated --project notely-484317 --max-instances=4
\ No newline at end of file
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 00000000000..d1dfbf23287
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,50 @@
+name: ci
+
+on:
+  pull_request:
+    branches: [main]
+
+jobs:
+  tests:
+    name: Tests
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v4
+
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: "1.25.1"
+
+      - name: Accurate Test
+        run: go test -cover ./...
+
+      - name: Install gosec
+        run: go install github.com/securego/gosec/v2/cmd/gosec@latest
+
+      - name: Security check
+        run: gosec ./...
+
+  style:
+    name: Style
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v4
+
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: "1.25.1"
+
+      - name: Install staticcheck
+        run: go install honnef.co/go/tools/cmd/staticcheck@latest
+
+      - name: Formatting Check
+        run: test -z $(go fmt ./...)
+
+      - name: Linting Check
+        run: ~/go/bin/staticcheck ./...
\ No newline at end of file
diff --git a/README.md b/README.md
index c2bec0368b7..4637562faa1 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,5 @@
+![Dynamically generated badge showing current status of all tests performed in CI](https://github.com/SeanCrowe1/learn-cicd-starter/actions/workflows/ci.yml/badge.svg)
+
 # learn-cicd-starter (Notely)
 
 This repo contains the starter code for the "Notely" application for the "Learn CICD" course on [Boot.dev](https://boot.dev).
@@ -21,3 +23,5 @@ go build -o notely && ./notely
 *This starts the server in non-database mode.* It will serve a simple webpage at `http://localhost:8080`.
 
 You do *not* need to set up a database or any interactivity on the webpage yet. Instructions for that will come later in the course!
+
+SeanCrowe1's version of Boot.dev's Notely app.
\ No newline at end of file
diff --git a/internal/auth/auth_test.go b/internal/auth/auth_test.go
new file mode 100644
index 00000000000..e801b351bd5
--- /dev/null
+++ b/internal/auth/auth_test.go
@@ -0,0 +1,37 @@
+package auth
+
+import (
+	"net/http"
+	"reflect"
+	"testing"
+)
+
+func TestEmptyGetAPIKey(t *testing.T) {
+	headers := http.Header{}
+	headers.Add("Authorization", "")
+	got, err := GetAPIKey(headers)
+	want := ""
+	if !reflect.DeepEqual(want, got) {
+		t.Fatalf("%v\nexpected: %v, got: %v", err, want, got)
+	}
+}
+
+func TestValidGetAPIKey(t *testing.T) {
+	headers := http.Header{}
+	headers.Add("Authorization", "ApiKey some-secret-key")
+	got, err := GetAPIKey(headers)
+	want := "some-secret-key"
+	if !reflect.DeepEqual(want, got) {
+		t.Fatalf("%v\nexpected: %v, got: %v", err, want, got)
+	}
+}
+
+func TestInvalidGetAPIKey(t *testing.T) {
+	headers := http.Header{}
+	headers.Add("Classification", "Private Stuff")
+	got, err := GetAPIKey(headers)
+	want := ""
+	if !reflect.DeepEqual(want, got) {
+		t.Fatalf("%v\nexpected: %v, got: %v", err, want, got)
+	}
+}
diff --git a/json.go b/json.go
index 1e6e7985e18..3e0cd76a11a 100644
--- a/json.go
+++ b/json.go
@@ -30,5 +30,10 @@ func respondWithJSON(w http.ResponseWriter, code int, payload interface{}) {
 		return
 	}
 	w.WriteHeader(code)
-	w.Write(dat)
+	_, err = w.Write(dat)
+	if err != nil {
+		log.Printf("Error writing data: %s", err)
+		w.WriteHeader(500)
+		return
+	}
 }
diff --git a/main.go b/main.go
index 19d7366c5f7..2e9e9b52384 100644
--- a/main.go
+++ b/main.go
@@ -89,8 +89,9 @@ func main() {
 
 	router.Mount("/v1", v1Router)
 	srv := &http.Server{
-		Addr:    ":" + port,
-		Handler: router,
+		Addr:              ":" + port,
+		Handler:           router,
+		ReadHeaderTimeout: 2000,
 	}
 
 	log.Printf("Serving on port: %s\n", port)
diff --git a/static/index.html b/static/index.html
index 72be101028c..5d4ad73c095 100644
--- a/static/index.html
+++ b/static/index.html
@@ -7,7 +7,7 @@
 </head>
 
 <body class="section">
-    <h1>Notely</h1>
+    <h1>Welcome to Notely</h1>
 
     <div id="userCreationContainer" class="section">
         <input id="nameField" type="text" placeholder="Enter your name">