diff --git a/lib/libmdl.a b/lib/libmdl.a
index 8586089221..bb8e78a3b9 100644
Binary files a/lib/libmdl.a and b/lib/libmdl.a differ
diff --git a/res/dep/mdl.dll b/res/dep/mdl.dll
index 098b3d1df4..0bdb1fbd75 100644
Binary files a/res/dep/mdl.dll and b/res/dep/mdl.dll differ
diff --git a/res/runtime/models/cylinder.obj b/res/runtime/models/cylinder.obj
new file mode 100644
index 0000000000..4ab916da71
--- /dev/null
+++ b/res/runtime/models/cylinder.obj
@@ -0,0 +1,359 @@
+# Blender v2.76 (sub 0) OBJ File: ''
+# www.blender.org
+o Cylinder
+v 0.000000 -2.000000 -0.100000
+v 0.000000 2.000000 -0.100000
+v 0.019509 -2.000000 -0.098079
+v 0.019509 2.000000 -0.098079
+v 0.038268 -2.000000 -0.092388
+v 0.038268 2.000000 -0.092388
+v 0.055557 -2.000000 -0.083147
+v 0.055557 2.000000 -0.083147
+v 0.070711 -2.000000 -0.070711
+v 0.070711 2.000000 -0.070711
+v 0.083147 -2.000000 -0.055557
+v 0.083147 2.000000 -0.055557
+v 0.092388 -2.000000 -0.038268
+v 0.092388 2.000000 -0.038268
+v 0.098079 -2.000000 -0.019509
+v 0.098079 2.000000 -0.019509
+v 0.100000 -2.000000 -0.000000
+v 0.100000 2.000000 -0.000000
+v 0.098079 -2.000000 0.019509
+v 0.098079 2.000000 0.019509
+v 0.092388 -2.000000 0.038268
+v 0.092388 2.000000 0.038268
+v 0.083147 -2.000000 0.055557
+v 0.083147 2.000000 0.055557
+v 0.070711 -2.000000 0.070711
+v 0.070711 2.000000 0.070711
+v 0.055557 -2.000000 0.083147
+v 0.055557 2.000000 0.083147
+v 0.038268 -2.000000 0.092388
+v 0.038268 2.000000 0.092388
+v 0.019509 -2.000000 0.098079
+v 0.019509 2.000000 0.098079
+v -0.000000 -2.000000 0.100000
+v -0.000000 2.000000 0.100000
+v -0.019509 -2.000000 0.098079
+v -0.019509 2.000000 0.098079
+v -0.038268 -2.000000 0.092388
+v -0.038268 2.000000 0.092388
+v -0.055557 -2.000000 0.083147
+v -0.055557 2.000000 0.083147
+v -0.070711 -2.000000 0.070711
+v -0.070711 2.000000 0.070711
+v -0.083147 -2.000000 0.055557
+v -0.083147 2.000000 0.055557
+v -0.092388 -2.000000 0.038268
+v -0.092388 2.000000 0.038268
+v -0.098079 -2.000000 0.019509
+v -0.098079 2.000000 0.019509
+v -0.100000 -2.000000 -0.000000
+v -0.100000 2.000000 -0.000000
+v -0.098079 -2.000000 -0.019509
+v -0.098079 2.000000 -0.019509
+v -0.092388 -2.000000 -0.038268
+v -0.092388 2.000000 -0.038268
+v -0.083147 -2.000000 -0.055557
+v -0.083147 2.000000 -0.055557
+v -0.070711 -2.000000 -0.070711
+v -0.070711 2.000000 -0.070711
+v -0.055557 -2.000000 -0.083147
+v -0.055557 2.000000 -0.083147
+v -0.038268 -2.000000 -0.092388
+v -0.038268 2.000000 -0.092388
+v -0.019509 -2.000000 -0.098079
+v -0.019509 2.000000 -0.098079
+vt 0.555976 0.995437
+vt 0.538604 0.995577
+vt 0.538604 0.000233
+vt 0.521233 0.995716
+vt 0.521233 0.000373
+vt 0.503862 0.995856
+vt 0.503862 0.000512
+vt 0.486490 0.995996
+vt 0.486490 0.000652
+vt 0.469119 0.996135
+vt 0.469119 0.000792
+vt 0.451748 0.996275
+vt 0.451748 0.000932
+vt 0.434376 0.996415
+vt 0.434376 0.001071
+vt 0.417005 0.996554
+vt 0.417005 0.001211
+vt 0.399634 0.996694
+vt 0.399634 0.001351
+vt 0.382262 0.996834
+vt 0.382262 0.001491
+vt 0.364891 0.996973
+vt 0.364891 0.001630
+vt 0.347520 0.997113
+vt 0.347520 0.001770
+vt 0.330148 0.997253
+vt 0.330148 0.001910
+vt 0.312777 0.997392
+vt 0.312777 0.002050
+vt 0.295406 0.997532
+vt 0.295406 0.002189
+vt 0.278034 0.997672
+vt 0.278034 0.002329
+vt 0.260663 0.997811
+vt 0.260663 0.002469
+vt 0.243292 0.997951
+vt 0.243292 0.002609
+vt 0.225920 0.998091
+vt 0.225920 0.002748
+vt 0.208549 0.998231
+vt 0.208549 0.002888
+vt 0.191178 0.998370
+vt 0.191178 0.003028
+vt 0.173806 0.998510
+vt 0.173806 0.003168
+vt 0.156435 0.998650
+vt 0.156435 0.003307
+vt 0.139064 0.998789
+vt 0.139064 0.003447
+vt 0.121692 0.998929
+vt 0.121692 0.003587
+vt 0.104321 0.999069
+vt 0.104321 0.003727
+vt 0.086950 0.999208
+vt 0.086950 0.003866
+vt 0.069578 0.999348
+vt 0.069578 0.004006
+vt 0.052207 0.999488
+vt 0.052207 0.004146
+vt 0.034836 0.999627
+vt 0.034836 0.004286
+vt 0.611514 0.637026
+vt 0.918401 0.606800
+vt 0.948626 0.913687
+vt 0.017465 0.999767
+vt 0.000093 0.999907
+vt 0.000093 0.004565
+vt 0.017465 0.004425
+vt 0.673356 0.414441
+vt 0.584708 0.122209
+vt 0.876941 0.033561
+vt 0.555976 0.000093
+vt 0.918401 0.943913
+vt 0.882859 0.967661
+vt 0.843367 0.984019
+vt 0.801443 0.992358
+vt 0.758697 0.992358
+vt 0.716774 0.984019
+vt 0.677281 0.967661
+vt 0.641740 0.943913
+vt 0.611514 0.913687
+vt 0.587766 0.878145
+vt 0.571407 0.838653
+vt 0.563068 0.796729
+vt 0.563068 0.753983
+vt 0.571407 0.712059
+vt 0.587766 0.672567
+vt 0.641740 0.606800
+vt 0.677281 0.583052
+vt 0.716774 0.566694
+vt 0.758698 0.558354
+vt 0.801444 0.558355
+vt 0.843367 0.566694
+vt 0.882859 0.583052
+vt 0.948627 0.637026
+vt 0.972375 0.672568
+vt 0.988733 0.712059
+vt 0.997072 0.753984
+vt 0.997072 0.796729
+vt 0.988733 0.838653
+vt 0.972375 0.878145
+vt 0.912138 0.057079
+vt 0.942071 0.087011
+vt 0.965589 0.122208
+vt 0.981789 0.161317
+vt 0.990047 0.202835
+vt 0.990047 0.245167
+vt 0.981789 0.286685
+vt 0.965589 0.325794
+vt 0.942071 0.360991
+vt 0.912138 0.390924
+vt 0.876941 0.414442
+vt 0.837832 0.430641
+vt 0.796314 0.438899
+vt 0.753983 0.438899
+vt 0.712465 0.430641
+vt 0.638159 0.390923
+vt 0.608226 0.360990
+vt 0.584708 0.325793
+vt 0.568509 0.286684
+vt 0.560250 0.245167
+vt 0.560250 0.202836
+vt 0.568509 0.161318
+vt 0.608226 0.087012
+vt 0.638159 0.057079
+vt 0.673356 0.033561
+vt 0.712465 0.017361
+vt 0.753983 0.009103
+vt 0.796315 0.009103
+vt 0.837832 0.017361
+vn 0.098000 0.000000 -0.995200
+vn 0.290300 0.000000 -0.956900
+vn 0.471400 0.000000 -0.881900
+vn 0.634400 0.000000 -0.773000
+vn 0.773000 0.000000 -0.634400
+vn 0.881900 0.000000 -0.471400
+vn 0.956900 0.000000 -0.290300
+vn 0.995200 0.000000 -0.098000
+vn 0.995200 0.000000 0.098000
+vn 0.956900 0.000000 0.290300
+vn 0.881900 0.000000 0.471400
+vn 0.773000 0.000000 0.634400
+vn 0.634400 0.000000 0.773000
+vn 0.471400 0.000000 0.881900
+vn 0.290300 0.000000 0.956900
+vn 0.098000 0.000000 0.995200
+vn -0.098000 0.000000 0.995200
+vn -0.290300 0.000000 0.956900
+vn -0.471400 0.000000 0.881900
+vn -0.634400 0.000000 0.773000
+vn -0.773000 0.000000 0.634400
+vn -0.881900 0.000000 0.471400
+vn -0.956900 0.000000 0.290300
+vn -0.995200 0.000000 0.098000
+vn -0.995200 0.000000 -0.098000
+vn -0.956900 0.000000 -0.290300
+vn -0.881900 0.000000 -0.471400
+vn -0.773000 0.000000 -0.634400
+vn -0.634400 0.000000 -0.773000
+vn -0.471400 0.000000 -0.881900
+vn 0.000000 1.000000 -0.000000
+vn -0.098000 0.000000 -0.995200
+vn -0.290300 0.000000 -0.956900
+vn 0.000000 -1.000000 -0.000000
+vn 0.000000 1.000000 -0.000100
+vn 0.000000 1.000000 0.000100
+vn 0.000000 -1.000000 -0.000100
+s off
+f 2/1/1 4/2/1 3/3/1
+f 4/2/2 6/4/2 5/5/2
+f 6/4/3 8/6/3 7/7/3
+f 8/6/4 10/8/4 9/9/4
+f 10/8/5 12/10/5 11/11/5
+f 12/10/6 14/12/6 13/13/6
+f 14/12/7 16/14/7 15/15/7
+f 16/14/8 18/16/8 17/17/8
+f 18/16/9 20/18/9 19/19/9
+f 20/18/10 22/20/10 21/21/10
+f 22/20/11 24/22/11 23/23/11
+f 24/22/12 26/24/12 25/25/12
+f 26/24/13 28/26/13 27/27/13
+f 28/26/14 30/28/14 29/29/14
+f 30/28/15 32/30/15 31/31/15
+f 32/30/16 34/32/16 33/33/16
+f 34/32/17 36/34/17 35/35/17
+f 36/34/18 38/36/18 37/37/18
+f 38/36/19 40/38/19 39/39/19
+f 40/38/20 42/40/20 41/41/20
+f 42/40/21 44/42/21 43/43/21
+f 44/42/22 46/44/22 45/45/22
+f 46/44/23 48/46/23 47/47/23
+f 48/46/24 50/48/24 49/49/24
+f 50/48/25 52/50/25 51/51/25
+f 52/50/26 54/52/26 53/53/26
+f 54/52/27 56/54/27 55/55/27
+f 56/54/28 58/56/28 57/57/28
+f 58/56/29 60/58/29 59/59/29
+f 60/58/30 62/60/30 61/61/30
+f 38/62/31 22/63/31 6/64/31
+f 64/65/32 2/66/32 1/67/32
+f 62/60/33 64/65/33 63/68/33
+f 31/69/34 47/70/34 63/71/34
+f 1/72/1 2/1/1 3/3/1
+f 3/3/2 4/2/2 5/5/2
+f 5/5/3 6/4/3 7/7/3
+f 7/7/4 8/6/4 9/9/4
+f 9/9/5 10/8/5 11/11/5
+f 11/11/6 12/10/6 13/13/6
+f 13/13/7 14/12/7 15/15/7
+f 15/15/8 16/14/8 17/17/8
+f 17/17/9 18/16/9 19/19/9
+f 19/19/10 20/18/10 21/21/10
+f 21/21/11 22/20/11 23/23/11
+f 23/23/12 24/22/12 25/25/12
+f 25/25/13 26/24/13 27/27/13
+f 27/27/14 28/26/14 29/29/14
+f 29/29/15 30/28/15 31/31/15
+f 31/31/16 32/30/16 33/33/16
+f 33/33/17 34/32/17 35/35/17
+f 35/35/18 36/34/18 37/37/18
+f 37/37/19 38/36/19 39/39/19
+f 39/39/20 40/38/20 41/41/20
+f 41/41/21 42/40/21 43/43/21
+f 43/43/22 44/42/22 45/45/22
+f 45/45/23 46/44/23 47/47/23
+f 47/47/24 48/46/24 49/49/24
+f 49/49/25 50/48/25 51/51/25
+f 51/51/26 52/50/26 53/53/26
+f 53/53/27 54/52/27 55/55/27
+f 55/55/28 56/54/28 57/57/28
+f 57/57/29 58/56/29 59/59/29
+f 59/59/30 60/58/30 61/61/30
+f 6/64/31 4/73/31 2/74/31
+f 2/74/31 64/75/31 6/64/31
+f 62/76/31 60/77/31 58/78/31
+f 58/78/31 56/79/31 54/80/31
+f 54/80/31 52/81/31 50/82/31
+f 50/82/31 48/83/31 54/80/31
+f 46/84/31 44/85/31 42/86/31
+f 42/86/31 40/87/31 46/84/31
+f 38/62/35 36/88/35 34/89/35
+f 34/89/36 32/90/36 30/91/36
+f 30/91/31 28/92/31 22/63/31
+f 26/93/31 24/94/31 22/63/31
+f 22/63/31 20/95/31 18/96/31
+f 18/96/31 16/97/31 22/63/31
+f 14/98/31 12/99/31 10/100/31
+f 10/100/31 8/101/31 14/98/31
+f 6/64/31 64/75/31 62/76/31
+f 62/76/31 58/78/31 54/80/31
+f 54/80/31 48/83/31 46/84/31
+f 46/84/31 40/87/31 38/62/31
+f 38/62/31 34/89/31 22/63/31
+f 28/92/31 26/93/31 22/63/31
+f 22/63/31 16/97/31 14/98/31
+f 14/98/31 8/101/31 6/64/31
+f 6/64/31 62/76/31 54/80/31
+f 54/80/31 46/84/31 38/62/31
+f 34/89/31 30/91/31 22/63/31
+f 22/63/31 14/98/31 6/64/31
+f 6/64/31 54/80/31 38/62/31
+f 63/68/32 64/65/32 1/67/32
+f 61/61/33 62/60/33 63/68/33
+f 63/71/37 1/102/37 3/103/37
+f 3/103/34 5/104/34 7/105/34
+f 7/105/34 9/106/34 11/107/34
+f 11/107/34 13/108/34 7/105/34
+f 15/109/34 17/110/34 19/111/34
+f 19/111/34 21/112/34 23/113/34
+f 23/113/34 25/114/34 27/115/34
+f 27/115/37 29/116/37 31/69/37
+f 31/69/37 33/117/37 35/118/37
+f 35/118/34 37/119/34 39/120/34
+f 39/120/34 41/121/34 43/122/34
+f 43/122/34 45/123/34 47/70/34
+f 47/70/34 49/124/34 51/125/34
+f 51/125/34 53/126/34 47/70/34
+f 55/127/34 57/128/34 59/129/34
+f 59/129/37 61/130/37 63/71/37
+f 63/71/34 3/103/34 7/105/34
+f 7/105/34 13/108/34 15/109/34
+f 15/109/34 19/111/34 31/69/34
+f 23/113/34 27/115/34 31/69/34
+f 31/69/34 35/118/34 39/120/34
+f 39/120/34 43/122/34 47/70/34
+f 47/70/34 53/126/34 55/127/34
+f 55/127/34 59/129/34 63/71/34
+f 63/71/34 7/105/34 31/69/34
+f 19/111/34 23/113/34 31/69/34
+f 31/69/34 39/120/34 47/70/34
+f 47/70/34 55/127/34 63/71/34
+f 7/105/34 15/109/34 31/69/34
diff --git a/res/runtime/resources.data b/res/runtime/resources.data
index 0a6ea5675c..3163c78cac 100644
--- a/res/runtime/resources.data
+++ b/res/runtime/resources.data
@@ -71,7 +71,8 @@ models: %[
 - cube
 - monkeyhead
 - sphere
-- torus]%
+- torus
+- cylinder]%
 cube.path: ../../../res/runtime/models/cube.obj
 cube.name: Complete Cube
 monkeyhead.path: ../../../res/runtime/models/monkeyhead.obj
