diff --git a/CMakeFiles/Makefile2 b/CMakeFiles/Makefile2
index 0cca7b4..1a34db3 100644
--- a/CMakeFiles/Makefile2
+++ b/CMakeFiles/Makefile2
@@ -66,7 +66,7 @@ CMAKE_BINARY_DIR = "/home/tux/Dev ++/Omicron"
 CMakeFiles/omicron.dir/all: deps/glfw/src/CMakeFiles/glfw.dir/all
 	$(MAKE) -f CMakeFiles/omicron.dir/build.make CMakeFiles/omicron.dir/depend
 	$(MAKE) -f CMakeFiles/omicron.dir/build.make CMakeFiles/omicron.dir/build
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76 "Built target omicron"
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76 "Built target omicron"
 .PHONY : CMakeFiles/omicron.dir/all
 
 # Include target in all.
@@ -76,7 +76,7 @@ all: CMakeFiles/omicron.dir/all
 
 # Build rule for subdir invocation for target.
 CMakeFiles/omicron.dir/rule: cmake_check_build_system
-	$(CMAKE_COMMAND) -E cmake_progress_start "/home/tux/Dev ++/Omicron/CMakeFiles" 41
+	$(CMAKE_COMMAND) -E cmake_progress_start "/home/tux/Dev ++/Omicron/CMakeFiles" 42
 	$(MAKE) -f CMakeFiles/Makefile2 CMakeFiles/omicron.dir/all
 	$(CMAKE_COMMAND) -E cmake_progress_start "/home/tux/Dev ++/Omicron/CMakeFiles" 0
 .PHONY : CMakeFiles/omicron.dir/rule
@@ -178,7 +178,7 @@ deps/glfw/src/preinstall:
 deps/glfw/src/CMakeFiles/glfw.dir/all:
 	$(MAKE) -f deps/glfw/src/CMakeFiles/glfw.dir/build.make deps/glfw/src/CMakeFiles/glfw.dir/depend
 	$(MAKE) -f deps/glfw/src/CMakeFiles/glfw.dir/build.make deps/glfw/src/CMakeFiles/glfw.dir/build
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=19,20,21,22,23,24,25,26,27,28,29,30,31,32 "Built target glfw"
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=18,19,20,21,22,23,24,25,26,27,28,29,30,31 "Built target glfw"
 .PHONY : deps/glfw/src/CMakeFiles/glfw.dir/all
 
 # Include target in all.
@@ -245,7 +245,7 @@ deps/glfw/examples/preinstall:
 deps/glfw/examples/CMakeFiles/heightmap.dir/all: deps/glfw/src/CMakeFiles/glfw.dir/all
 	$(MAKE) -f deps/glfw/examples/CMakeFiles/heightmap.dir/build.make deps/glfw/examples/CMakeFiles/heightmap.dir/depend
 	$(MAKE) -f deps/glfw/examples/CMakeFiles/heightmap.dir/build.make deps/glfw/examples/CMakeFiles/heightmap.dir/build
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=36,37,38 "Built target heightmap"
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=35,36,37 "Built target heightmap"
 .PHONY : deps/glfw/examples/CMakeFiles/heightmap.dir/all
 
 # Include target in all.
@@ -282,7 +282,7 @@ clean: deps/glfw/examples/CMakeFiles/heightmap.dir/clean
 deps/glfw/examples/CMakeFiles/gears.dir/all: deps/glfw/src/CMakeFiles/glfw.dir/all
 	$(MAKE) -f deps/glfw/examples/CMakeFiles/gears.dir/build.make deps/glfw/examples/CMakeFiles/gears.dir/depend
 	$(MAKE) -f deps/glfw/examples/CMakeFiles/gears.dir/build.make deps/glfw/examples/CMakeFiles/gears.dir/build
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=17,18 "Built target gears"
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=16,17 "Built target gears"
 .PHONY : deps/glfw/examples/CMakeFiles/gears.dir/all
 
 # Include target in all.
@@ -393,7 +393,7 @@ clean: deps/glfw/examples/CMakeFiles/wave.dir/clean
 deps/glfw/examples/CMakeFiles/boing.dir/all: deps/glfw/src/CMakeFiles/glfw.dir/all
 	$(MAKE) -f deps/glfw/examples/CMakeFiles/boing.dir/build.make deps/glfw/examples/CMakeFiles/boing.dir/depend
 	$(MAKE) -f deps/glfw/examples/CMakeFiles/boing.dir/build.make deps/glfw/examples/CMakeFiles/boing.dir/build
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=1,2 "Built target boing"
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=1 "Built target boing"
 .PHONY : deps/glfw/examples/CMakeFiles/boing.dir/all
 
 # Include target in all.
@@ -403,7 +403,7 @@ all: deps/glfw/examples/CMakeFiles/boing.dir/all
 
 # Build rule for subdir invocation for target.
 deps/glfw/examples/CMakeFiles/boing.dir/rule: cmake_check_build_system
-	$(CMAKE_COMMAND) -E cmake_progress_start "/home/tux/Dev ++/Omicron/CMakeFiles" 16
+	$(CMAKE_COMMAND) -E cmake_progress_start "/home/tux/Dev ++/Omicron/CMakeFiles" 15
 	$(MAKE) -f CMakeFiles/Makefile2 deps/glfw/examples/CMakeFiles/boing.dir/all
 	$(CMAKE_COMMAND) -E cmake_progress_start "/home/tux/Dev ++/Omicron/CMakeFiles" 0
 .PHONY : deps/glfw/examples/CMakeFiles/boing.dir/rule
@@ -700,7 +700,7 @@ clean: deps/glfw/tests/CMakeFiles/threads.dir/clean
 deps/glfw/tests/CMakeFiles/empty.dir/all: deps/glfw/src/CMakeFiles/glfw.dir/all
 	$(MAKE) -f deps/glfw/tests/CMakeFiles/empty.dir/build.make deps/glfw/tests/CMakeFiles/empty.dir/depend
 	$(MAKE) -f deps/glfw/tests/CMakeFiles/empty.dir/build.make deps/glfw/tests/CMakeFiles/empty.dir/build
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=8,9,10 "Built target empty"
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=7,8,9 "Built target empty"
 .PHONY : deps/glfw/tests/CMakeFiles/empty.dir/all
 
 # Include target in all.
@@ -737,7 +737,7 @@ clean: deps/glfw/tests/CMakeFiles/empty.dir/clean
 deps/glfw/tests/CMakeFiles/msaa.dir/all: deps/glfw/src/CMakeFiles/glfw.dir/all
 	$(MAKE) -f deps/glfw/tests/CMakeFiles/msaa.dir/build.make deps/glfw/tests/CMakeFiles/msaa.dir/depend
 	$(MAKE) -f deps/glfw/tests/CMakeFiles/msaa.dir/build.make deps/glfw/tests/CMakeFiles/msaa.dir/build
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=47,48,49 "Built target msaa"
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=46,47,48 "Built target msaa"
 .PHONY : deps/glfw/tests/CMakeFiles/msaa.dir/all
 
 # Include target in all.
@@ -811,7 +811,7 @@ clean: deps/glfw/tests/CMakeFiles/tearing.dir/clean
 deps/glfw/tests/CMakeFiles/events.dir/all: deps/glfw/src/CMakeFiles/glfw.dir/all
 	$(MAKE) -f deps/glfw/tests/CMakeFiles/events.dir/build.make deps/glfw/tests/CMakeFiles/events.dir/depend
 	$(MAKE) -f deps/glfw/tests/CMakeFiles/events.dir/build.make deps/glfw/tests/CMakeFiles/events.dir/build
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=11,12,13 "Built target events"
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=10,11,12 "Built target events"
 .PHONY : deps/glfw/tests/CMakeFiles/events.dir/all
 
 # Include target in all.
@@ -848,7 +848,7 @@ clean: deps/glfw/tests/CMakeFiles/events.dir/clean
 deps/glfw/tests/CMakeFiles/gamma.dir/all: deps/glfw/src/CMakeFiles/glfw.dir/all
 	$(MAKE) -f deps/glfw/tests/CMakeFiles/gamma.dir/build.make deps/glfw/tests/CMakeFiles/gamma.dir/depend
 	$(MAKE) -f deps/glfw/tests/CMakeFiles/gamma.dir/build.make deps/glfw/tests/CMakeFiles/gamma.dir/build
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=14,15,16 "Built target gamma"
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=13,14,15 "Built target gamma"
 .PHONY : deps/glfw/tests/CMakeFiles/gamma.dir/all
 
 # Include target in all.
@@ -885,7 +885,7 @@ clean: deps/glfw/tests/CMakeFiles/gamma.dir/clean
 deps/glfw/tests/CMakeFiles/glfwinfo.dir/all: deps/glfw/src/CMakeFiles/glfw.dir/all
 	$(MAKE) -f deps/glfw/tests/CMakeFiles/glfwinfo.dir/build.make deps/glfw/tests/CMakeFiles/glfwinfo.dir/depend
 	$(MAKE) -f deps/glfw/tests/CMakeFiles/glfwinfo.dir/build.make deps/glfw/tests/CMakeFiles/glfwinfo.dir/build
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=33,34,35 "Built target glfwinfo"
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=32,33,34 "Built target glfwinfo"
 .PHONY : deps/glfw/tests/CMakeFiles/glfwinfo.dir/all
 
 # Include target in all.
@@ -922,7 +922,7 @@ clean: deps/glfw/tests/CMakeFiles/glfwinfo.dir/clean
 deps/glfw/tests/CMakeFiles/iconify.dir/all: deps/glfw/src/CMakeFiles/glfw.dir/all
 	$(MAKE) -f deps/glfw/tests/CMakeFiles/iconify.dir/build.make deps/glfw/tests/CMakeFiles/iconify.dir/depend
 	$(MAKE) -f deps/glfw/tests/CMakeFiles/iconify.dir/build.make deps/glfw/tests/CMakeFiles/iconify.dir/build
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=39,40,41 "Built target iconify"
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=38,39,40 "Built target iconify"
 .PHONY : deps/glfw/tests/CMakeFiles/iconify.dir/all
 
 # Include target in all.
@@ -959,7 +959,7 @@ clean: deps/glfw/tests/CMakeFiles/iconify.dir/clean
 deps/glfw/tests/CMakeFiles/monitors.dir/all: deps/glfw/src/CMakeFiles/glfw.dir/all
 	$(MAKE) -f deps/glfw/tests/CMakeFiles/monitors.dir/build.make deps/glfw/tests/CMakeFiles/monitors.dir/depend
 	$(MAKE) -f deps/glfw/tests/CMakeFiles/monitors.dir/build.make deps/glfw/tests/CMakeFiles/monitors.dir/build
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=44,45,46 "Built target monitors"
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=43,44,45 "Built target monitors"
 .PHONY : deps/glfw/tests/CMakeFiles/monitors.dir/all
 
 # Include target in all.
