diff --git a/main.js b/main.js
index 31300f2..4487800 100644
--- a/main.js
+++ b/main.js
@@ -1,136 +1,12 @@
 import * as THREE from 'three';
 
-
+import * as SHAPES from './shapes.js';
 
 const NODE_SIZE = 0.07;
 const LINK_SIZE = 0.02;
 
 const HYPERPLANE = 4;
 
-const r5 = Math.sqrt(5);
-
-const CELL5 = {
-	nodes: [
-      {id:1, x: 1, y: 1, z: 1, w: -1 / r5 },
-      {id:2, x: 1, y: -1, z: -1, w: -1 / r5 },
-      {id:3, x: -1, y: 1, z: -1, w: -1 / r5 },
-      {id:4, x: -1, y: -1, z: 1, w: -1 / r5 },
-      {id:5, x: 0, y: 0, z: 0, w: 4 / r5 },
-	],
-	links: [
-		{ id:1, source:1, target: 2},
-		{ id:2, source:1, target: 3},
-		{ id:3, source:1, target: 4},
-		{ id:4, source:1, target: 5},
-		{ id:5, source:2, target: 3},
-		{ id:6, source:2, target: 4},
-		{ id:7, source:2, target: 5},
-		{ id:8, source:3, target: 4},
-		{ id:9, source:3, target: 5},
-		{ id:10, source:4, target: 5},
-		]
-
-	};
-
-
-const CELL16 = {
-	nodes: [
-		{ id: 1, x: 0, y: -1, z: 0, w: 0 },
-		{ id: 2, x: 0, y: 0, z: -1, w: 0 },
-		{ id: 3, x: -1, y: 0, z: 0, w: 0 },
-		{ id: 4, x: 0, y: 0, z: 1, w: 0 },
-		{ id: 5, x: 1, y: 0, z: 0, w: 0 },
-		{ id: 6, x: 0, y: 1, z: 0, w: 0 },
-		{ id: 7, x: 0, y: 0, z: 0, w: -1 },
-		{ id: 8, x: 0, y: 0, z: 0, w: 1 },
-	],
-	links: [
-		{ id: 1, source: 1, target: 2 },
-		{ id: 2, source: 1, target: 3 },
-		{ id: 3, source: 1, target: 4 },
-		{ id: 4, source: 1, target: 5 },
-		{ id: 5, source: 2, target: 3 },
-		{ id: 6, source: 3, target: 4 },
-		{ id: 7, source: 4, target: 5 },
-		{ id: 8, source: 5, target: 2 },
-		{ id: 9, source: 2, target: 6 },
-		{ id: 10, source: 3, target: 6 },
-		{ id: 11, source: 4, target: 6 },
-		{ id: 12, source: 5, target: 6 },
-		{ id: 13, source: 1, target: 7 },
-		{ id: 14, source: 1, target: 8 },
-		{ id: 15, source: 2, target: 7 },
-		{ id: 16, source: 2, target: 8 },
-		{ id: 17, source: 3, target: 7 },
-		{ id: 18, source: 3, target: 8 },
-		{ id: 19, source: 4, target: 7 },
-		{ id: 20, source: 4, target: 8 },
-		{ id: 21, source: 5, target: 7 },
-		{ id: 22, source: 5, target: 8 },
-		{ id: 23, source: 6, target: 7 },
-		{ id: 25, source: 6, target: 8 },
-	]
-};
-
-
-const TESSERACT = {
-	nodes: [
-		{ id: 1,  x: -1, y: -1, z: -1, w: -1 },
-		{ id: 2,  x:  1, y: -1, z: -1, w: -1 },
-		{ id: 3,  x: -1, y:  1, z: -1, w: -1 },
-		{ id: 4,  x:  1, y:  1, z: -1, w: -1 },
-		{ id: 5,  x: -1, y: -1, z:  1, w: -1 },
-		{ id: 6,  x:  1, y: -1, z:  1, w: -1 },
-		{ id: 7,  x: -1, y:  1, z:  1, w: -1 },
-		{ id: 8,  x:  1, y:  1, z:  1, w: -1 },
-		{ id: 9,  x: -1, y: -1, z: -1, w:  1 },
-		{ id: 10, x:  1, y: -1, z: -1, w:  1 },
-		{ id: 11, x: -1, y:  1, z: -1, w:  1 },
-		{ id: 12, x:  1, y:  1, z: -1, w:  1 },
-		{ id: 13, x: -1, y: -1, z:  1, w:  1 },
-		{ id: 14, x:  1, y: -1, z:  1, w:  1 },
-		{ id: 15, x: -1, y:  1, z:  1, w:  1 },
-		{ id: 16, x:  1, y:  1, z:  1, w:  1 },
-	],
-	links: [
-		{ id: 1, source: 1, target: 2 },
-		{ id: 2, source: 2, target: 4 },
-		{ id: 3, source: 4, target: 3 },
-		{ id: 4, source: 3, target: 1 },
-		{ id: 5, source: 5, target: 6 },
-		{ id: 6, source: 6, target: 8 },
-		{ id: 7, source: 8, target: 7 },
-		{ id: 8, source: 7, target: 5 },
-		{ id: 9, source: 1, target: 5 },
-		{ id: 10, source: 2, target: 6 },
-		{ id: 11, source: 3, target: 7 },
-		{ id: 12, source: 4, target: 8 },
-
-		{ id: 13, source: 9, target: 10 },
-		{ id: 14, source: 10, target: 12 },
-		{ id: 15, source: 12, target: 11 },
-		{ id: 16, source: 11, target: 9 },
-		{ id: 17, source: 13, target: 14 },
-		{ id: 18, source: 14, target: 16 },
-		{ id: 19, source: 16, target: 15 },
-		{ id: 20, source: 15, target: 13 },
-		{ id: 21, source: 9, target: 13 },
-		{ id: 22, source: 10, target: 14 },
-		{ id: 23, source: 11, target: 15 },
-		{ id: 24, source: 12, target: 16 },
-
-		{ id: 25, source: 1, target: 9 },
-		{ id: 26, source: 2, target: 10 },
-		{ id: 27, source: 3, target: 11 },
-		{ id: 28, source: 4, target: 12 },
-		{ id: 29, source: 5, target: 13 },
-		{ id: 30, source: 6, target: 14 },
-		{ id: 31, source: 7, target: 15 },
-		{ id: 32, source: 8, target: 16 },
-
-
-	]
-};
 
 
 // hacky stuff for 4d rotations
