diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
index 7784361..89a2e8c 100644
--- a/.vscode/c_cpp_properties.json
+++ b/.vscode/c_cpp_properties.json
@@ -7,7 +7,8 @@
                 "${workspaceFolder}/src/lib/godot-cpp/gen/include",
                 "${workspaceFolder}/src/lib/godot-cpp/include",
                 "${workspaceFolder}/src/lib/godot-cpp/gdextension",
-                "${workspaceFolder}/src/lib/godot-cpp/gen/include"
+                "${workspaceFolder}/src/lib/godot-cpp/gen/include",
+                "${workspaceFolder}/src/lib/discord_social_sdk/include"
             ],
             "defines": [
                 "_DEBUG",
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 2dba6bd..60c07dd 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -15,7 +15,62 @@
         "functional": "cpp",
         "tuple": "cpp",
         "type_traits": "cpp",
-        "utility": "cpp"
+        "utility": "cpp",
+        "any": "cpp",
+        "atomic": "cpp",
+        "bit": "cpp",
+        "*.tcc": "cpp",
+        "cctype": "cpp",
+        "clocale": "cpp",
+        "cmath": "cpp",
+        "compare": "cpp",
+        "concepts": "cpp",
+        "cstdarg": "cpp",
+        "cstddef": "cpp",
+        "cstdint": "cpp",
+        "cstdio": "cpp",
+        "cstdlib": "cpp",
+        "cstring": "cpp",
+        "ctime": "cpp",
+        "cwchar": "cpp",
+        "cwctype": "cpp",
+        "deque": "cpp",
+        "list": "cpp",
+        "map": "cpp",
+        "set": "cpp",
+        "string": "cpp",
+        "unordered_map": "cpp",
+        "vector": "cpp",
+        "exception": "cpp",
+        "algorithm": "cpp",
+        "iterator": "cpp",
+        "memory": "cpp",
+        "memory_resource": "cpp",
+        "numeric": "cpp",
+        "random": "cpp",
+        "string_view": "cpp",
+        "fstream": "cpp",
+        "initializer_list": "cpp",
+        "iomanip": "cpp",
+        "iosfwd": "cpp",
+        "iostream": "cpp",
+        "istream": "cpp",
+        "limits": "cpp",
+        "new": "cpp",
+        "numbers": "cpp",
+        "ostream": "cpp",
+        "ranges": "cpp",
+        "semaphore": "cpp",
+        "span": "cpp",
+        "sstream": "cpp",
+        "stdexcept": "cpp",
+        "stop_token": "cpp",
+        "streambuf": "cpp",
+        "text_encoding": "cpp",
+        "thread": "cpp",
+        "cinttypes": "cpp",
+        "typeinfo": "cpp",
+        "variant": "cpp"
     },
     "[python]": {
         "editor.defaultFormatter": "ms-python.black-formatter"
diff --git a/SConstruct b/SConstruct
index 93f1d78..e1fb4e5 100644
--- a/SConstruct
+++ b/SConstruct
@@ -18,10 +18,8 @@ elif env["platform"] == "windows":
     discord_library = "discord_partner_sdk.dll"
     libexportfolder = "/windows/"
 
-if env["target"] == "template_debug":
-    debugsuffix = "_debug"
-else:
-    debugsuffix = ""
+    folder = "release/"
+    discord_library_target = discord_library
 
 env.Append(LIBPATH=["src/lib/discord_social_sdk/lib/release/"])
 env.Append(LIBS=["discord_partner_sdk"])
@@ -31,8 +29,7 @@ env.Append(CPPDEFINES=["HOT_RELOAD_ENABLED"])
 library = env.SharedLibrary(
     target="project/addons/discord-rpc-gd/bin/"
     + libexportfolder
-    + "discord_partner_sdk_binding"
-    + debugsuffix,
+    + discord_library,
     source=sources,
 )
 env.Depends(
diff --git a/setup.py b/setup.py
index b354e8a..4e1db00 100644
--- a/setup.py
+++ b/setup.py
@@ -34,12 +34,6 @@ debug_dll_dest = "src/lib/discord_social_sdk/lib/debug/"
 os.makedirs(debug_dll_dest, exist_ok=True)
 shutil.copy(debug_dll_src, debug_dll_dest)
 
-include_folder_src = "src/lib/discord_social_sdk/include"
-include_folder_dest = "src"
-shutil.copytree(include_folder_src, include_folder_dest, dirs_exist_ok=True)
-
-shutil.rmtree(include_folder_src, ignore_errors=True)
-
 bin_folder = "src/lib/discord_social_sdk/bin"
 shutil.rmtree(bin_folder, ignore_errors=True)
 
@@ -47,4 +41,4 @@ print(f"Extracted and copied Discord Social SDK version: {extracted_version}")
 
 print("Getting submodules...")
 os.system("git submodule update --init --remote")
-print("Finished setup!")
+print("Finished setup.")
diff --git a/src/discordgodot.cpp b/src/discordgodot.cpp
index 4ea5612..d416ac8 100644
--- a/src/discordgodot.cpp
+++ b/src/discordgodot.cpp
@@ -73,6 +73,7 @@ void DiscordRPC::run_callbacks()
 }
 void DiscordRPC::debug()
 {
+    auto client = std::make_shared<discordpp::Client>();
 }
 
 void DiscordRPC::set_app_id(uint64_t value)