diff --git a/src/experimental/geom_octahedron.scad b/src/experimental/geom_octahedron.scad
new file mode 100644
index 00000000..fcdcfac5
--- /dev/null
+++ b/src/experimental/geom_octahedron.scad
@@ -0,0 +1,17 @@
+use <experimental/_impl/_geom_platonic_polyhedra.scad>;
+
+function geom_octahedron(radius, detail = 0, quick_mode = true) =
+    let(
+        t = (1 + sqrt(5)) / 2 ,
+        octahedron_points = [
+			[1, 0, 0], 	[-1, 0, 0],	[0, 1, 0],
+			[0, -1, 0], [0, 0, 1],	[0, 0, -1]
+		],
+        octahedron_faces = [
+			[4, 2, 0],	[3, 4, 0],	[5, 3, 0],
+			[2, 5, 0],	[5, 2, 1],	[3, 5, 1],
+			[4, 3, 1],	[2, 4, 1]
+		]
+    )
+    _geom_platonic_polyhedra(octahedron_points, octahedron_faces, radius, detail, quick_mode);
+    
\ No newline at end of file
diff --git a/src/experimental/octahedron.scad b/src/experimental/octahedron.scad
new file mode 100644
index 00000000..eefb66a4
--- /dev/null
+++ b/src/experimental/octahedron.scad
@@ -0,0 +1,6 @@
+use <experimental/geom_octahedron.scad>;
+
+module octahedron(radius, detail = 0, quick_mode = true) {
+	points_faces = geom_octahedron(radius, detail, quick_mode);
+    polyhedron(points_faces[0], points_faces[1]);
+} 
\ No newline at end of file