diff --git a/.gitignore b/.gitignore
index 6fd0a37..3390ebf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,7 +10,6 @@ luac.out
 *.o
 *.os
 *.ko
-*.obj
 *.elf
 
 # Precompiled Headers
diff --git a/default_markets.lua b/default_markets.lua
index 57e3b41..e51ce22 100644
--- a/default_markets.lua
+++ b/default_markets.lua
@@ -142,9 +142,30 @@ commoditymarket.register_market("caravan", caravan_def)
 minetest.register_node("commoditymarket:caravan_market", {
 	description = "Trader's Caravan",
 	_doc_items_longdesc = caravan_def.long_description,
-	tiles = {"default_chest_top.png","default_chest_top.png",
-		"default_chest_side.png^commoditymarket_caravan.png","default_chest_side.png^commoditymarket_caravan.png",
-		"commoditymarket_empty_shelf.png","default_chest_side.png^commoditymarket_trade.png",},
+	
+	drawtype = "mesh",
+	mesh = "commoditymarket_wagon.obj",
+	tiles = {
+		{ name = "default_wood.png", backface_culling = true }, -- base wood
+		{ name = "default_fence_rail_wood.png", backface_culling = true }, -- wheel sides
+		{ name = "default_coal_block.png", backface_culling = true }, -- wheel tyre
+		{ name = "commoditymarket_shingles_wood.png", backface_culling = true }, -- roof
+		{ name = "commoditymarket_door_wood.png", backface_culling = true }, -- door
+		{ name = "commoditymarket_trapdoor.png", backface_culling = true }, -- window
+		},
+    collision_box = {
+		type = "fixed",
+        fixed = {
+            {-0.6, -0.5, -1.25, 0.6, 1.5, 1.25},
+        },
+    },
+	selection_box = {
+		type = "fixed",
+        fixed = {
+            {-0.6, -0.5, -1.25, 0.6, 1.5, 1.25},
+        },
+    },
+
 	paramtype2 = "facedir",
 	drop = "",
 	groups = {choppy = 2, oddly_breakable_by_hand = 1, not_in_creative_inventory = 1},
@@ -177,9 +198,29 @@ minetest.register_node("commoditymarket:caravan_market", {
 minetest.register_node("commoditymarket:caravan_market_permanent", {
 	description = "Trader's Caravan",
 	_doc_items_longdesc = caravan_def.long_description,
-	tiles = {"default_chest_top.png","default_chest_top.png",
-		"default_chest_side.png^commoditymarket_caravan.png","default_chest_side.png^commoditymarket_caravan.png",
-		"commoditymarket_empty_shelf.png","default_chest_side.png^commoditymarket_trade.png",},
+	
+	drawtype = "mesh",
+	mesh = "commoditymarket_wagon.obj",
+	tiles = {
+		{ name = "default_wood.png", backface_culling = true }, -- base wood
+		{ name = "default_fence_rail_wood.png", backface_culling = true }, -- wheel sides
+		{ name = "default_coal_block.png", backface_culling = true }, -- wheel tyre
+		{ name = "commoditymarket_shingles_wood.png", backface_culling = true }, -- roof
+		{ name = "commoditymarket_door_wood.png", backface_culling = true }, -- door
+		{ name = "commoditymarket_trapdoor.png", backface_culling = true }, -- window
+		},
+    collision_box = {
+		type = "fixed",
+        fixed = {
+            {-0.6, -0.5, -1.25, 0.6, 1.5, 1.25},
+        },
+    },
+	selection_box = {
+		type = "fixed",
+        fixed = {
+            {-0.6, -0.5, -1.25, 0.6, 1.5, 1.25},
+        },
+    },
 	paramtype2 = "facedir",
 	is_ground_content = false,
 	groups = {choppy = 2, oddly_breakable_by_hand = 1,},
diff --git a/models/commoditymarket_wagon.obj b/models/commoditymarket_wagon.obj
new file mode 100644
index 0000000..31cc45d
--- /dev/null
+++ b/models/commoditymarket_wagon.obj
@@ -0,0 +1,792 @@
+# Blender v2.79 (sub 0) OBJ File: 'wagon.blend'
+# www.blender.org
+g Cart.004_Cube.011
+v 0.576721 -0.096672 -1.153442
+v 0.576721 -0.096672 1.153443
+v 0.576721 1.200951 -1.153442
+v 0.576721 1.200951 1.153443
+v 0.407804 1.608755 1.153443
+v 0.407804 1.608755 -1.153443
+v 0.634393 1.200951 1.268787
+v 0.634393 1.200951 -1.268787
+v 0.448584 1.649535 1.268787
+v 0.448584 1.649535 -1.268787
+v 0.581113 1.178882 1.268787
+v 0.581113 1.178882 -1.268787
+v 0.407805 1.608756 1.268787
+v 0.407805 1.608756 -1.268787
+v 0.554096 0.037741 1.018928
+v 0.554096 0.163735 1.089024
+v 0.554096 -0.523026 2.026881
+v 0.554096 -0.397032 2.096977
+v 0.409915 0.037741 1.018928
+v 0.409915 0.163735 1.089024
+v 0.409915 -0.523026 2.026881
+v 0.409915 -0.397032 2.096977
+v 0.324406 0.582331 1.134006
+v 0.324406 0.654421 1.134006
+v 0.324406 0.582331 1.441803
+v 0.324406 0.654421 1.441803
+v -0.576721 -0.096672 1.153443
+v -0.576721 -0.096672 -1.153442
+v 0.000000 1.200951 -1.153443
+v -0.576721 1.200951 -1.153442
+v 0.000000 1.200951 1.153443
+v 0.000000 1.777673 1.153443
+v 0.000000 1.777673 -1.153443
+v -0.576721 1.200951 1.153443
+v -0.407804 1.608755 1.153443
+v -0.407804 1.608755 -1.153443
+v 0.000000 1.835345 -1.268787
+v 0.000000 1.835345 1.268787
+v -0.634393 1.200951 1.268787
+v -0.634393 1.200951 -1.268787
+v -0.448584 1.649535 1.268787
+v -0.448584 1.649535 -1.268787
+v 0.000000 1.777673 -1.268787
+v 0.000000 1.777673 1.268787
+v -0.581113 1.178882 1.268787
+v -0.581113 1.178882 -1.268787
+v -0.407805 1.608756 1.268787
+v -0.407805 1.608756 -1.268787
+v -0.554096 0.037741 1.018928
+v -0.554096 0.163735 1.089024
+v -0.554096 -0.523026 2.026881
+v -0.554096 -0.397032 2.096977
+v -0.409915 0.037741 1.018928
+v -0.409915 0.163735 1.089024
+v -0.409915 -0.523026 2.026881
+v -0.409915 -0.397032 2.096977
+v -0.324406 0.582331 1.134006
+v -0.324406 0.654421 1.134006
+v -0.324406 0.582331 1.441803
+v -0.324406 0.654421 1.441803
+vt 1.700588 -1.928836
+vt 1.700588 -2.046429
+vt 2.758935 -2.046429
+vt 2.758935 -1.928836
+vt 1.696674 -2.548512
+vt 1.696674 -1.792455
+vt -2.442635 -1.792455
+vt -2.442635 -2.548512
+vt 1.696674 -1.072433
+vt -2.442635 -1.072432
+vt -2.442631 3.249394
+vt 1.696562 3.249523
+vt 1.696559 3.343594
+vt -2.442635 3.343473
+vt 1.916170 -1.183737
+vt 1.916170 -0.391715
+vt 1.829259 -0.427715
+vt 1.822098 -1.183736
+vt 2.116061 -0.391715
+vt 2.116059 -1.183737
+vt 2.210131 -1.183737
+vt 2.202973 -0.427715
+vt 1.962314 0.354636
+vt 1.962314 -0.437386
+vt 2.049228 -0.401385
+vt 2.049225 0.318636
+vt 2.704097 1.376386
+vt 2.704097 2.168408
+vt 2.617185 2.132408
+vt 2.617182 1.412387
+vt -2.442635 2.528168
+vt -2.442635 2.292981
+vt -0.561134 2.292980
+vt -0.561134 2.528170
+vt 2.449234 -0.948549
+vt 2.214046 -0.948549
+vt 2.214046 -1.183737
+vt 2.449234 -1.183737
+vt -0.561132 2.771188
+vt -0.561132 3.006376
+vt -2.442635 3.006376
+vt -2.442635 2.771187
+vt 2.449234 -0.705531
+vt 2.449234 -0.470344
+vt 2.214046 -0.470344
+vt 2.214046 -0.705531
+vt -0.561131 3.010291
+vt -0.561131 3.245479
+vt -2.442635 3.245479
+vt -2.442635 3.010291
+vt -0.561132 2.532084
+vt -0.561132 2.767272
+vt -2.442635 2.767272
+vt -2.442635 2.532084
+vt 1.700588 0.214419
+vt 1.700588 0.096825
+vt 2.202671 0.096825
+vt 2.202671 0.214419
+vt 1.700588 -2.548512
+vt 2.758935 -2.548512
+vt 2.758935 -1.426753
+vt 1.700588 -1.426753
+vt -2.442635 2.289065
+vt -2.442635 0.407561
+vt 1.320375 0.407561
+vt 1.320375 2.289065
+vt 1.696674 0.403646
+vt -2.442635 0.403646
+vt -2.442634 -0.352410
+vt 1.696674 -0.352410
+vt -2.442635 3.441588
+vt -2.442635 3.347518
+vt 1.696558 3.347508
+vt 1.696559 3.441588
+vt 2.018072 -1.183737
+vt 2.112145 -1.183736
+vt 2.104985 -0.427714
+vt 2.018074 -0.391715
+vt 2.014158 -0.391715
+vt 1.927246 -0.427714
+vt 1.920085 -1.183736
+vt 2.014158 -1.183737
+vt 2.143971 -0.437386
+vt 2.230882 -0.401386
+vt 2.230885 0.318636
+vt 2.143971 0.354636
+vt 0.326285 0.918677
+vt 0.239371 0.882676
+vt 0.239374 0.162655
+vt 0.326285 0.126655
+vt 1.328200 3.010291
+vt 3.209704 3.010291
+vt 3.209704 3.245479
+vt 1.328199 3.245479
+vt 2.449234 -0.944634
+vt 2.449234 -0.709446
+vt 2.214046 -0.709446
+vt 2.214046 -0.944634
+vt 3.209704 3.006375
+vt 1.328199 3.006376
+vt 1.328199 2.771188
+vt 3.209703 2.771187
+vt 2.206585 0.096825
+vt 2.441773 0.096825
+vt 2.441773 0.332013
+vt 2.206585 0.332013
+vt 3.582092 -1.187651
+vt 1.700588 -1.187651
+vt 1.700588 -1.422839
+vt 3.582092 -1.422839
+vt 1.324285 3.006376
+vt -0.557218 3.006375
+vt -0.557218 2.771187
+vt 1.324285 2.771187
+vt 1.700588 0.218334
+vt 2.202671 0.218334
+vt 2.202671 0.335928
+vt 1.700588 0.335928
+vt 0.231464 -3.312466
+vt 2.463943 -3.312466
+vt 2.463941 -0.800928
+vt 1.347703 -0.781449
+vt 0.231463 -0.800928
+vt -4.248406 -3.320643
+vt -4.248406 -0.802708
+vt 0.227922 -0.802708
+vt 0.227923 -3.320643
+vt 2.143980 0.001054
+vt 1.347708 -0.784479
+vt 0.551428 -0.001975
+vt 0.231463 -0.803958
+vt 1.347703 0.334959
+vt 1.347708 0.331930
+vt -4.248395 -3.319945
+vt 0.227936 -3.319947
+vt 0.227936 -0.802011
+vt -4.248393 -0.802009
+vt 0.551425 0.001054
+vt 2.463943 -0.803957
+vt 2.143983 -0.001978
+vt 0.231464 -3.315496
+vt 2.463943 -3.315496
+vn 0.0000 0.0000 1.0000
+vn -0.9275 -0.3739 0.0000
+vn -0.3827 -0.9239 0.0000
+vn 0.3827 -0.9239 0.0000
+vn 0.0000 0.0000 -1.0000
+vn 1.0000 0.0000 0.0000
+vn 0.0000 -0.4862 0.8739
+vn -1.0000 0.0000 0.0000
+vn 0.0000 0.4862 -0.8739
+vn 0.0000 -0.8739 -0.4862
+vn 0.0000 0.8739 0.4862
+vn 0.0000 1.0000 0.0000
+vn 0.0000 -1.0000 0.0000
+vn 0.9275 -0.3739 0.0000
+s off
+f 25/1/1 26/2/1 60/3/1 59/4/1
+f 11/5/2 13/6/2 14/7/2 12/8/2
+f 13/6/3 44/9/3 43/10/3 14/7/3
+f 8/11/4 7/12/4 11/13/4 12/14/4
+f 7/15/1 9/16/1 13/17/1 11/18/1
+f 10/19/5 8/20/5 12/21/5 14/22/5
+f 9/23/1 38/24/1 44/25/1 13/26/1
+f 37/27/5 10/28/5 14/29/5 43/30/5
+f 15/31/6 16/32/6 18/33/6 17/34/6
+f 17/35/7 18/36/7 22/37/7 21/38/7
+f 21/39/8 22/40/8 20/41/8 19/42/8
+f 19/43/9 20/44/9 16/45/9 15/46/9
+f 17/47/10 21/48/10 19/49/10 15/50/10
+f 22/51/11 18/52/11 16/53/11 20/54/11
+f 23/55/6 24/56/6 26/57/6 25/58/6
+f 60/3/12 26/2/12 24/59/12 58/60/12
+f 25/1/13 59/4/13 57/61/13 23/62/13
+f 28/63/13 1/64/13 2/65/13 27/66/13
+f 45/67/14 46/68/14 48/69/14 47/70/14
+f 47/70/4 48/69/4 43/10/4 44/9/4
+f 40/71/3 46/72/3 45/73/3 39/74/3
+f 39/75/1 45/76/1 47/77/1 41/78/1
+f 42/79/5 48/80/5 46/81/5 40/82/5
+f 41/83/1 47/84/1 44/85/1 38/86/1
+f 37/87/5 43/88/5 48/89/5 42/90/5
+f 49/91/8 51/92/8 52/93/8 50/94/8
+f 51/95/7 55/96/7 56/97/7 52/98/7
+f 55/99/6 53/100/6 54/101/6 56/102/6
+f 53/103/9 49/104/9 50/105/9 54/106/9
+f 51/107/10 49/108/10 53/109/10 55/110/10
+f 56/111/11 54/112/11 50/113/11 52/114/11
+f 57/115/8 59/116/8 60/117/8 58/118/8
+f 27/119/1 2/120/1 4/121/1 31/122/1 34/123/1
+f 1/124/6 3/125/6 4/126/6 2/127/6
+f 31/122/1 4/121/1 5/128/1
+f 29/129/5 6/130/5 3/131/5
+f 31/122/1 5/128/1 32/132/1
+f 29/129/5 33/133/5 6/130/5
+f 28/134/8 27/135/8 34/136/8 30/137/8
+f 31/122/1 35/138/1 34/123/1
+f 29/129/5 30/139/5 36/140/5
+f 31/122/1 32/132/1 35/138/1
+f 29/129/5 36/140/5 33/133/5
+f 29/129/5 3/131/5 1/141/5 28/142/5 30/139/5
+g Cart.003_Cube.010
+v 0.720902 0.047509 0.576721
+v 0.576721 0.047509 0.576721
+v 0.720902 0.268210 1.109542
+v 0.576721 0.268210 1.109542
+v 0.720902 -0.173193 1.109542
+v 0.576721 -0.173193 1.109542
+v 0.720902 -0.485312 0.797423
+v 0.576721 -0.485312 0.797423
+v 0.720902 -0.485312 0.356020
+v 0.576721 -0.485312 0.356020
+v 0.720902 -0.173193 0.043900
+v 0.576721 -0.173193 0.043900
+v 0.720902 0.268210 0.043900
+v 0.576721 0.268210 0.043900
+v 0.720902 0.580330 0.356020
+v 0.576721 0.580330 0.356020
+v 0.720902 0.580330 0.797423
+v 0.576721 0.580330 0.797423
+v 0.720902 0.047509 -0.576721
+v 0.576721 0.047509 -0.576721
+v 0.720902 0.268210 -0.043900
+v 0.576721 0.268210 -0.043900
+v 0.720902 -0.173193 -0.043900
+v 0.576721 -0.173193 -0.043900
+v 0.720902 -0.485312 -0.356020
+v 0.576721 -0.485312 -0.356020
+v 0.720902 -0.485312 -0.797423
+v 0.576721 -0.485312 -0.797423
+v 0.720902 -0.173193 -1.109542
+v 0.576721 -0.173193 -1.109542
+v 0.720902 0.268210 -1.109542
+v 0.576721 0.268210 -1.109542
+v 0.720902 0.580330 -0.797423
+v 0.576721 0.580330 -0.797423
+v 0.720902 0.580330 -0.356020
+v 0.576721 0.580330 -0.356020
+v -0.720902 0.047509 0.576721
+v -0.576721 0.047509 0.576721
+v -0.720902 0.268210 1.109542
+v -0.576721 0.268210 1.109542
+v -0.720902 -0.173193 1.109542
+v -0.576721 -0.173193 1.109542
+v -0.720902 -0.485312 0.797423
+v -0.576721 -0.485312 0.797423
+v -0.720902 -0.485312 0.356020
+v -0.576721 -0.485312 0.356020
+v -0.720902 -0.173193 0.043900
+v -0.576721 -0.173193 0.043900
+v -0.720902 0.268210 0.043900
+v -0.576721 0.268210 0.043900
+v -0.720902 0.580330 0.356020
+v -0.576721 0.580330 0.356020
+v -0.720902 0.580330 0.797423
+v -0.576721 0.580330 0.797423
+v -0.720902 0.047509 -0.576721
+v -0.576721 0.047509 -0.576721
+v -0.720902 0.268210 -0.043900
+v -0.576721 0.268210 -0.043900
+v -0.720902 -0.173193 -0.043900
+v -0.576721 -0.173193 -0.043900
+v -0.720902 -0.485312 -0.356020
+v -0.576721 -0.485312 -0.356020
+v -0.720902 -0.485312 -0.797423
+v -0.576721 -0.485312 -0.797423
+v -0.720902 -0.173193 -1.109542
+v -0.576721 -0.173193 -1.109542
+v -0.720902 0.268210 -1.109542
+v -0.576721 0.268210 -1.109542
+v -0.720902 0.580330 -0.797423
+v -0.576721 0.580330 -0.797423
+v -0.720902 0.580330 -0.356020
+v -0.576721 0.580330 -0.356020
+vt 0.499873 0.992213
+vt 0.914261 -0.008208
+vt 0.085485 -0.008208
+vt 0.499873 0.992213
+vt 0.085485 -0.008208
+vt 0.914261 -0.008208
+vt 0.914261 -0.008208
+vt 0.085485 -0.008208
+vt 0.085485 -0.008208
+vt 0.914261 -0.008208
+vt 0.914261 -0.008208
+vt 0.085485 -0.008208
+vt 0.085485 -0.008208
+vt 0.914261 -0.008208
+vt 0.914261 -0.008208
+vt 0.085485 -0.008208
+vt 0.085485 -0.008208
+vt 0.914261 -0.008208
+vt 0.914261 -0.008208
+vt 0.085485 -0.008208
+vt 0.085485 -0.008208
+vt 0.914261 -0.008208
+vt 0.914261 -0.008208
+vt 0.085485 -0.008208
+vt 0.085485 -0.008208
+vt 0.914261 -0.008208
+vt 0.914261 -0.008208
+vt 0.085485 -0.008208
+vt 0.085485 -0.008208
+vt 0.914261 -0.008208
+vt 0.914261 -0.008208
+vt 0.085485 -0.008208
+vt 0.085485 -0.008208
+vt 0.914261 -0.008208
+vt 0.499873 0.992213
+vt 0.914261 -0.008208
+vt 0.085485 -0.008208
+vt 0.499873 0.992213
+vt 0.085485 -0.008208
+vt 0.914261 -0.008208
+vt 0.914261 -0.008208
+vt 0.085485 -0.008208
+vt 0.085485 -0.008208
+vt 0.914261 -0.008208
+vt 0.914261 -0.008208
+vt 0.085485 -0.008208
+vt 0.085485 -0.008208
+vt 0.914261 -0.008208
+vt 0.914261 -0.008208
+vt 0.085485 -0.008208
+vt 0.085485 -0.008208
+vt 0.914261 -0.008208
+vt 0.914261 -0.008208
+vt 0.085485 -0.008208
+vt 0.085485 -0.008208
+vt 0.914261 -0.008208
+vt 0.914261 -0.008208
+vt 0.085485 -0.008208
+vt 0.085485 -0.008208
+vt 0.914261 -0.008208
+vt 0.914261 -0.008208
+vt 0.085485 -0.008208
+vt 0.085485 -0.008208
+vt 0.914261 -0.008208
+vt 0.914261 -0.008208
+vt 0.085485 -0.008208
+vt 0.085485 -0.008208
+vt 0.914261 -0.008208
+vt 0.499873 0.992213
+vt 0.085485 -0.008208
+vt 0.914261 -0.008208
+vt 0.499873 0.992213
+vt 0.914261 -0.008208
+vt 0.085485 -0.008208
+vt 0.085485 -0.008208
+vt 0.914261 -0.008208
+vt 0.914261 -0.008208
+vt 0.085485 -0.008208
+vt 0.085485 -0.008208
+vt 0.914261 -0.008208
+vt 0.914261 -0.008208
+vt 0.085485 -0.008208
+vt 0.085485 -0.008208
+vt 0.914261 -0.008208
+vt 0.914261 -0.008208
+vt 0.085485 -0.008208
+vt 0.085485 -0.008208
+vt 0.914261 -0.008208
+vt 0.914261 -0.008208
+vt 0.085485 -0.008208
+vt 0.085485 -0.008208
+vt 0.914261 -0.008208
+vt 0.914261 -0.008208
+vt 0.085485 -0.008208
+vt 0.085485 -0.008208
+vt 0.914261 -0.008208
+vt 0.914261 -0.008208
+vt 0.085485 -0.008208
+vt 0.085485 -0.008208
+vt 0.914261 -0.008208
+vt 0.914261 -0.008208
+vt 0.085485 -0.008208
+vt 0.499873 0.992213
+vt 0.085485 -0.008208
+vt 0.914261 -0.008208
+vt 0.499873 0.992213
+vt 0.914261 -0.008208
+vt 0.085485 -0.008208
+vt 0.085485 -0.008208
+vt 0.914261 -0.008208
+vt 0.914261 -0.008208
+vt 0.085485 -0.008208
+vt 0.085485 -0.008208
+vt 0.914261 -0.008208
+vt 0.914261 -0.008208
+vt 0.085485 -0.008208
+vt 0.085485 -0.008208
+vt 0.914261 -0.008208
+vt 0.914261 -0.008208
+vt 0.085485 -0.008208
+vt 0.085485 -0.008208
+vt 0.914261 -0.008208
+vt 0.914261 -0.008208
+vt 0.085485 -0.008208
+vt 0.085485 -0.008208
+vt 0.914261 -0.008208
+vt 0.914261 -0.008208
+vt 0.085485 -0.008208
+vt 0.085485 -0.008208
+vt 0.914261 -0.008208
+vt 0.914261 -0.008208
+vt 0.085485 -0.008208
+vt 0.085485 -0.008208
+vt 0.914261 -0.008208
+vt 0.914261 -0.008208
+vt 0.085485 -0.008208
+vn 1.0000 0.0000 0.0000
+vn -1.0000 0.0000 0.0000
+s off
+f 61/143/15 63/144/15 65/145/15
+f 62/146/16 66/147/16 64/148/16
+f 61/143/15 65/149/15 67/150/15
+f 62/146/16 68/151/16 66/152/16
+f 61/143/15 67/153/15 69/154/15
+f 62/146/16 70/155/16 68/156/16
+f 61/143/15 69/157/15 71/158/15
+f 62/146/16 72/159/16 70/160/16
+f 61/143/15 71/161/15 73/162/15
+f 62/146/16 74/163/16 72/164/16
+f 61/143/15 73/165/15 75/166/15
+f 62/146/16 76/167/16 74/168/16
+f 61/143/15 75/169/15 77/170/15
+f 62/146/16 78/171/16 76/172/16
+f 61/143/15 77/173/15 63/174/15
+f 62/146/16 64/175/16 78/176/16
+f 79/177/15 81/178/15 83/179/15
+f 80/180/16 84/181/16 82/182/16
+f 79/177/15 83/183/15 85/184/15
+f 80/180/16 86/185/16 84/186/16
+f 79/177/15 85/187/15 87/188/15
+f 80/180/16 88/189/16 86/190/16
+f 79/177/15 87/191/15 89/192/15
+f 80/180/16 90/193/16 88/194/16
+f 79/177/15 89/195/15 91/196/15
+f 80/180/16 92/197/16 90/198/16
+f 79/177/15 91/199/15 93/200/15
+f 80/180/16 94/201/16 92/202/16
+f 79/177/15 93/203/15 95/204/15
+f 80/180/16 96/205/16 94/206/16
+f 79/177/15 95/207/15 81/208/15
+f 80/180/16 82/209/16 96/210/16
+f 97/211/16 101/212/16 99/213/16
+f 98/214/15 100/215/15 102/216/15
+f 97/211/16 103/217/16 101/218/16
+f 98/214/15 102/219/15 104/220/15
+f 97/211/16 105/221/16 103/222/16
+f 98/214/15 104/223/15 106/224/15
+f 97/211/16 107/225/16 105/226/16
+f 98/214/15 106/227/15 108/228/15
+f 97/211/16 109/229/16 107/230/16
+f 98/214/15 108/231/15 110/232/15
+f 97/211/16 111/233/16 109/234/16
+f 98/214/15 110/235/15 112/236/15
+f 97/211/16 113/237/16 111/238/16
+f 98/214/15 112/239/15 114/240/15
+f 97/211/16 99/241/16 113/242/16
+f 98/214/15 114/243/15 100/244/15
+f 115/245/16 119/246/16 117/247/16
+f 116/248/15 118/249/15 120/250/15
+f 115/245/16 121/251/16 119/252/16
+f 116/248/15 120/253/15 122/254/15
+f 115/245/16 123/255/16 121/256/16
+f 116/248/15 122/257/15 124/258/15
+f 115/245/16 125/259/16 123/260/16
+f 116/248/15 124/261/15 126/262/15
+f 115/245/16 127/263/16 125/264/16
+f 116/248/15 126/265/15 128/266/15
+f 115/245/16 129/267/16 127/268/16
+f 116/248/15 128/269/15 130/270/15
+f 115/245/16 131/271/16 129/272/16
+f 116/248/15 130/273/15 132/274/15
+f 115/245/16 117/275/16 131/276/16
+f 116/248/15 132/277/15 118/278/15
+g Cart.002_Cube.009
+v 0.720902 0.268210 1.109542
+v 0.576721 0.268210 1.109542
+v 0.720902 -0.173193 1.109542
+v 0.576721 -0.173193 1.109542
+v 0.720902 -0.485312 0.797423
+v 0.576721 -0.485312 0.797423
+v 0.720902 -0.485312 0.356020
+v 0.576721 -0.485312 0.356020
+v 0.720902 -0.173193 0.043900
+v 0.576721 -0.173193 0.043900
+v 0.720902 0.268210 0.043900
+v 0.576721 0.268210 0.043900
+v 0.720902 0.580330 0.356020
+v 0.576721 0.580330 0.356020
+v 0.720902 0.580330 0.797423
+v 0.576721 0.580330 0.797423
+v 0.720902 0.268210 -0.043900
+v 0.576721 0.268210 -0.043900
+v 0.720902 -0.173193 -0.043900
+v 0.576721 -0.173193 -0.043900
+v 0.720902 -0.485312 -0.356020
+v 0.576721 -0.485312 -0.356020
+v 0.720902 -0.485312 -0.797423
+v 0.576721 -0.485312 -0.797423
+v 0.720902 -0.173193 -1.109542
+v 0.576721 -0.173193 -1.109542
+v 0.720902 0.268210 -1.109542
+v 0.576721 0.268210 -1.109542
+v 0.720902 0.580330 -0.797423
+v 0.576721 0.580330 -0.797423
+v 0.720902 0.580330 -0.356020
+v 0.576721 0.580330 -0.356020
+v -0.720902 0.268210 1.109542
+v -0.576721 0.268210 1.109542
+v -0.720902 -0.173193 1.109542
+v -0.576721 -0.173193 1.109542
+v -0.720902 -0.485312 0.797423
+v -0.576721 -0.485312 0.797423
+v -0.720902 -0.485312 0.356020
+v -0.576721 -0.485312 0.356020
+v -0.720902 -0.173193 0.043900
+v -0.576721 -0.173193 0.043900
+v -0.720902 0.268210 0.043900
+v -0.576721 0.268210 0.043900
+v -0.720902 0.580330 0.356020
+v -0.576721 0.580330 0.356020
+v -0.720902 0.580330 0.797423
+v -0.576721 0.580330 0.797423
+v -0.720902 0.268210 -0.043900
+v -0.576721 0.268210 -0.043900
+v -0.720902 -0.173193 -0.043900
+v -0.576721 -0.173193 -0.043900
+v -0.720902 -0.485312 -0.356020
+v -0.576721 -0.485312 -0.356020
+v -0.720902 -0.485312 -0.797423
+v -0.576721 -0.485312 -0.797423
+v -0.720902 -0.173193 -1.109542
+v -0.576721 -0.173193 -1.109542
+v -0.720902 0.268210 -1.109542
+v -0.576721 0.268210 -1.109542
+v -0.720902 0.580330 -0.797423
+v -0.576721 0.580330 -0.797423
+v -0.720902 0.580330 -0.356020
+v -0.576721 0.580330 -0.356020
+vt 0.081312 0.499997
+vt -0.251351 0.499998
+vt -0.251352 -0.518438
+vt 0.081311 -0.518439
+vt -0.251353 -1.536875
+vt 0.081310 -1.536875
+vt -0.251353 -2.555310
+vt 0.081309 -2.555310
+vt -0.251353 -3.573745
+vt 0.081309 -3.573745
+vt 0.081314 4.573743
+vt -0.251349 4.573744
+vt -0.251349 3.555308
+vt 0.081314 3.555308
+vt -0.251349 2.536872
+vt 0.081314 2.536870
+vt -0.251350 1.518435
+vt 0.081313 1.518434
+vt 0.082631 3.555311
+vt 0.415294 3.555312
+vt 0.415293 4.573746
+vt 0.082631 4.573746
+vt 0.082631 -3.573745
+vt 0.415294 -3.573745
+vt 0.415295 -2.555307
+vt 0.082632 -2.555307
+vt 0.415296 -1.536870
+vt 0.082633 -1.536870
+vt 0.415296 -0.518433
+vt 0.082633 -0.518433
+vt 0.415296 0.500004
+vt 0.082632 0.500004
+vt 0.415295 1.518441
+vt 0.082632 1.518441
+vt 0.415294 2.536876
+vt 0.082632 2.536876
+vt 0.416613 0.500002
+vt 0.416613 -0.518434
+vt 0.749276 -0.518434
+vt 0.749276 0.500002
+vt 0.416614 -1.536870
+vt 0.749277 -1.536870
+vt 0.416614 -2.555307
+vt 0.749277 -2.555308
+vt 0.416614 -3.573745
+vt 0.749277 -3.573745
+vt 0.416615 4.573745
+vt 0.416615 3.555309
+vt 0.749277 3.555308
+vt 0.749278 4.573744
+vt 0.416614 2.536874
+vt 0.749276 2.536873
+vt 0.416613 1.518439
+vt 0.749276 1.518439
+vt -0.252674 3.555306
+vt -0.252676 4.573743
+vt -0.585339 4.573742
+vt -0.585337 3.555306
+vt -0.252670 -3.573745
+vt -0.252670 -2.555310
+vt -0.585333 -2.555310
+vt -0.585332 -3.573745
+vt -0.252671 -1.536875
+vt -0.585334 -1.536875
+vt -0.252671 -0.518439
+vt -0.585334 -0.518439
+vt -0.252672 0.499997
+vt -0.585335 0.499997
+vt -0.252672 1.518432
+vt -0.585335 1.518432
+vt -0.252673 2.536869
+vt -0.585336 2.536868
+vn -0.0000 0.0000 1.0000
+vn 0.0000 -0.7071 0.7071
+vn 0.0000 -1.0000 0.0000
+vn 0.0000 -0.7071 -0.7071
+vn -0.0000 0.0000 -1.0000
+vn -0.0000 0.7071 -0.7071
+vn -0.0000 1.0000 0.0000
+vn -0.0000 0.7071 0.7071
+s off
+f 133/279/17 134/280/17 136/281/17 135/282/17
+f 135/282/18 136/281/18 138/283/18 137/284/18
+f 137/284/19 138/283/19 140/285/19 139/286/19
+f 139/286/20 140/285/20 142/287/20 141/288/20
+f 141/289/21 142/290/21 144/291/21 143/292/21
+f 143/292/22 144/291/22 146/293/22 145/294/22
+f 145/294/23 146/293/23 148/295/23 147/296/23
+f 147/296/24 148/295/24 134/280/24 133/279/24
+f 149/297/17 150/298/17 152/299/17 151/300/17
+f 151/301/18 152/302/18 154/303/18 153/304/18
+f 153/304/19 154/303/19 156/305/19 155/306/19
+f 155/306/20 156/305/20 158/307/20 157/308/20
+f 157/308/21 158/307/21 160/309/21 159/310/21
+f 159/310/22 160/309/22 162/311/22 161/312/22
+f 161/312/23 162/311/23 164/313/23 163/314/23
+f 163/314/24 164/313/24 150/298/24 149/297/24
+f 165/315/17 167/316/17 168/317/17 166/318/17
+f 167/316/18 169/319/18 170/320/18 168/317/18
+f 169/319/19 171/321/19 172/322/19 170/320/19
+f 171/321/20 173/323/20 174/324/20 172/322/20
+f 173/325/21 175/326/21 176/327/21 174/328/21
+f 175/326/22 177/329/22 178/330/22 176/327/22
+f 177/329/23 179/331/23 180/332/23 178/330/23
+f 179/331/24 165/315/24 166/318/24 180/332/24
+f 181/333/17 183/334/17 184/335/17 182/336/17
+f 183/337/18 185/338/18 186/339/18 184/340/18
+f 185/338/19 187/341/19 188/342/19 186/339/19
+f 187/341/20 189/343/20 190/344/20 188/342/20
+f 189/343/21 191/345/21 192/346/21 190/344/21
+f 191/345/22 193/347/22 194/348/22 192/346/22
+f 193/347/23 195/349/23 196/350/23 194/348/23
+f 195/349/24 181/333/24 182/336/24 196/350/24
+g Cart.001_Cube.008
+v 0.634393 1.200951 1.268787
+v 0.634393 1.200951 -1.268787
+v 0.448584 1.649535 1.268787
+v 0.448584 1.649535 -1.268787
+v 0.000000 1.835345 -1.268787
+v 0.000000 1.835345 1.268787
+v -0.634393 1.200951 1.268787
+v -0.634393 1.200951 -1.268787
+v -0.448584 1.649535 1.268787
+v -0.448584 1.649535 -1.268787
+vt 3.173871 2.353881
+vt -2.391578 2.353881
+vt -2.391578 1.288979
+vt 3.173871 1.288979
+vt -2.391578 0.224077
+vt 3.173871 0.224077
+vt 3.173871 -1.905729
+vt 3.173871 -0.840826
+vt -2.391578 -0.840826
+vt -2.391578 -1.905728
+vn 0.9239 0.3827 -0.0000
+vn 0.3827 0.9239 -0.0000
+vn -0.9239 0.3827 -0.0000
+vn -0.3827 0.9239 -0.0000
+s off
+f 197/351/25 198/352/25 200/353/25 199/354/25
+f 199/354/26 200/353/26 201/355/26 202/356/26
+f 203/357/27 205/358/27 206/359/27 204/360/27
+f 205/358/28 202/356/28 201/355/28 206/359/28
+g Cart.000_Cube.007
+v 0.259667 0.016670 -1.168107
+v -0.259668 0.016670 -1.168107
+v 0.259667 1.170112 -1.168107
+v -0.259668 1.170112 -1.168107
+vt 0.000000 0.000000
+vt 1.000000 0.000000
+vt 1.000000 1.000000
+vt 0.000000 1.000000
+vn 0.0000 0.0000 -1.0000
+s off
+f 207/361/29 208/362/29 210/363/29 209/364/29
+g Cart.005_Cube.006
+v -0.234629 1.147573 1.166732
+v 0.234629 1.147573 1.166732
+v -0.234629 0.678315 1.166732
+v 0.234629 0.678315 1.166732
+v -0.585458 1.147573 0.234629
+v -0.585458 1.147573 -0.234629
+v -0.585458 0.678315 0.234629
+v -0.585458 0.678315 -0.234629
+v 0.585459 1.147573 -0.234629
+v 0.585459 1.147573 0.234629
+v 0.585459 0.678315 -0.234629
+v 0.585459 0.678315 0.234629
+vt 0.000000 -0.000000
+vt 0.000000 1.000000
+vt 1.000000 1.000000
+vt 1.000000 0.000000
+vt -0.000000 -0.000000
+vt 1.000000 0.000000
+vt 1.000000 1.000000
+vt -0.000000 1.000000
+vt 0.000000 -0.000000
+vt 1.000000 0.000000
+vt 1.000000 1.000000
+vt 0.000000 1.000000
+vn 0.0000 0.0000 1.0000
+vn -1.0000 0.0000 0.0000
+vn 1.0000 0.0000 0.0000
+s off
+f 214/365/30 212/366/30 211/367/30 213/368/30
+f 218/369/31 217/370/31 215/371/31 216/372/31
+f 222/373/32 221/374/32 219/375/32 220/376/32
diff --git a/textures/commoditymarket_caravan.png b/textures/commoditymarket_caravan.png
deleted file mode 100644
index d193a1f..0000000
Binary files a/textures/commoditymarket_caravan.png and /dev/null differ
diff --git a/textures/commoditymarket_caravan_sign.png b/textures/commoditymarket_caravan_sign.png
index fa44b00..2c5280b 100644
Binary files a/textures/commoditymarket_caravan_sign.png and b/textures/commoditymarket_caravan_sign.png differ
diff --git a/textures/commoditymarket_caravan_sign_inventory.png b/textures/commoditymarket_caravan_sign_inventory.png
index a16fead..d1d3d14 100644
Binary files a/textures/commoditymarket_caravan_sign_inventory.png and b/textures/commoditymarket_caravan_sign_inventory.png differ
diff --git a/textures/commoditymarket_door_wood.png b/textures/commoditymarket_door_wood.png
new file mode 100644
index 0000000..ae70bda
Binary files /dev/null and b/textures/commoditymarket_door_wood.png differ
diff --git a/textures/commoditymarket_shingles_wood.png b/textures/commoditymarket_shingles_wood.png
new file mode 100644
index 0000000..6e86ea6
Binary files /dev/null and b/textures/commoditymarket_shingles_wood.png differ
diff --git a/textures/commoditymarket_sign.png b/textures/commoditymarket_sign.png
index 23b252b..fcdd409 100644
Binary files a/textures/commoditymarket_sign.png and b/textures/commoditymarket_sign.png differ
diff --git a/textures/commoditymarket_sign_post.png b/textures/commoditymarket_sign_post.png
index e4aa678..7181397 100644
Binary files a/textures/commoditymarket_sign_post.png and b/textures/commoditymarket_sign_post.png differ
diff --git a/textures/commoditymarket_trapdoor.png b/textures/commoditymarket_trapdoor.png
new file mode 100644
index 0000000..3c64693
Binary files /dev/null and b/textures/commoditymarket_trapdoor.png differ
diff --git a/textures/license.txt b/textures/license.txt
index 0969abd..d20b047 100644
--- a/textures/license.txt
+++ b/textures/license.txt
@@ -4,7 +4,10 @@ commoditymarket_moon.png - from https://commons.wikimedia.org/wiki/File:Luneta08
 commoditymarket_goblin.png - cropped from the "goblins" mod, Copyright 2015 by Francisco "FreeLikeGNU" Athens Creative Commons Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0)
 commoditymarket_empty_shelf.png - from the moreblocks mod's "moreblocks_empty_shelf", under the zlib license by Hugo Locurcio and contributors
 commoditymarket_search.png - Copyright © Diego Martínez (kaeza): CC BY-SA 3.0
+commoditymarket_shingles_wood.png is cottages_homedecor_shingles_wood.png from the cottages mod by VanessaE (CC-by-SA 3.0)
 
 commoditymarket_trade.png, commoditymarket_trade_flag.png, commoditymarket_under.png, and commoditymarket_under_top were created by FaceDeer and released under the CC0 public domain license
 
-commoditymarket_sign_post.png and commoditymarket_sign.png are made from elements of default_tree.png and default_aspen_wood.png
\ No newline at end of file
+commoditymarket_sign_post.png and commoditymarket_sign.png are made from elements of default_tree.png and default_aspen_wood.png
+commoditymarket_trapdoor.png is doors_trapdoor.png from the doors mod
+commoditymarket_door_wood.png is doors_door_wood.png from the doors mod
\ No newline at end of file