diff --git a/IMG_1576.JPG b/IMG_1576.JPG
new file mode 100644
index 0000000..050a4cf
Binary files /dev/null and b/IMG_1576.JPG differ
diff --git a/src/index.js b/src/index.js
index 8c18618..dbe3793 100644
--- a/src/index.js
+++ b/src/index.js
@@ -4,3 +4,5 @@ const port = 3030
 app.listen(port, () => {
  console.log(`Server is running on http://localhost:${port}/`)
 })
+
+module.exports = {app}
\ No newline at end of file
diff --git a/src/server.js b/src/server.js
index 30f0ce3..6e84173 100644
--- a/src/server.js
+++ b/src/server.js
@@ -1,13 +1,127 @@
-const express = require("express")
-const morgan = require("morgan")
-const cors = require("cors")
-const app = express()
+const express = require("express");
+const morgan = require("morgan");
+const cors = require("cors");
+const contacts = require("../data/contacts.js");
+const meetings = require("../data/meetings.js");
+const app = express();
 
-app.use(morgan("dev"))
-app.use(cors())
-app.use(express.json())
+app.use(morgan("dev"));
+app.use(cors());
+app.use(express.json());
 
-// write your app code here
+//CONTACTS RES/REQ
 
+app.get("/contacts", (req, res) => {
+  res.status(200).json({ contacts });
+});
 
-module.exports = app
+app.post("/contacts", (req, res) => {
+  const contact = req.body;
+  contact.id = contacts.length + 1;
+  contacts.push(contact);
+  res.status(201).json({ contact });
+});
+
+app.get("/contacts/:id", (req, res) => {
+  const contactId = req.params.id;
+  const contact = contacts.find((contact) => contact.id === Number(contactId));
+  if (!contact) {
+    return res.status(404).json({ error: "No contact with that ID" });
+  }
+  res.status(200).json({ contact });
+});
+
+app.delete("/contacts/:id", (req, res) => {
+  const contactId = req.params.id;
+  const contact = contacts.find((contact) => contact.id === Number(contactId));
+  if (!contact) {
+    return res.status(404).json({ error: "No contact with that ID" });
+  }
+  const index = contacts.indexOf(contact);
+  contacts.splice(index, 1);
+
+  meetings.forEach((meeting) => {
+    if (meeting.contactId === Number(contactId)) {
+        const index = meetings.indexOf(meeting)
+        meetings.splice(index, 1)
+    }
+  })
+  
+  res.status(200).json({ contact });
+});
+
+app.put("/contacts/:id", (req, res) => {
+  const contactId = req.params.id;
+  const updatedProperties = req.body;
+  let contact = contacts.find((contact) => contact.id === Number(contactId));
+
+  if (!contact) {
+    return res.status(404).json({ error: "No contact with that ID" });
+  }
+
+  Object.assign(contact, updatedProperties);
+  res.status(200).json({ contact });
+});
+
+//MEETINGS RES/REQ
+
+app.get("/meetings", (req, res) => {
+  res.status(200).json({ meetings });
+});
+
+app.get("/meetings/:id", (req, res) => {
+  const meetingId = req.params.id;
+  const meeting = meetings.find((meeting) => meeting.id === Number(meetingId));
+  if (!meeting) {
+    return res.status(404).json({ error: "No meeting with that ID" });
+  }
+  res.status(200).json({ meeting });
+});
+
+app.delete("/meetings/:id", (req, res) => {
+    const meetingId = req.params.id;
+    const meeting = meetings.find((meeting) => meeting.id === Number(meetingId));
+    if (!meeting) {
+      return res.status(404).json({ error: "No meeting with that ID" });
+    }
+    const index = meetings.indexOf(meeting);
+    meetings.splice(index, 1);
+    res.status(200).json({ meeting });
+  });
+
+  app.put("/meetings/:id", (req, res) => {
+    const meetingId = req.params.id;
+    const updatedProperties = req.body;
+    let meeting = meetings.find((meeting) => meeting.id === Number(meetingId));
+  
+    if (!meeting) {
+      return res.status(404).json({ error: "No contact with that ID" });
+    }
+  
+    Object.assign(meeting, updatedProperties);
+    res.status(200).json({ meeting });
+  });
+
+  app.get("/contacts/:id/meetings", (req, res) => {
+    const contactId = req.params.id
+    const filteredMeetings = meetings.filter((meeting) => meeting.contactId === Number(contactId))
+
+    res.status(200).json({ meetings: filteredMeetings })
+  })
+
+  app.post("/contacts/:id/meetings", (req, res) => {
+    const contactId = req.params.id
+    const meetingName = req.body.name
+
+    const meeting = {
+        id: meetings.length + 1,
+        name: meetingName,
+        contactId: Number(contactId)
+    }
+
+    meetings.push(meeting)
+    res.status(201).json({ meeting })
+  })
+  
+
+module.exports = app;