diff --git a/_events/releasefest-för-kloaksajterna-i-stockholm.md b/_events/releasefest-för-kloaksajterna-i-stockholm.md
index 43ee319..df1dba7 100644
--- a/_events/releasefest-för-kloaksajterna-i-stockholm.md
+++ b/_events/releasefest-för-kloaksajterna-i-stockholm.md
@@ -3,7 +3,7 @@ title: Releasefest för Kloaksajterna i Stockholm
 description: >-
   Kom och fira utgivningen av  Kolbjörn Guwallius roman oss på momangen i
   Stockholm!
-date: 2019-08-08 07:00:00 +0200
+date: 2019-08-08 10:00:00 +0200
 event_data:
   start_datetime: 2019-08-30 19:00:00 +0200
   end_datetime: 2019-08-30 22:00:00 +0200
diff --git a/_includes/coming-events.html b/_includes/coming-events.html
new file mode 100644
index 0000000..5554575
--- /dev/null
+++ b/_includes/coming-events.html
@@ -0,0 +1,17 @@
+{% assign now = site.time %}
+{% assign upcoming = site.events | sort: 'event_data.start_datetime' %}
+{% for event in upcoming %}   
+{% if event.event_data.end_datetime >= now %} 
+<div class="column">
+<h3>Kommande Events</h3>
+{% for event in upcoming %}   
+{% if event.event_data.end_datetime >= now %}  
+<div class="pastevents" {% if forloop.last == true %}style="border:none"{% endif %}>
+  <p>{{ event.event_data.start_datetime | date: '%Y-%m-%d' }}<br />
+    <a href="{{ event.url }}"><strong>{{ event.title }}</strong></a>
+  </p>
+</div> {% endif %} {% endfor %}
+<a href="/events/" class="cta" alt="Events">Mer Events</a>
+</div>
+{% break %}
+{% endif %} {% endfor %}
\ No newline at end of file
diff --git a/_includes/hero.html b/_includes/hero.html
index d9cb4bd..3af4f01 100644
--- a/_includes/hero.html
+++ b/_includes/hero.html
@@ -7,18 +7,45 @@
     {% if page.url == "/" %}
     <div id="poster">
       <!-- Begin Up next -->
-      {% capture now -%}{{ site.time | date: '%s' }}{%- endcapture %}       {% for event in site.events %}      {% capture endtime -%}       {{ event.event_data.end_datetime | date: '%s' }}      {%- endcapture %}       {% if now <= endtime %}
+
+
+{% assign now = site.time %}
+{% assign upcoming = site.events | sort: 'event_data.start_datetime' %}
+{% for event in upcoming %}   
+{% if event.event_data.end_datetime >= now %}  
+
+
       <div>
         På gång:
         <a href="cloudcannon:collections/{{ event.path }}" class="editor-link cms-editor-link">Redigera Event</a>
         <h2><a href="{{ event.url }}" class="nodecoration">{{ event.title }}</a></h2>
         <p>
-          {% assign d = event.event_data.start_datetime | date: "%-d"  %}{% case d %}{% when '1' or '21' or '31' or '2' or '22' %}{{ d }}:a          {% else %}{{ d }}:e{% endcase %}         {% assign m = event.event_data.start_datetime | date: "%-m" %}          {% case m %}           {% when '1' %}Januar          {% when '2' %}Februari          {% when '3' %}Mars           {% when '4' %}April          {% when '5' %}Maj          {% when '6' %}Juni          {% when '7' %}Juli          {% when '8' %}Augusti          {% when '9' %}September          {% when '10' %}October          {% when '11' %}November          {% when '12' %}December         {% endcase %}          {{ event.event_data.start_datetime | date: "%Y" }}          kl. {{ event.event_data.start_datetime | date: "%R"}}<br />
+          {% assign d = event.event_data.start_datetime | date: "%-d"  %}
+          {% case d %}
+          {% when '1' or '21' or '31' or '2' or '22' %}{{ d }}:a          
+          {% else %}{{ d }}:e
+          {% endcase %}         
+          
+          {% assign m = event.event_data.start_datetime | date: "%-m" %}          
+          {% case m %}           
+          {% when '1' %}Januar          
+          {% when '2' %}Februari          
+          {% when '3' %}Mars           
+          {% when '4' %}April          
+          {% when '5' %}Maj          
+          {% when '6' %}Juni          
+          {% when '7' %}Juli          
+          {% when '8' %}Augusti          
+          {% when '9' %}September          {% when '10' %}October          {% when '11' %}November          {% when '12' %}December         
+          {% endcase %}          
+          {{ event.event_data.start_datetime | date: "%Y" }}          
+          kl. {{ event.event_data.start_datetime | date: "%R"}}
+          <br />
           Typ av konst: {{ event.category }}
           <br /><strong>{{ event.description | truncatewords: 10 }}</strong></p>
         <p><a class="cta" href="{{ event.url }}" style="padding:10px;"> Läs mer </a></p>
       </div>
