diff --git a/src/App.tsx b/src/App.tsx
index d46111e825..f1263611cb 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -1,5 +1,6 @@
 /* eslint-disable max-len */
-import React from 'react';
+
+import React, { useEffect, useState } from 'react';
 import 'bulma/css/bulma.css';
 import '@fortawesome/fontawesome-free/css/all.css';
 
@@ -7,8 +8,70 @@ import { TodoList } from './components/TodoList';
 import { TodoFilter } from './components/TodoFilter';
 import { TodoModal } from './components/TodoModal';
 import { Loader } from './components/Loader';
+import { Todo } from './types/Todo';
+import { getTodos, getUser } from './api';
+import { User } from './types/User';
+import { Field } from './types/FilterField';
 
 export const App: React.FC = () => {
+  const [todos, setTodos] = useState<Todo[]>([]);
+  const [isLoading, setIsLoading] = useState(false);
+  const [selectedTodo, setSelectedTodo] = useState<Todo | null>(null);
+  const [user, setUser] = useState<User | null>(null);
+  const [filteredField, setFilteredField] = useState<Field | string>(Field.All);
+  const [query, setQuery] = useState<string>('');
+
+  const preparedTodos = todos.filter(todo => {
+    const filteredByField = (() => {
+      switch (filteredField) {
+        case Field.Completed:
+          return todo.completed;
+        case Field.Active:
+          return !todo.completed;
+        default:
+          return true;
+      }
+    })();
+
+    const filteredByQuery = query
+      ? todo.title.toLowerCase().includes(query.toLowerCase())
+      : true;
+
+    return filteredByField && filteredByQuery;
+  });
+
+  useEffect(() => {
+    setIsLoading(true);
+
+    getTodos()
+      .then(setTodos)
+      .finally(() => setIsLoading(false));
+  }, []);
+
+  const handleTodo = (todo: Todo) => {
+    setIsLoading(true);
+    setSelectedTodo(todo);
+
+    getUser(todo.userId)
+      .then(setUser)
+      .finally(() => setIsLoading(false));
+  };
+
+  const handleChangeStatus = (newStatus: string) => {
+    setFilteredField(newStatus);
+  };
+
+  const handleChangeQuery = (event: React.ChangeEvent<HTMLInputElement>) => {
+    setQuery(event.target.value);
+  };
+
+  const onReset = () => {
+    setQuery('');
+    setFilteredField(Field.All);
+    setSelectedTodo(null);
+    setUser(null);
+  };
+
   return (
     <>
       <div className="section">
@@ -17,18 +80,33 @@ export const App: React.FC = () => {
             <h1 className="title">Todos:</h1>
 
             <div className="block">
-              <TodoFilter />
+              <TodoFilter
+                onChangeStatus={handleChangeStatus}
+                query={query}
+                onChangeQuery={handleChangeQuery}
+                onReset={onReset}
+              />
             </div>
 
             <div className="block">
-              <Loader />
-              <TodoList />
+              {isLoading && <Loader />}
+              <TodoList
+                todos={preparedTodos}
+                showSelectedTodo={handleTodo}
+                selectedTodo={selectedTodo}
+              />
             </div>
           </div>
         </div>
       </div>
-
-      <TodoModal />
+      {selectedTodo && (
+        <TodoModal
+          user={user}
+          todo={selectedTodo}
+          onReset={onReset}
+          setUser={setUser}
+        />
+      )}
     </>
   );
 };
diff --git a/src/components/Todo/Todo.tsx b/src/components/Todo/Todo.tsx
new file mode 100644
index 0000000000..a8b54d3e92
--- /dev/null
+++ b/src/components/Todo/Todo.tsx
@@ -0,0 +1,55 @@
+import classNames from 'classnames';
+import { Todo } from '../../types/Todo';
+import React from 'react';
+
+type Props = {
+  todo: Todo;
+  selectedTodo: Todo | null;
+  showSelectedTodo: (todo: Todo) => void;
+};
+
+export const TodoItem: React.FC<Props> = props => {
+  const { todo, showSelectedTodo, selectedTodo } = props;
+
+  const isSelectedTodo = todo.id === selectedTodo?.id;
+
+  return (
+    <tr data-cy="todo" className="">
+      <td className="is-vcentered">{todo.id}</td>
+      <td className="is-vcentered">
+        {todo.completed && (
+          <span className="icon" data-cy="iconCompleted">
+            <i className="fas fa-check" />
+          </span>
+        )}
+      </td>
+      <td className="is-vcentered is-expanded">
+        <p
+          className={classNames({
+            'has-text-success': todo.completed,
+            'has-text-danger': !todo.completed,
+          })}
+        >
+          {todo.title}
+        </p>
+      </td>
+      <td className="has-text-right is-vcentered">
+        <button
+          data-cy="selectButton"
+          className="button"
+          type="button"
+          onClick={() => showSelectedTodo(todo)}
+        >
+          <span className="icon">
+            <i
+              className={classNames({
+                'far fa-eye-slash': isSelectedTodo,
+                'far fa-eye': !isSelectedTodo,
+              })}
+            />
+          </span>
+        </button>
+      </td>
+    </tr>
+  );
+};
diff --git a/src/components/TodoFilter/TodoFilter.tsx b/src/components/TodoFilter/TodoFilter.tsx
index 193f1cd2b2..8dd81ea446 100644
--- a/src/components/TodoFilter/TodoFilter.tsx
+++ b/src/components/TodoFilter/TodoFilter.tsx
@@ -1,8 +1,27 @@
-export const TodoFilter = () => (
+import classNames from 'classnames';
+import React from 'react';
+import { Field } from '../../types/FilterField';
+
+type Props = {
+  query: string;
+  onChangeStatus: (newStatus: string) => void;
+  onChangeQuery: (event: React.ChangeEvent<HTMLInputElement>) => void;
+  onReset: () => void;
+};
+
+export const TodoFilter: React.FC<Props> = ({
+  query,
+  onChangeStatus,
+  onChangeQuery,
+  onReset,
+}) => (
   <form className="field has-addons">
     <p className="control">
       <span className="select">
-        <select data-cy="statusSelect">
+        <select
+          data-cy="statusSelect"
+          onChange={event => onChangeStatus(event.target.value)}
+        >
           <option value="all">All</option>
           <option value="active">Active</option>
           <option value="completed">Completed</option>
@@ -16,15 +35,25 @@ export const TodoFilter = () => (
         type="text"
         className="input"
         placeholder="Search..."
+        value={query}
+        onChange={onChangeQuery}
       />
       <span className="icon is-left">
         <i className="fas fa-magnifying-glass" />
       </span>
 
-      <span className="icon is-right" style={{ pointerEvents: 'all' }}>
-        {/* eslint-disable-next-line jsx-a11y/control-has-associated-label */}
-        <button data-cy="clearSearchButton" type="button" className="delete" />
-      </span>
+      {query && (
+        <span
+          className={classNames('icon is-right', { pointerEvents: Field.All })}
+        >
+          <button
+            data-cy="clearSearchButton"
+            type="button"
+            className="delete"
+            onClick={onReset}
+          />
+        </span>
+      )}
     </p>
   </form>
 );
diff --git a/src/components/TodoList/TodoList.tsx b/src/components/TodoList/TodoList.tsx
index 84dbcf3c0e..92c4454a1b 100644
--- a/src/components/TodoList/TodoList.tsx
+++ b/src/components/TodoList/TodoList.tsx
@@ -1,100 +1,41 @@
 import React from 'react';
+import { Todo } from '../../types/Todo';
+import { TodoItem } from '../Todo/Todo';
 
-export const TodoList: React.FC = () => (
-  <table className="table is-narrow is-fullwidth">
-    <thead>
-      <tr>
-        <th>#</th>
-        <th>
-          <span className="icon">
-            <i className="fas fa-check" />
-          </span>
-        </th>
-        <th>Title</th>
-        <th> </th>
-      </tr>
-    </thead>
+type Props = {
+  todos: Todo[];
+  selectedTodo: Todo | null;
+  showSelectedTodo: (todo: Todo) => void;
+};
 
-    <tbody>
-      <tr data-cy="todo" className="">
-        <td className="is-vcentered">1</td>
-        <td className="is-vcentered" />
-        <td className="is-vcentered is-expanded">
-          <p className="has-text-danger">delectus aut autem</p>
-        </td>
-        <td className="has-text-right is-vcentered">
-          <button data-cy="selectButton" className="button" type="button">
-            <span className="icon">
-              <i className="far fa-eye" />
-            </span>
-          </button>
-        </td>
-      </tr>
-      <tr data-cy="todo" className="has-background-info-light">
-        <td className="is-vcentered">2</td>
-        <td className="is-vcentered" />
-        <td className="is-vcentered is-expanded">
-          <p className="has-text-danger">quis ut nam facilis et officia qui</p>
-        </td>
-        <td className="has-text-right is-vcentered">
-          <button data-cy="selectButton" className="button" type="button">
-            <span className="icon">
-              <i className="far fa-eye-slash" />
-            </span>
-          </button>
-        </td>
-      </tr>
+export const TodoList: React.FC<Props> = props => {
+  const { todos, showSelectedTodo, selectedTodo } = props;
 
-      <tr data-cy="todo" className="">
-        <td className="is-vcentered">1</td>
-        <td className="is-vcentered" />
-        <td className="is-vcentered is-expanded">
-          <p className="has-text-danger">delectus aut autem</p>
-        </td>
-        <td className="has-text-right is-vcentered">
-          <button data-cy="selectButton" className="button" type="button">
+  return (
+    <table className="table is-narrow is-fullwidth">
+      <thead>
+        <tr>
+          <th>#</th>
+          <th>
             <span className="icon">
-              <i className="far fa-eye" />
+              <i className="fas fa-check" />
             </span>
-          </button>
-        </td>
-      </tr>
+          </th>
+          <th>Title</th>
+          <th> </th>
+        </tr>
+      </thead>
 
-      <tr data-cy="todo" className="">
-        <td className="is-vcentered">6</td>
-        <td className="is-vcentered" />
-        <td className="is-vcentered is-expanded">
-          <p className="has-text-danger">
-            qui ullam ratione quibusdam voluptatem quia omnis
-          </p>
-        </td>
-        <td className="has-text-right is-vcentered">
-          <button data-cy="selectButton" className="button" type="button">
-            <span className="icon">
-              <i className="far fa-eye" />
-            </span>
-          </button>
-        </td>
-      </tr>
-
-      <tr data-cy="todo" className="">
-        <td className="is-vcentered">8</td>
-        <td className="is-vcentered">
-          <span className="icon" data-cy="iconCompleted">
-            <i className="fas fa-check" />
-          </span>
-        </td>
-        <td className="is-vcentered is-expanded">
-          <p className="has-text-success">quo adipisci enim quam ut ab</p>
-        </td>
-        <td className="has-text-right is-vcentered">
-          <button data-cy="selectButton" className="button" type="button">
-            <span className="icon">
-              <i className="far fa-eye" />
-            </span>
-          </button>
-        </td>
-      </tr>
-    </tbody>
-  </table>
-);
+      <tbody>
+        {todos.map(todo => (
+          <TodoItem
+            key={todo.id}
+            todo={todo}
+            showSelectedTodo={showSelectedTodo}
+            selectedTodo={selectedTodo}
+          />
+        ))}
+      </tbody>
+    </table>
+  );
+};
diff --git a/src/components/TodoModal/TodoModal.tsx b/src/components/TodoModal/TodoModal.tsx
index 0fbe6dae99..48b9e87be6 100644
--- a/src/components/TodoModal/TodoModal.tsx
+++ b/src/components/TodoModal/TodoModal.tsx
@@ -1,12 +1,35 @@
-import React from 'react';
+import React, { Dispatch, SetStateAction, useEffect, useState } from 'react';
 import { Loader } from '../Loader';
+import { Todo } from '../../types/Todo';
+import { User } from '../../types/User';
+import classNames from 'classnames';
+import { getUser } from '../../api';
+
+type Props = {
+  todo: Todo | null;
+  user: User | null;
+  onReset: () => void;
+  setUser: Dispatch<SetStateAction<User | null>>;
+};
+
+export const TodoModal: React.FC<Props> = props => {
+  const { todo, user, onReset, setUser } = props;
+  const [isTodoLoading, setIsTodoLoading] = useState(false);
+
+  useEffect(() => {
+    setIsTodoLoading(true);
+    if (todo) {
+      getUser(todo.userId)
+        .then(setUser)
+        .finally(() => setIsTodoLoading(false));
+    }
+  }, [todo, setUser, todo?.userId]);
 
-export const TodoModal: React.FC = () => {
   return (
     <div className="modal is-active" data-cy="modal">
       <div className="modal-background" />
 
-      {true ? (
+      {isTodoLoading ? (
         <Loader />
       ) : (
         <div className="modal-card">
@@ -15,25 +38,37 @@ export const TodoModal: React.FC = () => {
               className="modal-card-title has-text-weight-medium"
               data-cy="modal-header"
             >
-              Todo #2
+              Todo #{todo?.id}
             </div>
 
             {/* eslint-disable-next-line jsx-a11y/control-has-associated-label */}
-            <button type="button" className="delete" data-cy="modal-close" />
+            <button
+              type="button"
+              className="delete"
+              data-cy="modal-close"
+              onClick={onReset}
+            />
           </header>
 
           <div className="modal-card-body">
             <p className="block" data-cy="modal-title">
-              quis ut nam facilis et officia qui
+              {todo?.title}
             </p>
 
             <p className="block" data-cy="modal-user">
               {/* <strong className="has-text-success">Done</strong> */}
-              <strong className="has-text-danger">Planned</strong>
+              <strong
+                className={classNames({
+                  'has-text-success': todo?.completed,
+                  'has-text-danger': !todo?.completed,
+                })}
+              >
+                {todo?.completed ? 'Done' : 'Planned'}
+              </strong>
 
               {' by '}
 
-              <a href="mailto:Sincere@april.biz">Leanne Graham</a>
+              <a href={`mailto:${user?.email}`}>{user?.name}</a>
             </p>
           </div>
         </div>
diff --git a/src/types/FilterField.ts b/src/types/FilterField.ts
new file mode 100644
index 0000000000..dbf23c56e4
--- /dev/null
+++ b/src/types/FilterField.ts
@@ -0,0 +1,5 @@
+export enum Field {
+  All = 'all',
+  Active = 'active',
+  Completed = 'completed',
+}