diff --git a/fill-db.hs b/fill-db.hs
index 41631aebb..d90c8af28 100755
--- a/fill-db.hs
+++ b/fill-db.hs
@@ -14,6 +14,7 @@ main :: IO ()
 main = db $ do
   now <- liftIO getCurrentTime
   let
+    summer2017 = TermIdentifier 2017 Summer
     winter2017 = TermIdentifier 2017 Winter
     summer2018 = TermIdentifier 2018 Summer
   gkleen <- insert User
@@ -23,6 +24,29 @@ main = db $ do
     , userEmail  = "G.Kleen@campus.lmu.de"
     , userDisplayName = "Gregor Kleen"
     }
+  fhamann <- insert User
+    { userPlugin = "LDAP"
+    , userIdent  = "felix.hamann@campus.lmu.de"
+    , userMatrikelnummer = Nothing
+    , userEmail  = "felix.hamann@campus.lmu.de"
+    , userDisplayName = "Felix Hamann"
+    }
+  jost <- insert User
+    { userPlugin = "LDAP"
+    , userIdent  = "jost@tcs.ifi.lmu.de"
+    , userMatrikelnummer = Nothing
+    , userEmail  = "jost@tcs.ifi.lmu.de"
+    , userDisplayName = "Steffen Jost"
+    }
+  void . insert $ Term
+    { termName     = summer2017
+    , termStart    = fromGregorian 2017 04 09
+    , termEnd      = fromGregorian 2017 07 14
+    , termHolidays = []
+    , termLectureStart = fromGregorian 2017 04 09
+    , termLectureEnd   = fromGregorian 2018 07 14
+    , termActive       = False
+    }
   void . insert $ Term
     { termName     = winter2017
     , termStart    = fromGregorian 2017 10 16
@@ -45,9 +69,16 @@ main = db $ do
   mi <- insert $ School "Institut für Mathematik" "MI"
   void . insert $ UserAdmin gkleen ifi
   void . insert $ UserAdmin gkleen mi
+  void . insert $ UserAdmin fhamann ifi
+  void . insert $ UserAdmin jost ifi
+  void . insert $ UserAdmin jost mi
   void . insert $ UserLecturer gkleen ifi
+  void . insert $ UserLecturer fhamann ifi
+  void . insert $ UserLecturer jost ifi
   ifiBsc <- insert $ Degree "Bachelor Informatik" ifi
   ifiMsc <- insert $ Degree "Master Informatik" ifi
+  miBsc <- insert $ Degree "Bachelor Mathematik" mi
+  -- FFP
   ffp <- insert Course
     { courseName = "Fortgeschrittene Funktionale Programmierung"
     , courseDescription = Nothing
@@ -69,3 +100,99 @@ main = db $ do
   void . insert $ Lecturer gkleen ffp
   void . insert $ Corrector gkleen ffp (ByProportion 1)
   void . insert $ Sheet ffp "Blatt 1" Nothing NotGraded Nothing now now Nothing Nothing now now gkleen gkleen
+  -- EIP
+  eip <- insert Course
+    { courseName = "Einführung in die Programmierung"
+    , courseDescription = Nothing
+    , courseLinkExternal = Nothing
+    , courseShorthand = "eip"
+    , courseTermId = TermKey summer2017
+    , courseSchoolId = ifi
+    , courseCapacity = Just 20
+    , courseCreated = now
+    , courseChanged = now
+    , courseCreatedBy = fhamann
+    , courseChangedBy = fhamann
+    , courseHasRegistration = False
+    , courseRegisterFrom = Nothing
+    , courseRegisterTo = Nothing
+    }
+  void . insert $ DegreeCourse ifiBsc eip
+  void . insert $ DegreeCourse ifiMsc eip
+  void . insert $ Lecturer fhamann eip
+  -- interaction design
+  ixd <- insert Course
+    { courseName = "Interaction Design (User Experience Design I & II)"
+    , courseDescription = Nothing
+    , courseLinkExternal = Nothing
+    , courseShorthand = "ixd"
+    , courseTermId = TermKey summer2018
+    , courseSchoolId = ifi
+    , courseCapacity = Just 20
+    , courseCreated = now
+    , courseChanged = now
+    , courseCreatedBy = fhamann
+    , courseChangedBy = fhamann
+    , courseHasRegistration = True
+    , courseRegisterFrom = Just now
+    , courseRegisterTo = Just ((3600 * 24 * 60) `addUTCTime` now )
+    }
+  void . insert $ DegreeCourse ifiBsc ixd
+  void . insert $ Lecturer fhamann ixd
+  -- concept development
+  ux3 <- insert Course
+    { courseName = "Concept Development (User Experience Design III)"
+    , courseDescription = Nothing
+    , courseLinkExternal = Nothing
+    , courseShorthand = "ux3"
+    , courseTermId = TermKey winter2017
+    , courseSchoolId = ifi
+    , courseCapacity = Just 30
+    , courseCreated = now
+    , courseChanged = now
+    , courseCreatedBy = fhamann
+    , courseChangedBy = fhamann
+    , courseHasRegistration = False
+    , courseRegisterFrom = Nothing
+    , courseRegisterTo = Nothing
+    }
+  void . insert $ DegreeCourse ifiBsc ux3
+  void . insert $ Lecturer fhamann ux3
+  -- promo
+  pmo <- insert Course
+    { courseName = "Programmierung und Modellierung"
+    , courseDescription = Nothing
+    , courseLinkExternal = Nothing
+    , courseShorthand = "pmo"
+    , courseTermId = TermKey summer2017
+    , courseSchoolId = ifi
+    , courseCapacity = Just 50
+    , courseCreated = now
+    , courseChanged = now
+    , courseCreatedBy = jost
+    , courseChangedBy = jost
+    , courseHasRegistration = False
+    , courseRegisterFrom = Nothing
+    , courseRegisterTo = Nothing
+    }
+  void . insert $ DegreeCourse ifiBsc pmo
+  void . insert $ Lecturer jost pmo
+  -- datenbanksysteme
+  dbs <- insert Course
+    { courseName = "Datenbanksysteme"
+    , courseDescription = Nothing
+    , courseLinkExternal = Nothing
+    , courseShorthand = "dbs"
+    , courseTermId = TermKey summer2018
+    , courseSchoolId = ifi
+    , courseCapacity = Just 50
+    , courseCreated = now
+    , courseChanged = now
+    , courseCreatedBy = jost
+    , courseChangedBy = jost
+    , courseHasRegistration = False
+    , courseRegisterFrom = Nothing
+    , courseRegisterTo = Nothing
+    }
+  void . insert $ DegreeCourse ifiBsc dbs
+  void . insert $ Lecturer jost dbs