diff --git a/tetris-canvas.js b/tetris-canvas.js
index c21502c..3af3c9e 100644
--- a/tetris-canvas.js
+++ b/tetris-canvas.js
@@ -11,7 +11,7 @@ function TetrisCanvas(id, width, height) {
 		'S': 'green',
 		'T': 'purple',
 		'Z': 'red',
-	}
+	};
 	
 	/********************/
 	/* Global variables */
@@ -31,9 +31,10 @@ function TetrisCanvas(id, width, height) {
 	/**************/
 	/* Functions: */
 	/**************/
-	this.drawRectangle = function(x, y, color) {
+	this.drawRectangle = function(x, y, brickId) {
 		var topLeftCornerX = x*(this.pxSeparatorSize+this.pxRectSize);
 		var topLeftCornerY = this.pxHeight - (y + 1) * (this.pxSeparatorSize + this.pxRectSize) + this.pxSeparatorSize;
+		var color = this.colors[brickId];
 
 		this.context.beginPath();
 		this.context.rect(topLeftCornerX, topLeftCornerY, this.pxRectSize, this.pxRectSize);
@@ -45,7 +46,7 @@ function TetrisCanvas(id, width, height) {
 	this.drawBoard = function(board) {
 		for (var y = 0; y < this.sHeight; y++) {
 			for (var x = 0; x < this.sWidth; x++) {
-				this.drawRectangle(x,y,this.colors[board[x][y]]);
+				this.drawRectangle(x,y,board[x][y]);
 			}
 		}
 	}
diff --git a/tetris.js b/tetris.js
index f7244ea..89b4c61 100644
--- a/tetris.js
+++ b/tetris.js
@@ -1,13 +1,93 @@
 function TetrisGame(id) {
+	/*********/
+	/* Enum: */
+	/*********/
+	this.bricks = {
+		0:   0,
+		1: 'I',
+		2: 'J',
+		3: 'L',
+		4: 'O',
+		5: 'S',
+		6: 'T',
+		7: 'Z',
+	};
+	
+	this.brickShapes = {
+		0: [[0,0], [0,0], [0,0], [0,0]],
+		1: [[0,0], [0,1], [0,2], [0,3]],
+		2: [[0,0], [0,1], [0,2], [1,2]],
+		3: [[0,0], [0,1], [0,2], [-1,2]],
+		4: [[0,0], [0,1], [1,0], [1,1]],
+		5: [[0,0], [1,0], [1,1], [2,1]],
+		6: [[0,0], [0,1], [-1,1], [1,1]],
+		7: [[0,0], [-1,0], [-1,1], [-2,1]],
+	}
+
+	/**************/
+	/* Variables: */
+	/**************/
 	this.width = 10;
 	this.height = 15;
 	this.canvas = new TetrisCanvas(id, this.width, this.height);
 	this.board = createArray(this.width, this.height);
 	
+	this.currentBrickId = 0;
+	this.currentBrickLoc = [-1, -1];
+	this.currentBrickRot = 0;
+	
+	/**************/
+	/* Functions: */
+	/**************/
+	this.getRandomBrick = function() {
+		return Math.floor(Math.random() * 8);
+	}
+	
+	this.drawCurrentBrick = function() {
+		var glob_shape = this.brickShapes[this.currentBrickId];
+		var shape = createArray(4,2);
+		
+		for (var i = 0; i < 4; i++) {
+			switch(this.currentBrickRot) {
+				case 0:
+					shape[i][0] = glob_shape[i][0];
+					shape[i][1] = glob_shape[i][1];
+					break;
+				case 1:
+					shape[i][0] = glob_shape[i][1];
+					shape[i][1] = -glob_shape[i][0];
+					break;
+				case 2:
+					shape[i][0] = -glob_shape[i][0];
+					shape[i][1] = -glob_shape[i][1];
+					break;
+				case 3:
+					shape[i][0] = -glob_shape[i][1];
+					shape[i][1] = glob_shape[i][0];
+					break;
+			}
+		}
+		
+		for (var i = 0; i < 4; i++) {
+			var x = this.currentBrickLoc[0]+shape[i][0];
+			var y = this.currentBrickLoc[1]+shape[i][1];
+			this.canvas.drawRectangle(x, y, this.bricks[this.currentBrickId]);
+		}
+	}
+	
 	this.doTurn = function() {
+		/* Fill out */
+		this.currentBrickId = 3;
+		this.currentBrickLoc = [5,5];
+		this.currentBrickRot = 1;
+	
 		this.canvas.drawBoard(this.board);
+		this.drawCurrentBrick();
 	}
 
+	/****************/
+	/* Constructor: */
+	/****************/
 	this.TetrisGame = function(id) {
 		for (var y = 0; y < 15; y++) {
 			for (var x = 0; x < 10; x++) {
@@ -20,6 +100,5 @@ function TetrisGame(id) {
 
 $(document).ready(function() {
 	var tetris = new TetrisGame("tetris-board");
-	tetris.board[1][1] = 'I';
 	tetris.doTurn();
 });
\ No newline at end of file