diff --git a/homedecor/clocks.lua b/homedecor/clocks.lua
index e204b016..e27e333f 100644
--- a/homedecor/clocks.lua
+++ b/homedecor/clocks.lua
@@ -67,3 +67,29 @@ homedecor.register("alarm_clock", {
 	},
 	groups = {snappy=3},
 })
+
+local gf_cbox = {
+	type = "fixed",
+	fixed = { -7/16, -8/16, -7/16, 7/16, 24/16, 7/16 }
+}
+
+homedecor.register("grandfather_clock", {
+	description = "Grandfather Clock",
+	mesh = "homedecor_grandfather_clock.obj",
+	tiles = {
+		"homedecor_grandfather_clock_wood.png",
+		"homedecor_tile_brass2.png",
+		"homedecor_grandfather_clock_face.png",
+		"homedecor_grandfather_clock_face_edge.png"
+	},
+	inventory_image = "homedecor_grandfather_clock_inv.png",
+	groups = { snappy = 3 },
+	selection_box = gf_cbox,
+	collision_box = gf_cbox,
+	expand = { top="air" },
+})
+
+minetest.register_alias("homedecor:grandfather_clock_bottom", "homedecor:grandfather_clock")
+minetest.register_alias("homedecor:grandfather_clock_top", "air")
+
+
diff --git a/homedecor/furniture.lua b/homedecor/furniture.lua
index a452ca1c..7e239f54 100644
--- a/homedecor/furniture.lua
+++ b/homedecor/furniture.lua
@@ -336,56 +336,6 @@ homedecor.register("wall_shelf", {
 	}
 })
 
