diff --git a/src/App.jsx b/src/App.jsx
index 22ae1b9c..bdb4edf5 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -1,104 +1,32 @@
 import './App.scss';
+import postsFromServer from './api/posts.json';
+import commentsFromServer from './api/comments.json';
+import usersFromServer from './api/users.json';
+import { PostList } from './components/PostList'
 
-// import postsFromServer from './api/posts.json';
-// import commentsFromServer from './api/comments.json';
-// import usersFromServer from './api/users.json';
+const getUserById = userId => {
+  return usersFromServer.find(user => userId === user.id) || null
+}
 
-export const App = () => (
-  <section className="App">
-    <h1 className="App__title">Static list of posts</h1>
-
-    <div className="PostList">
-      <div className="PostInfo">
-        <div className="PostInfo__header">
-          <h3 className="PostInfo__title">qui est esse</h3>
-
-          <p>
-            {' Posted by  '}
-
-            <a className="UserInfo" href="mailto:Sincere@april.biz">
-              Leanne Graham
-            </a>
-          </p>
-        </div>
-
-        <p className="PostInfo__body">
-          est rerum tempore vitae sequi sint nihil reprehenderit dolor beatae ea
-          dolores neque fugiat blanditiis voluptate porro vel nihil molestiae ut
-          reiciendis qui aperiam non debitis possimus qui neque nisi nulla
-        </p>
-
-        <hr />
-
-        <b data-cy="NoCommentsMessage">No comments yet</b>
-      </div>
-
-      <div className="PostInfo">
-        <div className="PostInfo__header">
-          <h3 className="PostInfo__title">doloremque illum aliquid sunt</h3>
+export const posts = postsFromServer.map(post => {
+  return {
+    ...post,
+    user: getUserById(post.userId),
+    comments: commentsFromServer.filter(comment => comment.postId === post.id)
+  }
+})
 
-          <p>
-            {' Posted by  '}
+console.log(posts)
 
-            <a className="UserInfo" href="mailto:Julianne.OConner@kory.org">
-              Patricia Lebsack
-            </a>
-          </p>
-        </div>
 
-        <p className="PostInfo__body">
-          deserunt eos nobis asperiores et hic est debitis repellat molestiae
-          optio nihil ratione ut eos beatae quibusdam distinctio maiores earum
-          voluptates et aut adipisci ea maiores voluptas maxime
-        </p>
 
-        <div className="CommentList">
-          <div className="CommentInfo">
-            <div className="CommentInfo__title">
-              <strong className="CommentInfo__name">pariatur omnis in</strong>
-
-              {' by '}
-
-              <a
-                className="CommentInfo__email"
-                href="mailto:Telly_Lynch@karl.co.uk"
-              >
-                Telly_Lynch@karl.co.uk
-              </a>
-            </div>
-
-            <div className="CommentInfo__body">
-              dolorum voluptas laboriosam quisquam ab totam beatae et aut
-              aliquid optio assumenda voluptas velit itaque quidem voluptatem
-              tempore cupiditate in itaque sit molestiae minus dolores magni
-            </div>
-          </div>
-
-          <div className="CommentInfo">
-            <div className="CommentInfo__title">
-              <strong className="CommentInfo__name">
-                odio adipisci rerum aut animi
-              </strong>
-
-              {' by '}
-
-              <a
-                className="CommentInfo__email"
-                href="mailto:Nikita@garfield.biz"
-              >
-                Nikita@garfield.biz
-              </a>
-            </div>
-
-            <div className="CommentInfo__body">
-              quia molestiae reprehenderit quasi aspernatur aut expedita
-              occaecati aliquam eveniet laudantium omnis quibusdam delectus
-              saepe quia accusamus maiores nam est cum et ducimus et vero
-              voluptates excepturi deleniti ratione
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
+export const App = () => (
+  <section className="App">
+    <h1 className="App__title">Static list of posts</h1>
+    {posts.map(post => {
+      return (
+        <PostList post={post} key={post.id}/>
+      )
+    })}
   </section>
 );
diff --git a/src/App.scss b/src/App.scss
index 98bb3956..64365095 100644
--- a/src/App.scss
+++ b/src/App.scss
@@ -5,32 +5,3 @@ iframe {
 .App__title {
   text-align: center;
 }
-
-.PostInfo {
-  margin: 10px auto;
-  width: 90%;
-  border: 1px solid #000;
-  border-radius: 8px;
-  background-color: lightgray;
-  padding: 1em;
-
-  &__title {
-    margin: 0;
-  }
-
-  &__header {
-    margin-bottom: 1em;
-  }
-}
-
-.UserInfo {
-  font-weight: bold;
-}
-
-.CommentList {
-  display: flex;
-  flex-direction: column;
-  gap: 0.7em;
-  background-color: #eee;
-  padding: 1em;
-}
diff --git a/src/components/CommentInfo/CommentInfo.jsx b/src/components/CommentInfo/CommentInfo.jsx
index f99e2778..f119856e 100644
--- a/src/components/CommentInfo/CommentInfo.jsx
+++ b/src/components/CommentInfo/CommentInfo.jsx
@@ -1 +1,22 @@
-export const CommentInfo = () => <>Put the comment here</>;
+export const CommentInfo = ({ comment }) => {
+  return (
+    <div className="CommentInfo">
+    <div className="CommentInfo__title">
+      <strong className="CommentInfo__name">{comment.name}</strong>
+
+      {' by '}
+
+      <a
+        className="CommentInfo__email"
+        href={`mailto:${comment.email}`}
+      >
+        {comment.email}
+      </a>
+    </div>
+
+    <div className="CommentInfo__body">
+      {comment.body}
+    </div>
+  </div>
+  )
+}
diff --git a/src/components/CommentInfo/CommentInfo.scss b/src/components/CommentInfo/CommentInfo.scss
index f1b40ee0..e69de29b 100644
--- a/src/components/CommentInfo/CommentInfo.scss
+++ b/src/components/CommentInfo/CommentInfo.scss
@@ -1 +0,0 @@
-// add styles here
diff --git a/src/components/CommentList/CommentList.jsx b/src/components/CommentList/CommentList.jsx
index 263dfbc7..27cd50de 100644
--- a/src/components/CommentList/CommentList.jsx
+++ b/src/components/CommentList/CommentList.jsx
@@ -1 +1,23 @@
-export const CommentList = () => <>Put the list here</>;
+import './CommentList.scss'
+import { CommentInfo } from '../CommentInfo'
+
+export const CommentList = ({ comments }) => {
+  if (comments.length === 0) {
+    return (
+      <>
+        <hr />
+
+        <b data-cy="NoCommentsMessage">No comments yet</b>
+      </>
+    );
+  }
+
+  return (
+    <div className="CommentList">
+      {comments.map(comment => (
+        <CommentInfo key={comment.id} comment={comment} />
+      ))}
+    </div>
+  );
+}
+
diff --git a/src/components/CommentList/CommentList.scss b/src/components/CommentList/CommentList.scss
index f1b40ee0..91c2ed5f 100644
--- a/src/components/CommentList/CommentList.scss
+++ b/src/components/CommentList/CommentList.scss
@@ -1 +1,7 @@
-// add styles here
+.CommentList {
+  display: flex;
+  flex-direction: column;
+  gap: 0.7em;
+  background-color: #eee;
+  padding: 1em;
+}
diff --git a/src/components/PostInfo/PostInfo.jsx b/src/components/PostInfo/PostInfo.jsx
index eb3efb78..c424a6dd 100644
--- a/src/components/PostInfo/PostInfo.jsx
+++ b/src/components/PostInfo/PostInfo.jsx
@@ -1 +1,27 @@
-export const PostInfo = () => <>Put the post here</>;
+import './PostInfo.scss'
+import { CommentList } from '../CommentList'
+import { UserInfo } from '../UserInfo'
+
+export const PostInfo = ({ post }) => {
+  const {title, user, comments} = post
+
+  return (
+      <div className="PostInfo">
+        <div className="PostInfo__header">
+          <h3 className="PostInfo__title">{title}</h3>
+
+          <p>
+            {' Posted by  '}
+
+            <UserInfo user={user}/>
+          </p>
+        </div>
+
+        <p className="PostInfo__body">
+          {post.body}
+        </p>
+
+        <CommentList comments={comments}/>
+      </div>
+  )
+}
diff --git a/src/components/PostInfo/PostInfo.scss b/src/components/PostInfo/PostInfo.scss
index f1b40ee0..1ad49fd3 100644
--- a/src/components/PostInfo/PostInfo.scss
+++ b/src/components/PostInfo/PostInfo.scss
@@ -1 +1,16 @@
-// add styles here
+.PostInfo {
+  margin: 10px auto;
+  width: 90%;
+  border: 1px solid #000;
+  border-radius: 8px;
+  background-color: lightgray;
+  padding: 1em;
+
+  &__title {
+    margin: 0;
+  }
+
+  &__header {
+    margin-bottom: 1em;
+  }
+}
diff --git a/src/components/PostList/PostList.jsx b/src/components/PostList/PostList.jsx
index 4487a96c..fa7eb664 100644
--- a/src/components/PostList/PostList.jsx
+++ b/src/components/PostList/PostList.jsx
@@ -1 +1,11 @@
-export const PostList = () => <>Put the list here</>;
+import { PostInfo } from '../PostInfo'
+
+export const PostList = ({ post }) => {
+  return (
+    <div className="PostList">
+      {post && (
+        <PostInfo post={post}/>
+      )}
+    </div>
+  )
+}
diff --git a/src/components/UserInfo/UserInfo.jsx b/src/components/UserInfo/UserInfo.jsx
index 6264e2f7..0937e0ab 100644
--- a/src/components/UserInfo/UserInfo.jsx
+++ b/src/components/UserInfo/UserInfo.jsx
@@ -1 +1,13 @@
-export const UserInfo = () => <>Put the user here</>;
+import './UserInfo.scss'
+
+export const UserInfo = ({ user }) => {
+  if (user === null) {
+    return null;
+  }
+
+  return (
+    <a className="UserInfo" href={`mailto:${user.email}`}>
+      {user.name}
+    </a>
+  )
+}
diff --git a/src/components/UserInfo/UserInfo.scss b/src/components/UserInfo/UserInfo.scss
index f1b40ee0..5080de7c 100644
--- a/src/components/UserInfo/UserInfo.scss
+++ b/src/components/UserInfo/UserInfo.scss
@@ -1 +1,3 @@
-// add styles here
+.UserInfo {
+  font-weight: bold;
+}