diff --git a/enclosure/internal_components.scad b/enclosure/internal_components.scad
index 9839e85..65cbe07 100644
--- a/enclosure/internal_components.scad
+++ b/enclosure/internal_components.scad
@@ -2,7 +2,7 @@
 // This is for test-fitting and shouldn't be printed.
 
 // 50mm speaker
-module speaker() {
+module speaker_50() {
     translate([0, 0, -2]) {
         union() {
             difference() {
@@ -21,6 +21,13 @@ module speaker() {
     }
 }
 
+// 80mm flat speaker
+module speaker_80() {
+    cylinder(h = 12, d1 = 78, d2 = 34);
+    translate([0, 0, 12]) cylinder(h = 12, d = 22);
+}
+
+
 // 4056-based li-ion charging module
 module li_ion_4056_charger_module() {
     cube([28, 17, 2], true);
@@ -59,8 +66,9 @@ module battery_18650() {
     cylinder(d = 18, h = 65, center = true);
 }
 
-//speaker();
+//speaker_50();
+//speaker_80();
 //li_ion_4056_charger_module();
 //switch();
 //pcb();
-battery_18650();
\ No newline at end of file
+//battery_18650();
\ No newline at end of file
diff --git a/enclosure/test_fit.scad b/enclosure/test_fit.scad
new file mode 100644
index 0000000..7bd8d01
--- /dev/null
+++ b/enclosure/test_fit.scad
@@ -0,0 +1,15 @@
+// This file contains the enclosure with all the internal components, for a test fit.
+
+use <internal_components.scad>
+//use <fabula_enclosure.scad>
+
+
+module test_fit_components() {
+    translate([0, 35, 0]) speaker_80();
+    translate([0, -60, 0]) rotate([0, 0, 0]) rotate([0, 0, 90]) li_ion_4056_charger_module();
+    translate ([38, -40, 10]) rotate([90, 0, 0]) rotate([0, 90, 0]) switch();
+    translate([0, 0, 35]) pcb();
+    translate([0, -14, 9]) rotate([0, 90, 0]) battery_18650();
+}
+
+test_fit_components();
\ No newline at end of file