diff --git a/Main.java b/Main.java
index 161993e..405e85a 100644
--- a/Main.java
+++ b/Main.java
@@ -35,7 +35,7 @@ public class Main {
 		
 		agn.fillArtists();
 		agn.fillStages();
-		w.updatePanel("table");
+		w.updatePanel("timeline");
 	}
 
 }
diff --git a/Timeline.java b/Timeline.java
index f1b496d..6c56597 100644
--- a/Timeline.java
+++ b/Timeline.java
@@ -51,9 +51,14 @@ public class Timeline extends JPanel
 
 		genStages();
 		this.setSize(frame.getWidth(), frame.getHeight());
-		refresh();
+//		refresh();
 		
 	}
+	
+	public void setEvents(ArrayList<Event> events)
+	{
+		this.events = events;
+	}
 
 	public void refresh()
 	{
diff --git a/TimelinePanel.java b/TimelinePanel.java
index db5e133..cb06cc7 100644
--- a/TimelinePanel.java
+++ b/TimelinePanel.java
@@ -27,8 +27,14 @@ public class TimelinePanel extends JPanel implements Panel {
 	@Override
 	public void update(ArrayList<Event> event) 
 	{
-		// TODO Auto-generated method stub
+		timeline.setEvents(event);
+		timeline.refresh();
 		
 	}
+	
+	public TimelinePanel getTimelinePanel()
+	{
+		return this;
+	}
 
 }
diff --git a/Window.java b/Window.java
index ec670bd..9222081 100644
--- a/Window.java
+++ b/Window.java
@@ -7,6 +7,8 @@ import java.awt.FlowLayout;
 import java.awt.Toolkit;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.awt.event.ComponentAdapter;
+import java.awt.event.ComponentEvent;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import java.text.SimpleDateFormat;
@@ -166,6 +168,13 @@ public class Window extends JFrame {
 		
 		//Show window
 		setVisible(true);
+		this.getRootPane().addComponentListener(new ComponentAdapter() 
+		{
+			public void componentResized(ComponentEvent e) {
+                TimelinePanel tempTimeLine = (TimelinePanel) timeline;
+                tempTimeLine.refresh();
+            }
+		});
 	}
 	
 	public static void updatePanel(String panel)