diff --git a/src/pvv/side/activity.php b/src/pvv/side/activity.php
index b860fdd..6799d4f 100644
--- a/src/pvv/side/activity.php
+++ b/src/pvv/side/activity.php
@@ -1,7 +1,7 @@
 <?php //declare(strict_types=1);
 namespace pvv\side;
 
-use \DateTimeImmutable;
+use \DateTime;
 
 interface Activity {
 
diff --git a/src/pvv/side/agenda.php b/src/pvv/side/agenda.php
deleted file mode 100644
index 03054a3..0000000
--- a/src/pvv/side/agenda.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php //declare(strict_types=1);
-namespace pvv\side;
-
-use \pvv\side\social\NerdepitsaActivity;
-use \pvv\side\social\AnimekveldActivity;
-
-use \DateTimeImmutable;
-use \DateInterval;
-
-class Agenda {
-
-	const TODAY = 0;
-	const TOMORROW = 1;
-	const THIS_WEEK = 2;
-	const THIS_MONTH = 3;
-	const NEXT_MONTH = 4;
-
-	public function __construct() {
-		$this->activities = [
-			new NerdepitsaActivity,
-			new AnimekveldActivity,
-		];
-	}
-
-	public function getEventsBetween(DateTimeImmutable $from, DateTimeImmutable $to) {
-		$results = [[], []];
-		do {
-			$run = false;
-			for($i = 0; $i < sizeof($this->activities); $i++) {
-				if (sizeof($results[$i])) {
-					$date = end($results[$i])->getStop();
-				} else {
-					$date = $from;
-				}
-				$next = $this->activities[$i]->getNextEventFrom($date);
-				if (isset($next) && $next->getStart() < $to) {
-					$results[$i][] = $this->activities[$i]->getNextEventFrom($date);
-					$run = true;
-				}
-			}
-		} while ($run);
-		$result = [];
-		foreach($results as $a) foreach($a as $b) $result[] = $b;
-		usort($result, function($a, $b) {
-			return ($a->getStart() < $b->getStart()) ? -1 : 1;
-		});
-		return $result;
-	}
-
-	public function getNextDays() {
-		$result = [[], [], [], [], []];
-		$events = $this->getEventsBetween(
-				(new DateTimeImmutable)->sub(new DateInterval('PT1H')), 
-				(new DateTimeImmutable)->add(new DateInterval('P1M'))
-			);
-		foreach ($events as $event) {
-			$index = self::NEXT_MONTH;
-			if (self::isToday($event->getStart())) $index = self::TODAY;
-			elseif (self::isTomorrow($event->getStart())) $index = self::TOMORROW;
-			elseif (self::isThisWeek($event->getStart())) $index = self::THIS_WEEK;
-			elseif (self::isThisMonth($event->getStart())) $index = self::THIS_MONTH;
-			$result[$index][] = $event;
-		}
-		return $result;
-	}
-
-	public static function isToday(DateTimeImmutable $date) {
-		return $date->format('dmY') == date('dmY');
-	}
-
-	public static function isTomorrow(DateTimeImmutable $date) {
-		return $date->sub(new DateInterval('P1D'))->format('dmY') == date('dmY');
-	}
-
-	public static function isThisWeek(DateTimeImmutable $date) {
-		return $date->format('WY') == date('WY');
-	}
-
-	public static function isThisMonth(DateTimeImmutable $date) {
-		return $date->format('mY') == date('mY');
-	}
-
-}
diff --git a/src/pvv/side/event.php b/src/pvv/side/event.php
index 0affb9d..9b10eb1 100644
--- a/src/pvv/side/event.php
+++ b/src/pvv/side/event.php
@@ -1,20 +1,10 @@
 <?php //declare(strict_types=1);
 namespace pvv\side;
 
-use \DateTimeImmutable;
+interface Event extends Activity {
 
-abstract class Event implements Activity {
+	public function getStart(); /* : DateTime */
 
-	private $start;
-
-	public function __construct(DateTimeImmutable $start) {
-		$this->start = $start;
-	}
-
-	public function getStart() {
-		return $this->start;
-	}
-
-	public abstract function getStop(); /* : DateTimeImmutable */
+	public function getStop(); /* : DateTime */
 
 }
diff --git a/src/pvv/side/social/animekveldactivity.php b/src/pvv/side/social/animekveldactivity.php
index 89ca88c..f2a10cd 100644
--- a/src/pvv/side/social/animekveldactivity.php
+++ b/src/pvv/side/social/animekveldactivity.php
@@ -1,11 +1,10 @@
 <?php //declare(strict_types=1);
 namespace pvv\side\social;
 
-use \pvv\side\RepeatingActivity;
 use \DateTimeImmutable;
 use \DateInterval;
 
-class AnimekveldActivity implements RepeatingActivity {
+class AnimekveldActivity  {
 
 	public function nextDate(DateTimeImmutable $date) {
 		if ($date->format('H') > 20 || $date->format('H') == 19 && $date->format('i') > 30)
diff --git a/src/pvv/side/social/animekveldevent.php b/src/pvv/side/social/animekveldevent.php
deleted file mode 100644
index f8ad6d8..0000000
--- a/src/pvv/side/social/animekveldevent.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php //declare(strict_types=1);
-namespace pvv\side\social;
-
-use \pvv\side\Event;
-
-use \DateInterval;
-
-class AnimekveldEvent extends Event {
-
-	public function getStop() {
-		return $this->getStart()->add(new DateInterval('PT4H1800S'));
-	}
-
-	public function getName() /* : string */ {
-		return "Animekveld";
-	}
-
-	public function getLocation() /* : Location */ {
-		return "Peppes Kjøpmansgata";
-	}
-
-	public function getOrganiser() /* : User */ {
-		return "Anders Christensen";
-	}
-
-}
diff --git a/src/pvv/side/social/nerdepitsaevent.php b/src/pvv/side/social/nerdepitsaevent.php
deleted file mode 100644
index 83b764c..0000000
--- a/src/pvv/side/social/nerdepitsaevent.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php //declare(strict_types=1);
-namespace pvv\side\social;
-
-use \pvv\side\Event;
-
-use \DateInterval;
-
-class NerdepitsaEvent extends Event {
-
-	public function getStop() {
-		return $this->getStart()->add(new DateInterval('PT2H1800S'));
-	}
-
-	public function getName() {
-		return "Nerdepitsa";
-	}
-
-	public function getLocation() /* : Location */ {
-		return "Peppes Kjøpmansgata";
-	}
-
-	public function getOrganiser() /* : User */ {
-		return "Anders Christensen";
-	}
-
-}
diff --git a/www/anime/index.html b/www/anime/index.html
index b17e0da..8289cb2 100755
--- a/www/anime/index.html
+++ b/www/anime/index.html
@@ -1,4 +1,5 @@
 <!DOCTYPE html>
+<html lang="no">
 <title>Sosialverkstedet</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
@@ -7,7 +8,7 @@
 <link rel="stylesheet" href="../css/events.css">
 
 <nav>
-	<li><a href="../index.php">hjem</a></li>
+	<li><a href="../index.html">hjem</a></li>
 	<li><a href="../kurs/index.html">kurs</a></li>
 	<li><a href="../prosjekt/index.html">prosjekt</a></li>
 	<li class="active"><a href="../sosiale/index.html">sosiale</a></li>
@@ -21,15 +22,15 @@
 <article>
 	<h2><img src="../sosiale/animekveld.jpg"><em>fredag</em> Animekveld</h2>
 	<ul class="subtext">
-		<li>Tid: <a>Hver fredag 19:30</a>
+		<li>Tid: <a>2016-08-19 19:30</a>
 		<li>Sted: <a>Koserommet</a>
 		<li>Arrangør: <a>Liang Zhu</a>
 	</ul>
-	<p>Er du glad i japansk tegnefilm eller er du bare nysgjerrige på hva animeer er? Bli med oss. Hver fredag finner vi de nyeste episodene og ser på dem mens vi nyter noe godt. Vi viser denne senongens nye animeer.
+	<p>Er du glad i japansk tegnefilm? Hver fredag finner vi de nyeste episodene og ser på dem mens vi nyter noe godt. Vi viser denne senongens nye animeer.
 
-	<p>Alle kan være med på å anbefalle eller veto serier.
+	<p>Sesongoversikten finner du <a href="http://anichart.net/">her</a>
 
-	<p><a class="btn" href="http://anichart.net/">Sesongoversikten</a>
+	<p>Disclaimer: ved avstemning kan vi veto en eller flere serier.
 
 	<p><a class="btn" href="#">Påminn meg</a>
 </article>
diff --git a/www/css/style.css b/www/css/style.css
index a4ac80d..ab6106e 100644
--- a/www/css/style.css
+++ b/www/css/style.css
@@ -50,6 +50,7 @@ article {
 }
 article p {
 	text-align: justify;
+	hyphens: auto;
 }
 article:first-child {
 	border-radius: .5rem .5rem 0 0;
@@ -146,12 +147,3 @@ a.btn:active {
 		height: 13em;
 	}
 }
-
-
-
-.collapsable {
-	display: none;
-}
-.collapsable:target {
-	display: block;
-}
\ No newline at end of file
diff --git a/www/index.php b/www/index.php
index 568fa34..f529b44 100644
--- a/www/index.php
+++ b/www/index.php
@@ -1,4 +1,5 @@
-<?php require '../src/_autoload.php'; date_default_timezone_set('Europe/Oslo') ?><!DOCTYPE html>
+<?php require '../src/_autoload.php'; ?><!DOCTYPE html>
+<html lang="no">
 <title>Programvareverkstedet</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
@@ -36,21 +37,69 @@
 <article>
 <h2>Kommende arrangement</h2>
 <ul class="calendar-events">
-<?php $translation = ['i dag', 'i morgen', 'denne uka', 'denne måned', 'neste måned'] ?>
-<?php $counter1 = 0; ?>
-<?php $counter2 = 0; ?>
-<?php foreach((new \pvv\side\Agenda())->getNextDays() as $period => $events) if ($events && $counter1 < 2 && $counter2 < 10) { $counter1++ ?>
-<li><p><?= $translation[$period] ?> <span><?= reset($events)->getStart()->format('Y-m-d'); ?></span></p>
+
+
+
+<?php
+/* include "../../nettsiden/src/_autoload.php"; */
+/* use \pvv\side\Events; */
+# TEST START
+#Class Event {
+#    private $start, $name;
+#    function Event($name,$start){$this->start = $start;$this->name=$name;}
+#    function getName(){return $this->name;}
+#    function getStart(){return $this->start;}
+#}
+/* $evs = new Events(); */
+/* $events = $evs->getAllEvents(); */
+/* # TEST END */
+/* 		<a href="">animekveld</a> */
+
+/* echo "<li><p>i dag<span>".date("Y-m-d")."</span></p>"; */
+/*     echo "<ul>"; */
+/* foreach($events as $ev){ */
+/*     echo "<li>"; */
+/*     echo "<a href=\"\">".$ev->getName()."</a>"; */
+/*     echo "<span>".$ev->getStart()."</span>"; */
+/*     echo "		<a class=\"icon subscribe\" href=\"\">+</a>"; */
+/*     echo "	</li>"; */
+/* } */
+?>
+
+<?php 
+$a = new \pvv\side\social\NerdepitsaActivity;
+$nextPizzaDate = $a->nextDate(new \DateTimeImmutable);
+$a = new \pvv\side\social\AnimekveldActivity;
+$nextAnimeDate = $a->nextDate(new \DateTimeImmutable);
+?>
+
+<li><p><?=$nextPizzaDate->format('l')?><span><?=$nextPizzaDate->format('Y-m-d')?></span></p>
 <ul>
-<?php foreach($events as $event) { $counter2++ ?>
-<li>
-<a><?= $event->getName(); ?></a>
-<span><?= $event->getStart()->format('H:i'); ?></span>
-<a class="icon subscribe" href="">+</a>
-</li>
-<?php } ?>
+	<li>
+        <a href="nerdepitsa/index.html">nerdepitsa</a>
+        <span><?=$nextPizzaDate->format('H.i')?></span>
+		<a class="icon subscribe" href="">+</a>
+	</li>
+	<li>
+    	<a href="animekveld/index.html">animekveld</a>
+        <span><?=$nextAnimeDate->format('H.i')?></span>
+		<a class="icon subscribe" href="">+</a>
+	</li>
 </ul>
-<?php } ?>
+</li>
+
+<li><p>noen gang<span>2016-08-XX</span></p>
+<ul>
+	<li>
+		<a href="">styremøte</a>
+		<span>XX.00</span>
+		<a class="icon subscribe" href="">+</a>
+	</li>
+</ul>
+</li>
+
+
+
 </ul>
 <p><a class="btn" href="kalender/index.html">Flere aktiviteter</a></p>
 </article>
@@ -58,7 +107,7 @@
 <h2>Opptak</h2>
 <p>
 Alle med tilknytning til NTNU kan bli medlem hos oss
-og benytte seg av våre ressurser.
+og benytte seg av våre ressurs.
 For å bli med i våre prosjekter og komitéer må du søke.
 </p>
 <p>
diff --git a/www/kurs/index.html b/www/kurs/index.html
index 1f53baf..6b7fa58 100644
--- a/www/kurs/index.html
+++ b/www/kurs/index.html
@@ -1,4 +1,5 @@
 <!DOCTYPE html>
+<html lang="no">
 <title>Kursverkstedet</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
diff --git a/www/nerdepitsa/index.html b/www/nerdepitsa/index.html
index 9a1db84..3aedba0 100755
--- a/www/nerdepitsa/index.html
+++ b/www/nerdepitsa/index.html
@@ -1,4 +1,5 @@
 <!DOCTYPE html>
+<html lang="no">
 <title>Sosialverkstedet</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
@@ -7,7 +8,7 @@
 <link rel="stylesheet" href="../css/events.css">
 
 <nav>
-	<li><a href="../index.php">hjem</a></li>
+	<li><a href="../index.html">hjem</a></li>
 	<li><a href="../kurs/index.html">kurs</a></li>
 	<li><a href="../prosjekt/index.html">prosjekt</a></li>
 	<li class="active"><a href="../sosiale/index.html">sosiale</a></li>
diff --git a/www/prosjekt/index.html b/www/prosjekt/index.html
index f12ec74..d9c48ec 100644
--- a/www/prosjekt/index.html
+++ b/www/prosjekt/index.html
@@ -1,4 +1,5 @@
 <!DOCTYPE html>
+<html lang="no">
 <title>Prosjektverkstedet</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
diff --git a/www/soek/PR.html b/www/soek/PR.html
index 210e434..9c88ae0 100644
--- a/www/soek/PR.html
+++ b/www/soek/PR.html
@@ -1,4 +1,5 @@
 <!DOCTYPE html>
+<html lang="no">
 <title>Prosjektverkstedet</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
diff --git a/www/soek/drift.html b/www/soek/drift.html
index 3b8b9af..8d99228 100644
--- a/www/soek/drift.html
+++ b/www/soek/drift.html
@@ -1,4 +1,5 @@
 <!DOCTYPE html>
+<html lang="no">
 <title>Prosjektverkstedet</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
diff --git a/www/soek/index.html b/www/soek/index.html
index 8f4d2fd..ceedc24 100644
--- a/www/soek/index.html
+++ b/www/soek/index.html
@@ -1,4 +1,5 @@
 <!DOCTYPE html><!DOCTYPE html>
+<html lang="no">
 <title>Prosjektverkstedet</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
diff --git a/www/soek/styret.html b/www/soek/styret.html
index bcf57b3..3d9c567 100644
--- a/www/soek/styret.html
+++ b/www/soek/styret.html
@@ -1,4 +1,5 @@
 <!DOCTYPE html>
+<html lang="no">
 <title>Prosjektverkstedet</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
diff --git a/www/soek/trikom.html b/www/soek/trikom.html
index 4869dd2..c278a2b 100644
--- a/www/soek/trikom.html
+++ b/www/soek/trikom.html
@@ -1,4 +1,5 @@
 <!DOCTYPE html>
+<html lang="no">
 <title>Prosjektverkstedet</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
diff --git a/www/sosiale/index.html b/www/sosiale/index.html
index 83ab6d1..7cff1b0 100644
--- a/www/sosiale/index.html
+++ b/www/sosiale/index.html
@@ -1,4 +1,5 @@
 <!DOCTYPE html>
+<html lang="no">
 <title>Sosialverkstedet</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
@@ -21,42 +22,15 @@
 <article>
 	<h2><img src="../sosiale/animekveld.jpg"><em>fredag</em> Animekveld</h2>
 	<ul class="subtext">
-		<li>Tid: <a>Hver fredag 19:30</a>
+		<li>Tid: <a>2016-08-19 19:30</a>
 		<li>Sted: <a>Koserommet</a>
 		<li>Arrangør: <a>Liang Zhu</a>
 	</ul>
-	<p>Er du glad i japansk tegnefilm eller er du bare nysgjerrige på hva animeer er? Bli med oss. Hver fredag finner vi de nyeste episodene og ser på dem mens vi nyter noe godt. Vi viser denne senongens nye animeer.
+	<p>Er du glad i japansk tegnefilm? Hver fredag finner vi de nyeste episodene og ser på dem mens vi nyter noe godt. Vi viser denne senongens nye animeer.
 
-	<p>Alle kan være med på å anbefalle eller veto serier.
+	<p>Sesongoversikten finner du <a href="http://anichart.net/">her</a>
 
-	<p><a class="btn" href="http://anichart.net/">Sesongoversikten</a>
-
-	<p><a class="btn" href="#">Påminn meg</a>
-</article>
-
-<article>
-	<h2><em>Torsdag</em> Brettspillkveld</h2>
-	<ul class="subtext">
-		<li>Tid: <a>Hver Torsdag 19:30</a>
-		<li>Sted: <a>Koserommet</a>
-	</ul>
-	<p>Er du en hardcore brettspillentusiast eller en nybegynner som har bare spilt ludo? Da er vårt brettspillkveld noe for deg. Vi tar ut et par spill fra vårt samling of spiller så mye vi orker. Kom innom!
-
-	<p><a class="btn" href="#b_spill">Vår samling</a>
-
-		<ul id="b_spill" class="collapsable">
-			<li>Dominion
-			<li>Three cheers for master
-			<li>Avalon
-			<li>Cards aginst humanity
-			<li>Citadels
-			<li>Munchkin
-			<li>Exploding kittens
-			<li>Aye dark overlord
-			<li>Settlers of catan
-			<li>Risk
-			<li>og mange flere...
-		</ul>
+	<p>Disclaimer: ved avstemning kan vi veto en eller flere serier.
 
 	<p><a class="btn" href="#">Påminn meg</a>
 </article>