@@ -996,7 +996,7 @@ clean: deps/glfw/tests/CMakeFiles/monitors.dir/clean
 deps/glfw/tests/CMakeFiles/cursor.dir/all: deps/glfw/src/CMakeFiles/glfw.dir/all
 	$(MAKE) -f deps/glfw/tests/CMakeFiles/cursor.dir/build.make deps/glfw/tests/CMakeFiles/cursor.dir/depend
 	$(MAKE) -f deps/glfw/tests/CMakeFiles/cursor.dir/build.make deps/glfw/tests/CMakeFiles/cursor.dir/build
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=6,7 "Built target cursor"
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=5,6 "Built target cursor"
 .PHONY : deps/glfw/tests/CMakeFiles/cursor.dir/all
 
 # Include target in all.
@@ -1033,7 +1033,7 @@ clean: deps/glfw/tests/CMakeFiles/cursor.dir/clean
 deps/glfw/tests/CMakeFiles/joysticks.dir/all: deps/glfw/src/CMakeFiles/glfw.dir/all
 	$(MAKE) -f deps/glfw/tests/CMakeFiles/joysticks.dir/build.make deps/glfw/tests/CMakeFiles/joysticks.dir/depend
 	$(MAKE) -f deps/glfw/tests/CMakeFiles/joysticks.dir/build.make deps/glfw/tests/CMakeFiles/joysticks.dir/build
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=42,43 "Built target joysticks"
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=41,42 "Built target joysticks"
 .PHONY : deps/glfw/tests/CMakeFiles/joysticks.dir/all
 
 # Include target in all.
@@ -1070,7 +1070,7 @@ clean: deps/glfw/tests/CMakeFiles/joysticks.dir/clean
 deps/glfw/tests/CMakeFiles/clipboard.dir/all: deps/glfw/src/CMakeFiles/glfw.dir/all
 	$(MAKE) -f deps/glfw/tests/CMakeFiles/clipboard.dir/build.make deps/glfw/tests/CMakeFiles/clipboard.dir/depend
 	$(MAKE) -f deps/glfw/tests/CMakeFiles/clipboard.dir/build.make deps/glfw/tests/CMakeFiles/clipboard.dir/build
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=3,4,5 "Built target clipboard"
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=2,3,4 "Built target clipboard"
 .PHONY : deps/glfw/tests/CMakeFiles/clipboard.dir/all
 
 # Include target in all.
diff --git a/CMakeFiles/omicron.dir/C.includecache b/CMakeFiles/omicron.dir/C.includecache
index 1444e49..163b3fe 100644
--- a/CMakeFiles/omicron.dir/C.includecache
+++ b/CMakeFiles/omicron.dir/C.includecache
@@ -516,6 +516,20 @@ noise.h
 world.h
 /home/tux/Dev ++/Omicron/src/worldgen/world.h
 
+/home/tux/Dev ++/Omicron/src/worldgen/biome_swamp.c
+biome_swamp.h
+/home/tux/Dev ++/Omicron/src/worldgen/biome_swamp.h
+noise.h
+/home/tux/Dev ++/Omicron/src/worldgen/noise.h
+../config.h
+/home/tux/Dev ++/Omicron/src/config.h
+../item.h
+/home/tux/Dev ++/Omicron/src/item.h
+
+/home/tux/Dev ++/Omicron/src/worldgen/biome_swamp.h
+world.h
+/home/tux/Dev ++/Omicron/src/worldgen/world.h
+
 /home/tux/Dev ++/Omicron/src/worldgen/biome_taiga.c
 biome_taiga.h
 /home/tux/Dev ++/Omicron/src/worldgen/biome_taiga.h
@@ -575,6 +589,8 @@ biome_taiga.h
 /home/tux/Dev ++/Omicron/src/worldgen/biome_taiga.h
 biome_mesa.h
 /home/tux/Dev ++/Omicron/src/worldgen/biome_mesa.h
+biome_swamp.h
+/home/tux/Dev ++/Omicron/src/worldgen/biome_swamp.h
 
 /home/tux/Dev ++/Omicron/src/worldgen/world.h
 
