Index: trunk/src/scriptbuilder/gui/panels/TimeStampPanel.java
===================================================================
--- trunk/src/scriptbuilder/gui/panels/TimeStampPanel.java	(revision 76)
+++ trunk/src/scriptbuilder/gui/panels/TimeStampPanel.java	(revision 98)
@@ -61,5 +61,5 @@
                 if ((incident.length + incident.offset) > longestLength)
                 {
-                    longestLength = incident.length + incident.offset;
+                    longestLength = incident.length + incident.offset + IncidentTimelinePanel.requestedScriptBuilderFillerTime;
                 }
             }
@@ -92,5 +92,5 @@
      * @param incident the incident which this window is editing.
      */
-    public void update(ScriptIncident incident)
+    public void update(ScriptIncident incident, IncidentTimelinePanel timeline)
     {
         longestLength = ScriptBuilderGuiConstants.TICK_TIMELINE_SMALLEST_LENGTH;
@@ -105,5 +105,5 @@
             if ((incident.length + incident.offset) > longestLength)
             {
-                longestLength = incident.length + incident.offset;
+                longestLength = incident.length + incident.offset + timeline.requestedEditorFillerTime;
             }
         }
Index: trunk/src/scriptbuilder/gui/panels/IncidentTimelinePanel.java
===================================================================
--- trunk/src/scriptbuilder/gui/panels/IncidentTimelinePanel.java	(revision 96)
+++ trunk/src/scriptbuilder/gui/panels/IncidentTimelinePanel.java	(revision 98)
@@ -62,4 +62,19 @@
 
     /**
+     * Filler time at the end of the screen for a particular incident
+     */
+    public int requestedEditorFillerTime;
+
+    /**
+     * Filler time at the end of the screen for the whole script
+     */
+    public static int requestedScriptBuilderFillerTime = 0;
+
+    /**
+     * Constant for amount of filler to add, in seconds. Set to 15 minutes
+     */
+    public static final int FILLER_INTERVAL_SECONDS = 900;
+
+    /**
      * The map representing the properties of this incident's events. Keys:
      * event types. Values: Properties objects for those events.
@@ -310,4 +325,5 @@
         super();
 
+        requestedEditorFillerTime = 0;
 //        FACILITATOR_EVAL_EVENT, RADIO_EVAL_EVENT
         eventTypeToPropertyMap = new HashMap();
@@ -352,10 +368,23 @@
         {
 
-            newSize = new Dimension(((incident.length + incident.offset)
-                    / ScriptBuilderGuiConstants.HORIZONTAL_TICK_RESOLUTION
-                    * ScriptBuilderGuiConstants.PIXEL_WIDTH_PER_HORIZONTAL_TICK)
-                    + ScriptBuilderGuiConstants.EVENT_ICON_WIDTH,
-                    ScriptBuilderGuiConstants.TIMELINE_COLLAPSED_HEIGHT
-                    + ScriptBuilderGuiConstants.SCRIPT_EVENT_ICON_STEP * 2);
+            if (getTopLevelAncestor() instanceof IncidentEditorFrame)
+            {
+
+                newSize = new Dimension(((incident.length + incident.offset + requestedEditorFillerTime)
+                        / ScriptBuilderGuiConstants.HORIZONTAL_TICK_RESOLUTION
+                        * ScriptBuilderGuiConstants.PIXEL_WIDTH_PER_HORIZONTAL_TICK)
+                        + ScriptBuilderGuiConstants.EVENT_ICON_WIDTH,
+                        ScriptBuilderGuiConstants.TIMELINE_COLLAPSED_HEIGHT
+                        + ScriptBuilderGuiConstants.SCRIPT_EVENT_ICON_STEP * 2);
+            }
+            else
+            {
+                newSize = new Dimension(((incident.length + incident.offset + requestedScriptBuilderFillerTime)
+                        / ScriptBuilderGuiConstants.HORIZONTAL_TICK_RESOLUTION
+                        * ScriptBuilderGuiConstants.PIXEL_WIDTH_PER_HORIZONTAL_TICK)
+                        + ScriptBuilderGuiConstants.EVENT_ICON_WIDTH,
+                        ScriptBuilderGuiConstants.TIMELINE_COLLAPSED_HEIGHT
+                        + ScriptBuilderGuiConstants.SCRIPT_EVENT_ICON_STEP * 2);
+            }
 
         }
Index: trunk/src/scriptbuilder/gui/panels/TimelineTickPanel.java
===================================================================
--- trunk/src/scriptbuilder/gui/panels/TimelineTickPanel.java	(revision 76)
+++ trunk/src/scriptbuilder/gui/panels/TimelineTickPanel.java	(revision 98)
@@ -118,5 +118,5 @@
                 if ((incident.length + incident.offset) > longestLength)
                 {
-                    longestLength = incident.length + incident.offset;
+                    longestLength = incident.length + incident.offset + IncidentTimelinePanel.requestedScriptBuilderFillerTime;
                 }
             }
@@ -141,5 +141,5 @@
      * @param incident the incident being edited
      */
-    public void update(ScriptIncident incident)
+    public void update(ScriptIncident incident, IncidentTimelinePanel timeline)
     {
         longestLength = ScriptBuilderGuiConstants.TICK_TIMELINE_SMALLEST_LENGTH;
@@ -155,5 +155,5 @@
             if ((incident.length + incident.offset) > longestLength)
             {
-                longestLength = incident.length + incident.offset;
+                longestLength = incident.length + incident.offset + timeline.requestedEditorFillerTime;
             }