@@ -82,5 +83,7 @@ sword.path: ../../../res/runtime/models/sword.obj
 sword.name: Complete Sword
 torus.path: ../../../res/runtime/models/torus.obj
 torus.name: Complete Torus
-speed: 1
-played: 128302
+cylinder.path: ../../../res/runtime/models/cylinder.obj
+cylinder.name: Complete Cylinder
+speed: 0.5
+played: 125253
diff --git a/res/runtime/templates/cylinder_template.png b/res/runtime/templates/cylinder_template.png
new file mode 100644
index 0000000000..517965e1be
Binary files /dev/null and b/res/runtime/templates/cylinder_template.png differ
diff --git a/res/runtime/worlds/random.world b/res/runtime/worlds/random.world
index e63c124229..cadf934402 100644
--- a/res/runtime/worlds/random.world
+++ b/res/runtime/worlds/random.world
@@ -1,368 +1,55 @@
 gravity: [0, 0, 0]
-spawnpoint: [0, -1, 12]
-spawnorientation: [0, 3.14159, 0]
+spawnpoint: [0, 0, 0]
+spawnorientation: [0, 0, 0]
 object0.mesh: cube
-object0.texture: sand
-object0.normalmap: sand_normalmap
-object0.parallaxmap: default_parallaxmap
-object0.pos: [0, 0, 0]
+object0.texture: stone
+object0.normalmap: stone_normalmap
+object0.parallaxmap: stone_parallaxmap
+object0.pos: [0, -134, 0]
 object0.rot: [0, 0, 0]