diff --git a/CMakeFiles/omicron.dir/DependInfo.cmake b/CMakeFiles/omicron.dir/DependInfo.cmake
index 5eff950..3197f4d 100644
--- a/CMakeFiles/omicron.dir/DependInfo.cmake
+++ b/CMakeFiles/omicron.dir/DependInfo.cmake
@@ -27,6 +27,7 @@ set(CMAKE_DEPENDS_CHECK_C
   "/home/tux/Dev ++/Omicron/src/worldgen/biome_desert.c" "/home/tux/Dev ++/Omicron/CMakeFiles/omicron.dir/src/worldgen/biome_desert.c.o"
   "/home/tux/Dev ++/Omicron/src/worldgen/biome_mesa.c" "/home/tux/Dev ++/Omicron/CMakeFiles/omicron.dir/src/worldgen/biome_mesa.c.o"
   "/home/tux/Dev ++/Omicron/src/worldgen/biome_rainforest.c" "/home/tux/Dev ++/Omicron/CMakeFiles/omicron.dir/src/worldgen/biome_rainforest.c.o"
+  "/home/tux/Dev ++/Omicron/src/worldgen/biome_swamp.c" "/home/tux/Dev ++/Omicron/CMakeFiles/omicron.dir/src/worldgen/biome_swamp.c.o"
   "/home/tux/Dev ++/Omicron/src/worldgen/biome_taiga.c" "/home/tux/Dev ++/Omicron/CMakeFiles/omicron.dir/src/worldgen/biome_taiga.c.o"
   "/home/tux/Dev ++/Omicron/src/worldgen/biome_temperate.c" "/home/tux/Dev ++/Omicron/CMakeFiles/omicron.dir/src/worldgen/biome_temperate.c.o"
   "/home/tux/Dev ++/Omicron/src/worldgen/world.c" "/home/tux/Dev ++/Omicron/CMakeFiles/omicron.dir/src/worldgen/world.c.o"
diff --git a/CMakeFiles/omicron.dir/build.make b/CMakeFiles/omicron.dir/build.make
index 9b0b384..d237a51 100644
--- a/CMakeFiles/omicron.dir/build.make
+++ b/CMakeFiles/omicron.dir/build.make
@@ -489,9 +489,33 @@ CMakeFiles/omicron.dir/src/worldgen/biome_rainforest.c.o.provides: CMakeFiles/om
 CMakeFiles/omicron.dir/src/worldgen/biome_rainforest.c.o.provides.build: CMakeFiles/omicron.dir/src/worldgen/biome_rainforest.c.o
 
 
+CMakeFiles/omicron.dir/src/worldgen/biome_swamp.c.o: CMakeFiles/omicron.dir/flags.make
+CMakeFiles/omicron.dir/src/worldgen/biome_swamp.c.o: src/worldgen/biome_swamp.c
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=$(CMAKE_PROGRESS_19) "Building C object CMakeFiles/omicron.dir/src/worldgen/biome_swamp.c.o"
+	/usr/bin/cc  $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -o CMakeFiles/omicron.dir/src/worldgen/biome_swamp.c.o   -c "/home/tux/Dev ++/Omicron/src/worldgen/biome_swamp.c"
+
+CMakeFiles/omicron.dir/src/worldgen/biome_swamp.c.i: cmake_force
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing C source to CMakeFiles/omicron.dir/src/worldgen/biome_swamp.c.i"
+	/usr/bin/cc  $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -E "/home/tux/Dev ++/Omicron/src/worldgen/biome_swamp.c" > CMakeFiles/omicron.dir/src/worldgen/biome_swamp.c.i
+
+CMakeFiles/omicron.dir/src/worldgen/biome_swamp.c.s: cmake_force
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling C source to assembly CMakeFiles/omicron.dir/src/worldgen/biome_swamp.c.s"
+	/usr/bin/cc  $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -S "/home/tux/Dev ++/Omicron/src/worldgen/biome_swamp.c" -o CMakeFiles/omicron.dir/src/worldgen/biome_swamp.c.s
+
+CMakeFiles/omicron.dir/src/worldgen/biome_swamp.c.o.requires:
+
+.PHONY : CMakeFiles/omicron.dir/src/worldgen/biome_swamp.c.o.requires
+
+CMakeFiles/omicron.dir/src/worldgen/biome_swamp.c.o.provides: CMakeFiles/omicron.dir/src/worldgen/biome_swamp.c.o.requires
+	$(MAKE) -f CMakeFiles/omicron.dir/build.make CMakeFiles/omicron.dir/src/worldgen/biome_swamp.c.o.provides.build
+.PHONY : CMakeFiles/omicron.dir/src/worldgen/biome_swamp.c.o.provides
+
+CMakeFiles/omicron.dir/src/worldgen/biome_swamp.c.o.provides.build: CMakeFiles/omicron.dir/src/worldgen/biome_swamp.c.o
+
+
 CMakeFiles/omicron.dir/src/worldgen/biome_taiga.c.o: CMakeFiles/omicron.dir/flags.make
 CMakeFiles/omicron.dir/src/worldgen/biome_taiga.c.o: src/worldgen/biome_taiga.c
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=$(CMAKE_PROGRESS_19) "Building C object CMakeFiles/omicron.dir/src/worldgen/biome_taiga.c.o"
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=$(CMAKE_PROGRESS_20) "Building C object CMakeFiles/omicron.dir/src/worldgen/biome_taiga.c.o"
 	/usr/bin/cc  $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -o CMakeFiles/omicron.dir/src/worldgen/biome_taiga.c.o   -c "/home/tux/Dev ++/Omicron/src/worldgen/biome_taiga.c"
 
 CMakeFiles/omicron.dir/src/worldgen/biome_taiga.c.i: cmake_force
@@ -515,7 +539,7 @@ CMakeFiles/omicron.dir/src/worldgen/biome_taiga.c.o.provides.build: CMakeFiles/o
 
 CMakeFiles/omicron.dir/src/worldgen/biome_temperate.c.o: CMakeFiles/omicron.dir/flags.make
 CMakeFiles/omicron.dir/src/worldgen/biome_temperate.c.o: src/worldgen/biome_temperate.c
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=$(CMAKE_PROGRESS_20) "Building C object CMakeFiles/omicron.dir/src/worldgen/biome_temperate.c.o"
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=$(CMAKE_PROGRESS_21) "Building C object CMakeFiles/omicron.dir/src/worldgen/biome_temperate.c.o"
 	/usr/bin/cc  $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -o CMakeFiles/omicron.dir/src/worldgen/biome_temperate.c.o   -c "/home/tux/Dev ++/Omicron/src/worldgen/biome_temperate.c"
 
 CMakeFiles/omicron.dir/src/worldgen/biome_temperate.c.i: cmake_force
@@ -539,7 +563,7 @@ CMakeFiles/omicron.dir/src/worldgen/biome_temperate.c.o.provides.build: CMakeFil
 
 CMakeFiles/omicron.dir/src/worldgen/world.c.o: CMakeFiles/omicron.dir/flags.make
 CMakeFiles/omicron.dir/src/worldgen/world.c.o: src/worldgen/world.c
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=$(CMAKE_PROGRESS_21) "Building C object CMakeFiles/omicron.dir/src/worldgen/world.c.o"
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=$(CMAKE_PROGRESS_22) "Building C object CMakeFiles/omicron.dir/src/worldgen/world.c.o"
 	/usr/bin/cc  $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -o CMakeFiles/omicron.dir/src/worldgen/world.c.o   -c "/home/tux/Dev ++/Omicron/src/worldgen/world.c"
 
 CMakeFiles/omicron.dir/src/worldgen/world.c.i: cmake_force
@@ -563,7 +587,7 @@ CMakeFiles/omicron.dir/src/worldgen/world.c.o.provides.build: CMakeFiles/omicron
 
 CMakeFiles/omicron.dir/deps/glew/src/glew.c.o: CMakeFiles/omicron.dir/flags.make
 CMakeFiles/omicron.dir/deps/glew/src/glew.c.o: deps/glew/src/glew.c
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=$(CMAKE_PROGRESS_22) "Building C object CMakeFiles/omicron.dir/deps/glew/src/glew.c.o"
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=$(CMAKE_PROGRESS_23) "Building C object CMakeFiles/omicron.dir/deps/glew/src/glew.c.o"
 	/usr/bin/cc  $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -o CMakeFiles/omicron.dir/deps/glew/src/glew.c.o   -c "/home/tux/Dev ++/Omicron/deps/glew/src/glew.c"
 
 CMakeFiles/omicron.dir/deps/glew/src/glew.c.i: cmake_force
@@ -587,7 +611,7 @@ CMakeFiles/omicron.dir/deps/glew/src/glew.c.o.provides.build: CMakeFiles/omicron
 
 CMakeFiles/omicron.dir/deps/lodepng/lodepng.c.o: CMakeFiles/omicron.dir/flags.make
 CMakeFiles/omicron.dir/deps/lodepng/lodepng.c.o: deps/lodepng/lodepng.c
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=$(CMAKE_PROGRESS_23) "Building C object CMakeFiles/omicron.dir/deps/lodepng/lodepng.c.o"
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=$(CMAKE_PROGRESS_24) "Building C object CMakeFiles/omicron.dir/deps/lodepng/lodepng.c.o"
 	/usr/bin/cc  $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -o CMakeFiles/omicron.dir/deps/lodepng/lodepng.c.o   -c "/home/tux/Dev ++/Omicron/deps/lodepng/lodepng.c"
 
 CMakeFiles/omicron.dir/deps/lodepng/lodepng.c.i: cmake_force
@@ -611,7 +635,7 @@ CMakeFiles/omicron.dir/deps/lodepng/lodepng.c.o.provides.build: CMakeFiles/omicr
 
 CMakeFiles/omicron.dir/deps/noise/noise.c.o: CMakeFiles/omicron.dir/flags.make
 CMakeFiles/omicron.dir/deps/noise/noise.c.o: deps/noise/noise.c
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=$(CMAKE_PROGRESS_24) "Building C object CMakeFiles/omicron.dir/deps/noise/noise.c.o"
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=$(CMAKE_PROGRESS_25) "Building C object CMakeFiles/omicron.dir/deps/noise/noise.c.o"
 	/usr/bin/cc  $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -o CMakeFiles/omicron.dir/deps/noise/noise.c.o   -c "/home/tux/Dev ++/Omicron/deps/noise/noise.c"
 
 CMakeFiles/omicron.dir/deps/noise/noise.c.i: cmake_force
@@ -635,7 +659,7 @@ CMakeFiles/omicron.dir/deps/noise/noise.c.o.provides.build: CMakeFiles/omicron.d
 
 CMakeFiles/omicron.dir/deps/sqlite/sqlite3.c.o: CMakeFiles/omicron.dir/flags.make
 CMakeFiles/omicron.dir/deps/sqlite/sqlite3.c.o: deps/sqlite/sqlite3.c
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=$(CMAKE_PROGRESS_25) "Building C object CMakeFiles/omicron.dir/deps/sqlite/sqlite3.c.o"
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=$(CMAKE_PROGRESS_26) "Building C object CMakeFiles/omicron.dir/deps/sqlite/sqlite3.c.o"
 	/usr/bin/cc  $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -o CMakeFiles/omicron.dir/deps/sqlite/sqlite3.c.o   -c "/home/tux/Dev ++/Omicron/deps/sqlite/sqlite3.c"
 
 CMakeFiles/omicron.dir/deps/sqlite/sqlite3.c.i: cmake_force
@@ -659,7 +683,7 @@ CMakeFiles/omicron.dir/deps/sqlite/sqlite3.c.o.provides.build: CMakeFiles/omicro
 
 CMakeFiles/omicron.dir/deps/tinycthread/tinycthread.c.o: CMakeFiles/omicron.dir/flags.make
 CMakeFiles/omicron.dir/deps/tinycthread/tinycthread.c.o: deps/tinycthread/tinycthread.c
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=$(CMAKE_PROGRESS_26) "Building C object CMakeFiles/omicron.dir/deps/tinycthread/tinycthread.c.o"
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=$(CMAKE_PROGRESS_27) "Building C object CMakeFiles/omicron.dir/deps/tinycthread/tinycthread.c.o"
 	/usr/bin/cc  $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -o CMakeFiles/omicron.dir/deps/tinycthread/tinycthread.c.o   -c "/home/tux/Dev ++/Omicron/deps/tinycthread/tinycthread.c"
 
 CMakeFiles/omicron.dir/deps/tinycthread/tinycthread.c.i: cmake_force
@@ -701,6 +725,7 @@ omicron_OBJECTS = \
 "CMakeFiles/omicron.dir/src/worldgen/biome_desert.c.o" \
 "CMakeFiles/omicron.dir/src/worldgen/biome_mesa.c.o" \
 "CMakeFiles/omicron.dir/src/worldgen/biome_rainforest.c.o" \
+"CMakeFiles/omicron.dir/src/worldgen/biome_swamp.c.o" \
 "CMakeFiles/omicron.dir/src/worldgen/biome_taiga.c.o" \
 "CMakeFiles/omicron.dir/src/worldgen/biome_temperate.c.o" \
 "CMakeFiles/omicron.dir/src/worldgen/world.c.o" \
@@ -731,6 +756,7 @@ omicron: CMakeFiles/omicron.dir/src/worldgen/base_terrain.c.o
 omicron: CMakeFiles/omicron.dir/src/worldgen/biome_desert.c.o
 omicron: CMakeFiles/omicron.dir/src/worldgen/biome_mesa.c.o
 omicron: CMakeFiles/omicron.dir/src/worldgen/biome_rainforest.c.o
+omicron: CMakeFiles/omicron.dir/src/worldgen/biome_swamp.c.o
 omicron: CMakeFiles/omicron.dir/src/worldgen/biome_taiga.c.o
 omicron: CMakeFiles/omicron.dir/src/worldgen/biome_temperate.c.o
 omicron: CMakeFiles/omicron.dir/src/worldgen/world.c.o
@@ -762,7 +788,7 @@ omicron: /usr/lib/x86_64-linux-gnu/libXcursor.so
 omicron: /usr/lib/x86_64-linux-gnu/libGL.so
 omicron: /usr/lib/x86_64-linux-gnu/libcurl.so
 omicron: CMakeFiles/omicron.dir/link.txt
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --bold --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=$(CMAKE_PROGRESS_27) "Linking C executable omicron"
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --bold --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=$(CMAKE_PROGRESS_28) "Linking C executable omicron"
 	$(CMAKE_COMMAND) -E cmake_link_script CMakeFiles/omicron.dir/link.txt --verbose=$(VERBOSE)
 
 # Rule to build all files generated by this target.
@@ -788,6 +814,7 @@ CMakeFiles/omicron.dir/requires: CMakeFiles/omicron.dir/src/worldgen/base_terrai
 CMakeFiles/omicron.dir/requires: CMakeFiles/omicron.dir/src/worldgen/biome_desert.c.o.requires
 CMakeFiles/omicron.dir/requires: CMakeFiles/omicron.dir/src/worldgen/biome_mesa.c.o.requires
 CMakeFiles/omicron.dir/requires: CMakeFiles/omicron.dir/src/worldgen/biome_rainforest.c.o.requires
+CMakeFiles/omicron.dir/requires: CMakeFiles/omicron.dir/src/worldgen/biome_swamp.c.o.requires
 CMakeFiles/omicron.dir/requires: CMakeFiles/omicron.dir/src/worldgen/biome_taiga.c.o.requires
 CMakeFiles/omicron.dir/requires: CMakeFiles/omicron.dir/src/worldgen/biome_temperate.c.o.requires
 CMakeFiles/omicron.dir/requires: CMakeFiles/omicron.dir/src/worldgen/world.c.o.requires
diff --git a/CMakeFiles/omicron.dir/cmake_clean.cmake b/CMakeFiles/omicron.dir/cmake_clean.cmake
index 444fb89..eda0bce 100644
--- a/CMakeFiles/omicron.dir/cmake_clean.cmake
+++ b/CMakeFiles/omicron.dir/cmake_clean.cmake
@@ -17,6 +17,7 @@ file(REMOVE_RECURSE
   "CMakeFiles/omicron.dir/src/worldgen/biome_desert.c.o"
   "CMakeFiles/omicron.dir/src/worldgen/biome_mesa.c.o"
   "CMakeFiles/omicron.dir/src/worldgen/biome_rainforest.c.o"
+  "CMakeFiles/omicron.dir/src/worldgen/biome_swamp.c.o"
   "CMakeFiles/omicron.dir/src/worldgen/biome_taiga.c.o"
   "CMakeFiles/omicron.dir/src/worldgen/biome_temperate.c.o"
   "CMakeFiles/omicron.dir/src/worldgen/world.c.o"
diff --git a/CMakeFiles/omicron.dir/depend.internal b/CMakeFiles/omicron.dir/depend.internal
index 7a50e3e..dcb84b7 100644
--- a/CMakeFiles/omicron.dir/depend.internal
+++ b/CMakeFiles/omicron.dir/depend.internal
@@ -254,6 +254,13 @@ CMakeFiles/omicron.dir/src/worldgen/biome_rainforest.c.o
  /home/tux/Dev ++/Omicron/src/worldgen/biome_rainforest.h
  /home/tux/Dev ++/Omicron/src/worldgen/world.h
  deps/noise/noise.h
+CMakeFiles/omicron.dir/src/worldgen/biome_swamp.c.o
+ /home/tux/Dev ++/Omicron/src/config.h
+ /home/tux/Dev ++/Omicron/src/item.h
+ /home/tux/Dev ++/Omicron/src/worldgen/biome_swamp.c
+ /home/tux/Dev ++/Omicron/src/worldgen/biome_swamp.h
+ /home/tux/Dev ++/Omicron/src/worldgen/world.h
+ deps/noise/noise.h
 CMakeFiles/omicron.dir/src/worldgen/biome_taiga.c.o
  /home/tux/Dev ++/Omicron/src/config.h
  /home/tux/Dev ++/Omicron/src/item.h
@@ -276,6 +283,7 @@ CMakeFiles/omicron.dir/src/worldgen/world.c.o
  /home/tux/Dev ++/Omicron/src/worldgen/biome_desert.h
  /home/tux/Dev ++/Omicron/src/worldgen/biome_mesa.h
  /home/tux/Dev ++/Omicron/src/worldgen/biome_rainforest.h
+ /home/tux/Dev ++/Omicron/src/worldgen/biome_swamp.h
  /home/tux/Dev ++/Omicron/src/worldgen/biome_taiga.h
  /home/tux/Dev ++/Omicron/src/worldgen/biome_temperate.h
  /home/tux/Dev ++/Omicron/src/worldgen/world.c
diff --git a/CMakeFiles/omicron.dir/depend.make b/CMakeFiles/omicron.dir/depend.make
index b21530a..f406aa1 100644
--- a/CMakeFiles/omicron.dir/depend.make
+++ b/CMakeFiles/omicron.dir/depend.make
@@ -254,6 +254,13 @@ CMakeFiles/omicron.dir/src/worldgen/biome_rainforest.c.o: src/worldgen/biome_rai
 CMakeFiles/omicron.dir/src/worldgen/biome_rainforest.c.o: src/worldgen/world.h
 CMakeFiles/omicron.dir/src/worldgen/biome_rainforest.c.o: deps/noise/noise.h
 
+CMakeFiles/omicron.dir/src/worldgen/biome_swamp.c.o: src/config.h
+CMakeFiles/omicron.dir/src/worldgen/biome_swamp.c.o: src/item.h
+CMakeFiles/omicron.dir/src/worldgen/biome_swamp.c.o: src/worldgen/biome_swamp.c
+CMakeFiles/omicron.dir/src/worldgen/biome_swamp.c.o: src/worldgen/biome_swamp.h
+CMakeFiles/omicron.dir/src/worldgen/biome_swamp.c.o: src/worldgen/world.h
+CMakeFiles/omicron.dir/src/worldgen/biome_swamp.c.o: deps/noise/noise.h
+
 CMakeFiles/omicron.dir/src/worldgen/biome_taiga.c.o: src/config.h
 CMakeFiles/omicron.dir/src/worldgen/biome_taiga.c.o: src/item.h
 CMakeFiles/omicron.dir/src/worldgen/biome_taiga.c.o: src/worldgen/biome_taiga.c
@@ -275,6 +282,7 @@ CMakeFiles/omicron.dir/src/worldgen/world.c.o: src/worldgen/base_terrain.h
 CMakeFiles/omicron.dir/src/worldgen/world.c.o: src/worldgen/biome_desert.h
 CMakeFiles/omicron.dir/src/worldgen/world.c.o: src/worldgen/biome_mesa.h
 CMakeFiles/omicron.dir/src/worldgen/world.c.o: src/worldgen/biome_rainforest.h
+CMakeFiles/omicron.dir/src/worldgen/world.c.o: src/worldgen/biome_swamp.h
 CMakeFiles/omicron.dir/src/worldgen/world.c.o: src/worldgen/biome_taiga.h
 CMakeFiles/omicron.dir/src/worldgen/world.c.o: src/worldgen/biome_temperate.h
 CMakeFiles/omicron.dir/src/worldgen/world.c.o: src/worldgen/world.c
diff --git a/CMakeFiles/omicron.dir/link.txt b/CMakeFiles/omicron.dir/link.txt
index 811aedc..35624ec 100644
--- a/CMakeFiles/omicron.dir/link.txt
+++ b/CMakeFiles/omicron.dir/link.txt
@@ -1 +1 @@
-/usr/bin/cc     CMakeFiles/omicron.dir/src/auth.c.o CMakeFiles/omicron.dir/src/client.c.o CMakeFiles/omicron.dir/src/cube.c.o CMakeFiles/omicron.dir/src/db.c.o CMakeFiles/omicron.dir/src/inventory.c.o CMakeFiles/omicron.dir/src/item.c.o CMakeFiles/omicron.dir/src/main.c.o CMakeFiles/omicron.dir/src/map.c.o CMakeFiles/omicron.dir/src/matrix.c.o CMakeFiles/omicron.dir/src/parser.c.o CMakeFiles/omicron.dir/src/rendering.c.o CMakeFiles/omicron.dir/src/ring.c.o CMakeFiles/omicron.dir/src/sign.c.o CMakeFiles/omicron.dir/src/util.c.o CMakeFiles/omicron.dir/src/worldgen/base_terrain.c.o CMakeFiles/omicron.dir/src/worldgen/biome_desert.c.o CMakeFiles/omicron.dir/src/worldgen/biome_mesa.c.o CMakeFiles/omicron.dir/src/worldgen/biome_rainforest.c.o CMakeFiles/omicron.dir/src/worldgen/biome_taiga.c.o CMakeFiles/omicron.dir/src/worldgen/biome_temperate.c.o CMakeFiles/omicron.dir/src/worldgen/world.c.o CMakeFiles/omicron.dir/deps/glew/src/glew.c.o CMakeFiles/omicron.dir/deps/lodepng/lodepng.c.o CMakeFiles/omicron.dir/deps/noise/noise.c.o CMakeFiles/omicron.dir/deps/sqlite/sqlite3.c.o CMakeFiles/omicron.dir/deps/tinycthread/tinycthread.c.o  -o omicron -rdynamic -ldl deps/glfw/src/libglfw3.a -lrt -lm -lX11 -lpthread -lXrandr -lXinerama -lXi -lXxf86vm -lXcursor -lGL -ldl -lcurl -lrt -lm -lX11 -lpthread -lXrandr -lXinerama -lXi -lXxf86vm -lXcursor -lGL -lcurl 
+/usr/bin/cc     CMakeFiles/omicron.dir/src/auth.c.o CMakeFiles/omicron.dir/src/client.c.o CMakeFiles/omicron.dir/src/cube.c.o CMakeFiles/omicron.dir/src/db.c.o CMakeFiles/omicron.dir/src/inventory.c.o CMakeFiles/omicron.dir/src/item.c.o CMakeFiles/omicron.dir/src/main.c.o CMakeFiles/omicron.dir/src/map.c.o CMakeFiles/omicron.dir/src/matrix.c.o CMakeFiles/omicron.dir/src/parser.c.o CMakeFiles/omicron.dir/src/rendering.c.o CMakeFiles/omicron.dir/src/ring.c.o CMakeFiles/omicron.dir/src/sign.c.o CMakeFiles/omicron.dir/src/util.c.o CMakeFiles/omicron.dir/src/worldgen/base_terrain.c.o CMakeFiles/omicron.dir/src/worldgen/biome_desert.c.o CMakeFiles/omicron.dir/src/worldgen/biome_mesa.c.o CMakeFiles/omicron.dir/src/worldgen/biome_rainforest.c.o CMakeFiles/omicron.dir/src/worldgen/biome_swamp.c.o CMakeFiles/omicron.dir/src/worldgen/biome_taiga.c.o CMakeFiles/omicron.dir/src/worldgen/biome_temperate.c.o CMakeFiles/omicron.dir/src/worldgen/world.c.o CMakeFiles/omicron.dir/deps/glew/src/glew.c.o CMakeFiles/omicron.dir/deps/lodepng/lodepng.c.o CMakeFiles/omicron.dir/deps/noise/noise.c.o CMakeFiles/omicron.dir/deps/sqlite/sqlite3.c.o CMakeFiles/omicron.dir/deps/tinycthread/tinycthread.c.o  -o omicron -rdynamic -ldl deps/glfw/src/libglfw3.a -lrt -lm -lX11 -lpthread -lXrandr -lXinerama -lXi -lXxf86vm -lXcursor -lGL -ldl -lcurl -lrt -lm -lX11 -lpthread -lXrandr -lXinerama -lXi -lXxf86vm -lXcursor -lGL -lcurl 
diff --git a/CMakeFiles/omicron.dir/progress.make b/CMakeFiles/omicron.dir/progress.make
index 87c3cbc..f2113ab 100644
--- a/CMakeFiles/omicron.dir/progress.make
+++ b/CMakeFiles/omicron.dir/progress.make
@@ -1,28 +1,29 @@
-CMAKE_PROGRESS_1 = 50
-CMAKE_PROGRESS_2 = 51
-CMAKE_PROGRESS_3 = 52
-CMAKE_PROGRESS_4 = 53
-CMAKE_PROGRESS_5 = 54
-CMAKE_PROGRESS_6 = 55
-CMAKE_PROGRESS_7 = 56
-CMAKE_PROGRESS_8 = 57
-CMAKE_PROGRESS_9 = 58
-CMAKE_PROGRESS_10 = 59
-CMAKE_PROGRESS_11 = 60
-CMAKE_PROGRESS_12 = 61
-CMAKE_PROGRESS_13 = 62
-CMAKE_PROGRESS_14 = 63
-CMAKE_PROGRESS_15 = 64
-CMAKE_PROGRESS_16 = 65
-CMAKE_PROGRESS_17 = 66
-CMAKE_PROGRESS_18 = 67
-CMAKE_PROGRESS_19 = 68
-CMAKE_PROGRESS_20 = 69
-CMAKE_PROGRESS_21 = 70
-CMAKE_PROGRESS_22 = 71
-CMAKE_PROGRESS_23 = 72
-CMAKE_PROGRESS_24 = 73
-CMAKE_PROGRESS_25 = 74
-CMAKE_PROGRESS_26 = 75
-CMAKE_PROGRESS_27 = 76
+CMAKE_PROGRESS_1 = 49
+CMAKE_PROGRESS_2 = 50
+CMAKE_PROGRESS_3 = 51
+CMAKE_PROGRESS_4 = 52
+CMAKE_PROGRESS_5 = 53
+CMAKE_PROGRESS_6 = 54
+CMAKE_PROGRESS_7 = 55
+CMAKE_PROGRESS_8 = 56
+CMAKE_PROGRESS_9 = 57
+CMAKE_PROGRESS_10 = 58
+CMAKE_PROGRESS_11 = 59
+CMAKE_PROGRESS_12 = 60
+CMAKE_PROGRESS_13 = 61
+CMAKE_PROGRESS_14 = 62
+CMAKE_PROGRESS_15 = 63
+CMAKE_PROGRESS_16 = 64
+CMAKE_PROGRESS_17 = 65
+CMAKE_PROGRESS_18 = 66
+CMAKE_PROGRESS_19 = 67
+CMAKE_PROGRESS_20 = 68
+CMAKE_PROGRESS_21 = 69
+CMAKE_PROGRESS_22 = 70
+CMAKE_PROGRESS_23 = 71
+CMAKE_PROGRESS_24 = 72
+CMAKE_PROGRESS_25 = 73
+CMAKE_PROGRESS_26 = 74
+CMAKE_PROGRESS_27 = 75
+CMAKE_PROGRESS_28 = 76
 
diff --git a/CMakeFiles/omicron.dir/src/cube.c.o b/CMakeFiles/omicron.dir/src/cube.c.o
index 6c2f8d8..b23033e 100644
Binary files a/CMakeFiles/omicron.dir/src/cube.c.o and b/CMakeFiles/omicron.dir/src/cube.c.o differ
diff --git a/CMakeFiles/omicron.dir/src/inventory.c.o b/CMakeFiles/omicron.dir/src/inventory.c.o
index f82e870..0763b3b 100644
Binary files a/CMakeFiles/omicron.dir/src/inventory.c.o and b/CMakeFiles/omicron.dir/src/inventory.c.o differ
diff --git a/CMakeFiles/omicron.dir/src/item.c.o b/CMakeFiles/omicron.dir/src/item.c.o
index ac9dc8b..8beb562 100644
Binary files a/CMakeFiles/omicron.dir/src/item.c.o and b/CMakeFiles/omicron.dir/src/item.c.o differ
diff --git a/CMakeFiles/omicron.dir/src/main.c.o b/CMakeFiles/omicron.dir/src/main.c.o
index c16b606..8a12d0f 100644
Binary files a/CMakeFiles/omicron.dir/src/main.c.o and b/CMakeFiles/omicron.dir/src/main.c.o differ
diff --git a/CMakeFiles/omicron.dir/src/parser.c.o b/CMakeFiles/omicron.dir/src/parser.c.o
index 8e310ad..988e1bd 100644
Binary files a/CMakeFiles/omicron.dir/src/parser.c.o and b/CMakeFiles/omicron.dir/src/parser.c.o differ
diff --git a/CMakeFiles/omicron.dir/src/worldgen/biome_desert.c.o b/CMakeFiles/omicron.dir/src/worldgen/biome_desert.c.o
index cb482fb..093b778 100644
Binary files a/CMakeFiles/omicron.dir/src/worldgen/biome_desert.c.o and b/CMakeFiles/omicron.dir/src/worldgen/biome_desert.c.o differ
diff --git a/CMakeFiles/omicron.dir/src/worldgen/biome_mesa.c.o b/CMakeFiles/omicron.dir/src/worldgen/biome_mesa.c.o
index 7610404..261febe 100644
Binary files a/CMakeFiles/omicron.dir/src/worldgen/biome_mesa.c.o and b/CMakeFiles/omicron.dir/src/worldgen/biome_mesa.c.o differ
diff --git a/CMakeFiles/omicron.dir/src/worldgen/biome_rainforest.c.o b/CMakeFiles/omicron.dir/src/worldgen/biome_rainforest.c.o
index 1e6aa28..0307544 100644
Binary files a/CMakeFiles/omicron.dir/src/worldgen/biome_rainforest.c.o and b/CMakeFiles/omicron.dir/src/worldgen/biome_rainforest.c.o differ
diff --git a/CMakeFiles/omicron.dir/src/worldgen/biome_taiga.c.o b/CMakeFiles/omicron.dir/src/worldgen/biome_taiga.c.o
index 50a11dc..6600df9 100644
Binary files a/CMakeFiles/omicron.dir/src/worldgen/biome_taiga.c.o and b/CMakeFiles/omicron.dir/src/worldgen/biome_taiga.c.o differ
diff --git a/CMakeFiles/omicron.dir/src/worldgen/biome_temperate.c.o b/CMakeFiles/omicron.dir/src/worldgen/biome_temperate.c.o
index 8f52fee..397e204 100644
Binary files a/CMakeFiles/omicron.dir/src/worldgen/biome_temperate.c.o and b/CMakeFiles/omicron.dir/src/worldgen/biome_temperate.c.o differ
diff --git a/CMakeFiles/omicron.dir/src/worldgen/world.c.o b/CMakeFiles/omicron.dir/src/worldgen/world.c.o
index 47c3c6b..d0ca46e 100644
Binary files a/CMakeFiles/omicron.dir/src/worldgen/world.c.o and b/CMakeFiles/omicron.dir/src/worldgen/world.c.o differ
diff --git a/Makefile b/Makefile
index 818f32e..2d37697 100644
--- a/Makefile
+++ b/Makefile
@@ -1102,6 +1102,33 @@ src/worldgen/biome_rainforest.c.s:
 	$(MAKE) -f CMakeFiles/omicron.dir/build.make CMakeFiles/omicron.dir/src/worldgen/biome_rainforest.c.s
 .PHONY : src/worldgen/biome_rainforest.c.s
 
+src/worldgen/biome_swamp.o: src/worldgen/biome_swamp.c.o
+
+.PHONY : src/worldgen/biome_swamp.o
+
+# target to build an object file
+src/worldgen/biome_swamp.c.o:
+	$(MAKE) -f CMakeFiles/omicron.dir/build.make CMakeFiles/omicron.dir/src/worldgen/biome_swamp.c.o
+.PHONY : src/worldgen/biome_swamp.c.o
+
+src/worldgen/biome_swamp.i: src/worldgen/biome_swamp.c.i
+
+.PHONY : src/worldgen/biome_swamp.i
+
+# target to preprocess a source file
+src/worldgen/biome_swamp.c.i:
+	$(MAKE) -f CMakeFiles/omicron.dir/build.make CMakeFiles/omicron.dir/src/worldgen/biome_swamp.c.i
+.PHONY : src/worldgen/biome_swamp.c.i
+
+src/worldgen/biome_swamp.s: src/worldgen/biome_swamp.c.s
+
+.PHONY : src/worldgen/biome_swamp.s
+
+# target to generate assembly for a file
+src/worldgen/biome_swamp.c.s:
+	$(MAKE) -f CMakeFiles/omicron.dir/build.make CMakeFiles/omicron.dir/src/worldgen/biome_swamp.c.s
+.PHONY : src/worldgen/biome_swamp.c.s
+
 src/worldgen/biome_taiga.o: src/worldgen/biome_taiga.c.o
 
 .PHONY : src/worldgen/biome_taiga.o
@@ -1289,6 +1316,9 @@ help:
 	@echo "... src/worldgen/biome_rainforest.o"
 	@echo "... src/worldgen/biome_rainforest.i"
 	@echo "... src/worldgen/biome_rainforest.s"
+	@echo "... src/worldgen/biome_swamp.o"
+	@echo "... src/worldgen/biome_swamp.i"
+	@echo "... src/worldgen/biome_swamp.s"
 	@echo "... src/worldgen/biome_taiga.o"
 	@echo "... src/worldgen/biome_taiga.i"
 	@echo "... src/worldgen/biome_taiga.s"
diff --git a/logo.png b/logo.png
deleted file mode 100644
index e3aec54..0000000
Binary files a/logo.png and /dev/null differ
diff --git a/omicron b/omicron
index adbb4eb..b333643 100644
Binary files a/omicron and b/omicron differ
diff --git a/src/item.c b/src/item.c
index 7f32369..2241e08 100644
--- a/src/item.c
+++ b/src/item.c
@@ -4,12 +4,16 @@
 const int items[] = {
     // items the user can build
     Item_GRASS,
+    Item_SWAMP_GRASS,
     Item_SAND,
+    Item_SANDSTONE,
+    Item_SANDSTONE_BRICKS,
     Item_STONEBRICK,
     Item_SLAB_LOWER_STONEBRICK,
     Item_BRICK,
     Item_WOOD,
     Item_STONE,
+    Item_STONE_BRICKS,
     Item_DIRT,
     Item_PLANK,
     Item_SNOW,
@@ -20,6 +24,7 @@ const int items[] = {
     Item_CHEST,
     Item_TNT,
     Item_LEAVES,
+    Item_CLAY,
     //Item_CLOUD,
     //Item_CORESHELL,
     Item_WATER,
@@ -37,6 +42,7 @@ const int items[] = {
     
     //Flowers
     Item_TALL_GRASS,
+    Item_SWAMP_TALL_GRASS,
     Item_YELLOW_FLOWER,
     Item_RED_FLOWER,
     Item_PURPLE_FLOWER,
@@ -45,6 +51,9 @@ const int items[] = {
     Item_BLUE_FLOWER,
     Item_VINE,
     Item_CACTI,
+    Item_FERN,
+    Item_MUSHROOM,
+    Item_MUSHROOMS,
     
     //Colors
     Item_COLOR_00,
@@ -96,7 +105,7 @@ const int blocks[256][6] = {
     {7, 7, 7, 7, 7, 7}, // 8 - plank
     {24, 24, 40, 8, 24, 24}, // 9 - snow
     {9, 9, 9, 9, 9, 9}, // 10 - glass
-    {10, 10, 10, 10, 10, 10}, // 11 - cobble
+    {21, 21, 21, 21, 21, 21}, // 11 - cobble
     {11, 11, 11, 11, 11, 11}, // 12 - light stone
     {12, 12, 12, 12, 12, 12}, // 13 - dark stone
     {13, 13, 13, 13, 13, 13}, // 14 - chest
@@ -173,6 +182,15 @@ const int blocks[256][6] = {
     {83, 83, 83, 83, 83, 83}, // 78 - rubis block 
     {213, 213, 213, 213, 213, 213}, // 79 - ice 
     {214, 214, 215, 216, 214, 214}, // 80 - TNT 
+    {17, 17, 17, 17, 17, 17}, // 81 - sandstone 
+    {33, 33, 33, 33, 33, 33}, // 82 - sandstone bricks
+    {10, 10, 10, 10, 10, 10}, // 83 - stone bricks
+    {34, 34, 34, 34, 34, 34}, // 85 - clay
+    {0, 0, 0, 0, 0, 0}, // 86
+    {0, 0, 0, 0, 0, 0}, // 87
+    {0, 0, 0, 0, 0, 0}, // 88
+    {19, 19, 35, 0, 19, 19}, // 89 - swamp dirt
+    {0, 0, 0, 0, 0, 0}, // 90
     {0, 0, 0, 0, 0, 0} // - empty
 };
 
@@ -194,7 +212,17 @@ const int plants[256] = {
     0, 0, // 24 - 65
     
     55, // 66 - vine
-    56 // 67 - cacti
+    56, // 67 - cacti
+    
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, // 68 - 85
+    
+    57, // 86 - fern
+    58, // 87 - mushroom
+    59, // 88 - mushroom patch
+    0,
+	60 // 90 - swamp tall grass
+    
 };
 
 int is_plant(int w) {
@@ -208,6 +236,10 @@ int is_plant(int w) {
         case Item_BLUE_FLOWER:
         case Item_VINE:
         case Item_CACTI:
+        case Item_FERN:
+        case Item_MUSHROOM:
+        case Item_MUSHROOMS:
+        case Item_SWAMP_TALL_GRASS:
             return 1;
         default:
             return 0;
@@ -254,6 +286,17 @@ int is_transparent(int w) {
     }
 }
 
+int is_invisible(int w) {
+    if (w == Item_EMPTY) {
+        return 1;
+    }
+    w = ABS(w);
+    switch (w) {
+		default:
+            return 0;
+    }
+}
+
 int is_destructable(int w) {
     switch (w) {
         case Item_EMPTY:
diff --git a/src/item.h b/src/item.h
index b4e6b35..3a0a459 100644
--- a/src/item.h
+++ b/src/item.h
@@ -75,6 +75,15 @@ typedef enum {
 	Item_RUBIS_BLOCK,
 	Item_ICE,
 	Item_TNT,
+	Item_SANDSTONE,
+	Item_SANDSTONE_BRICKS,
+	Item_STONE_BRICKS,
+	Item_CLAY,
+	Item_FERN,
+	Item_MUSHROOM,
+	Item_MUSHROOMS,
+	Item_SWAMP_GRASS,
+	Item_SWAMP_TALL_GRASS,
     Item_max
 } Item;
 
@@ -91,12 +100,13 @@ extern const int plants[256];
 int is_plant(int w);
 int is_obstacle(int w);
 int is_transparent(int w);
+int is_invisible(int w);
 int is_destructable(int w);
 int boom_on_click(int w);
 int is_climbable(int w);
 int is_noncube(int w);
-int is_liquid (int w);
-int buildable_to (int w);
+int is_liquid(int w);
+int buildable_to(int w);
 
 NonCubeType noncube_type(int w);
 
diff --git a/src/main.c b/src/main.c
index b61b366..229bf38 100644
--- a/src/main.c
+++ b/src/main.c
@@ -824,6 +824,7 @@ int umap_get_block(Map *map, int x, int y, int z) { //optimized function for use
 void compute_chunk(WorkerItem *item) {
     char *opaque = (char *)calloc(XZ_SIZE * XZ_SIZE * Y_SIZE, sizeof(char));
     char *visible = (char *)calloc(XZ_SIZE * XZ_SIZE * Y_SIZE, sizeof(char));
+    char *transparent = (char *)calloc(XZ_SIZE * XZ_SIZE * Y_SIZE, sizeof(char));
     char *light = (char *)calloc(XZ_SIZE * XZ_SIZE * Y_SIZE, sizeof(char));
     char *highest = (char *)calloc(XZ_SIZE * XZ_SIZE, sizeof(char));
 
@@ -866,7 +867,8 @@ void compute_chunk(WorkerItem *item) {
                 }
                 // END TODO
 				opaque[XYZ(x, y, z)] = !is_transparent(w);
-				visible[XYZ(x, y, z)] = is_liquid(w);
+				transparent[XYZ(x, y, z)] = is_transparent(w); // dupe needed
+				visible[XYZ(x, y, z)] = !is_invisible(w); //needs modification to avoid border bugs...
                 
                 if (opaque[XYZ(x, y, z)]) {
                     highest[XZ(x, z)] = MAX(highest[XZ(x, z)], y);
@@ -916,14 +918,21 @@ void compute_chunk(WorkerItem *item) {
 		int f5 = !opaque[XYZ(x, y, z - 1)];
 		int f6 = !opaque[XYZ(x, y, z + 1)];
 		
-		int v1 = !visible[XYZ(x - 1, y, z)];
-		int v2 = !visible[XYZ(x + 1, y, z)];
-		int v3 = !visible[XYZ(x, y + 1, z)];
-		int v4 = !visible[XYZ(x, y - 1, z)] && (ey > 0);
-		int v5 = !visible[XYZ(x, y, z - 1)];
-		int v6 = !visible[XYZ(x, y, z + 1)];
+		int v1 = !transparent[XYZ(x - 1, y, z)];
+		int v2 = !transparent[XYZ(x + 1, y, z)];
+		int v3 = !transparent[XYZ(x, y + 1, z)];
+		int v4 = !transparent[XYZ(x, y - 1, z)] && (ey > 0);
+		int v5 = !transparent[XYZ(x, y, z - 1)];
+		int v6 = !transparent[XYZ(x, y, z + 1)];
+		
+		int i1 = visible[XYZ(x - 1, y, z)];
+		int i2 = visible[XYZ(x + 1, y, z)];
+		int i3 = visible[XYZ(x, y + 1, z)];
+		int i4 = visible[XYZ(x, y - 1, z)] && (ey > 0);
+		int i5 = visible[XYZ(x, y, z - 1)];
+		int i6 = visible[XYZ(x, y, z + 1)];
         
-        if (is_liquid(ew)) {
+        if (is_transparent(ew) && !is_invisible(ew)) {
 			if (v1 == 0) {
 				f1 = 0;
 			}
@@ -943,7 +952,29 @@ void compute_chunk(WorkerItem *item) {
 			}
 			if (v6 == 0) {
 				f6 = 0;
-			}			
+			}		
+			
+			//air check
+			if (i1 == 0) {
+				f1 = 1;
+			}
+			if (i2 == 0) {
+				f2 = 1;
+			}
+			
+			if (i3 == 0) {
+				f3 = 1;
+			}
+			if (i4 == 0) {
+				f4 = 1;
+			}
+					
+			if (i5 == 0) {
+				f5 = 1;
+			}
+			if (i6 == 0) {
+				f6 = 1;
+			}		
 		}	
         
         int total = f1 + f2 + f3 + f4 + f5 + f6;
@@ -976,14 +1007,21 @@ void compute_chunk(WorkerItem *item) {
         int f5 = !opaque[XYZ(x, y, z - 1)];
         int f6 = !opaque[XYZ(x, y, z + 1)];
         
-		int v1 = !visible[XYZ(x - 1, y, z)];
-		int v2 = !visible[XYZ(x + 1, y, z)];
-		int v3 = !visible[XYZ(x, y + 1, z)];
-		int v4 = !visible[XYZ(x, y - 1, z)] && (ey > 0);
-		int v5 = !visible[XYZ(x, y, z - 1)];
-		int v6 = !visible[XYZ(x, y, z + 1)];
+		int v1 = !transparent[XYZ(x - 1, y, z)];
+		int v2 = !transparent[XYZ(x + 1, y, z)];
+		int v3 = !transparent[XYZ(x, y + 1, z)];
+		int v4 = !transparent[XYZ(x, y - 1, z)] && (ey > 0);
+		int v5 = !transparent[XYZ(x, y, z - 1)];
+		int v6 = !transparent[XYZ(x, y, z + 1)];
 		
-		if (is_liquid(ew)) {
+		int i1 = visible[XYZ(x - 1, y, z)];
+		int i2 = visible[XYZ(x + 1, y, z)];
+		int i3 = visible[XYZ(x, y + 1, z)];
+		int i4 = visible[XYZ(x, y - 1, z)] && (ey > 0);
+		int i5 = visible[XYZ(x, y, z - 1)];
+		int i6 = visible[XYZ(x, y, z + 1)];
+        
+        if (is_transparent(ew) && !is_invisible(ew)) {
 			if (v1 == 0) {
 				f1 = 0;
 			}
@@ -1003,8 +1041,30 @@ void compute_chunk(WorkerItem *item) {
 			}
 			if (v6 == 0) {
 				f6 = 0;
-			}			
-		}	
+			}	
+			
+			//air check
+			if (i1 == 0) {
+				f1 = 1;
+			}
+			if (i2 == 0) {
+				f2 = 1;
+			}
+			
+			if (i3 == 0) {
+				f3 = 1;
+			}
+			if (i4 == 0) {
+				f4 = 1;
+			}
+					
+			if (i5 == 0) {
+				f5 = 1;
+			}
+			if (i6 == 0) {
+				f6 = 1;
+			}		
+		}			
 			
 		int total = f1 + f2 + f3 + f4 + f5 + f6;
 		
@@ -1070,6 +1130,7 @@ void compute_chunk(WorkerItem *item) {
 
     free(opaque);
     free(visible);
+    free(transparent);
     free(light);
     free(highest);
 
@@ -2551,18 +2612,22 @@ void handle_movement(double dt) {
             } else if (is_liquid(w)) { 
                 				
 				if (is_jump_pressed) {
-                    dy = 2.5f;
+                    dy = 8.0f;
                     //dy = 0;
                 
                 } else if (is_descend_pressed) {
+                    dy = -1.2f;
+                    //dy = 0;
+                        
+                } else {
                     dy = -0.5f;
                     //dy = 0;
                         
-                } 
+                }
                 
-				vx = vx/1.2;
+				vx = vx*0.65;
 				//vy = vy/1.6;
-				vz = vz/1.2;
+				vz = vz*0.65;
                 
             }
             else {
@@ -2743,7 +2808,7 @@ int main(int argc, char **argv) {
     char world;
     
     // Header generated using -> https://fsymbols.com/generators/tarty/
-    printf("\n▒█▀▀▀█ ▒█▀▄▀█ ▀█▀ ▒█▀▀█ ▒█▀▀█ ▒█▀▀▀█ ▒█▄░▒█ \n▒█░░▒█ ▒█▒█▒█ ▒█░ ▒█░░░ ▒█▄▄▀ ▒█░░▒█ ▒█▒█▒█ \n▒█▄▄▄█ ▒█░░▒█ ▄█▄ ▒█▄▄█ ▒█░▒█ ▒█▄▄▄█ ▒█░░▀█ \n		   a game by azekill_DIABLO\n\n");
+    printf("\n▒█▀▀▀█ ▒█▀▄▀█ ▀█▀ ▒█▀▀█ ▒█▀▀█ ▒█▀▀▀█ ▒█▄░▒█ \n▒█░░▒█ ▒█▒█▒█ ▒█░ ▒█░░░ ▒█▄▄▀ ▒█░░▒█ ▒█▒█▒█ \n▒█▄▄▄█ ▒█░░▒█ ▄█▄ ▒█▄▄█ ▒█░▒█ ▒█▄▄▄█ ▒█░░▀█ \n	       a game not by azekill_DIABLO\n\n");
     
     /*
     printf("> Available World list:");
@@ -3071,6 +3136,7 @@ int main(int argc, char **argv) {
             float ty = g->height - ts;
             if (SHOW_ITEM) {
                 render_item(&block_attrib);
+                render_item(&tblock_attrib);
                 render_item_count(&text_attrib, ts);
             }
 
diff --git a/src/worldgen/biome_desert.c b/src/worldgen/biome_desert.c
index 46f5877..3b12494 100644
--- a/src/worldgen/biome_desert.c
+++ b/src/worldgen/biome_desert.c
@@ -4,11 +4,14 @@
 #include "../item.h"
 
 void generateDesert(int dx, int dz, int x, int z, int start_h, int h, int flag, world_func func, void *arg) {  
-	for (int y = start_h; y < h; y++) {
-		func(x, y, z, 2 * flag, arg);
+	for (int y = start_h; y < h - 1; y++) {
+		func(x, y, z, Item_SANDSTONE * flag, arg);
 	}
-	
-	if (simplex2(x * 0.00091, z * 0.00091, 6, 1, 2) < 0.5) {
+	for (int y = 0; y < 5; y++) {
+		func(x, h-y-1, z, Item_SAND * flag, arg);
+	}
+     
+    if (h > 45) {
 
 		// flower
 		if (simplex2(-x * 0.1, z * 0.1, 4, 0.8, 2) > 0.8) {
@@ -16,7 +19,7 @@ void generateDesert(int dx, int dz, int x, int z, int start_h, int h, int flag,
 		}
 
 		// cacti
-		if (simplex2(-x * 0.1, z * 0.1, 3, 0.9, 2) > 0.85) {
+		if (simplex2(-x * 0.1, z * 0.1, 3, 0.9, 2) > 0.8) {
 			func(x, h, z, 67 * flag, arg); 
 		}
 
@@ -55,5 +58,14 @@ void generateDesert(int dx, int dz, int x, int z, int start_h, int h, int flag,
 				func(x, h + height - 3 + oz, z - 2, Item_CACTUS, arg);
 			}
 		}
+		int px = 42;
+		int pz = 42;
+		/*Pyramid prototype
+		for (int p = 50; p = 0; p--) {
+			for (int p2 = 50; p2 = 0; p2--) {
+				func(dx + p + p2, 82, dz + p2, Item_SANDSTONE_BRICKS * flag, arg);
+			}
+		}*/
+		//func(dx + p + p2, 82, dz + p2, Item_SANDSTONE_BRICKS * flag, arg);
 	}
 }
diff --git a/src/worldgen/biome_mesa.c b/src/worldgen/biome_mesa.c
index 4482d10..79d0a30 100644
--- a/src/worldgen/biome_mesa.c
+++ b/src/worldgen/biome_mesa.c
@@ -33,7 +33,7 @@ void generateMesa(int dx, int dz, int x, int z, int start_h, int h, int flag, wo
 			
 			// I don't even know why it does this but it looks sick
 			if (simplex2(x * 0.005, -z * 0.005, 4, 0.8, 2) > 0.7) {
-				if (h = 67) {
+				if (h == 67) {
 					func(x, h, z, Item_DIRT * flag, arg);
 				}
 			}
diff --git a/src/worldgen/biome_rainforest.c b/src/worldgen/biome_rainforest.c
index 002b4f9..9317231 100644
--- a/src/worldgen/biome_rainforest.c
+++ b/src/worldgen/biome_rainforest.c
@@ -5,11 +5,19 @@
 
 void generateRainforest(int dx, int dz, int x, int z, int start_h, int h, int flag, world_func func, void *arg) {
     for (int y = start_h; y < h - 1; y++) {
-        func(x, y, z, Item_DIRT * flag, arg);
-    }
-    func(x, h - 1, z, Item_GRASS * flag, arg);
+		func(x, y, z, Item_STONE * flag, arg);
+	}
+	for (int y = 0; y < 5; y++) {
+		func(x, h-y-1, z, Item_SAND * flag, arg);
+	}
+     
+    if (h > 46) {
+    
+		for (int y = start_h; y < h - 1; y++) {
+			func(x, y, z, Item_DIRT * flag, arg);
+		}
+		func(x, h - 1, z, Item_GRASS * flag, arg);
     
-    if (simplex2(x * 0.00091, z * 0.00091, 6, 1, 2) < 0.5) {
 
 		// grass
 		if (simplex2(-x * 0.1, z * 0.1, 4, 0.8, 2) > 0.5) {
diff --git a/src/worldgen/biome_swamp.c b/src/worldgen/biome_swamp.c
new file mode 100644
index 0000000..d06028b
--- /dev/null
+++ b/src/worldgen/biome_swamp.c
@@ -0,0 +1,73 @@
+#include "biome_swamp.h"
+#include "noise.h"
+#include "../config.h"
+#include "../item.h"
+
+void generateSwamp(int dx, int dz, int x, int z, int start_h, int h, int flag, world_func func, void *arg) {
+    for (int y = start_h; y < h - 1; y++) {
+		func(x, y, z, Item_STONE * flag, arg);
+	}
+	for (int y = 0; y < 5; y++) {
+		func(x, h-y-1, z, Item_DIRT * flag, arg);
+	}
+     
+    if (h > 44) {
+		for (int y = start_h; y < h - 1; y++) {	
+			func(x, y, z, Item_DIRT * flag, arg);
+		}
+		func(x, h - 1, z, Item_SWAMP_GRASS * flag, arg); 
+
+		// grass
+		if (simplex2(-x * 0.1, z * 0.1, 4, 0.8, 2) > 0.5) {
+			if (h > 38) {
+				func(x, h, z, Item_SWAMP_TALL_GRASS * flag, arg);
+			}
+		}
+
+		// cobble
+		if (simplex2(-x * 0.02, z * 0.02, 1, 1, 1) * (simplex2(-x * 0.1, z * 0.1, 1, 0.8, 2)) > 0.64) {
+			func(x, h-1, z, Item_COBBLE * flag, arg);
+			func(x, h, z, Item_COBBLE * flag, arg);
+		}
+
+		// forests
+		if (simplex2(-x * 0.01, z * 0.01, 6, 0.9, 2) > 0.59) {
+			// mushrooms
+			if (simplex2(-x * 0.08, z * 0.08, 6, 0.7, 2) > 0.69) {
+				func(x, h, z, Item_MUSHROOMS * flag, arg);
+			}
+			if (simplex2(-x * 0.1, z * 0.1, 5, 0.8, 2) > 0.66) {
+				func(x, h, z, Item_MUSHROOM * flag, arg);
+			}
+			// trees
+			if (h > 38) {
+				int ok = 1;
+				if (dx - 4 < 0 || dz - 4 < 0 ||
+					dx + 4 >= CHUNK_SIZE || dz + 4 >= CHUNK_SIZE)
+				{
+					ok = 0;
+				}
+
+				if (ok && simplex2(x, z, 6, 0.5, 2) > 0.71) {
+					for (int y = h + 3; y < h + 8; y++) {
+						for (int ox = -3; ox <= 3; ox++) {
+							for (int oz = -3; oz <= 3; oz++) {
+								int d = (ox * ox) + (oz * oz) +
+									(y - (h + 4)) * (y - (h + 4));
+								if (d < 11) {
+									func(x + 2, y-3, z + 1, Item_VINE, arg);
+									func(x - 2, y-3, z - 1, Item_VINE, arg);
+									func(x + 1, y-3, z - 2, Item_VINE, arg);
+									func(x + ox, y, z + oz, 15, arg);
+								}
+							}
+						}
+					}
+					for (int y = h; y < h + 7; y++) {		
+						func(x, y, z, 5, arg);
+					}
+				}
+			}
+		}
+    }
+}
diff --git a/src/worldgen/biome_swamp.h b/src/worldgen/biome_swamp.h
new file mode 100644
index 0000000..fb795fe
--- /dev/null
+++ b/src/worldgen/biome_swamp.h
@@ -0,0 +1,8 @@
+#ifndef _biome_swamp_h_
+#define _biome_swamp_h_
+
+#include "world.h"
+
+void generateSwamp(int dx, int dz, int x, int z, int start_h, int h, int flag, world_func func, void *arg);
+
+#endif // _biome_swamp_h_
diff --git a/src/worldgen/biome_taiga.c b/src/worldgen/biome_taiga.c
index fd338e7..6980591 100644
--- a/src/worldgen/biome_taiga.c
+++ b/src/worldgen/biome_taiga.c
@@ -3,24 +3,31 @@
 #include "../config.h"
 #include "../item.h"
 
-void generateTaiga(int dx, int dz, int x, int z, int start_h, int h, int flag, world_func func, void *arg) {
-    /* ice on water
-	if (simplex2(-x * 0.1, z * 0.1, 6, 0.6, 2) > 0.68) {
-		func(x, 36, z, Item_ICE * flag, arg);
-	}
-    */
+void generateTaiga(int dx, int dz, int x, int z, int start_h, int h, int flag, world_func func, void *arg) {  
     for (int y = start_h; y < h - 1; y++) {
-        func(x, y, z, Item_DIRT * flag, arg);
-    }
-    func(x, h - 1, z, Item_SNOW * flag, arg);
-    
-    if (simplex2(x * 0.00091, z * 0.00091, 6, 1, 2) < 0.5) {
+		func(x, y, z, Item_STONE * flag, arg);
+	}
+	for (int y = 0; y < 5; y++) {
+		func(x, h-y-1, z, Item_SAND * flag, arg);
+	}
+     
+    if (h > 46) {
 
+		for (int y = start_h; y < h - 1; y++) {
+			func(x, y, z, Item_DIRT * flag, arg);
+		}
+		func(x, h - 1, z, Item_SNOW * flag, arg);
+    
 		// grass
-		if (simplex2(-x * 0.1, z * 0.1, 4, 0.8, 2) > 0.7) {
+		if (simplex2(-x * 0.1, z * 0.1, 4, 0.8, 2) > 0.71) {
 			func(x, h, z, 17 * flag, arg);
 		}
 		
+		// ferns
+		if (simplex2(-x * 0.1, z * 0.1, 5, 0.5, 2) > 0.715) {
+			func(x, h, z, Item_FERN * flag, arg);
+		}
+		
 		
 		// trees
 		/** TODO **/
diff --git a/src/worldgen/biome_temperate.c b/src/worldgen/biome_temperate.c
index cc56b11..00636c2 100644
--- a/src/worldgen/biome_temperate.c
+++ b/src/worldgen/biome_temperate.c
@@ -4,13 +4,18 @@
 #include "../item.h"
 
 void generateTemperate(int dx, int dz, int x, int z, int start_h, int h, int flag, world_func func, void *arg) {
-    
-    for (int y = start_h; y < h - 1; y++) {	
-        func(x, y, z, Item_DIRT * flag, arg);
-    }
-    func(x, h - 1, z, Item_GRASS * flag, arg); 
-    
-    if (simplex2(x * 0.00091, z * 0.00091, 6, 1, 2) < 0.5) {
+    for (int y = start_h; y < h - 1; y++) {
+		func(x, y, z, Item_STONE * flag, arg);
+	}
+	for (int y = 0; y < 5; y++) {
+		func(x, h-y-1, z, Item_SAND * flag, arg);
+	}
+     
+    if (h > 46) {
+		for (int y = start_h; y < h - 1; y++) {	
+			func(x, y, z, Item_DIRT * flag, arg);
+		}
+		func(x, h - 1, z, Item_GRASS * flag, arg); 
 
 		// grass
 		if (simplex2(-x * 0.1, z * 0.1, 4, 0.8, 2) > 0.5) {
@@ -37,7 +42,13 @@ void generateTemperate(int dx, int dz, int x, int z, int start_h, int h, int fla
 
 		// forests
 		if (simplex2(-x * 0.001, z * 0.001, 6, 0.9, 2) > 0.59) {
-			//func(x, h, z, 35 * flag, arg);
+			// mushrooms
+			if (simplex2(-x * 0.08, z * 0.08, 6, 0.7, 2) > 0.69) {
+				func(x, h, z, Item_MUSHROOMS * flag, arg);
+			}
+			if (simplex2(-x * 0.1, z * 0.1, 5, 0.8, 2) > 0.66) {
+				func(x, h, z, Item_MUSHROOM * flag, arg);
+			}
 			// trees
 			if (h > 38) {
 				int ok = 1;
diff --git a/src/worldgen/world.c b/src/worldgen/world.c
index 1cca5ba..c73163c 100644
--- a/src/worldgen/world.c
+++ b/src/worldgen/world.c
@@ -13,6 +13,7 @@
 #include "biome_rainforest.h"
 #include "biome_taiga.h"
 #include "biome_mesa.h"
+#include "biome_swamp.h"
 
 void create_world(int p, int q, world_func func, void *arg) {
     int pad = 1;
@@ -24,9 +25,6 @@ void create_world(int p, int q, world_func func, void *arg) {
             }
             int x = p * CHUNK_SIZE + dx;
             int z = q * CHUNK_SIZE + dz;
-            //float random = (rand() % 1024);
-            //random = random/512.0; // Eat my decimal in the face
-            //printf("%.2f\n", random);
             float f = simplex2(x * 0.01, z * 0.01, 4, 0.5, 2);
             float g = simplex2(-x * 0.01, -z * 0.01, 2, 0.9, 2);
             
@@ -41,6 +39,21 @@ void create_world(int p, int q, world_func func, void *arg) {
             int h = f * mh;
             
             
+            // Ocean system (generates water under y == 45)
+            for (int y = 22; y < 45; y++) { 
+				func(x, y, z, Item_WATER * flag, arg);
+			}
+            
+            // ice on frigid biomes
+			float biomen = simplex3(-x * 0.0005 * (1 / BIOME_SIZE), -z * 0.0005 * (1 / BIOME_SIZE), q * 0.001, 2, 16.0, 1);
+			if(biomen > (4.0f/5.0f) && biomen < (5.0f/5.0f)) {
+				// 2 ice layers on water
+				if (simplex2(x * 0.0004, z * 0.0004, 8, 1.5, 2) > 0.6) {
+					func(x, 43, z, Item_ICE * flag, arg);
+					func(x, 44, z, Item_ICE * flag, arg);
+				}
+            }
+            
             //2 other values are needed : a high one for 
             //mountain-like biomes and other for oceans.
 
@@ -56,9 +69,9 @@ void create_world(int p, int q, world_func func, void *arg) {
                 generateTaiga(dx, dz, x, z, 32, 32 + h, flag, func, arg);
             } else if(biome == Biome_MESA) {
                 generateMesa(dx, dz, x, z, 32, 32 + h, flag, func, arg);
-            } //else if(biome == Biome_OCEAN) {		
-              //  generateOcean(dx, dz, x, z, 32, 32 + h, flag, func, arg);
-            //}
+            } else if(biome == Biome_SWAMP) {
+                generateSwamp(dx, dz, x, z, 32, 32 + h, flag, func, arg);
+            }
             
             generateBaseTerrain(dx, dz, x, z, 0, 32, flag, func, arg); //the good
             //generateBaseTerrain(dx, dz, x, z, 32, 32 + h, flag, func, arg); //the evil
@@ -72,70 +85,7 @@ void create_world(int p, int q, world_func func, void *arg) {
                     func(x, y, z, 16 * flag, arg);
                 }
             }
-            
-            // ocean
-           
-			// water and sand
-            for (int y = 30; y < 37; y++) { 
-				float coef = 1.1 - y/62.0;	
-				if (simplex2(x * 0.00091, z * 0.00091, 6, 1, 2) > coef-0.15) {
-					func(x, y, z, Item_SAND * flag, arg);
-				} 
-				if (simplex2(x * 0.00091, z * 0.00091, 6, 1, 2) > coef) {
-					func(x, y, z, Item_WATER * flag, arg);
-				} 
-			}
-			// ocean bottom
-			if (simplex2(x * 0.00091, z * 0.00091, 6, 1, 2) > 0.614) {
-					func(x, 29, z, Item_SAND * flag, arg);
-			} 
-						
-			// empty
-			for (int y = 37; y < 119; y++) { 
-				//float coef = y/60.0;	
-				if (simplex2(x * 0.00091, z * 0.00091, 6, 1, 2) > 0.5) {
-					func(x, y, z, 0 * flag, arg);
-				}
-			}
 			
-			// ice on frigid biomes
-			float biomen = simplex3(-x * 0.0005 * (1 / BIOME_SIZE), -z * 0.0005 * (1 / BIOME_SIZE), q * 0.001, 2, 16.0, 1);
-			if(biomen > (4.0f/5.0f) && biomen < (5.0f/5.0f)) {
-				// ice on water but not on sand
-				if (simplex2(-x * 0.01, z * 0.01, 6, 0.6, 2) > 0.60 && 
-				(simplex2(x * 0.00091, z * 0.00091, 6, 1, 2) > 0.52)) {
-					func(x, 36, z, Item_ICE * flag, arg);
-					func(x, 35, z, Item_ICE * flag, arg);
-				}
-			}
-			
-			/* Ocean (upscaled lakes) Too big too much hills. need mapgen tweaks.
-           
-            for (int y = 30; y < 37; y++) { 
-				float coef = (1.1 - y/62.0)+0.5;	
-				if (simplex2(x * 0.00008, z * 0.00008, 6, 1, 2) > coef) {
-					func(x, y, z, Item_WATER * flag, arg);
-				}
-			}
-			
-			for (int y = 37; y < 45; y++) { 
-				float coef = (y/70.0)+0.4;	
-				if (simplex2(x * 0.00008, z * 0.00008, 6, 1, 2) > coef) {
-					func(x, y, z, Item_EMPTY * flag, arg);
-				}
-			} */
-
-            /* rivers wip
-            for (int yb = 30; yb < 37; yb++) {
-                if (simplex3(
-					x * 0.02, yb * 0.004, z * 0.02, 8, 1.5, 1) > 0.6)
-                {
-                    //if (x > 100 && x < -100 && z > 100 && z < -100) {
-						func(x, yb, z, Item_WATER * flag, arg);
-					//}
-                }
-            } */
-            
             // Unbreakable Core shell
             func(x, 0, z, Item_CORESHELL * flag, arg);
             if (simplex2(
@@ -143,17 +93,6 @@ void create_world(int p, int q, world_func func, void *arg) {
 				func(x, 1, z, Item_CORESHELL * flag, arg);
 			}
 			
-			
-			
-			//for (int x = 0; x < 5; x++) { 
-			//	for (int y = 37; y < 42; y++) { 
-			//		func(42 + x, y, 42, Item_CORESHELL * flag, arg);
-			//		func(42 + x, y, 43, Item_CORESHELL * flag, arg);
-			//	}
-			//}
-			
-			
-			
 			// Buildings
 			
 			// Brick Mess
@@ -168,21 +107,24 @@ Biome biome_at_pos(int q, int x, int z) {
     float biomen = simplex3(-x * 0.0005 * (1 / BIOME_SIZE), -z * 0.0005 * (1 / BIOME_SIZE), q * 0.001, 2, 16.0, 1);
     Biome biome = Biome_max;
 
-    if(biomen > (1.0f/5.0f)) {
+    if(biomen > (1.0f/6.0f)) {
         biome = Biome_TEMPERATE;
     }
-    if(biomen > (2.0f/5.0f)) {
+    if(biomen > (2.0f/6.0f)) {
         biome = Biome_DESERT;
     }
-    if(biomen > (3.0f/5.0f)) {
+    if(biomen > (3.0f/6.0f)) {
         biome = Biome_RAINFOREST;
     }
    
-    if(biomen > (4.0f/5.0f)) {
+    if(biomen > (4.0f/6.0f)) {
         biome = Biome_TAIGA;
     }
-	if(biome == (Biome_max)) {
+	if(biome == (5.0/6.0)) {
         biome = Biome_MESA;
     } 
+    if(biome == (Biome_max)) {
+        biome = Biome_SWAMP;
+    } 
     return biome;
 }
diff --git a/src/worldgen/world.h b/src/worldgen/world.h
index 008009e..a70d839 100644
--- a/src/worldgen/world.h
+++ b/src/worldgen/world.h
@@ -7,6 +7,7 @@ typedef enum {
     Biome_RAINFOREST,
     Biome_TAIGA,
     Biome_MESA,
+    Biome_SWAMP,
     Biome_max
 } Biome;
 
diff --git a/textures/texture.png b/textures/texture.png
index 69871f2..aab502e 100644
Binary files a/textures/texture.png and b/textures/texture.png differ