diff --git a/config.toml b/config.toml
index e0951c2..d088348 100644
--- a/config.toml
+++ b/config.toml
@@ -6,7 +6,7 @@ enableGitInfo = true
 enableRobotsTXT = true
 
 [pagination]
-pagerSize = 50
+pagerSize = 20
 
 [params]
 github_username = "plugorgau"
@@ -17,3 +17,6 @@ unsafe = true
 
 [permalinks]
 minutes = "/events/committee/:year/:month-:day/"
+
+[taxonomies]
+presenter = "presenters"
diff --git a/content/events/2003.md b/content/events/2003.md
deleted file mode 100644
index f6763f0..0000000
--- a/content/events/2003.md
+++ /dev/null
@@ -1,36 +0,0 @@
----
-title: Events Archive 2003
----
-
-### **January 2003**
-James Bromberger & Tony Breeds: Linux.conf.au 2003
-
-### **March 2003**
-Tony Breeds on "What's New in 2.6"
-
-### **April 2003**
-Hans Humboldt on "Sun's Position in the Linux Market"
-
-### **May 2003**
-Trent Lloyd on "User-Mode Linux (UML)"
-
-### **June 2003**
-Bernard Blackham on "Speex Development and Applications"
-
-### **July 2003**
-Mike Gilks on "OpenOffice.org Data Connection - databases for the rest of us"
-
-### **August 2003**
-Sacha Schlegel on ebXML (cancelled)
-
-### **September 2003**
-Sacha Schlegel on ebXML
-
-### **October 2003**
-Tony Breeds on networking, part 1 of 3
-
-### **November 2003**
-Adrian Woodley on networking, part 2 of 3 (Samba)
-
-### **December 2003**
-Tony Breeds on networking, part 3 of 3 (ISP hookup, routing, firewalling)
diff --git a/content/events/2003/_index.md b/content/events/2003/_index.md
new file mode 100644
index 0000000..d5f81ec
--- /dev/null
+++ b/content/events/2003/_index.md
@@ -0,0 +1,4 @@
+---
+title: 2003 Events
+---
+
diff --git a/content/events/2003/ebxml/index.md b/content/events/2003/ebxml/index.md
new file mode 100644
index 0000000..3439d63
--- /dev/null
+++ b/content/events/2003/ebxml/index.md
@@ -0,0 +1,27 @@
+---
+title: ebXML
+date: 2003-09-09T19:30:00+08:00
+presenters:
+  - Sacha Schlegel
+aliases:
+  - /events/seminar/2003-09/
+---
+
+Electronic business and ebXML (electronic business eXtensible Markup
+Language) in particular in the Free Software/Open Source world.
+
+<!--more-->
+
+<!-- **Where:** Central TAFE Lecture Theatre, Perth -->
+
+**Biography:** My name is Sacha Schlegel born in 1971 in Switzerland,
+grown up in the Principality of Liechtenstein (in the heart of Europe).
+After obligatory school I finished a commercial apprenticeship in a Bank
+in Liechtenstein. Studied Computer Science (CS) and Business in
+Switzerland afterwards. Came to Australia in 2001 for a postgraduate
+diploma in CS and a masters by research in CS. My hobbies are Soccer,
+Windsurfing, Linux and lately (9 months) my little daughter Tawha.
+
+**Slides:** Slides from this talk [can be viewed on-line](slides.pdf).
+More information about ebXML can be found on [Sacha\'s ebXML web
+site](https://web.archive.org/web/20080906110857/http://www.schlegel.li/ebXML/Msc_documents.html).
diff --git a/content/events/2003/ebxml/slides.pdf b/content/events/2003/ebxml/slides.pdf
new file mode 100644
index 0000000..485f050
Binary files /dev/null and b/content/events/2003/ebxml/slides.pdf differ
diff --git a/content/events/2003/linux-2.6.md b/content/events/2003/linux-2.6.md
new file mode 100644
index 0000000..173f271
--- /dev/null
+++ b/content/events/2003/linux-2.6.md
@@ -0,0 +1,24 @@
+---
+title: "What's New in 2.6"
+date: 2003-03-11T19:30:00+08:00
+presenters:
+  - Tony Breeds
+aliases:
+  - /events/seminar/2003-03/
+---
+
+The 2.5 series kernel is approaching stability and should be ready to
+be released as 2.6.0 within the next 12 months. Tony will show some of
+the new features in the current development kernels.  Touching on user
+concerns, passing thought new features for system administrators, and
+stopping at some of the nifty things that have happened that you
+*shouldn't* ever see :)
+
+<!--more-->
+
+<!-- **Where:** Central TAFE Lecture Theatre, Perth -->
+
+**Biography:** Tony started using Linux in 1995 (shortly after he
+arrived in Perth). In 1996 he erased any other OS from his machine
+(something that survived until he got his notebook). In 1998 he found
+PLUG and kind'a just stayed hanging around.
diff --git a/content/events/2003/linux.conf.au.md b/content/events/2003/linux.conf.au.md
new file mode 100644
index 0000000..f2e67bb
--- /dev/null
+++ b/content/events/2003/linux.conf.au.md
@@ -0,0 +1,11 @@
+---
+title: Linux.conf.au 2003
+date: 2003-01-22
+presenters:
+  - James Bromberger
+  - Tony Breeds
+---
+
+In 2003, [Linux.conf.au](https://mirror.linux.org.au/pub/linux.conf.au/2003/)
+was held in Perth. A number of people on the organising team were PLUG
+members.
diff --git a/content/events/2003/networking-part1/index.md b/content/events/2003/networking-part1/index.md
new file mode 100644
index 0000000..a2e4597
--- /dev/null
+++ b/content/events/2003/networking-part1/index.md
@@ -0,0 +1,19 @@
+---
+title: Networking, part 1 of 3
+date: 2003-10-14T19:30:00+08:00
+presenters:
+  - Tony Breeds
+aliases:
+  - /events/seminar/2003-10/
+---
+
+This is part 1 of a 3 part seminar series. This week you'll learn
+enough to get 2 (or more) machines networked and "pinging" each
+other. Plus I'll touch on DNS and why it's a good thing for a home
+network.
+
+<!--more-->
+
+<!-- **Where:** Central TAFE Lecture Theatre, Perth -->
+
+**Slides:** Slides from this talk [can be viewed on-line](slides.pdf).
diff --git a/content/events/2003/networking-part1/slides.pdf b/content/events/2003/networking-part1/slides.pdf
new file mode 100644
index 0000000..73b508a
Binary files /dev/null and b/content/events/2003/networking-part1/slides.pdf differ
diff --git a/content/events/2003/networking-part2.md b/content/events/2003/networking-part2.md
new file mode 100644
index 0000000..49f6a19
--- /dev/null
+++ b/content/events/2003/networking-part2.md
@@ -0,0 +1,13 @@
+---
+title: Networking, part 2 of 3 (Samba)
+date: 2003-11-11T19:30:00+08:00
+presenters:
+  - Adrian Woodley
+aliases:
+  - /events/seminar/2003-11/
+---
+
+This is part 2 of a 3 part seminar series. This week you'll see Samba
+in action.
+
+<!--**Where:** Central TAFE Lecture Theatre, Perth\ -->
diff --git a/content/events/2003/networking-part3/index.md b/content/events/2003/networking-part3/index.md
new file mode 100644
index 0000000..b8431b2
--- /dev/null
+++ b/content/events/2003/networking-part3/index.md
@@ -0,0 +1,19 @@
+---
+title: Networking, part 3 of 3
+date: 2003-12-09T19:30:00+08:00
+presenters:
+  - Tony Breeds
+aliases:
+  - /events/seminar/2003-12/
+---
+
+This is part 3 of a 3 part seminar series. Tony will consolidate what
+has previously been discussed in parts one and two of this lecture
+series and then move onto ISP hookup. This leads inexorably to routing
+and firewalling. The session will end with a networking Q&A session.
+
+<!--more-->
+
+<!-- **Where:** Central TAFE Lecture Theatre, Perth\ -->
+
+**Slides:** Slides from this talk [can be viewed on-line](slides.pdf).
diff --git a/content/events/2003/networking-part3/slides.pdf b/content/events/2003/networking-part3/slides.pdf
new file mode 100644
index 0000000..4fb0226
Binary files /dev/null and b/content/events/2003/networking-part3/slides.pdf differ
diff --git a/content/events/2003/openoffice-db/db-presentation.pdf b/content/events/2003/openoffice-db/db-presentation.pdf
new file mode 100644
index 0000000..fdc8bf4
Binary files /dev/null and b/content/events/2003/openoffice-db/db-presentation.pdf differ
diff --git a/content/events/2003/openoffice-db/index.md b/content/events/2003/openoffice-db/index.md
new file mode 100644
index 0000000..ad3ab2a
--- /dev/null
+++ b/content/events/2003/openoffice-db/index.md
@@ -0,0 +1,31 @@
+---
+title: OpenOffice.org Data Connection - databases for the rest of us
+date: 2003-07-08T19:30:00+08:00
+presenters:
+  - Mike Gilks
+aliases:
+  - /events/seminar/2003-07/
+---
+
+Creating forms for the maintenance of a MySQL database, using the GUI
+elements available in OpenOffice.org 1.0.3. No code will be harmed in
+the creating of this presentation. Programmers' sensibilities may be
+bruised, but this is for the users!
+
+<!--more-->
+
+<!-- **Where:** Central TAFE Lecture Theatre, Perth -->
+
+**Biography:** Born in Perth, way too long ago. Worked in the Kimberley,
+mainly mining and mechanic-ing, then came back to Perth. Spent two years
+at TAFE studying IT, database programming, latest toys and walks on the
+beach. Discovered Linux about four years back and have struggled with it
+ever since. Every time I think I understand something, something else
+attracts my attention and I am back to square one, learning all over
+again. Short philosophical note; "Users should not have to learn about
+computers, software should do the knowing, users do the work. Your
+average mechanic cannot mine and refine metal, create an alloy then
+forge a good spanner, he just turns the thing. Computers should do the
+same."
+
+**Slides:** Slides from this talk [can be viewed on-line](db-presentation.pdf).
diff --git a/content/events/2003/speex/index.md b/content/events/2003/speex/index.md
new file mode 100644
index 0000000..c89672a
--- /dev/null
+++ b/content/events/2003/speex/index.md
@@ -0,0 +1,22 @@
+---
+title: Speex Development and Applications
+date: 2003-06-10T19:30:00+08:00
+presenters:
+  - Bernard Blackham
+aliases:
+  - /events/seminar/2003-06/
+---
+
+Speex is an audio codec designed specifically for recording and
+compressing speech. As the VoIP industry is invaded by patented and
+expensive voice-compression codecs, Speex hopes to bring a free, open
+standard to the world. The talk will cover a bit about the development
+of Speex and its applications to Internet telephony, streaming, PLUG,
+Linux.conf.au 2003 and world peace.
+
+<!--more-->
+
+<!-- **Where:** Central TAFE Lecture Theatre, Perth -->
+
+**Slides:** Slides from this talk are available in [PDF format
+\[25kb\]](speex.pdf).
diff --git a/content/events/2003/speex/speex.pdf b/content/events/2003/speex/speex.pdf
new file mode 100644
index 0000000..47d6304
Binary files /dev/null and b/content/events/2003/speex/speex.pdf differ
diff --git a/content/events/2003/sun.md b/content/events/2003/sun.md
new file mode 100644
index 0000000..f13d37e
--- /dev/null
+++ b/content/events/2003/sun.md
@@ -0,0 +1,18 @@
+---
+title: "Sun's Position in the Linux Market"
+date: 2003-04-08T17:30:00+08:00
+presenters:
+  - Hans Humboldt
+aliases:
+  - /events/seminar/2003-04/
+---
+
+Hans will talk about Sun Microsystems' current and future position in
+the Linux market.
+
+<!--more-->
+
+<!-- **Where:** Central TAFE Lecture Theatre, Perth\-->
+
+**Biography:** Hans is a Technical Account Manager with Sun Microsystems
+Australia Pty Ltd and is based in Western Australia.
diff --git a/content/events/2003/uml/index.md b/content/events/2003/uml/index.md
new file mode 100644
index 0000000..2c9ecc0
--- /dev/null
+++ b/content/events/2003/uml/index.md
@@ -0,0 +1,24 @@
+---
+title: User-Mode Linux (UML)
+date: 2003-05-13T17:30:00+08:00
+presenters:
+  - Trent Lloyd
+aliases:
+  - /events/seminar/2003-05/
+---
+
+User-Mode Linux is a project that is maturing quickly and has become
+fairly stable for everyday general use. This talk will go over the
+basics of User-Mode Linux, what it is, how to run it and more.  "More"
+will probably include the use of User-Mode Linux for another interest
+of Trent's, i.e. IPV6.
+
+<!--more-->
+
+<!-- **Where:** Central TAFE Lecture Theatre, Perth -->
+
+**Biography:** Trent is a highschool student and sys admin. He has
+presented talks and workshops on previous topics including IPV6 at the
+LCA in Perth earlier this year.
+
+**Slides:** Slides from this talk [can be viewed on-line](slides.pdf).
diff --git a/content/events/2003/uml/slides.pdf b/content/events/2003/uml/slides.pdf
new file mode 100644
index 0000000..96ea072
Binary files /dev/null and b/content/events/2003/uml/slides.pdf differ
diff --git a/content/events/2004.md b/content/events/2004.md
deleted file mode 100644
index 599fc85..0000000
--- a/content/events/2004.md
+++ /dev/null
@@ -1,30 +0,0 @@
----
-title: Events Archive 2004
----
-
-### **March 2004**
-Bernard Blackham on "Cool Things You Should and Shouldn't Do With PostgreSQL"
-
-### **April 2004**
-Nick Bannon, Clare Johnstone and Cameron Patrick on linux.conf.au 2004
-
-### **May 2004**
-Craig Ringer on "Generating quality PDF reports using Python and ReportLab"
-
-### **June 2004**
-Leon Brooks on "Playing with Ruby-SDL"
-
-### **July 2004**
-Bernard Blackham on "Linux, Laptops and Life"
-
-### **August 2004**
-James Levin, Bernard Blackham and Michal Wirski presenting a post-Installfest introduction to Linux
-
-### **September 2004**
-Cameron Patrick on "Shell scripting: why, how and what not to do"
-
-### **October 2004**
-Acure Technology presenting a Novell Linux Desktop show-off session
-
-### **November 2004**
-Jeremy Malcolm presenting "Splinters of a Fragmented Mind: Law, Cross-Platform Development, LDAP and Doctor Who"
diff --git a/content/events/2004/_index.md b/content/events/2004/_index.md
new file mode 100644
index 0000000..8c4a61a
--- /dev/null
+++ b/content/events/2004/_index.md
@@ -0,0 +1,4 @@
+---
+title: 2004 Events
+---
+
diff --git a/content/events/2004/intro-linux.md b/content/events/2004/intro-linux.md
new file mode 100644
index 0000000..772ca4a
--- /dev/null
+++ b/content/events/2004/intro-linux.md
@@ -0,0 +1,20 @@
+---
+title: Introduction to Linux
+date: 2004-08-10T19:30:00+08:00
+presenters:
+  - James Levin
+  - Bernard Blackham
+  - Michal Wirski
+aliases:
+  - /events/seminar/2004-08/
+---
+
+This is a special post-Installfest talk, aimed at introducing newcomers
+to their Linux systems. Topics to be covered include navigating the
+shell, basic system administration, and protecting yourself with a
+firewall. A large part of the talk will be distribution neutral, though
+upon request, distribution-specific demonstrations may be done.
+
+<!--more-->
+
+<!-- **Where:** Central TAFE Lecture Theatre, Perth -->
diff --git a/content/events/2004/laptops/index.md b/content/events/2004/laptops/index.md
new file mode 100644
index 0000000..28e7ca6
--- /dev/null
+++ b/content/events/2004/laptops/index.md
@@ -0,0 +1,19 @@
+---
+title: Linux, Laptops and Life
+date: 2004-07-13T19:30:00+08:00
+presenters:
+  - Bernard Blackham
+aliases:
+  - /events/seminar/2004-07/
+---
+
+This talk will cover tips, tricks and traps with Linux on laptops. More
+specifically, getting hibernation working, power-saving techniques and
+generally getting the most out of your laptop.
+
+<!--more-->
+
+<!-- **Where:** Central TAFE Lecture Theatre, Perth -->
+
+**Slides:** Slides from this talk are available in [PDF format
+\[146kb\]](laptops.pdf).
diff --git a/content/events/2004/laptops/laptops.pdf b/content/events/2004/laptops/laptops.pdf
new file mode 100644
index 0000000..62eecde
Binary files /dev/null and b/content/events/2004/laptops/laptops.pdf differ
diff --git a/content/events/2004/novell.md b/content/events/2004/novell.md
new file mode 100644
index 0000000..b70b923
--- /dev/null
+++ b/content/events/2004/novell.md
@@ -0,0 +1,26 @@
+---
+title: Novell Linux Desktop demonstration session
+date: 2004-10-12T19:30:00+08:00
+presenters:
+  - Aaron Le Saux
+aliases:
+  - /events/seminar/2004-10/
+---
+
+aCure will be showing a demonstration of the new Novell Linux
+Desktop<!--more-->, including:
+
+-   YaST2 Administration Console
+-   Evolution 2 with the Open Source Exchange connector
+-   OpenOffice 1.1.3 Novell Edition, including enhancements from Ximian
+    Desktop
+
+They will also be showing terminal services capabilities through the
+LTSP 4.1 (Linux Terminal Server Project) for LAN connections and
+Technology from NoMachine NX version 1.4 snapshot release 6 for
+Modem/ADSL Internet connections. aCure have just been approved as
+NoMachine NX first partner in Australia and plan to demonstrate the
+effectiveness of this technology as opposed to costly Microsoft and
+Citrix licensing alternatives.
+
+<!-- **Where:** Central TAFE Lecture Theatre, Perth -->
diff --git a/content/events/2004/postgresql/index.md b/content/events/2004/postgresql/index.md
new file mode 100644
index 0000000..c15ba1b
--- /dev/null
+++ b/content/events/2004/postgresql/index.md
@@ -0,0 +1,22 @@
+---
+title: Cool Things You Should and Shouldn't Do With PostgreSQL
+date: 2004-03-09T19:30:00+08:00
+presenters:
+  - Bernard Blackham
+aliases:
+  - /events/seminar/2004-03/
+---
+
+PostgreSQL is a relational database that has evolved over the past 25
+years or more. As a database that is packed with features, there are
+many which are often overlooked and to people writing applications
+based around databases, some can prove infinitely useful.  This talk
+will be a short introduction to some of the advanced features of
+PostgreSQL, and how they can make life much easier when working with
+databases.
+
+<!--more-->
+
+<!-- **Where:** Central TAFE Lecture Theatre, Perth -->
+
+**Slides:** Slides from this talk [can be viewed on-line](postgresql.pdf).
diff --git a/content/events/2004/postgresql/postgresql.pdf b/content/events/2004/postgresql/postgresql.pdf
new file mode 100644
index 0000000..9a3a097
Binary files /dev/null and b/content/events/2004/postgresql/postgresql.pdf differ
diff --git a/content/events/2004/reportlab/index.md b/content/events/2004/reportlab/index.md
new file mode 100644
index 0000000..c61bd8c
--- /dev/null
+++ b/content/events/2004/reportlab/index.md
@@ -0,0 +1,45 @@
+---
+title: Generating quality PDF reports using Python and ReportLab
+date: 2004-05-11T19:30:00+08:00
+presenters:
+  - Craig Ringer
+aliases:
+  - /events/seminar/2004-05/
+---
+
+This talk will cover the use of ReportLab with Python and the database
+of your choice to generate well-presented PDFs and printed reports. A
+method for dynamically generating PDFs for web use, cgi-script style,
+will also be covered.
+
+<!--more-->
+
+Basic knowledge of Python will be helpful, but not required.
+
+<!-- **Where:** Central TAFE Lecture Theatre, Perth -->
+
+**Slides and Extras from Craig:**
+
+You'll probably want the [full
+presentation](plug_rl_presentation.tar.bz2), including all
+the examples and the source code to the presentation.
+
+Alternately, you can download [just the
+PDF](plug_rl_presentation.pdf).
+
+**Extra software:**
+
+For your convenience, here's a list of links to the home pages of the
+software you\'re likely to need.
+
+-   [Python](https://www.python.org/). You'll want to use at least
+    Python 2.2, preferably Python 2.3.
+-   You'll obviously be wanting [ReportLab](https://www.reportlab.com/).
+-   [PyPgSQL](https://pypgsql.sourceforge.net/) is likely to be useful
+    if you\'ll be talking to a database, though you have plenty of
+    [choice](https://www.python.org/topics/database/) when it comes to
+    databases and interface modules.
+-   ReportLab works best with the [Python Imaging
+    Library](https://www.pythonware.com/products/pil/) installed.
+-   [Psyco](https://psyco.sourceforge.net/) is a handy JIT compiler
+    for Python.
diff --git a/content/events/2004/reportlab/plug_rl_presentation.pdf b/content/events/2004/reportlab/plug_rl_presentation.pdf
new file mode 100644
index 0000000..760f593
Binary files /dev/null and b/content/events/2004/reportlab/plug_rl_presentation.pdf differ
diff --git a/content/events/2004/reportlab/plug_rl_presentation.tar.bz2 b/content/events/2004/reportlab/plug_rl_presentation.tar.bz2
new file mode 100644
index 0000000..bebc30c
Binary files /dev/null and b/content/events/2004/reportlab/plug_rl_presentation.tar.bz2 differ
diff --git a/content/events/2004/ruby-sdl.md b/content/events/2004/ruby-sdl.md
new file mode 100644
index 0000000..380027a
--- /dev/null
+++ b/content/events/2004/ruby-sdl.md
@@ -0,0 +1,27 @@
+---
+title: Playing with Ruby-SDL
+date: 2004-06-08T19:30:00+08:00
+presenters:
+  - Leon Brooks
+aliases:
+  - /events/seminar/2004-06/
+---
+
+Have you ever wondered what it takes to write a computer game? Have you
+ever wondered how object oriented languages work? Have you ever wanted
+to be Horatius Cocles at the Sublician Bridge, the sole hero that
+"everybody" turns to for their survival?
+
+<!--more-->
+
+Your every need (in these respects, at least) can be satisfied if you
+trot along to this seminar at Central TAFE to hear Leon Brooks,
+principle of CyberKnights, show you what went into Cruiser Tech, a
+ruby-SDL game soon to appear in an Australian magazine near you.
+
+See Open Source tools in action! See environmental responsibility at
+work! Hear really bad sound effects! Add range to your definition of the
+phrase "ad hoc"! Join our capable peanut gallery, and take home enough
+understanding to build one of your own.
+
+<!-- **Where:** Central TAFE Lecture Theatre, Perth -->
diff --git a/content/events/2004/shell-scripting/examples.tar.gz b/content/events/2004/shell-scripting/examples.tar.gz
new file mode 100644
index 0000000..d429a1b
Binary files /dev/null and b/content/events/2004/shell-scripting/examples.tar.gz differ
diff --git a/content/events/2004/shell-scripting/index.md b/content/events/2004/shell-scripting/index.md
new file mode 100644
index 0000000..3a9fad4
--- /dev/null
+++ b/content/events/2004/shell-scripting/index.md
@@ -0,0 +1,41 @@
+---
+title: "Shell scripting: why, how, and what not to do"
+date: 2004-09-14T19:30:00+08:00
+presenters:
+  - Cameron Patrick
+aliases:
+  - /events/seminar/2004-09/
+---
+
+This talk will be a short introduction to shell scripting, followed by
+some examples from real shell scripts illustrating how the concepts fit
+together. Some basic programming knowledge and a moderate understanding
+of Linux command-line usage will be assumed.
+
+<!--more-->
+
+<!-- **Where:** Central TAFE Lecture Theatre, Perth -->
+
+**Slides and examples:** Slides from this talk are available in [PDF
+format \[60kb\]](slides.pdf). A tar.gz file containing [the example
+scripts \[13kb\]](examples.tar.gz) is also available.
+
+Craig Ringer comments:
+
+    > A couple of quick suggestions/ideas:
+    >
+    > It might be an idea to mention that you're covering berkley-compatible
+    > scripting, and there is another flavour (csh/tcsh/ksh) out there.
+    >
+    > It might also be worth mentioning that arguments can be passed on the
+    > hashbang line, eg:
+    > #!/bin/bash -eu
+    >
+    > Finally, I think 'bash -u' / 'set -u' deserves special mention, as it's
+    > perhaps the single most important thing to make bash scripting less evil
+    > and help the script writer retain their sanity. What crack-head thought
+    > "Well, if the variable is invalid let's just substitute an empty string"
+    > anyway? *grumble*
+    >
+    > I'd personally put 'See: autotools" in the section about reading other
+    > people's code as a BRILLIANT example of a "don't" but that's just me :-P
diff --git a/content/events/2004/shell-scripting/slides.pdf b/content/events/2004/shell-scripting/slides.pdf
new file mode 100644
index 0000000..a6554c6
Binary files /dev/null and b/content/events/2004/shell-scripting/slides.pdf differ
diff --git a/content/events/2004/splinters/index.md b/content/events/2004/splinters/index.md
new file mode 100644
index 0000000..effdac4
--- /dev/null
+++ b/content/events/2004/splinters/index.md
@@ -0,0 +1,15 @@
+---
+title: "Splinters of a Fragmented Mind: Law, Cross-Platform Development, LDAP and Doctor Who"
+date: 2004-11-09T19:30:00+08:00
+presenters:
+  - Jeremy Malcolm
+aliases:
+  - /events/seminar/2004-11/
+---
+
+<!--more-->
+
+<!-- **Where:** Central TAFE Lecture Theatre, Perth -->
+
+**Slides:** Slides from this talk are also available in [PDF format
+\[149K\]](splinters.pdf).
diff --git a/content/events/2004/splinters/splinters.pdf b/content/events/2004/splinters/splinters.pdf
new file mode 100644
index 0000000..42c93e4
Binary files /dev/null and b/content/events/2004/splinters/splinters.pdf differ
diff --git a/content/events/2005.md b/content/events/2005.md
deleted file mode 100644
index be5f310..0000000
--- a/content/events/2005.md
+++ /dev/null
@@ -1,33 +0,0 @@
----
-title: Events Archive 2005
----
-
-### **March 2005**
-Davyd Madeley with The Clubber's Guide to Rapid Application Development with GNOME and Python and Cameron Patrick with Software Archery: hitting the bull's-eye with GNU Arch revision control.
-
-### **April 2005**
-Lightning Talks
-
-### **May 2005**
-Antics of linux.conf.au 2005
-
-### **June 2005**
-Russell Steicke on his winning LCA 2005 hackfest entry
-
-### **July 2005**
-Leon Brooks with a talk mysteriously entitled The Crimson Panacea
-
-### **August 2005**
-Phil Twiss on Open Source WA and Harry McNally on Computer Angels
-
-### **September 2005**
-Alex Dawson on Network management and automation using open source tools
-
-### **October 2005**
-Davyd Madeley on The Ministry of Source: Ubuncool and John Knight with a KDE 3.5 Sneak Preview
-
-### **November 2005**
-Adrian Woodley with Everything you ever wanted to know about VoIP, SIP and Asterisk, but didn't know who to phone
-
-### **December 2005**
-Ian Kent with Autofs, the Linux automounter
diff --git a/content/events/2005/_index.md b/content/events/2005/_index.md
new file mode 100644
index 0000000..b88bd5e
--- /dev/null
+++ b/content/events/2005/_index.md
@@ -0,0 +1,4 @@
+---
+title: 2005 Events
+---
+
diff --git a/content/events/2005/arch/arch-talk.pdf b/content/events/2005/arch/arch-talk.pdf
new file mode 100644
index 0000000..0a3c1ad
Binary files /dev/null and b/content/events/2005/arch/arch-talk.pdf differ
diff --git a/content/events/2005/arch/index.md b/content/events/2005/arch/index.md
new file mode 100644
index 0000000..03de140
--- /dev/null
+++ b/content/events/2005/arch/index.md
@@ -0,0 +1,23 @@
+---
+title: "Software Archery: hitting the bull's-eye with GNU Arch revision control"
+date: 2005-03-15T20:00:00+08:00
+presenters:
+  - Cameron Patrick
+---
+
+This talk will briefly describe the problem of revision control, and
+explain some of the trade-offs in designing a trivial revision control
+system and how just a few simple ideas can be combined to produce
+something remarkably close to [GNU
+Arch](https://www.gnu.org/software/gnu-arch/).
+
+<!--more-->
+
+After this, I'll describe some of the concerns in using Arch in
+practice. A final section of the talk will mention other contenders in
+the revision control world and the situations in which you might want
+to use them instead.
+
+**Slides:** [PDF format \[110 kb\]](arch-talk.pdf)
+
+<!-- **Where:** Highgate Primary School -->
diff --git a/content/events/2005/asterisk.md b/content/events/2005/asterisk.md
new file mode 100644
index 0000000..f02399e
--- /dev/null
+++ b/content/events/2005/asterisk.md
@@ -0,0 +1,40 @@
+---
+title: "Everything you ever wanted to know about VoIP, SIP and Asterisk, but didn't know who to phone"
+date: 2005-11-08T19:30:00+08:00
+presenters:
+  - Adrian Woodley
+aliases:
+  - /events/seminar/2005-11/
+---
+
+Voice over IP has been around for several years but has only recently
+reached a level suitable to replace traditional analogue phone systems.
+Several standards have been produced for delivering VoIP. The current
+standard for most VoIP systems is SIP. Like most other technologies on
+the internet, Linux has its fair share of quality systems that provide
+services for VoIP. Most notable of these is the Asterisk Software PABX.
+
+<!--more-->
+
+This presentation will demonstrate the configuring of Asterisk and the
+basic workings of SIP.
+
+Adrian is a Network Engineer for Speek IP Phones, a VoIP Carrier.
+
+<!-- **Where:** Open Source WA Demo Centre, Tech Park -->
+
+An audio recording of the talk is available (1hr:40min, includes
+question and answer session at the end although questions may be hard to
+hear).
+
+-   [Speex format][speex] \[8kbit, 6.7MB\]. Playable in Totem or Xine
+    with appropriate codecs installed; see also
+    [https://www.speex.org/software/](https://www.speex.org/software/).
+-   [Ogg Vorbis format][vorbis] \[24kbit, 18.5MB\]. Playable in most
+    free software media applications; see also
+    [https://xiph.org/vorbis/](https://xiph.org/vorbis/).
+-   [MP3 format][mp3] \[32kbit, 27MB\].
+
+[speex]: https://web.archive.org/web/20080906105318/http://www.plug.org.au/talks/2005-11-Adrian-Woodley-VoIP.spx
+[vorbis]: https://web.archive.org/web/20080906105318/http://www.plug.org.au/talks/2005-11-Adrian-Woodley-VoIP.ogg
+[mp3]: https://web.archive.org/web/20080906105318/http://www.plug.org.au/talks/2005-11-Adrian-Woodley-VoIP.mp3
diff --git a/content/events/2005/autofs.md b/content/events/2005/autofs.md
new file mode 100644
index 0000000..3ac106e
--- /dev/null
+++ b/content/events/2005/autofs.md
@@ -0,0 +1,33 @@
+---
+title: Autofs, the Linux automounter
+date: 2005-12-13T19:30:00+08:00
+presenters:
+  - Ian Kent
+aliases:
+  - /events/seminar/2005-12/
+---
+
+Many large scale enterprise deployments include an automounter
+implementation. The automounter provides a mechanism for automatically
+mounting file systems upon access, and umounting them when they are no
+longer referenced. It turns out that the Linux automounter is not
+feature-complete. And there are cases where Linux is just plain
+incompatible with the implementations from other proprietary vendors.
+
+<!--more-->
+
+This presentation looks at the common problems in large-scale Linux
+autofs deployments, and offers solutions to these problems.
+
+<!-- **Where:** Meeting Room 2, Collins Street Centre (cnr Collins Street and
+Shaftesbury Street, South Perth) -->
+
+An audio recording of the talk is available (1hr:20min).
+
+-   [Ogg Vorbis format][vorbis] \[15kbit, 8.7MB\]. Playable in most
+    free software media applications; see also
+    [https://xiph.org/vorbis/](https://xiph.org/vorbis/).
+-   [MP3 format][mp3] \[18kbit, 10MB\].
+
+[vorbis]: https://web.archive.org/web/20080906105041/http://www.plug.org.au/talks/2005-12-Ian-Kent-autofs.ogg
+[mp3]: https://web.archive.org/web/20080906105041/http://www.plug.org.au/talks/2005-12-Ian-Kent-autofs.mp3
diff --git a/content/events/2005/computer-angels.md b/content/events/2005/computer-angels.md
new file mode 100644
index 0000000..85b49b9
--- /dev/null
+++ b/content/events/2005/computer-angels.md
@@ -0,0 +1,29 @@
+---
+title: Are you a Computer Angel?
+date: 2005-08-09T20:15:00+08:00
+presenters:
+  - Harry McNally
+---
+
+Harry McNally will be speaking about Computer Angels, another
+organisation devoted to spreading computer literacy, making good use
+of Linux:
+
+<!--more-->
+
+[Computer Angels][ca] started as [an email to the PLUG mailing
+list][mail] in late 1998. A lot has happened since then. This talk
+will not be technical but will focus on how we provide information and
+support to address the real digital divide which is a knowledge gap,
+not a hardware access problem. Okay, so we might ponder a few
+technical things too.
+
+A [transcript of Harry's talk][transcript] is available from the
+Computer Angels web site.
+
+[ca]: https://web.archive.org/web/20050717072514/http://computerangels.org.au/
+[mail]: https://lists.plug.org.au/pipermail/plug/1998-December/002167.html
+[transcript]: https://web.archive.org/web/20060819064323/http://computerangels.org.au/resources/plug2005.shtml
+
+<!-- **Where:** Open Source WA Centre, Tech Park -->
+
diff --git a/content/events/2005/crimson-panacea.md b/content/events/2005/crimson-panacea.md
new file mode 100644
index 0000000..6ea8b93
--- /dev/null
+++ b/content/events/2005/crimson-panacea.md
@@ -0,0 +1,18 @@
+---
+title: The Crimson Panacea
+date: 2005-07-12T19:30:00+08:00
+presenters:
+  - Leon Brooks
+aliases:
+  - /events/seminar/2005-07/
+---
+
+crimson, a.:
+>  having any of numerous bright or strong colors reminiscent of
+>  the color of blood or cherries or tomatoes or rubies
+
+panacea, n.:
+>  hypothetical remedy for all ills or diseases; once sought by the
+>  alchemists
+
+<!-- **Where:** Open Source WA Centre, Tech Park -->
diff --git a/content/events/2005/kde-3.5.md b/content/events/2005/kde-3.5.md
new file mode 100644
index 0000000..9095db1
--- /dev/null
+++ b/content/events/2005/kde-3.5.md
@@ -0,0 +1,15 @@
+---
+title: KDE 3.5 Sneak Preview
+date: 2005-10-11T20:30:00+08:00
+presenters:
+  - John Knight
+---
+
+We look at the first beta of KDE 3.5 and explore the cool features that
+in this release and some that have evolved along the way. PC plugged in,
+projector running, we show the desktop. Simple and nice, enjoy.
+
+<!--more-->
+
+<!-- **Where:** Open Source WA Demo Centre, Tech Park -->
+
diff --git a/content/events/2005/lca-hackfest.md b/content/events/2005/lca-hackfest.md
new file mode 100644
index 0000000..ef56287
--- /dev/null
+++ b/content/events/2005/lca-hackfest.md
@@ -0,0 +1,16 @@
+---
+title: How To Win An LCA Hackfest
+date: 2005-06-14T19:30:00+08:00
+presenters:
+  - Russell Steicke
+aliases:
+  - /events/seminar/2005-06/
+---
+
+Russell will talk about his entry in the LCA 2005 hackfest, how he was
+inspired by a previous speaker to program in python and pygtk, and the
+shiny Power Mac G5 that he won. You'll also see some pics from his
+ride across the continent and back to attend LCA in Canberra.
+
+<!-- **Where:** Highgate Primary School -->
+
diff --git a/content/events/2005/lca-recap.md b/content/events/2005/lca-recap.md
new file mode 100644
index 0000000..50c4384
--- /dev/null
+++ b/content/events/2005/lca-recap.md
@@ -0,0 +1,14 @@
+---
+title: Antics of linux.conf.au 2005
+date: 2005-05-10T19:30:00+08:00
+aliases:
+  - /events/seminar/2005-05/
+---
+
+If you couldn\'t make this year's linux.conf.au yourself, you can hear
+all about what you missed out on - the best bits squeezed into 90
+minutes of pure LCA recitals. If there were any topics on the [LCA
+program](https://web.archive.org/web/20050312055050/http://linux.conf.au/program.php)
+that you wished you could attend, come along and hear the essentials.
+
+<!-- **Where:** Highgate Primary School -->
diff --git a/content/events/2005/lightning-talks.md b/content/events/2005/lightning-talks.md
new file mode 100644
index 0000000..0707ca4
--- /dev/null
+++ b/content/events/2005/lightning-talks.md
@@ -0,0 +1,14 @@
+---
+title: Lightning Talks
+date: 2005-04-12T19:30:00+08:00
+aliases:
+  - /events/seminar/2005-04/
+---
+<!-- **Where:** Highgate Primary School -->
+
+This month we're going to have a shot at lightning talks. See [this
+post to the mailing
+list](https://lists.plug.org.au/pipermail/plug/2005-March/062400.html)
+for details. If you'd like to present a talk this month, please send
+mail to [committee@plug.org.au](mailto:committee@plug.org.au) or the
+[mailing list](/resources/mailing-list.md).
diff --git a/content/events/2005/network-management.md b/content/events/2005/network-management.md
new file mode 100644
index 0000000..30ae739
--- /dev/null
+++ b/content/events/2005/network-management.md
@@ -0,0 +1,22 @@
+---
+title: Network management and automation using open source tools
+date: 2005-09-20T19:30:00+08:00
+presenters:
+  - Alex Dawson
+aliases:
+  - /events/seminar/2005-09/
+---
+
+This presentation will be giving an overview of using Open source
+tools running on Linux systems to effectively manage networks and
+automate network admission control mechanisms. Some tools will be
+Cisco specific, while others are applicable to all modern managed
+switches and routers.
+
+<!--more-->
+
+Alex Dawson is an IT Security Officer for The University of WA, and
+has previously worked in other IT capacities for the University.
+
+<!-- **Where:** Open Source WA Centre, Tech Park -->
+
diff --git a/content/events/2005/oswa.md b/content/events/2005/oswa.md
new file mode 100644
index 0000000..fe92f84
--- /dev/null
+++ b/content/events/2005/oswa.md
@@ -0,0 +1,21 @@
+---
+title: Open Source WA
+date: 2005-08-09T19:30:00+08:00
+presenters:
+  - Phil Twiss
+aliases:
+  - /events/seminar/2005-08/
+---
+
+Phil will be speaking about the Open Source Centre WA<!--more-->, in
+particular:
+
+-   What is OpenSource WA, and why the WA government is involved in
+    this.
+-   Progress of similar activities in other states and around the world.
+-   Linkages and networks (the human kind, not the computer kind).
+-   The OS Demonstration Centre and how members of PLUG can make use of
+    the facilities.
+-   What now? Future plans and activities for OpenSource WA.
+
+<!-- **Where:** Open Source WA Centre, Tech Park -->
diff --git a/content/events/2005/pygtk/gnome+python.pdf b/content/events/2005/pygtk/gnome+python.pdf
new file mode 100644
index 0000000..f167c11
Binary files /dev/null and b/content/events/2005/pygtk/gnome+python.pdf differ
diff --git a/content/events/2005/pygtk/index.md b/content/events/2005/pygtk/index.md
new file mode 100644
index 0000000..e3ba1f4
--- /dev/null
+++ b/content/events/2005/pygtk/index.md
@@ -0,0 +1,22 @@
+---
+title: "The Clubber's Guide to Rapid Application Development with GNOME and Python"
+date: 2005-03-15T19:00:00+08:00
+presenters:
+  - Davyd Madeley
+aliases:
+  - /events/seminar/2005-03/
+---
+
+Davyd Madeley, GNOME Hacker, Perthite and Gentleman Spy Extraordinare
+introduces people to the steamy underground world of rapid application
+development with Python and the PyGTK toolkit. This talk aims to be
+very accessible to everyone, including those who don\'t even know or
+like Python. A must-see for everyone vaguely interested in programming
+with the best GUI toolkit available today!
+
+<!--more-->
+
+**Slides and examples:** [slides in PDF](gnome+python.pdf), and
+[examples tar.bz2 file](pygtk-presentation.tar.bz2) \[241 kb\].
+
+<!-- **Where:** Highgate Primary School -->
diff --git a/content/events/2005/pygtk/pygtk-presentation.tar.bz2 b/content/events/2005/pygtk/pygtk-presentation.tar.bz2
new file mode 100644
index 0000000..a62f3df
Binary files /dev/null and b/content/events/2005/pygtk/pygtk-presentation.tar.bz2 differ
diff --git a/content/events/2005/ubuncool/index.md b/content/events/2005/ubuncool/index.md
new file mode 100644
index 0000000..5170a86
--- /dev/null
+++ b/content/events/2005/ubuncool/index.md
@@ -0,0 +1,17 @@
+---
+title: "The Ministry of Source: Ubuncool"
+date: 2005-10-11T19:30:00+08:00
+presenters:
+  - Davyd Madeley
+aliases:
+  - /events/seminar/2005-10/
+---
+A look and short tour of the exciting worlds of GNOME 2.12 and the
+Ubuntu release codenamed Breezy Badger. GNOME Developer Davyd Madeley
+will demonstrate some of the new (and existing) features that make
+Ubuntu and GNOME so exciting for users, developers, business and
+software vendors around the world.
+
+Slides are available in [PDF format \[1.0MB\]](ubuncool.pdf).
+
+<!-- **Where:** Open Source WA Demo Centre, Tech Park -->
diff --git a/content/events/2005/ubuncool/ubuncool.pdf b/content/events/2005/ubuncool/ubuncool.pdf
new file mode 100644
index 0000000..f4a0b63
Binary files /dev/null and b/content/events/2005/ubuncool/ubuncool.pdf differ
diff --git a/content/events/2006.md b/content/events/2006.md
deleted file mode 100644
index 3611dc6..0000000
--- a/content/events/2006.md
+++ /dev/null
@@ -1,15 +0,0 @@
----
-title: Events Archive 2006
----
-
-### **January 2006** 
-Stuart Midgley with Linux on supercomputers & tour of IVEC facilities.
-
-### **February 2006**
-Linux.conf.au 2006 reminiscing.
-
-### **August 2006**
-Adrian Woodley on Virtual E-mail Hosting
-
-### **September 2006**
-Adrian Chadd on Serving a gigabit of web traffic for fun and profit
diff --git a/content/events/2006/_index.md b/content/events/2006/_index.md
new file mode 100644
index 0000000..14c7ac5
--- /dev/null
+++ b/content/events/2006/_index.md
@@ -0,0 +1,3 @@
+---
+title: 2006 Events
+---
diff --git a/content/events/2006/email-hosting.md b/content/events/2006/email-hosting.md
new file mode 100644
index 0000000..5a6aacb
--- /dev/null
+++ b/content/events/2006/email-hosting.md
@@ -0,0 +1,15 @@
+---
+title: Virtual E-mail Hosting
+date: 2006-08-15T19:30:00+08:00
+presenters:
+  - Adrian Woodley
+aliases:
+  - /events/seminar/2006-08/
+---
+
+Adrian spoke to us about his experience at an ISP hosting e-mails for
+many domains on a single machine. There was a live demo including a
+working SMTP, IMAP and web-mail system. No slides or recordings are
+available.
+
+<!-- **Where:** Open Source WA meeting room, Tech Park -->
diff --git a/content/events/2006/gigabit.md b/content/events/2006/gigabit.md
new file mode 100644
index 0000000..c49481c
--- /dev/null
+++ b/content/events/2006/gigabit.md
@@ -0,0 +1,15 @@
+---
+title: Pushing a gigabit of web traffic from a single machine
+date: 2006-09-12T19:30:00+08:00
+presenters:
+  - Adrian Chadd
+aliases:
+  - /events/seminar/2006-09/
+---
+
+This month seminar will be presented by another Adrian with experience
+in the ISP industry. Adrian Chadd is a FreeBSD and Squid developer who
+has recently been working on improving web cache performance. He intends
+to have a speccy live demo to show off what can be done.
+
+<!-- **Where:** Open Source WA meeting room, Tech Park -->
diff --git a/content/events/2006/ivec/PLUG.pdf b/content/events/2006/ivec/PLUG.pdf
new file mode 100644
index 0000000..04b3d04
Binary files /dev/null and b/content/events/2006/ivec/PLUG.pdf differ
diff --git a/content/events/2006/ivec/index.md b/content/events/2006/ivec/index.md
new file mode 100644
index 0000000..919a3fd
--- /dev/null
+++ b/content/events/2006/ivec/index.md
@@ -0,0 +1,28 @@
+---
+title: Linux on supercomputers & tour of IVEC facilities
+date: 2006-01-17T19:30:00+08:00
+presenters:
+  - Stuart Midgley
+aliases:
+  - /events/seminar/2006-01/
+---
+
+Stuart will be talking about the new 160-cpu SGI Altix at IVEC, how
+Linux is different on this system, and what IVEC does generally. The
+talk will be followed by a tour of the facility.
+
+<!--more-->
+
+<!-- **Where:** Open Source WA Demo Centre, Tech Park -->
+
+An audio recording of the talk is available (52mins).
+
+-   [Ogg Vorbis format][vorbis] \[40kbit, 14MB\]. Playable in most
+    free software media applications; see also
+    [https://xiph.org/vorbis/](https://xiph.org/vorbis/).
+-   [MP3 format][mp3] \[64kbit, 24MB\].
+
+[vorbis]: https://web.archive.org/web/20080906111105/http://plug.org.au/talks/2006-01-Stuart-Midgley-iVEC.ogg
+[mp3]: https://web.archive.org/web/20080906111105/http://plug.org.au/talks/2006-01-Stuart-Midgley-iVEC.mp3
+
+Stuart's slides are [available in PDF format \[850kb\]](PLUG.pdf).
diff --git a/content/events/2006/lca-recap.md b/content/events/2006/lca-recap.md
new file mode 100644
index 0000000..a94838e
--- /dev/null
+++ b/content/events/2006/lca-recap.md
@@ -0,0 +1,15 @@
+---
+title: Linux.conf.au 2006 reminiscing
+date: 2006-02-21T19:30:00+08:00
+aliases:
+  - /events/seminar/2006-02/
+---
+
+A few of those PLUGgers who were fortunate enough to attend
+[linux.conf.au
+2006](https://web.archive.org/web/20060202020342/http://lca2006.linux.org.au/)
+in Dunedin will re-tell the highlights of their time in New Zealand. If
+you missed out going to the conference, come to this session and hear
+first-hand accounts of how you could have been spending your January!
+
+<!-- **Where:** Open Source WA Demo Centre, Tech Park -->
diff --git a/content/events/2007.md b/content/events/2007.md
deleted file mode 100644
index aa08582..0000000
--- a/content/events/2007.md
+++ /dev/null
@@ -1,24 +0,0 @@
----
-title: Events Archive 2007
----
-
-### **March 2007**
-Phil Schwan on Deconstructing Lustre
-
-### **May 2007**
-Ian Kent on Autofs in the Linux Kernel
-
-### **August 2007**
-Adrian Chadd on Xen and Virtualisation
-
-### **September 2007**
-Patrick Coleman on Command Line Fu and Cameron Patrick on Map The Planet
-
-### **October 2007**
-Adrian Woodley on Network Monitoring, and Daniel Axtens on Simple Ubuntu Tips and Tricks
-
-### **November 2007**
-Paul Antoine on UNIX in Australia
-
-### **December 2007**
-Davyd Madeley on Awesome Tools for Document Authoring
diff --git a/content/events/2007/_index.md b/content/events/2007/_index.md
new file mode 100644
index 0000000..e489ac4
--- /dev/null
+++ b/content/events/2007/_index.md
@@ -0,0 +1,3 @@
+---
+title: 2007 Events
+---
diff --git a/content/events/2007/autofs.md b/content/events/2007/autofs.md
new file mode 100644
index 0000000..0712198
--- /dev/null
+++ b/content/events/2007/autofs.md
@@ -0,0 +1,43 @@
+---
+title: Autofs in the Linux Kernel
+date: 2007-05-15T19:30:00+08:00
+presenters:
+  - Ian Kent
+aliases:
+  - /events/seminar/2007-05/
+---
+
+Many large scale enterprise deployments include an automounter
+implementation. The automounter provides a mechanism for automatically
+mounting file systems upon access, and umounting them when they are no
+longer referenced. It turns out that the Linux automounter is not
+feature-complete, and there are cases where Linux is just plain
+incompatible with the implementations from other proprietary vendors.
+
+<!--more-->
+
+This presentation looks at the common problems in large-scale Linux
+autofs deployments, and offers solutions to these problems. It is the
+same presentation given about a year ago but will focus on the
+development progress of the new features in autofs version 5 described
+in the presentation.
+
+<!-- **Where:**
+\'[Futuresphere](https://web.archive.org/web/20080906110825/http://www.futuresphere.com.au/)\',
+Christ Church Grammar School, Queenslea Drive, Claremont -->
+
+#### Getting There
+
+This month's seminar is being held in the 'Futuresphere', Christ
+Church Grammar School, located at:
+
+**Christ Church Grammar School\
+Queenslea Drive\
+Claremont WA\
+**
+
+To get to Queenslea Drive from the Freeway, jump off at Mounts Bay Road
+then take Stirling Hwy to Claremont (about 10 minutes past UWA). Having
+gone through Claremont, you\'ll see a stone church to the left; turn
+immediately left at the next set of lights (Queenslea Drive), and the
+school will be directly on your right.
diff --git a/content/events/2007/doc-authoring.md b/content/events/2007/doc-authoring.md
new file mode 100644
index 0000000..e5d4a33
--- /dev/null
+++ b/content/events/2007/doc-authoring.md
@@ -0,0 +1,26 @@
+---
+title: Awesome Tools for Document Authoring
+date: 2007-12-11T19:30:00+08:00
+presenters:
+  - Davyd Madeley
+aliases:
+  - /events/seminar/2007-12/
+---
+
+Libre software provides a suite of excellent tools that really interact
+well together for creating top quality professional documents. Davyd
+Madeley will take the time to demonstrate some of these authoring tools,
+plus some awesome tools for information management.
+
+<!--more-->
+
+Davyd Madeley is an electronic engineer and computer scientist who
+graduated from the University of Western Australia. He works for Fugro
+Seismic Imaging as a GTK+ programmer. He is actively involved in the
+GNOME project and has previously been the GNOME-Applets maintainer. He
+plays the tenor saxophone.
+
+<!--**Where:**
+\'[Futuresphere](https://web.archive.org/web/20080906105901/http://www.futuresphere.com.au/)\',
+Christ Church Grammar School, Queenslea Drive, Claremont -->
+
diff --git a/content/events/2007/lustre.md b/content/events/2007/lustre.md
new file mode 100644
index 0000000..def354b
--- /dev/null
+++ b/content/events/2007/lustre.md
@@ -0,0 +1,59 @@
+---
+title: Deconstructing Lustre
+date: 2007-03-27T19:30:00+08:00
+presenters:
+  - Phil Schwan
+aliases:
+  - /events/seminar/2007-03/
+---
+
+The Lustre cluster file system provides a POSIX-compliant file system
+API for clusters of almost any size.<!--more--> It's designed to scale
+along all axes: given sufficient hardware, it can offer gigabytes-per-
+second access to multi-petabyte storage arrays. Most of the world's
+largest supercomputers use Lustre to access their storage, including
+the largest clusters in North America, Europe, and Asia.
+
+This makes Lustre relatively unique, not just by file system standards,
+but also in what it requires from its operating system environment.
+
+In this hour we'll tour the highlights of Lustre's design, including:
+
+-   how Lustre differs from most other cluster file systems
+-   locking and concurrency
+-   a challenging recovery problem or two
+-   Linux kernel integration and associated nightmares
+
+Refreshments will be provided after the seminar, thanks to
+[iVEC](https://web.archive.org/web/20080906110550/http://www.ivec.org/).
+
+<!-- **Where:** ARRC Auditorium, Tech Park -->
+
+#### About Phil
+
+Phil is a visiting iVEC Industry & Government Fellow, consulting in the
+areas of open source business, software engineering process, and storage
+for high-performance computing.
+
+He's been actively involved in open source and open development since
+1992, contributing to a variety of technologies including enterprise
+desktop, Linux, privacy and security, network file systems, and consumer
+internet.
+
+He co-founded CFS, co-developed its award-winning open-source Lustre
+file system, and oversaw the company's first four profitable years as
+Chief Executive. Lustre is used on most of the world\'s largest Linux
+supercomputers, providing high-speed, POSIX-compliant storage for
+governments, universities, and Fortune 100 companies worldwide.
+
+At the Mozilla Corporation he directed an overhaul of localization for
+Firefox 2.0, shipping the web browser simultaneously in 23 languages for
+the first time. Approximately 20% of the world's internet population
+uses Firefox as their primary browser, including a growing proportion in
+languages other than English.
+
+Previously, Phil executed the open-source strategy for zero-knowledge
+systems, one of the most widely-discussed providers of privacy and
+security software and services. He also helped develop a toolkit for
+private electronic cash and one of the first commercial anonymous IP
+networks.
diff --git a/content/events/2007/october/index.md b/content/events/2007/october/index.md
new file mode 100644
index 0000000..553500d
--- /dev/null
+++ b/content/events/2007/october/index.md
@@ -0,0 +1,36 @@
+---
+title: '"System Monitoring - Knowing When to Duck" and "Simple Ubuntu Tips and Tricks"'
+date: 2007-10-09T19:30:00+08:00
+presenters:
+  - Adrian Woodley
+  - Daniel Axtens
+aliases:
+  - /events/seminar/2007-10/
+---
+
+It would be painfully obvious to anyone who\'s worked with computers
+that they are far from perfect. Failures are forever prevalent and often
+expensive. To mitigate the affects of these failures, monitoring is
+essential. Adrian Woodley will present a talk covering several
+monitoring packages available to \*nix systems, how they work and how to
+configure and use them; hopefully with a demonstration of each.
+
+Adrian Woodley has been a Linux user for the past 8 years, both
+professionally and as a hobby. He has worked on networks scaling from
+small home setups through to Australia's largest ADSL2+ network. Adrian
+currently works for iiNet as a Systems Engineer, and has 12 months
+experience working in iiNet's Network Operations Centre, monitoring the
+iiNet network. With this presentation, Adrian reaches the status of
+PLUG's most prevalent presenter!
+
+Daniel Axtens will talk about setting up Ubuntu to play MP3s, watch
+YouTube videos, play Flash games, and maybe a couple of other useful
+things to make your new Ubuntu system feel like home. Some points from
+the talk will be applicable to users of other GNU/Linux distros. This is
+a beginner-friendly talk.
+
+<!-- **Where:**
+\'[Futuresphere](https://web.archive.org/web/20080906105625/http://www.futuresphere.com.au/)\',
+Christ Church Grammar School, Queenslea Drive, Claremont -->
+
+Daniel's slides are available in [PDF format](plug-presentation.pdf).
diff --git a/content/events/2007/october/plug-presentation.pdf b/content/events/2007/october/plug-presentation.pdf
new file mode 100644
index 0000000..5a7f5b6
Binary files /dev/null and b/content/events/2007/october/plug-presentation.pdf differ
diff --git a/content/events/2007/september.md b/content/events/2007/september.md
new file mode 100644
index 0000000..62f70f4
--- /dev/null
+++ b/content/events/2007/september.md
@@ -0,0 +1,23 @@
+---
+title: '"Command Line Fu" and "Map The Planet"'
+date: 2007-09-11T19:30:00+08:00
+presenters:
+  - Patrick Coleman
+  - Cameron Patrick
+aliases:
+  - /events/seminar/2007-09/
+---
+
+Patrick will be presenting an introduction to using the Linux
+commandline - shells, shortcuts, common commands and whatever else he
+can think of on the night.
+
+Cameron will be talking about open geographical data, why you'd want
+it and how you can help the [Open Street
+Map](https://www.openstreetmap.org/) project to map the planet.
+
+<!--more-->
+
+<!--**Where:**
+\'[Futuresphere](https://web.archive.org/web/20080906105144/http://www.futuresphere.com.au/)\',
+Christ Church Grammar School, Queenslea Drive, Claremont -->
diff --git a/content/events/2007/unix.md b/content/events/2007/unix.md
new file mode 100644
index 0000000..01eea65
--- /dev/null
+++ b/content/events/2007/unix.md
@@ -0,0 +1,53 @@
+---
+title: UNIX in Australia
+date: 2007-11-13T19:30:00+08:00
+presenters:
+  - Paul Antoine
+aliases:
+  - /events/seminar/2007-11/
+---
+
+<!--more-->
+
+To blatantly plagiarise Paul:
+
+-   Australia was the first country outside the US to have Unix source
+    code
+-   Wollongong University was the first to port Unix to a non-DEC
+    architecture (Perkin-Elmer)
+-   A good deal of the work on a VM-enabled kernel was the result of
+    work at the University of NSW
+-   UNSW had the first *stable* VM-enabled kernel, where stable is
+    defined as running for 24 hours without crashing :-)
+-   University of Sydney developed the first Fair Share scheduler to
+    allow 100 staff and students to use a single VAX 11/780 (1MIP\...
+    yes ONE MIP)
+
+Paul will be talking on how these and other achievements came about, as
+well has his involvement in a number of Australian IT startups.
+
+Paul Antoine's professional career spans 23 years. He has more than 12
+years of Board-level experience both in Australia and the US and has
+been a lead investor in several startup companies.
+
+In 1993 Paul was appointed CEO of Softway (now Aurema), a systems
+software company specializing in enterprise resource management within
+operating systems, where he completed licensing of their Share II
+resource management product to companies such as Fujitsu, SGI,
+Siemens-Nixdorf, and Sun Microsystems. The Share II technology was the
+first successful commercialisation of software out of Sydney University,
+and the Sun Microsystems licensing deal the largest dollar value
+licensing of software in Australia's IT industry history.
+
+Softway's network security division quickly become a preferred supplier
+of network security systems and services to the Australian Federal
+Government and achieved \$1M in sales in the first year of its
+operation.
+
+Paul has also invested and participated in other IT startups, including
+Bullant Pty Ltd, 5th Finger Pty Ltd (Australia's first SMS marketing
+company) and BePrivate (anti-spam) in Australia and the US.
+
+<!--**Where:**
+\'[Futuresphere](https://web.archive.org/web/20080906110754/http://www.futuresphere.com.au/)\',
+Christ Church Grammar School, Queenslea Drive, Claremont -->
diff --git a/content/events/2007/xen.md b/content/events/2007/xen.md
new file mode 100644
index 0000000..6f4cb15
--- /dev/null
+++ b/content/events/2007/xen.md
@@ -0,0 +1,23 @@
+---
+title: Xen and virtualisation
+date: 2007-08-14T19:30:00+08:00
+presenters:
+  - Adrian Chadd
+aliases:
+  - /events/seminar/2007-08/
+---
+
+Adrian Chadd runs a web hosting business specialising in providing Xen
+virtual machines. He will be talking about his experiences in doing
+so, with the intention of making virtualisation seem less like black
+magic.  The talk will cover various virtualisation methods and
+techniques, as well as some particular implementations (VMWare, Java,
+Xen, Linux KVM, jails). Or as he puts it, "Adrian will rant a bit like
+he normally does, you might pick up something useful."
+
+<!--more-->
+
+<!--**Where:**
+\'[Futuresphere](https://web.archive.org/web/20080906110959/http://www.futuresphere.com.au/)\',
+Christ Church Grammar School, Queenslea Drive, Claremont -->
+
diff --git a/content/events/2008.md b/content/events/2008.md
deleted file mode 100644
index e175f84..0000000
--- a/content/events/2008.md
+++ /dev/null
@@ -1,35 +0,0 @@
----
-title: Events Archive 2008
----
-### **January 2008**
-Web Content Delivery, 2007 style, presented by Adrian Chadd
-
-### **February 2008**
-iSCSI: It's not a Mac, presented by Patrick Coleman
-
-### **March 2008**
-Linux Filesystem Internals, presented by Ian Kent
-
-### **April 2008**
-WPAD for chumps, presented by Adon Metcalfe
-
-### **May 2008**
-LDAP for Popular People and Sysadmins, presented by Ritchie Young
-
-### **June 2008**
-Making Emacs your bit^H^H^H preferred editor and IDE, presented by Alastair Irvine
-
-### **July 2008**
-User security on shared hosting and shell servers, presented by David Adam
-
-### **September 2008**
-All the wonders of LDAP revealed!!! (Eggs and all major vegetables accepted.), presented by Adrian Woodley
-
-### **October 2008**
-LTSP for fun and profit, presented by Adon Metcalfe
-
-### **November 2008**
-A look at Ubuntu Intrepid Ibex, Virt-Manager, KVM, VirtIO, FreeNAS and OpenArena, presented by Adrian Woodley
-
-### **December 2008**
-The Eeepc: tips and tricks, presented by John McCabe-Dansted
diff --git a/content/events/2008/_index.md b/content/events/2008/_index.md
new file mode 100644
index 0000000..de3fb9e
--- /dev/null
+++ b/content/events/2008/_index.md
@@ -0,0 +1,3 @@
+---
+title: 2008 Events
+---
diff --git a/content/events/2008/eeepc.md b/content/events/2008/eeepc.md
new file mode 100644
index 0000000..ebacca3
--- /dev/null
+++ b/content/events/2008/eeepc.md
@@ -0,0 +1,27 @@
+---
+title: "The Eeepc: tips and tricks"
+date: 2008-12-09T19:30:00+08:00
+presenters:
+  - John McCabe-Dansted
+---
+
+The Eeepc 701 is under a kilogram, and often under $300
+new. This makes it easy to have a full Linux pc with
+you where-ever you go. Despite the low weight and low
+cost the Xandros based OS is snappy for casual use.
+
+<!--more-->
+
+Having used the Eeepc my primary desktop for two weeks,
+the limited nature of the Eeepc's screen, memory, flash
+storage, CPU and supported software was clear. I discuss
+ways of mitigating these limitations, such as;
+
+- Increasing the virtual resolution of the screen.
+- Compressing the memory with the compcache module.
+- "Overclocking" the CPU (without actually overclocking)
+- Adding Etch repositories safely with APT-pinning.
+
+Adding additional hardware to the Eeepc will also be
+discussed. Borrowing a proper keyboard, monitor can make
+the Eeepc much nicer to work with when traveling.
diff --git a/content/events/2008/emacs.md b/content/events/2008/emacs.md
new file mode 100644
index 0000000..6196177
--- /dev/null
+++ b/content/events/2008/emacs.md
@@ -0,0 +1,49 @@
+---
+title: "Making Emacs your bit^H^H^H preferred editor and IDE"
+date: 2008-06-10T19:30:00+08:00
+presenters:
+  - Alastair Irvine
+aliases:
+  - /events/seminar/2008-06/
+---
+
+Emacs has a very long history of being one of the most full-featured
+text editors around. Not only that, but it has a whole galaxy of other
+features: everything from a Tetris clone to a Usenet news reader. It
+also goes hand-in-hand with Unix's tradition of supporting the
+programming process.
+
+This introductory talk assumes no prior Emacs experience.<!--more-->
+It will cover the following areas:-
+
+-   helpful mindsets for using Emacs
+-   highly-efficient text editing in Emacs
+-   The use of Emacs as an IDE
+-   the philosophy behind Emacs' construction
+
+Traditionally Emacs was terminal-based, but now there are two main
+"competing" branches from the original code, each offering different
+GUIs: [GNU Emacs](https://www.gnu.org/software/emacs/) and
+[XEmacs](https://www.xemacs.org/).  They have other differences too,
+including architectural and API aspects.
+
+That's right -- the plot thickens -- Emacs has an API. The
+*majority* of Emacs is actually written in LISP. This allows bits of
+Emacs to be easily overridden or extended. It also makes it relatively
+easy to add completely new features and editing modes.
+
+From a non-programmer's perspective, Emacs is also highly customisable,
+offering a very powerful menu-driven configuration interface. It really
+is the ultimate kitchen sink editor.
+
+<!-- **Where:**
+\'[Futuresphere](https://web.archive.org/web/20080906111032/http://www.futuresphere.com.au/)\',
+Christ Church Grammar School, Queenslea Drive, Claremont -->
+
+Alastair Irvine has worked as both a Software Engineer and a system
+administrator. His professional experience lies in the fields of Linux
+and Unix system administration, network and Internet domain management
+and operating system maintenance. Alastair is passionate about a wide
+variety of technologies including Python, Debian GNU/Linux, C++ and XML.
+He currently works with Warpspace IT, an IT consultancy firm, providing
+IT solutions based on open systems.
diff --git a/content/events/2008/iscsi.md b/content/events/2008/iscsi.md
new file mode 100644
index 0000000..1b53992
--- /dev/null
+++ b/content/events/2008/iscsi.md
@@ -0,0 +1,27 @@
+---
+title: "iSCSI: It's not a Mac"
+date: 2008-02-12T19:30:00+08:00
+presenters:
+  - Patrick Coleman
+aliases:
+  - /events/seminar/2008-02/
+---
+
+Patrick will be talking about iSCSI - a protocol for exporting storage
+devices over a standard ethernet network. iSCSI is gaining popularity as
+a cheap alternative to Fibre Channel for connecting storage area
+networks (SANs). The talk will discuss the principals of iSCSI, along
+with the pros and cons, and will include some experiences deploying
+iSCSI in a high-availability environment with (hopfully) a demo.
+
+<!--more-->
+
+Following the seminar, we will hold the PLUG 2008 AGM.
+
+Patrick Coleman works as a network engineer for Christ Church Grammar
+School, alongside running a web services company. He is currently the
+Vice-President of PLUG.
+
+<!-- **Where:**
+\'[Futuresphere](https://web.archive.org/web/20080906110209/http://www.futuresphere.com.au/)\',
+Christ Church Grammar School, Queenslea Drive, Claremont -->
diff --git a/content/events/2008/ldap-intro.md b/content/events/2008/ldap-intro.md
new file mode 100644
index 0000000..a6c5ead
--- /dev/null
+++ b/content/events/2008/ldap-intro.md
@@ -0,0 +1,31 @@
+---
+title: LDAP for Popular People and Sysadmins
+date: 2008-05-13T19:30:00+08:00
+presenters:
+  - Ritchie Young
+aliases:
+  - /events/seminar/2008-05/
+---
+
+LDAP is the standard protocol for storing and accessing identity
+information. OpenLDAP is a high-performance, hugely scalable
+implementation of this important standard that you can install on your
+(Linux based) server or laptop in about 3 minutes. Whether you need to
+provide access control for a large organisation or store the contact
+details for a couple of million close, personal friends, OpenLDAP can
+help.
+
+In this introductory talk, Ritchie will show you how to configure
+OpenLDAP on Linux and talk about where it fits with other identity
+management technologies.
+
+<!--more-->
+
+Ritchie is a developer and systems integrator. He is also the author
+of the [RubySync provisioning
+system](https://web.archive.org/web/20090323065525/http://rubysync.org/).
+
+<!-- **Where:**
+\'[Futuresphere](https://web.archive.org/web/20080906105246/http://www.futuresphere.com.au/)\',
+Christ Church Grammar School, Queenslea Drive, Claremont -->
+
diff --git a/content/events/2008/ldap-revealed.md b/content/events/2008/ldap-revealed.md
new file mode 100644
index 0000000..a7d6a8f
--- /dev/null
+++ b/content/events/2008/ldap-revealed.md
@@ -0,0 +1,34 @@
+---
+title: "All the wonders of LDAP revealed!!! (Eggs and all major vegetables accepted.)"
+date: 2008-09-09T19:30:00+08:00
+presenters:
+  - Adrian Woodley
+aliases:
+  - /events/seminar/2008-09/
+---
+
+In this presentation I hope to explain some of the fundamentals of LDAP,
+how it works and what if can be useful for. I will demonstrate setting
+up and LDAP server for a network, how to manage accounts within a LDAP
+directory and setting up client machines to authenticate against the
+LDAP server. With these basics, it is possible to have unified usernames
+and passwords across your whole network, including Linux login, email,
+web and Samba. And as a special treat (assuming all goes well over the
+weekend), I'll demonstrate my shiny new OpenSolaris server with ZFS and
+VirtualBox.
+
+<!--more-->
+
+Adrian is a Systems Engineer at iiNet. At iiNet he deals with the
+email network, ADSL network and security. Following this presentation,
+Adrian will regain his title of "Most Prolific PLUG Presenter", having
+previously presented "[Samba
+Networking](../2003/networking-part2.md)", "[Everything you ever
+wanted to know about VoIP, SIP and Asterisk, but didn\'t know who to
+phone](../2005/asterisk.md)", "[Virtual Email
+Hosting](../2006/email-hosting.md)" and "[Network
+Monitoring](../2007/october/index.md)".
+
+<!-- **Where:**
+\'[Futuresphere](https://web.archive.org/web/20081120040454/http://www.futuresphere.com.au/)\',
+Christ Church Grammar School, Queenslea Drive, Claremont -->
diff --git a/content/events/2008/linux-vfs.md b/content/events/2008/linux-vfs.md
new file mode 100644
index 0000000..60d4dcb
--- /dev/null
+++ b/content/events/2008/linux-vfs.md
@@ -0,0 +1,23 @@
+---
+title: "Linux Filesystem Internals"
+date: 2008-03-11T19:30:00+08:00
+presenters:
+  - Ian Kent
+aliases:
+  - /events/seminar/2008-03/
+---
+
+Linux is able to support many different file systems using the same
+method as other Unix variants by using a facility called the Virtual
+Filesystem Switch (VFS). The VFS provides a well defined interface to
+the kernel for those developing filesystem modules. This talk aims at
+describing, very briefly, the structures and methods provided by the VFS
+for filesystem implementers and will look more closely at a couple of
+these interface functions by describing how the kernel resolves a path
+to get a data structure needed for most functions in the VFS.
+
+<!--more-->
+
+<!-- **Where:**
+\'[Futuresphere](https://web.archive.org/web/20080906110343/http://www.futuresphere.com.au/)\',
+Christ Church Grammar School, Queenslea Drive, Claremont -->
diff --git a/content/events/2008/ltsp.md b/content/events/2008/ltsp.md
new file mode 100644
index 0000000..80e3b6d
--- /dev/null
+++ b/content/events/2008/ltsp.md
@@ -0,0 +1,6 @@
+---
+title: LTSP for fun and profit
+date: 2008-10-14T19:30:00+08:00
+presenters:
+  - Adon Metcalfe
+---
diff --git a/content/events/2008/november.md b/content/events/2008/november.md
new file mode 100644
index 0000000..c5a9dd5
--- /dev/null
+++ b/content/events/2008/november.md
@@ -0,0 +1,50 @@
+---
+title: "A look at Ubuntu Intrepid Ibex, Virt-Manager, KVM, VirtIO, FreeNAS and OpenArena"
+date: 2008-11-11T19:30:00+08:00
+presenters:
+  - Adrian Woodley
+---
+
+(Or "What Adrian's been playing with this week")
+
+<!--more-->
+
+As most of you will be aware, Intrepid Ibex, the newest update to
+Ubuntu, was released last week. Overall there are only minor
+improvements on Hardy Heron, Intrepid does come with some new versions
+of some interesting systems.
+
+One of these in particular is Virt-Manager. Virt-Manager is a GUI
+front end for several hypervisors. Currently it supports Xen, QEMU and
+KVM. While possibly not suitable for large scale or server
+environments, Virt-Manager does make playing with virtual machines
+incredibly easy. I'll be focusing on using Virt-Manager with KVM and
+VirtIO.
+
+Having the flexibility of a virtual environment to play in has allowed
+me to try out a heap of software, systems and distributions which
+otherwise would have been painful and time consuming. I intend to
+demonstrate a couple that I've come across in the past week, including
+FreeNAS and Nexenta.
+
+On an entirely different tack, I've been having a play with some games
+which are packaged and available in Ubuntu, namely Open Arena, Alien
+Arena and Tremulous. If all goes well, we should be able to have a
+play of these on the big-screen.
+
+Lastly, I'd like to hold a bit of a discussion on an idea I've been
+thinking about lately; Distributed Network Monitoring. I'll elaborate
+more on my idea during the presentation and will be looking for some
+feed back on its usefulness and viability.
+
+(It should be noted that I haven't actually prepared any of this, so
+don't expect slides or any in-depth knowledge on any of the above
+topics! Patrick only approached me on tuesday to fill in.)
+
+Adrian is a Systems Engineer at iiNet. At iiNet he deals with the
+email network, ADSL network and security. Adrian currently holds the
+title of "Most prolific PLUG presenter", having previously presented
+"All the wonders of LDAP revealed!!! (Eggs and all major vegetables
+accepted.)", "Samba Networking", "Everything you ever wanted to know
+about VoIP, SIP and Asterisk, but didn't know who to phone", "Virtual
+Email Hosting" and "Network Monitoring".
diff --git a/content/events/2008/shell-servers.md b/content/events/2008/shell-servers.md
new file mode 100644
index 0000000..9e29218
--- /dev/null
+++ b/content/events/2008/shell-servers.md
@@ -0,0 +1,32 @@
+---
+title: "User security on shared hosting and shell servers"
+date: 2008-07-08T19:30:00+08:00
+presenters:
+  - David Adam
+aliases:
+  - /events/seminar/2008-07/
+---
+
+With a computer on every desktop, we sometimes forget that most modern
+operating systems are designed for more than one user. This talk will
+take you through the things you need to keep in mind as a user of the
+most popular multiple-user systems - shared web hosting, and shell
+servers - such as the UNIX security model, keeping database credentials
+secure, and the dangers posed by web-administered CMSes.
+
+<!--more-->
+
+The principles discussed in this talk are aimed at novice and
+intermediate Linux users, including those who use Windows on their
+desktops but manage websites on UNIX hosts, or who use shell servers.
+Additionally, some tips will be presented for people who are just
+getting started with administering shared hosting.
+
+David Adam is a volunteer systems administrator for the University
+Computer Club, and pays the bills by running a Windows network. He
+enjoys good beer, (very) cheap wine, and spends most of his time as a
+medical student at UWA.
+
+<!-- **Where:**
+\'[Futuresphere](https://web.archive.org/web/20080906072304/http://www.futuresphere.com.au/)\',
+Christ Church Grammar School, Queenslea Drive, Claremont -->
diff --git a/content/events/2008/web-caching.md b/content/events/2008/web-caching.md
new file mode 100644
index 0000000..d341756
--- /dev/null
+++ b/content/events/2008/web-caching.md
@@ -0,0 +1,24 @@
+---
+title: "Web Content Delivery, 2007 style."
+date: 2008-01-08T19:30:00+08:00
+presenters:
+  - Adrian Chadd
+aliases:
+  - /events/seminar/2008-01/
+---
+
+Adrian will be talking about websites - how they work, get delivered to
+your machine and the challenges involved in caching them. He will also
+discuss some popular web applications, including Youtube and Google
+Maps, and present the challenges involved in caching these in a way that
+is transparent to the end user.
+
+<!--more-->
+
+Adrian Chadd runs a consulting and hosting business, specialising in
+Squid and Xen hosting. He also develops for Squid, the open-source HTTP
+caching proxy project.
+
+<!--**Where:**
+\'[Futuresphere](https://web.archive.org/web/20080906105728/http://www.futuresphere.com.au/)\',
+Christ Church Grammar School, Queenslea Drive, Claremont -->
diff --git a/content/events/2008/wpad.md b/content/events/2008/wpad.md
new file mode 100644
index 0000000..2662c78
--- /dev/null
+++ b/content/events/2008/wpad.md
@@ -0,0 +1,27 @@
+---
+title: WPAD for chumps
+date: 2008-04-08T19:30:00+08:00
+presenters:
+  - Adon Metcalfe
+aliases:
+  - /events/seminar/2008-04/
+---
+
+Adon will outline how to setup a proxy server that adheres to the Web
+Proxy Auto Discovery protocol (WPAD) with basic filtering & virus
+scanning (DansGuardian) and caching (Squid). He will also discuss the
+various technical difficulties involved in transparent proxying of HTTP
+and HTTPS connections. The talk will include a demo if time permits.
+
+<!--more-->
+
+Adon Metcalfe is vice-president of PLUG, and works at the Department of
+Environment and Conservation (Radio Communications Section). He is also
+doing Electrical Engineering & Computer Science at UWA. He is currently
+involved in deploying a satellite communications network for use by
+Western Australian emergency services.
+
+<!-- **Where:**
+\'[Futuresphere](https://web.archive.org/web/20080906105522/http://www.futuresphere.com.au/)\',
+Christ Church Grammar School, Queenslea Drive, Claremont -->
+
diff --git a/content/events/2012/astronomy.md b/content/events/2012/astronomy.md
index 7fdc848..ef5d2d9 100644
--- a/content/events/2012/astronomy.md
+++ b/content/events/2012/astronomy.md
@@ -1,6 +1,8 @@
 ---
-title: "October Talk: Python in Astronomy by Andrew Williams"
+title: "Python in Astronomy"
 date: 2012-10-09T18:00:00+08:00
+presenters:
+  - Andrew Williams
 ---
 
 Dr. Andrew Williams on Python use in astronomy, work with optical
diff --git a/content/events/2012/aws.md b/content/events/2012/aws.md
index 12c93ec..03c0793 100644
--- a/content/events/2012/aws.md
+++ b/content/events/2012/aws.md
@@ -1,6 +1,8 @@
 ---
-title: "December Talk: Amazon Web Services by James Bromberger"
+title: "Amazon Web Services"
 date: 2012-12-11T18:00:00+08:00
+presenters:
+  - James Bromberger
 ---
 
 Amazon Web Services Cloud recently launched in Sydney, Australia. Come
diff --git a/content/events/2012/bitcoin.md b/content/events/2012/bitcoin.md
index d88a418..fc569f9 100644
--- a/content/events/2012/bitcoin.md
+++ b/content/events/2012/bitcoin.md
@@ -1,6 +1,8 @@
 ---
-title: "September Talk: Bitcoin by Leo Treasure"
+title: "Bitcoin"
 date: 2012-09-11T18:00:00+08:00
+presenters:
+  - Leo Treasure
 ---
 
 Leo Treasure talks about Bitcoin
diff --git a/content/events/2012/linux-clusters.md b/content/events/2012/linux-clusters.md
index 91ea8a6..0706ac0 100644
--- a/content/events/2012/linux-clusters.md
+++ b/content/events/2012/linux-clusters.md
@@ -1,6 +1,8 @@
 ---
-title: "November Talk: Linux on Large Clusters by Stuart Midgley"
+title: "Linux on Large Clusters"
 date: 2012-11-13T18:00:00+08:00
+presenters:
+  - Stuart Midgley
 ---
 
 Stuart Midgley will be talking about his experiences and issues with
diff --git a/content/events/2013/ipv6.md b/content/events/2013/ipv6.md
index 95aaa64..27c7228 100644
--- a/content/events/2013/ipv6.md
+++ b/content/events/2013/ipv6.md
@@ -1,6 +1,8 @@
 ---
-title: "March Talk: IPV6"
+title: "IPV6"
 date: 2013-03-12T18:00:00+08:00
+presenters:
+  - Adrian Woodley
 ---
 
 Following the success of 2012's World IPv6 Launch, several popular
diff --git a/content/events/2013/mainframe.md b/content/events/2013/mainframe.md
index baa6e37..4800261 100644
--- a/content/events/2013/mainframe.md
+++ b/content/events/2013/mainframe.md
@@ -1,6 +1,8 @@
 ---
-title: "May Talk: Linux on IBM Mainframes"
+title: "Linux on IBM Mainframes"
 date: 2013-05-14T18:00:00+08:00
+presenters:
+  - Han Wen Kam
 ---
 
 For 8 months in 2007, I was part of a multi-national team working
diff --git a/content/events/2013/puppet.md b/content/events/2013/puppet.md
index 2cb9104..8636037 100644
--- a/content/events/2013/puppet.md
+++ b/content/events/2013/puppet.md
@@ -1,6 +1,8 @@
 ---
-title: "October Talk: Configuration Management using Puppet by Luke Williams"
+title: "Configuration Management using Puppet"
 date: 2013-10-08T18:00:00+08:00
+presenters:
+  - Luke Williams
 ---
 
 Luke Williams will be talking about automated system administration
diff --git a/content/events/2013/skynet.md b/content/events/2013/skynet.md
index e1b0412..4c962af 100644
--- a/content/events/2013/skynet.md
+++ b/content/events/2013/skynet.md
@@ -1,6 +1,8 @@
 ---
-title: "November Talk: SkyNet Pan-STARRS1 Optical Galaxy Survey project by Kevin Vinsen"
+title: "SkyNet Pan-STARRS1 Optical Galaxy Survey project"
 date: 2013-11-12T18:00:00+08:00
+presenters:
+  - Kevin Vinsen
 ---
 
 Kevin Vinsen will be giving a talk on SkyNet Pan-STARRS1 Optical
diff --git a/content/events/2013/student-cluster.md b/content/events/2013/student-cluster.md
index fc9d58c..5cb87a6 100644
--- a/content/events/2013/student-cluster.md
+++ b/content/events/2013/student-cluster.md
@@ -1,8 +1,17 @@
 ---
-title: "August Talk: 'Student Cluster Competition' at the ACM/IEEE Supercomputing Conference"
+title: "'Student Cluster Competition' at the ACM/IEEE Supercomputing Conference"
 date: 2013-08-13T18:00:00+08:00
 ---
 
+iVEC has a team entering the Student Cluster Competition at SC13 in
+the US later this year. This is the pre-eminent event in the High
+Performance Computing (HPC) world and it's great for Australia, and in
+particular Western Australia to be involved thanks to iVEC and their
+sponsors.
+
+The team gave a presentation at PLUG going through the ins and outs of
+super computing, the state of super compuing in WA, and information
+about the competition itself.
 <!--more-->
 
 {{< youtube "m4RywlIdhM8" >}}
diff --git a/content/events/2013/subversion.md b/content/events/2013/subversion.md
index 410981f..74346c5 100644
--- a/content/events/2013/subversion.md
+++ b/content/events/2013/subversion.md
@@ -1,6 +1,8 @@
 ---
-title: "July Talk: Intro into Subversion by Alastair Irvine"
+title: "Intro into Subversion"
 date: 2013-07-09T18:00:00+08:00
+presenters:
+  - Alastair Irvine
 ---
 
 Alastair Irvine believes in the right tool for the job. At this PLUG
diff --git a/content/events/2014/debian-ec2.md b/content/events/2014/debian-ec2.md
index 28e0551..0b4ebdc 100644
--- a/content/events/2014/debian-ec2.md
+++ b/content/events/2014/debian-ec2.md
@@ -1,4 +1,6 @@
 ---
-title: "November Talk: Debian AMIs on the Amazon EC2 cloud by James Bromberger"
+title: "Debian AMIs on the Amazon EC2 cloud"
 date: 2014-11-11T18:00:00+08:00
+presenters:
+  - James Bromberger
 ---
diff --git a/content/events/2014/exobrain.md b/content/events/2014/exobrain.md
index 91d8c2a..05bce1d 100644
--- a/content/events/2014/exobrain.md
+++ b/content/events/2014/exobrain.md
@@ -1,6 +1,8 @@
 ---
-title: "April Talk: Build Your Own Exobrain by Paul Fenwick"
+title: "Build Your Own Exobrain"
 date: 2014-04-30T18:00:00+08:00
+presenters:
+  - Paul Fenwick
 ---
 
 Online services like "If This Then That" (IFTTT) are great for
diff --git a/content/events/2014/free-software-politics.md b/content/events/2014/free-software-politics.md
index bcb2ac5..9a0e38d 100644
--- a/content/events/2014/free-software-politics.md
+++ b/content/events/2014/free-software-politics.md
@@ -1,6 +1,8 @@
 ---
-title: "October Talk: Free Software in Political Campaigning by Grahame Bowland"
+title: "Free Software in Political Campaigning"
 date: 2014-10-14T18:00:00+08:00
+presenters:
+  - Grahame Bowland
 ---
 
 
diff --git a/content/events/2014/ubuntu-phone.md b/content/events/2014/ubuntu-phone.md
index 369ded8..5e585ba 100644
--- a/content/events/2014/ubuntu-phone.md
+++ b/content/events/2014/ubuntu-phone.md
@@ -1,9 +1,12 @@
 ---
-title: "July Talk: Ubuntu Phone by James Henstridge"
+title: "Ubuntu Phone"
 date: 2014-07-08T18:00:00+08:00
+presenters:
+  - James Henstridge
 ---
 
 James talks about the Ubuntu Phone project.
+<!--more-->
 
 ## Presenter Bio
 
diff --git a/content/events/2015/castledare.md b/content/events/2015/castledare.md
index dff7c6a..0af9971 100644
--- a/content/events/2015/castledare.md
+++ b/content/events/2015/castledare.md
@@ -1,6 +1,8 @@
 ---
-title: "March Talk: Signals and Control @ Castledare Miniature Railways"
+title: "Signals and Control @ Castledare Miniature Railways"
 date: 2015-03-13T10:30:00+08:00
+presenters:
+ - Mike Crean
 ---
 
 Mike Crean has kindly invited us to visit Castledare Miniature
diff --git a/content/events/2015/crypto-party.md b/content/events/2015/crypto-party.md
index 9942156..cc4c773 100644
--- a/content/events/2015/crypto-party.md
+++ b/content/events/2015/crypto-party.md
@@ -1,9 +1,12 @@
 ---
-title: "June Talk: Crypto Party with Port80"
+title: "Crypto Party with Port80"
 date: 2015-06-03T18:00:00+08:00
+presenters:
+  - Luke John
 ---
 
 Crypto Party in conjunction with Port80 run by Luke John.
+<!--more-->
 
 There will be a few lighting talks and some discussion around things like:
 * Key Signing
diff --git a/content/events/2015/eventstreamr.md b/content/events/2015/eventstreamr.md
index acc9d0d..fb2b888 100644
--- a/content/events/2015/eventstreamr.md
+++ b/content/events/2015/eventstreamr.md
@@ -1,6 +1,8 @@
 ---
-title: "April Talk: EventStreamr by Leon Wright"
+title: "EventStreamr"
 date: 2015-04-13T18:00:00+08:00
+presenters:
+  - Leon Wright
 ---
 
 EventStreamr -- What is it, why does it exist and how can I help? This
diff --git a/content/events/2015/hpc.md b/content/events/2015/hpc.md
index 1d39461..b9978de 100644
--- a/content/events/2015/hpc.md
+++ b/content/events/2015/hpc.md
@@ -1,6 +1,8 @@
 ---
-title: "September Talk: High Performance Computing by Matthew Wallis"
+title: "High Performance Computing"
 date: 2015-09-08T18:00:00+08:00
+presenters:
+  - Matthew Wallis
 ---
 
 This month we are delighted to have Matthew Wallis from Direct Data
diff --git a/content/events/2015/open-data.md b/content/events/2015/open-data.md
index 9316f18..6b2c040 100644
--- a/content/events/2015/open-data.md
+++ b/content/events/2015/open-data.md
@@ -1,6 +1,8 @@
 ---
-title: "August Talk: The New Open Data Policy by Damian Shepherd"
+title: "The New Open Data Policy"
 date: 2015-08-11T18:00:00+08:00
+presenters:
+  - Damian Shepherd
 ---
 
 The policy was announced at GovHack and it’s a Western Australian
diff --git a/content/events/2015/paul-fenwick.md b/content/events/2015/paul-fenwick.md
index f13fb82..f47dccd 100644
--- a/content/events/2015/paul-fenwick.md
+++ b/content/events/2015/paul-fenwick.md
@@ -1,6 +1,8 @@
 ---
-title: "November Talk: The future is awesome by Paul Fenwick"
+title: "The future is awesome"
 date: 2015-11-09T18:00:00+08:00
+presenters:
+  - Paul Fenwick
 ---
 
 The 21st century is a time with an unprecedented expansion of ideas,
@@ -12,6 +14,7 @@ awesome in ways you may not expect, and what you can do about it.
 
 Paul J Fenwick is a well known speaker especially at things like at
 linux.conf.au and it's well worth coming to see him. http://pjf.id.au/
+<!--more-->
 
 ## Presenter Bio
 
diff --git a/content/events/2015/rpi-jam.md b/content/events/2015/rpi-jam.md
index 16d2ddb..ba12d51 100644
--- a/content/events/2015/rpi-jam.md
+++ b/content/events/2015/rpi-jam.md
@@ -1,5 +1,5 @@
 ---
-title: "July Talk: Raspberry Pi Jam"
+title: "Raspberry Pi Jam"
 date: 2015-07-14T18:00:00+08:00
 ---
 
diff --git a/content/events/2015/ubuntu-core.md b/content/events/2015/ubuntu-core.md
index d2925dd..36e5549 100644
--- a/content/events/2015/ubuntu-core.md
+++ b/content/events/2015/ubuntu-core.md
@@ -1,6 +1,8 @@
 ---
-title: "October Talk: Deploying apps on Snappy Ubuntu Core by James Henstridge"
+title: "Deploying apps on Snappy Ubuntu Core"
 date: 2015-10-13T18:00:00+08:00
+presenters:
+  - James Henstridge
 ---
 
 Deploying apps on Snappy Ubuntu Core by James Henstridge
@@ -8,5 +10,6 @@ Deploying apps on Snappy Ubuntu Core by James Henstridge
 It will include a description of what Snappy is (and how it differs to
 traditional Ubuntu systems), and some basics of how to package up
 software to run on the system
+<!--more-->
 
 {{< youtube "6ACZbuozg4w" >}}
diff --git a/content/events/2016/castledare.md b/content/events/2016/castledare.md
index 96e8a46..c1624ac 100644
--- a/content/events/2016/castledare.md
+++ b/content/events/2016/castledare.md
@@ -1,5 +1,5 @@
 ---
-title: "November Talk: Castledare Trains"
+title: "Castledare Trains"
 date: 2016-11-12T11:00:00+08:00
 ---
 
diff --git a/content/events/2016/chromecast.md b/content/events/2016/chromecast.md
index 14e1ad4..ed9e89f 100644
--- a/content/events/2016/chromecast.md
+++ b/content/events/2016/chromecast.md
@@ -1,6 +1,9 @@
 ---
-title: "September Talk: Chromecast by James Henstridge"
+title: "Chromecast"
 date: 2016-09-13T18:00:00+08:00
+presenters:
+  - James Henstridge
 ---
 
+<!--more-->
 {{< youtube "HHWeWTjgeYo" >}}
diff --git a/content/events/2016/dropbear.md b/content/events/2016/dropbear.md
index 4e358b5..c9e3bc3 100644
--- a/content/events/2016/dropbear.md
+++ b/content/events/2016/dropbear.md
@@ -1,6 +1,8 @@
 ---
-title: "June Talk: Dropbear by Matt Johnston"
+title: "Dropbear"
 date: 2016-06-14T18:00:00+08:00
+presenters:
+  - Matt Johnston
 ---
 
 Dropbear is an open source SSH server running on millions of embedded
diff --git a/content/events/2016/dug.md b/content/events/2016/dug.md
index 13d0804..b31a7ac 100644
--- a/content/events/2016/dug.md
+++ b/content/events/2016/dug.md
@@ -1,5 +1,5 @@
 ---
-title: "October Talk: Data Centre tour at DownUnder GeoSolutions"
+title: "Data Centre tour at DownUnder GeoSolutions"
 date: 2016-10-11T18:00:00+08:00
 ---
 
diff --git a/content/events/2016/wa-freenet.md b/content/events/2016/wa-freenet.md
index dcc8716..1a76fa3 100644
--- a/content/events/2016/wa-freenet.md
+++ b/content/events/2016/wa-freenet.md
@@ -1,5 +1,5 @@
 ---
-title: "March Talk: WAFreeNet"
+title: "WAFreeNet"
 date: 2016-03-08T18:00:00+08:00
 ---
 
diff --git a/content/events/2017/drupal.md b/content/events/2017/drupal.md
index ba96589..201a61e 100644
--- a/content/events/2017/drupal.md
+++ b/content/events/2017/drupal.md
@@ -1,5 +1,5 @@
 ---
-title: "September Talk: Highly Available Drupal - Achieving fault-tolerance in the AWS Cloud"
+title: "Highly Available Drupal - Achieving fault-tolerance in the AWS Cloud"
 date: 2017-09-12T18:00:00+08:00
 ---
 
diff --git a/content/events/2017/ska.md b/content/events/2017/ska.md
index 764f347..0038577 100644
--- a/content/events/2017/ska.md
+++ b/content/events/2017/ska.md
@@ -1,10 +1,13 @@
 ---
-title: "June Talk: The Square Kilometer Array by Kevin Vinsen"
+title: "The Square Kilometer Array"
 date: 2017-06-13T18:00:00+08:00
+presenters:
+  - Kevin Vinsen
 ---
 
 The Square Kilometre Array in Western Australia and how it will work.
 
 Prototyping your supercomputer in the cloud.
+<!--more-->
 
 {{< youtube "t5LNex_qZxg" >}}
diff --git a/content/events/2018/chromebooks.md b/content/events/2018/chromebooks.md
index 246a914..d40621f 100644
--- a/content/events/2018/chromebooks.md
+++ b/content/events/2018/chromebooks.md
@@ -1,6 +1,8 @@
 ---
-title: "June Talk: Chromebooks Unleashed by Benjamin Arntzen"
+title: "Chromebooks Unleashed"
 date: 2018-06-12T18:00:00+08:00
+presenters:
+  - Benjamin Arntzen
 ---
 
 Chromebooks Unleashed is a talk on the surprising potential of a cheap
diff --git a/content/events/2018/creating-deb-packages.md b/content/events/2018/creating-deb-packages.md
index f0ec85a..263938b 100644
--- a/content/events/2018/creating-deb-packages.md
+++ b/content/events/2018/creating-deb-packages.md
@@ -1,6 +1,8 @@
 ---
-title: "October Talk: Creating Deb Packages by Alastair Irvine"
+title: "Creating Deb Packages"
 date: 2018-10-09T18:00:00+08:00
+presenters:
+  - Alastair Irvine
 ---
 
 Once upon a time, Debian was a GNU/Linux distribution that was mainly
@@ -9,6 +11,7 @@ distributions such as Red Hat, and their derivatives.  Then Canonical
 used it to create Ubuntu, and the world changed.  (In the interim
 though, there were a lot of businesses relying on Debian as a stable,
 low-TCO server OS with good security support.)
+<!--more-->
 
 If you are running Debian on a personal host or in production, you
 might have wondered how Debian packages work and whether you have a
diff --git a/content/events/2018/desktop-snaps.md b/content/events/2018/desktop-snaps.md
index de83cde..c27c53c 100644
--- a/content/events/2018/desktop-snaps.md
+++ b/content/events/2018/desktop-snaps.md
@@ -1,6 +1,8 @@
 ---
-title: "April Talk: Confined applications on the desktop by James Henstridge"
+title: "Confined applications on the desktop"
 date: 2018-04-10T18:00:00+08:00
+presenters:
+  - James Henstridge
 ---
 
 Traditionally, Linux distributions have relied on package archives
diff --git a/content/events/2018/linux-tiny-places.md b/content/events/2018/linux-tiny-places.md
index f6e6e84..7428ef9 100644
--- a/content/events/2018/linux-tiny-places.md
+++ b/content/events/2018/linux-tiny-places.md
@@ -1,6 +1,8 @@
 ---
-title: "July Talk: GNU/Linux in some tiny places by Chris McCormick"
+title: "GNU/Linux in some tiny places"
 date: 2018-07-10T18:00:00+08:00
+presenters:
+  - Chris McCormick
 ---
 
 Modern user-space GNU tools and scripting languages on Android with
diff --git a/content/events/2018/matrix.md b/content/events/2018/matrix.md
index 648df56..5224a0f 100644
--- a/content/events/2018/matrix.md
+++ b/content/events/2018/matrix.md
@@ -1,6 +1,8 @@
 ---
-title: "August Talk: What is the Matrix? by Eamonn Collins"
+title: "What is the Matrix?"
 date: 2018-08-14T18:00:00+08:00
+presenters:
+  - Michael Collins
 ---
 
 What is the 'Matrix'? What features does it have? What is 'PerthChat'
diff --git a/content/events/2018/more-sleep.md b/content/events/2018/more-sleep.md
index fed9745..cd7a5d2 100644
--- a/content/events/2018/more-sleep.md
+++ b/content/events/2018/more-sleep.md
@@ -1,6 +1,8 @@
 ---
-title: "September Talk: Get More Sleep by Benjamin Arntzen"
+title: "Get More Sleep"
 date: 2018-09-11T18:00:00+08:00
+presenters:
+  - Benjamin Arntzen
 ---
 
 "Get more sleep" by Benjamin is a short talk on "how to get better
diff --git a/content/events/2018/ubuntu-launch.md b/content/events/2018/ubuntu-launch.md
index 40c3902..73b66f9 100644
--- a/content/events/2018/ubuntu-launch.md
+++ b/content/events/2018/ubuntu-launch.md
@@ -1,5 +1,5 @@
 ---
-title: "May Talk: Ubuntu Launch Party"
+title: "Ubuntu Launch Party"
 date: 2018-05-08T18:00:00+08:00
 ---
 
diff --git a/content/events/2019/iot-ubuntu.md b/content/events/2019/iot-ubuntu.md
index 4a3204c..cfabdcc 100644
--- a/content/events/2019/iot-ubuntu.md
+++ b/content/events/2019/iot-ubuntu.md
@@ -1,6 +1,8 @@
 ---
-title: "March Talk: Deploying IoT/embedded applications with Ubuntu Core by James Henstridge"
+title: "Deploying IoT/embedded applications with Ubuntu Core"
 date: 2019-03-12T18:00:00+08:00
+presenters:
+  - James Henstridge
 ---
 
 Small single board computers like the Raspberry Pi provide a great
diff --git a/content/events/2019/moosefs.md b/content/events/2019/moosefs.md
index 272b876..f438dc1 100644
--- a/content/events/2019/moosefs.md
+++ b/content/events/2019/moosefs.md
@@ -1,6 +1,8 @@
 ---
-title: "September Talk: MooseFS and the Elastic NAS by Benjamin Arntzen"
+title: "MooseFS and the Elastic NAS"
 date: 2019-09-10T18:00:00+08:00
+presenters:
+  - Benjamin Arntzen
 ---
 
 A do-it-yourself approach to [network-attached
diff --git a/content/events/2019/openstack.md b/content/events/2019/openstack.md
index 108fbf8..1434fb8 100644
--- a/content/events/2019/openstack.md
+++ b/content/events/2019/openstack.md
@@ -1,6 +1,8 @@
 ---
-title: "April Talk: Deploying an OpenStack control plane with MAAS, Ansible, and Ceph by Gregory Orange"
+title: "Deploying an OpenStack control plane with MAAS, Ansible, and Ceph"
 date: 2019-04-09T18:00:00+08:00
+presenters:
+  - Gregory Orange
 ---
 
 The Pawsey Super computing Centre in Technology Park offers an
diff --git a/content/events/2019/plug-av.md b/content/events/2019/plug-av.md
index bf16e68..0e4a43b 100644
--- a/content/events/2019/plug-av.md
+++ b/content/events/2019/plug-av.md
@@ -1,5 +1,5 @@
 ---
-title: "July Talk: PLUG AV introduction"
+title: "PLUG AV introduction"
 date: 2019-07-09T18:00:00+08:00
 ---
 
diff --git a/content/events/2019/rpi-jam.md b/content/events/2019/rpi-jam.md
index 8666701..a594c63 100644
--- a/content/events/2019/rpi-jam.md
+++ b/content/events/2019/rpi-jam.md
@@ -1,5 +1,5 @@
 ---
-title: "May Talk: Raspberry PI Jam & Workshop"
+title: "Raspberry PI Jam & Workshop"
 date: 2019-05-14T18:00:00+08:00
 ---
 
diff --git a/content/events/2020/github-actions.md b/content/events/2020/github-actions.md
index b6a57e9..35fea2b 100644
--- a/content/events/2020/github-actions.md
+++ b/content/events/2020/github-actions.md
@@ -1,6 +1,8 @@
 ---
-title: "July Talk: GitHub Actions by James Henstridge"
+title: "GitHub Actions"
 date: 2020-07-14T18:00:00+08:00
+presenters:
+  - James Henstridge
 ---
 
 Github Actions is a continuous integration system that can be used for
diff --git a/content/events/2020/linux-hpc.md b/content/events/2020/linux-hpc.md
index 3365fe0..7de0fc6 100644
--- a/content/events/2020/linux-hpc.md
+++ b/content/events/2020/linux-hpc.md
@@ -1,6 +1,9 @@
 ---
-title: Linux in Large Scale HPC Deployments by Stuart Midgley
+title: Linux in Large Scale HPC Deployments
 date: 2020-11-10T18:00:00+08:00
+params:
+  presenters:
+    - Stuart Midgley
 ---
 
 Stuart joined DUG as Head of IT in 2007. Now the Company’s Chief
diff --git a/content/events/2020/matrix.md b/content/events/2020/matrix.md
index 05aadd9..a07c4b3 100644
--- a/content/events/2020/matrix.md
+++ b/content/events/2020/matrix.md
@@ -1,6 +1,8 @@
 ---
-title: "September Talk: Matrix in 2020 by Michael Collins"
+title: "Matrix in 2020"
 date: 2020-09-08T18:00:00+08:00
+presenters:
+  - Michael Collins
 ---
 
 Join us as we discuss recent changes to Matrix and future plans for
diff --git a/content/events/2020/rpi-jam-august.md b/content/events/2020/rpi-jam-august.md
index 5b2e0ea..40b3a5e 100644
--- a/content/events/2020/rpi-jam-august.md
+++ b/content/events/2020/rpi-jam-august.md
@@ -1,5 +1,5 @@
 ---
-title: "August Talk: Raspberry Pi Jam and Workshop"
+title: "Raspberry Pi Jam and Workshop"
 date: 2020-08-11T18:00:00+08:00
 ---
 
diff --git a/content/events/2020/rpi-jam-march.md b/content/events/2020/rpi-jam-march.md
index 82d326d..9e6c960 100644
--- a/content/events/2020/rpi-jam-march.md
+++ b/content/events/2020/rpi-jam-march.md
@@ -1,5 +1,5 @@
 ---
-title: "March Talk: Raspberry Pi Jam and Workshop"
+title: "Raspberry Pi Jam and Workshop"
 date: 2020-03-10T18:00:00+08:00
 ---
 
diff --git a/content/events/2021/behind-the-scenes.md b/content/events/2021/behind-the-scenes.md
new file mode 100644
index 0000000..791e41d
--- /dev/null
+++ b/content/events/2021/behind-the-scenes.md
@@ -0,0 +1,9 @@
+---
+title: "Behind the Scenes workshop"
+date: 2021-09-14T18:00:00+08:00
+---
+
+What is involved in putting on a PLUG talk? Come along and find out
+more about our AV system and investigate the features of
+BigBlueButton. This will be an informal session, with the opportunity
+to get hands on experience.
diff --git a/content/events/2021/free-software-commercial.md b/content/events/2021/free-software-commercial.md
new file mode 100644
index 0000000..f516f3e
--- /dev/null
+++ b/content/events/2021/free-software-commercial.md
@@ -0,0 +1,13 @@
+---
+title: "Free Software vs commercial - why not both"
+date: 2021-08-10T18:00:00+08:00
+presenters:
+ - Chris McCormick
+---
+
+A survey of some ways people are building sustainable businesses on
+top of FLOSS.
+
+<!--more-->
+
+{{< youtube "RqpCISzLFIA" >}}
diff --git a/content/events/2021/gstreamer.md b/content/events/2021/gstreamer.md
new file mode 100644
index 0000000..ee6bc8f
--- /dev/null
+++ b/content/events/2021/gstreamer.md
@@ -0,0 +1,21 @@
+---
+title: "Editing Video with code"
+date: 2021-05-11T18:00:00+08:00
+presenters:
+ - James Henstridge
+---
+
+When PLUG started holding hybrid in-person/online meetings using Big
+Blue Button, we wanted a way to publish professional looking videos
+from the slides, camera footage and audio. Rather than editing
+everything together manually, I built some scripts to automate the
+process using GStreamer Editing Services: a library for
+non-destructive video editing.
+<!--more-->
+
+This talk will cover the basics of using GES, creating a set of edits,
+and rendering the resulting video. It will also demonstrate how these
+projects can be worked on further using the Pitivi video editing
+software.
+
+{{< youtube "DW-HWg3eaS4" >}}
diff --git a/content/events/2021/lightning-talks.md b/content/events/2021/lightning-talks.md
new file mode 100644
index 0000000..c8c0c0c
--- /dev/null
+++ b/content/events/2021/lightning-talks.md
@@ -0,0 +1,20 @@
+---
+title: "Lightning Talks"
+date: 2021-07-08T18:00:00+08:00
+presenters:
+ - Yuchen Pei
+ - Harry McNally
+ - Margaret Wood
+---
+
+An assortment of short talks on a variety of subjects If you would
+like to talk for 5-10 minutes on a relevant subject please contact the
+PLUG Committee.
+
+<!--more-->
+
+{{< youtube "xc_sDKzyyT0" >}}
+
+{{< youtube "zgkFUmSmjz4" >}}
+
+{{< youtube "MNcmIyPk3xY" >}}
diff --git a/content/events/2021/puppet.md b/content/events/2021/puppet.md
index aa5bb9c..6713283 100644
--- a/content/events/2021/puppet.md
+++ b/content/events/2021/puppet.md
@@ -1,6 +1,8 @@
 ---
-title: "February Talk: Puppet by Simon Anderson"
+title: "Puppet"
 date: 2021-02-09T18:00:00+08:00
+presenters:
+  - Simon Anderson
 ---
 
 Managing fleets of systems can sometimes lead to boring and repetitive
@@ -10,4 +12,6 @@ streamline and standardise the tasks so that system admins and the
 like and use their time more productively and more enjoyable whilst
 not having to worry about human-error mistakes being made (as much)
 
+<!--more-->
+
 {{< youtube "eyQR2Nb5TKc" >}}
diff --git a/content/events/2021/quiz-night.md b/content/events/2021/quiz-night.md
new file mode 100644
index 0000000..8d00dfd
--- /dev/null
+++ b/content/events/2021/quiz-night.md
@@ -0,0 +1,13 @@
+---
+title: "PLUG Quiz Night"
+date: 2021-10-12T18:00:00+08:00
+---
+
+Doors open 18:00 so you can get a drink and order food. The quiz will
+start at 19:00
+<!--more-->
+
+The quiz questions aren't technical - general knowledge is the game.
+It's a social event, there's prizes to be won, bring a few friends who
+may enjoy this kind of thing. We'll make up tables of players on the
+night, we're expecting 4 or 5 people to a table.
diff --git a/content/events/2021/riffcc.md b/content/events/2021/riffcc.md
new file mode 100644
index 0000000..f8c412d
--- /dev/null
+++ b/content/events/2021/riffcc.md
@@ -0,0 +1,16 @@
+---
+title: "Riff.CC"
+date: 2021-06-08T18:00:00+08:00
+presenters:
+ - Benjamin Arntzen
+---
+
+Riff.CC is a free community-run website for streaming, downloading and
+sharing legally free culture such as movies, TV shows, audiobooks and
+music. It has a unique non-profit business model where you are paid a
+special currency, BON, in exchange for your seeding efforts. We have
+3,000 items on the site and are working hard on reaching 200,000 soon.
+
+<!--more-->
+
+{{< youtube "rIfZwCxpxCE" >}}
diff --git a/content/events/2021/rpi-jam-march.md b/content/events/2021/rpi-jam-march.md
new file mode 100644
index 0000000..a14d1a5
--- /dev/null
+++ b/content/events/2021/rpi-jam-march.md
@@ -0,0 +1,14 @@
+---
+title: "Raspberry Pi Jam and Workshop"
+date: 2021-03-09T18:00:00+08:00
+---
+
+Do you think Raspberry Pis are a great idea, but need help getting started?
+Do you have a Raspberry Pi project that you would like to show to others?
+<!--more-->
+
+Bring your own Laptop, Pi (if you have one) & power supply; we will
+have power boards to plug into.
+
+There will be an opportunity to Learn more about the Minimagnus V2
+Supercomputer, built from Raspberry Pis
diff --git a/content/events/2021/scavenger-hunt.md b/content/events/2021/scavenger-hunt.md
new file mode 100644
index 0000000..43cae9f
--- /dev/null
+++ b/content/events/2021/scavenger-hunt.md
@@ -0,0 +1,8 @@
+---
+title: "PLUG Car Rally/Scavenger Hunt"
+date: 2021-04-18T09:30:00+08:00
+---
+
+Carpark 1 @ UWA. Please RSVP and be there before 9:30am. We are doing
+a car rally/scavenger hunt followed by a PLUG in the pub. Location for
+the pub to be announced.
diff --git a/content/events/2022/_index.md b/content/events/2022/_index.md
new file mode 100644
index 0000000..f5b48b6
--- /dev/null
+++ b/content/events/2022/_index.md
@@ -0,0 +1,3 @@
+---
+title: 2022 Events
+---
diff --git a/content/events/2022/dorothy.md b/content/events/2022/dorothy.md
new file mode 100644
index 0000000..831b6d6
--- /dev/null
+++ b/content/events/2022/dorothy.md
@@ -0,0 +1,16 @@
+---
+title: "Dorothy, a dotfile ecosystem"
+date: 2022-04-12T18:00:00+08:00
+presenters:
+  - Benjamin Lupton
+---
+
+Dorothy is a dotfile ecosystem with cross-platform automations.It
+supports fish, zsh and bash, it runs on Mac and Linux. This
+presentation will show how to set it up and configure it, and will
+demonstrate its capabilities and extensibility with ideas for both
+beginners and experienced shell scripters
+
+<!--more-->
+
+{{< youtube "gWLana1JmNk" >}}
diff --git a/content/events/2022/hugo.md b/content/events/2022/hugo.md
new file mode 100644
index 0000000..a18f550
--- /dev/null
+++ b/content/events/2022/hugo.md
@@ -0,0 +1,18 @@
+---
+title: "Building Websites on the Cheap With Hugo"
+date: 2022-06-14T18:00:00+08:00
+presenters:
+  - James Henstridge
+---
+
+James Henstridge will talk about the Hugo static website
+generator. Websites served as static files have a smaller attack
+surface for security bugs, easier to migrate between hosting
+providers, and generally cheaper to host.
+
+Hugo together with Git can provide some of the content management
+features that would otherwise be missing in a static site.
+
+<!--more-->
+
+{{< youtube "AkPUKmDrMms" >}}
diff --git a/content/events/2022/privacy.md b/content/events/2022/privacy.md
new file mode 100644
index 0000000..db59c92
--- /dev/null
+++ b/content/events/2022/privacy.md
@@ -0,0 +1,17 @@
+---
+title: "Privacy Roundtable"
+date: 2022-07-12T18:00:00+08:00
+presenters:
+---
+
+This month we are going to try an experiment with the meeting format,
+and hold a discussion directed by the meeting's participants. If
+there's a topic you'd like to discus on the theme of privacy, or you
+have questions you think the community might be able to help you
+answer, this is good opportunity.
+
+So we can keep the meeting on track, please add any topics you'd like
+to discuss to this document:
+https://demo.hedgedoc.org/ej7SEkdMT6iop8QgRePtcA?both (no account
+required to edit). We will also use the document to make notes about
+the discussion.
diff --git a/content/events/2022/quiz-night.md b/content/events/2022/quiz-night.md
new file mode 100644
index 0000000..5934fb4
--- /dev/null
+++ b/content/events/2022/quiz-night.md
@@ -0,0 +1,20 @@
+---
+title: "Quiz Night"
+date: 2022-11-08T18:00:00+08:00
+presenters:
+---
+
+Join us for our annual quiz night, which this year is being held at
+the [Captain Stirling Hotel in
+Nedlands](https://www.captainstirlinghotel.com.au/).
+<!--more-->
+
+You don't need to be a Linux expert - the questions will cover a wide
+range of subjects, so family and friends are welcome.
+
+The cost is $5 for members, $10 for non-members. Payment direct to our
+bank account (details at plug.org.au/membership) is preferred, but we
+can also accept cash on the night.
+
+The quiz will start at 19;00, but come earlier to buy a drink, order
+food and socialise.
diff --git a/content/events/2022/tarsnap.md b/content/events/2022/tarsnap.md
new file mode 100644
index 0000000..3cd5147
--- /dev/null
+++ b/content/events/2022/tarsnap.md
@@ -0,0 +1,19 @@
+---
+title: "Tarsnap"
+date: 2022-05-10T18:00:00+08:00
+presenters:
+  - Niall Navin
+---
+
+In this day and age backups are ubiquitous with basic system
+administration. Tarsnap augments the traditional tape archive program,
+tar, to provide encryption and cloud storage. Designed such that not
+even the creator can access your data, its tagline is 'Online backups
+for the truly paranoid'
+
+This talk is an introductory overview of the program and why I use
+it. https://www.tarsnap.com/
+
+<!--more-->
+
+{{< youtube "_pfWnCHF3Ew" >}}
diff --git a/content/events/2022/toolbelt.md b/content/events/2022/toolbelt.md
new file mode 100644
index 0000000..1910ce2
--- /dev/null
+++ b/content/events/2022/toolbelt.md
@@ -0,0 +1,40 @@
+---
+title: "Toolbelt: Install anything (in theory)"
+date: 2022-02-08T18:00:00+08:00
+presenters:
+ - Alastair Irvine
+---
+
+The process of ad-hoc system administration, in which lengthy and
+possibly insecure installation commands are typed/pasted from software
+project websites or even Q&A sites, is both time-consuming and not
+recommended from a security perspective.
+
+However, OS-provided software packages are often old versions or not
+present at all.  And modern DevOps approaches like Ansible, Puppet,
+Vagrant or Docker are not always justified, especially for
+experimentation or work on one's own workstation.
+
+Toolbelt fills the gap, by automating the recommended installation
+approach described on the provider's website for each supported piece
+of software.
+<!--more-->
+
+This presentation will give an overview of Toolbelt, including a
+partial code walkthrough and a description of how to extend it to
+support additional software.
+
+{{< youtube "s3w6OX7Sv_o" >}}
+
+Bio:
+
+Alastair Irvine is a Software Engineer and system administrator by
+trade.  He has a BSc in Computer Science from Curtin University.
+
+His computer-related interests lie in various areas within his trade;
+suffice to say that he is a "geek of many colours". :) He is a
+die-hard FOSS user and Linux fan.
+
+Alastair is a freelancer with his own business.  Warpspace IT is a
+consultancy with a fairly broad focus on the technical side of IT. See
+http://www.warpspace.net/ for details.
diff --git a/content/events/2023/_index.md b/content/events/2023/_index.md
new file mode 100644
index 0000000..9308522
--- /dev/null
+++ b/content/events/2023/_index.md
@@ -0,0 +1,3 @@
+---
+title: 2023 Events
+---
diff --git a/content/events/2023/android-roms.md b/content/events/2023/android-roms.md
new file mode 100644
index 0000000..6f28b14
--- /dev/null
+++ b/content/events/2023/android-roms.md
@@ -0,0 +1,16 @@
+---
+title: "Android Phone ROMs"
+date: 2023-05-09T18:00:00+08:00
+presenters:
+  - Jasper Greenhill
+---
+
+This month, Minilandl gives a presentation on installing and using
+custom Android ROM's.
+
+If you have ever been interested in running a custom ROM on your
+Android phone come along and hear how Minilandl does it.
+
+<!--more-->
+
+{{< youtube "jubD-d92tRw" >}}
diff --git a/content/events/2023/audio.md b/content/events/2023/audio.md
new file mode 100644
index 0000000..1f3f1fc
--- /dev/null
+++ b/content/events/2023/audio.md
@@ -0,0 +1,16 @@
+---
+title: "Linux sound/audio stack"
+date: 2023-07-11T18:00:00+08:00
+presenters:
+  - Lachlan Baker
+---
+
+The Linux audio stack is infamous for it's turbulent history, plagued
+by competing standards with dubious compatibility. Join us as Lachlan
+leads us down the rabbit hole that is the history of audio on *nix,
+why making your computer play sounds has been such a struggle, and how
+we've finally reached a mostly-good solution.
+
+<!--more-->
+
+{{< youtube "lK360Szh9o8" >}}
diff --git a/content/events/2023/emacs.md b/content/events/2023/emacs.md
new file mode 100644
index 0000000..d00d852
--- /dev/null
+++ b/content/events/2023/emacs.md
@@ -0,0 +1,12 @@
+---
+title: "EMACS for Notetaking"
+date: 2023-10-10T18:00:00+08:00
+presenters:
+  - Benjamin Dunstan
+---
+
+EMACS using [org-mode](https://orgmode.org/) for notetaking.
+
+<!--more-->
+
+{{< youtube "9odhod5RIaQ" >}}
diff --git a/content/events/2023/homelab.md b/content/events/2023/homelab.md
new file mode 100644
index 0000000..13bff14
--- /dev/null
+++ b/content/events/2023/homelab.md
@@ -0,0 +1,20 @@
+---
+title: "When a homelab gets too big"
+date: 2023-04-11T18:00:00+08:00
+presenters:
+  - Benjamin Arntzen
+---
+
+Wings talks on the situation when a home lab becomes a behemoth unto
+itself, akin to something comparable to a supercomputer.
+<!--more-->
+
+The trials and tribulations of managing 308 CPU cores, 616 threads,
+almost 1.5 terabytes of RAM and more than a petabyte of disk space in
+PCHQ.
+
+Come for snacks and refreshments with a talk by one of PLUG's past
+presidents while meeting other people who enjoy Free Open Source
+Software.
+
+{{< youtube "JuhM2x6o-Xo" >}}
diff --git a/content/events/2023/rpi-jam-november.md b/content/events/2023/rpi-jam-november.md
new file mode 100644
index 0000000..94d370e
--- /dev/null
+++ b/content/events/2023/rpi-jam-november.md
@@ -0,0 +1,20 @@
+---
+title: "Raspberry Pi Jam - Introducing the New Raspberry Pi 5"
+date: 2023-11-14T18:00:00+08:00
+---
+
+With the launch of the new Raspberry Pi 5, we are hosting an event to
+celebrate our favourite SBC single-board computer. We will be going
+over the new features on Raspberry Pi 5.
+<!--more-->
+
+* Do you think Raspberry Pi's are interesting, but need help getting started
+* Perhaps you want to make a low powered media server, or retro gaming machine.
+* Do you have a Raspberry Pi project that you would like to show to others?
+* Bring your own Laptop, Pi (if you have one) & power supply. We will have power boards to plug into, along with a monitor...
+* There will be an opportunity to learn more about the new Raspberry PI 5, the Pi Global Shutter camera, and much more.
+
+The evening will be mostly informal, but there will be an opportunity
+for lightning talks, so if you would like to give a short presentation
+about your Raspberry Pi Project, please let the committee know by
+email.
diff --git a/content/events/2023/sbc-jam.md b/content/events/2023/sbc-jam.md
new file mode 100644
index 0000000..272aee5
--- /dev/null
+++ b/content/events/2023/sbc-jam.md
@@ -0,0 +1,9 @@
+---
+title: "SBC Jam on Pi Day"
+date: 2023-03-14T18:00:00+08:00
+---
+
+Single Board Computer Jam, on Pi Day: after last year's Linux
+Smörgåsbord, we're holding a SBC workshop. Bring your own
+laptop/Raspberry Pi/etc. Let us know it you want to talk about or
+demonstrate a project you've done.
diff --git a/content/events/2024/gaming.md b/content/events/2024/gaming.md
new file mode 100644
index 0000000..4726000
--- /dev/null
+++ b/content/events/2024/gaming.md
@@ -0,0 +1,16 @@
+---
+title: "Getting Started with Gaming on Linux"
+date: 2024-09-10T18:00:00+08:00
+presenters:
+  - Jasper Greenhill
+---
+
+With the popularity of the Steam Deck, gaming has been really good
+recently. How hard can it be to setup and play games on Linux??
+
+Jasper Greenhill goes through his experiences playing games
+exclusively on Linux.
+
+<!--more-->
+
+{{< youtube "QvpJgJ-oIUI" >}}
diff --git a/content/events/2024/inkscape.md b/content/events/2024/inkscape.md
new file mode 100644
index 0000000..7818de8
--- /dev/null
+++ b/content/events/2024/inkscape.md
@@ -0,0 +1,14 @@
+---
+title: "Inkscape and T-shirt printing"
+date: 2024-04-09T18:00:00+08:00
+presenters:
+  - John McCabe-Dansted
+---
+
+Join us as John C. McCabe-Dansted gives an overview of the vector
+drawing program InkScape.  This talk is in preparation for a T-Shirt
+printing day at the Artifactory on April 14th.
+
+<!--more-->
+
+{{< youtube "bFvMiyJXqf8" >}}
diff --git a/content/events/2024/lsp.md b/content/events/2024/lsp.md
new file mode 100644
index 0000000..8b013d3
--- /dev/null
+++ b/content/events/2024/lsp.md
@@ -0,0 +1,9 @@
+---
+title: "Turning your Editor into an IDE with the Language Server Protocol"
+date: 2024-06-11T18:00:00+08:00
+presenters:
+  - James Henstridge
+---
+
+James will show us how LSP can add Integrated Development Environment
+features to your coding. Syntax highlighting for every type of file!
diff --git a/content/events/2024/raspberry_pico_sensor_hacking/index.md b/content/events/2024/raspberry_pico_sensor_hacking/index.md
index e40500d..398ac0f 100644
--- a/content/events/2024/raspberry_pico_sensor_hacking/index.md
+++ b/content/events/2024/raspberry_pico_sensor_hacking/index.md
@@ -1,8 +1,16 @@
 ---
-title: Observations from Raspberry Pico Sensor Hacking
+title: Raspberry Pico Sensor Hacking
 date: 2024-09-29T16:00:00+08:00
 ---
 
+The UCC has recently set up [a door
+sensor](https://gitlab.ucc.asn.au/UCC/ucc-door-sensor) - a Raspberry
+PicoW and reed switch, talking MQTT to a backend VM - but we'll be
+wanting more soon, and perhaps other types of input/output.
+<!--more-->
+
+---
+
 [![Raspberry_PicoW](raspberry_picow.jpg)](https://datasheets.raspberrypi.com/picow/pico-w-product-brief.pdf)
 
 The Saturday afternoon workshop was to work with the Raspberry PicoW to reproduce and extend an existing project that is [hosted](https://gitlab.ucc.asn.au/UCC/ucc-door-sensor) on UCC's Gitlab server.
diff --git a/content/events/2024/rpi-jam-march.md b/content/events/2024/rpi-jam-march.md
new file mode 100644
index 0000000..6f94b95
--- /dev/null
+++ b/content/events/2024/rpi-jam-march.md
@@ -0,0 +1,26 @@
+---
+title: "Raspberry Pi Jam"
+date: 2024-03-12T18:00:00+08:00
+---
+
+February 29th marks 12 years of Raspberry PI releases and
+development. To celebrate this occasion we are hosting an event to
+celebrate our favourite SBC single-board computer. Come along for a
+chance to win a Raspberry PI 5.
+<!--more-->
+
+Design a T-Shirt logo for PLUG to use and the best design, as judged
+by the PLUG president, will take home a Raspberry PI 5, case, and
+power supply.
+
+* Do you think Raspberry Pi's are interesting, but need help getting
+  started?
+* Perhaps you want to make a low powered media server, or retro gaming machine?
+* Do you have a Raspberry Pi project that you would like to show to others?
+* Bring your own Laptop, Pi (if you have one) & power supply. We will have power boards to plug into, along with a monitor...
+* There will be an opportunity to learn more about the new Raspberry PI 5, the Pi Global Shutter camera, and much more.
+
+The evening will be mostly informal, but there will be an opportunity
+for lightning talks, so if you would like to give a short presentation
+about your Raspberry Pi Project, please let the committee know by
+email.
diff --git a/content/events/2025/homelab.md b/content/events/2025/homelab.md
new file mode 100644
index 0000000..e5593a2
--- /dev/null
+++ b/content/events/2025/homelab.md
@@ -0,0 +1,17 @@
+---
+title: "Running a Homelab"
+date: 2025-04-08T18:00:00+08:00
+presenters:
+  - Jasper Greenhill
+---
+
+A Homelab is a great way to learn new skills and Learn more about
+Servers and Computers if you work in IT . Jasper goes through the
+Challenges of running a maintaining his servers and self hosted
+services at home from 39tb of Storage and a Highly Available
+Virtualization Cluster running on Enterprise Hardware. He will go over
+the challenges of keeping things running well and the things he have
+learned along the way.
+<!--more-->
+
+{{< youtube "ftKEruPiCa0" >}}
diff --git a/content/events/2025/rpi-jam-march.md b/content/events/2025/rpi-jam-march.md
new file mode 100644
index 0000000..9626166
--- /dev/null
+++ b/content/events/2025/rpi-jam-march.md
@@ -0,0 +1,12 @@
+---
+title: "Raspberry Pi Jam"
+date: 2025-03-11T18:00:00+08:00
+---
+
+13 years of Raspberry Pi, a baker's dozen.
+<!--more-->
+
+* Do you think Raspberry Pis are interesting, but need help getting started?
+* Perhaps you want to make a low-powered media server, or retro gaming machine?
+* Do you have a Raspberry Pi project that you would like to show to others?
+* Bring your own laptop, Raspberry Pi (if you have one), and power supply. We will have power boards to plug into, along with a monitor.
diff --git a/content/events/2025/statecharts.md b/content/events/2025/statecharts.md
new file mode 100644
index 0000000..503a2a4
--- /dev/null
+++ b/content/events/2025/statecharts.md
@@ -0,0 +1,32 @@
+---
+title: "Statecharts, State Machines, and QP/C"
+date: 2025-10-08T18:00:00+08:00
+presenters:
+  - Harry McNally
+---
+
+Harry McNally will tell us about State Charts, State Machines and QP/C
+in embedded systems.
+<!--more-->
+
+In embedded programming, between big loop and RealRTOS, is a
+lightweight framework called QP/C which implements asynchronous,
+event-driven Hierarchical State Machines described as Active Objects.
+
+The frameworks are dual-licensed so they are available for download
+and use in open-source projects.
+
+The developer, Miro Samek, has over several decades prepared video
+coursework that describe all approaches to embedded programming
+including Quantum Programming; the QP/C, QP/C++, and support tools.
+
+For anyone interested in embedded programming, the talk will discuss
+how HSM statecharts can be used to define and then implement embedded
+systems.
+
+Many of the coursework examples on real low-cost evaluation boards
+offer advantages in embedded development comparable to open source
+software projects that "An example is a thousand instruction manuals".
+
+The talk is for anyone interested in embedded programming and working
+close to the silicon.
diff --git a/content/events/2025/vlans.md b/content/events/2025/vlans.md
new file mode 100644
index 0000000..d849506
--- /dev/null
+++ b/content/events/2025/vlans.md
@@ -0,0 +1,9 @@
+---
+title: "Using VLANs at Home"
+date: 2025-06-10T18:00:00+08:00
+presenters:
+  - James Henstridge
+---
+
+James talks about how he used virtual LANs to set up a private guest
+network at home, spanned over both wired and wifi devices.
diff --git a/content/events/AGM/2002.md b/content/events/AGM/2002.md
index becdabd..a68da23 100644
--- a/content/events/AGM/2002.md
+++ b/content/events/AGM/2002.md
@@ -3,6 +3,7 @@ title: AGM Minutes 2002
 date: 2001-12-11
 ---
 
+<!--more-->
 ```
 date: 11th December 2001
 prez: matt kemner
diff --git a/content/events/AGM/2003.md b/content/events/AGM/2003.md
index 9bcbb98..a0eff3d 100644
--- a/content/events/AGM/2003.md
+++ b/content/events/AGM/2003.md
@@ -3,6 +3,7 @@ title: AGM Minutes 2003
 date: 2003-02-12
 ---
 
+<!--more-->
 ```
 Date: Wed, 12 Feb 2003 14:32:14 +0800 (WST)
 From: "Anthony J. Breeds-Taurima" <tony@cantech.net.au>
diff --git a/content/events/AGM/2004.md b/content/events/AGM/2004.md
index 1d1706b..7ba1173 100644
--- a/content/events/AGM/2004.md
+++ b/content/events/AGM/2004.md
@@ -6,6 +6,7 @@ date: 2004-02-10
 <p>The Perth Linux User Group (PLUG) Annual General Meeting was held
 Tuesday 10 February, 2004 at the normal Tuesday meeting place, Perth
 Central TAFE in Northbridge.
+<!--more-->
 <p>Present were:-
 <ul><li>Vice President - Bernard Blackham
 <li>Secretary - Mark Gaynor
diff --git a/content/events/AGM/2005.md b/content/events/AGM/2005.md
index 7dfa7c8..f780a8c 100644
--- a/content/events/AGM/2005.md
+++ b/content/events/AGM/2005.md
@@ -3,6 +3,7 @@ title: AGM Minutes 2005
 date: 2005-01-24
 ---
 
+<!--more-->
 <h3>>Summary for the impatient</h3>
 
 <p> the 2005 committee are:
diff --git a/content/events/AGM/2006.md b/content/events/AGM/2006.md
index 6015370..0820e55 100644
--- a/content/events/AGM/2006.md
+++ b/content/events/AGM/2006.md
@@ -3,6 +3,7 @@ title: AGM Minutes 2006
 date: 2006-01-30
 ---
 
+<!--more-->
 <h3>Summary for the impatient</h3>
 
 <p>The new PLUG committee for 2006 is:
diff --git a/content/events/AGM/2007.md b/content/events/AGM/2007.md
index f45904c..add51a9 100644
--- a/content/events/AGM/2007.md
+++ b/content/events/AGM/2007.md
@@ -3,6 +3,7 @@ title: AGM Minutes 2007
 date: 2007-01-29
 ---
 
+<!--more-->
 <h3>Summary for the impatient</h3>
 
 <p>The new PLUG committee for 2007 is:
diff --git a/content/events/AGM/2008.md b/content/events/AGM/2008.md
index 7186367..e4bd492 100644
--- a/content/events/AGM/2008.md
+++ b/content/events/AGM/2008.md
@@ -3,6 +3,7 @@ title: AGM Minutes 2008
 date: 2008-02-12
 ---
 
+<!--more-->
 <p><b>Summary for the impatient</b>
 
 <p>The new PLUG committee for 2008 is:
diff --git a/content/events/AGM/2009.md b/content/events/AGM/2009.md
index eaadba2..641ebd9 100644
--- a/content/events/AGM/2009.md
+++ b/content/events/AGM/2009.md
@@ -3,6 +3,7 @@ title: AGM Minutes 2009
 date: 2009-02-10
 ---
 
+<!--more-->
 <h3>Summary for the impatient</h3>
 
 <p>The new PLUG committee for 2009 is:</p>
diff --git a/content/events/AGM/2010.md b/content/events/AGM/2010.md
index e2458a8..1a29b10 100644
--- a/content/events/AGM/2010.md
+++ b/content/events/AGM/2010.md
@@ -3,6 +3,7 @@ title: AGM Minutes 2010
 date: 2010-03-09
 ---
 
+<!--more-->
 <h2>PLUG Annual General Meeting, 2010</h2>
 <p>
 <b>Title:</b> PLUG Annual General Meeting, 2010<br>
diff --git a/content/events/AGM/2011.md b/content/events/AGM/2011.md
index 0228632..602e05b 100644
--- a/content/events/AGM/2011.md
+++ b/content/events/AGM/2011.md
@@ -3,6 +3,7 @@ title: AGM Minutes 2011
 date: 2011-01-12
 ---
 
+<!--more-->
 ```
 Minutes of the PLUG Annual General Meeting 2011
 held on Tuesday, 12th January 2011 from 7:30pm
diff --git a/content/events/AGM/2012.md b/content/events/AGM/2012.md
index 4a8a2cf..7234cb7 100644
--- a/content/events/AGM/2012.md
+++ b/content/events/AGM/2012.md
@@ -3,6 +3,7 @@ title: AGM Minutes 2012
 date: 2012-01-17
 ---
 
+<!--more-->
 ## Minutes for the Preliminary AGM 2012
 
 ```
diff --git a/content/events/AGM/2013.md b/content/events/AGM/2013.md
index 8d188b3..94e7aad 100644
--- a/content/events/AGM/2013.md
+++ b/content/events/AGM/2013.md
@@ -3,6 +3,7 @@ title: AGM Minutes 2013
 date: 2013-01-08
 ---
 
+<!--more-->
 ## Minutes for the PLUG AGM 2013
 
 ```
diff --git a/content/events/AGM/2014.md b/content/events/AGM/2014.md
index 81a7a63..2c59f57 100644
--- a/content/events/AGM/2014.md
+++ b/content/events/AGM/2014.md
@@ -3,6 +3,7 @@ title: AGM Minutes 2014
 date: 2014-02-11
 ---
 
+<!--more-->
 ## Minutes of the PLUG Annual General Meeting 2014
 ```
 Minutes of the PLUG Annual General Meeting 2014
diff --git a/content/events/AGM/2015.md b/content/events/AGM/2015.md
index 5f14382..9042bd5 100644
--- a/content/events/AGM/2015.md
+++ b/content/events/AGM/2015.md
@@ -3,6 +3,7 @@ title: AGM Minutes 2015
 date: 2015-02-10
 ---
 
+<!--more-->
 ```
 Minutes of the PLUG Annual General Meeting 2015
 held on Tuesday, 10th February 2015 from 7pm
diff --git a/content/events/AGM/2016.md b/content/events/AGM/2016.md
index bef2bae..af53341 100644
--- a/content/events/AGM/2016.md
+++ b/content/events/AGM/2016.md
@@ -3,6 +3,7 @@ title: AGM Minutes 2016
 date: 2016-01-12
 ---
 
+<!--more-->
 # Perth Linux Users Group -  Annual General Meeting 2016 - Minutes
 
 Held at 45 St Georges Terrace Perth CBD. Spacecubed.org on Tuesday 12th of January 2016 at 7:00 PM
diff --git a/content/events/AGM/2017/index.md b/content/events/AGM/2017/index.md
index 6516072..5ad246d 100644
--- a/content/events/AGM/2017/index.md
+++ b/content/events/AGM/2017/index.md
@@ -3,6 +3,7 @@ title: AGM Minutes 2017
 date: 2017-01-10
 ---
 
+<!--more-->
 ## Perth Linux Users Group – Annual General Meeting 2017 – Minutes
 
 Held at 45 St Georges Terrace Perth CBD. Spacecubed.org on Tuesday 10th of January 2017 at 7:30 PM
diff --git a/content/events/AGM/2018/index.md b/content/events/AGM/2018/index.md
index 491cc5a..33753d1 100644
--- a/content/events/AGM/2018/index.md
+++ b/content/events/AGM/2018/index.md
@@ -3,6 +3,7 @@ title: AGM Minutes 2018
 date: 2018-03-13
 ---
 
+<!--more-->
 # Perth Linux Users Group – Annual General Meeting 2018 – Minutes
 
 The Perth Linux Users Group Annual General Meeting held at Spacecubed.com at 45 St Georges Terrace, Perth CBD on Tuesday 13th March 2018 at 7:20 PM.
diff --git a/content/events/AGM/2019.md b/content/events/AGM/2019.md
index 8124b4e..7c76a9e 100644
--- a/content/events/AGM/2019.md
+++ b/content/events/AGM/2019.md
@@ -3,6 +3,7 @@ title: AGM Minutes 2019
 date: 2019-02-12
 ---
 
+<!--more-->
 # Perth Linux Users Group – Annual General Meeting 2019 – Minutes
 
 The Perth Linux Users Group Annual General Meeting
diff --git a/content/events/AGM/2020/index.md b/content/events/AGM/2020/index.md
index f87abaf..17596c1 100644
--- a/content/events/AGM/2020/index.md
+++ b/content/events/AGM/2020/index.md
@@ -3,6 +3,7 @@ title: AGM Minutes 2020
 date: 2020-02-11
 ---
 
+<!--more-->
 # Perth Linux Users Group - Annual General Meeting 2020 - Minutes
 
 * Our venue has been provided by Spacecubed.com
diff --git a/content/events/AGM/2021/index.md b/content/events/AGM/2021/index.md
index 8fbd2cf..7e037ec 100644
--- a/content/events/AGM/2021/index.md
+++ b/content/events/AGM/2021/index.md
@@ -3,6 +3,7 @@ title: AGM Minutes 2021
 date: 2021-01-12
 ---
 
+<!--more-->
 # PLUG Annual General Meeting Minutes for 2021
 
 * Venue: Spacecubed.com, 45 St Georges Terrace, Perth WA 6000
diff --git a/content/events/AGM/2022/index.md b/content/events/AGM/2022/index.md
index 1073b7f..79eac16 100644
--- a/content/events/AGM/2022/index.md
+++ b/content/events/AGM/2022/index.md
@@ -3,6 +3,7 @@ title: AGM Minutes 2022
 date: 2022-01-11
 ---
 
+<!--more-->
 # PLUG Annual General Meeting 2022 Minutes
 
 * Venue: Spacecubed.com, 45 St Georges Terrace, Perth WA 6000
diff --git a/content/events/AGM/2023/index.md b/content/events/AGM/2023/index.md
index fecfa72..00568bd 100644
--- a/content/events/AGM/2023/index.md
+++ b/content/events/AGM/2023/index.md
@@ -3,6 +3,7 @@ title: AGM Minutes 2023
 date: 2023-01-10
 ---
 
+<!--more-->
 # PLUG Annual General Meeting 2023 Minutes
 
 * Venue: Spacecubed.com, 45 St Georges Terrace, Perth WA 6000
diff --git a/content/events/AGM/2024-sgm.md b/content/events/AGM/2024-sgm.md
index 1337003..28c65bc 100644
--- a/content/events/AGM/2024-sgm.md
+++ b/content/events/AGM/2024-sgm.md
@@ -3,6 +3,7 @@ title: SGM Minutes 2024
 date: 2024-10-08
 ---
 
+<!--more-->
 ## PLUG SGM, Tuesday 2024-10-08
 - Perth Linux Users Group Special General Meeting
 - Venue: Spacecubed.com / Riff
diff --git a/content/events/AGM/2024.md b/content/events/AGM/2024.md
index 6895ea8..692d680 100644
--- a/content/events/AGM/2024.md
+++ b/content/events/AGM/2024.md
@@ -3,6 +3,7 @@ title: AGM Minutes 2024
 date: 2024-01-09
 ---
 
+<!--more-->
 ## PLUG AGM, Tuesday 2024-01-09
 - Perth Linux Users Group Annual General Meeting
 - Venue: Spacecubed.com / Riff
diff --git a/content/events/AGM/2025.md b/content/events/AGM/2025.md
index 714e1d7..0b2cc98 100644
--- a/content/events/AGM/2025.md
+++ b/content/events/AGM/2025.md
@@ -3,6 +3,7 @@ title: AGM Minutes 2025
 date: 2025-01-14
 ---
 
+<!--more-->
 # PLUG AGM 2025
 
 ## -2. Preparation
diff --git a/content/events/_index.md b/content/events/_index.md
index a2f1218..349e00f 100644
--- a/content/events/_index.md
+++ b/content/events/_index.md
@@ -1,18 +1,30 @@
 ---
-layout: single
-title: Events
+title: Events Archive
+layout: archive
+url: /events/archive/
 ---
 
-### New [August Installfest](2025/installfest/index.md)
+Here is a list of previous PLUG events, organized by year.
 
-We use the Google calendar (below) and [meetup](https://www.meetup.com/Perth-Linux-Users-Group-PLUG) to plan our events please look at those for specific events and details.
-
-Generally, PLUG runs a talk once a month at [Spacecubed](https://www.spacecubed.com/) along with a meetup in a local pub once every two months and a quiz night with prizes once a year around April or May.
-
-<iframe src="https://www.google.com/calendar/embed?showTitle=0&showNav=0&showDate=0&showPrint=0&showTabs=0&showCalendars=0&mode=AGENDA&height=200&wkst=1&bgcolor=%23FFFFFF&src=president%40plug.org.au&color=%23182C57&ctz=Australia%2FPerth" style=" border-width:0 " width="100%" height="500" frameborder="0" scrolling="no"></iframe>
-
-You can also subscribe to an [iCalendar feed](https://calendar.google.com/calendar/ical/president%40plug.org.au/public/basic.ics) of all events.
-
-To visit our archives of previous events (including talks), check out the [Event Archives](archive.md).
-
-To visit our archives of the Annual General Meetings and (where available) meeting minutes, check out the [Committee Archives](minutes/_index.md).
+[2025](2025/_index.md) |
+[2024](2024/_index.md) |
+[2021](2021/_index.md) |
+[2020](2020/_index.md) |
+[2019](2019/_index.md) |
+[2018](2018/_index.md) |
+[2017](2017/_index.md) |
+[2016](2016/_index.md) |
+[2015](2015/_index.md) |
+[2014](2014/_index.md) |
+[2013](2013/_index.md) |
+[2012](2012/_index.md) |
+[2011](2011.md) |
+[2010](2010.md) |
+[2009](2009.md) |
+[2008](2008/_index.md) |
+[2007](2007/_index.md) |
+[2006](2006/_index.md) |
+[2005](2005/_index.md) |
+[2004](2004/_index.md) |
+[2003](2003/_index.md) |
+[2001](2001.md)
diff --git a/content/events/archive.md b/content/events/archive.md
deleted file mode 100644
index 1fa1e06..0000000
--- a/content/events/archive.md
+++ /dev/null
@@ -1,28 +0,0 @@
----
-title: Events Archive
----
-
-Here is a list of previous PLUG events, organized by year.
-
-* [2025](2025/_index.md)
-* [2024](2024/_index.md)
-* [2021](2021/_index.md)
-* [2020](2020/_index.md)
-* [2019](2019/_index.md)
-* [2018](2018/_index.md)
-* [2017](2017/_index.md)
-* [2016](2016/_index.md)
-* [2015](2015/_index.md)
-* [2014](2014/_index.md)
-* [2013](2013/_index.md)
-* [2012](2012/_index.md)
-* [2011](2011.md)
-* [2010](2010.md)
-* [2009](2009.md)
-* [2008](2008.md)
-* [2007](2007.md)
-* [2006](2006.md)
-* [2005](2005.md)
-* [2004](2004.md)
-* [2003](2003.md)
-* [2001](2001.md)
diff --git a/content/events/calendar.md b/content/events/calendar.md
new file mode 100644
index 0000000..f288b49
--- /dev/null
+++ b/content/events/calendar.md
@@ -0,0 +1,18 @@
+---
+title: Events
+url: /events/
+build:
+  list: false
+---
+
+We use the Google calendar (below) and [meetup](https://www.meetup.com/Perth-Linux-Users-Group-PLUG) to plan our events please look at those for specific events and details.
+
+Generally, PLUG runs a talk once a month at [Spacecubed](https://www.spacecubed.com/) along with a meetup in a local pub once every two months and a quiz night with prizes once a year around April or May.
+
+<iframe src="https://www.google.com/calendar/embed?showTitle=0&showNav=0&showDate=0&showPrint=0&showTabs=0&showCalendars=0&mode=AGENDA&height=200&wkst=1&bgcolor=%23FFFFFF&src=president%40plug.org.au&color=%23182C57&ctz=Australia%2FPerth" style=" border-width:0 " width="100%" height="500" frameborder="0" scrolling="no"></iframe>
+
+You can also subscribe to an [iCalendar feed](https://calendar.google.com/calendar/ical/president%40plug.org.au/public/basic.ics) of all events.
+
+To visit our archives of previous events (including talks), check out the [Event Archives](_index.md).
+
+To visit our archives of the Annual General Meetings and (where available) meeting minutes, check out the [Committee Archives](minutes/_index.md).
diff --git a/layouts/events/archive.html b/layouts/events/archive.html
new file mode 100644
index 0000000..c6a9e67
--- /dev/null
+++ b/layouts/events/archive.html
@@ -0,0 +1,23 @@
+{{ define "main" }}
+<div class="post">
+
+  <article class="post-content">
+    <section>
+      {{- .Content -}}
+    </section>
+    <section>
+      {{ $paginator := .Paginate .RegularPagesRecursive }}
+      {{ range $paginator.Pages.GroupByDate "January 2006" }}
+      <h3>{{ .Key }}</h3>
+      <ul>
+        {{ range .Pages }}
+        {{- partial "summary.html" . -}}
+        {{ end }}
+      </ul>
+      {{ end }}
+    </section>
+    {{- template "_internal/pagination.html" . -}}
+  </article>
+
+</div>
+{{ end }}
diff --git a/layouts/events/single.html b/layouts/events/single.html
index 3dcf61f..16dba61 100644
--- a/layouts/events/single.html
+++ b/layouts/events/single.html
@@ -3,6 +3,9 @@
 
   <header class="post-header">
     <h1 class="post-title">{{ .Page.Title }}</h1>
+{{- with .Page.GetTerms "presenters" }}
+      <p>by {{ range $i, $p := . }}{{ if $i }}, {{ end }}<a href="{{ $p.RelPermalink }}">{{ $p.Title }}</a>{{ end }}</p>
+{{- end }}
     {{ if not .Page.IsHome }}{{ with .Page.Date }}<p class="post-meta">{{ .Format "January 2, 2006" }}</p>{{ end }}{{ end -}}
   </header>
 
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index 2ffb231..f3c4b3d 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -6,7 +6,7 @@
   <link rel="shortcut icon" href="{{ relURL ($.Site.Params.favicon) }}" type="image/x-icon" />
   {{- end }}
 
-  <title>{{ if .Params.Title }}{{ .Params.Title }}{{ else }}{{ .Site.Title }}{{ end }}</title>
+  <title>{{ if .Title }}{{ .Title }}{{ else }}{{ .Site.Title }}{{ end }}</title>
   {{/* NOTE: These Hugo Internal Templates can be found starting at https://gi
 thub.com/spf13/hugo/blob/master/tpl/tplimpl/template_embedded.go#L158 */}}
   {{- template "_internal/opengraph.html" . -}}
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index f0b0423..d3aced8 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -17,7 +17,7 @@
         <a class="page-link" href="{{ relref . "/_index.md" }}">Home</a>
         <a class="page-link" href="{{ relref . "/about/_index.md" }}">About</a>
         <a class="page-link" href="{{ relref . "/membership.md" }}">Membership</a>
-        <a class="page-link" href="{{ relref . "/events/_index.md" }}">Events</a>
+        <a class="page-link" href="{{ relref . "/events/calendar.md" }}">Events</a>
         <a class="page-link" href="{{ relref . "/projects/_index.md" }}">Projects</a>
         <a class="page-link" href="{{ relref . "/resources/_index.md" }}">Resources</a>
         <a class="page-link" href="{{ relref . "/sponsors/_index.md" }}">Sponsors</a>
diff --git a/layouts/partials/summary.html b/layouts/partials/summary.html
index fc76c24..3f0c051 100644
--- a/layouts/partials/summary.html
+++ b/layouts/partials/summary.html
@@ -1,3 +1,5 @@
-<li><div><a href="{{ .RelPermalink }}">{{ .Title }}</a></div>
+<li><div><a href="{{ .RelPermalink }}">{{ .Title }}</a>
+{{- with .GetTerms "presenters" }} by {{ range $i, $p := . }}{{ if $i }}, {{ end }}{{ .Title }}{{ end }}{{ end -}}
+</div>
 {{- with .Summary }}<div>{{ . }}</div>{{ end -}}
 </li>