diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
new file mode 100644
index 0000000000..38ef87c826
--- /dev/null
+++ b/.github/workflows/cd.yml
@@ -0,0 +1,46 @@
+name: cd
+on:
+  push:
+    branches: [main]
+
+jobs:
+  deploy:
+    name: Deploy
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+
+    steps:
+      - name: Set up go
+        uses: actions/setup-go@v2
+        with:
+          go-version: '1.22'
+
+      - name: Check out repository
+        uses: actions/checkout@v2
+
+      - name: Install goose
+        run: go install github.com/pressly/goose/v3/cmd/goose@latest
+
+      - name: Build
+        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@v2'
+        with:
+          version: '>= 363.0.0'
+
+      - name: Build and push Docker image
+        run: gcloud builds submit --tag us-central1-docker.pkg.dev/notely-456712/notely-ar-repo/my-image:1.0.0 .
+
+      - name: Deploy to Cloud Run
+        run: gcloud run deploy notely --image us-central1-docker.pkg.dev/notely-456712/notely-ar-repo/my-image:1.0.0 --region us-central1
+
+      - name: Run migration
+        env:
+          DATABASE_URL: ${{ secrets.DATABASE_URL }}
+        run: ./scripts/migrateup.sh
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 0000000000..4a656f678e
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,47 @@
+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.23.0'
+
+      - name: Run Tests
+        run: go test ./internal/auth -cover
+
+      - name: Install gosec
+        run: go install github.com/securego/gosec/v2/cmd/gosec@latest
+
+      - name: Run gosec
+        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.23.0'
+
+      - name: Check Formatting
+        run: test -z $(go fmt ./...)
+
+      - name: Install staticcheck
+        run: go install honnef.co/go/tools/cmd/staticcheck@latest
diff --git a/README.md b/README.md
index c2bec0368b..48f01ee50c 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,5 @@
+![alt text goes here](https://github.com/WilliamBadgett97/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).
@@ -18,6 +20,8 @@ Run the server:
 go build -o notely && ./notely
 ```
 
-*This starts the server in non-database mode.* It will serve a simple webpage at `http://localhost:8080`.
+_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!
 
-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!
+Williams's version of Boot.dev's Notely app.
diff --git a/internal/auth/auth.go b/internal/auth/auth.go
index f969aacf63..8da3b7ffa0 100644
--- a/internal/auth/auth.go
+++ b/internal/auth/auth.go
@@ -2,6 +2,7 @@ package auth
 
 import (
 	"errors"
+	"fmt"
 	"net/http"
 	"strings"
 )
@@ -15,6 +16,10 @@ func GetAPIKey(headers http.Header) (string, error) {
 		return "", ErrNoAuthHeaderIncluded
 	}
 	splitAuth := strings.Split(authHeader, " ")
+	fmt.Println("SPLIT AUTH")
+	fmt.Println(splitAuth)
+	fmt.Println(len(splitAuth))
+	fmt.Println(len(splitAuth[0]))
 	if len(splitAuth) < 2 || splitAuth[0] != "ApiKey" {
 		return "", errors.New("malformed authorization header")
 	}
diff --git a/internal/auth/auth_test.go b/internal/auth/auth_test.go
new file mode 100644
index 0000000000..9544870260
--- /dev/null
+++ b/internal/auth/auth_test.go
@@ -0,0 +1,33 @@
+package auth
+
+import (
+	"net/http"
+	"reflect"
+	"testing"
+)
+
+func TestGetApiKey(t *testing.T) {
+	var headerTestOne = http.Header{
+		"Authorization": []string{"ApiKey 12345-abcde-67890-fghij"},
+	}
+	var headerTestTwo = http.Header{
+		"Authorization": []string{"ApiKey "},
+	}
+	type test struct {
+		input http.Header
+		want  string
+	}
+	tests := []test{
+		{input: headerTestOne, want: "12345-abcde-67890-fghij"},
+		{input: headerTestTwo, want: ""},
+	}
+	for _, tc := range tests {
+		got, err := GetAPIKey(tc.input)
+		if err != nil {
+			t.Fatal(err)
+		}
+		if !reflect.DeepEqual(tc.want, got) {
+			t.Fatalf("expected: %v, got: %v", tc.want, got)
+		}
+	}
+}
diff --git a/json.go b/json.go
index 1e6e7985e1..35fe788492 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 19d7366c5f..ec86bb7bf9 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: time.Second * 5,
 	}
 
 	log.Printf("Serving on port: %s\n", port)
