diff --git a/.gitignore b/.gitignore
index 40c7f50..8f64639 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,10 +3,16 @@
 .cmake/
 CMakeCache.txt
 CMakeFiles/
-Game
+bin/
+lib/
 Makefile
 cmake_install.cmake
 compile_commands.json
+# FastNoise2 extra build files
+CPM_modules/
+NoiseTool.ini
+_deps/
+cpm-package-lock.cmake
 
 # Ignore Cmake'd files
 src/helpers/RootDir.h
diff --git a/.gitmodules b/.gitmodules
index 7a79fb5..3e4f130 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,7 @@
 [submodule "data/game-models"]
 	path = data/game-models
 	url = https://git.warwicknew.xyz/game-models/
+[submodule "deps/FastNoise2"]
+	path = deps/FastNoise2
+	url = https://github.com/Auburn/FastNoise2.git
+	branch = 1001d76
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7131fda..bd7a1b7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,17 +19,24 @@ link_directories(${CMAKE_SOURCE_DIR}/lib)
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/")
 
+# Generic OpenGL and windowing libraries.
 find_package(SDL2 REQUIRED)
 find_package(SDL2_image REQUIRED)
 find_package(OpenGL REQUIRED)
 find_package(GLEW REQUIRED)
 find_package(GLM REQUIRED)
-find_package(assimp REQUIRED)
 
+# Model loading
+find_package(assimp REQUIRED)
 if (assimp_VERSION VERSION_LESS "5.1")
     message(FATAL_ERROR "Assimp ${assimp_VERSION} out of date, Assimp 5.1.0 or newer is required!")
 endif()
 
+# Build FastNoise2 Library
+set(FASTNOISE2_NOISETOOL ON CACHE BOOL "Build Noise Tool" FORCE)
+set(BUILD_SHARED_LIBS ON CACHE BOOL "Build Noise Tool Dynamic Library" FORCE)
+add_subdirectory(deps/FastNoise2)
+
 include_directories(
     ${SDL2_INCLUDE_DIRS}
     ${SDL2_IMAGE_DIRS}
@@ -39,9 +46,10 @@ include_directories(
 
 add_executable(${PROJECT_NAME} ${HEADER_FILES} ${SOURCE_FILES})
 
-target_link_libraries(${PROJECT_NAME}
+target_link_libraries(${PROJECT_NAME} PRIVATE
     ${SDL2_LIBRARIES}
     ${SDL2_IMAGE_LIBRARIES}
     ${OPENGL_LIBRARIES}
     ${GLEW_LIBRARIES}
-    ${ASSIMP_LIBRARIES})
+    ${ASSIMP_LIBRARIES}
+    FastNoise)
diff --git a/deps/FastNoise2 b/deps/FastNoise2
new file mode 160000
index 0000000..73c6e58
--- /dev/null
+++ b/deps/FastNoise2
@@ -0,0 +1 @@
+Subproject commit 73c6e582052275cd073ebae7790f8874b9c194ba
diff --git a/src/main.cpp b/src/main.cpp
index 667f377..1d04fac 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,4 +1,3 @@
-// Include Config header generated by GNU autotools
 #include <GL/glew.h>
 // Make sure Glew is loaded first
 #include <GL/gl.h>