diff --git a/README.md b/README.md
index 61ec120..edae79a 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,2 @@
 # InteractiveProgramming
-This is the base repo for the interactive programming project for Software Design, Spring 2016 at Olin College.
+This is the repository for our game, which allows the player character to be controlled via keyboard inputs or the location of a face detected by a computer's webcam.  In order to play the game, the graphics.py file must be run.
diff --git a/Reflection.pdf b/Reflection.pdf
new file mode 100644
index 0000000..dc3ebc1
Binary files /dev/null and b/Reflection.pdf differ
diff --git a/face.py b/face.py
new file mode 100644
index 0000000..104f18d
--- /dev/null
+++ b/face.py
@@ -0,0 +1,24 @@
+import numpy as np
+import cv2
+
+cap = cv2.VideoCapture(0)
+face_cascade = cv2.CascadeClassifier('/home/youngdp/workspace/haarcascade_frontalface_alt.xml')
+kernel = np.ones((21,21),'uint8')
+while(True):
+    # Capture frame-by-frame
+    ret, frame = cap.read()
+
+    # Display the resulting frame
+    cv2.imshow('frame',frame)
+    ret, frame = cap.read()
+    faces = face_cascade.detectMultiScale(frame, scaleFactor=1.2, minSize=(20,20))
+    for (x,y,w,h) in faces:
+    	print x, y
+    cv2.imshow('frame',frame)
+    if cv2.waitKey(1) & 0xFF == ord('q'):
+        break
+
+# When everything done, release the capture
+
+cap.release()
+cv2.destroyAllWindows()
\ No newline at end of file
diff --git a/graphics.py b/graphics.py
new file mode 100644
index 0000000..8b6c773
--- /dev/null
+++ b/graphics.py
@@ -0,0 +1,318 @@
+#graphics
+import pygame, random, sys, time, cv2, threading #imports
+import numpy as np
+from plane import plane
+from player import player
+
+'''initializing pygame and setting globals'''
+pygame.init()
+pygame.display.init()
+size = (1020, 1020)
+screen = pygame.display.set_mode(size)
+red = (255, 0, 0)
+green = (0, 255, 0)
+blue = (0, 0, 255)
+black = (0, 0, 0)
+middle = 250
+screen.fill(black)
+faceCoordinates = [] #list used as a stack (pushes, pops)
+
+def read_frame(run):
+	'''Function that handles reading in face location in openCV, adds relevant values to the global stack'''
+	cap = cv2.VideoCapture(0)
+	face_cascade = cv2.CascadeClassifier('/usr/share/opencv/haarcascades/haarcascade_frontalface_alt.xml')
+	kernel = np.ones((21,21),'uint8')
+	while(True):
+		et, frame = cap.read()
+		ret, frame = cap.read()
+		faces = face_cascade.detectMultiScale(frame, scaleFactor=1.1, minSize=(20,20))
+		for (x,y,w,h) in faces:
+			if(x == None or y == None):
+				faceCoordinates.append((middle, middle))
+			else:
+				faceCoordinates.append((x, y))
+		if(not run.running): #had trouble forcing an end to the function when pygame is closed and even when sys.exit() is called, instead a class variable that could be edited by update was used
+			break
+def move_x(x):
+	'''Determines whether character moves from face location'''
+	if int(x) - middle < -10:
+		return 20
+	elif int(x) - middle > 10:
+		return -20
+	return 0
+def check_jump(value):
+	'''determines whether the character should jump'''
+	if (middle - value) > 40:
+		return True
+	return False
+def update(coordinate1, coordinate2, coordinate3, coordinate4, map1, map2, map3, map4, player, num_lines, fThread, run):
+	'''handles all game running'''
+	'''initials'''
+	done = False
+	index = 1
+	maps = [map1, map2, map3, map4]
+	myfont = pygame.font.SysFont("monospace", 20)
+	score = 0
+	max_score = 0
+	while not done:
+		pygame.display.update()
+		try: #try/catch for getting face coordinates, in case of empty stack assume middle facial position (no movement of character)
+			(x, y) = faceCoordinates.pop()
+		except IndexError:
+			(x, y) = (middle, middle)
+		keys = pygame.key.get_pressed()
+		player.x += move_x(x) #moves based on face position
+
+		if(keys[pygame.K_LEFT] != 0): #moves based on key input
+			player.x -= 10
+		elif(keys[pygame.K_RIGHT] != 0):
+			player.x += 10
+		if(player.x > 100): #allows player to 'rotate' onto a side wall based on character position
+				player.x -= 10
+		else:
+			player.x = 900
+			maps = [maps[2], maps[3], maps[1], maps[0]]
+
+		if(player.x < 920):
+			player.x += 10
+		else:
+			player.x = 120
+			maps = [maps[3], maps[2], maps[0], maps[1]]
+		if((keys[pygame.K_UP] != 0 or check_jump(y)) and not player.inAir): #jumping based on either face input or up button
+			player.goingUp = True
+			player.inAir = True
+		elif(player.inAir): #logic for jumping
+			if(player.jumpHeight <= 0 and not player.goingUp):
+				player.jumpHeight = 0
+				player.inAir = False
+			elif(player.goingUp and player.jumpHeight < 80):
+				player.jumpHeight += 10
+			elif(player.goingUp and player.jumpHeight >= 80):
+				player.goingUp = False
+			else:
+				player.jumpHeight -= 10
+		locs = round_player_loc(player.x, width, num_lines) #creates hitbox of player
+		if collision(maps[3], locs, index, player.inAir): #checks for collision
+			score = 0
+		draw_grid(coordinate1, maps[0], index, screen, num_lines, False, locs, False, player.inAir) #draws left wall
+		draw_grid(coordinate2, maps[1], index, screen, num_lines, True, locs, False, player.inAir) #draws right wall
+		draw_grid(coordinate3, maps[2], index, screen, num_lines, True, locs, False, player.inAir) #draws top wall
+		draw_grid(coordinate4, maps[3], index, screen, num_lines, False, locs, True, player.inAir) #draws bottom wall
+		
+		score += 1
+		if score > max_score: #score handling
+			max_score = score
+		show_score(score, max_score, myfont, width, height)
+		draw_player(player, screen) #draws player
+		pygame.time.wait(10)
+		index += 1
+		for event in pygame.event.get(): #handles quitting
+			if event.type == pygame.QUIT:
+				run.running = False
+				pygame.quit(); sys.exit();
+
+def show_score(score, max_score, myfont, width, height):
+	'''Displays score in center of screen'''
+	pygame.draw.rect(screen, (0, 0, 0), (width / 2 - 100, height / 2 - 100, 200, 200), 0)
+	label = myfont.render(str(score), 1, (255, 255, 255))
+	label2 = myfont.render("Max score: " + str(max_score), 1, (255, 255, 255))
+	screen.blit(label2, (width / 2 - 90, height / 2 - 50))
+	screen.blit(label, (width / 2 - 50, height / 2))
+
+def round_player_loc(x, width, num_lines): 
+	'''Handles hitbox'''
+	new_x = 1.0 * (width - x) / width * num_lines
+	values_to_check = []
+	fix = 0
+	if new_x < num_lines / 3:
+		fix = -1
+	elif new_x > 2 * num_lines / 3:
+		fix = 1
+	for i in range(-1, 1):
+		values_to_check.append([int(new_x) + i + fix, 2])
+	return values_to_check
+
+def draw_player(player, screen):
+	'''dDaws player'''
+	pygame.draw.circle(screen, player.color, [player.x, player.y - player.jumpHeight], 30)
+
+def draw_grid(coordinates, mapC, index, screen, num_lines, reverse, locs, bottom, in_air):
+	'''Handles drawing walls based on coordinates'''
+	for i in range(num_lines):
+		for j in range(num_lines):
+			color = (0, 0, 0)
+			if not reverse:
+				if (mapC.map[j + index][i] == 1):
+					color = mapC.color
+				count = i * (num_lines) + j
+				if bottom and not in_air:
+					for loc in locs:				
+							if loc[0] == i and j == loc[1]:
+								color = (255, 0, 0)
+				pygame.draw.polygon(screen, color, coordinates[-count], 0)
+			else:
+				if (mapC.map[j + index][-i] == 1):
+					color = mapC.color
+				count = i * (num_lines) + j
+				pygame.draw.polygon(screen, color, coordinates[-count], 0)
+
+def collision(mapC, locs, index, in_air): 
+	'''Determines if player is colliding with hole'''
+	if in_air:
+		return False
+	for loc in locs:
+		x = loc[1] + index
+		y = loc[0]
+		if mapC.map[x][y] == 0:
+			return True
+	return False
+
+
+def create_coordinates(side, width, height, num_lines, depth):
+	'''Creates coordinate system for drawings to give the impression of 3D'''
+	y_loc = height / 2
+	interval = width / num_lines
+	horizon_line = [depth, 'vertical']
+	x = 0
+	if side == 'right' or side == 'top':
+		x = width
+		horizon_line = [width - depth, 'vertical']
+
+
+	lines = []
+	for i in range(num_lines + 1):
+		lines.append(find_slope_intercept([x, interval * i], [width / 2, y_loc]))
+		red = (255, 0, 0)
+
+
+	point = find_intersection(horizon_line, lines[0])
+
+	cross_line = find_slope_intercept(point, [x, height])
+
+	vert_lines = []
+	for i in range(num_lines + 1):
+		intersection = find_intersection(cross_line, lines[i])
+		vert_lines.append(create_vertical_line(intersection))
+
+	coordinates = []
+	for i in range(len(lines) - 1):
+		for j in range(len(vert_lines) - 1):
+			p1 = find_intersection(lines[i], vert_lines[j])
+			p2 = find_intersection(lines[i + 1], vert_lines[j])
+			p3 = find_intersection(lines[i + 1], vert_lines[j + 1])
+			p4 = find_intersection(lines[i], vert_lines[j + 1])
+			if side == 'left':
+				coordinates.append([p1, p2, p3, p4])
+				rand_color = (random.uniform(0, 255), random.uniform(0, 255), random.uniform(0, 255))
+				pygame.draw.polygon(screen, rand_color, [p1, p2, p3, p4], 0)
+			elif side == 'right':
+				coordinates.append([p1, p2, p3, p4])
+				rand_color = (random.uniform(0, 255), random.uniform(0, 255), random.uniform(0, 255))
+				pygame.draw.polygon(screen, rand_color, [p1, p2, p3, p4], 0)
+			elif side == 'bottom':
+				coordinates.append([reflect_point(p1), reflect_point(p2), reflect_point(p3), reflect_point(p4)])
+				rand_color = (random.uniform(0, 255), random.uniform(0, 255), random.uniform(0, 255))
+				pygame.draw.polygon(screen, rand_color, [reflect_point(p1), reflect_point(p2), reflect_point(p3), reflect_point(p4)], 0)
+			elif side == 'top':
+				coordinates.append([reflect_point(p1), reflect_point(p2), reflect_point(p3), reflect_point(p4)])
+				rand_color = (random.uniform(0, 255), random.uniform(0, 255), random.uniform(0, 255))
+				pygame.draw.polygon(screen, rand_color, [reflect_point(p1), reflect_point(p2), reflect_point(p3), reflect_point(p4)], 0)
+	return coordinates
+
+def flip_horizontal(width, height, p):
+	'''Returns a point mirrored about the y axis'''
+	return [width - p[0], p[1]]
+
+def flip_vertical(width, height, p):
+	'''Returns a point mirrored about the x axis'''
+	return [p[0], height - p[1]]
+
+
+def reflect_point(p):
+	'''Returns a point mirrored about the line y = x'''
+	return [p[1], p[0]]
+
+def find_intersection(l1, l2):
+	'''Finds the intersection of two verteces'''
+	l1_b0 = l1[0]
+	l1_b1 = l1[1]
+	l2_b0 = l2[0]
+	l2_b1 = l2[1]
+	if l1_b1 == 'vertical':
+		return [l1_b0, int(l2_b0 + 1.0 * l2_b1 * l1_b0)]
+	elif l2_b1 == 'vertical':
+		return [l2_b0, int(l1_b0 + 1.0 * l1_b1 * l2_b0)]
+	else:
+		x = 1.0 * (l1_b0 - l2_b0) / (l2_b1 - l1_b1)
+		y = l1_b0 + l1_b1 * x
+		return [int(x), int(y)]
+
+def find_slope_intercept(p1, p2):
+	'''Finds the point at which two lines intersect'''
+	p1_x = p1[0]
+	p1_y = p1[1]
+	p2_x = p2[0]
+	p2_y = p2[1]
+	run = p2_x - p1_x
+	rise = p2_y - p1_y
+	if run == 0:
+		return [p1_x, 'vertical']
+	slope = 1.0 * rise / run
+	return [1.0 * p1_y - slope * p1_x, slope]
+
+def create_vertical_line(p):
+	'''Creates a vertical line'''
+	p_x = p[0]
+	p_y = p[1]
+	return [p_x, 'vertical']
+
+def create_horizontal_line(p):
+	'''Creates a horizontal line'''
+	p_x = p[0]
+	p_y = p[1]
+	return [p_y, 0]
+
+class running: 
+	'''Class to be passed into both threaded functions so they can communicate when to end mid-thread'''
+	def __init__(self):
+		self.running = False
+
+if __name__ == '__main__':
+	width = 1020
+	height = 1020
+	num_lines = 30
+	depth = 400
+	left_coordinates = create_coordinates('left', width, height, num_lines, depth)
+	right_coordinates = create_coordinates('right', width, height, num_lines, depth)
+	top_coordinates = create_coordinates('top', width, height, num_lines, depth)
+	bottom_coordinates = create_coordinates('bottom', width, height, num_lines, depth)
+	play = player(510, 925)
+	map1 = plane(1, play, (0, 125, 125))
+	map2 = plane(2, play, (0, 125, 125))
+	map3 = plane(3, play, (125, 0, 125))
+	map4 = plane(4, play, (125, 0, 125))
+	map1.populate(10000, num_lines, 6)
+	map2.populate(10000, num_lines, 6)
+	map3.populate(10000, num_lines, 6)
+	map4.populate(10000, num_lines, 6)
+	r = running()
+	try:
+		faceThread = threading.Thread(target = read_frame, name = 'face', args = (r,))
+		gameThread = threading.Thread(target = update, name = 'game', args = (left_coordinates, right_coordinates, bottom_coordinates, top_coordinates, map1, map2, map3, map4, play, num_lines, faceThread, r))
+		gameThread.start()
+		r.running = True
+		faceThread.start()
+		gameThread.join()
+		faceThread.join()
+	except IndexError:
+		while True:
+			pygame.display.update()
+			pygame.draw.rect(screen, (0, 0, 0), (width / 2 - 100, height / 2 - 100, 200, 200), 0)
+			label = pygame.font.SysFont("comicsansms", 50).render('You made it', 1, (0, 255, 0))
+			label2 = pygame.font.SysFont("comicsansms", 50).render('to the end!', 1, (0, 255, 0))
+			screen.blit(label, (width / 2 - 100, height / 2 - 50))
+			screen.blit(label2, (width / 2 - 95, height / 2 - 20))
+			for event in pygame.event.get():
+				if event.type == pygame.QUIT:
+					r.running = False
+					pygame.quit(); sys.exit();
\ No newline at end of file
diff --git a/plane.py b/plane.py
new file mode 100644
index 0000000..c2e92f8
--- /dev/null
+++ b/plane.py
@@ -0,0 +1,23 @@
+import random
+class plane:
+	def __init__(self, num, pl, color, planeMap = []):
+		self.planeNum = num #identify which plane this is
+		self.player = pl #the player
+		self.map = planeMap #matrix of points for floor/holes
+		self.color = color
+	def populate(self, numRows, numCols, size): #randomly populate itself
+		self.map = []
+		mapRef = []
+		weight = 4
+		for x in range(numRows/size):
+			mapRef.append([(1 if random.randint(1, weight) < weight else 0) for i in range(numCols/size)]) #floors are weighted more than holes
+		for row in mapRef: #this structure was to create holes larger than a single matrix point
+			realRow = []
+			for entry in row:
+				for i in range(size):
+					realRow.append(entry)
+			for i in range(size):
+				self.map.append(realRow)
+		return self.map
+	def onFloor(self): #returns True if the current position is on an existing floor, false if it is on a hole
+		return (self.map[int(self.player.x)][int(self.player.y)] == 1) #1 constitutes floor, 0 indicates hole
diff --git a/player.py b/player.py
new file mode 100644
index 0000000..e81b346
--- /dev/null
+++ b/player.py
@@ -0,0 +1,13 @@
+class player:
+	def __init__(self, xPos = 0, yPos = 0, advanceIncrement = 1, color = (0, 255, 0)): #can set advance increment so that advance can be called on player to easily increase position
+		self.x = xPos
+		self.y = yPos
+		self.increment = advanceIncrement
+		self.inAir = False
+		self.color = color
+		self.jumpHeight = 0
+		player.goingUp = True
+	def setPos(self, xPos, yPos): #set the new position
+		self.x = xPos
+		self.y = yPos
+		
\ No newline at end of file