diff --git a/static/index.html b/static/index.html
index 72be101028..dcc7bb0410 100644
--- a/static/index.html
+++ b/static/index.html
@@ -1,193 +1,203 @@
 <!DOCTYPE html>
 <html lang="en">
-
-<head>
-    <meta charset="UTF-8">
+  <head>
+    <meta charset="UTF-8" />
     <title>Notely</title>
-</head>
+  </head>
 
-<body class="section">
-    <h1>Notely</h1>
+  <body class="section">
+    <h1>Welcome to Notely</h1>
 
     <div id="userCreationContainer" class="section">
-        <input id="nameField" type="text" placeholder="Enter your name">
-        <button id="createUserButton" onclick="createUser()">Create User</button>
+      <input id="nameField" type="text" placeholder="Enter your name" />
+      <button id="createUserButton" onclick="createUser()">Create User</button>
     </div>
 
-    <div id="noteSection" class="section" style="display: none;">
-        <p id="greetingMessage"></p>
+    <div id="noteSection" class="section" style="display: none">
+      <p id="greetingMessage"></p>
 
-        <textarea id="newNoteContent"></textarea>
-        <button id="createNoteButton" onclick="createNote()">Create Note</button>
+      <textarea id="newNoteContent"></textarea>
+      <button id="createNoteButton" onclick="createNote()">Create Note</button>
 
-        <h2>Your Notes</h2>
-        <div id="notes"></div>
+      <h2>Your Notes</h2>
+      <div id="notes"></div>
 
-        <button onclick="logout()">Logout</button>
+      <button onclick="logout()">Logout</button>
     </div>
 
     <script>