@@ -334,9 +210,9 @@ link_m.roughness = 0.0;
 link_m.transparent = true;
 link_m.opacity = 0.5;
 
+console.log(SHAPES.TESSERACT);
 
-
-const shape = new FourDShape(node_m, link_m, TESSERACT);
+const shape = new FourDShape(node_m, link_m, SHAPES.TESSERACT);
 
 scene.add(shape);
 
@@ -353,7 +229,7 @@ function animate() {
 
 	theta += 0.01;
 
-	const rotations = [rotXY(theta * 0.5), rotXW(theta)];
+	const rotations = [rotYZ(theta * 0.33), rotXW(theta * 0.5)];
 	shape.render3(rotations);
 
 
diff --git a/shapes.js b/shapes.js
new file mode 100644
index 0000000..17a0b80
--- /dev/null
+++ b/shapes.js
@@ -0,0 +1,127 @@
+const r5 = Math.sqrt(5);
+
+
+export const CELL5 = {
+	nodes: [
+      {id:1, x: 1, y: 1, z: 1, w: -1 / r5 },
+      {id:2, x: 1, y: -1, z: -1, w: -1 / r5 },
+      {id:3, x: -1, y: 1, z: -1, w: -1 / r5 },
+      {id:4, x: -1, y: -1, z: 1, w: -1 / r5 },
+      {id:5, x: 0, y: 0, z: 0, w: 4 / r5 },
+	],
+	links: [
+		{ id:1, source:1, target: 2},
+		{ id:2, source:1, target: 3},
+		{ id:3, source:1, target: 4},
+		{ id:4, source:1, target: 5},
+		{ id:5, source:2, target: 3},
+		{ id:6, source:2, target: 4},
+		{ id:7, source:2, target: 5},
+		{ id:8, source:3, target: 4},
+		{ id:9, source:3, target: 5},
+		{ id:10, source:4, target: 5},
+		]
+
+	};
+
+
+export const CELL16 = {
+	nodes: [
+		{ id: 1, x: 0, y: -1, z: 0, w: 0 },
+		{ id: 2, x: 0, y: 0, z: -1, w: 0 },
+		{ id: 3, x: -1, y: 0, z: 0, w: 0 },
+		{ id: 4, x: 0, y: 0, z: 1, w: 0 },
+		{ id: 5, x: 1, y: 0, z: 0, w: 0 },
+		{ id: 6, x: 0, y: 1, z: 0, w: 0 },
+		{ id: 7, x: 0, y: 0, z: 0, w: -1 },
+		{ id: 8, x: 0, y: 0, z: 0, w: 1 },
+	],
+	links: [
+		{ id: 1, source: 1, target: 2 },
+		{ id: 2, source: 1, target: 3 },
+		{ id: 3, source: 1, target: 4 },
+		{ id: 4, source: 1, target: 5 },
+		{ id: 5, source: 2, target: 3 },
+		{ id: 6, source: 3, target: 4 },
+		{ id: 7, source: 4, target: 5 },
+		{ id: 8, source: 5, target: 2 },
+		{ id: 9, source: 2, target: 6 },
+		{ id: 10, source: 3, target: 6 },
+		{ id: 11, source: 4, target: 6 },
+		{ id: 12, source: 5, target: 6 },
+		{ id: 13, source: 1, target: 7 },
+		{ id: 14, source: 1, target: 8 },
+		{ id: 15, source: 2, target: 7 },
+		{ id: 16, source: 2, target: 8 },
+		{ id: 17, source: 3, target: 7 },
+		{ id: 18, source: 3, target: 8 },
+		{ id: 19, source: 4, target: 7 },
+		{ id: 20, source: 4, target: 8 },
+		{ id: 21, source: 5, target: 7 },
+		{ id: 22, source: 5, target: 8 },
+		{ id: 23, source: 6, target: 7 },
+		{ id: 25, source: 6, target: 8 },
+	]
+};
+
+
+export const TESSERACT = {
+	nodes: [
+		{ id: 1,  x: -1, y: -1, z: -1, w: -1 },
+		{ id: 2,  x:  1, y: -1, z: -1, w: -1 },
+		{ id: 3,  x: -1, y:  1, z: -1, w: -1 },
+		{ id: 4,  x:  1, y:  1, z: -1, w: -1 },
+		{ id: 5,  x: -1, y: -1, z:  1, w: -1 },
+		{ id: 6,  x:  1, y: -1, z:  1, w: -1 },
+		{ id: 7,  x: -1, y:  1, z:  1, w: -1 },
+		{ id: 8,  x:  1, y:  1, z:  1, w: -1 },
+		{ id: 9,  x: -1, y: -1, z: -1, w:  1 },
+		{ id: 10, x:  1, y: -1, z: -1, w:  1 },
+		{ id: 11, x: -1, y:  1, z: -1, w:  1 },
+		{ id: 12, x:  1, y:  1, z: -1, w:  1 },
+		{ id: 13, x: -1, y: -1, z:  1, w:  1 },
+		{ id: 14, x:  1, y: -1, z:  1, w:  1 },
+		{ id: 15, x: -1, y:  1, z:  1, w:  1 },
+		{ id: 16, x:  1, y:  1, z:  1, w:  1 },
+	],
+	links: [
+		{ id: 1, source: 1, target: 2 },
+		{ id: 2, source: 2, target: 4 },
+		{ id: 3, source: 4, target: 3 },
+		{ id: 4, source: 3, target: 1 },
+		{ id: 5, source: 5, target: 6 },
+		{ id: 6, source: 6, target: 8 },
+		{ id: 7, source: 8, target: 7 },
+		{ id: 8, source: 7, target: 5 },
+		{ id: 9, source: 1, target: 5 },
+		{ id: 10, source: 2, target: 6 },
+		{ id: 11, source: 3, target: 7 },
+		{ id: 12, source: 4, target: 8 },
+
+		{ id: 13, source: 9, target: 10 },
+		{ id: 14, source: 10, target: 12 },
+		{ id: 15, source: 12, target: 11 },
+		{ id: 16, source: 11, target: 9 },
+		{ id: 17, source: 13, target: 14 },
+		{ id: 18, source: 14, target: 16 },
+		{ id: 19, source: 16, target: 15 },
+		{ id: 20, source: 15, target: 13 },
+		{ id: 21, source: 9, target: 13 },
+		{ id: 22, source: 10, target: 14 },
+		{ id: 23, source: 11, target: 15 },
+		{ id: 24, source: 12, target: 16 },
+
+		{ id: 25, source: 1, target: 9 },
+		{ id: 26, source: 2, target: 10 },
+		{ id: 27, source: 3, target: 11 },
+		{ id: 28, source: 4, target: 12 },
+		{ id: 29, source: 5, target: 13 },
+		{ id: 30, source: 6, target: 14 },
+		{ id: 31, source: 7, target: 15 },
+		{ id: 32, source: 8, target: 16 },
+
+
+	]
+};
+
+