diff --git a/.gitignore b/.gitignore
index 1cd7b4f..64452fc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 Export/
+out/
+.idea/
 \#*\#
diff --git a/Assets/test.json b/Assets/test.json
new file mode 100644
index 0000000..956981a
--- /dev/null
+++ b/Assets/test.json
@@ -0,0 +1,189 @@
+[
+  {
+    "days": [
+      {
+        "weekday": 2,
+        "time": "11:30-13:20"
+      },
+      {
+        "weekday": 2,
+        "time": "14:00-15:00"
+      },
+      {
+        "weekday": 4,
+        "time": "13:30-15:20"
+      }
+    ],
+    "start": {
+      "day": 28,
+      "month": 9,
+      "year": 2018
+    },
+    "end": {
+      "day": 1,
+      "month": 11,
+      "year": 2018
+    },
+    "homework": [
+      [20, 6],
+      [10, 4],
+      [30, 3]
+    ],
+    "project": 100,
+    "exception": [3],
+    "title": "Drawing"
+  },
+  {
+    "days": [
+      {
+        "weekday": 1,
+        "time": "10:30-11:20"
+      },
+      {
+        "weekday": 3,
+        "time": "10:30-11:20"
+      },
+      {
+        "weekday": 5,
+        "time": "10:30-11:20"
+      },
+      {
+        "weekday": 2,
+        "time": "15:00-15:30"
+      },
+      {
+        "weekday": 4,
+        "time": "15:00-15:30"
+      }
+    ],
+    "start": {
+      "day": 28,
+      "month": 9,
+      "year": 2018
+    },
+    "end": {
+      "day": 1,
+      "month": 11,
+      "year": 2018
+    },
+    "homework": [
+      [25, 6],
+      [5, 4],
+      [30, 3]
+    ],
+    "project": 1000,
+    "exception": [5],
+    "title": "Evolution and Ecology"
+  },
+  {
+    "days": [
+      {
+        "weekday": 2,
+        "time": "17:00-19:50"
+      }
+    ],
+    "start": {
+      "day": 28,
+      "month": 9,
+      "year": 2018
+    },
+    "end": {
+      "day": 1,
+      "month": 11,
+      "year": 2018
+    },
+    "homework": [
+      [60, 10]
+    ],
+    "project": 0,
+    "exception": [3, 8, 2],
+    "title": "EE Lab"
+  },
+  {
+    "days": [
+      {
+        "weekday": 1,
+        "time": "9:30-10:20"
+      },
+      {
+        "weekday": 3,
+        "time": "9:30-10:20"
+      },
+      {
+        "weekday": 5,
+        "time": "9:30-10:20"
+      }
+    ],
+    "start": {
+      "day": 28,
+      "month": 9,
+      "year": 2018
+    },
+    "end": {
+      "day": 1,
+      "month": 11,
+      "year": 2018
+    },
+    "homework": [
+      [25, 6],
+      [5, 4],
+      [30, 3]
+    ],
+    "project": 0,
+    "exception": [],
+    "title": "Chem"
+  },
+  {
+    "days": [
+      {
+        "weekday": 1,
+        "time": "18:00-20:50"
+      }
+    ],
+    "start": {
+      "day": 28,
+      "month": 9,
+      "year": 2018
+    },
+    "end": {
+      "day": 1,
+      "month": 11,
+      "year": 2018
+    },
+    "homework": [
+      [60, 10]
+    ],
+    "project": 0,
+    "exception": [7, 4],
+    "title": "Chem Lab"
+  },
+  {
+    "days": [
+      {
+        "weekday": 2,
+        "time": "15:30-16:50"
+      },
+      {
+        "weekday": 4,
+        "time": "15:30-16:50"
+      }
+    ],
+    "start": {
+      "day": 28,
+      "month": 9,
+      "year": 2018
+    },
+    "end": {
+      "day": 1,
+      "month": 11,
+      "year": 2018
+    },
+    "homework": [
+      [0, 2],
+      [10, 20]
+    ],
+    "project": 0,
+    "exception": [4, 5],
+    "title": "How Things Work"
+  }
+]
diff --git a/Source/Assignment.hx b/Source/Assignment.hx
index e16150c..d0e2cb8 100644
--- a/Source/Assignment.hx
+++ b/Source/Assignment.hx
@@ -5,8 +5,7 @@ import openfl.display.Shape;
 import openfl.text.TextField;
 import openfl.events.MouseEvent;
 