-        const API_BASE = '/v1';
-        let currentUserAPIKey = null;
-        let currentUser = null;
-
-        async function createNote() {
-            if (!currentUser) {
-                alert('Please create a user first');
-                return;
-            }
-            const noteContent = document.getElementById('newNoteContent').value;
-            const response = await fetchWithAlert(`${API_BASE}/notes`,
-                {
-                    method: 'POST', headers: { 'Content-Type': 'application/json', 'Authorization': `ApiKey ${currentUserAPIKey}` },
-                    body: JSON.stringify({ note: noteContent })
-                });
-            const note = await response.json();
-            displayNote(note);
-        }
-
-        async function getUser() {
-            const response = await fetchWithAlert(`${API_BASE}/users`, { headers: { 'Authorization': `ApiKey ${currentUserAPIKey}` } });
-            return await response.json();
-        }
-
-        async function loadNotes() {
-            if (!currentUser) {
-                return;
-            }
-            const response = await fetchWithAlert(`${API_BASE}/notes`, { headers: { 'Authorization': `ApiKey ${currentUserAPIKey}` } });
-            const notes = await response.json();
-            const notesContainer = document.getElementById('notes');
-            notesContainer.innerHTML = '';
-            notes.forEach(note => displayNote(note));
-        }
-
-        function displayNote(note) {
-            const noteElement = document.createElement('div');
-            noteElement.className = 'note';
-            noteElement.textContent = note.note;
-            document.getElementById('notes').appendChild(noteElement);
-        }
-
-        async function createUser() {
-            const nameField = document.getElementById('nameField');
-            const response = await fetchWithAlert(`${API_BASE}/users`, {
-                method: 'POST',
-                headers: { 'Content-Type': 'application/json' },
-                body: JSON.stringify({ name: nameField.value }) // using the value from nameField
-            });
-            const user = await response.json();
-            localStorage.setItem('currentUserAPIKey', user.api_key);
-            login()
-            alert(`User Created: ${user.name}`);
-
-            // Once a user is created, hide the user creation section and show the note section
-            document.getElementById('userCreationContainer').style.display = 'none';
-            document.getElementById('noteSection').style.display = 'flex';
-        }
-
-        function logout() {
-            localStorage.removeItem('currentUserAPIKey');
-            currentUser = null;
-
-            // When a user logs out, show the user creation section and hide the note section
-            document.getElementById('userCreationContainer').style.display = 'block';
-            document.getElementById('noteSection').style.display = 'none';
-        }
-
-        async function login() {
-            currentUserAPIKey = localStorage.getItem('currentUserAPIKey')
-            if (!currentUserAPIKey) {
-                return;
-            }
-            const user = await getUser();
-            currentUser = user;
-            currentUserAPIKey = user.api_key;
-            await loadNotes();
-
-            // When a user logs in, hide the user creation section and show the note section
-            document.getElementById('userCreationContainer').style.display = 'none';
-            document.getElementById('noteSection').style.display = 'flex';
-
-            // Display a greeting message
-            document.getElementById('greetingMessage').textContent = `Hello ${user.name}!`;
-        }
-
-        async function fetchWithAlert(url, options) {
-            const response = await fetch(url, options);
-            if (response.status > 299) {
-                alert(`Error: ${response.status}`);
-                return;
-            }
-            return response;
-        }
-
+      const API_BASE = '/v1';
+      let currentUserAPIKey = null;
+      let currentUser = null;
+
+      async function createNote() {
+        if (!currentUser) {
+          alert('Please create a user first');
+          return;
+        }
+        const noteContent = document.getElementById('newNoteContent').value;
+        const response = await fetchWithAlert(`${API_BASE}/notes`, {
+          method: 'POST',
+          headers: {
+            'Content-Type': 'application/json',
+            Authorization: `ApiKey ${currentUserAPIKey}`,
+          },
+          body: JSON.stringify({ note: noteContent }),
+        });
+        const note = await response.json();
+        displayNote(note);
+      }
+
+      async function getUser() {
+        const response = await fetchWithAlert(`${API_BASE}/users`, {
+          headers: { Authorization: `ApiKey ${currentUserAPIKey}` },
+        });
+        return await response.json();
+      }
+
+      async function loadNotes() {
+        if (!currentUser) {
+          return;
+        }
+        const response = await fetchWithAlert(`${API_BASE}/notes`, {
+          headers: { Authorization: `ApiKey ${currentUserAPIKey}` },
+        });
+        const notes = await response.json();
+        const notesContainer = document.getElementById('notes');
+        notesContainer.innerHTML = '';
+        notes.forEach((note) => displayNote(note));
+      }
+
+      function displayNote(note) {
+        const noteElement = document.createElement('div');
+        noteElement.className = 'note';
+        noteElement.textContent = note.note;
+        document.getElementById('notes').appendChild(noteElement);
+      }
+
+      async function createUser() {
+        const nameField = document.getElementById('nameField');
+        const response = await fetchWithAlert(`${API_BASE}/users`, {
+          method: 'POST',
+          headers: { 'Content-Type': 'application/json' },
+          body: JSON.stringify({ name: nameField.value }), // using the value from nameField
+        });
+        const user = await response.json();
+        localStorage.setItem('currentUserAPIKey', user.api_key);
         login();
+        alert(`User Created: ${user.name}`);
+
+        // Once a user is created, hide the user creation section and show the note section
+        document.getElementById('userCreationContainer').style.display = 'none';
+        document.getElementById('noteSection').style.display = 'flex';
+      }
+
+      function logout() {
+        localStorage.removeItem('currentUserAPIKey');
+        currentUser = null;
+
+        // When a user logs out, show the user creation section and hide the note section
+        document.getElementById('userCreationContainer').style.display =
+          'block';
+        document.getElementById('noteSection').style.display = 'none';
+      }
+
+      async function login() {
+        currentUserAPIKey = localStorage.getItem('currentUserAPIKey');
+        if (!currentUserAPIKey) {
+          return;
+        }
+        const user = await getUser();
+        currentUser = user;
+        currentUserAPIKey = user.api_key;
+        await loadNotes();
+
+        // When a user logs in, hide the user creation section and show the note section
+        document.getElementById('userCreationContainer').style.display = 'none';
+        document.getElementById('noteSection').style.display = 'flex';
+
+        // Display a greeting message
+        document.getElementById(
+          'greetingMessage'
+        ).textContent = `Hello ${user.name}!`;
+      }
+
+      async function fetchWithAlert(url, options) {
+        const response = await fetch(url, options);
+        if (response.status > 299) {
+          alert(`Error: ${response.status}`);
+          return;
+        }
+        return response;
+      }
+
+      login();
     </script>
 
     <style>
