diff --git a/image/bobross.jpg b/image/bobross.jpg
deleted file mode 100644
index 2d4f114..0000000
Binary files a/image/bobross.jpg and /dev/null differ
diff --git a/image/image.php b/image/image.php
index c82651b..5e9cf85 100644
--- a/image/image.php
+++ b/image/image.php
@@ -1,7 +1,5 @@
 <?php
 
-header('Content-Type: image/jpeg');
-
-echo file_get_contents($_GET['file']);
+echo file_get_contents('../../' . $_GET['file']);
 
 ?>
\ No newline at end of file
diff --git a/image/image_check_prefix.php b/image/image_check_prefix.php
new file mode 100644
index 0000000..84d34e9
--- /dev/null
+++ b/image/image_check_prefix.php
@@ -0,0 +1,10 @@
+<?php
+
+// Controleer of de string begint met 'uploads'
+if(substr($_GET['file'], 0, 7) == 'uploads') {
+    echo file_get_contents('../../' . $_GET['file']);
+} else {
+    echo "Bestand moet in uploads map staan!";
+}
+
+?>
\ No newline at end of file
diff --git a/image/image_remove_traversal.php b/image/image_remove_traversal.php
new file mode 100644
index 0000000..ab48314
--- /dev/null
+++ b/image/image_remove_traversal.php
@@ -0,0 +1,8 @@
+<?php
+
+// Remove '../' from the URL
+$file = str_replace('../', '', $_GET['file']);
+
+echo file_get_contents('../../'.$file);
+
+?>
\ No newline at end of file
diff --git a/image/index_more_pages.php b/image/index_more_pages.php
new file mode 100644
index 0000000..e4bdced
--- /dev/null
+++ b/image/index_more_pages.php
@@ -0,0 +1,50 @@
+<?php
+if($_FILES) {
+    move_uploaded_file($_FILES["file"]["tmp_name"], "../../uploads/" . $_FILES["file"]["name"]);
+}
+?><!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>imgr: the simple image sharer</title>
+
+    <link rel="stylesheet" href="/themes/css/bootstrap.min.css" media="screen"/>
+    <link rel="stylesheet" href="/themes/css/imgr.css" media="screen"/>
+
+  <!-- De code in dit bestand is met opzet slecht en zeer onveilig opgezet.
+       GEBRUIK DEZE CODE NIET als referentiemateriaal voor je eigen PHP projecten! -->
+  </head>
+
+  <body class="row-fluid">
+
+    <div id="site-header">
+      <img src="/themes/images/imgr.png" class="offset1">
+      <a href="index_more_pages.php?include=login.php">Inloggen</a>
+      <a href="index_more_pages.php?include=register.php">Registreren</a>
+    </div>
+
+    <div class="panel span6 offset1 images">
+        <?php
+        if(isset($_GET['include'])) {
+
+            if(substr($_GET['include'], -4) == '.php') {
+                include($_GET['include']);
+            } else {
+                echo 'Dit is geen PHP bestand';
+            }
+
+        } else {
+            echo "<p>Wegens een security probleem in onze site kun je tijdelijk geen afbeeldingen bekijken.</p>";
+        }
+        ?>
+    </div>
+
+    <div class="panel span4">
+      <form enctype="multipart/form-data" method="POST">
+        <input type="file" name="file">
+        <button type="submit">Upload afbeelding</button>
+      </form>
+    </div>
+
+  </body>
+</html>
\ No newline at end of file
diff --git a/image/index_no_public_uploads.php b/image/index_no_public_uploads.php
new file mode 100644
index 0000000..47c06f3
--- /dev/null
+++ b/image/index_no_public_uploads.php
@@ -0,0 +1,42 @@
+<?php
+if($_FILES) {
+    move_uploaded_file($_FILES["file"]["tmp_name"], "../../uploads/" . $_FILES["file"]["name"]);
+}
+?><!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>imgr: the simple image sharer</title>
+
+    <link rel="stylesheet" href="/themes/css/bootstrap.min.css" media="screen"/>
+    <link rel="stylesheet" href="/themes/css/imgr.css" media="screen"/>
+
+  <!-- De code in dit bestand is met opzet slecht en zeer onveilig opgezet.
+       GEBRUIK DEZE CODE NIET als referentiemateriaal voor je eigen PHP projecten! -->
+  </head>
+
+  <body class="row-fluid">
+
+    <div id="site-header">
+      <img src="/themes/images/imgr.png" class="offset1">
+    </div>
+
+    <div class="panel span6 offset1 images">
+        <div class="header">The <em>meest recente</em> plaatjes van vandaag:</div>
+        <?php
+        foreach ( glob('../../uploads/*') as $image ) {
+            $image = 'image.php?file=uploads/' . basename($image);
+            echo '<a href="'.$image.'"><img src="'.$image.'"></a>';
+        }
+        ?>
+    </div>
+
+    <div class="panel span4">
+      <form enctype="multipart/form-data" method="POST">
+        <input type="file" name="file">
+        <button type="submit">Upload afbeelding</button>
+      </form>
+    </div>
+
+  </body>
+</html>
\ No newline at end of file
diff --git a/image/login.php b/image/login.php
new file mode 100644
index 0000000..2981e2e
--- /dev/null
+++ b/image/login.php
@@ -0,0 +1 @@
+Binnenkort kunt u hier inloggen
\ No newline at end of file
diff --git a/image/register.php b/image/register.php
new file mode 100644
index 0000000..32a3b2d
--- /dev/null
+++ b/image/register.php
@@ -0,0 +1 @@
+Binnenkort kunt u hier registreren
\ No newline at end of file
diff --git a/index.php b/index.php
index 21160df..dde7a38 100644
--- a/index.php
+++ b/index.php
@@ -11,5 +11,9 @@ De virtuele machine werkt! Lees de opgave om te beginnen met hacken.
 <a href="/nieuws/users.php">Nieuws (users)</a><br>
 <a href="/nieuws/login.php">Nieuws (login)</a>
 
+<h2><a href="/image/">Image</a></h2>
+<a href="/image/index_no_public_uploads.php">Image 2</a><br>
+<a href="/image/index_more_pages.php">Image 3</a>
+
 <hr>
 <footer>Laatste update: <?php echo `git log -1 --format="%cd"`; ?></footer>
\ No newline at end of file