-class Assignment extends Sprite
-{
+class Assignment extends Sprite {
     private var rect:Shape;
     private var workRect:Shape;
     private var workSize:Float;
@@ -16,64 +15,61 @@ class Assignment extends Sprite
     private var working:Bool;
     private var size:Float;
     private var interestRate:Float;
-    
-    public function new (size:Float, height:Float, color:Int, barWidth:Int, interestRate:Float, workRate:Float){
-	super();
 
-	this.color = color;
-	this.barWidth = barWidth;
-	this.size = size;
-	this.interestRate = interestRate;
-	this.workRate = workRate;
-	this.y = -height;
+    public function new(size:Float, height:Float, color:Int, barWidth:Int, interestRate:Float, workRate:Float) {
+        super();
 
-	working = false;
-	
-	rect = new Shape();
-	workRect = new Shape();
-	workSize = 0;
-	drawRectangle(rect, size, color);
-	addChild(rect);
-	addChild(workRect);
+        this.color = color;
+        this.barWidth = barWidth;
+        this.size = size;
+        this.interestRate = interestRate;
+        this.workRate = workRate;
+        this.y = -height;
 
-	this.addEventListener(MouseEvent.MOUSE_DOWN,
-			      function (e:MouseEvent)
-			      {working=true;});
-	this.addEventListener(MouseEvent.MOUSE_UP,
-			      function (e:MouseEvent)
-			      {working=false;});
-	this.addEventListener(MouseEvent.MOUSE_OUT,
-			      function (e:MouseEvent)
-			      {working=false;});
+        working = false;
+
+        rect = new Shape();
+        workRect = new Shape();
+        workSize = 0;
+        drawRectangle(rect, size, color);
+        addChild(rect);
+        addChild(workRect);
+
+        this.addEventListener(MouseEvent.MOUSE_DOWN,
+        function(e:MouseEvent) {working = true;});
+        this.addEventListener(MouseEvent.MOUSE_UP,
+        function(e:MouseEvent) {working = false;});
+        this.addEventListener(MouseEvent.MOUSE_OUT,
+        function(e:MouseEvent) {working = false;});
     }
 
-    private function drawRectangle(shape:Shape, size:Float, color:Int){
-	shape.graphics.clear();
-	shape.graphics.lineStyle(0);
-	shape.graphics.beginFill(color, 1);
-        shape.graphics.drawRect(-Math.round(barWidth/2),-size,barWidth,size);
-	shape.graphics.endFill();
+    private function drawRectangle(shape:Shape, size:Float, color:Int) {
+        shape.graphics.clear();
+        shape.graphics.lineStyle(0);
+        shape.graphics.beginFill(color, 1);
+        shape.graphics.drawRect(-Math.round(barWidth / 2), -size, barWidth, size);
+        shape.graphics.endFill();
     }
 
-    public function update (gameDate:Date, delta:Float, height:Float):Float {//returns size
-       	accrueInterest(delta);
-       	this.y = -height;
-	if(working){
-	    work(delta);
-	    if (workSize>=size){
-		size = 0; // This is an indication that the assignment is done
-	    }
-	}
-	return size;
+    public function update(gameDate:Date, delta:Float, height:Float):Float {//returns size
+        accrueInterest(delta);
+        this.y = -height;
+        if (working) {
+            work(delta);
+            if (workSize >= size) {
+                size = 0; // This is an indication that the assignment is done
+            }
+        }
+        return size;
     }
 
-    private function accrueInterest(delta:Float){
-	size += interestRate*(delta/(3600*24))*(size-workSize); // only get interest on part that you didn't do yet
-	drawRectangle(rect, size, color);
+    private function accrueInterest(delta:Float) {
+        size += interestRate * (delta / (3600 * 24)) * (size - workSize); // only get interest on part that you didn't do yet
+        drawRectangle(rect, size, color);
     }
 
-    private function work(delta:Float){
-	workSize += workRate*delta/(3600*24);
-	drawRectangle(workRect, workSize, 0x897ea9);
+    private function work(delta:Float) {
+        workSize += workRate * delta / (3600 * 24);
+        drawRectangle(workRect, workSize, 0x897ea9);
     }
 }
diff --git a/Source/Bar.hx b/Source/Bar.hx
index 186b39c..51020a7 100644
--- a/Source/Bar.hx
+++ b/Source/Bar.hx
@@ -1,12 +1,13 @@
 package;
 
+import Lecture.LectureObject;
+import DateTools;
 import openfl.display.Sprite;
 import openfl.display.Shape;
 import openfl.text.TextField;
 import openfl.events.MouseEvent;
 
-class Bar extends Sprite
-{
+class Bar extends Sprite {
     private var nameHeight = 15;
     private var barWidth = 20;
     private var assignments:Array<Assignment>;
@@ -15,63 +16,58 @@ class Bar extends Sprite
     //    private var nameField:TextField;
     private var interestRate:Float;
     private var workRate:Float;
-    private var lectures:Array<Lecture>;
-    private var lectureNum:Int;
-    private var lectureEndDate:Date;
+    private var lectures:Lecture.LectureIterator;
     private var initGameDate:Date;
+    private var curLecture:LectureObject;
     private var color:Int;
-   
+
     // interestRate is the proportion of the total that increases per day
 
-    public function new(interestRate:Float, workRate:Float, startHeight:Int, nameStr:String, lectures:Array<Lecture>, gameDate:Date, color:Int=0x000000) {
-	super();
+    public function new(interestRate:Float, workRate:Float, startHeight:Int, nameStr:String, lectures:Lecture.LectureIterator, gameDate:Date, color:Int = 0x000000) {
+        super();
 
-	this.color = color;
+        this.color = color;
 
-	assignments = new Array();
-	heights = new Array();
-	heights.push(0);
-	numAssignments = 0;
+        assignments = new Array();
+        heights = new Array();
+        heights.push(0);
+        numAssignments = 0;
 
-	this.interestRate = interestRate;
-	this.workRate = workRate;
-	this.lectures = lectures;
-	lectureNum = 0;
-	initGameDate = gameDate;
-       	lectureEndDate = Util.jsonTimeToDate(initGameDate, lectures[lectureNum].times.split(" ")[1]);
+        this.interestRate = interestRate;
+        this.workRate = workRate;
+        this.lectures = lectures;
+        initGameDate = gameDate;
+        curLecture = lectures.next();
     }
 
     public function update(gameDate:Date, delta:Float) {
-	var i:Int = 0;
-	var size:Float;
-	// We need a while loop instead of a for loop because numAssignments can change during, and a for loop converts it to a number at the outset
-	while (i<numAssignments){
-	    size = assignments[i].update(gameDate, delta, heights[i]);
-	    if (size == 0){
-		removeChild(assignments[i]);
-		assignments = assignments.slice(0,i).concat(assignments.slice(i+1));
-		numAssignments--;
-	    } else {
-		heights[i+1] = heights[i] + size;
-	    }
-	    i++;
-	}
-	getHomework(gameDate);
+        var i:Int = 0;
+        var size:Float;
+        // We need a while loop instead of a for loop because numAssignments can change during, and a for loop converts it to a number at the outset
+        while (i < numAssignments) {
+            size = assignments[i].update(gameDate, delta, heights[i]);
+            if (size == 0) {
+                removeChild(assignments[i]);
+                assignments = assignments.slice(0, i).concat(assignments.slice(i + 1));
+                numAssignments--;
+            } else {
+                heights[i + 1] = heights[i] + size;
+            }
+            i++;
+        }
+        getHomework(gameDate);
     }
 
-    private function getHomework(gameDate:Date){
-	if (lectureNum < lectures.length){
-	    if (gameDate.getTime() > lectureEndDate.getTime()){
-		var size = lectures[lectureNum].size;
-		var assignment = new Assignment(size, heights[numAssignments], color, barWidth, interestRate, workRate);
-		assignments.push(assignment);
-		this.addChild(assignment);
-		lectureNum++;
-		if (lectureNum < lectures.length){
-		    lectureEndDate = Util.jsonTimeToDate(initGameDate, lectures[lectureNum].times.split(" ")[1]);
-		}
-		numAssignments++;
-	    }
-	}
+    private function getHomework(gameDate:Date) {
+        if (lectures.hasNext() && gameDate.getTime() > curLecture.endTime.getTime()) {
+            if (curLecture.hw) {
+                var size = curLecture.weight;
+                var assignment = new Assignment(size, heights[numAssignments], color, barWidth, interestRate, workRate);
+                assignments.push(assignment);
+                this.addChild(assignment);
+                numAssignments++;
+            }
+            curLecture = lectures.next();
+        }
     }
 }
diff --git a/Source/Calendar.hx b/Source/Calendar.hx
index f4b11f0..2579672 100644
--- a/Source/Calendar.hx
+++ b/Source/Calendar.hx
@@ -7,107 +7,106 @@ import haxe.ds.HashMap;
 
 class Calendar extends Sprite {
 
-    private var cells:HashMap<Day,TextField> = new HashMap();
-    private var weekdayHeight = 15;
-    private var today:Day;
-    
-    private var xOffset:Int;
-    private var yOffset:Int;
-    private var cellWidth:Int;
-    private var cellHeight:Int;
-    private var rows:Int;
-    private var endDate:Date; //first date not in calendar
-    
-    public function new(width, height, date:Date){
-	super();
-	today = Day.fromDate(date);
-	//round down to nearest Sunday to get endDate because nothing in calendar yet
-	endDate = DateTools.delta(date, -DateTools.days(date.getDay()));
-	
-	xOffset = 0;
-	yOffset = weekdayHeight;
-	cellWidth = Math.round(width/7);
-	cellHeight = Math.round((height-weekdayHeight)/2);
-	rows = 2;
-	
-	makeGrid();
-	makeWeekdays();
-	cells.get(today).backgroundColor = 0xEE5D15;
-    }
+	private var cells:HashMap<Day,TextField> = new HashMap();
+	private var weekdayHeight = 15;
+	private var today:Day;
 
-    private function makeRow (rowNum){
-	for (j in 0...7){
-	    
-	    var cell:TextField = new TextField();
-	    addChild(cell);
-	    
-	    cell.x = xOffset + j*cellWidth;
-	    cell.y = yOffset + rowNum*cellHeight;
-	    cell.text = Std.string(endDate.getDate());
-	    trace(endDate);
-	    if (endDate.getDate()==1){
-		var ms:Array<String> = ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"];
-		var m = ms[endDate.getMonth()];
-		trace(ms);
-		trace(m);
-		cell.text += " "+m; 
-	    }
-	    
-	    cell.background = true;
-	    cell.backgroundColor = 0xFFFFFF;
-	    cell.border = true;
-	    cell.borderColor = 0x000000;
-	    cell.width = cellWidth;
-	    cell.height = cellHeight;
+	private var xOffset:Int;
+	private var yOffset:Int;
+	private var cellWidth:Int;
+	private var cellHeight:Int;
+	private var rows:Int;
+	private var endDate:Date; //first date not in calendar
 
-	    cells.set(Day.fromDate(endDate),cell);
+	public function new(width, height, date:Date){
+		super();
+		today = Day.fromDate(date);
+		//round down to nearest Sunday to get endDate because nothing in calendar yet
+		endDate = DateTools.delta(date, -DateTools.days(date.getDay()));
 		
-	    endDate = DateTools.delta(endDate, 24*3600*1000);//DateTools.days(1));
+		xOffset = 0;
+		yOffset = weekdayHeight;
+		cellWidth = Math.round(width/7);
+		cellHeight = Math.round((height-weekdayHeight)/2);
+		rows = 2;
+		
+		makeGrid();
+		makeWeekdays();
+		cells.get(today).backgroundColor = 0xEE5D15;
 	}
-    }
 
-    private function makeGrid()
-    {
-	for (i in 0...rows){
-	    makeRow(i);
+	private function makeRow (rowNum){
+		for (j in 0...7){
+			
+			var cell:TextField = new TextField();
+			addChild(cell);
+			
+			cell.x = xOffset + j*cellWidth;
+			cell.y = yOffset + rowNum*cellHeight;
+			cell.text = Std.string(endDate.getDate());
+			trace(endDate);
+			if (endDate.getDate()==1){
+				var ms:Array<String> = ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"];
+				var m = ms[endDate.getMonth()];
+				trace(ms);
+				trace(m);
+				cell.text += " "+m; 
+			}
+			
+			cell.background = true;
+			cell.backgroundColor = 0xFFFFFF;
+			cell.border = true;
+			cell.borderColor = 0x000000;
+			cell.width = cellWidth;
+			cell.height = cellHeight;
+			
+			cells.set(Day.fromDate(endDate),cell);
+			
+			endDate = DateTools.delta(endDate, 24*3600*1000);//DateTools.days(1));
+		}
 	}
-    }
 
-    private function advanceGrid(){
-	for (cell in cells){
-	    if (cell.y <= yOffset){
-		removeChild(cell);
-	    } else {
-		cell.y -= cellHeight;
-	    }
+	private function makeGrid(){
+		for (i in 0...rows){
+			makeRow(i);
+		}
 	}
-	makeRow(rows-1);
-    }
 
-    private function makeWeekdays() {
-	var names:Array<String> = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"];
-	for (i in 0...7) {
-	    var weekday:TextField = new TextField();
-	    addChild(weekday);
+	private function advanceGrid(){
+		for (cell in cells){
+			if (cell.y <= yOffset){
+				removeChild(cell);
+			} else {
+				cell.y -= cellHeight;
+			}
+		}
+		makeRow(rows-1);
+	}
 
-	    weekday.text = names[i];
-	    weekday.x = xOffset + i*cellWidth;
-	    weekday.y = yOffset - 15;
+	private function makeWeekdays() {
+		var names:Array<String> = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"];
+		for (i in 0...7) {
+			var weekday:TextField = new TextField();
+			addChild(weekday);
+			
+			weekday.text = names[i];
+			weekday.x = xOffset + i*cellWidth;
+			weekday.y = yOffset - 15;
+		}
 	}
-    }
 
-    public function update(gameDate:Date) {
-	//trace("hi");
-	var day = Day.fromDate(gameDate);
-	//trace(today.month+" "+today.day);
-	//trace(day.month+" "+day.day);
-	if (!today.equals(day)){
-	    if (gameDate.getDay()==0){
-		advanceGrid();
-	    }
-	    cells.get(day).backgroundColor = 0xEE5D15;
-	    cells.get(today).backgroundColor = 0xFFFFFF;
-	    today=day;
+	public function update(gameDate:Date) {
+		//trace("hi");
+		var day = Day.fromDate(gameDate);
+		//trace(today.month+" "+today.day);
+		//trace(day.month+" "+day.day);
+		if (!today.equals(day)){
+			if (gameDate.getDay()==0){
+				advanceGrid();
+			}
+			cells.get(day).backgroundColor = 0xEE5D15;
+			cells.get(today).backgroundColor = 0xFFFFFF;
+			today=day;
+		}
 	}
-    }
 }
diff --git a/Source/Day.hx b/Source/Day.hx
index 24edaba..228d5a1 100644
--- a/Source/Day.hx
+++ b/Source/Day.hx
@@ -3,22 +3,24 @@ package;
 class Day {
     public var month:Int;
     public var day:Int;
+	public var year:Int;
 
-    public function new (month:Int, day:Int){
-	this.month = month;
-	this.day = day;
+    public function new (month:Int, day:Int, year:Int){
+		this.month = month;
+		this.day = day;
+		this.year = year;
     }
     
     public static function fromDate(date:Date){
-	return new Day(date.getMonth(), date.getDate());
+		return new Day(date.getMonth(), date.getDate(), date.getFullYear());
     }
 
     public function equals(other:Day){
-	return this.hashCode() == other.hashCode();
+		return this.hashCode() == other.hashCode();
     }
-    public function hashCode():Int
-    {
-	return month*8+day;
+    
+	public function hashCode():Int{
+		return month*8+day;
     }
 
 }
diff --git a/Source/Lecture.hx b/Source/Lecture.hx
index d9f9975..8d45a12 100644
--- a/Source/Lecture.hx
+++ b/Source/Lecture.hx
@@ -1,7 +1,144 @@
 package;
 
 typedef Lecture = {
-    var times:String;
-    var size:Int;
+    var days:Array<LectureDay>;
+    var start:SSDate;
+    var end:SSDate;
+    var homework:Array<Array<Int>>;
+    var project:Int;
+    var exception:Array<Int>;
     var title:String;
-}
\ No newline at end of file
+}
+
+typedef LectureDay = {
+    var weekday:Int;
+    var time:String;
+}
+
+typedef SSDate = {
+    var day:Int;
+    var month:Int;
+    var year:Int;
+}
+
+class LectureIterator {
+    private var startDate:Date;
+    private var endDate:Date;
+    private var weekdays:Array<Int>;
+    private var times:Array<Time>;
+    private var homework:Array<Array<Int>>;
+    private var exceptions:Array<Int>;
+
+    public var project:Int;
+    public var title:String;
+
+    private var curLecture:LectureObject;
+    private var curLectureNum:Int;
+    private var curHW:Int;
+    private var nextLecDate:Date;
+
+
+    public function new(lecture:Lecture) {
+        var start = Util.splitAndParseInt(lecture.days[0].time.split("-")[0], ":");
+
+        this.startDate = new Date(lecture.start.year, lecture.start.month, lecture.start.day, start[0], start[1], 0);
+        var delta = lecture.days[0].weekday - startDate.getDay();
+
+        if (delta < 0)
+            delta += 7;
+
+        startDate = DateTools.delta(this.startDate, DateTools.days(delta));
+
+        this.times = new Array<Time>();
+        this.weekdays = new Array<Int>();
+        for (i in lecture.days) {
+            var start = Util.splitAndParseInt(i.time.split("-")[0], ":");
+            var end = Util.splitAndParseInt(i.time.split("-")[1], ":");
+
+            var time:Time = new Time(start, end);
+            trace(lecture.title,time.start, time.end,i);
+            times.push(time);
+            weekdays.push(i.weekday);
+        }
+
+        this.endDate = new Date(lecture.end.year, lecture.end.month, lecture.end.day, 0, 0, 0);
+        this.homework = lecture.homework;
+        this.title = lecture.title;
+        this.exceptions = lecture.exception;
+        this.curLectureNum = 0;
+        this.curHW = 0;
+        this.project = lecture.project;
+        this.nextLecDate = startDate;
+    }
+
+    public function getCurLecture():LectureObject {
+        return curLecture;
+    }
+
+    //TODO spontaneous
+    public function next():LectureObject {
+        while (exceptions.indexOf(curLectureNum) != -1) {
+            nextDate();
+            curLectureNum++;
+        }
+        if (nextLecDate == null) return null;
+
+        var index = curLectureNum % times.length;
+        var delta:Float = DateTools.hours(times[index].end[0] - nextLecDate.getHours()) +
+            DateTools.minutes(times[index].end[1]) - nextLecDate.getMinutes();
+        var endTime = DateTools.delta(nextLecDate, delta);
+        var hw:Bool = false;
+        var weight:Int = 0;
+        if (curHW < homework.length) {
+            hw = homework[curHW][0] != 0;
+            weight = homework[curHW][0];
+            homework[curHW][1]--;
+            if (homework[curHW][1] == 0) curHW++;
+        }
+
+        curLecture = {startTime: nextLecDate, endTime: endTime, hw: hw};
+        if (hw) curLecture.weight = weight;
+
+        nextDate();
+        curLectureNum++;
+        trace(curLecture.startTime);
+        return curLecture;
+    }
+
+    public function hasNext():Bool {
+        return nextLecDate != null;
+    }
+
+    private function nextDate() {
+        var nextIndex = (curLectureNum + 1) % weekdays.length;
+        var next = weekdays[nextIndex];
+        var nextStart = times[nextIndex].start;
+        var curLecDate = curLecture.startTime;
+
+        var delta:Float = DateTools.days(next - curLecDate.getDay()) + DateTools.hours(nextStart[0] - curLecDate.getHours())
+            + DateTools.minutes(nextStart[1] - curLecDate.getMinutes());
+
+        if (delta <= 0)
+            delta += DateTools.days(7);
+
+        var nextDate = DateTools.delta(curLecDate, delta);
+        if (Util.DayinRange(startDate, endDate, nextDate))
+            nextLecDate = nextDate;
+        else nextLecDate = null;
+    }
+}
+
+typedef LectureObject = {
+    public var startTime:Date;
+    public var endTime:Date;
+    @:optional public var hwDueTime:Date;
+    @:optional public var weight:Int;
+    public var hw:Bool;
+}
+
+class Time {
+    public var start:Array<Int>;
+    public var end:Array<Int>;
+
+    public function new(start, end) {this.start = start; this.end = end;}
+}
diff --git a/Source/Main.hx b/Source/Main.hx
index 79c065d..ece132d 100644
--- a/Source/Main.hx
+++ b/Source/Main.hx
@@ -1,149 +1,154 @@
 package;
 
-
 import openfl.display.Sprite;
 import openfl.display.Shape;
 import openfl.display.Bitmap;
 import openfl.Assets;
 import openfl.events.Event;
+import openfl.events.KeyboardEvent;
+import openfl.ui.Keyboard;
 import haxe.Json;
 import haxe.Timer;
 
 class Main extends Sprite {
-    public static inline var m = 10;
-    public static inline var s1 = 150;
-    public static inline var s2 = 250;
-    public static inline var xM = m;
-    public static inline var yM = m;
-    public static inline var x1 = s1;
-    public static inline var x2 = 800-4*m-s1-s2;
-    public static inline var x3 = s2;
-    public static inline var y1 = s1;
-    public static inline var y2 = 600-3*m-s1;
-
-    public var timeScale:Float = 3600*6;
-    public var gameDate:Date; // must be a Sunday
-    public var mscheduleSpr:Calendar;
-    public var wscheduleSpr:Schedule;
-    public var bar1:Bar;
-    public var bar2:Bar;
-    public var bar3:Bar;
-    public var bar4:Bar;
-    public var bar5:Bar;
-    public var bar6:Bar;
-    public var initialTimestamp:Float;
-    public var initialGameTimestamp:Float;
-    public var scheduleObject:Array<Array<Lecture>>;
-    public var colors:Array<Int>;
-    
-    public function new () {
-	
-	super ();
-	
-	var scheduleJson = Assets.getText("assets/schedule.json");
-	scheduleObject = Json.parse(scheduleJson);
-
-	colors = [0xFF7800, 0x00FF00, 0x5555FF, 0xFFFF00, 0xFF00FF, 0xE3D3FF];
-
-	/*
-	  var bitmapData = Assets.getBitmapData ("assets/openfl.png");
-	  var bitmap = new Bitmap (bitmapData);
-	  addChild (bitmap);
-	  
-	  bitmap.x = (stage.stageWidth - bitmap.width) / 2;
-	  bitmap.y = (stage.stageHeight - bitmap.height) / 2;
-	*/
-        gameDate = new Date(2018, 9, 28, 0, 0, 0);
-	var gameDay = new Date(2018, 9, 28, 12, 0, 0);
-	//This is for the purpose of daylight savings.  Some days are 23 or 25 hours, so putting the time as noon will be stable WRT these changes.
-	
-	//trace(gameDate.getDay()); //Should be 0
-	initialTimestamp = Timer.stamp();
-	initialGameTimestamp = gameDate.getTime()/1000;
-	//trace(gameDate.getTime());
-	trace(initialTimestamp);
-	trace(Date.now().getTime()/1000);
-	trace(Timer.stamp());
-	mscheduleSpr = new Calendar(x2,y1, gameDay);
-	mscheduleSpr.x=2*xM+x1;
-	mscheduleSpr.y=yM;
-	var avatarSpr = new Sprite();
-	avatarSpr.x=xM;
-	avatarSpr.y=2*yM+y1;
-	var classesSpr = new Sprite();
-	classesSpr.x=2*xM+x1;
-	classesSpr.y=2*yM+y1;
-	wscheduleSpr = new Schedule(x3,y2, gameDay, scheduleObject, colors);
-	wscheduleSpr.x=3*xM+x1+x2;
-	wscheduleSpr.y=2*yM+y1;
-	
-	//	var rectangle1 = new Shape();
-	var rectangle2 = new Shape();
-	var rectangle3 = new Shape();
-	//var rectangle4 = new Shape();
-	//rectangle1.graphics.lineStyle(2);
-	rectangle2.graphics.lineStyle(2);
-	rectangle3.graphics.lineStyle(2);
-	//rectangle4.graphics.lineStyle(2);
-	
-	//rectangle1.graphics.drawRect(0,0, x2, y1); 
-	rectangle2.graphics.drawRect(0,0, x1, y2); 
-	rectangle3.graphics.drawRect(0,0, x2, y2);
-	//	rectangle4.graphics.drawRect(0,0, x3, y2); 
-
-	//mscheduleSpr.addChild(rectangle1);
-	avatarSpr.addChild(rectangle2);
-	classesSpr.addChild(rectangle3);
-	//wscheduleSpr.addChild(rectangle4);
-	
-	this.addChild(mscheduleSpr);
-	this.addChild(avatarSpr);
-	this.addChild(classesSpr);
-	this.addChild(wscheduleSpr);
-
-	bar1 = new Bar(0.01, 100, 0, "Drawing", scheduleObject[0], gameDate, colors[0]);
-	bar1.x = Math.round(x2/7);
-	bar1.y = y2;
-	bar2 = new Bar(0.2, 100, 0, "Evolution and Ecology", scheduleObject[1], gameDate, colors[1]);
-	bar2.x = Math.round(2*x2/7);
-	bar2.y = y2;
-	bar3 = new Bar(0.2, 100, 0, "EE Lab", scheduleObject[2], gameDate, colors[2]);
-	bar3.x = Math.round(3*x2/7);
-	bar3.y = y2;
-	bar4 = new Bar(0.2, 100, 0, "Chem", scheduleObject[3], gameDate, colors[3]);
-	bar4.x = Math.round(4*x2/7);
-	bar4.y = y2;
-	bar5 = new Bar(0.04, 100, 0, "Chem Lab", scheduleObject[4], gameDate, colors[4]);
-	bar5.x = Math.round(5*x2/7);
-	bar5.y = y2;
-	bar6 = new Bar(0.01, 100, 0, "How Things Work", scheduleObject[5], gameDate, colors[5]);
-	bar6.x = Math.round(6*x2/7);
-	bar6.y = y2;
-	classesSpr.addChild(bar1);
-	classesSpr.addChild(bar2);
-	classesSpr.addChild(bar3);
-	classesSpr.addChild(bar4);
-	classesSpr.addChild(bar5);
-	classesSpr.addChild(bar6);
-
-       	stage.addEventListener(Event.ENTER_FRAME, onEnterFrame);
-
-    }
-
-    private function onEnterFrame (e:Event){
-	//initialTimeStamp is in seconds, but Date.fromTime takes milliseconds
-	var newGameDate = Date.fromTime(1000*(initialGameTimestamp+timeScale*(Timer.stamp()-initialTimestamp)));
-	//	trace(timeScale*(wut-initialTimeStamp));
-	var delta = (newGameDate.getTime() - gameDate.getTime())/1000;
-	gameDate = newGameDate;
-	mscheduleSpr.update(gameDate);
-	wscheduleSpr.update(gameDate);
-	bar1.update(gameDate, delta);
-	bar2.update(gameDate, delta);
-	bar3.update(gameDate, delta);
-	bar4.update(gameDate, delta);
-	bar5.update(gameDate, delta);
-	bar6.update(gameDate, delta);
-    }
-	
+	public static inline var m = 10;
+	public static inline var s1 = 150;
+	public static inline var s2 = 250;
+	public static inline var xM = m;
+	public static inline var yM = m;
+	public static inline var x1 = s1;
+	public static inline var x2 = 800-4*m-s1-s2;
+	public static inline var x3 = s2;
+	public static inline var y1 = s1;
+	public static inline var y2 = 600-3*m-s1;
+
+	public var timeScale:Float = 3600*6;
+	public var gameDate:Date; // must be a Sunday
+	public var mscheduleSpr:Calendar;
+	public var wscheduleSpr:Schedule;
+	public var bar1:Bar;
+	public var bar2:Bar;
+	public var bar3:Bar;
+	public var bar4:Bar;
+	public var bar5:Bar;
+	public var bar6:Bar;
+	public var initialTimestamp:Float;
+	public var initialGameTimestamp:Float;
+	public var scheduleObject:Array<Lecture.LectureIterator>;
+	public var colors:Array<Int>;
+
+	public function new () {
+		super ();
+
+		var scheduleJson = Assets.getText("assets/test.json");
+		var lectureArray:Array<Lecture> = Json.parse(scheduleJson);
+		var scheduleObject:Array<Lecture.LectureIterator> = new Array<Lecture.LectureIterator>();
+		var scheduleObjectCopy:Array<Lecture.LectureIterator> = new Array<Lecture.LectureIterator>();
+		for (lecture in lectureArray){
+			scheduleObject.push(new Lecture.LectureIterator(lecture));
+			scheduleObjectCopy.push(new Lecture.LectureIterator(lecture));
+		}
+
+		colors = [0xFF7800, 0x00FF00, 0x5555FF, 0xFFFF00, 0xFF00FF, 0xE3D3FF];
+
+		/*
+		  var bitmapData = Assets.getBitmapData ("assets/openfl.png");
+		  var bitmap = new Bitmap (bitmapData);
+		  addChild (bitmap);
+
+		  bitmap.x = (stage.stageWidth - bitmap.width) / 2;
+		  bitmap.y = (stage.stageHeight - bitmap.height) / 2;
+		*/
+			gameDate = new Date(2018, 9, 28, 0, 0, 0);
+		var gameDay = new Date(2018, 9, 28, 12, 0, 0);
+		//This is for the purpose of daylight savings.  Some days are 23 or 25 hours, so putting the time as noon will be stable WRT these changes.
+
+		//trace(gameDate.getDay()); //Should be 0
+		initialTimestamp = Timer.stamp();
+		initialGameTimestamp = gameDate.getTime()/1000;
+		//trace(gameDate.getTime());
+		trace(initialTimestamp);
+		trace(Date.now().getTime()/1000);
+		trace(Timer.stamp());
+		mscheduleSpr = new Calendar(x2,y1, gameDay);
+		mscheduleSpr.x=2*xM+x1;
+		mscheduleSpr.y=yM;
+		var avatarSpr = new Sprite();
+		avatarSpr.x=xM;
+		avatarSpr.y=2*yM+y1;
+		var classesSpr = new Sprite();
+		classesSpr.x=2*xM+x1;
+		classesSpr.y=2*yM+y1;
+		wscheduleSpr = new Schedule(x3,y2, gameDay, scheduleObject, colors);
+		wscheduleSpr.x=3*xM+x1+x2;
+		wscheduleSpr.y=2*yM+y1;
+
+		//	var rectangle1 = new Shape();
+		var rectangle2 = new Shape();
+		var rectangle3 = new Shape();
+		//var rectangle4 = new Shape();
+		//rectangle1.graphics.lineStyle(2);
+		rectangle2.graphics.lineStyle(2);
+		rectangle3.graphics.lineStyle(2);
+		//rectangle4.graphics.lineStyle(2);
+
+		//rectangle1.graphics.drawRect(0,0, x2, y1);
+		rectangle2.graphics.drawRect(0,0, x1, y2);
+		rectangle3.graphics.drawRect(0,0, x2, y2);
+		//	rectangle4.graphics.drawRect(0,0, x3, y2);
+
+		//mscheduleSpr.addChild(rectangle1);
+		avatarSpr.addChild(rectangle2);
+		classesSpr.addChild(rectangle3);
+		//wscheduleSpr.addChild(rectangle4);
+
+		this.addChild(mscheduleSpr);
+		this.addChild(avatarSpr);
+		this.addChild(classesSpr);
+		this.addChild(wscheduleSpr);
+
+		bar1 = new Bar(0.04, 100, 0, "Drawing", scheduleObjectCopy[0], gameDate, colors[0]);
+		bar1.x = Math.round(x2/7);
+		bar1.y = y2;
+		bar2 = new Bar(0.2, 100, 0, "Evolution and Ecology", scheduleObjectCopy[1], gameDate, colors[1]);
+		bar2.x = Math.round(2*x2/7);
+		bar2.y = y2;
+		bar3 = new Bar(0.2, 100, 0, "EE Lab", scheduleObjectCopy[2], gameDate, colors[2]);
+		bar3.x = Math.round(3*x2/7);
+		bar3.y = y2;
+		bar4 = new Bar(0.2, 100, 0, "Chem", scheduleObjectCopy[3], gameDate, colors[3]);
+		bar4.x = Math.round(4*x2/7);
+		bar4.y = y2;
+		bar5 = new Bar(0.04, 100, 0, "Chem Lab", scheduleObjectCopy[4], gameDate, colors[4]);
+		bar5.x = Math.round(5*x2/7);
+		bar5.y = y2;
+		bar6 = new Bar(0.01, 100, 0, "How Things Work", scheduleObjectCopy[5], gameDate, colors[5]);
+		bar6.x = Math.round(6*x2/7);
+		bar6.y = y2;
+		classesSpr.addChild(bar1);
+		classesSpr.addChild(bar2);
+		classesSpr.addChild(bar3);
+		classesSpr.addChild(bar4);
+		classesSpr.addChild(bar5);
+		classesSpr.addChild(bar6);
+
+		stage.addEventListener(Event.ENTER_FRAME, onEnterFrame);
+	}
+
+	private function onEnterFrame (e:Event){
+		//initialTimeStamp is in seconds, but Date.fromTime takes milliseconds
+		var newGameDate = Date.fromTime(1000*(initialGameTimestamp+timeScale*(Timer.stamp()-initialTimestamp)));
+		//	trace(timeScale*(wut-initialTimeStamp));
+		var delta = (newGameDate.getTime() - gameDate.getTime())/1000;
+		gameDate = newGameDate;
+		mscheduleSpr.update(gameDate);
+		wscheduleSpr.update(gameDate);
+		bar1.update(gameDate, delta);
+		bar2.update(gameDate, delta);
+		bar3.update(gameDate, delta);
+		bar4.update(gameDate, delta);
+		bar5.update(gameDate, delta);
+		bar6.update(gameDate, delta);
+	}
+
 }
diff --git a/Source/Schedule.hx b/Source/Schedule.hx
index 47d099a..ccc5f12 100644
--- a/Source/Schedule.hx
+++ b/Source/Schedule.hx
@@ -1,5 +1,6 @@
 package;
 
+import Lecture.LectureObject;
 import openfl.display.Sprite;
 import openfl.display.Shape;
 import openfl.text.TextFormat;
@@ -8,182 +9,177 @@ import haxe.ds.HashMap;
 
 class Schedule extends Sprite {
 
-    private var cols:HashMap<Day,TextField> = new HashMap();
-    private var lectureCols:Array<TextField> = new Array();
-    private var weekdayHeight = 15;
-    private var today:Day;
-    
-    private var xOffset:Int;
-    private var yOffset:Int;
-    private var colWidth:Int;
-    private var colHeight:Int;
-    private var endDate:Date; //first date not in calendar
-    private var cursor:Shape;
-    private var week:Int;
-
-    private var scheduleObject:Array<Array<Lecture>>;
-    private var colors:Array<Int>;
-
-    private var textHeight:Int;
-    private var format:TextFormat;
-    
-    public function new (width, height, date:Date, scheduleObject:Array<Array<Lecture>>, colors:Array<Int>=null){
-	super();
-
-	this.scheduleObject = scheduleObject;
-	this.colors = colors;
-
-	if (colors == null || colors.length<scheduleObject.length){
-	    colors = new Array();
-	    for (i in 0...scheduleObject.length){
-		colors.push(0x000000);
-	    }
-	}
-	
-	today = Day.fromDate(date);
+	private var cols:HashMap<Day, TextField> = new HashMap();
+	private var lectureCols:Array<TextField> = new Array();
+	private var weekdayHeight = 15;
+	private var today:Day;
+
+	private var xOffset:Int;
+	private var yOffset:Int;
+	private var colWidth:Int;
+	private var colHeight:Int;
+	private var endDate:Date; //first date not in calendar
+	private var cursor:Shape;
+	private var week:Int;
+
+	private var scheduleObject:Array<Lecture.LectureIterator>;
+	private var colors:Array<Int>;
+
+	private var textHeight:Int;
+	private var format:TextFormat;
+
+	public function new(width, height, date:Date, scheduleObject:Array<Lecture.LectureIterator>, colors:Array<Int> = null) {
+		super();
+
+		this.scheduleObject = scheduleObject;
+		this.colors = colors;
+
+		if (colors == null || colors.length < scheduleObject.length) {
+			colors = new Array();
+			for (i in 0...scheduleObject.length) {
+				colors.push(0x000000);
+			}
+		}
+
+		today = Day.fromDate(date);
 		//round down to nearest Sunday to get endDate because nothing in schedule yet
-	endDate = DateTools.delta(date, -DateTools.days(date.getDay()));
-	
-	xOffset = 40;
-	yOffset = weekdayHeight;
-	colWidth = Math.round((width-xOffset)/7);
-	colHeight = height-weekdayHeight;
-	textHeight = 10;
-	format = new TextFormat(textHeight);
-
-	cursor = new Shape();
-	cursor.graphics.lineStyle(0);
-	cursor.graphics.beginFill(0x00FF00, 1);
-	cursor.graphics.drawRect(0,0,colWidth, 5);
-	cursor.graphics.endFill();
-	cursor.x = xOffset + colWidth*date.getDay();
-	cursor.y = yOffset + colHeight*modDay(date);
-	this.addChild(cursor);
-
-	week = -1;
-	makeCols();
-	makeWeekdays();
-	makeTimes();
-	cols.get(today).backgroundColor = 0x55FFFF;
-	
-    }
-
-    private function modDay(date:Date):Float {
-	return  (date.getHours() + (date.getMinutes() + (date.getSeconds())/60)/60)/24;
-    }
-    
-    private function makeCols(){
-	week++;
-	
-	for (j in 0...7){
-	    var col:TextField = new TextField();
-	    addChild(col);
-
-	    col.x = xOffset + j*colWidth;
-	    col.y = yOffset;
-	    col.text = Std.string(endDate.getDate());
-	    
-	    col.background = true;
-	    col.backgroundColor = 0xFFFFFF;
-	    col.border = true;
-	    col.borderColor = 0x000000;
-	    col.width = colWidth;
-	    col.height = colHeight;
-	    
-	    cols.set(Day.fromDate(endDate),col);
-	    endDate = DateTools.delta(endDate, DateTools.days(1));
+		endDate = DateTools.delta(date, -DateTools.days(date.getDay()));
+
+		xOffset = 40;
+		yOffset = weekdayHeight;
+		colWidth = Math.round((width - xOffset) / 7);
+		colHeight = height - weekdayHeight;
+		textHeight = 10;
+		format = new TextFormat(textHeight);
+
+		cursor = new Shape();
+		cursor.graphics.lineStyle(0);
+		cursor.graphics.beginFill(0x00FF00, 1);
+		cursor.graphics.drawRect(0, 0, colWidth, 5);
+		cursor.graphics.endFill();
+		cursor.x = xOffset + colWidth * date.getDay();
+		cursor.y = yOffset + colHeight * modDay(date);
+		this.addChild(cursor);
+
+		week = -1;
+
+		for (lectures in scheduleObject) lectures.next();
+		makeCols();
+		makeWeekdays();
+		makeTimes();
+		cols.get(today).backgroundColor = 0x55FFFF;
+	}
+
+	private function modDay(date:Date):Float {
+		return (date.getHours() + (date.getMinutes() + (date.getSeconds()) / 60) / 60) / 24;
 	}
-	var colorNum = 0;
-	for (lectures in scheduleObject){
-	    for (lecture in lectures){
-		var times = lecture.times.split(" ");
-		var startNums = Util.splitAndParseInt(times[0], "/");
-		//trace("hey");
-		if (startNums[0]<week){
-		    continue;
-		} else if(startNums[0]>week){
-		    break;
+
+	private function makeCols() {
+		week++;
+
+		for (j in 0...7) {
+			var col:TextField = new TextField();
+			addChild(col);
+
+			col.x = xOffset + j * colWidth;
+			col.y = yOffset;
+			col.text = Std.string(endDate.getDate());
+
+			col.background = true;
+			col.backgroundColor = 0xFFFFFF;
+			col.border = true;
+			col.borderColor = 0x000000;
+			col.width = colWidth;
+			col.height = colHeight;
+
+			cols.set(Day.fromDate(endDate), col);
+			endDate = DateTools.delta(endDate, DateTools.days(1));
+		}
+
+		var lecture:LectureObject;
+		for (lectures in scheduleObject) {
+			lecture = lectures.getCurLecture();
+			while (lecture != null) {
+				if (lecture.startTime.getTime() >= endDate.getTime()) break;
+
+				var startFrac = (lecture.startTime.getHours() + lecture.startTime.getMinutes() / 60) / 24;
+				var yPos = yOffset + colHeight * startFrac;
+				var xPos = xOffset + lecture.startTime.getDay() * colWidth;
+
+				var endFrac = (lecture.endTime.getHours() + lecture.endTime.getMinutes() / 60) / 24;
+				var h = colHeight * (endFrac - startFrac);
+				var lectureCol = new TextField();
+				addChild(lectureCol);
+
+				lectureCol.x = xPos;
+				lectureCol.y = yPos;
+				lectureCol.text = lectures.title;
+
+				lectureCol.background = true;
+				lectureCol.backgroundColor = colors[scheduleObject.indexOf(lectures)];
+				lectureCol.border = true;
+				lectureCol.borderColor = 0x000000;
+				lectureCol.width = colWidth;
+				lectureCol.height = h;
+
+				lectureCols.push(lectureCol);
+				lecture = lectures.next();
+			}
 		}
-		//trace("there");
-		var startFrac = (startNums[2]+startNums[3]/60)/24;
-		var yPos = yOffset + colHeight*startFrac;
-		var xPos = xOffset + startNums[1]*colWidth;
-		var endNums = Util.splitAndParseInt(times[1], "/");
-		var endFrac = (endNums[2]+endNums[3]/60)/24;
-		// We don't look at endNums[0] or endNums[1]
-		var h = colHeight*(endFrac-startFrac);
-		var lectureCol = new TextField();
-		addChild(lectureCol);
-
-		lectureCol.x = xPos;
-		lectureCol.y = yPos;
-		lectureCol.text = lecture.title;
-
-		lectureCol.background = true;
-		lectureCol.backgroundColor = colors[colorNum];
-		lectureCol.border = true;
-		lectureCol.borderColor = 0x000000;
-		lectureCol.width = colWidth;
-		lectureCol.height = h;
-		
-		lectureCols.push(lectureCol);
-	    }
-	    colorNum++;
+		this.addChild(cursor);
 	}
-	this.addChild(cursor);
-    }
-
-    private function makeWeekdays() {
-	var names:Array<String> = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"];
-	for (i in 0...7) {
-	    var weekday:TextField = new TextField();
-	    addChild(weekday);
-
-	    weekday.text = names[i];
-	    weekday.setTextFormat(format);
-	    weekday.x = xOffset + i*colWidth;
-	    weekday.y = yOffset - 15;
+
+	private function makeWeekdays() {
+		var names:Array<String> = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"];
+		for (i in 0...7) {
+			var weekday:TextField = new TextField();
+			addChild(weekday);
+
+			weekday.text = names[i];
+			weekday.setTextFormat(format);
+			weekday.x = xOffset + i * colWidth;
+			weekday.y = yOffset - 15;
+		}
 	}
-    }
 
 
-    private function makeTimes() {
-	var times:Array<String> = ["12am", "1am", "2am", "3am", "4am", "5am", "6am", "7am", "8am", "9am", "10am", "11am", "12pm", "1pm", "2pm", "3pm", "4pm", "5pm", "6pm", "7pm", "8pm", "9pm", "10pm", "11pm", "12am"];
-	for (i in 0...25) {
-	    var time:TextField = new TextField();
-	    addChild(time);
+	private function makeTimes() {
+		var times:Array<String> = ["12am", "1am", "2am", "3am", "4am", "5am", "6am", "7am", "8am", "9am", "10am", "11am", "12pm", "1pm", "2pm", "3pm", "4pm", "5pm", "6pm", "7pm", "8pm", "9pm", "10pm", "11pm", "12am"];
+		for (i in 0...25) {
+			var time:TextField = new TextField();
+			addChild(time);
 
-	    time.text = times[i];
-	    time.setTextFormat(format);
-	    time.x = 0;
-	    time.y = yOffset - (textHeight) + i*colHeight/24;
-	}
-    }
-    
-    private function advanceCols(){
-	for (col in cols){
-		removeChild(col);
+			time.text = times[i];
+			time.setTextFormat(format);
+			time.x = 0;
+			time.y = yOffset - (textHeight) + i * colHeight / 24;
+		}
 	}
-	for (lectureCol in lectureCols){
-	    removeChild(lectureCol);
+
+	private function advanceCols() {
+		for (col in cols) {
+			removeChild(col);
+		}
+		for (lectureCol in lectureCols) {
+			removeChild(lectureCol);
+		}
+		makeCols();
 	}
-	makeCols();
-    }
-
-    public function update(gameDate:Date) {
-//	trace("hi");
-	var day = Day.fromDate(gameDate);
-//	trace(today.month+" "+today.day);
-//	trace(day.month+" "+day.day);
-	if (!today.equals(day)){
-	    if (gameDate.getDay()==0){
-		advanceCols();
-	    }
-	    cols.get(day).backgroundColor = 0x55FFFF;
-	    cols.get(today).backgroundColor = 0xFFFFFF;
-	    today=day;
+
+	public function update(gameDate:Date) {
+		//	trace("hi");
+		var day = Day.fromDate(gameDate);
+		//	trace(today.month+" "+today.day);
+		//	trace(day.month+" "+day.day);
+		if (!today.equals(day)) {
+			if (gameDate.getDay() == 0) {
+				advanceCols();
+			}
+			cols.get(day).backgroundColor = 0x55FFFF;
+			cols.get(today).backgroundColor = 0xFFFFFF;
+			today = day;
+		}
+		cursor.x = xOffset + colWidth * gameDate.getDay();
+		cursor.y = yOffset + colHeight * modDay(gameDate);
 	}
-	cursor.x = xOffset + colWidth*gameDate.getDay();
-	cursor.y = yOffset + colHeight*modDay(gameDate);
-    }
 }
diff --git a/Source/Util.hx b/Source/Util.hx
index 37866bc..43830c3 100644
--- a/Source/Util.hx
+++ b/Source/Util.hx
@@ -1,19 +1,26 @@
 package;
 
 class Util {
-    public static function splitAndParseInt(str:String, delim:String){
-	var result:Array<Int> = new Array();
-	for (x in str.split(delim)){
-	    result.push(Std.parseInt(x));
+	public static function splitAndParseInt(str:String, delim:String){
+		var result:Array<Int> = new Array();
+		for (x in str.split(delim)){
+			result.push(Std.parseInt(x));
+		}
+		return result;
+	}
+	public static function jsonTimeToDate (gameDate:Date, jsonTime:String) {
+		var nums = splitAndParseInt(jsonTime, "/");
+		var weeks = nums[0];//Std.parseInt(nums[0]);
+		var days = nums[1];//Std.parseInt(nums[1]);
+		var hours = nums[2];//Std.parseInt(nums[2]);
+		var minutes = nums[3];//Std.parseInt(nums[3]);
+		return DateTools.delta(gameDate, 1000*60*(minutes+60*(hours+24*(days+7*weeks))));
+	}
+	
+	public static function DayinRange(startDate:Date, endDate:Date, date:Date): Bool{
+		var start:Float = startDate.getTime();
+		var end:Float = endDate.getTime();
+		var day:Float = date.getTime();
+		return day >= start && day <= end;
 	}
-	return result;
-    }
-    public static function jsonTimeToDate (gameDate:Date, jsonTime:String) {
-	var nums = splitAndParseInt(jsonTime, "/");
-	var weeks = nums[0];//Std.parseInt(nums[0]);
-	var days = nums[1];//Std.parseInt(nums[1]);
-	var hours = nums[2];//Std.parseInt(nums[2]);
-	var minutes = nums[3];//Std.parseInt(nums[3]);
-	return DateTools.delta(gameDate, 1000*60*(minutes+60*(hours+24*(days+7*weeks))));
-    }
 }