diff --git a/.github/workflows/test.yml-template b/.github/workflows/test.yml-template
new file mode 100644
index 0000000..bb13dfc
--- /dev/null
+++ b/.github/workflows/test.yml-template
@@ -0,0 +1,23 @@
+name: Test
+
+on:
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [20.x]
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Use Node.js ${{ matrix.node-version }}
+      uses: actions/setup-node@v1
+      with:
+        node-version: ${{ matrix.node-version }}
+    - run: npm install
+    - run: npm test
diff --git a/db/expense.json b/db/expense.json
index 1bc75a6..22717fa 100644
--- a/db/expense.json
+++ b/db/expense.json
@@ -1,5 +1 @@
-{
-  "date": "2024-01-25",
-  "title": "Test Expense",
-  "amount": "100"
-}
\ No newline at end of file
+{"date":"2026-05-13","title":"expense","amount":"10000"}
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index 28a4d31..4fbbc4f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,7 +11,7 @@
       "license": "GPL-3.0",
       "devDependencies": {
         "@mate-academy/eslint-config": "latest",
-        "@mate-academy/scripts": "^1.8.6",
+        "@mate-academy/scripts": "^2.1.3",
         "axios": "^1.7.2",
         "eslint": "^8.57.0",
         "eslint-plugin-jest": "^28.6.0",
@@ -1468,10 +1468,11 @@
       }
     },
     "node_modules/@mate-academy/scripts": {
-      "version": "1.8.6",
-      "resolved": "https://registry.npmjs.org/@mate-academy/scripts/-/scripts-1.8.6.tgz",
-      "integrity": "sha512-b4om/whj4G9emyi84ORE3FRZzCRwRIesr8tJHXa8EvJdOaAPDpzcJ8A0sFfMsWH9NUOVmOwkBtOXDu5eZZ00Ig==",
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/@mate-academy/scripts/-/scripts-2.1.3.tgz",
+      "integrity": "sha512-a07wHTj/1QUK2Aac5zHad+sGw4rIvcNl5lJmJpAD7OxeSbnCdyI6RXUHwXhjF5MaVo9YHrJ0xVahyERS2IIyBQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@octokit/rest": "^17.11.2",
         "@types/get-port": "^4.2.0",
diff --git a/package.json b/package.json
index 8a92721..cd53c9e 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
   "license": "GPL-3.0",
   "devDependencies": {
     "@mate-academy/eslint-config": "latest",
-    "@mate-academy/scripts": "^1.8.6",
+    "@mate-academy/scripts": "^2.1.3",
     "axios": "^1.7.2",
     "eslint": "^8.57.0",
     "eslint-plugin-jest": "^28.6.0",
diff --git a/src/createServer.js b/src/createServer.js
index 1cf1dda..5bce95e 100644
--- a/src/createServer.js
+++ b/src/createServer.js
@@ -1,8 +1,105 @@
 'use strict';
 
+const http = require('http');
+const fs = require('fs');
+const path = require('path');
+const querystring = require('querystring');
+
 function createServer() {
-  /* Write your code here */
-  // Return instance of http.Server class
+  return http.createServer((req, res) => {
+    const { method, url } = req;
+
+    if (method === 'GET' && url === '/') {
+      const filePath = path.resolve(__dirname, 'index.html');
+
+      fs.readFile(filePath, 'utf8', (err, data) => {
+        if (err) {
+          res.statusCode = 500;
+          res.setHeader('Content-Type', 'text/plain; charset=utf-8');
+          res.end('Internal Server Error');
+
+          return;
+        }
+
+        res.statusCode = 200;
+        res.setHeader('Content-Type', 'text/html; charset=utf-8');
+        res.end(data);
+      });
+
+      return;
+    }
+
+    if (method === 'POST' && url === '/add-expense') {
+      let body = '';
+
+      req.on('data', (chunk) => {
+        body += chunk.toString();
+      });
+
+      req.on('end', () => {
+        const contentType = (req.headers['content-type'] || '').toLowerCase();
+        let parsed = {};
+
+        try {
+          if (contentType.includes('application/json')) {
+            parsed = body ? JSON.parse(body) : {};
+          } else if (
+            contentType.includes('application/x-www-form-urlencoded')
+          ) {
+            parsed = querystring.parse(body);
+          } else {
+            // try to guess
+            if (body.includes('=')) {
+              parsed = querystring.parse(body);
+            } else {
+              parsed = body ? JSON.parse(body) : {};
+            }
+          }
+        } catch (err) {
+          res.statusCode = 400;
+          res.setHeader('Content-Type', 'text/plain; charset=utf-8');
+          res.end('Invalid payload');
+
+          return;
+        }
+
+        const { date, title, amount } = parsed;
+
+        if (!date || !title || !amount) {
+          res.statusCode = 400;
+          res.setHeader('Content-Type', 'text/plain; charset=utf-8');
+          res.end('Missing required fields');
+
+          return;
+        }
+
+        const dataPath = path.resolve(__dirname, '../db/expense.json');
+
+        try {
+          fs.writeFileSync(dataPath, JSON.stringify({ date, title, amount }));
+        } catch (err) {
+          res.statusCode = 500;
+          res.setHeader('Content-Type', 'text/plain; charset=utf-8');
+          res.end('Failed to save data');
+
+          return;
+        }
+
+        const formatted = JSON.stringify({ date, title, amount }, null, 2);
+        const html = `<!doctype html><html><head><meta charset="utf-8"><title>Saved</title></head><body><pre>${formatted}</pre></body></html>`;
+
+        res.statusCode = 200;
+        res.setHeader('Content-Type', 'text/html; charset=utf-8');
+        res.end(html);
+      });
+
+      return;
+    }
+
+    res.statusCode = 404;
+    res.setHeader('Content-Type', 'text/plain; charset=utf-8');
+    res.end('Not Found');
+  });
 }
 
 module.exports = {
diff --git a/src/index.html b/src/index.html
new file mode 100644
index 0000000..a6df2e0
--- /dev/null
+++ b/src/index.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <title>Expense form</title>
+</head>
+<body>
+  <h1>Add Expense</h1>
+  <form action="/add-expense" method="POST">
+    <label>
+      Date:
+      <input type="date" name="date" />
+    </label>
+    <br />
+    <label>
+      Title:
+      <input type="text" name="title" />
+    </label>
+    <br />
+    <label>
+      Amount:
+      <input type="number" name="amount" />
+    </label>
+    <br />
+    <button type="submit">Submit</button>
+  </form>
+</body>
+</html>