diff --git a/Event.java b/Event.java
index 2440740..8585133 100644
--- a/Event.java
+++ b/Event.java
@@ -112,11 +112,31 @@ public class Event implements Serializable {
 		this.stage = stage;
 	}
 	
-	public GregorianCalendar getLength()
+	public int getLength()
 	{
 		GregorianCalendar length = endDate;
 		System.out.println(endDate.getTime());
-		return length;
+		return 10;
+	}
+	
+	public int getStartTime()
+	{
+		return 1800;
+	}
+	
+	public int getEndTime()
+	{
+		return 2100;
+	}
+	
+	public void setStartTime(int time)
+	{
+		
+	}
+	
+	public void setEndTime(int time)
+	{
+		
 	}
 
 	public String toString() {
diff --git a/StagePanel.java b/StagePanel.java
index f8a206e..3c3a827 100644
--- a/StagePanel.java
+++ b/StagePanel.java
@@ -13,13 +13,13 @@ public class StagePanel extends JPanel
 {
 	private BufferedImage image;
 	private int width, height, posX;
-	private Stage stage;
-	public StagePanel(int width, int height, int posX, Stage stage) 
+	private Event event;
+	public StagePanel(int width, int height, int posX, Event event) 
 	{
 		this.width = width;
 		this.height = height;
 		this.posX = posX;
-		this.stage = stage;
+		this.event = event;
 		image = new BufferedImage(this.width, this.height, BufferedImage.TYPE_INT_ARGB);
 		Graphics2D g2 = image.createGraphics();
 		g2.setColor(Color.blue);
@@ -69,17 +69,17 @@ public class StagePanel extends JPanel
 	
 	public void setStageStartTime(int startTime)
 	{
-		stage.setStartTime(startTime);
+		event.setStartTime(startTime);
 	}
 	
 	public void setStageEndTime(int endTime)
 	{
-		stage.setEndTime(endTime);
+		event.setEndTime(endTime);
 	}
 	
 	public int getStageStartTime()
 	{
-		return stage.getStartTime();
+		return event.getStartTime();
 	}
 	
 	public int getImageWidth()
diff --git a/Timeline.java b/Timeline.java
index 7ea109d..f1b496d 100644
--- a/Timeline.java
+++ b/Timeline.java
@@ -40,9 +40,9 @@ public class Timeline extends JPanel
 //	});
 	
 	
-	DateTime dt1 = new DateTime(2000, 1, 1, 0, 0, 0, 0);
-	DateTime dt2 = new DateTime(2010, 1, 1, 0, 0, 0, 0);
-	int days = Days.daysBetween(dt1, dt2).getDays();
+//	DateTime dt1 = new DateTime(2000, 1, 1, 0, 0, 0, 0);
+//	DateTime dt2 = new DateTime(2010, 1, 1, 0, 0, 0, 0);
+//	int days = Days.daysBetween(dt1, dt2).getDays();
 	
 	public Timeline(JPanel frame) 
 	{
@@ -223,8 +223,8 @@ public class Timeline extends JPanel
 
 	public int calcEndTimeOfStagePanel(int posx, int imageWidth)
 	{
-		GregorianCalendar min = findMinMax(1);
-		GregorianCalendar max = findMinMax(2);
+		int min = findMinMax(1);
+		int max = findMinMax(2);
 		//Omdat het anders onnodig afgerond wordt, alles apart in doubles.
 		double minmax = max-min;
 		double bottom = this.getWidth() / minmax;
@@ -243,8 +243,8 @@ public class Timeline extends JPanel
 		//		Steage oldstage = new Stage(oldevents,0,null, 0, 0);
 		ArrayList<Event> eventscopy = (ArrayList<Event>) events.clone();
 
-		GregorianCalendar earliestStartTime = null;
-		GregorianCalendar lastEndTime = null;
+		Integer earliestStartTime = null;
+		Integer lastEndTime = null;
 
 		for(Event event : eventscopy)
 		{
@@ -253,14 +253,14 @@ public class Timeline extends JPanel
 				if(earliestStartTime == null)
 				{
 
-					earliestStartTime = event.getStartDate();
+					earliestStartTime = event.getStartTime();
 				}
 
 				else
 				{
-					if(event.getStartDate() < earliestStartTime)
+					if(event.getStartTime() < earliestStartTime)
 					{
-						earliestStartTime = event.getStartDate();
+						earliestStartTime = event.getStartTime();
 					}
 				}
 			}
@@ -268,13 +268,13 @@ public class Timeline extends JPanel
 			{
 				if(lastEndTime == null)
 				{
-					lastEndTime = event.getEndDate();
+					lastEndTime = event.getEndTime();
 				}
 				else
 				{
-					if(event.getEndDate() > lastEndTime)
+					if(event.getEndTime() > lastEndTime)
 					{
-						lastEndTime = event.getEndDate();
+						lastEndTime = event.getEndTime();
 					}
 				}
 			}