diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4f3a815..1547304 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -51,6 +51,7 @@ endif ()
 find_package(Threads REQUIRED)
 find_package(PugiXML CONFIG REQUIRED)
 find_package(Lua54 REQUIRED)
+find_package(Sol2 REQUIRED)
 
 find_package(Boost 1.66.0 REQUIRED COMPONENTS system iostreams)
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c80e24b..4002904 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,5 +1,3 @@
-add_subdirectory(luamodules)
-
 set(tfs_SRC
 	${CMAKE_CURRENT_LIST_DIR}/otpch.cpp
 	${CMAKE_CURRENT_LIST_DIR}/actions.cpp
@@ -33,40 +31,40 @@ set(tfs_SRC
 	${CMAKE_CURRENT_LIST_DIR}/iomapserialize.cpp
 	${CMAKE_CURRENT_LIST_DIR}/item.cpp
 	${CMAKE_CURRENT_LIST_DIR}/items.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/luaactions.cpp" />
-    ${CMAKE_CURRENT_LIST_DIR}/luacombat.cpp" />
-    ${CMAKE_CURRENT_LIST_DIR}/luacondition.cpp" />
-    ${CMAKE_CURRENT_LIST_DIR}/luacontainer.cpp" />
-    ${CMAKE_CURRENT_LIST_DIR}/luacreature.cpp" />
-    ${CMAKE_CURRENT_LIST_DIR}/luacreatureevent.cpp" />
-    ${CMAKE_CURRENT_LIST_DIR}/luagame.cpp" />
-    ${CMAKE_CURRENT_LIST_DIR}/luaglobalevent.cpp" />
-    ${CMAKE_CURRENT_LIST_DIR}/luagroup.cpp" />
-    ${CMAKE_CURRENT_LIST_DIR}/luaguild.cpp" />
-    ${CMAKE_CURRENT_LIST_DIR}/luahouse.cpp" />
-    ${CMAKE_CURRENT_LIST_DIR}/luaitem.cpp" />
-    ${CMAKE_CURRENT_LIST_DIR}/luaitemtype.cpp" />
-    ${CMAKE_CURRENT_LIST_DIR}/lualoot.cpp" />
-    ${CMAKE_CURRENT_LIST_DIR}/luamonster.cpp" />
-    ${CMAKE_CURRENT_LIST_DIR}/luamonsterspell.cpp" />
-    ${CMAKE_CURRENT_LIST_DIR}/luamonstertype.cpp" />
-    ${CMAKE_CURRENT_LIST_DIR}/luamoveevent.cpp" />
-    ${CMAKE_CURRENT_LIST_DIR}/luanetworkmessage.cpp" />
-    ${CMAKE_CURRENT_LIST_DIR}/luanpc.cpp" />
-    ${CMAKE_CURRENT_LIST_DIR}/luaoutfit.cpp" />
-    ${CMAKE_CURRENT_LIST_DIR}/luaparty.cpp" />
-    ${CMAKE_CURRENT_LIST_DIR}/luaplayer.cpp" />
-    ${CMAKE_CURRENT_LIST_DIR}/luaposition.cpp" />
+    ${CMAKE_CURRENT_LIST_DIR}/luaactions.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/luacombat.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/luacondition.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/luacontainer.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/luacreature.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/luacreatureevent.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/luagame.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/luaglobalevent.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/luagroup.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/luaguild.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/luahouse.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/luaitem.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/luaitemtype.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/lualoot.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/luamonster.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/luamonsterspell.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/luamonstertype.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/luamoveevent.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/luanetworkmessage.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/luanpc.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/luaoutfit.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/luaparty.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/luaplayer.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/luaposition.cpp
 	${CMAKE_CURRENT_LIST_DIR}/luascript.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/luaspells.cpp" />
-    ${CMAKE_CURRENT_LIST_DIR}/luatalkaction.cpp" />
-    ${CMAKE_CURRENT_LIST_DIR}/luateleport.cpp" />
-    ${CMAKE_CURRENT_LIST_DIR}/luatile.cpp" />
-    ${CMAKE_CURRENT_LIST_DIR}/luatown.cpp" />
-    ${CMAKE_CURRENT_LIST_DIR}/luavariant.cpp" />
-    ${CMAKE_CURRENT_LIST_DIR}/luavocation.cpp" />
-    ${CMAKE_CURRENT_LIST_DIR}/luaweapons.cpp" />
-    ${CMAKE_CURRENT_LIST_DIR}/luaxml.cpp" />
+    ${CMAKE_CURRENT_LIST_DIR}/luaspells.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/luatalkaction.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/luateleport.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/luatile.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/luatown.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/luavariant.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/luavocation.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/luaweapons.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/luaxml.cpp
 	${CMAKE_CURRENT_LIST_DIR}/mailbox.cpp
 	${CMAKE_CURRENT_LIST_DIR}/map.cpp
 	${CMAKE_CURRENT_LIST_DIR}/matrixarea.cpp
@@ -202,6 +200,7 @@ target_link_libraries(tfslib PRIVATE
 	Boost::iostreams
 	Boost::system
 	fmt::fmt
+	sol2::sol2
 	pugixml::pugixml
 	${CMAKE_THREAD_LIBS_INIT}
 	${Crypto++_LIBRARIES}
diff --git a/vc17/theforgottenserver.vcxproj b/vc17/theforgottenserver.vcxproj
index bea90aa..364d317 100644
--- a/vc17/theforgottenserver.vcxproj
+++ b/vc17/theforgottenserver.vcxproj
@@ -87,6 +87,10 @@
     <TargetName>$(ProjectName)-$(Platform)</TargetName>
     <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
   </PropertyGroup>
+  <PropertyGroup Label="Vcpkg">
+    <VcpkgEnableManifest>true</VcpkgEnableManifest>
+    <VcpkgEnabled>true</VcpkgEnabled>
+  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PreprocessorDefinitions>_CONSOLE;$(PREPROCESSOR_DEFS);%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -95,7 +99,7 @@
       <EnableParallelCodeGeneration>true</EnableParallelCodeGeneration>
       <EnableEnhancedInstructionSet>AdvancedVectorExtensions</EnableEnhancedInstructionSet>
       <AdditionalIncludeDirectories>$(VcpkgRoot)include\%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard>stdcpp20</LanguageStandard>
     </ClCompile>
     <Link>
       <TargetMachine>MachineX86</TargetMachine>
@@ -110,7 +114,7 @@
       <EnableParallelCodeGeneration>true</EnableParallelCodeGeneration>
       <EnableEnhancedInstructionSet>AdvancedVectorExtensions</EnableEnhancedInstructionSet>
       <AdditionalIncludeDirectories>$(VcpkgRoot)include\%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard>stdcpp20</LanguageStandard>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -128,7 +132,7 @@
       <EnableParallelCodeGeneration>true</EnableParallelCodeGeneration>
       <EnableEnhancedInstructionSet>AdvancedVectorExtensions</EnableEnhancedInstructionSet>
       <AdditionalIncludeDirectories>$(VcpkgRoot)include\luajit;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard>stdcpp20</LanguageStandard>
     </ClCompile>
     <Link>
       <TargetMachine>MachineX86</TargetMachine>
@@ -362,4 +366,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/vc17/theforgottenserver.vcxproj.filters b/vc17/theforgottenserver.vcxproj.filters
index b9f9762..40f18f4 100644
--- a/vc17/theforgottenserver.vcxproj.filters
+++ b/vc17/theforgottenserver.vcxproj.filters
@@ -73,6 +73,7 @@
     <ClCompile Include="..\src\weapons.cpp" />
     <ClCompile Include="..\src\wildcardtree.cpp" />
     <ClCompile Include="..\src\xtea.cpp" />
+    <ClCompile Include="..\src\main.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\src\luaactions.cpp">
@@ -213,7 +214,6 @@
     <ClInclude Include="..\src\itemloader.h" />
     <ClInclude Include="..\src\items.h" />
     <ClInclude Include="..\src\lockfree.h" />
-    <ClInclude Include="..\src\luaenv.h" />
     <ClInclude Include="..\src\luascript.h" />
     <ClInclude Include="..\src\mailbox.h" />
     <ClInclude Include="..\src\map.h" />
@@ -267,4 +267,4 @@
       <UniqueIdentifier>{9156d8f4-e8e6-4a03-bbf7-dcc7e7357a85}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/vcpkg.json b/vcpkg.json
index 7a2dfe2..6dd9ebd 100644
--- a/vcpkg.json
+++ b/vcpkg.json
@@ -10,7 +10,8 @@
         "fmt",
         "libmariadb",
         "lua",
-        "pugixml"
+        "pugixml",
+        "sol2"
     ],
     "features": {
         "luajit": {