diff --git a/src/App.js b/src/App.js
index de63f6b..64e5d61 100644
--- a/src/App.js
+++ b/src/App.js
@@ -1,7 +1,6 @@
 import React, { Component } from 'react';
 import {
   BrowserRouter as Router,
-  Link,
   Route,
   Switch
 } from 'react-router-dom';
@@ -15,6 +14,7 @@ import { Articles, FullArticle } from './Article';
 import { Footer } from './Footer';
 import { Header } from './Header';
 import { NavList, TagNav, HistoryNav } from './Nav';
+import { NotFound } from './NotFound';
 
 
 class App extends Component {
@@ -82,21 +82,4 @@ class About extends Component {
   }
 }
 
-class NotFound extends Component {
-  render () {
-    return (
-      <article>
-        <header>
-          <h1>404 Oh No!</h1>
-        </header>
-        <section>
-          <p>
-            You're lost, bud. Why not try going back <Link to="/">Home</Link>?
-          </p>
-        </section>
-      </article>
-    )
-  }
-}
-
 export default App;
diff --git a/src/NotFound.js b/src/NotFound.js
new file mode 100644
index 0000000..1fc0a7f
--- /dev/null
+++ b/src/NotFound.js
@@ -0,0 +1,17 @@
+import React from 'react';
+import { Link } from 'react-router-dom';
+
+const NotFound = () => (
+  <article>
+    <header>
+      <h1>404 Oh No!</h1>
+    </header>
+    <section>
+      <p>
+        You're lost, bud. Why not try going back <Link to="/">Home</Link>?
+      </p>
+    </section>
+  </article>
+)
+
+export { NotFound }