Index: trunk/src/scriptbuilder/gui/panels/IncidentTimelinePanel.java
===================================================================
--- trunk/src/scriptbuilder/gui/panels/IncidentTimelinePanel.java	(revision 98)
+++ trunk/src/scriptbuilder/gui/panels/IncidentTimelinePanel.java	(revision 101)
@@ -80,5 +80,5 @@
      * event types. Values: Properties objects for those events.
      */
-    Map<ScriptEventType, Properties> eventTypeToPropertyMap;
+    public static Map<ScriptEventType, Properties> eventTypeToPropertyMap;
 
     /**
@@ -225,15 +225,9 @@
             }
 
-            if (incident.slices.get(newSlice) != null)
-
-            {
-                for (I_ScriptEvent se : incident.slices.get(newSlice).events)
-                {
-                    if (ed != null)
-                    {
-                        ed.addProperty(eventTypeToPropertyMap.get(se.getScriptEventType()), se);
-                    }
-                }
-            }
+            if (ed != null)
+            {
+                ed.setSlice(incident.slices.get(newSlice));
+            }
+            
 
             /**
@@ -250,5 +244,5 @@
                         if (ed != null)
                         {
-                            ed.addProperty(eventTypeToPropertyMap.get(g.currentEventType), s);
+                            ed.addEvent(eventTypeToPropertyMap.get(g.currentEventType), s);
                         }
                         if (incident.slices.get(newSlice) == null)