diff --git a/layouts/index.html b/layouts/index.html
index 5c4340d..4ce76a2 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -9,5 +9,6 @@
{{ .Title}}
{{ end }}
+LOL
{{ partial "footer.html" . }}
diff --git a/layouts/shortcodes/calendar.html b/layouts/shortcodes/calendar.html
index 76d611e..9aa7975 100644
--- a/layouts/shortcodes/calendar.html
+++ b/layouts/shortcodes/calendar.html
@@ -26,9 +26,40 @@
{{ end }}
{{ end }}
- {{ range seq 1 $daysInMonth }}
- {{ . }}
+
+ {{ range seq 1 $daysInMonth }}
+
+ {{ $startDate := printf "%4d-%02d-%02dT00:00:00" $year $month . }}
+ {{ $startDate := time.AsTime $startDate }}
+ {{ $endDate := printf "%4d-%02d-%02dT23:59:59" $year $month . }}
+ {{ $endDate := time.AsTime $endDate }}
+
+ {{ . }}
+ `
+ {{ range where $.Site.RegularPages "Section" "eq" "events" }}
+ {{ $eventStart := time.AsTime .Params.start_date | int }}
+ {{ if after $eventStart $startDate }}
+
{{ .Title }}
+ {{ end }}
+
+
{{ end }}
+
+
+{{ end }}
+
+
+
+
+{{ range where .Site.Pages "Type" "event" }}
+ {{ if (and (gt .Params.start_date $.Date) (lt .Params.end_date $.Date)) }}
+ {{ .Title }}
+ {{ end }}
+{{ end }}
+
+
+
+