-object0.scale: [2, 2, 2]
-object1.mesh: cube
-object1.texture: grass
-object1.normalmap: default_normalmap
-object1.parallaxmap: default_parallaxmap
-object1.pos: [6, 0, 0]
+object0.scale: [800, 20, 800]
+object1.mesh: cylinder
+object1.texture: wood
+object1.normalmap: wood_normalmap
+object1.parallaxmap: wood_parallaxmap
+object1.pos: [0, 0, -970]
 object1.rot: [0, 0, 0]
-object1.scale: [2, 2, 2]
-object2.mesh: torus
-object2.texture: sand
-object2.normalmap: sand_normalmap
-object2.parallaxmap: default_parallaxmap
-object2.pos: [0, -15, 0]
+object1.scale: [900, 900, 900]
+object2.mesh: cube
+object2.texture: lava
+object2.normalmap: lava_normalmap
+object2.parallaxmap: lava_parallaxmap
+object2.pos: [0, 1805, -905]
 object2.rot: [0, 0, 0]
-object2.scale: [100, 100, 100]
-object3.mesh: cube
-object3.texture: sand
-object3.normalmap: sand_normalmap
-object3.parallaxmap: default_parallaxmap
-object3.pos: [18.0488, 16.6728, 130.286]
-object3.rot: [-0.15, 3.90841, -0]
-object3.scale: [25, 25, 25]
+object2.scale: [200, 200, 200]
+object3.mesh: torus
+object3.texture: bricks
+object3.normalmap: bricks_normalmap
+object3.parallaxmap: bricks_parallaxmap
+object3.pos: [0, -121, 152]
+object3.rot: [0, 0, 0]
+object3.scale: [400, 400, 400]
 object4.mesh: monkeyhead
