diff --git a/entities.js b/entities.js
index 79ec74b..bb9b2c4 100644
--- a/entities.js
+++ b/entities.js
@@ -27,15 +27,26 @@ var Clock = function(sideLength) {
 		while(lane < 0) {
 			lane = lane + this.sides;
 		}
+		block.distFromHex = MainClock.sideLength / 2 * Math.sqrt(3) + block.height * this.blocks[lane].length + block.height/2;
 		this.blocks[lane].push(block);
 	}
 
 	this.rotate = function(steps) {
+		var oldPosition = this.position;
 		this.position += steps;
 		this.position = this.position % this.sides;
 		while(this.position < 0) {
 			this.position = this.position + this.sides; 
 		}
+		for(var i=0; i<this.blocks.length; i++) {
+			for(var j=0; j<this.blocks[i].length; j++) {
+				this.blocks[i][j].lane += (this.position - oldPosition);
+				this.blocks[i][j].lane = this.blocks[i][j].lane % this.sides;
+				while(this.blocks[i][j].lane < 0) {
+					this.blocks[i][j].lane += this.sides;
+				}
+			}
+		}
 		this.angle = 30 + this.position * 60;
 	}
 
diff --git a/main.js b/main.js
index 725f3d3..396a75c 100644
--- a/main.js
+++ b/main.js
@@ -14,14 +14,19 @@ clock = new Clock(6);
 
 var blocks = [];
 
-for (var i = 0; i < 12; i++) {
-	blocks.push(new Block(i, 'green'));
-}
+// for (var i = 0; i < 12; i++) {
+// 	blocks.push(new Block(i, 'green'));
+// }
 
 var MainClock = new Clock(65);
 
 function Render() {
 	ctx.clearRect(0, 0, canvas.width, canvas.height);
+	for(var i=0; i<MainClock.blocks.length; i++) {
+		for(var j=0; j<MainClock.blocks[i].length; j++) {
+			MainClock.blocks[i][j].draw();
+		}
+	}
 	blocks.forEach(function(o){
 		o.draw();
 		o.distFromHex -= 1/100;
@@ -53,6 +58,8 @@ function Block(lane, color, distFromHex) {
 		this.distFromHex = 300;
 	}
 	this.draw = function() {
+		this.angle = 90 - (30 + 60 * this.lane);
+
 		var p1 = rotatePoint(-this.width/2, this.height/2, this.angle);
 		var p2 = rotatePoint(this.width/2, this.height/2, this.angle);
 		var p3 = rotatePoint(this.width/2, -this.height/2, this.angle);