diff --git a/src/main/java/model/Customer.java b/src/main/java/model/Customer.java
diff --git a/src/main/java/model/Image.java b/src/main/java/model/Image.java
diff --git a/src/main/java/model/Invoice.java b/src/main/java/model/Invoice.java
diff --git a/src/main/java/model/Order.java b/src/main/java/model/Order.java
diff --git a/src/main/java/model/ShoppingCart.java b/src/main/java/model/ShoppingCart.java
diff --git a/src/main/java/servlet/DiesDas.java b/src/main/java/servlet/DiesDas.java
@@ -0,0 +1,16 @@
+package servlet;
+
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+public class DiesDas extends HttpServlet {
+    @Override
+    protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+        RequestDispatcher rd = req.getRequestDispatcher("/WEB-INF/diesdas.jsp");
+        rd.forward(req, resp);
+    }
+}
diff --git a/src/main/java/servlet/Welcome.java b/src/main/java/servlet/Welcome.java
@@ -0,0 +1,17 @@
+package servlet;
+
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+public class Welcome extends HttpServlet {
+    @Override
+    protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+        System.out.println("asdasd");
+        RequestDispatcher rd = req.getRequestDispatcher("index.jsp");
+        rd.forward(req, resp);
+    }
+}
diff --git a/src/main/webapp/WEB-INF/diesdas.jsp b/src/main/webapp/WEB-INF/diesdas.jsp
@@ -0,0 +1,16 @@
+<%--
+  Created by IntelliJ IDEA.
+  User: chris
+  Date: 03.03.18
+  Time: 15:09
+  To change this template use File | Settings | File Templates.
+--%>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <title>Title</title>
+</head>
+<body>
+diesdas
+</body>
+</html>
diff --git a/src/main/webapp/WEB-INF/moep.jsp b/src/main/webapp/WEB-INF/moep.jsp
@@ -0,0 +1,17 @@
+<%--
+  Created by IntelliJ IDEA.
+  User: chris
+  Date: 03.03.18
+  Time: 14:45
+  To change this template use File | Settings | File Templates.
+--%>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <title>Title</title>
+</head>
+<body>
+/WEB-inf/moep.jsp
+
+</body>
+</html>
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
@@ -1,7 +1,25 @@
-<!DOCTYPE web-app PUBLIC
- "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
- "http://java.sun.com/dtd/web-app_2_3.dtd" >
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<web-app xmlns="http://java.sun.com/xml/ns/javaee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+         version="3.0">
+    <servlet>
+        <servlet-name>welcome</servlet-name>
+        <servlet-class>servlet.Welcome</servlet-class>
+    </servlet>
+    <servlet-mapping>
+        <servlet-name>welcome</servlet-name>
+        <url-pattern>/welcome</url-pattern>
+    </servlet-mapping>
+
+    <servlet>
+        <servlet-name>DiesDas</servlet-name>
+        <servlet-class>servlet.DiesDas</servlet-class>
+    </servlet>
+    <servlet-mapping>
+        <servlet-name>DiesDas</servlet-name>
+        <url-pattern>/diesdas</url-pattern>
+    </servlet-mapping>
 
-<web-app>
-  <display-name>Archetype Created Web Application</display-name>
 </web-app>
diff --git a/src/main/webapp/css/base.css b/src/main/webapp/css/base.css
diff --git a/src/main/webapp/css/base.css.map b/src/main/webapp/css/base.css.map
diff --git a/src/main/webapp/css/base.scss b/src/main/webapp/css/base.scss
@@ -0,0 +1,3 @@
+h1 {
+  color: red;
+}
diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp
@@ -1,6 +1,17 @@
-<html>
+<%@ page isELIgnored="false" %>
+
+<!doctype html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport"
+          content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <title>Document</title>
+    <link link rel="stylesheet" type="text/css"href="css/base.css" />
+</head>
 <body>
-<h2>Hello World!</h2>
-<p>Do it nau</p>
+<h1>aälkdsjalsjkd</h1>
+${pageContext.request.contextPath}
 </body>
-</html>
+</html>
diff --git a/webshop.iml b/webshop.iml
@@ -22,6 +22,12 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.glassfish.grizzly:grizzly-http2:2.3.28" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.glassfish.grizzly:grizzly-http:2.3.28" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.glassfish.grizzly:grizzly-framework:2.3.28" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.glassfish.grizzly:grizzly-npn-bootstrap:1.7" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.glassfish.grizzly:grizzly-npn-api:1.7" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: junit:junit:3.8.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:javax.servlet-api:3.1.0" level="project" />
   </component>
 </module>