-homedecor.register("grandfather_clock_bottom", {
-	description = "Grandfather Clock",
-	tiles = {
-		"homedecor_grandfather_clock_sides.png",
-		"homedecor_grandfather_clock_sides.png",
-		"homedecor_grandfather_clock_sides.png",
-		"homedecor_grandfather_clock_sides.png",
-		"homedecor_grandfather_clock_sides.png",
-		"homedecor_grandfather_clock_bottom.png"
-	},
-	inventory_image = "homedecor_grandfather_clock_inv.png",
-	groups = { snappy = 3 },
-	node_box = {
-		type = "fixed",
-		fixed = {
-			{-0.4, -0.5, -0.4, -0.3125, 0.5, 0.4}, -- NodeBox1
-			{-0.3125, -0.4375, -0.3125, 0.3125, 0.5, 0.4}, -- NodeBox2
-			{0.3125, -0.5, -0.4, 0.4, 0.5, 0.4}, -- NodeBox3
-			{-0.3125, -0.5, -0.4, 0.3125, -0.405, 0.4}, -- NodeBox4
-		}
-	},
-	selection_box = {
-		type = "fixed",
-		fixed = { -0.4, -0.5, -0.4, 0.4, 1.5, 0.4 }
-	},
-	expand = { top="homedecor:grandfather_clock_top" },
-})
-
-homedecor.register("grandfather_clock_top", {
-	tiles = {
-		"homedecor_grandfather_clock_sides.png",
-		"homedecor_grandfather_clock_sides.png",
-		"homedecor_grandfather_clock_sides.png",
-		"homedecor_grandfather_clock_sides.png",
-		"homedecor_grandfather_clock_sides.png",
-		"homedecor_grandfather_clock_top.png"
-	},
-	groups = { snappy = 3, not_in_creative_inventory=1 },
-	node_box = {
-		type = "fixed",
-		fixed = {
-			{-0.4, -0.5, -0.4, -0.3125, 0.5, 0.4}, -- NodeBox1
-			{-0.3125, -0.1875, -0.4, 0.3125, 0.5, 0.4}, -- NodeBox2
-			{0.3125, -0.5, -0.4, 0.4, 0.5, 0.4}, -- NodeBox3
-			{-0.3125, -0.5, -0.3125, 0.3125, 0.5, 0.4}, -- NodeBox4
-		}
-	},
-	selection_box = homedecor.nodebox.null,
-})
-
 local ofchairs_sbox = {
 		type = "fixed",
 		fixed = { -8/16, -8/16, -8/16, 8/16, 29/32, 8/16 }
diff --git a/homedecor/models/homedecor_grandfather_clock.mtl b/homedecor/models/homedecor_grandfather_clock.mtl
new file mode 100644
index 00000000..67c47a86
--- /dev/null
+++ b/homedecor/models/homedecor_grandfather_clock.mtl
@@ -0,0 +1,32 @@
+# Blender MTL File: 'grandfather-clock.blend'
+# Material Count: 3
+
+newmtl brass
+Ns 96.078431
+Ka 0.000000 0.000000 0.000000
+Kd 0.722818 0.530407 0.147719
+Ks 0.500000 0.500000 0.500000
+Ni 1.000000
+d 1.000000
+illum 2
+map_Kd /home/vanessa/Minetest-related/mods/my_mods/homedecor_modpack/homedecor/textures/homedecor_tile_brass2.png
+
+newmtl face
+Ns 96.078431
+Ka 0.000000 0.000000 0.000000
+Kd 0.640000 0.640000 0.640000
+Ks 0.500000 0.500000 0.500000
+Ni 1.000000
+d 1.000000
+illum 2
+map_Kd /home/vanessa/Minetest-related/mods/my_mods/homedecor_modpack/homedecor/textures/homedecor_grandfather_clock_face.png
+
+newmtl wood
+Ns 96.078431
+Ka 0.000000 0.000000 0.000000
+Kd 0.087778 0.033537 0.010796
+Ks 0.500000 0.500000 0.500000
+Ni 1.000000
+d 1.000000
+illum 2
+map_Kd /home/vanessa/Minetest-related/mods/my_mods/homedecor_modpack/homedecor/textures/homedecor_grandfather_clock_wood.png
diff --git a/homedecor/models/homedecor_grandfather_clock.obj b/homedecor/models/homedecor_grandfather_clock.obj
new file mode 100644
index 00000000..ea9aab7a
--- /dev/null
+++ b/homedecor/models/homedecor_grandfather_clock.obj
@@ -0,0 +1,360 @@
+# Blender v2.73 (sub 0) OBJ File: 'grandfather-clock.blend'
+# www.blender.org
+o Cylinder.001
+v 0.000000 0.875000 -0.406250
+v -0.000000 0.843751 -0.437500
+v 0.107630 0.865159 -0.437500
+v 0.095671 0.894030 -0.406250
+v 0.198874 0.926126 -0.437500
+v 0.176777 0.948223 -0.406250
+v 0.259841 1.017370 -0.437500
+v 0.230970 1.029329 -0.406250
+v 0.281249 1.125000 -0.437500
+v 0.250000 1.125000 -0.406250
+v 0.259841 1.232630 -0.437500
+v 0.230970 1.220671 -0.406250
+v 0.198874 1.323874 -0.437500
+v 0.176777 1.301777 -0.406250
+v 0.107630 1.384841 -0.437500
+v 0.095671 1.355970 -0.406250
+v -0.000000 1.406249 -0.437500
+v 0.000000 1.375000 -0.406250
+v -0.107630 1.384841 -0.437500
+v -0.095671 1.355970 -0.406250
+v -0.198874 1.323874 -0.437500
+v -0.176777 1.301777 -0.406250
+v -0.259841 1.232630 -0.437500
+v -0.230970 1.220671 -0.406250
+v -0.281249 1.125000 -0.437500
+v -0.250000 1.125000 -0.406250
+v -0.259841 1.017370 -0.437500
+v -0.230970 1.029329 -0.406250
+v -0.198873 0.926126 -0.437500
+v -0.176776 0.948223 -0.406250
+v -0.107630 0.865159 -0.437500
+v -0.095671 0.894030 -0.406250
+v -0.437500 -0.500000 0.437500
+v -0.437500 -0.500000 -0.437500
+v 0.437500 -0.500000 -0.437500
+v 0.437500 -0.500000 0.437500
+v -0.437500 1.500000 0.437500
+v -0.437500 1.500000 -0.437500
+v 0.437500 1.500000 -0.437500
+v 0.437500 1.500000 0.437500
+v -0.437500 -0.375000 -0.437500
+v 0.437500 -0.375000 -0.437500
+v -0.437500 0.750000 -0.437500
+v 0.437500 0.750000 -0.437500
+v -0.312500 -0.375000 -0.437500
+v -0.312500 0.750000 -0.437500
+v 0.312500 -0.375000 -0.437500
+v 0.312500 0.750000 -0.437500
+v -0.312500 -0.375000 0.375000
+v -0.312500 0.750000 0.375000
+v 0.312500 -0.375000 0.375000
+v 0.312500 0.750000 0.375000
+v -0.031250 -0.062500 0.015625
+v -0.031250 -0.062500 -0.015625
+v 0.031250 -0.062500 -0.015625
+v 0.031250 -0.062500 0.015625
+v -0.031250 0.750000 0.015625
+v -0.031250 0.750000 -0.015625
+v 0.031250 0.750000 -0.015625
+v 0.031250 0.750000 0.015625
+v 0.024386 -0.057089 -0.017327
+v 0.024386 -0.057089 0.017329
+v 0.069446 -0.075754 -0.017327
+v 0.069446 -0.075754 0.017329
+v 0.103934 -0.110241 -0.017327
+v 0.103934 -0.110241 0.017329
+v 0.122598 -0.155301 -0.017327
+v 0.122598 -0.155301 0.017329
+v 0.122598 -0.204074 -0.017327
+v 0.122598 -0.204074 0.017329
+v 0.103934 -0.249134 -0.017327
+v 0.103934 -0.249134 0.017329
+v 0.069446 -0.283621 -0.017327
+v 0.069446 -0.283621 0.017329
+v 0.024386 -0.302286 -0.017327
+v 0.024386 -0.302286 0.017329
+v -0.024386 -0.302286 -0.017327
+v -0.024386 -0.302286 0.017329
+v -0.069446 -0.283621 -0.017327
+v -0.069446 -0.283621 0.017329
+v -0.103934 -0.249134 -0.017327
+v -0.103934 -0.249134 0.017329
+v -0.122598 -0.204074 -0.017327
+v -0.122598 -0.204074 0.017329
+v -0.122598 -0.155301 -0.017327
+v -0.122598 -0.155301 0.017329
+v -0.103934 -0.110241 -0.017327
+v -0.103934 -0.110241 0.017329
+v -0.069446 -0.075754 -0.017327
+v -0.069446 -0.075754 0.017329
+v -0.024386 -0.057089 -0.017327
+v -0.024386 -0.057089 0.017329
+v -0.437500 0.500000 0.437500
+v 0.437500 0.500000 0.437500
+v -0.437500 0.500000 -0.437500
+v 0.437500 0.500000 -0.437500
+v -0.312500 0.500000 -0.437500
+v 0.312500 0.500000 -0.437500
+v -0.312500 0.500000 0.375000
+v 0.312500 0.500000 0.375000
+vt 0.062500 0.250000
+vt 0.392370 0.365160
+vt 0.301126 0.426126
+vt 0.937500 0.250000
+vt 0.759841 0.517370
+vt 0.698873 0.426126
+vt 0.062500 0.000000
+vt 0.937500 0.000000
+vt 0.937500 1.000000
+vt 0.062500 1.000000
+vt 0.937500 0.125000
+vt 0.062500 0.125000
+vt 0.240159 0.517370
+vt 0.062500 0.875000
+vt 0.937500 0.875000
+vt 0.812500 0.250000
+vt 0.187500 0.250000
+vt 0.187500 0.000000
+vt 0.812500 0.000000
+vt 0.812500 1.000000
+vt 0.812500 0.062500
+vt 0.187500 0.062500
+vt 0.187500 1.000000
+vt 0.812500 0.937500
+vt 0.187500 0.937500
+vt 0.187500 0.125000
+vt 0.812500 0.125000
+vt 0.607630 0.365160
+vt 0.781250 0.625000
+vt 0.218751 0.625000
+vt 0.500000 0.343751
+vt 0.759841 0.732630
+vt 0.698874 0.823874
+vt 0.240159 0.732630
+vt 0.392370 0.884840
+vt 0.500000 0.906249
+vt 0.607630 0.884840
+vt 0.301126 0.823874
+vt 0.875000 0.687500
+vt 0.875000 0.750000
+vt 0.062500 0.750000
+vt 0.062500 0.687500
+vt 0.875000 0.812500
+vt 0.062500 0.812500
+vt 0.875000 0.875000
+vt 0.062500 0.187500
+vt 0.125000 0.125000
+vt 0.125000 0.187500
+vt 0.187500 0.187500
+vt 0.250000 0.125000
+vt 0.250000 0.187500
+vt 0.312500 0.125000
+vt 0.312500 0.187500
+vt 0.375000 0.125000
+vt 0.375000 0.187500
+vt 0.437500 0.125000
+vt 0.437500 0.187500
+vt 0.500000 0.125000
+vt 0.500000 0.187500
+vt 0.562500 0.125000
+vt 0.562500 0.187500
+vt 0.625000 0.125000
+vt 0.625000 0.187500
+vt 0.687500 0.125000
+vt 0.687500 0.187500
+vt 0.750000 0.125000
+vt 0.750000 0.187500
+vt 0.812500 0.187500
+vt 0.875000 0.125000
+vt 0.875000 0.187500
+vt 0.937500 0.187500
+vt -0.000000 0.187500
+vt -0.000000 0.125000
+vt 1.000000 0.125000
+vt 1.000000 0.187500
+vt 0.595078 0.515567
+vt 0.549293 0.496602
+vt 0.514250 0.461559
+vt 0.495285 0.415773
+vt 0.495285 0.366215
+vt 0.514250 0.320429
+vt 0.549293 0.285387
+vt 0.595078 0.266421
+vt 0.644636 0.266421
+vt 0.690422 0.285387
+vt 0.725465 0.320429
+vt 0.744430 0.366215
+vt 0.744430 0.415773
+vt 0.725465 0.461559
+vt 0.690422 0.496602
+vt 0.644636 0.515567
+vt 0.185729 0.185729
+vt 0.329918 0.089386
+vt 0.500000 0.055554
+vt 0.670082 0.089386
+vt 0.814269 0.185729
+vt 0.910614 0.329918
+vt 0.944445 0.500000
+vt 0.910614 0.670082
+vt 0.814271 0.814271
+vt 0.670082 0.910614
+vt 0.500000 0.944445
+vt 0.329918 0.910614
+vt 0.185729 0.814271
+vt 0.089385 0.670082
+vt 0.055554 0.500000
+vt 0.089385 0.329918
+vt 0.125000 0.750000
+vt 0.125000 0.687500
+vt 0.250000 0.687500
+vt 0.250000 0.750000
+vt 0.375000 0.750000
+vt 0.375000 0.687500
+vt 0.500000 0.687500
+vt 0.500000 0.750000
+vt 0.500000 0.937500
+vt 0.500000 0.875000
+vt 0.625000 0.875000
+vt 0.625000 0.937500
+vt 0.750000 0.937500
+vt 0.750000 0.875000
+vt 0.875000 0.937500
+vt 1.000000 0.687500
+vt 1.000000 0.750000
+vt 1.000000 0.875000
+vt 1.000000 0.937500
+vt 0.250000 0.937500
+vt 0.250000 0.875000
+vt 0.375000 0.875000
+vt 0.375000 0.937500
+vt 0.125000 0.937500
+vt 0.125000 0.875000
+vt 0.750000 0.750000
+vt 0.750000 0.687500
+vt 0.000000 0.750000
+vt 0.000000 0.687500
+vt 0.625000 0.750000
+vt 0.625000 0.687500
+vt 0.000000 0.937500
+vt 0.000000 0.875000
+vn -0.000000 -0.000000 -1.000000
+vn 1.000000 0.000000 0.000000
+vn 0.000000 0.000000 1.000000
+vn 0.000000 -1.000000 0.000000
+vn 0.000000 1.000000 0.000000
+vn -1.000000 0.000000 0.000000
+vn 0.382700 0.923900 0.000000
+vn 0.707100 0.707100 0.000000
+vn 0.923900 0.382700 0.000000
+vn 0.923900 -0.382700 0.000000
+vn 0.707100 -0.707100 0.000000
+vn 0.382700 -0.923900 0.000000
+vn -0.382700 -0.923900 0.000000
+vn -0.707100 -0.707100 0.000000
+vn -0.923900 -0.382700 0.000000
+vn -0.923900 0.382700 0.000000
+vn -0.707100 0.707100 0.000000
+vn -0.382700 0.923900 0.000000
+vn -0.396600 -0.593600 -0.700200
+vn -0.700200 -0.139300 -0.700200
+vn 0.700200 -0.139300 -0.700200
+vn 0.396600 -0.593600 -0.700200
+vn -0.139300 0.700200 -0.700200
+vn 0.139300 -0.700200 -0.700200
+vn 0.593600 0.396600 -0.700200
+vn 0.396600 0.593600 -0.700200
+vn -0.396600 0.593600 -0.700200
+vn -0.593600 -0.396600 -0.700200
+vn -0.139300 -0.700200 -0.700200
+vn 0.593600 -0.396600 -0.700200
+vn 0.700200 0.139300 -0.700200
+vn -0.593600 0.396600 -0.700200
+vn -0.700200 0.139300 -0.700200
+vn 0.139300 0.700200 -0.700200
+g Cylinder.001_Cylinder.001_wood
+s off
+f 44/1/1 3/2/1 5/3/1
+f 43/4/1 27/5/1 29/6/1
+f 94/7/2 96/8/2 39/9/2 40/10/2
+f 35/7/1 34/8/1 41/11/1 42/12/1
+f 96/9/2 94/10/2 36/7/2 35/8/2
+f 94/9/3 93/10/3 33/7/3 36/8/3
+f 33/10/4 34/7/4 35/8/4 36/9/4
+f 40/8/5 39/9/5 38/10/5 37/7/5
+f 7/13/1 44/1/1 5/3/1
+f 45/8/6 49/7/6 99/14/6 97/15/6
+f 50/16/1 52/17/1 100/18/1 99/19/1
+f 98/15/6 47/8/6 51/7/6 100/14/6
+f 97/8/6 99/7/6 50/1/6 46/4/6
+f 47/20/4 51/21/4 49/22/4 45/23/4
+f 52/24/4 50/25/4 46/18/4 48/19/4
+f 99/20/1 100/23/1 51/26/1 49/27/1
+f 31/28/1 43/4/1 29/6/1
+f 43/4/1 25/29/1 27/5/1
+f 9/30/1 44/1/1 7/13/1
+f 44/1/1 2/31/1 3/2/1
+f 31/28/1 2/31/1 43/4/1
+f 23/32/1 38/9/1 21/33/1
+f 43/4/1 2/31/1 44/1/1
+f 25/29/1 38/9/1 23/32/1
+f 11/34/1 39/10/1 9/30/1
+f 39/10/1 15/35/1 17/36/1
+f 19/37/1 38/9/1 17/36/1
+f 21/33/1 38/9/1 19/37/1
+f 39/10/1 13/38/1 15/35/1
+f 39/10/1 11/34/1 13/38/1
+f 9/30/1 39/10/1 44/1/1
+f 39/10/1 17/36/1 38/9/1
+f 38/9/1 25/29/1 43/4/1
+f 40/9/3 37/10/3 93/7/3 94/8/3
+f 33/8/6 93/9/6 95/10/6 34/7/6
+f 93/8/6 37/9/6 38/10/6 95/7/6
+f 48/4/6 98/8/6 100/7/6 52/1/6
+f 47/26/1 98/23/1 96/10/1 42/12/1
+f 45/27/1 41/11/1 95/9/1 97/20/1
+f 97/19/1 95/8/1 43/4/1 46/16/1
+f 98/18/1 48/17/1 44/1/1 96/7/1
+g Cylinder.001_Cylinder.001_brass
+f 57/39/6 58/40/6 54/41/6 53/42/6
+f 58/40/1 59/43/1 55/44/1 54/41/1
+f 59/43/2 60/45/2 56/14/2 55/44/2
+f 61/46/7 62/12/7 64/47/7 63/48/7
+f 63/48/8 64/47/8 66/26/8 65/49/8
+f 65/49/9 66/26/9 68/50/9 67/51/9
+f 67/51/2 68/50/2 70/52/2 69/53/2
+f 69/53/10 70/52/10 72/54/10 71/55/10
+f 71/55/11 72/54/11 74/56/11 73/57/11
+f 73/57/12 74/56/12 76/58/12 75/59/12
+f 75/59/4 76/58/4 78/60/4 77/61/4
+f 77/61/13 78/60/13 80/62/13 79/63/13
+f 79/63/14 80/62/14 82/64/14 81/65/14
+f 81/65/15 82/64/15 84/66/15 83/67/15
+f 83/67/6 84/66/6 86/27/6 85/68/6
+f 85/68/16 86/27/16 88/69/16 87/70/16
+f 87/70/17 88/69/17 90/11/17 89/71/17
+f 91/72/5 92/73/5 62/12/5 61/46/5
+f 89/71/18 90/11/18 92/74/18 91/75/18
+f 61/76/1 63/77/1 65/78/1 67/79/1 69/80/1 71/81/1 73/82/1 75/83/1 77/84/1 79/85/1 81/86/1 83/87/1 85/88/1 87/89/1 89/90/1 91/91/1
+g Cylinder.001_Cylinder.001_face
+f 6/92/1 4/93/1 1/94/1 32/95/1 30/96/1 28/97/1 26/98/1 24/99/1 22/100/1 20/101/1 18/102/1 16/103/1 14/104/1 12/105/1 10/106/1 8/107/1
+g Cylinder.001_Cylinder.001_face-edge
+f 16/108/19 15/109/19 13/110/19 14/111/19
+f 12/112/20 11/113/20 9/114/20 10/115/20
+f 26/116/21 25/117/21 23/118/21 24/119/21
+f 22/120/22 21/121/22 19/45/22 20/122/22
+f 4/40/23 3/39/23 2/123/23 1/124/23
+f 20/122/24 19/45/24 17/125/24 18/126/24
+f 30/127/25 29/128/25 27/129/25 28/130/25
+f 32/131/26 31/132/26 29/128/26 30/127/26
+f 6/133/27 5/134/27 3/39/27 4/40/27
+f 14/111/28 13/110/28 11/113/28 12/112/28
+f 16/108/29 18/135/29 17/136/29 15/109/29
+f 24/119/30 23/118/30 21/121/30 22/120/30
+f 28/130/31 27/129/31 25/117/31 26/116/31
+f 8/137/32 7/138/32 5/134/32 6/133/32
+f 10/115/33 9/114/33 7/138/33 8/137/33
+f 32/131/34 1/139/34 2/140/34 31/132/34
diff --git a/homedecor/textures/homedecor_grandfather_clock_bottom.png b/homedecor/textures/homedecor_grandfather_clock_bottom.png
deleted file mode 100644
index c15a59aa..00000000
Binary files a/homedecor/textures/homedecor_grandfather_clock_bottom.png and /dev/null differ
diff --git a/homedecor/textures/homedecor_grandfather_clock_face.png b/homedecor/textures/homedecor_grandfather_clock_face.png
new file mode 100644
index 00000000..6b269ccb
Binary files /dev/null and b/homedecor/textures/homedecor_grandfather_clock_face.png differ
diff --git a/homedecor/textures/homedecor_grandfather_clock_face_edge.png b/homedecor/textures/homedecor_grandfather_clock_face_edge.png
new file mode 100644
index 00000000..2ad43818
Binary files /dev/null and b/homedecor/textures/homedecor_grandfather_clock_face_edge.png differ
diff --git a/homedecor/textures/homedecor_grandfather_clock_inv.png b/homedecor/textures/homedecor_grandfather_clock_inv.png
index ae9bf13b..d0b168c9 100644
Binary files a/homedecor/textures/homedecor_grandfather_clock_inv.png and b/homedecor/textures/homedecor_grandfather_clock_inv.png differ
diff --git a/homedecor/textures/homedecor_grandfather_clock_sides.png b/homedecor/textures/homedecor_grandfather_clock_sides.png
deleted file mode 100644
index 786e4982..00000000
Binary files a/homedecor/textures/homedecor_grandfather_clock_sides.png and /dev/null differ
diff --git a/homedecor/textures/homedecor_grandfather_clock_top.png b/homedecor/textures/homedecor_grandfather_clock_top.png
deleted file mode 100644
index 6b6dd5f2..00000000
Binary files a/homedecor/textures/homedecor_grandfather_clock_top.png and /dev/null differ
diff --git a/homedecor/textures/homedecor_grandfather_clock_wood.png b/homedecor/textures/homedecor_grandfather_clock_wood.png
new file mode 100644
index 00000000..95fc8d59
Binary files /dev/null and b/homedecor/textures/homedecor_grandfather_clock_wood.png differ