diff --git a/events.xml b/events.xml
index 963bbef..c46dc3e 100644
--- a/events.xml
+++ b/events.xml
@@ -3,6 +3,20 @@
 <!DOCTYPE eventdefs SYSTEM "csc.dtd">
 <eventdefs>
 
+<!-- Spring 2009 -->
+<eventitem date="2009-05-12" time="12:00 noon" room="MC 2034" title="PHP on Windows">
+    <short><p>PHP Programming Contest Info Session</p></short>
+    <abstract><p>
+    Port or create a new PHP web application and you could win a prize
+    of up to $10k. Microsoft is running a programming contest for PHP
+    developers willing to support the Windows platform. The contest is
+    ongoing; this will be a short introduction to it by
+    representatives of Microsoft and an opportunity to ask questions.
+    Pizza and pop will be provided.
+    </p></abstract>
+</eventitem>
+
+
 <!-- Winter 2009 -->
 <eventitem date="2009-04-02" time="4:30 PM" room="DC1302" title="Rapid prototyping and mathematical art">
   
diff --git a/media/index.xml b/media/index.xml
index bc725d4..29b248d 100644
--- a/media/index.xml
+++ b/media/index.xml
@@ -11,6 +11,53 @@
     CD or DVD should you so choose.
     <ul>
 
+<mediaitem title="Programming Quantum Computers">
+  <abstract><p>
+    Raymond Laflamme is the director of the Institute for Quantum Computing at the 
+    University of Waterloo and holds the Canada Research Chair in Quantum Information. 
+    He will give a brief introduction to quantum computing and why it matters, followed 
+    by a talk on programming quantum computers. This is followed by tours of IQC Labs.
+  </p></abstract>
+  <mediafile file="iqc1.avi" type="Talk (XviD)" />
+  <mediafile file="iqc1.ogg" type="Talk (Ogg/Theora)" />
+  <mediafile file="iqc1.mp4" type="Talk (MP4)" />
+  <mediafile file="iqc1.mpg" type="Talk (MPG)" />
+  <mediafile file="iqc2.avi" type="Quantum Key Distribution Lab (XviD)" />
+  <mediafile file="iqc2.ogg" type="Quantum Key Distribution Lab (Ogg/Theora)" />
+  <mediafile file="iqc2.mp4" type="Quantum Key Distribution Lab (MP4)" />
+  <mediafile file="iqc2.mpg" type="Quantum Key Distribution Lab (MPG)" />
+  <mediafile file="iqc3.avi" type="NMR Quantum Computer (XviD)" />
+  <mediafile file="iqc3.ogg" type="NMR Quantum Computer (Ogg/Theora)" />
+  <mediafile file="iqc3.mp4" type="NMR Quantum Computer (MP4)" />
+  <mediafile file="iqc3.mpg" type="NMR Quantum Computer (MPG)" />
+  <flvfile file="iqc1.flv" />
+</mediaitem>
+
+<mediaitem title="Functional Lexing and Parsing">
+  <abstract><p>
+    This talk will describe a non-traditional functional approach to the
+    classical problems of lexing (breaking a stream of characters into
+    "words" or tokens) and parsing (identifying tree structure in a stream
+    of tokens based on a grammar, e.g. for a programming language that
+    needs to be compiled or interpreted). The functional approach can
+    clarify and organize a number of algorithms that tend to be opaque in
+    their conventional imperative presentation. No prior background in
+    functional programming, lexing, or parsing is assumed.
+  </p>
+  <p>The slides for this talk can be found <a href="http://mirror.csclub.uwaterloo.ca/csclub/pr-functional-lexing-parsing-slides.pdf">here</a> as a pdf.
+  </p></abstract>
+  <mediafile file="pr-functional-lexing-parsing.avi" type="XviD" />
+  <mediafile file="pr-functional-lexing-parsing.ogg" type="Ogg/Theora" />
+  <mediafile file="pr-functional-lexing-parsing.mp4" type="MP4" />
+  <mediafile file="pr-functional-lexing-parsing.mpg" type="MPG" />
+  <flvfile file="pr-functional-lexing-parsing.flv" />
+  <other>
+  <h2>Contact</h2>
+  <p>If you would like to contact Dr. Ragde check out his <a href="http://www.cs.uwaterloo.ca/~plragde">website</a> or e-mail him at plragde at uwaterloo dot ca.</p>
+  </other>
+</mediaitem>
+  
+
 <mediaitem title="Rapid Prototyping and Mathematical Art">
   <abstract><p>
    The combination of computer graphics, geometry, and rapid
@@ -31,6 +78,8 @@
   <mediafile file="kaplan-mathematical-art.mpg" type="MPG" />
   <flvfile file="kaplan-mathematical-art.flv" />
   <other>
+    <h2>Contact</h2>
+    <p>If you would like to contact Dr. Kaplan check out his <a href="http://www.cgl.uwaterloo.ca/~csk/">website</a> or e-mail him at csk at uwaterloo dot ca.</p>
     <h2>Links and credits</h2>
 
     <p>This talk included images of the work of a large number of talented