-        :root {
-            --primary: hsl(235, 86%, 65%);
-            --primary-light: hsl(235, 88%, 73%);
-            --dark: #121212;
-            --light: #E4E4E4;
-            --grey: #424242;
-        }
-
-        body {
-            font-family: system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
-            background-color: var(--dark);
-            color: var(--light);
-            margin: 0;
-            padding: 0;
-            height: 100vh;
-        }
-
-        .section {
-            display: flex;
-            flex-direction: column;
-            align-items: center;
-            justify-content: center;
-        }
-
-        textarea {
-            width: 300px;
-            height: 100px;
-            margin-bottom: 10px;
-        }
-
-        input {
-            display: block;
-            padding: 1rem;
-        }
-
-        button {
-            background-color: var(--primary);
-            color: var(--light);
-            border: none;
-            padding: 15px 32px;
-            text-align: center;
-            text-decoration: none;
-            display: inline-block;
-            font-size: 16px;
-            margin: 4px 2px;
-            cursor: pointer;
-            transition-duration: 0.4s;
-        }
-
-        button:hover {
-            background-color: var(--primary-light);
-        }
-
-        .note {
-            width: 300px;
-            background-color: var(--grey);
-            border: 1px solid var(--primary);
-            padding: 10px;
-            margin-bottom: 10px;
-        }
+      :root {
+        --primary: hsl(235, 86%, 65%);
+        --primary-light: hsl(235, 88%, 73%);
+        --dark: #121212;
+        --light: #e4e4e4;
+        --grey: #424242;
+      }
+
+      body {
+        font-family: system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI',
+          Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue',
+          sans-serif;
+        background-color: var(--dark);
+        color: var(--light);
+        margin: 0;
+        padding: 0;
+        height: 100vh;
+      }
+
+      .section {
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        justify-content: center;
+      }
+
+      textarea {
+        width: 300px;
+        height: 100px;
+        margin-bottom: 10px;
+      }
+
+      input {
+        display: block;
+        padding: 1rem;
+      }
+
+      button {
+        background-color: var(--primary);
+        color: var(--light);
+        border: none;
+        padding: 15px 32px;
+        text-align: center;
+        text-decoration: none;
+        display: inline-block;
+        font-size: 16px;
+        margin: 4px 2px;
+        cursor: pointer;
+        transition-duration: 0.4s;
+      }
+
+      button:hover {
+        background-color: var(--primary-light);
+      }
+
+      .note {
+        width: 300px;
+        background-color: var(--grey);
+        border: 1px solid var(--primary);
+        padding: 10px;
+        margin-bottom: 10px;
+      }
     </style>
     <!-- your existing CSS code... -->
-</body>
-
+  </body>
 </html>