diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
new file mode 100644
index 0000000000..432a3a49c2
--- /dev/null
+++ b/.github/workflows/cd.yml
@@ -0,0 +1,38 @@
+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.23.0"
+      - name: Build Go Application
+        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
+
+      - name: Use gcloud CLI
+        run: gcloud info
+
+      - name: Build and push Docker image
+        run: gcloud builds submit --tag us-central1-docker.pkg.dev/notely-470916/notely-ar-repo/notely-app:v1 .
+
+      - name: Deploy to Cloud Run
+        run: gcloud run deploy notely --image us-central1-docker.pkg.dev/notely-470916/notely-ar-repo/notely-app:v1 --region us-central1 --allow-unauthenticated --project notely-470916 --max-instances=4
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 0000000000..9c20510fc9
--- /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: Go Tests
+        run: go test -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: Test Style
+        run: test -z $(go fmt ./...)
+
+      - name: Install staticcheck
+        run: go install honnef.co/go/tools/cmd/staticcheck@latest
diff --git a/.gitignore b/.gitignore
index 2092f54e78..4251dae06e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ out
 .env
 learn-cicd-starter
 notely
+notely-470916-53389ea9bcbf.json
\ No newline at end of file
diff --git a/README.md b/README.md
index c2bec0368b..44b0684ce3 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,5 @@
+![Workflow Badge](https://github.com/Arundhuti2000/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!
+Arundhati's version of Boot.dev's Notely app.
diff --git a/internal/auth/auth_test.go b/internal/auth/auth_test.go
new file mode 100644
index 0000000000..ba37735d12
--- /dev/null
+++ b/internal/auth/auth_test.go
@@ -0,0 +1,38 @@
+package auth
+
+import (
+	"net/http"
+	"testing"
+)
+
+func TestGetAPIKey_NoHeader(t *testing.T) {
+	headers := http.Header{}
+	_, err := GetAPIKey(headers)
+	if err != ErrNoAuthHeaderIncluded {
+		t.Fatalf("expected: %v, got: %v", ErrNoAuthHeaderIncluded, err)
+	}
+}
+
+func TestGetAPIKey_MalformedHeader(t *testing.T) {
+	headers := http.Header{}
+	headers.Set("Authorization", "Bearer sometoken")
+
+	_, err := GetAPIKey(headers)
+	if err == nil || err.Error() != "malformed authorization header" {
+		t.Fatalf("expected: malformed authorization header, got: %v", err)
+	}
+}
+func TestGetAPIKey_ValidHeader(t *testing.T) {
+	headers := http.Header{}
+	headers.Set("Authorization", "ApiKey my-secret-key")
+
+	got, err := GetAPIKey(headers)
+	want := "my-secret-key"
+
+	if err != nil {
+		t.Fatalf("expected no error, got: %v", err)
+	}
+	if got != want {
+		t.Fatalf("expected: %v, got: %v", want, got)
+	}
+}
diff --git a/json.go b/json.go
index 1e6e7985e1..0f8075d808 100644
--- a/json.go
+++ b/json.go
@@ -30,5 +30,7 @@ func respondWithJSON(w http.ResponseWriter, code int, payload interface{}) {
 		return
 	}
 	w.WriteHeader(code)
-	w.Write(dat)
+	if _, err := w.Write(dat); err != nil {
+		log.Printf("Error writing response: %s", 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)
diff --git a/static/index.html b/static/index.html
index 72be101028..d9997c6fef 100644
--- a/static/index.html
+++ b/static/index.html
@@ -1,193 +1,203 @@
 <!DOCTYPE html>
 <html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <title>Welcome to Notely</title>
+  </head>
 
-<head>
-    <meta charset="UTF-8">
-    <title>Notely</title>
-</head>
-
-<body class="section">
+  <body class="section">
     <h1>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>