diff --git a/step01/index.js b/step01/index.js
deleted file mode 100644
index e69de29..0000000
diff --git a/step02/index.js b/step02/index.js
deleted file mode 100644
index e69de29..0000000
diff --git a/step03/index.js b/step03/index.js
deleted file mode 100644
index e69de29..0000000
diff --git a/step05/src/components/TodoList.tsx b/step05/src/components/TodoList.tsx
index 93dbc04..e62f0ce 100644
--- a/step05/src/components/TodoList.tsx
+++ b/step05/src/components/TodoList.tsx
@@ -4,29 +4,6 @@ import { TodoListItem } from './TodoListItem';
 export class TodoList extends React.Component<any, any> {
   render() {
     const { filter, todos } = this.props;
-    let filteredTodos: typeof todos = {};
-
-    switch (filter) {
-      case 'completed':
-        Object.keys(todos).forEach(id => {
-          if (todos[id].completed) {
-            filteredTodos[id] = todos[id];
-          }
-        });
-        break;
-
-      case 'active':
-        Object.keys(todos).forEach(id => {
-          if (!todos[id].completed) {
-            filteredTodos[id] = todos[id];
-          }
-        });
-        break;
-
-      default:
-        filteredTodos = todos;
-        break;
-    }
 
     return (
       <ul className="todos">
diff --git a/step07/index.html b/step07/index.html
new file mode 100644
index 0000000..de2c99d
--- /dev/null
+++ b/step07/index.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+  <link rel="stylesheet" href="./src/style.css" />
+  <body>
+    <div id="app"></div>
+  </body>
+</html>
+
+
diff --git a/step07/src/App.tsx b/step07/src/App.tsx
new file mode 100644
index 0000000..f5df052
--- /dev/null
+++ b/step07/src/App.tsx
@@ -0,0 +1,78 @@
+import React from "react";
+import { TodoFooter } from "./components/TodoFooter";
+import { TodoHeader } from "./components/TodoHeader";
+import { TodoList } from "./components/TodoList";
+
+export class TodoApp extends React.Component<any, any> {
+  constructor(props) {
+    super(props);
+    this.state = {
+      inputValue: "",
+      todos: [],
+      filter: "all"
+    };
+  }
+  render() {
+    const { filter, todos, inputValue } = this.state;
+    return (
+      <div>
+        <TodoHeader
+          onInputChange={this._updateInput}
+          inputValue={inputValue}
+          onTodoSubmit={this._addTodo}
+          onFilterClick={this._updateFilter}
+          filter={filter}
+        />
+        <TodoList onTodoToggle={this._toggleTodoComplete} todos={todos} filter={filter} />
+        <TodoFooter onClearClick={this._removeCompletedTodos} todos={todos} />
+      </div>
+    );
+  }
+
+  _addTodo = () => {
+    const { todos, inputValue } = this.state;
+    const id = todos[0] ? todos[0].id + 1 : 0;
+    const newTodos = [
+      {
+        id: id,
+        key: id,
+        text: inputValue
+      },
+      ...todos
+    ];
+
+    this.setState({
+      todos: newTodos,
+      inputValue: ""
+    });
+  };
+
+  _toggleTodoComplete = (id) => {
+    this.setState({
+      todos: this.state.todos.map(todo => {
+        if (todo.id == id) {todo.completed = !todo.completed}
+        return todo;
+      })
+    })
+  }
+
+  _removeCompletedTodos = () => {
+    this.setState({
+      todos: this.state.todos.filter(todo => {
+        return !todo.completed;
+      })
+    })
+  }
+
+  _updateFilter = (filter) => {
+    this.setState({
+      filter: filter
+    })
+  };
+
+  _updateInput = ev => {
+    this.setState({
+      inputValue: ev.target.value
+    });
+  };
+}
diff --git a/step07/src/components/TodoFooter.tsx b/step07/src/components/TodoFooter.tsx
new file mode 100644
index 0000000..78b3247
--- /dev/null
+++ b/step07/src/components/TodoFooter.tsx
@@ -0,0 +1,11 @@
+import React from "react";
+
+export const TodoFooter = (props: any) => {
+  const items = props.todos.filter(todo => !todo.completed)
+  return (
+    <footer>
+      <span> {items.length} items left </span>
+      <button onClick={props.onClearClick} className="button">Clear Completed</button>
+    </footer>
+  );
+};
diff --git a/step07/src/components/TodoHeader.tsx b/step07/src/components/TodoHeader.tsx
new file mode 100644
index 0000000..e9fc0d1
--- /dev/null
+++ b/step07/src/components/TodoHeader.tsx
@@ -0,0 +1,21 @@
+import React from "react";
+
+export class TodoHeader extends React.Component<any, any> {
+  render() {
+    const { filter, inputValue, onInputChange, onTodoSubmit, onFilterClick } = this.props;
+    return (
+      <div>
+        <h1>todos</h1>
+        <input value={inputValue} onChange={onInputChange} className="textfield" />
+        <button onClick={onTodoSubmit} className="button add">Add</button>
+        <div className="filter">
+          <button onClick={() => onFilterClick('all')} className={filter == "all" ? "active" : ""}>all</button>
+          <button onClick={() => onFilterClick('active')} className={filter == "active" ? "active" : ""}>active</button>
+          <button onClick={() => onFilterClick('completed')} className={filter == "completed" ? "active" : ""}>
+            completed
+          </button>
+        </div>
+      </div>
+    );
+  }
+}
diff --git a/step07/src/components/TodoList.tsx b/step07/src/components/TodoList.tsx
new file mode 100644
index 0000000..2913842
--- /dev/null
+++ b/step07/src/components/TodoList.tsx
@@ -0,0 +1,28 @@
+import React from 'react';
+import { TodoListItem } from './TodoListItem';
+
+export class TodoList extends React.Component<any, any> {
+  render() {
+    const { filter, todos, onTodoToggle } = this.props;
+    let filteredTodos: typeof todos = {};
+
+    filteredTodos = todos.filter(todo => {
+      const matchesActive = filter == 'active' && !todo.completed;
+      const matchesCompleted = filter == 'completed' && todo.completed;
+      
+      return filter == 'all' || matchesActive || matchesCompleted; 
+    })
+
+    const TodoListItems = filteredTodos.map((todo, i) => {
+      return (
+        <TodoListItem onTodoToggle={onTodoToggle} {...todo} />
+      );
+    })
+
+    return (
+      <ul className="todos">
+        {TodoListItems}         
+      </ul>
+    );
+  }
+}
diff --git a/step07/src/components/TodoListItem.tsx b/step07/src/components/TodoListItem.tsx
new file mode 100644
index 0000000..98424f9
--- /dev/null
+++ b/step07/src/components/TodoListItem.tsx
@@ -0,0 +1,15 @@
+import React from "react";
+
+export class TodoListItem extends React.Component<any, any> {
+  
+  render() {
+    const {text, completed, onTodoToggle, id} = this.props;
+    return (
+      <li className="todo">
+        <label>
+          <input onClick={() => onTodoToggle(id)}  type="checkbox" checked={completed} /> {text}
+        </label>
+      </li>
+    );
+  }
+}
diff --git a/step07/src/index.tsx b/step07/src/index.tsx
new file mode 100644
index 0000000..3289ec8
--- /dev/null
+++ b/step07/src/index.tsx
@@ -0,0 +1,4 @@
+import React from "react";
+import ReactDOM from "react-dom";
+import { TodoApp } from "./App";
+ReactDOM.render(<TodoApp />, document.getElementById("app"));
diff --git a/step07/src/style.css b/step07/src/style.css
new file mode 100644
index 0000000..c897b4c
--- /dev/null
+++ b/step07/src/style.css
@@ -0,0 +1,50 @@
+body {
+  font-family: "Segoe UI", Tahoma, Geneva, Verdana, sans-serif;
+  width: 400px;
+  margin: 20px auto;
+}
+h1 {
+  text-align: center;
+}
+
+.textfield {
+  width: 80%;
+}
+
+.add {
+  margin-left: 5%;
+}
+
+.button {
+  border: none;
+  padding: 5px 10px;
+}
+
+.filter {
+  margin: 10px 0 0;
+}
+
+.filter button {
+  background: transparent;
+  border: none;
+}
+.filter .active {
+  border-bottom: 2px solid blue;
+}
+
+.todos {
+  list-style: none;
+  padding: 0;
+}
+
+footer {
+  display: flex;
+}
+
+footer span {
+  flex-grow: 1;
+}
+
+.hidden {
+  display: none;
+}
\ No newline at end of file
diff --git a/webpack.config.js b/webpack.config.js
index 6918418..74b20ab 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -6,6 +6,7 @@ const entries = {
   step04: './step04/src/index',
   step05: './step05/src/index',
   step06: './step06/src/index',
+  step07: './step07/src/index',
   'step2-01': './step2-01/src/index',
   playground: './playground/src/index'
 };