-object4.texture: metal
-object4.normalmap: metal_normalmap
-object4.parallaxmap: default_parallaxmap
-object4.pos: [-47.1851, 48.3911, 28.841]
-object4.rot: [-0.75, 1.34159, 0]
-object4.scale: [8, 8, 8]
-object5.mesh: monkeyhead
+object4.texture: sand
+object4.normalmap: sand_normalmap
+object4.parallaxmap: sand_parallaxmap
+object4.pos: [14.6862, 0, 1031.61]
+object4.rot: [0, 3.05002, 0]
+object4.scale: [300, 300, 300]
+object5.mesh: cube
 object5.texture: lava
-object5.normalmap: default_normalmap
-object5.parallaxmap: default_parallaxmap
-object5.pos: [15.0001, 1.5, 50]
-object5.rot: [0, 6.2416, 0]
-object5.scale: [12, 12, 12]
-object6.mesh: monkeyhead
-object6.texture: bricks
-object6.normalmap: bricks_normalmap
-object6.parallaxmap: default_parallaxmap
-object6.pos: [19.6578, 97.6598, 22.0097]
-object6.rot: [-1.6, 6.2416, 0]
-object6.scale: [31, 31, 31]
-object7.mesh: cube
-object7.texture: lava
-object7.normalmap: lava_normalmap
-object7.parallaxmap: default_parallaxmap
-object7.pos: [127.87, 58.3642, -25.6041]
-object7.rot: [-0.75, 12.6416, 0]
-object7.scale: [24, 21, 19]
-object8.mesh: cube
-object8.texture: lava
-object8.normalmap: default_normalmap
-object8.parallaxmap: default_parallaxmap
-object8.pos: [26.1821, 5.30777, 0.993736]
-object8.rot: [-0.9, 16.9916, 0]
-object8.scale: [0.5, 0.5, 0.5]
-object9.mesh: monkeyhead
-object9.texture: metal
-object9.normalmap: metal_normalmap
-object9.parallaxmap: default_parallaxmap
-object9.pos: [21.0549, 5.1723, 1.0272]
-object9.rot: [-0.15, 19.9916, 0]
-object9.scale: [0.3, 0.3, 0.3]
-object10.mesh: monkeyhead
-object10.texture: lava
-object10.normalmap: default_normalmap
-object10.parallaxmap: default_parallaxmap
-object10.pos: [16.5289, 2.48079, 5.73992]
-object10.rot: [0.3, 18.9416, 0]
-object10.scale: [0.05, 0.05, 0.05]
-object11.mesh: sphere
-object11.texture: lava
-object11.normalmap: lava_normalmap
-object11.parallaxmap: default_parallaxmap
-object11.pos: [86.4294, 32.143, 49.7597]
-object11.rot: [3.85, 22.4415, 0]
-object11.scale: [44, 44, 44]
-object12.mesh: cube
-object12.texture: bricks
-object12.normalmap: bricks_normalmap
-object12.parallaxmap: bricks_parallaxmap
-object12.pos: [16.4531, 31.5, -54.246]
-object12.rot: [0, -2.60841, 0]
-object12.scale: [30, 30, 30]
-object13.mesh: cube
-object13.texture: bricks
-object13.normalmap: bricks_normalmap
-object13.parallaxmap: bricks_parallaxmap
-object13.pos: [0, -56.5, 12]
-object13.rot: [0, 3.14159, 0]
-object13.scale: [150, 10, 150]
-object14.mesh: cube
-object14.texture: metal
-object14.normalmap: metal_normalmap
-object14.parallaxmap: default_parallaxmap
-object14.pos: [-103.976, 58.5, -50.526]
-object14.rot: [0, 2.59159, 0]
-object14.scale: [30, 30, 30]
-object15.mesh: cube
-object15.texture: wood
-object15.normalmap: wood_normalmap
-object15.parallaxmap: wood_parallaxmap
-object15.pos: [-166.596, 48.6411, 147.666]
-object15.rot: [-0.5, 6.9416, 0]
-object15.scale: [25, 25, 25]
-object16.mesh: cube
-object16.texture: metal
-object16.normalmap: default_normalmap
-object16.parallaxmap: default_parallaxmap
-object16.pos: [-238.026, 72.0878, -32.5975]
-object16.rot: [-0.11, 1.57786, 0]
-object16.scale: [30, 30, 30]
-object17.mesh: cube
-object17.texture: wood
-object17.normalmap: default_normalmap
-object17.parallaxmap: default_parallaxmap
-object17.pos: [-217.439, 70.5788, 84.0984]
-object17.rot: [-0.0549999, 1.72032, 0]
-object17.scale: [30, 30, 30]
-object18.mesh: cube
-object18.texture: lava
-object18.normalmap: bricks_normalmap
-object18.parallaxmap: default_parallaxmap
-object18.pos: [-72.5607, 94.0283, 79.1195]
-object18.rot: [-0.135, 0.441576, 0]
-object18.scale: [30, 30, 30]
-object19.mesh: cube
-object19.texture: lava
-object19.normalmap: metal_normalmap
-object19.parallaxmap: default_parallaxmap
-object19.pos: [-41.6143, 63.2966, -138.426]
-object19.rot: [-0.34, 3.28408, 0]
-object19.scale: [30, 30, 30]
-object20.mesh: sphere
-object20.texture: metal
-object20.normalmap: metal_normalmap
-object20.parallaxmap: default_parallaxmap
-object20.pos: [383.362, 47.3228, 235.985]
-object20.rot: [0.035, 4.72034, 0]
-object20.scale: [250, 250, 250]
-object21.mesh: sphere
-object21.texture: bricks
-object21.normalmap: bricks_normalmap
-object21.parallaxmap: default_parallaxmap
-object21.pos: [462.116, 73.3755, 15.0273]
-object21.rot: [-0.155, 4.45784, 0]
-object21.scale: [200, 200, 200]
-object22.mesh: monkeyhead
-object22.texture: metal
-object22.normalmap: metal_normalmap
-object22.parallaxmap: default_parallaxmap
-object22.pos: [417.931, 398.1, 88.8868]
-object22.rot: [-0.35, 5.09909, 0]
-object22.scale: [175, 175, 175]
-object23.mesh: torus
-object23.texture: wood
-object23.normalmap: wood_normalmap
-object23.parallaxmap: default_parallaxmap
-object23.pos: [210.758, 62.8585, -243.696]
-object23.rot: [-1.51, 3.74535, 0]
-object23.scale: [100, 100, 100]
-object24.mesh: cube
-object24.texture: sand
-object24.normalmap: bricks_normalmap
-object24.parallaxmap: default_parallaxmap
-object24.pos: [-62.702, 79.2323, 206.062]
-object24.rot: [-0.0849999, 6.08533, 0]
-object24.scale: [20, 20, 20]
-object25.mesh: cube
-object25.texture: bricks
-object25.normalmap: bricks_normalmap
-object25.parallaxmap: bricks_parallaxmap
-object25.pos: [-4.67621, 87.2118, 175.83]
-object25.rot: [-0.11, -0.162188, 0]
-object25.scale: [30, 30, 30]
-object26.mesh: cube
-object26.texture: bricks
-object26.normalmap: bricks_normalmap
-object26.parallaxmap: default_parallaxmap
-object26.pos: [104.83, 92.6372, 160.631]
-object26.rot: [0.0299998, 6.11157, 0]
-object26.scale: [30, 30, 30]
-object27.mesh: cube
-object27.texture: bricks
-object27.normalmap: default_normalmap
-object27.parallaxmap: bricks_parallaxmap
-object27.pos: [28.7183, 81.3509, 272.667]
-object27.rot: [0.0449998, 6.41157, 0]
-object27.scale: [30, 30, 30]
-object28.mesh: cube
-object28.texture: lava
-object28.normalmap: bricks_normalmap
-object28.parallaxmap: default_parallaxmap
-object28.pos: [-147.162, 96.4334, -198.509]
-object28.rot: [0.02, 21.8838, 0]
-object28.scale: [30, 30, 30]
-object29.mesh: cube
-object29.texture: lava
-object29.normalmap: bricks_normalmap
-object29.parallaxmap: bricks_parallaxmap
-object29.pos: [-229.186, 96.4334, -189.669]
-object29.rot: [0.02, 21.8838, 0]
-object29.scale: [30, 30, 30]
-object30.mesh: cube
-object30.texture: stone
-object30.normalmap: stone_normalmap
-object30.parallaxmap: stone_parallaxmap
-object30.pos: [-0.00132591, -64.5, -511]
-object30.rot: [0, 3.14159, 0]
-object30.scale: [300, 20, 300]
-object31.mesh: cube
-object31.texture: bricks
-object31.normalmap: bricks_normalmap
-object31.parallaxmap: bricks_parallaxmap
-object31.pos: [128.25, -16.5, -650.816]
-object31.rot: [0, 1.62656, 0]
-object31.scale: [50, 5, 50]
-object32.mesh: cube
-object32.texture: stone
-object32.normalmap: default_normalmap
-object32.parallaxmap: default_parallaxmap
-object32.pos: [-77.2259, -28.5, -430.477]
-object32.rot: [0, 0.0465658, 0]
-object32.scale: [50, 5, 50]
-object33.mesh: cube
-object33.texture: stone
-object33.normalmap: stone_normalmap
-object33.parallaxmap: default_parallaxmap
-object33.pos: [-18.2898, -28.5, -427.729]
-object33.rot: [0, 0.0465658, 0]
-object33.scale: [50, 5, 50]
-object34.mesh: cube
-object34.texture: stone
-object34.normalmap: stone_normalmap
-object34.parallaxmap: stone_parallaxmap
-object34.pos: [39.6473, -28.5, -425.028]
-object34.rot: [0, 0.0465658, 0]
-object34.scale: [50, 5, 50]
-object35.mesh: cube
-object35.texture: lava
-object35.normalmap: lava_normalmap
-object35.parallaxmap: default_parallaxmap
-object35.pos: [164.829, -1, -436.011]
-object35.rot: [0, 0.0865658, 0]
-object35.scale: [80, 8, 80]
-object36.mesh: cube
-object36.texture: lava
-object36.normalmap: lava_normalmap
-object36.parallaxmap: lava_parallaxmap
-object36.pos: [331.205, -1, -421.567]
-object36.rot: [0, 0.0865658, 0]
-object36.scale: [80, 8, 80]
-object37.mesh: cube
-object37.texture: metal
-object37.normalmap: metal_normalmap
-object37.parallaxmap: metal_parallaxmap
-object37.pos: [141.321, 9, -803.441]
-object37.rot: [0, -0.0384342, 0]
-object37.scale: [80, 8, 80]
-object38.mesh: cube
-object38.texture: metal
-object38.normalmap: metal_normalmap
-object38.parallaxmap: metal_parallaxmap
-object38.pos: [-28.5543, 9, -796.904]
-object38.rot: [0, -0.0384342, 0]
-object38.scale: [80, 8, 80]
-object39.mesh: cube
-object39.texture: metal
-object39.normalmap: metal_normalmap
-object39.parallaxmap: metal_parallaxmap
-object39.pos: [-0.000628724, -300, -236]
-object39.rot: [0, 3.14159, 0]
-object39.scale: [800, 10, 800]
-object40.mesh: cube
-object40.texture: lava
-object40.normalmap: stone_normalmap
-object40.parallaxmap: stone_parallaxmap
-object40.pos: [-443.387, -66, -108.628]
-object40.rot: [0, 1.45159, 0]
-object40.scale: [80, 8, 80]
-object41.mesh: cube
-object41.texture: metal
-object41.normalmap: stone_normalmap
-object41.parallaxmap: stone_parallaxmap
-object41.pos: [-470.619, -68, -319.725]
-object41.rot: [0, 3.01159, 0]
-object41.scale: [80, 8, 80]
-object42.mesh: cube
-object42.texture: stone
-object42.normalmap: lava_normalmap
-object42.parallaxmap: lava_parallaxmap
-object42.pos: [-499, -71, -551]
-object42.rot: [0, 3.02159, 0]
-object42.scale: [80, 8, 80]
-object43.mesh: cube
-object43.texture: stone
-object43.normalmap: metal_normalmap
-object43.parallaxmap: metal_parallaxmap
-object43.pos: [-692.381, -63, -518.761]
-object43.rot: [0, 1.38159, 0]
-object43.scale: [80, 8, 80]
-object44.mesh: cube
-object44.texture: sand
-object44.normalmap: stone_normalmap
-object44.parallaxmap: stone_parallaxmap
-object44.pos: [-649.096, -65, -290.25]
-object44.rot: [0, 2.99159, 0]
-object44.scale: [80, 8, 80]
-object45.mesh: monkeyhead
-object45.texture: sand
-object45.normalmap: stone_normalmap
-object45.parallaxmap: stone_parallaxmap
-object45.pos: [455.504, -1, -428.552]
-object45.rot: [0, 1.54159, 0]
-object45.scale: [150, 150, 150]
-eo0.mesh: cube
-eo0.texture: lava
-eo0.normalmap: lava_normalmap
-eo0.parallaxmap: lava_parallaxmap
-eo0.mass: 5
-eo0.pos: [-121.229, 23.4656, 533.473]
-eo0.rot: [0, 0, 0]
-eo0.scale: [10, 10, 10]
-eo1.mesh: monkeyhead
-eo1.texture: grass
-eo1.normalmap: default_normalmap
-eo1.parallaxmap: default_parallaxmap
-eo1.mass: 20
-eo1.pos: [-234.055, 190.511, -364.34]
-eo1.rot: [0, 3.14159, 0]
-eo1.scale: [6, 6, 6]
-eo2.mesh: torus
-eo2.texture: lava
-eo2.normalmap: lava_normalmap
-eo2.parallaxmap: lava_parallaxmap
-eo2.mass: 7
-eo2.pos: [953.168, -43.5197, -633.221]
-eo2.rot: [0, 3.14159, 0]
-eo2.scale: [5, 5, 5]
-eo3.mesh: monkeyhead
-eo3.texture: sand
-eo3.normalmap: sand_normalmap
-eo3.parallaxmap: sand_parallaxmap
-eo3.mass: 30
-eo3.pos: [104.033, 40.027, -556.489]
-eo3.rot: [0, 3.14159, 0]
-eo3.scale: [50, 50, 50]
-eo4.mesh: cube
-eo4.texture: bricks
-eo4.normalmap: bricks_normalmap
-eo4.parallaxmap: bricks_parallaxmap
-eo4.mass: 20
-eo4.pos: [-234.055, 190.511, -364.34]
-eo4.rot: [0, 7.8916, 0]
-eo4.scale: [30, 30, 30]
+object5.normalmap: lava_normalmap
+object5.parallaxmap: lava_parallaxmap
+object5.pos: [-184.175, -35.7083, -523.794]
+object5.rot: [-2.55001, 3.54128, 0]
+object5.scale: [100, 100, 100]
+object6.mesh: cube
+object6.texture: lava
+object6.normalmap: lava_normalmap
+object6.parallaxmap: lava_parallaxmap
+object6.pos: [-465.339, 0, -611.085]
+object6.rot: [0, 0.045, 0]
+object6.scale: [100, 100, 100]
 objects: %[
 - object0
 - object1
@@ -370,49 +57,5 @@ objects: %[
 - object3
 - object4
 - object5
-- object6
-- object7
-- object8
-- object9
-- object10
-- object11
-- object12
-- object13
-- object14
-- object15
-- object16
-- object17
-- object18
-- object19
-- object20
-- object21
-- object22
-- object23
-- object24
-- object25
-- object26
-- object27
-- object28
-- object29
-- object30
-- object31
-- object32
-- object33
-- object34
-- object35
-- object36
-- object37
-- object38
-- object39
-- object40
-- object41
-- object42
-- object43
-- object44
-- object45]%
+- object6]%
 entityobjects: %[
-- eo0
-- eo1
-- eo2
-- eo3
-- eo4]%
diff --git a/src/world.cpp b/src/world.cpp
index 5c6b236c68..240734d001 100644
--- a/src/world.cpp
+++ b/src/world.cpp
@@ -66,6 +66,9 @@ void World::addEntityObject(std::shared_ptr<EntityObject> eo)
 	this->entityObjects.push_back(eo);
 }
 
+//temp 
+#include <iostream>
+
 void World::exportWorld(std::string worldName) const
 {
 	DataTranslation dt(RES_POINT + "/resources.data");
@@ -88,6 +91,7 @@ void World::exportWorld(std::string worldName) const
 	for(unsigned int i = 0; i < this->members.size(); i++)
 	{
 		std::string objectName = "object" + StringUtility::toString(i);
+		std::cout << "Exporting " << objectName << "(" << this->members.size() << ")...\n";
 		objectList.push_back(objectName);
 		Object curObj = this->members.at(i);
 		std::string meshLink = curObj.getMeshLink();