diff --git a/Event.java b/Event.java
index 8585133..6f74618 100644
--- a/Event.java
+++ b/Event.java
@@ -1,6 +1,8 @@
 import java.io.Serializable;
 import java.text.DateFormat;
+import java.text.Format;
 import java.text.SimpleDateFormat;
+import java.util.Calendar;
 import java.util.GregorianCalendar;
 
 public class Event implements Serializable {
@@ -114,24 +116,31 @@ public class Event implements Serializable {
 	
 	public int getLength()
 	{
-		GregorianCalendar length = endDate;
-		System.out.println(endDate.getTime());
-		return 10;
+		return getEndTime() - getStartTime();
 	}
 	
 	public int getStartTime()
 	{
-		return 1800;
+		DateFormat format = new SimpleDateFormat("kkmm");
+		format.setLenient(false);
+		System.out.println(format.format(startDate.getTime()));
+		
+//		System.out.println(date.get(Calendar.HOUR_OF_DAY));
+		
+		return Integer.valueOf(format.format(startDate.getTime()));
 	}
 	
 	public int getEndTime()
 	{
-		return 2100;
+		DateFormat format = new SimpleDateFormat("kkmm");
+		format.setLenient(false);
+		System.out.println(format.format(endDate.getTime()));
+		return Integer.valueOf(format.format(endDate.getTime()));
 	}
 	
 	public void setStartTime(int time)
 	{
-		
+		startDate.set(Calendar.HOUR, 6);
 	}
 	
 	public void setEndTime(int time)
diff --git a/Timeline.java b/Timeline.java
index 6c56597..2db4c54 100644
--- a/Timeline.java
+++ b/Timeline.java
@@ -84,7 +84,7 @@ public class Timeline extends JPanel
 		centerContainer.setPreferredSize(centerDim);
 
 		centerContainer.setMaximumSize(centerDim);
-		System.out.println(centerDim);
+//		System.out.println(centerDim);
 		mainPanel.add(centerContainer);
 		this.add(mainPanel, BorderLayout.CENTER);
 	}