-      {% break %}       {% endif %}       {% endfor %}
+      {% break %}  {% endif %}   {% endfor %}
       <!-- end Up next-->
     </div>
     {% else %}
diff --git a/_includes/past-events.html b/_includes/past-events.html
index 327fad2..4ffc00e 100644
--- a/_includes/past-events.html
+++ b/_includes/past-events.html
@@ -1,5 +1,8 @@
 <h3>Förflutna events</h3>
-{% capture now -%} {{ site.time | date: '%s' }} {%- endcapture %} {% assign events = site.events | reverse %} {% for event in events | limit: 8 %} {% capture endtime -%} {{ event.event_data.end_datetime | date: '%s' }} {%- endcapture %} {% if now >= endtime %}
+{% assign now = site.time %}
+{% assign upcoming = site.events | sort: 'event_data.start_datetime' | reverse %}
+{% for event in upcoming limit: 10 %}   
+{% if event.event_data.end_datetime <= now %}  
 <div class="pastevents" {% if forloop.last == true %}style="border:none"{% endif %}>
   <p>{{ event.event_data.start_datetime | date: '%Y-%m-%d' }}<br />
     <a href="{{ event.url }}"><strong>{{ event.title }}</strong></a>
diff --git a/events.html b/events.html
index b09765c..56adfdb 100644
--- a/events.html
+++ b/events.html
@@ -6,20 +6,14 @@ image: /uploads/stickerwall.jpg
 ---
 
 
-{% for event in site.events %}
-    {% capture now -%}{{ site.time | date: '%s' }}{%- endcapture %}
-    {% capture endtime -%} {{ event.event_data.end_datetime | date: '%s' }} {%- endcapture %}
-    {% capture postdate -%} {{ event.date | date: '%s' }} {%- endcapture %}
-    {% if now <= endtime %} {% unless now <= postdate %}
 <div class="column" style="border: none;">
   <h3>Kommande event</h3>
   <div class="flexitem" style="margin-left: 0;">
 
-    {% for event in site.events %}
-    {% capture now -%}{{ site.time | date: '%s' }}{%- endcapture %}
-    {% capture endtime -%} {{ event.event_data.end_datetime | date: '%s' }} {%- endcapture %}
-    {% capture postdate -%} {{ event.date | date: '%s' }} {%- endcapture %}
-    {% if now <= endtime %} {% unless now <= postdate %}
+    {% assign now = site.time %}
+{% assign upcoming = site.events | sort: 'event_data.start_datetime' %}
+{% for event in upcoming %}   
+{% if event.event_data.end_datetime >= now %}  
 
     <div class="column2">
       <a href="cloudcannon:collections/{{ event.path }}" class="editor-link cms-editor-link">Redigera Event</a>
@@ -39,17 +33,16 @@ image: /uploads/stickerwall.jpg
         Typ av konst: {{ event.category }}</p>
       <h3 style="margin-bottom: 30px;">{{ event.description | truncatewords: 10 }}</h3>
       <a href="{{ event.url }}" class="cta">Läs mer</a><br /><br />
-    </div>{% endunless %}{% endif %} {% endfor %} 
+    </div>{% endif %}   {% endfor %}
   </div>
 </div>
-{% break %}
-{% endunless %}{% endif %} {% endfor %} 
 <div class="column" style="border: none;">
   <h3>Förflutna events</h3>
   <div class="flexitem">
-    {% capture now -%} {{ site.time | date: '%s' }} {%- endcapture %} {% assign events = site.events | reverse %}
-    {% for event in events %} {% capture endtime -%} {{ event.event_data.end_datetime | date: '%s' }} {%- endcapture %}
-    {% if now >= endtime %}
+    {% assign now = site.time %}
+{% assign upcoming = site.events | sort: 'event_data.start_datetime' | reverse %}
+{% for event in upcoming %}   
+{% if event.event_data.end_datetime <= now %}  
     <div class="column2">
       <a href="cloudcannon:collections/{{ event.path }}" class="editor-link cms-editor-link">Redigera Event</a>
       <a href="{{ event.url }}" title="Event: {{ event.title }}" alt="Event: {{ event.title }}">
diff --git a/index.html b/index.html
index cf4d537..08c8a67 100644
--- a/index.html
+++ b/index.html
@@ -20,6 +20,9 @@ layout: default
   </div>
   <a href="/about/" class="cta" alt="About Momangen">Om Momangen</a>
 </div>
+
+  {% include coming-events.html %}
+
 <div class="column">
   {% include past-events.html %}
 </div>