diff --git a/.github/.gitkeep b/.github/.gitkeep
new file mode 100644
index 0000000000..8b13789179
--- /dev/null
+++ b/.github/.gitkeep
@@ -0,0 +1 @@
+
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
new file mode 100644
index 0000000000..9194028efc
--- /dev/null
+++ b/.github/workflows/cd.yml
@@ -0,0 +1,18 @@
+name: Continuous Deployment
+
+on:
+  push:
+    branches: [main]
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+      - name: Set up Go
+        uses: actions/setup-go@v4
+        with:
+          go-version: '1.21'
+      - name: Build app
+        run: scripts/buildprod.sh
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 0000000000..9663fc6b94
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,57 @@
+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.21.x" # Try a different Go version
+
+      - name: Run tests
+        run: go test -cover ./...
+
+      - name: Install gosec
+        run: go install github.com/securego/gosec/v2/cmd/gosec@latest
+
+      - name: Run gosec
+        run: ~/go/bin/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.21.x"
+
+      - name: Check formatting
+        run: test -z "$(go fmt ./...)"
+
+      - name: List files
+        run: ls -R
+        working-directory: ${{ github.workspace }}
+
+      - name: Install staticcheck
+        run: go install honnef.co/go/tools/cmd/staticcheck@latest
+        working-directory: ${{ github.workspace }}
+
+      - name: Run staticcheck
+        run: ~/go/bin/staticcheck ./...
+        working-directory: ${{ github.workspace }}
\ No newline at end of file
diff --git a/README.md b/README.md
index c2bec0368b..80a09a68fa 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,5 @@
+![CI Test Status](https://github.com/Galaxybigbird/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!
+
+Andy'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 0000000000..4ce5cfe9a1
--- /dev/null
+++ b/internal/auth/auth_test.go
@@ -0,0 +1,41 @@
+package auth
+
+import (
+	"net/http"
+	"testing"
+)
+
+func TestGetAPIKey_ValidHeader(t *testing.T) {
+	headers := http.Header{}
+	headers.Set("Authorization", "ApiKey testkey123")
+	key, err := GetAPIKey(headers)
+	if err != nil {
+		t.Errorf("expected no error, got %v", err)
+	}
+	if key != "testkey123" {
+		t.Errorf("expected 'testkey123', got '%s'", key)
+	}
+}
+
+func TestGetAPIKey_MissingHeader(t *testing.T) {
+	headers := http.Header{}
+	_, err := GetAPIKey(headers)
+	if err == nil {
+		t.Error("expected error for missing header, got nil")
+	}
+}
+
+func TestGetAPIKey_MalformedHeader(t *testing.T) {
+	headers := http.Header{}
+	headers.Set("Authorization", "Bearer sometoken")
+	_, err := GetAPIKey(headers)
+	if err == nil {
+		t.Error("expected error for malformed header, got nil")
+	}
+
+	headers.Set("Authorization", "ApiKey")
+	_, err = GetAPIKey(headers)
+	if err == nil {
+		t.Error("expected error for incomplete ApiKey header, got nil")
+	}
+}
diff --git a/json.go b/json.go
index 1e6e7985e1..abab4ffbfe 100644
--- a/json.go
+++ b/json.go
@@ -30,5 +30,8 @@ func respondWithJSON(w http.ResponseWriter, code int, payload interface{}) {
 		return
 	}
 	w.WriteHeader(code)
-	w.Write(dat)
+	if _, err := w.Write(dat); err != nil {
+		// Optionally log the error
+		// log.Printf("failed to write response: %v", err)
+	}
 }
diff --git a/main.go b/main.go
index 19d7366c5f..15ee531c5d 100644
--- a/main.go
+++ b/main.go
@@ -7,6 +7,7 @@ import (
 	"log"
 	"net/http"
 	"os"
+	"time"
 
 	"github.com/go-chi/chi"
 	"github.com/go-chi/cors"
@@ -89,8 +90,9 @@ func main() {
 
 	router.Mount("/v1", v1Router)
 	srv := &http.Server{
-		Addr:    ":" + port,
-		Handler: router,
+		Addr:              ":" + port,
+		Handler:           router,
+		ReadHeaderTimeout: 5 * time.Second,
 	}
 
 	log.Printf("Serving on port: %s\n", port)