diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..6e41ae2
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,6 @@
+[submodule "third_party/BVH"]
+	path = third_party/BVH
+	url = https://github.com/hydrogendeuteride/BVH.git
+[submodule "third_party/taskflow"]
+	path = third_party/taskflow
+	url = https://github.com/taskflow/taskflow.git
diff --git a/conanfile.txt b/conanfile.txt
new file mode 100644
index 0000000..aed0f41
--- /dev/null
+++ b/conanfile.txt
@@ -0,0 +1,7 @@
+[requires]
+taskflow/3.10.0
+[generators]
+CMakeDeps
+CMakeToolchain
+[layout]
+cmake_layout
\ No newline at end of file
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e851180..d689b6d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -101,7 +101,7 @@ target_include_directories(vulkan_engine PUBLIC
 
 option(ENABLE_MIKKTS "Use MikkTSpace for tangent generation" ON)
 
-target_link_libraries(vulkan_engine PUBLIC vma glm Vulkan::Vulkan fmt::fmt stb_image SDL2::SDL2 vkbootstrap imgui fastgltf::fastgltf ImGuizmo)
+target_link_libraries(vulkan_engine PUBLIC vma glm Vulkan::Vulkan fmt::fmt stb_image SDL2::SDL2 vkbootstrap imgui fastgltf::fastgltf ImGuizmo BVH2)
 if (ENABLE_MIKKTS)
   target_link_libraries(vulkan_engine PUBLIC mikktspace)
   target_compile_definitions(vulkan_engine PUBLIC MIKKTS_ENABLE=1)
diff --git a/third_party/BVH b/third_party/BVH
new file mode 160000
index 0000000..2a9838e
--- /dev/null
+++ b/third_party/BVH
@@ -0,0 +1 @@
+Subproject commit 2a9838e7efd56b20910e35148bf547b17894a954
diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt
index 69b413a..ff13c2f 100644
--- a/third_party/CMakeLists.txt
+++ b/third_party/CMakeLists.txt
@@ -69,6 +69,9 @@ target_compile_definitions(ImGuizmo
 
 target_link_libraries(ImGuizmo PUBLIC imgui)
 
+add_subdirectory(BVH)
+target_include_directories(BVH2 INTERFACE taskflow)
+
 target_include_directories(stb_image INTERFACE stb_image)
 
 # MikkTSpace (optional)
diff --git a/third_party/taskflow b/third_party/taskflow
new file mode 160000
index 0000000..0f5d556
--- /dev/null
+++ b/third_party/taskflow
@@ -0,0 +1 @@
+Subproject commit 0f5d556267964465bd9507300357909b6f5b2dea