Fixed Button dll input/output.

Fixed the logger.
2025-10-09 07:43:03 -07:00 · 2025-08-13 21:31:57 -07:00 · 2025-07-27 23:50:13 -07:00 · 2025-06-01 22:16:32 -07:00 · 2025-05-22 23:56:22 -07:00 · 2025-05-22 23:56:00 -07:00
275 changed files with 14182 additions and 4230 deletions
--- a/.gitea/workflows/BuildRelease.yaml
+++ b/.gitea/workflows/BuildRelease.yaml
@@ -8,6 +8,9 @@ on:
 jobs:
  Windows-AMD64-Build:
    runs-on: windows-x86_64
+    defaults:
+      run:
+        shell: powershell
    steps:
      - name: Check out repository code
        uses: actions/checkout@v3
@@ -19,8 +22,9 @@ jobs:
      - name: Building/Compiling/Installing Project
        run: |
          cd ${{ gitea.workspace }}
-          cmake -A x64 -DCMAKE_BUILD_TYPE=Release --preset=default .
+          mkdir build
          cd build
+          cmake -A x64 -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE="$env:VCPKG_ROOT\scripts\buildsystems\vcpkg.cmake" ..
          cmake --build . --config Release
          cmake --install .

@@ -28,10 +32,14 @@ jobs:
        run: |
          cd ${{ gitea.workspace }}
          mkdir bin
+          mv build/Release/EHS_Dyn.dll bin
          mv build/Release/StrToHash.exe bin
          mv build/Release/zlib1.dll bin
+          mv build/Release/libcrypto-3-x64.dll bin
+          mv build/Release/libssl-3-x64.dll bin
          mkdir lib
-          mv build/Release/EHS.lib lib
+          mv build/Release/EHS_Stc.lib lib
+          mv build/Release/EHS_Dyn.lib lib

      - name: Zipping Binaries
        run: |
@@ -49,6 +57,7 @@ jobs:
          files: |-
            ehs-windows-amd64.zip
          api_key: '${{secrets.RELEASE_TOKEN}}'
+          pre_release: false

  Linux-AMD64-Build:
    runs-on: linux-x86_64
@@ -58,7 +67,7 @@ jobs:

      - name: Installing Dependencies
        run: |
-          sudo pacman -S --noconfirm doxygen zip alsa-lib libxcb xcb-util-cursor
+          sudo pacman -S --noconfirm doxygen ninja zip libxcb xcb-util-cursor pipewire

      - name: Generating Documentation
        run: |
@@ -67,16 +76,18 @@ jobs:
      - name: Building/Compiling/Installing Project
        run: |
          cd ${{ gitea.workspace }}
-          cmake -DCMAKE_BUILD_TYPE=Release -DLINUX_WINDOW_SYSTEM:STRING=XCB .
+          cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DLINUX_WINDOW_SYSTEM:STRING=XCB .
          cmake --build . --config Release
          cmake --install .

      - name: Creating Appropriate Directories
        run: |
+          cd ${{ gitea.workspace }}
          mkdir bin
+          mv libEHS_Dyn.so bin
          mv StrToHash bin
          mkdir lib
-          mv libEHS.a lib
+          mv libEHS_Stc.a lib

      - name: Zipping Binaries
        run: zip -r ehs-linux-amd64.zip include bin lib docs LICENSE RADME.md
@@ -92,6 +103,7 @@ jobs:
          files: |-
            ehs-linux-amd64.zip
          api_key: '${{secrets.RELEASE_TOKEN}}'
+          pre_release: false

  Linux-AARCH64-Build:
    runs-on: linux-aarch64
@@ -100,7 +112,7 @@ jobs:
        uses: actions/checkout@v3

      - name: Installing Dependencies
-        run: sudo apt install -y doxygen zip libasound2-dev libxcb1-dev libxcb-xinput-dev libxcb-cursor-dev
+        run: sudo apt install -y doxygen ninja-build zip libxcb1-dev libxcb-xinput-dev libxcb-cursor-dev libpipewire-0.3-dev

      - name: Generating Documentation
        run: |
@@ -109,16 +121,18 @@ jobs:
      - name: Building/Compiling/Installing Project
        run: |
          cd ${{ gitea.workspace }}
-          cmake -DCMAKE_BUILD_TYPE=Release -DLINUX_WINDOW_SYSTEM:STRING=XCB .
+          cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DLINUX_WINDOW_SYSTEM:STRING=XCB .
          cmake --build . --config Release
          cmake --install .

      - name: Creating Appropriate Directories
        run: |
+          cd ${{ gitea.workspace }}
          mkdir bin
+          mv libEHS_Dyn.so bin
          mv StrToHash bin
          mkdir lib
-          mv libEHS.a lib
+          mv libEHS_Stc.a lib

      - name: Zipping Binaries
        run: zip -r ehs-linux-aarch64.zip include bin lib docs LICENSE README.md
@@ -134,3 +148,4 @@ jobs:
          files: |-
            ehs-linux-aarch64.zip
          api_key: '${{secrets.RELEASE_TOKEN}}'
+          pre_release: false
--- a/Assembly.def
+++ b/Assembly.def
@@ -0,0 +1,26 @@
+LIBRARY EHS_Dyn
+EXPORTS
+    ?GenerateSeed_u64@HRNG@ehs@@SA_KXZ
+    ?Generate_u64@HRNG@ehs@@SA_K_K0@Z
+    ?Generate_u64@HRNG@ehs@@SA_KXZ
+    ?GenerateSeed_s64@HRNG@ehs@@SA_JXZ
+    ?Generate_s64@HRNG@ehs@@SA_J_J0@Z
+    ?Generate_s64@HRNG@ehs@@SA_JXZ
+    ?GenerateSeed_u32@HRNG@ehs@@SAIXZ
+    ?Generate_u32@HRNG@ehs@@SAIII@Z
+    ?Generate_u32@HRNG@ehs@@SAIXZ
+    ?GenerateSeed_s32@HRNG@ehs@@SAHXZ
+    ?Generate_s32@HRNG@ehs@@SAHHH@Z
+    ?Generate_s32@HRNG@ehs@@SAHXZ
+    ?GenerateSeed_u16@HRNG@ehs@@SAIXZ
+    ?Generate_u16@HRNG@ehs@@SAGGG@Z
+    ?Generate_u16@HRNG@ehs@@SAGXZ
+    ?GenerateSeed_s16@HRNG@ehs@@SAFXZ
+    ?Generate_s16@HRNG@ehs@@SAFFF@Z
+    ?Generate_s16@HRNG@ehs@@SAFXZ
+    ?GenerateSeed_u8@HRNG@ehs@@SAEXZ
+    ?Generate_u8@HRNG@ehs@@SAEEE@Z
+    ?Generate_u8@HRNG@ehs@@SAEXZ
+    ?GenerateSeed_s8@HRNG@ehs@@SACXZ
+    ?Generate_s8@HRNG@ehs@@SACCC@Z
+    ?Generate_s8@HRNG@ehs@@SACXZ
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.25.1)
+cmake_minimum_required(VERSION 3.30.4)

 set(IS_OS_WINDOWS FALSE)
 set(IS_OS_LINUX FALSE)
@@ -11,9 +11,12 @@ set(IS_ARCH_ARM FALSE)

 project(EHS CXX C)

+set(CMAKE_VERBOSE_MAKEFILE ON)
+
 if (${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Windows")
    set(IS_OS_WINDOWS TRUE)
-    set(USER_HOME_DIRECTORY $ENV{USERPROFILE})
+    set(USER_HOME_DIRECTORY "$ENV{USERPROFILE}")
+    string(REPLACE "\\" "/" USER_HOME_DIRECTORY "${USER_HOME_DIRECTORY}")
    message("Building for the Windows operating system.")
 elseif (${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Linux")
    set(IS_OS_LINUX TRUE)
@@ -39,164 +42,216 @@ endif ()
 set(CMAKE_CXX_STANDARD 20)

 set(EHS_SOURCES
-        src/EHS.cpp include/ehs/EHS.h
-        src/Type.cpp include/ehs/Type.h
-        src/BaseObj.cpp include/ehs/BaseObj.h
-        src/GarbageCollector.cpp include/ehs/GarbageCollector.h
-        src/Log.cpp include/ehs/Log.h
-        src/URI.cpp include/ehs/URI.h
-        src/Math.cpp include/ehs/Math.h
-        src/Color4.cpp include/ehs/Color4.h
-        src/Color3.cpp include/ehs/Color3.h
-        src/Version.cpp include/ehs/Version.h
-        src/Base64.cpp include/ehs/Base64.h
-        src/Data.cpp include/ehs/Data.h
-        src/Range.cpp include/ehs/Range.h
-        src/Util.cpp include/ehs/Util.h
-        src/Task.cpp include/ehs/Task.h
-        src/DataType.cpp include/ehs/DataType.h
-        include/ehs/Anchor.h
-        include/ehs/Dock.h
-        include/ehs/HashMap.h
-        include/ehs/HRNG.h
-        include/ehs/Link.h
-        include/ehs/LinkedList.h
-        include/ehs/Mat2.h
-        include/ehs/Mat3.h
-        include/ehs/Mat4.h
-        include/ehs/PRNG.h
-        include/ehs/Quat.h
-        include/ehs/Rect.h
-        include/ehs/Str.h
-        include/ehs/Types.h
-        include/ehs/UTF.h
-        include/ehs/Vec2.h
-        include/ehs/Vec3.h
-        include/ehs/Vec4.h
-        include/ehs/Serializer.h
-        include/ehs/Array.h
-        include/ehs/Vector.h
-        include/ehs/SArray.h
-        src/PtrData.cpp include/ehs/PtrData.h
-        include/ehs/UniPtr.h
-        include/ehs/ShdPtr.h
-        include/ehs/WkPtr.h
+    src/EHS.cpp include/ehs/EHS.h
+    src/Type.cpp include/ehs/Type.h
+    src/BaseObj.cpp include/ehs/BaseObj.h
+    src/GC.cpp include/ehs/GC.h
+    src/Log.cpp include/ehs/Log.h
+    src/URI.cpp include/ehs/URI.h
+    src/Math.cpp include/ehs/Math.h
+    src/Color4.cpp include/ehs/Color4.h
+    src/Color3.cpp include/ehs/Color3.h
+    src/Version.cpp include/ehs/Version.h
+    src/Base64.cpp include/ehs/Base64.h
+    src/SHA256.cpp include/ehs/SHA256.h
+    src/Data.cpp include/ehs/Data.h
+    src/Range.cpp include/ehs/Range.h
+    src/Util.cpp include/ehs/Util.h
+    src/Task.cpp include/ehs/Task.h
+    src/DataType.cpp include/ehs/DataType.h
+    include/ehs/Anchor.h
+    include/ehs/Dock.h
+    include/ehs/HashMap.h
+    include/ehs/HRNG.h
+    include/ehs/Link.h
+    include/ehs/LinkedList.h
+    include/ehs/Mat2.h
+    include/ehs/Mat3.h
+    include/ehs/Mat4.h
+    include/ehs/PRNG.h
+    include/ehs/Quat.h
+    include/ehs/Rect.h
+    include/ehs/Str.h
+    include/ehs/Types.h
+    include/ehs/UTF.h
+    include/ehs/Vec2.h
+    include/ehs/Vec3.h
+    include/ehs/Vec4.h
+    include/ehs/Serializer.h
+    include/ehs/Array.h
+    include/ehs/Vector.h
+    include/ehs/SArray.h
+    src/PtrData.cpp include/ehs/PtrData.h
+    include/ehs/UniPtr.h
+    include/ehs/ShdPtr.h
+    include/ehs/WkPtr.h

-        src/database/DVar.cpp include/ehs/database/DVar.h
+    src/db/DbVarTmpl.cpp include/ehs/db/DbVarTmpl.h

-        src/system/CPU.cpp include/ehs/system/CPU.h
-        src/system/Thread.cpp include/ehs/system/Thread.h
-        src/system/BaseMutex.cpp include/ehs/system/BaseMutex.h
-        src/system/BaseSemaphore.cpp include/ehs/system/BaseSemaphore.h
-        src/system/BaseSystem.cpp include/ehs/system/BaseSystem.h
-        src/system/BaseOpen.cpp include/ehs/system/BaseOpen.h
-        include/ehs/system/Architecture.h
-        include/ehs/system/Mutex.h
-        include/ehs/system/Open.h
-        include/ehs/system/OS.h
-        include/ehs/system/Semaphore.h
-        include/ehs/system/System.h
+    src/system/CPU.cpp include/ehs/system/CPU.h
+    src/system/Thread.cpp include/ehs/system/Thread.h
+    src/system/BaseMutex.cpp include/ehs/system/BaseMutex.h
+    src/system/BaseSemaphore.cpp include/ehs/system/BaseSemaphore.h
+    src/system/BaseSystem.cpp include/ehs/system/BaseSystem.h
+    src/system/BaseOpen.cpp include/ehs/system/BaseOpen.h
+    include/ehs/system/Architecture.h
+    include/ehs/system/Mutex.h
+    include/ehs/system/Open.h
+    include/ehs/system/OS.h
+    include/ehs/system/Semaphore.h
+    include/ehs/system/System.h
+    include/ehs/system/AVX2.h
+    include/ehs/system/AVX512.h

-        src/json/Json.cpp include/ehs/json/Json.h
-        src/json/JsonBase.cpp include/ehs/json/JsonBase.h
-        src/json/JsonNum.cpp include/ehs/json/JsonNum.h
-        src/json/JsonBool.cpp include/ehs/json/JsonBool.h
-        src/json/JsonStr.cpp include/ehs/json/JsonStr.h
-        src/json/JsonObj.cpp include/ehs/json/JsonObj.h
-        src/json/JsonArray.cpp include/ehs/json/JsonArray.h
-        src/json/JsonVar.cpp include/ehs/json/JsonVar.h
+    src/json/Json.cpp include/ehs/json/Json.h
+    src/json/JsonBase.cpp include/ehs/json/JsonBase.h
+    src/json/JsonNum.cpp include/ehs/json/JsonNum.h
+    src/json/JsonBool.cpp include/ehs/json/JsonBool.h
+    src/json/JsonStr.cpp include/ehs/json/JsonStr.h
+    src/json/JsonObj.cpp include/ehs/json/JsonObj.h
+    src/json/JsonArray.cpp include/ehs/json/JsonArray.h
+    src/json/JsonVar.cpp include/ehs/json/JsonVar.h

-        src/io/Resource.cpp include/ehs/io/Resource.h
-        src/io/Console.cpp include/ehs/io/Console.h
-        src/io/RIFF_Chunk.cpp include/ehs/io/RIFF_Chunk.h
-        src/io/RIFF.cpp include/ehs/io/RIFF.h
-        src/io/BaseWindow.cpp include/ehs/io/BaseWindow.h
-        src/io/BaseFile.cpp include/ehs/io/BaseFile.h
-        src/io/Glyph.cpp include/ehs/io/Glyph.h
-        src/io/FontAtlas.cpp include/ehs/io/FontAtlas.h
-        src/io/BaseFileMonitor.cpp include/ehs/io/BaseFileMonitor.h
-        include/ehs/io/COM.h
-        include/ehs/io/File.h
-        include/ehs/io/FileMonitor.h
-        include/ehs/io/Window.h
+    src/io/Resource.cpp include/ehs/io/Resource.h
+    src/io/Console.cpp include/ehs/io/Console.h
+    src/io/RIFF_Chunk.cpp include/ehs/io/RIFF_Chunk.h
+    src/io/RIFF.cpp include/ehs/io/RIFF.h
+    src/io/BaseWindow.cpp include/ehs/io/BaseWindow.h
+    src/io/BaseFile.cpp include/ehs/io/BaseFile.h
+    src/io/Glyph.cpp include/ehs/io/Glyph.h
+    src/io/FontAtlas.cpp include/ehs/io/FontAtlas.h
+    src/io/BaseFileMonitor.cpp include/ehs/io/BaseFileMonitor.h
+    include/ehs/io/COM.h
+    include/ehs/io/File.h
+    include/ehs/io/FileMonitor.h
+    include/ehs/io/Window.h

-        src/io/socket/Request.cpp include/ehs/io/socket/Request.h
-        src/io/socket/Response.cpp include/ehs/io/socket/Response.h
-        src/io/socket/DNS.cpp include/ehs/io/socket/DNS.h
-        src/io/socket/BaseUDP.cpp include/ehs/io/socket/BaseUDP.h
-        src/io/socket/BaseTCP.cpp include/ehs/io/socket/BaseTCP.h
-        src/io/socket/SSL.cpp include/ehs/io/socket/SSL.h
+    include/ehs/io/socket/Socket.h
+    src/io/socket/Request.cpp include/ehs/io/socket/Request.h
+    src/io/socket/Response.cpp include/ehs/io/socket/Response.h
+    src/io/socket/BaseDNS.cpp include/ehs/io/socket/BaseDNS.h
+    include/ehs/io/socket/DNS.h
+    src/io/socket/BaseUDP.cpp include/ehs/io/socket/BaseUDP.h
+    include/ehs/io/socket/UDP.h
+    src/io/socket/BaseTCP.cpp include/ehs/io/socket/BaseTCP.h
+    include/ehs/io/socket/TCP.h
+    src/io/socket/SSL.cpp include/ehs/io/socket/SSL.h

-        src/io/socket/rest/Twitch.cpp include/ehs/io/socket/rest/Twitch.h
-        src/io/socket/rest/TwitchChat.cpp include/ehs/io/socket/rest/TwitchChat.h
-        src/io/socket/rest/Spotify.cpp include/ehs/io/socket/rest/Spotify.h
-        include/ehs/io/socket/Socket.h
-        include/ehs/io/socket/TCP.h
-        include/ehs/io/socket/UDP.h
+    include/ehs/io/socket/ehc/NetUtils.h
+    src/io/socket/EHC.cpp include/ehs/io/socket/EHC.h
+    src/io/socket/ehc/NetFrag.cpp include/ehs/io/socket/ehc/NetFrag.h
+    src/io/socket/ehc/NetEnd.cpp include/ehs/io/socket/ehc/NetEnd.h
+    src/io/socket/ehc/NetSys.cpp include/ehs/io/socket/ehc/NetSys.h
+    src/io/socket/ehc/NetOp.cpp include/ehs/io/socket/ehc/NetOp.h

-        src/io/audio/Audio.cpp include/ehs/io/audio/Audio.h
-        src/io/audio/BaseAudioDevice.cpp include/ehs/io/audio/BaseAudioDevice.h
-        src/io/audio/AudioCodec.cpp include/ehs/io/audio/AudioCodec.h
-        include/ehs/io/audio/AudioDevice.h
+    src/io/socket/rest/Twitch.cpp include/ehs/io/socket/rest/Twitch.h
+    src/io/socket/rest/TwitchChat.cpp include/ehs/io/socket/rest/TwitchChat.h
+    src/io/socket/rest/Spotify.cpp include/ehs/io/socket/rest/Spotify.h

-        src/io/img/PNG.cpp include/ehs/io/img/PNG.h
-        src/io/img/Img.cpp include/ehs/io/img/Img.h
-        src/io/img/PNG_Chunk.cpp include/ehs/io/img/PNG_Chunk.h
-        src/io/img/ImgCodec.cpp include/ehs/io/img/ImgCodec.h
+    src/io/audio/Audio.cpp include/ehs/io/audio/Audio.h
+    src/io/audio/BaseAudioDevice.cpp include/ehs/io/audio/BaseAudioDevice.h
+    src/io/audio/AudioCodec.cpp include/ehs/io/audio/AudioCodec.h
+    include/ehs/io/audio/AudioDevice.h

-        include/ehs/io/model/Vertex.h
-        src/io/model/Mesh.cpp include/ehs/io/model/Mesh.h
-        src/io/model/Bone.cpp include/ehs/io/model/Bone.h
-        src/io/model/Model.cpp include/ehs/io/model/Model.h
-        src/io/model/Animation.cpp include/ehs/io/model/Animation.h
-        src/io/model/AnimBone.cpp include/ehs/io/model/AnimBone.h
-        src/io/model/KeyFrame.cpp include/ehs/io/model/KeyFrame.h
-        src/io/model/PropertyChange.cpp include/ehs/io/model/PropertyChange.h
+    src/io/img/PNG.cpp include/ehs/io/img/PNG.h
+    src/io/img/Img.cpp include/ehs/io/img/Img.h
+    src/io/img/PNG_Chunk.cpp include/ehs/io/img/PNG_Chunk.h
+    src/io/img/ImgCodec.cpp include/ehs/io/img/ImgCodec.h

-        src/io/hid/ButtonState.cpp include/ehs/io/hid/ButtonState.h
-        src/io/hid/Button.cpp include/ehs/io/hid/Button.h
-        src/io/hid/Mouse.cpp include/ehs/io/hid/Mouse.h
-        src/io/hid/Keyboard.cpp include/ehs/io/hid/Keyboard.h
-        src/io/hid/HID.cpp include/ehs/io/hid/HID.h
-        src/io/hid/InputHandler.cpp include/ehs/io/hid/InputHandler.h
-        src/io/hid/Input.cpp include/ehs/io/hid/Input.h
+    include/ehs/io/mdl/Vertex.h
+    src/io/model/Mesh.cpp include/ehs/io/mdl/Mesh.h
+    src/io/model/Bone.cpp include/ehs/io/mdl/Bone.h
+    src/io/model/Mdl.cpp include/ehs/io/mdl/Mdl.h
+    src/io/model/Animation.cpp include/ehs/io/mdl/Animation.h
+    src/io/model/AnimBone.cpp include/ehs/io/mdl/AnimBone.h
+    src/io/model/KeyFrame.cpp include/ehs/io/mdl/KeyFrame.h
+    src/io/model/PropertyChange.cpp include/ehs/io/mdl/PropertyChange.h
+
+    src/io/hid/ButtonState.cpp include/ehs/io/hid/ButtonState.h
+    src/io/hid/Button.cpp include/ehs/io/hid/Button.h
+    src/io/hid/Mouse.cpp include/ehs/io/hid/Mouse.h
+    src/io/hid/Keyboard.cpp include/ehs/io/hid/Keyboard.h
+    src/io/hid/HID.cpp include/ehs/io/hid/HID.h
+    src/io/hid/InputHandler.cpp include/ehs/io/hid/InputHandler.h
+    src/io/hid/Input.cpp include/ehs/io/hid/Input.h
+    src/io/model/MdlCodec.cpp
+    include/ehs/io/mdl/MdlCodec.h
+    include/ehs/io/UsbBase.h
+    src/io/UsbBase.cpp
+    include/ehs/db/DbTable.h
+    include/ehs/db/DbObject.h
+    include/ehs/db/DbVar.h
+    src/db/DbVar.cpp
+    include/ehs/db/Database.h
+    src/db/DbObject.cpp
+    src/db/Database.cpp
+    src/db/Database.cpp
+    src/db/DbTable.cpp
+    include/ehs/io/BaseDirectory.h
+    src/io/BaseDirectory.cpp
+    include/ehs/io/Directory.h
+    include/ehs/io/socket/ehc/NetEnc.h
+    src/io/socket/ehc/NetEnc.cpp
+    include/ehs/io/socket/ehc/NetChannel.h
+    src/io/socket/ehc/NetChannel.cpp
+    include/ehs/io/socket/ehc/NetServerCh.h
+    include/ehs/io/socket/ehc/NetClientCh.h
+    src/io/socket/ehc/NetClientCh.cpp
+    src/io/socket/ehc/NetServerCh.cpp
+    src/io/socket/ehc/NetUtils.cpp
+    include/ehs/io/socket/BaseICMP.h src/io/socket/BaseICMP.cpp
+    include/ehs/io/socket/ICMP.h
+    src/io/socket/QueryVar.cpp include/ehs/io/socket/QueryVar.h
+    src/io/socket/HeaderVar.cpp include/ehs/io/socket/HeaderVar.h
 )

 if (IS_OS_WINDOWS)
    list(APPEND EHS_SOURCES
-            src/io/socket/UDP_W32.cpp include/ehs/io/socket/UDP_W32.h
-            src/io/socket/TCP_W32.cpp include/ehs/io/socket/TCP_W32.h
-            src/system/Semaphore_W32.cpp include/ehs/system/Semaphore_W32.h
-            src/system/System_W32.cpp include/ehs/system/System_W32.h
-            src/system/Mutex_W32.cpp include/ehs/system/Mutex_W32.h
-            src/system/Open_W32.cpp include/ehs/system/Open_W32.h
-            src/io/audio/audioDevice_W32.cpp include/ehs/io/audio/audioDevice_W32.h
-            src/io/File_W32.cpp include/ehs/io/File_W32.h
-            src/io/FileMonitor_W32.cpp include/ehs/io/FileMonitor_W32.h
-            src/io/Window_W32.cpp include/ehs/io/Window_W32.h
-            src/io/COM.cpp include/ehs/io/COM.h
-            src/system/CPU_MSVC_AMD64.asm src/HRNG_MSVC.asm src/Math_MSVC_AMD64.asm
-    )
-elseif (IS_OS_LINUX)
-    list(APPEND EHS_SOURCES
-            src/io/socket/UDP_BSD.cpp include/ehs/io/socket/UDP_BSD.h
-            src/io/socket/TCP_BSD.cpp include/ehs/io/socket/TCP_BSD.h
-            src/system/Semaphore_P.cpp include/ehs/system/Semaphore_P.h
-            src/system/System_LNX.cpp include/ehs/system/System_LNX.h
-            src/system/Open_UNX.cpp include/ehs/system/Open_UNX.h
-            src/io/File_UNX.cpp include/ehs/io/File_UNX.h
-            src/io/FileMonitor_UNX.cpp include/ehs/io/FileMonitor_UNX.h
-            src/system/Mutex_PT.cpp include/ehs/system/Mutex_PT.h
-            src/io/audio/AudioDevice_ALSA.cpp include/ehs/io/audio/AudioDevice_ALSA.h
-            src/system/FileSystem.cpp include/ehs/system/FileSystem.h
-            src/system/User.cpp include/ehs/system/User.h
+        src/io/socket/UDP_W32.cpp include/ehs/io/socket/UDP_W32.h
+        src/io/socket/TCP_W32.cpp include/ehs/io/socket/TCP_W32.h
+        src/io/socket/DNS_W32.cpp include/ehs/io/socket/DNS_W32.h
+        src/system/Semaphore_W32.cpp include/ehs/system/Semaphore_W32.h
+        src/system/System_W32.cpp include/ehs/system/System_W32.h
+        src/system/Mutex_W32.cpp include/ehs/system/Mutex_W32.h
+        src/system/Open_W32.cpp include/ehs/system/Open_W32.h
+        src/io/audio/audioDevice_W32.cpp include/ehs/io/audio/audioDevice_W32.h
+        src/io/File_W32.cpp include/ehs/io/File_W32.h
+        src/io/FileMonitor_W32.cpp include/ehs/io/FileMonitor_W32.h
+        src/io/Window_W32.cpp include/ehs/io/Window_W32.h
+        src/io/COM.cpp include/ehs/io/COM.h
+        src/system/CPU_MSVC_AMD64.asm src/HRNG_MSVC.asm src/Math_MSVC_AMD64.asm
+        src/io/Directory_W32.cpp include/ehs/io/Directory_W32.h
+        include/ehs/io/socket/ICMP_W32.h src/io/socket/ICMP_W32.cpp
+        src/system/AVX2_MSVC_AMD64.asm src/system/AVX512_MSVC_AMD64.asm
    )

-    set(LINUX_WINDOW_SYSTEM "Wayland" CACHE STRING "Linux Window System")
+elseif (IS_OS_LINUX)
+    list(APPEND EHS_SOURCES
+        src/io/socket/UDP_BSD.cpp include/ehs/io/socket/UDP_BSD.h
+        src/io/socket/TCP_BSD.cpp include/ehs/io/socket/TCP_BSD.h
+        src/io/socket/DNS_LNX.cpp include/ehs/io/socket/DNS_LNX.h
+        src/system/Semaphore_P.cpp include/ehs/system/Semaphore_P.h
+        src/system/System_LNX.cpp include/ehs/system/System_LNX.h
+        src/system/Open_UNX.cpp include/ehs/system/Open_UNX.h
+        src/io/File_UNX.cpp include/ehs/io/File_UNX.h
+        src/io/FileMonitor_UNX.cpp include/ehs/io/FileMonitor_UNX.h
+        src/system/Mutex_PT.cpp include/ehs/system/Mutex_PT.h
+        src/io/audio/AudioDevice_PW.cpp include/ehs/io/audio/AudioDevice_PW.h
+        src/system/FileSystem.cpp include/ehs/system/FileSystem.h
+        src/system/User.cpp include/ehs/system/User.h
+        src/io/Directory_LNX.cpp include/ehs/io/Directory_LNX.h
+        src/io/Usb_LNX.cpp include/ehs/io/Usb_LNX.h
+        include/ehs/io/socket/ICMP_LNX.h src/io/socket/ICMP_LNX.cpp
+    )
+
+    set(LINUX_WINDOW_SYSTEM "XCB" CACHE STRING "Linux Window System")

    if (LINUX_WINDOW_SYSTEM STREQUAL "Wayland")
        add_compile_definitions(EHS_WS_WAYLAND)
-        list(APPEND EHS_SOURCES src/io/xdg-shell-protocol.c include/ehs/io/xdg-shell-client-protocol.h src/io/Window_Way.cpp include/ehs/io/Window_Way.h)
+        list(APPEND EHS_SOURCES
+                src/io/xdg-shell-protocol.c include/ehs/io/xdg-shell-client-protocol.h
+                src/io/xdg-decoration.c include/ehs/io/xdg-decoration.h
+                src/io/Window_Way.cpp include/ehs/io/Window_Way.h)
        message("Building for Wayland.")
    elseif (LINUX_WINDOW_SYSTEM STREQUAL "XCB")
        add_compile_definitions(EHS_WS_XCB)
@@ -205,32 +260,43 @@ elseif (IS_OS_LINUX)
    endif ()

    if (IS_ARCH_AMD64)
-        list(APPEND EHS_SOURCES src/system/CPU_GCC_AMD64.asm src/HRNG_GCC.asm src/Math_GCC_AMD64.asm)
+        list(APPEND EHS_SOURCES src/system/CPU_GCC_AMD64.asm src/HRNG_GCC.asm src/Math_GCC_AMD64.asm src/system/AVX2_GCC_AMD64.asm src/system/AVX512_GCC_AMD64.asm)
    elseif (IS_ARCH_ARM64)
-        list(APPEND EHS_SOURCES src/system/CPU_ARM64.cpp src/HRNG_ARM64.cpp src/Math_GCC_ARM64.s)
+        list(APPEND EHS_SOURCES src/system/CPU_ARM64.cpp src/system/CPU_GCC_AARCH64.s src/HRNG_ARM64.cpp src/Math_GCC_ARM64.s src/system/AVX2_AARCH64.cpp src/system/AVX512_AARCH64.cpp)
    endif ()
 endif()

-#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
-#message("${CMAKE_CXX_FLAGS}")
-
-add_library(EHS ${EHS_SOURCES})
-
+add_library(EHS_Stc STATIC ${EHS_SOURCES})
+add_library(EHS_Dyn SHARED ${EHS_SOURCES} Assembly.def)
 add_executable(StrToHash src/StrToHash.cpp)

-target_include_directories(EHS PUBLIC ${PROJECT_SOURCE_DIR}/include)
+target_compile_definitions(EHS_Dyn PRIVATE EHS_LIB_EXPORT)
+
+target_include_directories(EHS_Stc PUBLIC ${PROJECT_SOURCE_DIR}/include)
+target_include_directories(EHS_Dyn PUBLIC ${PROJECT_SOURCE_DIR}/include)

 if (IS_OS_LINUX)
    set(CMAKE_INSTALL_PREFIX "${USER_HOME_DIRECTORY}/.local")
+    install(TARGETS EHS_Dyn LIBRARY DESTINATION "bin")
+
+    find_package(PkgConfig REQUIRED)
+    pkg_check_modules(PIPEWIRE REQUIRED libpipewire-0.3)
+
+    target_include_directories(EHS_Stc PRIVATE ${PIPEWIRE_INCLUDE_DIRS})
+    target_include_directories(EHS_Dyn PRIVATE ${PIPEWIRE_INCLUDE_DIRS})
 elseif (IS_OS_WINDOWS)
    set(CMAKE_INSTALL_PREFIX "${USER_HOME_DIRECTORY}/EHS")
+    install(TARGETS EHS_Dyn LIBRARY DESTINATION "lib")
+    install(TARGETS EHS_Dyn RUNTIME DESTINATION "bin")
+
+    file(GLOB DLL_FILES "${CMAKE_CURRENT_BINARY_DIR}/*.dll")
+    install(FILES ${DLL_FILES} DESTINATION "bin")
 endif ()

-install(TARGETS EHS DESTINATION lib)
+install(TARGETS EHS_Stc DESTINATION "lib")
+install(TARGETS StrToHash DESTINATION "bin")

-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/ DESTINATION include)
-
-install(TARGETS StrToHash DESTINATION bin)
+install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include/" DESTINATION "include")

 find_package(ZLIB REQUIRED)
 if (ZLIB_FOUND)
@@ -246,16 +312,22 @@ else ()
    message(STATUS "OpenSSL was not found.")
 endif ()

-target_link_libraries(EHS OpenSSL::SSL OpenSSL::Crypto ZLIB::ZLIB)
+target_link_libraries(EHS_Stc OpenSSL::SSL OpenSSL::Crypto ZLIB::ZLIB)
+target_link_libraries(EHS_Dyn OpenSSL::SSL OpenSSL::Crypto ZLIB::ZLIB)
+target_link_libraries(StrToHash OpenSSL::SSL OpenSSL::Crypto ZLIB::ZLIB)

 if (IS_OS_WINDOWS)
-    target_link_libraries(StrToHash ws2_32 avrt EHS)
+    target_link_libraries(EHS_Dyn avrt ws2_32 IPHLPAPI)
+    target_link_libraries(StrToHash ws2_32 avrt EHS_Stc)
 elseif (IS_OS_LINUX)
    if (LINUX_WINDOW_SYSTEM STREQUAL "Wayland")
+        target_link_libraries(EHS_Dyn wayland-client)
        target_link_libraries(StrToHash wayland-client)
    elseif (LINUX_WINDOW_SYSTEM STREQUAL "XCB")
+        target_link_libraries(EHS_Dyn xcb xcb-cursor xcb-xfixes xcb-xinput)
        target_link_libraries(StrToHash xcb xcb-cursor xcb-xfixes xcb-xinput)
    endif ()

-    target_link_libraries(StrToHash z asound EHS)
+    target_link_libraries(EHS_Dyn z pipewire-0.3)
+    target_link_libraries(StrToHash z EHS_Stc)
 endif ()
--- a/CMakePresets.json
+++ b/CMakePresets.json
@@ -1,12 +0,0 @@
-{
-  "version": 3,
-  "configurePresets": [
-    {
-      "name": "default",
-      "binaryDir": "${sourceDir}/build",
-      "cacheVariables": {
-        "CMAKE_TOOLCHAIN_FILE": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake"
-      }
-    }
-  ]
-}
--- a/README.md
+++ b/README.md
@@ -8,6 +8,7 @@ This project does not fully follow the C++ standard.
 ### Features
 - Audio IO/Processing/Manipulation
 - Image Processing/Manipulation
+- Databases
 - 3D Model & Mesh Processing/Manipulation
 - File IO
 - Basic File Monitoring
@@ -20,7 +21,8 @@ This project does not fully follow the C++ standard.
 - Mutexes
 - Semaphores
 - CPU information and features at runtime
- HTTP(S) Sockets
+- HTTP(S) Socket Layer
+- ICMP & ICMPv6 Socket
 - TCP Socket
 - UDP Socket
 - COM (Serial) IO
@@ -29,12 +31,15 @@ This project does not fully follow the C++ standard.
 - Twitch Integration
 - Json Parsing/Writing
 - User Friendly HID Input
- Basic Garbage Collector
+- Heap Garbage Collector
 - Linked List
 - Array
 - Vector
 - Asynchronous Task System
 - URI Parsing
+- USB (WIP)
+- Base64
+- SHA256

 ### Supported Architectures
 - AMD64
@@ -71,8 +76,10 @@ Wayland Window System. Wayland support is currently not fully supported yet, use
 - [CMake](https://cmake.org/)
 - [vcpkg](https://learn.microsoft.com/en-us/vcpkg/get_started/get-started?pivots=shell-cmd)

+`vcpkg install` - Use this command in the directory where `vcpkg.json` is located to download/install dependencies.
+
 ### Building
-`cmake -A x64 -DCMAKE_BUILD_TYPE=Release --preset=default /path/to/source`
+`cmake -A x64 -DCMAKE_BUILD_TYPE=Release /path/to/source`

 ### Compiling
 `cmake --build /path/to/build --config Release`
@@ -87,12 +94,10 @@ This will require the terminal to be running in administrator mode.
 #include <ehs/EHS.h>
 #include <ehs/io/Console.h>

-ehs::Int_32 Main(ehs::Str_8* appName, ehs::Str_8* appVerId, ehs::Version* appVer)
+int main()
 {
 	// Simple identifying meta-data for the logger.
-	*appName = "Simple Example App"; // The application's name
-	*appVerId = "Release"; // The app's version prefix; i.e. Alpha, Beta or Release as an example.
-	*appVer = {1, 0, 0}; // The app's version major, minor and patch number.
+	ehs::Initialize("Simple Example App", "Release", {1, 0, 0});
 	
 	ehs::Console::Write_8("How old are you?"); // Write to the console in UTF_8 character encoding.
 	
@@ -101,13 +106,15 @@ ehs::Int_32 Main(ehs::Str_8* appName, ehs::Str_8* appVerId, ehs::Version* appVer
 	if (!response.IsNum())
    {
 		ehs::Console::Clear(); // Clear the console's buffer.
-		return Main(appName, appVerId, appVer); // Repeat process if given response is not a number.
+		return main(); // Repeat process if given response is not a number.
    }
 	
 	ehs::UInt_8 age = response.ToDecimal<ehs::UInt_8>(); // Converts the string number into a number based primitive.
 	
 	ehs::Console::Write("Your age is " + ehs::Str_8::FromNum(age) + "."); // Write the console with the age converted back to string.

+    ehs::Uninitialize();
+
    return 0;
 }
 ```
--- a/include/ehs/Array.h
+++ b/include/ehs/Array.h
@@ -12,7 +12,7 @@ namespace ehs
    /// @tparam T Array data type to use.
    /// @tparam N Number data type to use.
 	template<typename T, typename N = UInt_64>
-	class Array : public BaseObj
+	class Array
    {
    protected:
        T* data;
@@ -20,7 +20,7 @@ namespace ehs

    public:
        /// Frees any data created on the heap.
-        ~Array() override
+        ~Array()
        {
            delete[] data;
        }
@@ -29,7 +29,6 @@ namespace ehs
        Array()
            : data(nullptr), size(0)
        {
-			AddType("Array");
        }

        /// Initializes an empty array with the given size.
@@ -37,7 +36,6 @@ namespace ehs
        explicit Array(const N size)
 			: data(new T[size]), size(size)
        {
-			AddType("Array");
        }

        /// Initializes this array with an initializer list object.
@@ -45,8 +43,6 @@ namespace ehs
        Array(std::initializer_list<T> list)
 			: data(new T[list.size()]), size(list.size())
        {
-			AddType("Array");
-
            N i = 0;
            for (auto v = list.begin(); v != list.end(); ++v)
                data[i++] = std::move(*v);
@@ -58,14 +54,12 @@ namespace ehs
        Array(const T* const data, const N size)
 			: data(new T[size]), size(size)
        {
-			AddType("Array");
-
            for (N i = 0; i < size; ++i)
                this->data[i] = data[i];
        }

 		Array(Array&& array) noexcept
-			: BaseObj(array), data(array.data), size(array.size)
+			: data(array.data), size(array.size)
 		{
 			array.data = nullptr;
 			array.size = 0;
@@ -74,7 +68,7 @@ namespace ehs
        /// Copies all members from the given array object.
        /// @param [in] array The array object to copy from.
        Array(const Array& array)
-			: BaseObj((BaseObj&&)array), data(new T[array.size]), size(array.size)
+			: data(new T[array.size]), size(array.size)
        {
            for (N i = 0; i < size; ++i)
                data[i] = array.data[i];
@@ -85,8 +79,6 @@ namespace ehs
 			if (this == &array)
 				return *this;

-			BaseObj::operator=((BaseObj&&)array);
-
 			delete[] data;
 			data = array.data;
 			size = array.size;
@@ -105,8 +97,6 @@ namespace ehs
            if (this == &array)
                return *this;

-			BaseObj::operator=(array);
-
 			delete[] data;
            data = new T[array.size];
            for (N i = 0; i < array.size; ++i)
--- a/include/ehs/Base64.h
+++ b/include/ehs/Base64.h
@@ -5,20 +5,29 @@

 namespace ehs
 {
-	class Base64
+	class EHS_LIB_IO Base64
 	{
 	private:
-		static const char ascii[];
+		static constexpr UInt_8 asciiUrl[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_";
+		static constexpr UInt_8 ascii[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
 		
 	public:
-		static Str_8 Encode(const Str_8 input);
+		static Str_8 EncodeURL(const Str_8 &input);

-		static Str_8 Decode(const Str_8 input);
+		static Str_8 Encode(const Str_8 &input);
+
+		static Str_8 DecodeURL(const Str_8 &input);
+
+		static Str_8 Decode(const Str_8 &input);
 		
 	private:
-		static char Find(const char c);
+		static UInt_8 FindURL(const UInt_8 &c);

-		static bool IsBase64(const char c);
+		static UInt_8 Find(const UInt_8 &c);
+
+		static bool IsBase64URL(const UInt_8 &c);
+
+		static bool IsBase64(const UInt_8 &c);
 		
 	};
 }
--- a/include/ehs/BaseObj.h
+++ b/include/ehs/BaseObj.h
@@ -5,7 +5,7 @@

 namespace ehs
 {
-    class BaseObj
+    class EHS_LIB_IO BaseObj
    {
    private:
 		Type* hierarchy;
--- a/include/ehs/Color3.h
+++ b/include/ehs/Color3.h
@@ -4,7 +4,7 @@

 namespace ehs
 {
-    class Color3
+    class EHS_LIB_IO Color3
    {
    public:
        float r;
@@ -13,13 +13,13 @@ namespace ehs

        Color3();

-        Color3(const float scalar);
+        Color3(float scalar);

-        Color3(const float r, const float g, const float b);
+        Color3(float r, float g, float b);

        Color3(const Color3& color);

-		Color3& operator=(const float scalar);
+		Color3& operator=(float scalar);

        Color3& operator=(const Color3& color);

@@ -27,9 +27,9 @@ namespace ehs

 		bool operator!=(const Color3& color) const;

-        float operator[](const UInt_64 i) const;
+        float operator[](UInt_64 i) const;

-        float& operator[](const UInt_64 i);
+        float& operator[](UInt_64 i);

 		Color3& operator*=(const Color3& color);

--- a/include/ehs/Color4.h
+++ b/include/ehs/Color4.h
@@ -5,7 +5,7 @@

 namespace ehs
 {
-    class Color4
+    class EHS_LIB_IO Color4
    {
    public:
        float r;
@@ -15,15 +15,15 @@ namespace ehs

        Color4();

-		Color4(const float scalar);
+		Color4(float scalar);

 		explicit Color4(const Color3& color);

-		Color4(const float r, const float g, const float b, const float a = 1.0f);
+		Color4(float r, float g, float b, float a = 1.0f);

        Color4(const Color4& color);

-		Color4& operator=(const float scalar);
+		Color4& operator=(float scalar);

 		Color4& operator=(const Color3& color);

@@ -33,9 +33,9 @@ namespace ehs

 		bool operator!=(const Color4& color) const;

-        float operator[](const UInt_64 i) const;
+        float operator[](UInt_64 i) const;

-        float& operator[](const UInt_64 i);
+        float& operator[](UInt_64 i);

 		Color4& operator*=(const Color4& color);

--- a/include/ehs/Data.h
+++ b/include/ehs/Data.h
@@ -5,7 +5,7 @@

 namespace ehs
 {
-    class Data
+    class EHS_LIB_IO Data
    {
    public:
        template<typename T>
--- a/include/ehs/DataType.h
+++ b/include/ehs/DataType.h
@@ -21,9 +21,9 @@ namespace ehs
 		UINT_8
 	};

-	DataType FromAudioBitDepth(UInt_16 bitDepth);
+	EHS_LIB_IO DataType FromAudioBitDepth(UInt_16 bitDepth);

-	UInt_8 ToByteDepth(DataType type);
+	EHS_LIB_IO UInt_8 ToByteDepth(DataType type);

-	UInt_8 ToBitDepth(DataType type);
+	EHS_LIB_IO UInt_8 ToBitDepth(DataType type);
 }
--- a/include/ehs/EHS.h
+++ b/include/ehs/EHS.h
@@ -13,51 +13,53 @@

 namespace ehs
 {
-    enum class MemoryPattern
+	enum class MemoryPattern
    {
        SPEED,
        SIZE
    };

+	EHS_LIB_IO void Initialize(Str_8 appName, Str_8 appVerId, const Version &appVer);
+
+	EHS_LIB_IO void Uninitialize();
+
 	/// Retrieves the UTF32 C-style string as "Event Horizon Standard"
 	/// @returns The result.
-    const Char_32* GetName_32();
+	EHS_LIB_IO const Char_32* GetName_32();

    /// Retrieves the UTF16 C-style string as "Event Horizon Standard"
    /// @returns The result.
-    const Char_16* GetName_16();
+	EHS_LIB_IO const Char_16* GetName_16();

    /// Retrieves the UTF8 C-style string as "Event Horizon Standard"
    /// @returns The result.
-    const Char_8* GetName_8();
+	EHS_LIB_IO const Char_8* GetName_8();

-	Str_8 GetAppName_8();
+	EHS_LIB_IO Str_8 GetAppName_8();

-    const Char_32* GetAcronym_32();
+	EHS_LIB_IO const Char_32* GetAcronym_32();

-    const Char_16* GetAcronym_16();
+	EHS_LIB_IO const Char_16* GetAcronym_16();

-    const Char_8* GetAcronym_8();
+	EHS_LIB_IO const Char_8* GetAcronym_8();

    /// Retrieves the version identifier in UTF32.
    /// @returns The result.
-    const Char_32* GetVersionId_32();
+	EHS_LIB_IO const Char_32* GetVersionId_32();

    /// Retrieves the version identifier in UTF16.
    /// @returns The result.
-    const Char_16* GetVersionId_16();
+	EHS_LIB_IO const Char_16* GetVersionId_16();

    /// Retrieves the version identifier in UTF8.
    /// @returns The result.
-    const Char_8* GetVersionId_8();
+	EHS_LIB_IO const Char_8* GetVersionId_8();

-	Str_8 GetAppVersionId_8();
+	EHS_LIB_IO Str_8 GetAppVersionId_8();

    /// Retrieves the current Event Horizon Standard version.
    /// @returns The result.
-	Version GetVersion();
+	EHS_LIB_IO Version GetVersion();

-	Version GetAppVersion();
+	EHS_LIB_IO Version GetAppVersion();
 };
-
-extern ehs::SInt_32 Main(ehs::Str_8* appName, ehs::Str_8* appVerId, ehs::Version* appVer);
--- a/include/ehs/GarbageCollector.h
+++ b/include/ehs/GarbageCollector.h
@@ -1,6 +1,5 @@
 #pragma once

-#include "EHS.h"
 #include "Vector.h"
 #include "BaseObj.h"
 #include "ehs/system/Mutex.h"
@@ -10,10 +9,10 @@ namespace ehs
 {
 	typedef bool (*GcLogic)(BaseObj*);

-	class GarbageCollector
+	class EHS_LIB_IO GC
 	{
 	private:
-		static Vector<GcLogic>* logic;
+		static Array<GcLogic> logic;
 		static Vector<BaseObj*> garbage;
 		static UInt_64 max;
 		static Thread thread;
@@ -27,13 +26,17 @@ namespace ehs

 		static void Stop();

+		static bool HasLogic(GcLogic logicCb);
+
+		static bool AddLogic(GcLogic logicCb);
+
 		/// Adds an object to the garbage pile to be deleted.
 		/// @param[in] obj The object to be deleted.
 		static void Add(BaseObj* obj);

 		/// Sets the maximum amount of garbage to delete per poll.
 		/// @param[in] newMax The new maximum.
-		static void SetMax(const UInt_64 newMax);
+		static void SetMax(UInt_64 newMax);

 		/// Gets the maximum amount of garbage to delete per poll.
 		/// @returns The maximum.
@@ -41,7 +44,7 @@ namespace ehs

 		/// Sets a new amount for memory pre-allocation to save on memory operations.
 		/// @param[in] newStride The stride to pre-allocate.
-		static void SetStride(const UInt_64 newStride);
+		static void SetStride(UInt_64 newStride);

 		/// The amount of data pre-allocated to save on memory operations.
 		/// @returns The stride.
@@ -59,5 +62,8 @@ namespace ehs
 		static void Dump();

 		static bool IsRunning();
+
+	private:
+		static bool ShouldDelete(BaseObj *obj);
 	};
 }
--- a/include/ehs/Log.h
+++ b/include/ehs/Log.h
@@ -9,26 +9,53 @@

 namespace ehs
 {
+	class Log;
+
+	typedef void (*LogRaisedCb)(const Log &);
+	typedef void (*LogOutputCb)(const Array<Log> &);
+
+	enum class LogType : UInt_8
+	{
+		SUCCESS,
+		ERR,
+		WARN,
+		INFO
+	};
+
 	/// A helper class for holding error information and handling them.
 	/// @tparam T The character data type to use.
 	/// @tparam N The number data type to use.
-	class Log
+	class EHS_LIB_IO Log
 	{
 	private:
-        static void (*logCb)(const Log&);
+		static void DefaultRaisedCb(const Log &log);
+
+		static void DefaultOutputCb(const Array<Log> &logs);
+
+        static LogRaisedCb raisedCb;
+		static LogOutputCb outputCb;
+		static Array<Log> logs;
 		static Log lastLog;
+		static bool immediate;
+		LogType type;
 		Array<Str_8> tags;
 		UInt_64 code;
 		Str_8 msg;

 	public:
-        static void SetCallback(void (*newLogCb)(const Log&));
+        static void SetRaisedCallback(LogRaisedCb newCb);

-        static void Raise(const Log& log);
+		static void SetOutputCallback(LogOutputCb newCb);
+
+		static void OnExit();
+
+        static void Raise(Log log);

 		/// Retrieves the last log raised.
 		static Log GetLastLog();

+		static void EnableImmediateMode(bool enable);
+
        /// Default members initialization.
 		Log();

@@ -36,22 +63,26 @@ namespace ehs
        /// @param [in] tags The tags to associate this log with.
 		/// @param [in] code The unique code to use.
        /// @param [in] msg Detailed information about what happened.
-		Log(std::initializer_list<Str_8> tags, const UInt_64 code, const Str_8& msg);
+		Log(LogType type, const Str_8 &tags, UInt_64 code, Str_8 msg);

        /// Initializes members with the given information.
        /// @param [in] tags The tags to associate this log with.
 		/// @param [in] code The unique code to use.
        /// @param [in] msg Detailed information about what happened.
-        Log(Array<Str_8>& tags, const UInt_64 code, const Str_8& msg);
+        Log(LogType type, Array<Str_8> tags, UInt_64 code, Str_8 msg);
+
+		Log(Log &&log) noexcept;

        /// Copies all members from the given log.
        /// @param [in] log The log to copy from.
-		Log(const Log& log);
+		Log(const Log &log);
+
+		Log &operator=(Log &&log) noexcept;

        /// Copies all members from the given log.
        /// @param [in] log The log to copy from.
        /// @returns The log that has been assigned to.
-        Log& operator=(const Log& log);
+        Log &operator=(const Log &log);

 		/*
        /// Compares with another given log.
@@ -65,24 +96,26 @@ namespace ehs
 		bool operator!=(const Log log);
 		*/

-        /// Checks whether or not this log has the given tags.
-        /// @param [in] tags The tags to look for.
-        /// @returns True if all tags were found, otherwise false.
-		bool HasTags(const std::initializer_list<Str_8> tags) const;
+		LogType GetType() const;

        /// Checks whether or not this log has the given tags.
        /// @param [in] tags The tags to look for.
        /// @returns True if all tags were found, otherwise false.
-		bool HasTags(const Array<Str_8>& tags) const;
+		bool HasTags(const std::initializer_list<Str_8> &tags) const;
+
+        /// Checks whether or not this log has the given tags.
+        /// @param [in] tags The tags to look for.
+        /// @returns True if all tags were found, otherwise false.
+		bool HasTags(const Array<Str_8> &tags) const;

 		/// Checks whether or not this log has the given tag.
 		/// @param [in] tag The tag to look for.
 		/// @returns True if tag was found, otherwise false.
-		bool HasTag(const Str_8& tag) const;
+		bool HasTag(const Str_8 &tag) const;

 		/// Retrieves all the tags.
 		/// @returns The result.
-        Array<Str_8> GetTags() const;
+        const Array<Str_8> &GetTags() const;

 		UInt_64 GetCode() const;

@@ -101,16 +134,20 @@ namespace ehs

 #ifndef EHS_LOG_INT
 	#ifdef EHS_DEBUG
-		#define EHS_LOG_INT(type, code, msg) Log::Raise({{type, GetAcronym_8(), EHS_FILE, EHS_FUNC, Str_8::FromNum((UInt_32)EHS_LINE)}, code, msg})
+		#define EHS_LOG_INT(type, code, msg) ehs::Log::Raise(ehs::Log(type, ehs::Str_8(ehs::GetAcronym_8()) + ", " + EHS_FILE + ", " + EHS_FUNC + ", " + ehs::Str_8::FromNum((ehs::UInt_32)EHS_LINE), code, msg))
 	#else
-		#define EHS_LOG_INT(type, code, msg) Log::Raise({{type, GetAcronym_8(), EHS_FUNC}, code, msg})
+		#define EHS_LOG_INT(type, code, msg) ehs::Log::Raise(ehs::Log(type, ehs::Str_8(ehs::GetAcronym_8()) + ", " + EHS_FUNC, code, msg))
 	#endif
 #endif

 #ifndef EHS_LOG
 	#ifdef EHS_DEBUG
-		#define EHS_LOG(type, code, msg) ehs::Log::Raise({{type, ehs::GetAppName_8(), EHS_FILE, EHS_FUNC, ehs::Str_8::FromNum((ehs::UInt_32)EHS_LINE)}, code, msg})
+		#define EHS_LOG(type, code, msg) ehs::Log::Raise(ehs::Log(type, ehs::Str_8(ehs::GetAppName_8()) + ", " + EHS_FILE + ", " + EHS_FUNC + ", " + ehs::Str_8::FromNum((ehs::UInt_32)EHS_LINE), code, msg))
 	#else
-		#define EHS_LOG(type, code, msg) ehs::Log::Raise({{type, ehs::GetAppName_8(), EHS_FUNC}, code, msg})
+		#define EHS_LOG(type, code, msg) ehs::Log::Raise(ehs::Log(type, ehs::Str_8(ehs::GetAppName_8()) + ", " + EHS_FUNC, code, msg))
 	#endif
 #endif
+
+#ifndef EHS_LOG_SUCCESS
+	#define EHS_LOG_SUCCESS() ehs::Log::Raise({})
+#endif
--- a/include/ehs/Mat2.h
+++ b/include/ehs/Mat2.h
@@ -120,7 +120,7 @@ namespace ehs

 		Mat2<T> GetMinor() const
 		{
-			Mat2<T> result(0);
+			Mat2<T> result;
 			result.data[0] = data[3];
 			result.data[1] = data[2];
 			result.data[2] = data[1];
@@ -187,7 +187,7 @@ namespace ehs
 		Mat2<T> GetInverse() const
 		{
 			T det = GetDeterminant();
-			if (Math::ComCmp(det, 0.0f))
+			if (Math::ComCmp(det, 0))
 				return {};

 			return GetAdjugate() * (1 / det);
@@ -196,7 +196,7 @@ namespace ehs
 		void Inverse()
 		{
 			T det = GetDeterminant();
-			if (Math::ComCmp(det, 0.0f))
+			if (Math::ComCmp(det, 0))
 				return;

 			Adjugate();
@@ -212,6 +212,9 @@ namespace ehs
 		}
 	};

+	template class EHS_LIB_IO Mat2<float>;
+	template class EHS_LIB_IO Mat2<double>;
+
 	typedef Mat2<float> Mat2_f;
 	typedef Mat2<double> Mat2_d;
 }
--- a/include/ehs/Mat3.h
+++ b/include/ehs/Mat3.h
@@ -50,7 +50,7 @@ namespace ehs
 			Mat2<T> result;

 			for (UInt_8 i = 0; i < 4; ++i)
-				result.data[i] = data[i / 2 * 4 + i % 2];
+				result[i] = data[i / 2 * 4 + i % 2];

 			return result;
 		}
@@ -234,7 +234,7 @@ namespace ehs
 		Mat3<T> GetInverse() const
 		{
 			T det = GetDeterminant();
-			if (Math::ComCmp(det, 0.0f))
+			if (Math::ComCmp(det, 0))
 				return {};

 			return GetAdjugate() * (1 / det);
@@ -243,7 +243,7 @@ namespace ehs
 		void Inverse()
 		{
 			T det = GetDeterminant();
-			if (Math::ComCmp(det, 0.0f))
+			if (Math::ComCmp(det, 0))
 				return;

 			Adjugate();
@@ -317,6 +317,9 @@ namespace ehs
 		}
 	};

+	template class EHS_LIB_IO Mat3<float>;
+	template class EHS_LIB_IO Mat3<double>;
+
 	typedef Mat3<float> Mat3_f;
 	typedef Mat3<double> Mat3_d;
 }
--- a/include/ehs/Mat4.h
+++ b/include/ehs/Mat4.h
@@ -268,7 +268,7 @@ namespace ehs
 		Mat4<T> GetInverse() const
 		{
 			T det = GetDeterminant();
-			if (Math::ComCmp(det, 0.0f))
+			if (Math::ComCmp(det, 0))
 				return {};

 			return GetAdjugate() * (1 / det);
@@ -277,7 +277,7 @@ namespace ehs
 		void Inverse()
 		{
 			T det = GetDeterminant();
-			if (Math::ComCmp(det, 0.0f))
+			if (Math::ComCmp(det, 0))
 				return;

 			Adjugate();
@@ -332,14 +332,14 @@ namespace ehs

 		static Mat4<T> YawRotate(const T angle)
 		{
-			T radians = Math::Rads(angle);
+			T radians = Math::Rads<T>(angle);

 			Mat4<T> result;
-			result.data[0] = Math::Cos(radians);
-			result.data[2] = -Math::Sin(radians);
+			result.data[0] = Math::Cos<T>(radians);
+			result.data[2] = -Math::Sin<T>(radians);
 			result.data[5] = 1;
-			result.data[8] = Math::Sin(radians);
-			result.data[10] = Math::Cos(radians);
+			result.data[8] = Math::Sin<T>(radians);
+			result.data[10] = Math::Cos<T>(radians);
 			result.data[15] = 1;

 			return result;
@@ -347,7 +347,7 @@ namespace ehs

 		static Mat4<T> RollRotate(const T angle)
 		{
-			T radians = Math::Rads(angle);
+			T radians = Math::Rads<T>(angle);

 			Mat4<T> result;
 			result.data[0] = Math::Cos(radians);
@@ -367,7 +367,7 @@ namespace ehs

 		static Mat4<T> RH_Perspective(const T fov, const T aspect, const T zNear, const T zFar)
 		{
-			const float tanHalfFovy = tan(Math::Rads(fov) / 2.0f);
+			const T tanHalfFovy = Math::Tan<T>(Math::Rads(fov) / 2.0f);

 			Mat4<T> result;
 			result[0] = 1.0f / (aspect * tanHalfFovy);
@@ -380,7 +380,7 @@ namespace ehs

 		static Mat4<T> LH_Perspective(const T fov, const T aspect, const T zNear, const T zFar)
 		{
-			const float tanHalfFovy = Math::Tan(Math::Rads(fov) / 2.0f);
+			const T tanHalfFovy = Math::Tan<T>(Math::Rads(fov) / 2.0f);

 			Mat4<T> result;
 			result[0] = 1.0f / (aspect * tanHalfFovy);
@@ -421,6 +421,9 @@ namespace ehs
 		}
 	};

+	template class EHS_LIB_IO Mat4<float>;
+	template class EHS_LIB_IO Mat4<double>;
+
 	typedef Mat4<float> Mat4_f;
 	typedef Mat4<double> Mat4_d;
 }
--- a/include/ehs/Math.h
+++ b/include/ehs/Math.h
@@ -6,7 +6,7 @@

 namespace ehs
 {
-	class Math
+	class EHS_LIB_IO Math
 	{
    private:
        static float Sqrt_AVX(const float from);
@@ -26,22 +26,22 @@ namespace ehs
 		constexpr static double dblEpsilon = 1e-16;

 		/// Absolute tolerance comparison for single precision floats.
-		static bool AbsCmp(const float a, const float b);
+		static bool AbsCmp(float a, float b);

 		/// Absolute tolerance comparison for double precision floats.
-		static bool AbsCmp(const double a, const double b);
+		static bool AbsCmp(double a, double b);

 		/// Relative tolerance comparison for single precision floats.
-		static bool RelCmp(const float a, const float b);
+		static bool RelCmp(float a, float b);

 		/// Relative tolerance comparison for double precision floats.
-		static bool RelCmp(const double a, const double b);
+		static bool RelCmp(double a, double b);

 		/// Combined absolute and relative tolerance comparison for single precision floats.
-		static bool ComCmp(const float a, const float b);
+		static bool ComCmp(float a, float b);

 		/// Combined absolute and relative tolerance comparison for double precision floats.
-		static bool ComCmp(const double a, const double b);
+		static bool ComCmp(double a, double b);

 		template<typename T = float>
 		static T Max(const T a, const T b)
@@ -101,29 +101,113 @@ namespace ehs
 			return from * 57.295779513082320876798154814105;
 		}

+		template <typename T = float>
+		static T Exp(const T x)
+		{
+			T sum = 1;
+			T term = 1;
+
+			for (int n = 1; n <= 20; ++n)
+			{
+				term *= x / n;
+				sum += term;
+			}
+
+			return sum;
+		}
+
+		template <typename T = float>
+		static T Ln_Taylor(T x)
+		{
+			T result = 0;
+			T term = (x - 1) / (x + 1);
+			T term_squared = term * term;
+			T denominator = 1;
+			T current_term = term;
+
+			for (int n = 0; n < 100; ++n)
+			{
+				result += current_term / denominator;
+				current_term *= term_squared;
+				denominator += 2;
+			}
+
+			return 2 * result;
+		}
+
+		template <typename T = float>
+		static T Ln(T x)
+		{
+			if (x <= 0)
+				return -1;
+
+			if (x == 1)
+				return 0;
+
+			SSize exp = 0;
+			while (x > 2)
+			{
+				x /= 2;
+				exp++;
+			}
+
+			while (x < 0.5)
+			{
+				x *= 2;
+				exp--;
+			}
+
+			T result = Ln_Taylor<T>(x);
+			result += exp * Ln_Taylor<T>(2);
+
+			return result;
+		}
+
 		/// A method for use of exponents.
 		/// @tparam T The data type to return;
 		/// @tparam I The data type to use as the exponent.
 		/// @param [in] from The value to use the exponent on.
 		/// @param [in] of The exponent.
 		/// @returns The result.
-		template<typename T = float, typename I = UInt_64>
-        static T Pow(const T from, const I of)
+		template<typename T = float, typename I = float>
+        static T Pow(const T base, const I exponent)
 		{
-            if (of < 0)
-            {
-                if (from == 0)
-                    return -0;
+			if (base == 0)
+				return (exponent == 0) ? 1 : 0;

-                return 1 / (from * Pow<T>(from, (-of) - 1));
-            }
+			if (exponent == 0)
+				return 1;

-            if (of == 0)
-                return 1;
-            else if (of == 1)
-                return from;
+			SSize intExp = (SSize)exponent;
+			bool isInteger = exponent == intExp;
+			bool isNeg = base < 0;

-			return from * Pow<T>(from, of - 1);
+			if (isNeg && isInteger)
+			{
+				T result = Exp<T>(exponent * Ln<T>(-base));
+				if ((SSize)exponent % 2)
+					result = -result;
+
+				return result;
+			}
+
+			if (isNeg && !isInteger)
+			{
+				T magnitude = Exp<T>(exponent * Ln<T>(-base));
+				T angle = exponent * Pi<T>();
+				T realPart = magnitude * Cos<T>(angle);
+				T imagPart = magnitude * Sin<T>(angle);
+
+				return realPart;
+			}
+
+			return Exp<T>(exponent * Ln<T>(base));
+		}
+
+		template <typename T = float>
+		static T Log10(const T x)
+		{
+			return Ln<T>(x) / Ln<T>(10);
 		}

        static float Near(const float from);
--- a/include/ehs/PtrData.h
+++ b/include/ehs/PtrData.h
@@ -10,9 +10,9 @@ namespace ehs
 		void* data;
 	};

-	bool HasPtrData(void* data);
+	EHS_LIB_IO bool HasPtrData(void* data);

-	void AddPtrData(void* data);
+	EHS_LIB_IO void AddPtrData(void* data);

-	bool RemovePtrData(void* data);
+	EHS_LIB_IO bool RemovePtrData(void* data);
 }
--- a/include/ehs/Rect.h
+++ b/include/ehs/Rect.h
@@ -130,7 +130,7 @@ namespace ehs
 				case 3:
 					return h;
 				default:
-					EHS_LOG_INT("Error", 0, "Index of, \"" + Str_8::FromNum(index) + "\" is out of range for a Rectangle.");
+					EHS_LOG_INT(LogType::ERR, 0, "Index of, \"" + Str_8::FromNum(index) + "\" is out of range for a Rectangle.");
 					return x;
 			}
 		}
@@ -148,7 +148,7 @@ namespace ehs
 				case 3:
 					return h;
 				default:
-					EHS_LOG_INT("Error", 0, "Index of, \"" + Str_8::FromNum(index) + "\" is out of range for a Rectangle.");
+					EHS_LOG_INT(LogType::ERR, 0, "Index of, \"" + Str_8::FromNum(index) + "\" is out of range for a Rectangle.");
 					return x;
 			}
 		}
--- a/include/ehs/SArray.h
+++ b/include/ehs/SArray.h
@@ -87,7 +87,7 @@ namespace ehs
 		{
 			if (index >= size)
 			{
-				EHS_LOG_INT("Warning", 0, "Cannot insert value at " + Str_8::FromNum(index) + " because it is outside of array range of " + size + ".");
+				EHS_LOG_INT(LogType::WARN, 0, "Cannot insert value at " + Str_8::FromNum(index) + " because it is outside of array range of " + size + ".");
 				return;
 			}

--- a/include/ehs/SHA256.h
+++ b/include/ehs/SHA256.h
@@ -0,0 +1,59 @@
+#pragma once
+#include "Types.h"
+
+namespace ehs
+{
+    class EHS_LIB_IO SHA256
+    {
+    private:
+        static UInt_32 ROTR(UInt_32 x, UInt_32 n);
+
+        static UInt_32 CH(UInt_32 x, UInt_32 y, UInt_32 z);
+
+        static UInt_32 MAJ(UInt_32 x, UInt_32 y, UInt_32 z);
+
+        static UInt_32 EP0(UInt_32 x);
+
+        static UInt_32 EP1(UInt_32 x);
+
+        static UInt_32 SIG0(UInt_32 x);
+
+        static UInt_32 SIG1(UInt_32 x);
+
+        static constexpr UInt_32 k[64] = {
+            0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5, 0x3956c25b, 0x59f111f1, 0x923f82a4, 0xab1c5ed5,
+            0xd807aa98, 0x12835b01, 0x243185be, 0x550c7dc3, 0x72be5d74, 0x80deb1fe, 0x9bdc06a7, 0xc19bf174,
+            0xe49b69c1, 0xefbe4786, 0x0fc19dc6, 0x240ca1cc, 0x2de92c6f, 0x4a7484aa, 0x5cb0a9dc, 0x76f988da,
+            0x983e5152, 0xa831c66d, 0xb00327c8, 0xbf597fc7, 0xc6e00bf3, 0xd5a79147, 0x06ca6351, 0x14292967,
+            0x27b70a85, 0x2e1b2138, 0x4d2c6dfc, 0x53380d13, 0x650a7354, 0x766a0abb, 0x81c2c92e, 0x92722c85,
+            0xa2bfe8a1, 0xa81a664b, 0xc24b8b70, 0xc76c51a3, 0xd192e819, 0xd6990624, 0xf40e3585, 0x106aa070,
+            0x19a4c116, 0x1e376c08, 0x2748774c, 0x34b0bcb5, 0x391c0cb3, 0x4ed8aa4a, 0x5b9cca4f, 0x682e6ff3,
+            0x748f82ee, 0x78a5636f, 0x84c87814, 0x8cc70208, 0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2
+        };
+
+        UInt_32 state[8];
+        UInt_64 bitLen;
+        Byte data[64];
+        UInt_64 dataLen;
+
+    public:
+        SHA256();
+
+        SHA256(SHA256 &&other) noexcept;
+
+        SHA256(const SHA256 &other);
+
+        SHA256 &operator=(SHA256 &&other) noexcept;
+
+        SHA256 &operator=(const SHA256 &other);
+
+        void Update(const Byte *data, UInt_64 len);
+
+        void Final(Byte hash[32]);
+
+        void Hash(const Byte *data, UInt_64 len, Byte hash[32]);
+
+    private:
+        void Transform(const Byte data[64]);
+    };
+}
--- a/include/ehs/Serializer.h
+++ b/include/ehs/Serializer.h
@@ -21,7 +21,7 @@
 namespace ehs
 {
 	template<typename N = UInt_64>
-	class Serializer : public BaseObj
+	class Serializer
 	{
 	private:
        Endianness endianness;
@@ -30,7 +30,7 @@ namespace ehs
        N offset;

 	public:
-        ~Serializer() override
+        ~Serializer()
 		{
            delete[] data;
 		}
@@ -38,32 +38,27 @@ namespace ehs
 		Serializer()
 			: endianness(Endianness::BE), data(nullptr), size(0), offset(0)
 		{
-			AddType("Serializer");
 		}

        Serializer(const Endianness endianness)
            : endianness(endianness), data(nullptr), size(0), offset(0)
        {
-			AddType("Serializer");
        }

        Serializer(const Endianness endianness, const N size)
            : endianness(endianness), data(new Byte[size]), size(size), offset(0)
        {
-			AddType("Serializer");
        }

 		Serializer(const Endianness endianness, const Byte* const data, const N size, const N offset = 0)
 			: endianness(endianness), data(new Byte[size]), size(size), offset(offset)
 		{
-			AddType("Serializer");
-
 			for (N i = 0; i < size; ++i)
 				this->data[i] = data[i];
 		}

 		Serializer(Serializer&& serializer) noexcept
-			: BaseObj((BaseObj&&)serializer), endianness(serializer.endianness), data(serializer.data),
+			: endianness(serializer.endianness), data(serializer.data),
 			size(serializer.size), offset(serializer.offset)
 		{
 			serializer.data = nullptr;
@@ -72,7 +67,7 @@ namespace ehs
 		}

 		Serializer(const Serializer& serializer)
-			: BaseObj(serializer), endianness(serializer.endianness), data(new Byte[serializer.size]),
+			: endianness(serializer.endianness), data(new Byte[serializer.size]),
 			size(serializer.size), offset(serializer.offset)
 		{
 			for (N i = 0; i < serializer.size; ++i)
@@ -84,8 +79,6 @@ namespace ehs
 			if (this == &serializer)
 				return *this;

-			BaseObj::operator=((Serializer&&)serializer);
-
 			endianness = serializer.endianness;
 			delete[] data;
 			data = serializer.data;
@@ -104,8 +97,6 @@ namespace ehs
            if (this == &serializer)
                return *this;

-			BaseObj::operator=(serializer);
-
            endianness = serializer.endianness;

 			delete[] data;
@@ -194,8 +185,7 @@ namespace ehs

                Byte* r = new Byte[this->size + remainder];

-                for (N i = 0; i < this->size; ++i)
-                    r[i] = data[i];
+				Util::Copy(r, data, this->size);

                delete[] data;
                data = r;
@@ -265,8 +255,7 @@ namespace ehs

                Byte* r = new Byte[size + remainder];

-                for (N i = 0; i < size; ++i)
-                    r[i] = data[i];
+				Util::Copy(r, data, size);

                delete[] data;
                data = r;
@@ -336,8 +325,7 @@ namespace ehs

                Byte* r = new Byte[size + remainder];

-                for (N i = 0; i < size; ++i)
-                    r[i] = data[i];
+				Util::Copy(r, data, size);

                delete[] data;
                data = r;
@@ -398,17 +386,87 @@ namespace ehs
            offset += sizeof(T) * value.Size();
        }

+		template<typename T, typename O = UInt_64>
+		void WriteStr(const T* str, N inSize = 0)
+		{
+			bool sizeKnown = inSize;
+
+			if (!sizeKnown)
+				while (str[inSize])
+					inSize++;
+
+			N bSize = sizeof(T) * inSize;
+			N bSizeN = bSize;
+			if (!sizeKnown)
+				bSizeN += sizeof(T);
+
+			if (bSizeN > size - offset)
+			{
+				N remainder = bSizeN - (size - offset);
+
+				Byte* r = new Byte[size + remainder];
+
+				Util::Copy(r, data, size);
+
+				delete[] data;
+				data = r;
+				size += remainder;
+			}
+
+			if (CPU::GetEndianness() == Endianness::LE)
+			{
+				if (endianness == Endianness::LE)
+				{
+					Util::Copy(&data[offset], &str[0], bSize);
+
+					if (!sizeKnown)
+						*(T*)&data[offset + inSize] = 0;
+				}
+				else
+				{
+					for (N i = 0; i < inSize; ++i)
+						for (N b = 0; b < sizeof(T); ++b)
+							data[offset + sizeof(T) * i + b] = ((Byte*)&str[i])[sizeof(T) - i - 1];
+
+					if (!sizeKnown)
+						*(T*)&data[offset + bSize] = 0;
+				}
+			}
+			else
+			{
+				if (endianness == Endianness::LE)
+				{
+					for (N i = 0; i < inSize; ++i)
+						for (N b = 0; b < sizeof(T); ++b)
+							data[offset + sizeof(T) * i + b] = ((Byte*)&str[i])[sizeof(T) - i - 1];
+
+					if (!sizeKnown)
+						*(T*)&data[offset + bSize] = 0;
+				}
+				else
+				{
+					Util::Copy(&data[offset], &str[0], bSize);
+
+					if (!sizeKnown)
+						*(T*)&data[offset + bSize] = 0;
+				}
+			}
+
+			offset += bSizeN;
+		}
+
        template<typename T, typename O = UInt_64>
        void WriteStr(const Str<T, O>& str)
        {
-            if (sizeof(N) + sizeof(T) * str.Size() > size - offset)
+			N inSize = sizeof(T) * (str.Size() + 1);
+
+            if (inSize > size - offset)
            {
-                N remainder = sizeof(N) + sizeof(T) * str.Size() - (size - offset);
+                N remainder = inSize - (size - offset);

                Byte* r = new Byte[size + remainder];

-                for (N i = 0; i < size; ++i)
-                    r[i] = data[i];
+				Util::Copy(r, data, size);

                delete[] data;
                data = r;
@@ -419,54 +477,38 @@ namespace ehs
            {
                if (endianness == Endianness::LE)
                {
-                    *(N*)&data[offset] = (N)str.Size();
+					Util::Copy(&data[offset], &str[0], str.Size(true));

-                    offset += sizeof(N);
-
-                    for (N i = 0; i < str.Size(); ++i)
-                        *(T*)&data[offset + i * sizeof(T)] = str[i];
+					*(T*)&data[offset + str.Size(true)] = 0;
                }
                else
                {
-                    N tmpSize = (N)str.Size();
-
-                    for (N i = 0; i < sizeof(N); ++i)
-                        data[offset + i] = ((Byte*)&tmpSize)[sizeof(N) - i - 1];
-
-                    offset += sizeof(N);
-
                    for (N i = 0; i < str.Size(); ++i)
                        for (N b = 0; b < sizeof(T); ++b)
-                            data[offset + i * sizeof(T) + b] = ((Byte*)&str[i])[sizeof(T) - i - 1];
+                            data[offset + sizeof(T) * i + b] = ((Byte*)&str[i])[sizeof(T) - i - 1];
+
+					*(T*)&data[offset + str.Size(true)] = 0;
                }
            }
            else
            {
                if (endianness == Endianness::LE)
                {
-                    N tmpSize = (N)str.Size();
-
-                    for (N i = 0; i < sizeof(N); ++i)
-                        data[offset + i] = ((Byte*)&tmpSize)[sizeof(N) - i - 1];
-
-                    offset += sizeof(N);
-
                    for (N i = 0; i < str.Size(); ++i)
                        for (N b = 0; b < sizeof(T); ++b)
-                            data[offset + i * sizeof(T) + b] = ((Byte*)&str[i])[sizeof(T) - i - 1];
+                            data[offset + sizeof(T) * i + b] = ((Byte*)&str[i])[sizeof(T) - i - 1];
+
+					*(T*)&data[offset + str.Size(true)] = 0;
                }
                else
                {
-                    *(N*)&data[offset] = (N)str.Size();
+					Util::Copy(&data[offset], &str[0], str.Size(true));

-                    offset += sizeof(N);
-
-                    for (N i = 0; i < str.Size(); ++i)
-                        *(T*)&data[offset + i * sizeof(T)] = str[i];
+					*(T*)&data[offset + str.Size(true)] = 0;
                }
            }

-            offset += str.Size() * sizeof(T);
+            offset += inSize;
        }

        void WriteVersion(const Version& value)
@@ -477,8 +519,7 @@ namespace ehs

                Byte* r = new Byte[size + remainder];

-                for (N i = 0; i < size; ++i)
-                    r[i] = data[i];
+				Util::Copy(r, data, size);

                delete[] data;
                data = r;
@@ -518,8 +559,7 @@ namespace ehs

                Byte* r = new Byte[size + remainder];

-                for (N i = 0; i < size; ++i)
-                    r[i] = data[i];
+				Util::Copy(r, data, size);

                delete[] data;
                data = r;
@@ -559,8 +599,7 @@ namespace ehs

                Byte* r = new Byte[size + remainder];

-                for (N i = 0; i < size; ++i)
-                    r[i] = data[i];
+				Util::Copy(r, data, size);

                delete[] data;
                data = r;
@@ -599,8 +638,7 @@ namespace ehs

                Byte* r = new Byte[size + remainder];

-                for (N i = 0; i < size; ++i)
-                    r[i] = data[i];
+				Util::Copy(r, data, size);

                delete[] data;
                data = r;
@@ -640,8 +678,7 @@ namespace ehs

                Byte* r = new Byte[size + remainder];

-                for (N i = 0; i < size; ++i)
-                    r[i] = data[i];
+				Util::Copy(r, data, size);

                delete[] data;
                data = r;
@@ -681,8 +718,7 @@ namespace ehs

 				Byte* r = new Byte[size + remainder];

-				for (N i = 0; i < size; ++i)
-					r[i] = data[i];
+				Util::Copy(r, data, size);

 				delete[] data;
 				data = r;
@@ -721,8 +757,7 @@ namespace ehs

                Byte* r = new Byte[size + remainder];

-                for (N i = 0; i < size; ++i)
-                    r[i] = data[i];
+				Util::Copy(r, data, size);

                delete[] data;
                data = r;
@@ -762,8 +797,7 @@ namespace ehs

 				Byte* r = new Byte[size + remainder];

-				for (N i = 0; i < size; ++i)
-					r[i] = data[i];
+				Util::Copy(r, data, size);

 				delete[] data;
 				data = r;
@@ -803,8 +837,7 @@ namespace ehs

 				Byte* r = new Byte[size + remainder];

-				for (N i = 0; i < size; ++i)
-					r[i] = data[i];
+				Util::Copy(r, data, size);

 				delete[] data;
 				data = r;
@@ -844,8 +877,7 @@ namespace ehs

 				Byte* r = new Byte[size + remainder];

-				for (N i = 0; i < size; ++i)
-					r[i] = data[i];
+				Util::Copy(r, data, size);

 				delete[] data;
 				data = r;
@@ -885,8 +917,7 @@ namespace ehs

                Byte* r = new Byte[size + remainder];

-                for (N i = 0; i < size; ++i)
-                    r[i] = data[i];
+				Util::Copy(r, data, size);

                delete[] data;
                data = r;
@@ -944,6 +975,26 @@ namespace ehs
 			offset += ser.Size();
 		}

+		void WritePadding(const N size)
+		{
+			if (size > this->size - offset)
+			{
+				N remainder = size - (this->size - offset);
+
+				Byte* r = new Byte[this->size + remainder];
+
+				Util::Copy(r, data, this->size);
+
+				delete[] data;
+				data = r;
+				this->size += remainder;
+			}
+
+			Util::Zero(&data[offset], size);
+
+			offset += size;
+		}
+
        template<typename T>
        void Write(const T value)
        {
@@ -953,8 +1004,7 @@ namespace ehs

                Byte* r = new Byte[size + remainder];

-                for (N i = 0; i < size; ++i)
-                    r[i] = data[i];
+				Util::Copy(r, data, size);

                delete[] data;
                data = r;
@@ -985,7 +1035,10 @@ namespace ehs
        void ReadArray(T* const value, O* const size)
        {
            if (!*size)
-                *size = (O)Read<N>();
+            {
+	            *size = (O)Read<N>();
+            	return;
+            }

            for (N i = 0; i < *size; ++i)
                value[i] = Read<T>();
@@ -1013,13 +1066,40 @@ namespace ehs
            return result;
        }

-        template<typename T, typename O>
-        Str<T, O> ReadStr(const O size = 0)
+        template<typename T = Char_8, typename O = UInt_64>
+        Str<T, O> ReadStr(O size = 0)
        {
-            Str<T, O> result(size ? size : (O)Read<N>());
+			bool sizeKnown = size;

-            for (O i = 0; i < result.Size(); ++i)
-                result[i] = Read<T>();
+			if (!sizeKnown)
+				while (((T*)&data[offset])[size])
+					++size;
+
+            Str<T, O> result(size);
+
+			if (CPU::GetEndianness() == Endianness::LE)
+			{
+				if (endianness == Endianness::LE)
+					Util::Copy(&result[0], &data[offset], result.Size(true));
+				else
+					for (N i = 0; i < size; ++i)
+						for (N b = 0; b < sizeof(T); ++b)
+							((Byte*)&result[i])[b] = data[offset + sizeof(T) * i + b];
+			}
+			else
+			{
+				if (endianness == Endianness::LE)
+					for (N i = 0; i < size; ++i)
+						for (N b = 0; b < sizeof(T); ++b)
+							((Byte*)&result[i])[b] = data[offset + sizeof(T) * i + b];
+				else
+					Util::Copy(&result[0], &data[offset], result.Size(true));
+			}
+
+			offset += result.Size(true);
+
+			if (!sizeKnown)
+				offset++;

            return result;
        }
@@ -1139,7 +1219,7 @@ namespace ehs
 		void Resize(const N newSize)
 		{
 			Byte* result = new Byte[newSize];
-            Util::Copy(result, data, size);
+            Util::Copy(result, data, newSize >= size ? size : newSize);
 			delete[] data;
 			data = result;
 			size = newSize;
--- a/include/ehs/Str.h
+++ b/include/ehs/Str.h
@@ -25,7 +25,7 @@ namespace ehs
    /// @tparam T The character's data type to use.
    /// @tparam N The number data type to use.
 	template<typename T = Char_8, typename N = UInt_64>
-	class Str : public BaseObj
+	class Str
 	{
 	private:
 		N size;
@@ -33,7 +33,7 @@ namespace ehs

 	public:
 	    /// Frees any data created on the heap.
-        ~Str() override
+        ~Str()
 		{
            delete[] data;
 		}
@@ -42,22 +42,22 @@ namespace ehs
 		Str()
 			: size(0), data(nullptr)
 		{
-			AddType("Str");
 		}

 		/// Initializes members with given C-style string.
 		/// @param [in] str The C-style string.
 		/// @param [in] size The size of the given C-style string.
 		Str(const T* const str, const N size)
-			: size((size) ? size : Len(str)), data(nullptr)
+			: size(size), data(nullptr)
 		{
+        	if (!size)
+        		return;
+
 			data = new T[this->size + 1];

            Util::Copy(data, str, Size(true));

 			data[this->size] = 0;
-
-			AddType("Str");
 		}

 		/// Initializes members with given C-style string.
@@ -70,8 +70,6 @@ namespace ehs
            Util::Copy(data, str, Size(true));

 			data[size] = 0;
-
-			AddType("Str");
 		}

 		/// Initializes string with the given size.
@@ -80,13 +78,11 @@ namespace ehs
 			: size(size), data(new T[size + 1])
 		{
 			data[size] = 0;
-
-			AddType("Str");
 		}

 		/// A move constructor.
 		Str(Str&& str) noexcept
-			: BaseObj((BaseObj&&)str), size(str.size), data(str.data)
+			: size(str.size), data(str.data)
 		{
 			str.size = 0;
 			str.data = nullptr;
@@ -95,7 +91,7 @@ namespace ehs
 		/// Copies all members from the given string object.
 		/// @param [in] str The string object to copy from.
 		Str(const Str& str)
-			: BaseObj(str), size(str.size), data(new T[size + 1])
+			: size(str.size), data(new T[size + 1])
 		{
            Util::Copy(data, str.data, Size(true));

@@ -107,8 +103,6 @@ namespace ehs
 			if (this == &str)
 				return *this;

-			BaseObj::operator=((BaseObj&&)str);
-
 			size = str.size;
 			delete[] data;
 			data = str.data;
@@ -127,8 +121,6 @@ namespace ehs
 	        if (&str == this)
 	            return *this;

-			BaseObj::operator=(str);
-
 			size = str.size;

            delete[] data;
@@ -564,7 +556,7 @@ namespace ehs
                return;
            }

-            Util::Copy(data[dstOffset], src, src.Size(true));
+            Util::Copy(&data[dstOffset], src, src.Size(true));
        }

        /// Copies a C-style string to the referenced string object.
@@ -580,7 +572,7 @@ namespace ehs
                return;
            }

-            Util::Copy(data[dstOffset], src, srcSize * sizeof(T));
+            Util::Copy(&data[dstOffset], src, srcSize * sizeof(T));
        }

 		/// Copies a C-style string to the referenced string object.
@@ -595,7 +587,7 @@ namespace ehs
 	            return;
            }

-            Util::Copy(data[dstOffset], src, srcSize * sizeof(T));
+            Util::Copy(&data[dstOffset], src, srcSize * sizeof(T));
        }

 		/// Inserts a string at a specified index.
@@ -747,7 +739,7 @@ namespace ehs

            T* result = new T[size + inSize + 1];
            Util::Copy(result, data, Size(true));
-            Util::Copy(result[size], value, inSize * sizeof(T));
+            Util::Copy(&result[size], value, inSize * sizeof(T));

            result[size + inSize] = 0;

@@ -925,10 +917,10 @@ namespace ehs
 		}

 		/// Splits a string into a Vector with the given separator.
-		/// @param [in] ide The given string as the separator.
+		/// @param [in] delimeter The given string as the separator.
 		/// @param [in] max The max amount of times to split the string.
 		/// @returns The resulting string object.
-		Vector<Str<T, N>, N> Split(const Str<T, N>& ide, const N max = 0) const
+		Vector<Str<T, N>, N> Split(const Str<T, N>& delimeter, const N max = 0) const
 		{
 			Vector<Str<T, N>, N> result(0, 5);

@@ -936,9 +928,9 @@ namespace ehs

 			for (N i = 0, c = 0; i < size; ++i)
 			{
-				if (data[i] == ide[c])
+				if (data[i] == delimeter[c])
 				{
-					if (++c == ide.Size())
+					if (++c == delimeter.Size())
 					{
 					    N r = i - (c - 1) - b;
 					    if (!r)
@@ -966,17 +958,17 @@ namespace ehs
 		}

 		/// Removes all instances of the ide.
-		/// @param [in] ide The string to look for.
+		/// @param [in] delimeter The string to look for.
 		/// @returns The resulting string object.
-		Str<T, N> RemoveAll(const Str<T, N>& ide) const
+		Str<T, N> RemoveAll(const Str<T, N>& delimeter) const
 		{
 			Str<T, N> result(size);

 			for (N i = 0, b = 0, c = 0; i < size; ++i)
 			{
-				if (data[i] == ide[c])
+				if (data[i] == delimeter[c])
 				{
-					if (++c == ide.Size())
+					if (++c == delimeter.Size())
 						c = 0;
 				}
 				else
@@ -995,18 +987,18 @@ namespace ehs
 		}

 		/// Replaces all instances of ide with the replacer.
-		/// @param [in] ide The string to look for.
+		/// @param [in] delimeter The string to look for.
 		/// @param [in] replacer The string placed.
 		/// @returns The resulting string object.
-		Str ReplaceAll(const Str& ide, const Str& replacer) const
+		Str ReplaceAll(const Str& delimeter, const Str& replacer) const
 		{
 			Str<T, N> result;

 			for (N i = 0, b = 0; i < size; ++i)
 			{
-				if (data[i] == ide[b])
+				if (data[i] == delimeter[b])
 				{
-					if (++b == ide.Size())
+					if (++b == delimeter.Size())
 					{
 						result.Push(replacer);
 						b = 0;
@@ -1022,20 +1014,20 @@ namespace ehs
 		}

 		/// Finds the first instance of the given string object.
-		/// @param [in] ide The string to look for.
+		/// @param [in] delimeter The string to look for.
 		/// @param [out] index The index of the string found. Can be a nullptr.
 		/// @param [in] pattern The search pattern for optimization.
 		/// @param [in] result What index to return where the first instance is found.
 		/// @returns The index where the instance was found with the result varying from the result parameter.
-		bool Find(const Str<T, N>& ide, N* const index = nullptr, const SearchPattern pattern = SearchPattern::LEFT_RIGHT, const IndexResult result = IndexResult::BEGINNING) const
+		bool Find(const Str<T, N> &delimeter, N* const index = nullptr, const SearchPattern pattern = SearchPattern::LEFT_RIGHT, const IndexResult result = IndexResult::BEGINNING) const
 		{
 			if (pattern == SearchPattern::LEFT_RIGHT)
 			{
 				for (N i = 0, c = 0; i < size; ++i)
 				{
-					if (data[i] == ide[c])
+					if (data[i] == delimeter[c])
 					{
-						if (++c == ide.Size())
+						if (++c == delimeter.Size())
 						{
 							if (result == IndexResult::BEGINNING)
                            {
@@ -1057,16 +1049,16 @@ namespace ehs
 			}
 			else if (pattern == SearchPattern::RIGHT_LEFT)
 			{
-				for (N i = size, c = ide.Size(); i > 0; --i)
+				for (N i = size, c = delimeter.Size(); i > 0; --i)
 				{
-					if (data[i - 1] == ide[c - 1])
+					if (data[i - 1] == delimeter[c - 1])
 					{
 						if (--c == 0)
 						{
 							if (result == IndexResult::BEGINNING)
                            {
                                if (index)
-                                    *index = i - (ide.Size() - 1);
+                                    *index = i - (delimeter.Size() - 1);

                                return true;
                            }
@@ -1086,18 +1078,18 @@ namespace ehs
 		}

 		/// Checks if the current string contains the given ide.
-		/// @param [in] ide The given ide to check for.
+		/// @param [in] delimeter The given ide to check for.
 		/// @param [in] pattern The search pattern to use.
 		/// @returns True if the current string does contain the ide.
-        bool Contains(const Str<T, N>& ide, const SearchPattern pattern = SearchPattern::LEFT_RIGHT) const
+        bool Contains(const Str<T, N>& delimeter, const SearchPattern pattern = SearchPattern::LEFT_RIGHT) const
        {
            if (pattern == SearchPattern::LEFT_RIGHT)
            {
                for (N i = 0, c = 0; i < size; ++i)
                {
-                    if (data[i] == ide[c])
+                    if (data[i] == delimeter[c])
                    {
-                        if (++c == ide.Size())
+                        if (++c == delimeter.Size())
                        {
                            return true;
                        }
@@ -1106,9 +1098,9 @@ namespace ehs
            }
            else if (pattern == SearchPattern::RIGHT_LEFT)
            {
-                for (N i = size, c = ide.Size(); i > 0; --i)
+                for (N i = size, c = delimeter.Size(); i > 0; --i)
                {
-                    if (data[i - 1] == ide[c - 1])
+                    if (data[i - 1] == delimeter[c - 1])
                    {
                        if (--c == 0)
                        {
@@ -1121,6 +1113,54 @@ namespace ehs
            return false;
        }

+		Vector<Str> ParseArgs() const
+        {
+	        Vector<Str> args;
+        	T *quoteStart = nullptr;
+        	T *spaceStart = nullptr;
+
+        	for (T *i = data; i <= data + size; ++i)
+        	{
+        		if (*i == '\"' && !spaceStart)
+        		{
+        			if (quoteStart)
+        			{
+        				args.Push(Str(quoteStart, i - quoteStart));
+        				quoteStart = nullptr;
+        			}
+        			else
+        			{
+        				if (i + 1 < &data[size - 1])
+        					quoteStart = i + 1;
+        				else
+        					args.Push({});
+        			}
+        		}
+        		else if (*i == ' ' && !quoteStart)
+        		{
+        			if (spaceStart)
+        			{
+        				args.Push(Str(spaceStart, i - spaceStart));
+        				spaceStart = i + 1;
+        			}
+        			else
+        			{
+        				if (i + 1 < &data[size - 1])
+        					spaceStart = i + 1;
+        				else
+        					args.Push({});
+        			}
+        		}
+        	}
+
+        	if (quoteStart)
+        		args.Push(Str(quoteStart, &data[size - 1] - (quoteStart - 1)));
+        	else if (spaceStart)
+        		args.Push(Str(spaceStart, &data[size - 1] - (spaceStart - 1)));
+
+        	return args;
+        }
+
 		/// Checks if the string represents a number. Must not have any alphabetical characters.
 		/// @returns The result.
 		bool IsNum() const
@@ -1271,8 +1311,11 @@ namespace ehs
 		/// @note Use "IsNum" before this if the string object is not guaranteed to be a number.
        float ToFloat() const
        {
+			Str<T, N> ide;
+			ide.Push(46);
+
            N decPoint = size;
-            Find(".", &decPoint);
+            Find(ide, &decPoint);

            float result = 0.0f;
            float fraction = 0.0f;
@@ -1297,8 +1340,11 @@ namespace ehs
 		/// @note Use "IsNum" before this if the string object is not guaranteed to be a number.
        double ToDouble() const
        {
+			Str<T, N> ide;
+			ide.Push(46);
+
            N decPoint = size;
-            Find(".", &decPoint);
+            Find(ide, &decPoint);

            double result = 0.0f;
            double fraction = 0.0f;
@@ -1323,8 +1369,11 @@ namespace ehs
 		/// @note Use "IsNum" before this if the string object is not guaranteed to be a number.
        long double ToLDouble() const
        {
+			Str<T, N> ide;
+			ide.Push(46);
+
            N decPoint = size;
-            Find(".", &decPoint);
+            Find(ide, &decPoint);

            long double result = 0.0f;
            long double fraction = 0.0f;
@@ -1679,7 +1728,7 @@ namespace ehs

 			Str<T, N> result;
 			if (whole < 0)
-				result += "-";
+				result.Push(45);

 			result += Str<T, N>::FromNum(whole);

@@ -1691,7 +1740,7 @@ namespace ehs
 			if (!fraction)
 				return result;

-			result += ".";
+			result.Push(46);

 			Str<T, N> fResult(maxDecimals);
 			N i = 0;
@@ -1721,7 +1770,7 @@ namespace ehs

 			Str<T, N> result;
 			if (whole < 0)
-				result += "-";
+				result.Push(45);

 			result += Str<T, N>::FromNum(whole);

@@ -1733,7 +1782,7 @@ namespace ehs
 			if (!fraction)
 				return result;

-			result += ".";
+			result.Push(46);

 			Str<T, N> fResult(maxDecimals);
 			N i = 0;
@@ -1763,7 +1812,7 @@ namespace ehs

 			Str<T, N> result;
 			if (whole < 0)
-				result += "-";
+				result.Push(45);

 			result += Str<T, N>::FromNum(whole);

@@ -1775,7 +1824,7 @@ namespace ehs
 			if (!fraction)
 				return result;

-			result += ".";
+			result.Push(46);

 			Str<T, N> fResult(maxDecimals);
 			N i = 0;
@@ -1795,23 +1844,23 @@ namespace ehs
 			return result;
        }

-        /// A 32-bit FNV-1a hash algorithm.
-        /// @param [in] str The string to hash.
-        /// @returns The resulting hash. Zero if string does not contain any characters.
-        static UInt_32 Hash_32(const Str<T, N>& str)
-        {
+		/// A 32-bit FNV-1a hash algorithm.
+		/// @param [in] str The string to hash.
+		/// @returns The resulting hash. Zero if string does not contain any characters.
+		static UInt_32 Hash_32(const Str<T, N>& str)
+		{
 			if (!str.Size())
 				return 0;

-            const Byte* const bytes = str.ToBytes();
+		    const Byte* const bytes = str.ToBytes();

-            UInt_32 hash = 2166136261ul;
+		    UInt_32 hash = 2166136261ul;

-	        for (N i = 0; i < str.Size(true); ++i)
-                hash = (hash ^ bytes[i]) * 16777619;
+		    for (N i = 0; i < str.Size(true); ++i)
+		        hash = (hash ^ bytes[i]) * 16777619;

-	        return hash;
-        }
+		    return hash;
+		}

 		/// A 32-bit FNV-1a hash algorithm.
 		/// @returns The resulting hash. Zero if string does not contain any characters.
@@ -1830,23 +1879,23 @@ namespace ehs
            return hash;
        }

-        /// A 64-bit FNV-1a hash algorithm.
-        /// @param [in] str The string to hash.
+		/// A 64-bit FNV-1a hash algorithm.
+		/// @param [in] str The string to hash.
 		/// @returns The resulting hash. Zero if string does not contain any characters.
-        static UInt_64 Hash_64(const Str<T, N>& str)
-        {
+		static UInt_64 Hash_64(const Str<T, N>& str)
+		{
 			if (!str.Size())
 				return 0;

-            const Byte* const bytes = str.ToBytes();
+		    const Byte* const bytes = str.ToBytes();

-            UInt_64 hash = 14695981039346656037ull;
+		    UInt_64 hash = 14695981039346656037ull;

-            for (N i = 0; i < str.Size(true); ++i)
-                hash = (hash ^ bytes[i]) * 1099511628211;
+		    for (N i = 0; i < str.Size(true); ++i)
+		        hash = (hash ^ bytes[i]) * 1099511628211;

-            return hash;
-        }
+		    return hash;
+		}

 		/// A 64-bit FNV-1a hash algorithm.
 		/// @returns The resulting hash. Zero if string does not contain any characters.
@@ -1870,6 +1919,9 @@ namespace ehs
 		/// @returns The character count.
        static N Len(const T* const str)
        {
+			if (!str)
+				return 0;
+
            N count = 0;
            while (str[count])
                ++count;
@@ -1888,14 +1940,14 @@ namespace ehs
            if (aSize != bSize)
                return false;

-            for (UInt_64 i = 0; i < aSize; ++i)
-                if (a[i] != b[i])
-                    return false;
-
-            return true;
+        	return Util::Compare(a, b, aSize);
        }
 	};

+	template class EHS_LIB_IO Str<Char_32, UInt_64>;
+	template class EHS_LIB_IO Str<Char_16, UInt_64>;
+	template class EHS_LIB_IO Str<Char_8, UInt_64>;
+
 	typedef Str<Char_32, UInt_64> Str_32;
 	typedef Str<Char_16, UInt_64> Str_16;
 	typedef Str<Char_8, UInt_64> Str_8;
--- a/include/ehs/Task.h
+++ b/include/ehs/Task.h
@@ -9,7 +9,7 @@ namespace ehs
 {
 	typedef void (*TaskCb)(Serializer<UInt_64>*);

-	class Task
+	class EHS_LIB_IO Task
 	{
 	private:
 		bool working;
--- a/include/ehs/Type.h
+++ b/include/ehs/Type.h
@@ -5,7 +5,7 @@

 namespace ehs
 {
-    class Type
+    class EHS_LIB_IO Type
    {
    private:
 		friend class BaseObj;
--- a/include/ehs/Types.h
+++ b/include/ehs/Types.h
@@ -1,6 +1,7 @@
 #pragma once

 #include "ehs/system/OS.h"
+#include "ehs/system/Architecture.h"

 #define EHS_MAX_PATH 0x104
 #define EHS_UINT_8_MAX 0xFF
@@ -25,6 +26,12 @@
 #define EHS_LDOUBLE_MAX 1.79769e+308
 #define EHS_LDOUBLE_MIN 2.22507e-308

+#if defined(EHS_64_BIT)
+	#define EHS_SIZE_MAX 0xFFFFFFFFFFFFFFFF
+#elif defined(EHS_32_BIT)
+	#define EHS_SIZE_MAX 0xFFFFFFFF
+#endif
+
 #define EHS_INFINITE EHS_UINT_32_MAX

 namespace ehs
@@ -52,4 +59,12 @@ namespace ehs
 		typedef signed long SInt_64;
 		typedef long Int_64;
 	#endif
+
+	#if defined(EHS_64_BIT)
+		typedef UInt_64 Size;
+		typedef SInt_64 SSize;
+	#elif defined(EHS_32_BIT)
+		typedef UInt_32 Size;
+		typedef SInt_32 SSize;
+	#endif
 }
--- a/include/ehs/URI.h
+++ b/include/ehs/URI.h
@@ -5,7 +5,7 @@

 namespace ehs
 {
-	class URI
+	class EHS_LIB_IO URI
 	{
 	public:
 		/// Encodes specialized characters in the URI.
--- a/include/ehs/UTF.h
+++ b/include/ehs/UTF.h
@@ -13,7 +13,7 @@ namespace ehs
    };

    /// A helper class for converting between UTF8, 16 and 32.
-	class UTF
+	class EHS_LIB_IO UTF
 	{
 	public:
 	    /// Converts the given UTF16 C-style string into UTF32.
--- a/include/ehs/Util.h
+++ b/include/ehs/Util.h
@@ -4,7 +4,7 @@

 namespace ehs
 {
-	class Util
+	class EHS_LIB_IO Util
 	{
 	public:
 		static bool Compare(const void* a, const void* b, UInt_64 size);
--- a/include/ehs/Vec2.h
+++ b/include/ehs/Vec2.h
@@ -229,7 +229,7 @@ namespace ehs
 				case 1:
 					return y;
 				default:
-					EHS_LOG_INT("Error", 0, "Index of, \"" + Str_8::FromNum(index) + "\" is out of range for a Vector 3.");
+					EHS_LOG_INT(LogType::ERR, 0, "Index of, \"" + Str_8::FromNum(index) + "\" is out of range for a Vector 3.");
 					return x;
 			}
 		}
@@ -243,7 +243,7 @@ namespace ehs
 				case 1:
 					return y;
 				default:
-					EHS_LOG_INT("Error", 0, "Index of, \"" + Str_8::FromNum(index) + "\" is out of range for a Vector 3.");
+					EHS_LOG_INT(LogType::ERR, 0, "Index of, \"" + Str_8::FromNum(index) + "\" is out of range for a Vector 3.");
 					return x;
 			}
 		}
--- a/include/ehs/Vec3.h
+++ b/include/ehs/Vec3.h
@@ -266,7 +266,7 @@ namespace ehs
 				case 2:
 					return z;
 				default:
-					EHS_LOG_INT("Error", 0, "Index of, \"" + Str_8::FromNum(index) + "\" is out of range for a Vector 3.");
+					EHS_LOG_INT(LogType::ERR, 0, "Index of, \"" + Str_8::FromNum(index) + "\" is out of range for a Vector 3.");
 					return x;
 			}
 		}
@@ -282,7 +282,7 @@ namespace ehs
 				case 2:
 					return z;
 				default:
-					EHS_LOG_INT("Error", 0, "Index of, \"" + Str_8::FromNum(index) + "\" is out of range for a Vector 3.");
+					EHS_LOG_INT(LogType::ERR, 0, "Index of, \"" + Str_8::FromNum(index) + "\" is out of range for a Vector 3.");
 					return x;
 			}
 		}
--- a/include/ehs/Vec4.h
+++ b/include/ehs/Vec4.h
@@ -279,7 +279,7 @@ namespace ehs
 			case 3:
 				return w;
            default:
-                EHS_LOG_INT("Error", 0, "Index of, \"" + Str_8::FromNum(index) + "\" is out of range for a Vector 4.");
+                EHS_LOG_INT(LogType::ERR, 0, "Index of, \"" + Str_8::FromNum(index) + "\" is out of range for a Vector 4.");
                return x;
 			}
 		}
@@ -297,7 +297,7 @@ namespace ehs
 			case 3:
 				return w;
            default:
-                EHS_LOG_INT("Error", 0, "Index of, \"" + Str_8::FromNum(index) + "\" is out of range for a Vector 4.");
+                EHS_LOG_INT(LogType::ERR, 0, "Index of, \"" + Str_8::FromNum(index) + "\" is out of range for a Vector 4.");
                return x;
 			}
 		}
--- a/include/ehs/Vector.h
+++ b/include/ehs/Vector.h
@@ -14,7 +14,7 @@ namespace ehs
    /// @tparam N Number data type to use.
    /// @note If extra memory is set to five then each time that memory is filled it will add five extra.
 	template<typename T, typename N = UInt_64>
-	class Vector : public BaseObj
+	class Vector
 	{
 	protected:
 		N rawSize;
@@ -24,7 +24,7 @@ namespace ehs

 	public:
        /// Frees any data created on the heap.
-        ~Vector() override
+        ~Vector()
 		{
            delete[] data;
 		}
@@ -33,7 +33,6 @@ namespace ehs
 		Vector()
 			: rawSize(0), size(0), stride(5), data(nullptr)
 		{
-			AddType("Vector");
 		}

 		/// Initializes members for pre-allocated memory to write to later.
@@ -42,7 +41,6 @@ namespace ehs
 		Vector(const N size, const N stride)
 			: rawSize(size + stride), size(size), stride(stride), data(new T[rawSize])
 		{
-			AddType("Vector");
 		}

        /// Initializes this vector with an initializer list object.
@@ -51,8 +49,6 @@ namespace ehs
        Vector(std::initializer_list<T> list, const N stride = 5)
 			: rawSize(0), size(list.size()), stride(stride), data(nullptr)
        {
-			AddType("Vector");
-
 			if (stride)
 			{
 				rawSize = list.size() / stride * stride;
@@ -78,8 +74,6 @@ namespace ehs
 		Vector(const T* data, const N size, const N stride)
 			: rawSize(0), size(size), stride(stride), data(nullptr)
 		{
-			AddType("Vector");
-
 			if (stride)
 			{
 				rawSize = size / stride * stride;
@@ -100,14 +94,14 @@ namespace ehs
        /// Copies all members from the given vector object.
        /// @param [in] vec The vector object to copy from.
 		Vector(const Vector& vec)
-			: BaseObj(vec), rawSize(vec.rawSize), size(vec.size), stride(vec.stride), data(new T[rawSize])
+			: rawSize(vec.rawSize), size(vec.size), stride(vec.stride), data(new T[rawSize])
 		{
 			for (N i = 0; i < size; ++i)
 				data[i] = vec.data[i];
 		}

        Vector(Vector&& vec) noexcept
-            : BaseObj((BaseObj&&)vec), rawSize(vec.rawSize), size(vec.size), stride(vec.stride), data(vec.data)
+            : rawSize(vec.rawSize), size(vec.size), stride(vec.stride), data(vec.data)
        {
            vec.rawSize = 0;
            vec.size = 0;
@@ -123,8 +117,6 @@ namespace ehs
            if (this == &vec)
                return *this;

-			BaseObj::operator=(vec);
-
 			rawSize = vec.rawSize;
 			size = vec.size;
 			stride = vec.stride;
@@ -143,8 +135,6 @@ namespace ehs
            if (this == &vec)
                return *this;

-			BaseObj::operator=((BaseObj&&)vec);
-
            rawSize = vec.rawSize;
            size = vec.size;
            stride = vec.stride;
@@ -402,7 +392,7 @@ namespace ehs
 			{
 				if (stride)
 				{
-					rawSize = (this->size + size()) / stride * stride;
+					rawSize = (this->size + size) / stride * stride;
 					if ((this->size + size) % stride)
 						rawSize += stride;
 				}
@@ -413,7 +403,7 @@ namespace ehs

 				T* result = new T[rawSize];

-				for (N i = 0; i < size; ++i)
+				for (N i = 0; i < this->size; ++i)
 					result[i] = std::move(data[i]);

 				delete[] data;
--- a/include/ehs/Version.h
+++ b/include/ehs/Version.h
@@ -5,7 +5,7 @@
 namespace ehs
 {
    /// A helper class for storing version major, minor and patch.
-	class Version
+	class EHS_LIB_IO Version
 	{
 	public:
 		UInt_32 major;
--- a/include/ehs/database/DVar.h
+++ b/include/ehs/database/DVar.h
@@ -1,20 +0,0 @@
-#pragma once
-
-#include "ehs/EHS.h"
-#include "ehs/BaseObj.h"
-#include "ehs/Str.h"
-
-namespace ehs
-{
-	enum class DType : UInt_8
-	{
-	
-	};
-
-	class DVar : public BaseObj
-	{
-	private:
-		Str_8 id;
-		UInt_64 hashId;
-	};
-}
--- a/include/ehs/db/Database.h
+++ b/include/ehs/db/Database.h
@@ -0,0 +1,56 @@
+#pragma once
+
+#include "ehs/Array.h"
+#include "DbTable.h"
+
+namespace ehs
+{
+	class EHS_LIB_IO Database
+	{
+	private:
+		UInt_64 hashId;
+		Str_8 id;
+		Version version;
+		Array<DbTable> tables;
+		Str_8 dir;
+
+	public:
+		Database();
+
+		Database(Str_8 id, const Version& version);
+
+		Database(Str_8 filePath);
+
+		Database(Database&& db) noexcept;
+
+		Database(const Database& db);
+
+		Database& operator=(Database&& db) noexcept;
+
+		Database& operator=(const Database& db);
+
+		UInt_64 GetHashId() const;
+
+		void SetId(Str_8 newId);
+
+		Str_8 GetId() const;
+
+		void SetVersion(const Version& newVersion);
+
+		Version GetVersion() const;
+
+		bool HasTable(UInt_64 hashId) const;
+
+		bool HasTable(const Str_8& id) const;
+
+		DbTable* CreateTable(Str_8 id);
+
+		DbTable* GetTable(UInt_64 hashId) const;
+
+		DbTable* GetTable(const Str_8& id) const;
+
+		Str_8 GetDirectory() const;
+
+		void Save(Str_8 directory);
+	};
+}
--- a/include/ehs/db/DbObject.h
+++ b/include/ehs/db/DbObject.h
@@ -0,0 +1,52 @@
+#pragma once
+
+#include "ehs/Array.h"
+#include "DbVar.h"
+
+namespace ehs
+{
+	class DbTable;
+
+	class EHS_LIB_IO DbObject
+	{
+	private:
+		friend class DbTable;
+		friend class DbVar;
+
+		UInt_64 id;
+		DbTable* parent;
+		Array<DbVar> vars;
+
+	public:
+		DbObject();
+
+		DbObject(UInt_64 id);
+
+		DbObject(DbObject&& obj) noexcept;
+
+		DbObject(const DbObject& obj);
+
+		DbObject& operator=(DbObject&& obj) noexcept;
+
+		DbObject& operator=(const DbObject& obj);
+
+		UInt_64 GetId() const;
+
+		bool HasVariable(UInt_64 hashId) const;
+
+		DbVar* GetVariable(UInt_64 hashId) const;
+
+		DbVar* GetVariable(const Str_8& id) const;
+
+		void Save() const;
+
+		void Load();
+
+		bool IsLoaded() const;
+
+		void Free();
+
+	private:
+		void CreateVariable(DbVarTmpl* master);
+	};
+}
--- a/include/ehs/db/DbTable.h
+++ b/include/ehs/db/DbTable.h
@@ -0,0 +1,66 @@
+#pragma once
+
+#include "ehs/Version.h"
+#include "ehs/Array.h"
+#include "DbVarTmpl.h"
+#include "DbObject.h"
+#include "ehs/Serializer.h"
+
+namespace ehs
+{
+	class Database;
+
+	class EHS_LIB_IO DbTable
+	{
+	private:
+		friend class Database;
+		friend class DbVar;
+		friend class DbObject;
+
+		Database *parent;
+		UInt_64 hashId;
+		Str_8 id;
+		Array<DbVarTmpl> varTmpls;
+		Array<DbObject> objects;
+
+	public:
+		DbTable();
+
+		DbTable(Str_8 id);
+
+		DbTable(DbTable&& table) noexcept;
+
+		DbTable(const DbTable& table);
+
+		DbTable& operator=(DbTable&& table) noexcept;
+
+		DbTable& operator=(const DbTable& table);
+
+		UInt_64 GetHashId() const;
+
+		void SetId(Str_8 newId);
+
+		Str_8 GetId() const;
+
+		bool HasVariable(UInt_64 hashId) const;
+
+		bool HasVariable(const Str_8& id) const;
+
+		bool CreateVariable(DbVarTmpl var);
+
+		DbObject *CreateObject();
+
+		DbObject *GetObject(UInt_64 variableHashId, const Str_8 &value) const;
+
+		DbObject *GetObject(const Str_8 &variable, const Str_8 &value) const;
+
+		DbObject *GetObject(UInt_64 id) const;
+
+	private:
+		DbVarTmpl *GetVariableTemplate(UInt_64 hashId) const;
+
+		void Serialize(const Str_8 &dir, Serializer<UInt_64>& data) const;
+
+		void Deserialize(const Str_8 &dir, Serializer<UInt_64>& data);
+	};
+}
--- a/include/ehs/db/DbVar.h
+++ b/include/ehs/db/DbVar.h
@@ -0,0 +1,105 @@
+#pragma once
+
+#include "ehs/Types.h"
+#include "ehs/Serializer.h"
+
+namespace ehs
+{
+	class DbVarTmpl;
+	class DbObject;
+
+	class EHS_LIB_IO DbVar
+	{
+	private:
+		friend class DbObject;
+
+		UInt_64 hashId;
+		DbObject *parent;
+		Byte *value;
+		UInt_64 size;
+
+	public:
+		~DbVar();
+
+		DbVar();
+
+		DbVar(UInt_64 hashId, const DbVarTmpl *master);
+
+		DbVar(DbVar &&var) noexcept;
+
+		DbVar(const DbVar &var);
+
+		DbVar &operator=(DbVar &&var) noexcept;
+
+		DbVar &operator=(const DbVar &var);
+
+		explicit operator Byte *() const;
+
+		UInt_64 GetHashId() const;
+
+		template<typename T>
+		void SetValueArray(const T* const newValue, const UInt_64 newSize)
+		{
+			size = sizeof(T) * newSize;
+
+			value = new Byte[size];
+
+			Util::Copy(value, newValue, size);
+		}
+
+		template<typename T = Char_8>
+		void SetValueStr(const T * const newValue)
+		{
+			size = sizeof(T) * Str<Char_8, UInt_64>::Len(newValue);
+
+			value = new Byte[size];
+
+			Util::Copy(value, newValue, size);
+		}
+
+		template<typename T = Char_8, typename I = UInt_64>
+		void SetValueStr(const Str<T, I>& newValue)
+		{
+			size = newValue.Size(true);
+
+			value = new Byte[size];
+
+			Util::Copy(value, &newValue[0], size);
+		}
+
+		template<typename T>
+		void SetValue(const Byte* newValue)
+		{
+			size = sizeof(T);
+
+			value = new Byte[size];
+
+			Util::Copy(value, newValue, size);
+		}
+
+		template<typename T>
+		T* GetValueArray() const
+		{
+			return (T*)value;
+		}
+
+		template<typename T = Char_8, typename I = UInt_64>
+		Str<T, I> GetValueStr() const
+		{
+			return {(T*)value, size / sizeof(T)};
+		}
+
+		template<typename T>
+		T GetValue() const
+		{
+			return *(T*)value;
+		}
+
+		UInt_64 GetSize() const;
+
+	private:
+		void Serialize(Serializer<UInt_64> &data) const;
+
+		void Deserialize(Serializer<UInt_64> &data);
+	};
+}
--- a/include/ehs/db/DbVarTmpl.h
+++ b/include/ehs/db/DbVarTmpl.h
@@ -0,0 +1,77 @@
+#pragma once
+
+#include "ehs/EHS.h"
+#include "ehs/Serializer.h"
+#include "ehs/Str.h"
+
+namespace ehs
+{
+	class DbVar;
+
+	class EHS_LIB_IO DbVarTmpl
+	{
+	private:
+		friend class DbTable;
+
+		UInt_64 hashId;
+		Str_8 id;
+		Byte* def;
+		UInt_64 size;
+
+	public:
+		~DbVarTmpl();
+
+		DbVarTmpl();
+
+		template<typename T>
+		DbVarTmpl(Str_8 id, const T* const def, UInt_64 size)
+			: hashId(id.Hash_64()), id((Str_8&&)id), def(new Byte[sizeof(T) * size]), size(sizeof(T) * size)
+		{
+			Util::Copy(this->def, def, this->size);
+		}
+
+		template<typename T>
+		DbVarTmpl(Str_8 id, const T* const def)
+			: hashId(id.Hash_64()), id((Str_8&&)id), def(new Byte[sizeof(T)]), size(sizeof(T))
+		{
+			Util::Copy(this->def, def, this->size);
+		}
+
+		DbVarTmpl(Str_8 id);
+
+		DbVarTmpl(DbVarTmpl&& varTmpl) noexcept;
+
+		DbVarTmpl(const DbVarTmpl& varTmpl);
+
+		DbVarTmpl& operator=(DbVarTmpl&& varTmpl) noexcept;
+
+		DbVarTmpl& operator=(const DbVarTmpl& varTmpl);
+
+		operator Byte *() const;
+
+		UInt_64 GetHashId() const;
+
+		void SetId(Str_8 newId);
+
+		Str_8 GetId() const;
+
+		template<typename T>
+		T* GetDefaultArray() const
+		{
+			return (T*)def;
+		}
+
+		template<typename T>
+		T GetDefault() const
+		{
+			return *(T*)def;
+		}
+
+		UInt_64 GetSize() const;
+
+	private:
+		void Serialize(Serializer<UInt_64> &data) const;
+
+		void Deserialize(Serializer<UInt_64> &data);
+	};
+}
--- a/include/ehs/io/BaseDirectory.h
+++ b/include/ehs/io/BaseDirectory.h
@@ -0,0 +1,17 @@
+#pragma once
+
+#include "ehs/Array.h"
+#include "ehs/Str.h"
+
+namespace ehs
+{
+	class EHS_LIB_IO BaseDirectory
+	{
+	public:
+		static Array<Str_8> GetAllFiles(const Str_8 &dir);
+
+		static void CreateRecursive(Str_8 dir);
+
+		static void Create(const Str_8 &dir);
+	};
+}
--- a/include/ehs/io/BaseFile.h
+++ b/include/ehs/io/BaseFile.h
@@ -25,7 +25,7 @@ namespace ehs
 	};

 	/// A cross-platform wrapper class that handles native file input/output.
-	class BaseFile
+	class EHS_LIB_IO BaseFile
 	{
 	protected:
 		Str_8 path;
--- a/include/ehs/io/BaseFileMonitor.h
+++ b/include/ehs/io/BaseFileMonitor.h
@@ -11,7 +11,7 @@

 namespace ehs
 {
-	class BaseFileMonitor
+	class EHS_LIB_IO BaseFileMonitor
 	{
 	protected:
 		Str_8 filePath;
--- a/include/ehs/io/BaseWindow.h
+++ b/include/ehs/io/BaseWindow.h
@@ -1,9 +1,7 @@
 #pragma once

-#include "ehs/EHS.h"
 #include "ehs/Str.h"
 #include "ehs/Vec2.h"
-#include "ehs/Rect.h"
 #include "ehs/io/hid/Input.h"

 namespace ehs
@@ -20,7 +18,7 @@ namespace ehs
 		I_BEAM
 	};

-    class BaseWindow
+    class EHS_LIB_IO BaseWindow
    {
 	protected:
 		bool created;
@@ -60,10 +58,6 @@ namespace ehs

 		bool HasFocus() const;

-    	void EnableResizing(bool enable);
-
-    	bool IsResizable() const;
-
 		/// Gets the cursors position on the desktop in pixels.
 		/// @param [in] relative Whether the position should be relative to the windows client.
 		/// @returns The current value.
--- a/include/ehs/io/COM.h
+++ b/include/ehs/io/COM.h
@@ -20,7 +20,7 @@ namespace ehs
        TWO
    };

-    class COM
+    class EHS_LIB_IO COM
    {
    private:
        UInt_8 port;
--- a/include/ehs/io/Console.h
+++ b/include/ehs/io/Console.h
@@ -12,7 +12,7 @@ namespace ehs
        typedef int ConsoleHdl;
    #endif

-	class Console
+	class EHS_LIB_IO Console
 	{
 	private:
 		static ConsoleHdl hdlOut;
--- a/include/ehs/io/Directory.h
+++ b/include/ehs/io/Directory.h
@@ -0,0 +1,9 @@
+#pragma once
+
+#include "ehs/system/OS.h"
+
+#if defined(EHS_OS_WINDOWS)
+    #include "Directory_W32.h"
+#elif defined(EHS_OS_LINUX)
+    #include "Directory_LNX.h"
+#endif
--- a/include/ehs/io/Directory_LNX.h
+++ b/include/ehs/io/Directory_LNX.h
@@ -0,0 +1,16 @@
+#pragma once
+
+#include "BaseDirectory.h"
+
+namespace ehs
+{
+	class EHS_LIB_IO Directory : public BaseDirectory
+	{
+	public:
+		static Array<Str_8> GetAllFiles(const Str_8 &dir);
+
+		static void CreateRecursive(Str_8 dir);
+
+		static void Create(const Str_8 &dir);
+	};
+}
--- a/include/ehs/io/Directory_W32.h
+++ b/include/ehs/io/Directory_W32.h
@@ -0,0 +1,16 @@
+#pragma once
+
+#include "BaseDirectory.h"
+
+namespace ehs
+{
+    class EHS_LIB_IO Directory : public BaseDirectory
+    {
+    public:
+        static Array<Str_8> GetAllFiles(const Str_8 &dir);
+
+        static void CreateRecursive(Str_8 dir);
+
+        static void Create(const Str_8 &dir);
+    };
+}
--- a/include/ehs/io/File.h
+++ b/include/ehs/io/File.h
@@ -1,6 +1,6 @@
 #pragma once

-#include "ehs/EHS.h"
+#include "ehs/system/OS.h"

 #if defined(EHS_OS_WINDOWS)
 #include "File_W32.h"
--- a/include/ehs/io/FileMonitor_UNX.h
+++ b/include/ehs/io/FileMonitor_UNX.h
@@ -5,7 +5,7 @@

 namespace ehs
 {
-	class FileMonitor : public BaseFileMonitor
+	class EHS_LIB_IO FileMonitor : public BaseFileMonitor
 	{
 	private:
 		int hdl;
--- a/include/ehs/io/FileMonitor_W32.h
+++ b/include/ehs/io/FileMonitor_W32.h
@@ -5,7 +5,7 @@

 namespace ehs
 {
-	class FileMonitor final : public BaseFileMonitor
+	class EHS_LIB_IO FileMonitor final : public BaseFileMonitor
 	{
 	private:
 		Handle hdl;
--- a/include/ehs/io/File_UNX.h
+++ b/include/ehs/io/File_UNX.h
@@ -10,7 +10,7 @@

 namespace ehs
 {
-	class File : public BaseFile
+	class EHS_LIB_IO File : public BaseFile
 	{
 	private:
 		int hdl;
--- a/include/ehs/io/File_W32.h
+++ b/include/ehs/io/File_W32.h
@@ -10,7 +10,7 @@

 namespace ehs
 {
-	class File : public BaseFile
+	class EHS_LIB_IO File : public BaseFile
 	{
 	private:
 		HANDLE hdl;
--- a/include/ehs/io/FontAtlas.h
+++ b/include/ehs/io/FontAtlas.h
@@ -6,11 +6,11 @@
 #include "Glyph.h"
 #include "ehs/Anchor.h"
 #include "ehs/io/img/Img.h"
-#include "ehs/io/model/Mesh.h"
+#include "ehs/io/mdl/Mesh.h"

 namespace ehs
 {
-	class FontAtlas : public BaseObj
+	class EHS_LIB_IO FontAtlas : public BaseObj
 	{
 	private:
 		UInt_64 hashId;
--- a/include/ehs/io/Glyph.h
+++ b/include/ehs/io/Glyph.h
@@ -7,7 +7,7 @@

 namespace ehs
 {
-	class Glyph
+	class EHS_LIB_IO Glyph
 	{
 	private:
 		Char_32 code;
@@ -20,7 +20,7 @@ namespace ehs
 	public:
 		Glyph();

-		Glyph(Serializer<>& ser);
+		Glyph(Serializer<UInt_64>& ser);

 		Glyph(const Char_32 code);

--- a/include/ehs/io/RIFF.h
+++ b/include/ehs/io/RIFF.h
@@ -8,7 +8,7 @@

 namespace ehs
 {
-	class RIFF
+	class EHS_LIB_IO RIFF
 	{
 	private:
 		Str_8 type;
--- a/include/ehs/io/RIFF_Chunk.h
+++ b/include/ehs/io/RIFF_Chunk.h
@@ -6,7 +6,7 @@

 namespace ehs
 {
-	class RIFF_Chunk
+	class EHS_LIB_IO RIFF_Chunk
 	{
 	private:
 		Str_8 id;
--- a/include/ehs/io/Resource.h
+++ b/include/ehs/io/Resource.h
@@ -7,7 +7,7 @@

 namespace ehs
 {
-	class Resource : public BaseObj
+	class EHS_LIB_IO Resource : public BaseObj
 	{
 	private:
 		ehs::UInt_64 hashId;
--- a/include/ehs/io/UsbBase.h
+++ b/include/ehs/io/UsbBase.h
@@ -0,0 +1,48 @@
+#pragma once
+
+#include "ehs/Types.h"
+
+namespace ehs
+{
+    class EHS_LIB_IO UsbBase
+    {
+    private:
+        UInt_32 bus;
+        UInt_32 address;
+
+    public:
+        virtual ~UsbBase() = default;
+
+        UsbBase();
+
+        UsbBase(UInt_32 bus, UInt_32 address);
+
+        UsbBase(UsbBase&& usb) noexcept;
+
+        UsbBase(const UsbBase& usb);
+
+        UsbBase& operator=(UsbBase&& usb) noexcept;
+
+        UsbBase& operator=(const UsbBase& usb);
+
+        virtual void Initialize() = 0;
+
+        virtual void Release() = 0;
+
+        virtual bool IsInitialized() const = 0;
+
+        virtual Size Send(const Byte* data, Size size) = 0;
+
+        void BulkSend(const Byte* data, Size size);
+
+        virtual Size Receive(Byte* data, Size size) = 0;
+
+        void BulkReceive(Byte** data, Size* size);
+
+        UInt_32 GetBus() const;
+
+        UInt_32 GetAddress() const;
+
+        bool IsValid() const;
+    };
+}
--- a/include/ehs/io/Usb_LNX.h
+++ b/include/ehs/io/Usb_LNX.h
@@ -0,0 +1,34 @@
+#pragma once
+
+#include "UsbBase.h"
+#include "File.h"
+
+namespace ehs
+{
+    class EHS_LIB_IO Usb final : public UsbBase
+    {
+    private:
+        int hdl;
+
+    public:
+        ~Usb() override;
+
+        Usb();
+
+        Usb(UInt_32 bus, UInt_32 address);
+
+        Usb(Usb&& usb) noexcept;
+
+        Usb(const Usb& usb);
+
+        Usb& operator=(Usb&& usb) noexcept;
+
+        Usb& operator=(const Usb& usb);
+
+        void Initialize() override;
+
+        void Release() override;
+
+        bool IsInitialized() const override;
+    };
+}
--- a/include/ehs/io/Window_W32.h
+++ b/include/ehs/io/Window_W32.h
@@ -14,7 +14,7 @@

 namespace ehs
 {
-    class Window : public BaseWindow
+    class EHS_LIB_IO Window : public BaseWindow
    {
    private:
        UInt_32 owner;
@@ -71,13 +71,6 @@ namespace ehs

 		void SetIcon(const Str_8& filePath);

-        /// Sets the windows client scale.
-        /// @param [in] w The width in pixels.
-        /// @param [in] h The height in pixels.
-        void SetClientSize(const Vec2<UInt_32>& size);
-
-        Vec2<UInt_32> GetClientSize();
-
        /// Gets the windows native handle for the operating system or other native tasks.
        /// @returns The window's native handle.
        HWND GetHdl() const;
--- a/include/ehs/io/Window_Way.h
+++ b/include/ehs/io/Window_Way.h
@@ -4,21 +4,27 @@

 #include <wayland-client.h>
 #include "xdg-shell-client-protocol.h"
+#include "xdg-decoration.h"

 namespace ehs
 {
-	class Window : public BaseWindow
+	class EHS_LIB_IO Window : public BaseWindow
 	{
-	private:
-		wl_display* display;
+	protected:
+		wl_display *display;
 		wl_registry *registry;
-		wl_compositor* compositor;
-		wl_surface* surface;
+		wl_compositor *compositor;
+		wl_surface *wlSurface;
 		xdg_wm_base *xdgShell;
 		xdg_surface *xdgSurface;
 		xdg_toplevel *xdgToplevel;
+		zxdg_decoration_manager_v1 *decManager;
+		zxdg_toplevel_decoration_v1 *dec;
+		wl_seat *seat;
+		wl_pointer *pointer;
+		Vec2_u32 scale;

-		static void SurfaceConfigure(void *data, xdg_surface *xdg_surface, UInt_32 serial);
+		static void SurfaceConfigEvent(void *data, xdg_surface *xdg_surface, UInt_32 serial);

 		static void ShellPing(void *data, xdg_wm_base *shell, UInt_32 serial);

@@ -26,16 +32,32 @@ namespace ehs

 		static void RegistryRemoved(void *data, wl_registry *registry, UInt_32 id);

+		static void ResizeEvent(void *data, xdg_toplevel *xdg_toplevel, Int_32 width, Int_32 height, wl_array *states);
+
+		static void CloseEvent(void *data, xdg_toplevel *xdg_toplevel);
+
+		static void SeatCapabilitiesEvent(void *data, wl_seat *seat, UInt_32 capabilities);
+
+		static void PointerMotionEvent(void *data, wl_pointer *pointer, UInt_32 time, wl_fixed_t sx, wl_fixed_t sy);
+
 	public:
 		~Window() override;

 		Window();

-		void Create_32(const Str_32& title, const Vec2_s32& pos, const Vec2_u32 scale) override;
+		Window(Window &&win) noexcept;

-		void Create_16(const Str_16& title, const Vec2_s32& pos, const Vec2_u32 scale) override;
+		Window(const Window &win);

-		void Create_8(const Str_8& title, const Vec2_s32& pos, const Vec2_u32 scale) override;
+		Window &operator=(Window &&win) noexcept;
+
+		Window &operator=(const Window &win);
+
+		void Create_32(const Str_32& title, const Vec2_s32& pos, Vec2_u32 scale) override;
+
+		void Create_16(const Str_16& title, const Vec2_s32& pos, Vec2_u32 scale) override;
+
+		void Create_8(const Str_8& title, const Vec2_s32& pos, Vec2_u32 scale) override;

 		void OnCreated() override;

--- a/include/ehs/io/Window_XCB.h
+++ b/include/ehs/io/Window_XCB.h
@@ -8,7 +8,7 @@

 namespace ehs
 {
-    class Window : public BaseWindow
+    class EHS_LIB_IO Window : public BaseWindow
    {
    protected:
 		friend class Input;
--- a/include/ehs/io/audio/Audio.h
+++ b/include/ehs/io/audio/Audio.h
@@ -11,7 +11,7 @@

 namespace ehs
 {
-    class Audio : public Resource
+    class EHS_LIB_IO Audio : public Resource
    {
 	private:
 		static Array<AudioCodec> codecs;
@@ -39,7 +39,9 @@ namespace ehs

 		Audio();

-		Audio(Str_8 id);
+		Audio(const Str_8& filePath);
+
+		Audio(const Str_8& filePath, DataType type);

 		Audio(Str_8 id, UInt_64 sampleRate, DataType dataType, UInt_8 channels, UInt_64 frames, const Byte* data);

@@ -79,10 +81,14 @@ namespace ehs

 		UInt_64 GetSampleCount() const;

+		UInt_8 GetFrameSize() const;
+
 		UInt_64 GetSize() const;

 		float GetLength() const;

+		Byte* GetFrame(UInt_64 frameIndex) const;
+
 		Array<Byte> FrameAsMono(UInt_64 frameIndex) const;

 		Array<Byte> FrameAsStereo(UInt_64 frameIndex) const;
@@ -123,17 +129,7 @@ namespace ehs

 		Audio GetAsChannels(UInt_8 newChannels) const;

-		bool ToFile(const Str_8& filePath) const;
-
-		static Audio FromFile(const Str_8& filePath);
-
-		static Audio* FromFile_Heap(const Str_8& filePath);
-
-		static Audio FromFile(const Str_8& filePath, DataType required);
-
-		static Audio* FromFile_Heap(const Str_8& filePath, DataType required);
-
-		static Audio FromData(Str_8 id, const Str_8& ext, Serializer<UInt_64>& data);
+		bool Export(const Str_8& filePath) const;

 	private:
 		void ToMono(UInt_64 newFrameCount, Byte* newData, UInt_64 frameOffset) const;
@@ -201,4 +197,10 @@ namespace ehs

 		void SInt_32_to_SInt_64(Byte* newData, Byte* newPeak) const;
    };
+
+	bool EncodeEHA(const ehs::AudioCodec* codec, ehs::Serializer<ehs::UInt_64>& out, const ehs::Audio* in);
+
+	bool DecodeEHA(const ehs::AudioCodec* codec, ehs::Serializer<ehs::UInt_64>& in, ehs::Audio* out);
+
+	bool DecodeWAV(const ehs::AudioCodec* codec, ehs::Serializer<ehs::UInt_64>& in, ehs::Audio* out);
 }
--- a/include/ehs/io/audio/AudioCodec.h
+++ b/include/ehs/io/audio/AudioCodec.h
@@ -8,7 +8,7 @@ namespace ehs
 {
 	class Audio;

-	class AudioCodec
+	class EHS_LIB_IO AudioCodec
 	{
 	private:
 		Str_8 id;
--- a/include/ehs/io/audio/AudioDevice.h
+++ b/include/ehs/io/audio/AudioDevice.h
@@ -5,5 +5,5 @@
 #if defined(EHS_OS_WINDOWS)
 #include "AudioDevice_W32.h"
 #elif defined(EHS_OS_LINUX)
-#include "AudioDevice_ALSA.h"
+#include "AudioDevice_PW.h"
 #endif
--- a/include/ehs/io/audio/AudioDevice_ALSA.h
+++ b/include/ehs/io/audio/AudioDevice_ALSA.h
@@ -1,46 +0,0 @@
-#pragma once
-
-#include "ehs/EHS.h"
-#include "BaseAudioDevice.h"
-
-#include <alsa/asoundlib.h>
-
-namespace ehs
-{
-	class AudioDevice : public BaseAudioDevice
-	{
-	private:
-		snd_pcm_t* hdl;
-
-	public:
-		~AudioDevice() override;
-
-		AudioDevice();
-
-		AudioDevice(AudioDevice&& device) noexcept;
-
-		AudioDevice(const AudioDevice& device);
-
-		AudioDevice& operator=(AudioDevice&& device) noexcept;
-
-		AudioDevice& operator=(const AudioDevice& device);
-
-		void Release() override;
-
-		void OpenStream() override;
-
-		void CloseStream() override;
-
-		UInt_64 GetAvailFrames() const override;
-
-		Byte* Map(UInt_64* offset, UInt_64* frames) override;
-
-		void UnMap(const UInt_64 offset, const UInt_64 frames) override;
-
-		bool IsValid() const override;
-
-		static AudioDevice GetDefault(const AudioDeviceType type);
-
-		static Array<AudioDevice> Get(const AudioDeviceType type, const AudioDeviceState state);
-	};
-}
--- a/include/ehs/io/audio/AudioDevice_PW.h
+++ b/include/ehs/io/audio/AudioDevice_PW.h
@@ -0,0 +1,68 @@
+#pragma once
+
+#include "ehs/EHS.h"
+#include "BaseAudioDevice.h"
+
+#include <pipewire/pipewire.h>
+#include <pipewire/loop.h>
+#include <pipewire/context.h>
+#include <pipewire/stream.h>
+#include <spa/param/audio/format-utils.h>
+
+namespace ehs
+{
+	class EHS_LIB_IO AudioDevice final : public BaseAudioDevice
+	{
+	private:
+		static Array<AudioDevice> devices;
+		static AudioDevice defOut;
+		static AudioDevice defIn;
+
+		UInt_32 id;
+		Str_8 name;
+		pw_loop *loop;
+		pw_context *context;
+		pw_core *core;
+		pw_stream *input;
+		pw_stream *output;
+		spa_hook paramsHook;
+
+		static void RegistryEventGlobal(void *data, UInt_32 id, UInt_32 permissions, const char *type, UInt_32 version, const spa_dict *props);
+
+		static void RegistryEventGlobalRemove(void *data, UInt_32 id);
+
+		static void OnParamChanged(void *data, UInt_32 id, const spa_pod *param);
+
+	public:
+		~AudioDevice() override;
+
+		AudioDevice();
+
+		AudioDevice(AudioDevice&& device) noexcept;
+
+		AudioDevice(const AudioDevice& device);
+
+		AudioDevice& operator=(AudioDevice&& device) noexcept;
+
+		AudioDevice& operator=(const AudioDevice& device);
+
+		void OpenStream() override;
+
+		void CloseStream() override;
+
+		UInt_64 SendStream(const void *data, UInt_64 size) override;
+
+		UInt_64 ReceiveStream(void *data, UInt_64 size) override;
+
+		bool IsStreaming() const override;
+
+		bool IsValid() const override;
+
+		static AudioDevice GetDefault(AudioDeviceType type);
+
+		static Array<AudioDevice> Get(AudioDeviceType type, AudioDeviceState state);
+
+	private:
+		Str_8 GetCategory() const;
+	};
+}
--- a/include/ehs/io/audio/AudioDevice_W32.h
+++ b/include/ehs/io/audio/AudioDevice_W32.h
@@ -12,7 +12,7 @@ struct IMMDevice;

 namespace ehs
 {
-	class AudioDevice : public BaseAudioDevice
+	class EHS_LIB_IO AudioDevice final : public BaseAudioDevice
 	{
 	private:
 		IMMDevice* hdl;
@@ -33,17 +33,13 @@ namespace ehs

 		AudioDevice& operator=(const AudioDevice& device);

-		void Release() override;
-
 		void OpenStream() override;

 		void CloseStream() override;

-		UInt_64 GetAvailFrames() const override;
+		UInt_64 SendStream(const void *data, UInt_64 outFrameSize) override;

-		Byte* Map(UInt_64* offset, UInt_64* frames) override;
-
-		void UnMap(const UInt_64 offset, const UInt_64 frames) override;
+		UInt_64 ReceiveStream(void *data, UInt_64 inFrameSize) override;

 		Str_32 GetInterfaceName_32() const;

@@ -57,10 +53,12 @@ namespace ehs

 		Str_8 GetName_8() const;

+        bool IsStreaming() const override;
+
 		bool IsValid() const override;

-		static AudioDevice GetDefault(const AudioDeviceType type);
+		static AudioDevice GetDefault(AudioDeviceType type);

-		static Array<AudioDevice> Get(const AudioDeviceType type, const AudioDeviceState state);
+		static Array<AudioDevice> Get(AudioDeviceType type, AudioDeviceState state);
 	};
 }
--- a/include/ehs/io/audio/BaseAudioDevice.h
+++ b/include/ehs/io/audio/BaseAudioDevice.h
@@ -10,8 +10,8 @@ namespace ehs
 {
 	enum class AudioDeviceType
 	{
-		OUTPUT = 0x0,
 		INPUT = 0x1,
+		OUTPUT = 0x0,
 		ALL = 0x2
 	};

@@ -23,18 +23,17 @@ namespace ehs
 		UNPLUGGED = 0x8
 	};

-    class BaseAudioDevice
+    class EHS_LIB_IO BaseAudioDevice
    {
 	protected:
        AudioDeviceType type;
 		DataType dataType;
-		UInt_16 bitDepth;
+		UInt_16 byteDepth;
 		UInt_32 sampleRate;
 		UInt_32 channels;
 		UInt_32 period;
 		UInt_32 latency;
 		UInt_64 maxFrames;
-		bool streaming;

    public:
        virtual ~BaseAudioDevice() = default;
@@ -45,21 +44,21 @@ namespace ehs

        BaseAudioDevice& operator=(const BaseAudioDevice& device);

-		virtual void Release();
-
 		virtual void OpenStream();

 		virtual void CloseStream();

-		virtual UInt_64 GetAvailFrames() const;
+    	virtual UInt_64 SendStream(const void *data, UInt_64 size);

-		virtual Byte* Map(UInt_64* offset, UInt_64* frames);
+    	virtual UInt_64 ReceiveStream(void *data, UInt_64 size);

-		virtual void UnMap(const UInt_64 offset, const UInt_64 frames);
+		void BridgeStreams(BaseAudioDevice *input, UInt_64 frameBufferSize);
+
+    	void BridgeStreams(UInt_64 frameBufferSize);

        AudioDeviceType GetType() const;

-		void SetDataType(const DataType newDataType);
+		void SetDataType(DataType newDataType);

 		DataType GetDataType() const;

@@ -67,39 +66,39 @@ namespace ehs

 		UInt_16 GetBitDepth() const;

-		void SetSampleRate(const UInt_32 newSampleRate);
+		void SetSampleRate(UInt_32 newSampleRate);

 		UInt_32 GetSampleRate() const;

-		void SetChannels(const UInt_32 newChannels);
+		void SetChannels(UInt_32 newChannels);

 		UInt_16 GetChannels() const;

 		UInt_32 GetFrameSize() const;

-		void SetPeriod(const UInt_32 newPeriod);
+		void SetPeriod(UInt_32 newPeriod);

 		UInt_32 GetPeriod() const;

-		void SetLatency(const UInt_32 newLatency);
+		void SetLatency(UInt_32 newLatency);

 		UInt_32 GetLatency() const;

 		UInt_64 GetMaxFrames() const;

-		bool IsStreaming() const;
+		virtual bool IsStreaming() const;

 		virtual bool IsValid() const;

 		/// Retrieves the default audio input/output device.
 		/// @param [in] type The audio device type to retrieve.
 		/// @param [out] device The default audio device.
-		static BaseAudioDevice GetDefault(const AudioDeviceType type);
+		static BaseAudioDevice GetDefault(AudioDeviceType type);

 		/// Retrieves a list of audio input/output devices.
 		/// @param [in] type The audio device type to retrieve.
 		/// @param [in] state The audio device state to retrieve.
 		/// @param [out] devices The list of audio devices.
-		static Array<BaseAudioDevice> Get(const AudioDeviceType type, const AudioDeviceState state);
+		static Array<BaseAudioDevice> Get(AudioDeviceType type, AudioDeviceState state);
    };
 }
--- a/include/ehs/io/hid/Button.h
+++ b/include/ehs/io/hid/Button.h
@@ -5,27 +5,33 @@

 namespace ehs
 {
-	class Button
+	class EHS_LIB_IO Button
 	{
 	private:
-		Str_8 name;
 		UInt_32 hash;
+		Str_8 name;

 	public:
 		Button();

-		Button(const Str_8& name);
+		Button(Str_8 name);

-		Button(const Button& key);
+		Button(Button &&key) noexcept;

-		Button& operator=(const Button& key);
+		Button(const Button &key);

-		bool operator==(const Button& key) const;
+		Button &operator=(Button &&key) noexcept;

-		bool operator!=(const Button& key) const;
+		Button &operator=(const Button &key);
+
+		bool operator==(const Button &key) const;
+
+		bool operator!=(const Button &key) const;
+
+		UInt_32 GetHash() const;

 		Str_8 GetName() const;

-		UInt_32 GetHash() const;
+		bool IsValid() const;
 	};
 }
--- a/include/ehs/io/hid/ButtonState.h
+++ b/include/ehs/io/hid/ButtonState.h
@@ -13,7 +13,7 @@ namespace ehs
 		TOUCHED
 	};

-	class ButtonState
+	class EHS_LIB_IO ButtonState
 	{
 	private:
 		Button button;
--- a/include/ehs/io/hid/HID.h
+++ b/include/ehs/io/hid/HID.h
@@ -7,7 +7,7 @@

 namespace ehs
 {
-	class HID
+	class EHS_LIB_IO HID
 	{
 	protected:
 		UInt_8 type;
@@ -15,11 +15,17 @@ namespace ehs
 		Str_8 name;
 		UInt_64 id;
 		Array<ButtonState> states;
+		Button lastState;
+		float heldTime;
+		float activateTime;
+		bool active;

 	public:
+		virtual ~HID() = default;
+
 		HID();

-		HID(const UInt_8 type, Str_8 name, const UInt_64 id);
+		HID(UInt_8 type, Str_8 name, UInt_64 id);

 		HID(HID&& hid) noexcept;

@@ -33,11 +39,11 @@ namespace ehs

 		bool operator!=(const HID& other) const;

-		bool operator==(const UInt_64 otherId) const;
+		bool operator==(UInt_64 otherId) const;

-		bool operator!=(const UInt_64 otherId) const;
+		bool operator!=(UInt_64 otherId) const;

-		virtual void Poll();
+		virtual void Poll(float delta);

 		UInt_8 GetType() const;

@@ -71,6 +77,10 @@ namespace ehs

 		const ButtonState* IsUp() const;

+		const ButtonState *IsPressed(const Button &button);
+
+		const ButtonState *GetPressed();
+
 		void ButtonDown(const Button& button);

 		void ButtonUp(const Button& button);
@@ -87,5 +97,11 @@ namespace ehs
 		bool AddState(const ButtonState& state);

 		ButtonState* GetState(const Button& button);
+
+		bool TickHoldTime(float delta);
+
+		void ResetTime();
+
+		void TickActivateTime(float delta);
 	};
 }
--- a/include/ehs/io/hid/Input.h
+++ b/include/ehs/io/hid/Input.h
@@ -6,11 +6,11 @@

 namespace ehs
 {
-	class Input
+	class EHS_LIB_IO Input
 	{
 	private:
 		Array<InputHandler*> handlers;
-		bool initalized;
+		bool initialized;

 	public:
 		~Input();
@@ -31,13 +31,13 @@ namespace ehs

 		void Poll();

-		bool HasHandler(const UInt_64 hashId) const;
+		bool HasHandler(UInt_64 hashId) const;

 		bool HasHandler(const Str_8& id) const;

 		bool AddHandler(InputHandler* handler);

-		const InputHandler* GetHandler(const UInt_64 hashId) const;
+		const InputHandler* GetHandler(UInt_64 hashId) const;

 		const InputHandler* GetHandler(const Str_8& id) const;

--- a/include/ehs/io/hid/InputHandler.h
+++ b/include/ehs/io/hid/InputHandler.h
@@ -5,11 +5,13 @@

 namespace ehs
 {
-	class InputHandler
+	class EHS_LIB_IO InputHandler
 	{
 	private:
 		UInt_64 hashId;
 		Str_8 id;
+		UInt_64 start;
+		UInt_64 delta;

 	protected:
 		Array<HID*> devices;
@@ -29,9 +31,9 @@ namespace ehs

 		InputHandler& operator=(const InputHandler& ih);

-		bool operator==(const UInt_64 otherHashId);
+		bool operator==(UInt_64 otherHashId) const;

-		bool operator!=(const UInt_64 otherHashId);
+		bool operator!=(UInt_64 otherHashId) const;

 		virtual bool Initialize();

@@ -45,13 +47,13 @@ namespace ehs

 		void ResetAllStates();

-		bool HasDevice(const UInt_64 id) const;
+		bool HasDevice(UInt_64 id) const;

 		bool AddDevice(HID* device);

-		HID* GetDevice(const UInt_64 id) const;
+		HID* GetDevice(UInt_64 id) const;

-		HID* GetDeviceByType(const UInt_8 type) const;
+		HID* GetDeviceByType(UInt_8 type) const;

 		virtual bool IsInitialized() const;
 	};
--- a/include/ehs/io/hid/Keyboard.h
+++ b/include/ehs/io/hid/Keyboard.h
@@ -8,7 +8,7 @@

 namespace ehs
 {
-	class Keyboard : public HID
+	class EHS_LIB_IO Keyboard : public HID
 	{
 	public:
 		Keyboard();
@@ -23,96 +23,96 @@ namespace ehs

 		Keyboard& operator=(const Keyboard& hid);

-		void Poll() override;
+		void Poll(float delta) override;

 		Keyboard* Clone() const override;

-		static const Button Unknown;
-		static const Button Escape;
-		static const Button Backspace;
-		static const Button Enter;
-		static const Button LShift;
-		static const Button RShift;
-		static const Button LAlt;
-		static const Button RAlt;
-		static const Button LCtrl;
-		static const Button RCtrl;
-		static const Button Space;
-		static const Button A;
-		static const Button B;
-		static const Button C;
-		static const Button D;
-		static const Button E;
-		static const Button F;
-		static const Button G;
-		static const Button H;
-		static const Button I;
-		static const Button J;
-		static const Button K;
-		static const Button L;
-		static const Button M;
-		static const Button N;
-		static const Button O;
-		static const Button P;
-		static const Button Q;
-		static const Button R;
-		static const Button S;
-		static const Button T;
-		static const Button U;
-		static const Button V;
-		static const Button W;
-		static const Button X;
-		static const Button Y;
-		static const Button Z;
-		static const Button One;
-		static const Button Two;
-		static const Button Three;
-		static const Button Four;
-		static const Button Five;
-		static const Button Six;
-		static const Button Seven;
-		static const Button Eight;
-		static const Button Nine;
-		static const Button Zero;
-		static const Button Minus;
-		static const Button Equals;
-		static const Button Tilde;
-		static const Button BackSlash;
-		static const Button LeftSquareBracket;
-		static const Button RightSquareBracket;
-		static const Button SemiColon;
-		static const Button Apostrophe;
-		static const Button Comma;
-		static const Button Period;
-		static const Button ForwardSlash;
-		static const Button F1;
-		static const Button F2;
-		static const Button F3;
-		static const Button F4;
-		static const Button F5;
-		static const Button F6;
-		static const Button F7;
-		static const Button F8;
-		static const Button F9;
-		static const Button F10;
-		static const Button F11;
-		static const Button F12;
-		static const Button F13;
-		static const Button F14;
-		static const Button F15;
-		static const Button F16;
-		static const Button F17;
-		static const Button F18;
-		static const Button F19;
-		static const Button F20;
-		static const Button F21;
-		static const Button F22;
-		static const Button F23;
-		static const Button F24;
-		static const Button Left;
-		static const Button Right;
-		static const Button Up;
-		static const Button Down;
+		static inline const Button Unknown = Button("Unknown");
+		static inline const Button Escape = Button("Escape Button");
+		static inline const Button Backspace = Button("Backspace Button");
+		static inline const Button Enter = Button("Enter Button");
+		static inline const Button LShift = Button("Left Shift Button");
+		static inline const Button RShift = Button("Right Shift Button");
+		static inline const Button LAlt = Button("Left Alt Button");
+		static inline const Button RAlt = Button("Right Alt Button");
+		static inline const Button LCtrl = Button("Left Control Button");
+		static inline const Button RCtrl = Button("Right Button");
+		static inline const Button Space = Button("Space Button");
+		static inline const Button A = Button("A Button");
+		static inline const Button B = Button("B Button");
+		static inline const Button C = Button("C Button");
+		static inline const Button D = Button("D Button");
+		static inline const Button E = Button("E Button");
+		static inline const Button F = Button("F Button");
+		static inline const Button G = Button("G Button");
+		static inline const Button H = Button("H Button");
+		static inline const Button I = Button("I Button");
+		static inline const Button J = Button("J Button");
+		static inline const Button K = Button("K Button");
+		static inline const Button L = Button("L Button");
+		static inline const Button M = Button("M Button");
+		static inline const Button N = Button("N Button");
+		static inline const Button O = Button("O Button");
+		static inline const Button P = Button("P Button");
+		static inline const Button Q = Button("Q Button");
+		static inline const Button R = Button("R Button");
+		static inline const Button S = Button("S Button");
+		static inline const Button T = Button("T Button");
+		static inline const Button U = Button("U Button");
+		static inline const Button V = Button("V Button");
+		static inline const Button W = Button("W Button");
+		static inline const Button X = Button("X Button");
+		static inline const Button Y = Button("Y Button");
+		static inline const Button Z = Button("Z Button");
+		static inline const Button One = Button("One Button");
+		static inline const Button Two = Button("Two Button");
+		static inline const Button Three = Button("Three Button");
+		static inline const Button Four = Button("Four Button");
+		static inline const Button Five = Button("Five Button");
+		static inline const Button Six = Button("Six Button");
+		static inline const Button Seven = Button("Seven Button");
+		static inline const Button Eight = Button("Eight Button");
+		static inline const Button Nine = Button("Nine Button");
+		static inline const Button Zero = Button("Zero Button");
+		static inline const Button Minus = Button("Minus Button");
+		static inline const Button Equals = Button("Equals Button");
+		static inline const Button Tilde = Button("Tilde Button");
+		static inline const Button BackSlash = Button("Back Slash Button");
+		static inline const Button LeftSquareBracket = Button("Left Square Bracket Button");
+		static inline const Button RightSquareBracket = Button("Right Square Bracket Button");
+		static inline const Button SemiColon = Button("Semi Colon Button");
+		static inline const Button Apostrophe = Button("Apostrophe Button");
+		static inline const Button Comma = Button("Comma Button");
+		static inline const Button Period = Button("Period Button");
+		static inline const Button ForwardSlash = Button("Forward Slash Button");
+		static inline const Button F1 = Button("Function One Button");
+		static inline const Button F2 = Button("Function Two Button");
+		static inline const Button F3 = Button("Function Three Button");
+		static inline const Button F4 = Button("Function Four Button");
+		static inline const Button F5 = Button("Function Five Button");
+		static inline const Button F6 = Button("Function Six Button");
+		static inline const Button F7 = Button("Function Seven Button");
+		static inline const Button F8 = Button("Function Eight Button");
+		static inline const Button F9 = Button("Function Nine Button");
+		static inline const Button F10 = Button("Function Ten Button");
+		static inline const Button F11 = Button("Function Eleven Button");
+		static inline const Button F12 = Button("Function Twelve Button");
+		static inline const Button F13 = Button("Function Thirteen Button");
+		static inline const Button F14 = Button("Function Fourteen Button");
+		static inline const Button F15 = Button("Function Fifteen Button");
+		static inline const Button F16 = Button("Function Sixteen Button");
+		static inline const Button F17 = Button("Function Seventeen Button");
+		static inline const Button F18 = Button("Function Eighteen Button");
+		static inline const Button F19 = Button("Function Nineteen Button");
+		static inline const Button F20 = Button("Function Twenty Button");
+		static inline const Button F21 = Button("Function Twenty One Button");
+		static inline const Button F22 = Button("Function Twenty Two Button");
+		static inline const Button F23 = Button("Function Twenty Three Button");
+		static inline const Button F24 = Button("Function Twenty Four Button");
+		static inline const Button Left = Button("Left Button");
+		static inline const Button Right = Button("Right Button");
+		static inline const Button Up = Button("Up Button");
+		static inline const Button Down = Button("Down Button");

 		static Button TranslateScanCode(UInt_32 code);

--- a/include/ehs/io/hid/Mouse.h
+++ b/include/ehs/io/hid/Mouse.h
@@ -9,7 +9,7 @@

 namespace ehs
 {
-	class Mouse : public HID
+	class EHS_LIB_IO Mouse : public HID
 	{
 	private:
 		friend class Input;
@@ -19,7 +19,7 @@ namespace ehs
 	public:
 		Mouse();

-		Mouse(Str_8 name, const UInt_64 id);
+		Mouse(Str_8 name, UInt_64 id);

 		Mouse(Mouse&& hid) noexcept = default;

@@ -29,7 +29,7 @@ namespace ehs

 		Mouse& operator=(const Mouse& hid);

-		void Poll() override;
+		void Poll(float delta) override;

 		void SetDelta(const Vec2_s32& newDelta);

@@ -37,18 +37,18 @@ namespace ehs

 		Mouse* Clone() const override;

-		static const Button Unknown;
-		static const Button LMB;
-		static const Button MMB;
-		static const Button RMB;
-		static const Button Four;
-		static const Button Five;
-        static const Button ScrollUp;
-        static const Button ScrollDown;
-		static const Button ScrollLeft;
-		static const Button ScrollRight;
-        static const Button Back;
-        static const Button Forward;
+		static inline const Button Unknown = Button("Unknown Button");
+		static inline const Button LMB = Button("Left Mouse Button");
+		static inline const Button MMB = Button("Middle Mouse Button");
+		static inline const Button RMB = Button("Right Mouse Button");
+		static inline const Button Four = Button("Four Button");
+		static inline const Button Five = Button("Five Button");
+        static inline const Button ScrollUp = Button("Scroll Up Button");
+        static inline const Button ScrollDown = Button("Scroll Down Button");
+		static inline const Button ScrollLeft = Button("Scroll Left Button");
+		static inline const Button ScrollRight = Button("Scroll Right Button");
+        static inline const Button Back = Button("Back Button");
+        static inline const Button Forward = Button("Forward Button");

 		static Button TranslateXCB(const UInt_32 code);
 	};
--- a/include/ehs/io/img/Img.h
+++ b/include/ehs/io/img/Img.h
@@ -13,7 +13,7 @@ namespace ehs
 		NEAREST_NEIGHBOR
 	};

-	class Img : public BaseObj
+	class EHS_LIB_IO Img : public BaseObj
 	{
 	private:
 		static Array<ImgCodec> codecs;
@@ -42,7 +42,7 @@ namespace ehs

 		Img();

-		Img(Str_8 id);
+		Img(const Str_8& filePath);

 		Img(Str_8 id, UInt_8 byteDepth, UInt_8 channels, const Vec2_u64& resolution, const Byte* data);

@@ -124,13 +124,7 @@ namespace ehs

 		bool IsValid() const;

-		bool ToFile(const Str_8& filePath) const;
-
-		static Img FromFile(const Str_8& filePath);
-
-		static Img* FromFile_Heap(const Str_8& filePath);
-
-		static Img FromData(Str_8 id, const Str_8& ext, Serializer<UInt_64>& data);
+		bool Export(const Str_8& filePath) const;

 	private:
 		Img GetNearestNeighbor(const Vec2_u64& newResolution) const;
@@ -185,4 +179,10 @@ namespace ehs

 		void BD16_to_BD8(UInt_64 newSize, Byte* buffer) const;
 	};
+
+	bool EncodeQOI(const ehs::ImgCodec* codec, ehs::Serializer<ehs::UInt_64>& out, const ehs::Img* in);
+
+	bool DecodeQOI(const ehs::ImgCodec* codec, ehs::Serializer<ehs::UInt_64>& in, ehs::Img* out);
+
+	bool DecodePNG(const ehs::ImgCodec* codec, ehs::Serializer<ehs::UInt_64>& in, ehs::Img* out);
 }
--- a/include/ehs/io/img/ImgCodec.h
+++ b/include/ehs/io/img/ImgCodec.h
@@ -7,23 +7,25 @@
 namespace ehs
 {
 	class Img;
+	class ImgCodec;

-	class ImgCodec
+	typedef bool (*EncodeImgCb)(const ImgCodec* const, Serializer<UInt_64>&, const Img*);
+	typedef bool (*DecodeImgCb)(const ImgCodec* const, Serializer<UInt_64>&, Img*);
+
+	class EHS_LIB_IO ImgCodec
 	{
 	private:
 		Str_8 id;
 		UInt_64 hashExt;
 		Str_8 ext;
 		Endianness endianness;
-		bool (*encodeCb)(const ImgCodec* const, Serializer<UInt_64>&, const Img*);
-		bool (*decodeCb)(const ImgCodec* const, Serializer<UInt_64>&, Img*);
+		EncodeImgCb encoder;
+		DecodeImgCb decoder;

 	public:
 		ImgCodec();

-		ImgCodec(Str_8 id, Str_8 ext, const Endianness end,
-				 bool (*encodeCb)(const ImgCodec* const, Serializer<UInt_64>&, const Img*),
-				 bool (*decodeCb)(const ImgCodec* const, Serializer<UInt_64>&, Img*));
+		ImgCodec(Str_8 id, Str_8 ext, Endianness end, EncodeImgCb encoder, DecodeImgCb decoder);

 		ImgCodec(ImgCodec&& codec) noexcept;

--- a/include/ehs/io/img/PNG.h
+++ b/include/ehs/io/img/PNG.h
@@ -7,7 +7,7 @@

 namespace ehs
 {
-	class PNG
+	class EHS_LIB_IO PNG
 	{
 	private:
 		Str_8 id;
--- a/include/ehs/io/img/PNG_Chunk.h
+++ b/include/ehs/io/img/PNG_Chunk.h
@@ -6,7 +6,7 @@

 namespace ehs
 {
-	class PNG_Chunk
+	class EHS_LIB_IO PNG_Chunk
 	{
 	private:
 		Str_8 id;
--- a/include/ehs/io/model/AnimBone.h
+++ b/include/ehs/io/model/AnimBone.h
@@ -6,7 +6,7 @@

 namespace ehs
 {
-	class AnimBone
+	class EHS_LIB_IO AnimBone
 	{
 	private:
 		UInt_8 boneId;
--- a/include/ehs/io/model/Animation.h
+++ b/include/ehs/io/model/Animation.h
@@ -7,7 +7,7 @@

 namespace ehs
 {
-	class Animation
+	class EHS_LIB_IO Animation
 	{
 	private:
 		UInt_64 hashId;
--- a/include/ehs/io/model/Bone.h
+++ b/include/ehs/io/model/Bone.h
@@ -6,7 +6,7 @@

 namespace ehs
 {
-	class Bone
+	class EHS_LIB_IO Bone
 	{
 	private:
 		UInt_64 hashName;
--- a/include/ehs/io/model/KeyFrame.h
+++ b/include/ehs/io/model/KeyFrame.h
@@ -9,7 +9,7 @@

 namespace ehs
 {
-	class KeyFrame
+	class EHS_LIB_IO KeyFrame
 	{
 	private:
 		float num;
--- a/include/ehs/io/mdl/Mdl.h
+++ b/include/ehs/io/mdl/Mdl.h
@@ -0,0 +1,93 @@
+#pragma once
+
+#include "ehs/EHS.h"
+#include "ehs/Array.h"
+#include "ehs/io/File.h"
+#include "MdlCodec.h"
+#include "Mesh.h"
+#include "Bone.h"
+#include "Animation.h"
+
+namespace ehs
+{
+	enum class ModelEncoding : UInt_8
+	{
+		EHM
+	};
+
+	class EHS_LIB_IO Mdl : public BaseObj
+	{
+	private:
+		static Array<MdlCodec> codecs;
+
+	protected:
+		UInt_64 hashId;
+		Str_8 id;
+		Array<Mesh> meshes;
+		Bone skeleton;
+		Array<Animation> animations;
+
+	public:
+		static bool HasCodec(UInt_64 hashExt);
+
+		static bool HasCodec(const Str_8& ext);
+
+		static bool AddCodec(MdlCodec codec);
+
+		static const MdlCodec* GetCodec(UInt_64 hashExt);
+
+		static const MdlCodec* GetCodec(const Str_8& ext);
+
+		Mdl();
+
+		Mdl(const Str_8& filePath);
+
+		Mdl(Str_8 id, Array<Mesh> meshes, Bone skeleton, Array<Animation> animations);
+
+		Mdl(Str_8 id, Array<Mesh> meshes, Bone skeleton);
+
+		Mdl(Str_8 id, Array<Mesh> meshes);
+
+		Mdl(Mdl&& model) noexcept;
+
+		Mdl(const Mdl& model) = default;
+
+		Mdl& operator=(Mdl&& model) noexcept;
+
+		Mdl& operator=(const Mdl& model) = default;
+
+		void Release();
+
+		UInt_64 GetHashId() const;
+
+		void SetId(Str_8 newId);
+
+		Str_8 GetId() const;
+
+		const Array<Mesh>& GetMeshes() const;
+
+		Array<Mesh>& GetMeshes();
+
+		Mesh* GetMesh(UInt_64 inHashId);
+
+		Mesh* GetMesh(const Str_8& inId);
+
+		const Bone& GetSkeleton() const;
+
+		Bone& GetSkeleton();
+
+		Animation* GetAnimation(UInt_64 inHashId);
+
+		const Array<Animation>& GetAnimations() const;
+
+		Array<Animation>& GetAnimations();
+
+		void Calculate();
+
+		bool Export(const Str_8& filePath) const;
+	};
+
+	bool EncodeEHM(const MdlCodec* codec, Serializer<UInt_64>& data, const Mdl* mdl);
+
+	bool DecodeEHM(const MdlCodec* codec, Serializer<UInt_64>& data, Mdl* mdl);
+}
--- a/include/ehs/io/mdl/MdlCodec.h
+++ b/include/ehs/io/mdl/MdlCodec.h
@@ -0,0 +1,50 @@
+#pragma once
+
+#include "ehs/Str.h"
+#include "ehs/Serializer.h"
+#include "ehs/system/CPU.h"
+
+namespace ehs
+{
+	class Mdl;
+	class MdlCodec;
+
+	typedef bool (*EnocdeMdlCb)(const MdlCodec*, Serializer<UInt_64>&, const Mdl*);
+	typedef bool (*DecodeMdlCb)(const MdlCodec*, Serializer<UInt_64>&, Mdl*);
+
+	class EHS_LIB_IO MdlCodec
+	{
+	private:
+		Str_8 id;
+		UInt_64 hashExt;
+		Str_8 ext;
+		Endianness endianness;
+		EnocdeMdlCb encoder;
+		DecodeMdlCb decoder;
+
+	public:
+		MdlCodec();
+
+		MdlCodec(Str_8 id, Str_8 ext, Endianness end, EnocdeMdlCb encoder, DecodeMdlCb decoder);
+
+		MdlCodec(MdlCodec&& codec) noexcept;
+
+		MdlCodec(const MdlCodec& codec);
+
+		MdlCodec& operator=(MdlCodec&& codec) noexcept;
+
+		MdlCodec& operator=(const MdlCodec& codec);
+
+		Str_8 GetId() const;
+
+		UInt_64 GetHashExt() const;
+
+		Str_8 GetExt() const;
+
+		Endianness GetEndianness() const;
+
+		bool Encode(Serializer<UInt_64>& out, const Mdl* in) const;
+
+		bool Decode(Serializer<UInt_64>& in, Mdl* out) const;
+	};
+}
--- a/include/ehs/io/model/Mesh.h
+++ b/include/ehs/io/model/Mesh.h
@@ -7,7 +7,7 @@

 namespace ehs
 {
-    class Mesh final : public BaseObj
+    class EHS_LIB_IO Mesh final : public BaseObj
    {
    protected:
 		UInt_64 hashId;
--- a/include/ehs/io/model/PropertyChange.h
+++ b/include/ehs/io/model/PropertyChange.h
@@ -19,7 +19,7 @@ namespace ehs
 		INVALID
 	};

-	class PropertyChange
+	class EHS_LIB_IO PropertyChange
 	{
 	public:
 		ChangeType type;
--- a/include/ehs/io/model/Vertex.h
+++ b/include/ehs/io/model/Vertex.h
--- a/include/ehs/io/model/Model.h
+++ b/include/ehs/io/model/Model.h
@@ -1,80 +0,0 @@
-#pragma once
-
-#include "ehs/EHS.h"
-#include "ehs/Array.h"
-#include "ehs/io/File.h"
-#include "Mesh.h"
-#include "Bone.h"
-#include "Animation.h"
-
-namespace ehs
-{
-	enum class ModelEncoding : UInt_8
-	{
-		EHM
-	};
-
-	class Model : public BaseObj
-	{
-	protected:
-		UInt_64 hashId;
-		Str_8 id;
-		Array<Mesh> meshes;
-		Bone skeleton;
-		Array<Animation> animations;
-
-	public:
-		Model();
-
-		Model(const Str_8& filePath);
-
-		Model(Str_8 id, Array<Mesh> meshes, Bone skeleton, Array<Animation> animations);
-
-		Model(Str_8 id, Array<Mesh> meshes, Bone skeleton);
-
-		Model(Str_8 id, Array<Mesh> meshes);
-
-		Model(Model&& model) noexcept;
-
-		Model(const Model& model) = default;
-
-		Model& operator=(Model&& model) noexcept;
-
-		Model& operator=(const Model& model) = default;
-
-		void Release();
-
-		UInt_64 GetHashId() const;
-
-		void SetId(Str_8 newId);
-
-		Str_8 GetId() const;
-
-		const Array<Mesh>& GetMeshes() const;
-
-		Array<Mesh>& GetMeshes();
-
-		Mesh* GetMesh(UInt_64 inHashId);
-
-		Mesh* GetMesh(const Str_8& inId);
-
-		const Bone& GetSkeleton() const;
-
-		Bone& GetSkeleton();
-
-		Animation* GetAnimation(UInt_64 inHashId);
-
-		const Array<Animation>& GetAnimations() const;
-
-		Array<Animation>& GetAnimations();
-
-		void Calculate();
-
-		void Export(const Str_8& filePath, ModelEncoding encoding);
-
-	private:
-		void ToEHM(File& file);
-
-		void FromEHM(File& file);
-	};
-}
--- a/include/ehs/io/socket/BaseDNS.h
+++ b/include/ehs/io/socket/BaseDNS.h
@@ -0,0 +1,18 @@
+#pragma once
+
+#include "Socket.h"
+#include "ehs/Str.h"
+
+namespace ehs
+{
+	class EHS_LIB_IO BaseDNS
+	{
+	public:
+		static Str_8 Resolve(IP type, const Str_8 &hostname);
+
+		/// Resolves a hostname to an ip address.
+		/// @param [in] hostname The given hostname to resolve.
+		/// @returns The resulting ip address.
+		static Str_8 Resolve(const Str_8 &hostname);
+	};
+}
--- a/include/ehs/io/socket/BaseICMP.h
+++ b/include/ehs/io/socket/BaseICMP.h
@@ -0,0 +1,68 @@
+#pragma once
+
+#include "ehs/Serializer.h"
+#include "ehs/Types.h"
+#include "ehs/io/socket/Socket.h"
+
+namespace ehs
+{
+	struct ICMP_Header
+	{
+		UInt_8 type;
+		UInt_8 code;
+		UInt_16 checksum;
+	};
+
+	struct ICMP_EchoRequest
+	{
+		UInt_16 id;
+		UInt_16 sequence;
+	};
+
+	class BaseICMP
+	{
+	private:
+		IP version;
+
+	public:
+		virtual ~BaseICMP() = default;
+
+		BaseICMP();
+
+		BaseICMP(IP version);
+
+		BaseICMP(BaseICMP &&icmp) noexcept;
+
+		BaseICMP(const BaseICMP &icmp);
+
+		BaseICMP &operator=(BaseICMP &&icmp) noexcept;
+
+		BaseICMP &operator=(const BaseICMP &icmp);
+
+		virtual void Release();
+
+		UInt_64 Send(const Str_8 &address, ICMP_Header header, const Byte *data, UInt_64 size);
+
+		UInt_64 Receive(Str_8 &address, ICMP_Header &header, Serializer<UInt_64> &data);
+
+		void SendEchoRequest(const Str_8 &address, ICMP_EchoRequest er, const Byte *data, UInt_64 size);
+
+		virtual void SetReceiveTimeout(UInt_64 timeout);
+
+		IP GetVersion() const;
+
+		virtual bool IsValid() const;
+
+	protected:
+		static UInt_16 ComputeChecksumV4(UInt_16 *buffer, Size length);
+
+	private:
+		virtual UInt_64 SendV6(const Str_8 &address, ICMP_Header header, const Byte *data, UInt_64 size);
+
+		virtual UInt_64 SendV4(const Str_8 &address, ICMP_Header header, const Byte *data, UInt_64 size);
+
+		virtual UInt_64 ReceiveV6(Str_8 &address, ICMP_Header &header, Serializer<UInt_64> &data) const;
+
+		virtual UInt_64 ReceiveV4(Str_8 &address, ICMP_Header &header, Serializer<UInt_64> &data) const;
+	};
+}
--- a/include/ehs/io/socket/BaseTCP.h
+++ b/include/ehs/io/socket/BaseTCP.h
@@ -9,10 +9,10 @@

 namespace ehs
 {
-	class BaseTCP
+	class EHS_LIB_IO BaseTCP
 	{
 	protected:
-		AddrType addrType;
+		IP ip;
 		Str_8 localAddr;
 		UInt_16 localPort;
 		Str_8 remoteHostName;
@@ -24,9 +24,9 @@ namespace ehs
 		bool connected;

 	public:
-		static const UInt_16 HTTPS_Port = 443;
-		static const UInt_16 HTTP_Port = 80;
-		static const UInt_16 MaxHeaderSize = 8192;
+		static constexpr UInt_16 HTTPS_Port = 443;
+		static constexpr UInt_16 HTTP_Port = 80;
+		static constexpr UInt_16 MaxHeaderSize = 8192;

 		virtual ~BaseTCP() = default;

@@ -35,7 +35,7 @@ namespace ehs

 		/// Properly initializes the socket.
 		/// @param [in] type The ip version to initialize the socket with.
-		BaseTCP(AddrType addrType);
+		BaseTCP(IP ip);

 		BaseTCP(BaseTCP&& tcp) noexcept;

@@ -55,7 +55,7 @@ namespace ehs
 		/// @param [in] address The ip address to bind to.
 		/// @param [in] port The port to bind to.
 		/// @note Used for servers.
-		virtual void Bind(const Str_8& address, UInt_16 port) = 0;
+		virtual void Bind(Str_8 address, const UInt_16 &port) = 0;

 		/// Listens for new incoming connections.
 		/// @note Used for servers.
@@ -63,13 +63,13 @@ namespace ehs

 		/// Accepts the new incoming connection.
 		/// @note Used for servers.
-		virtual BaseTCP* Accept() = 0;
+		virtual BaseTCP *Accept() = 0;

 		/// Connects to a server at the specified address and port.
 		/// @param [in] address The ip address to connect to.
 		/// @param [in] port The port to connect to.
 		/// @note Used for clients.
-		virtual void Connect(const Str_8& address, UInt_16 port) = 0;
+		virtual void Connect(Str_8 address, const UInt_16 &port) = 0;

 		/// Sends data to the connected endpoint.
 		/// @param [in] buffer The data to send to the endpoint.
@@ -104,7 +104,7 @@ namespace ehs

 		/// Retrieves the sockets ip version.
 		/// @returns The ip version.
-		AddrType GetAddressType() const;
+		IP GetAddressType() const;

 		/// Retrieves the bound ip address.
 		/// @returns The ip address.
@@ -146,6 +146,12 @@ namespace ehs
 		/// @returns The result.
 		virtual bool IsBlocking() const = 0;

+		virtual void SetIPv6Only(bool value) = 0;
+
+		virtual bool IsIPv6Only() const = 0;
+
+		virtual void SetReuse(const bool &enabled) = 0;
+
 		/// Retrieves whether or not this socket was initialized.
 		/// @returns The result.
 		virtual bool IsValid() const = 0;
--- a/include/ehs/io/socket/BaseUDP.h
+++ b/include/ehs/io/socket/BaseUDP.h
@@ -6,12 +6,10 @@

 namespace ehs
 {
-	class BaseUDP
+	class EHS_LIB_IO BaseUDP
 	{
 	protected:
-		AddrType type;
-		Str_8 address;
-		UInt_16 port;
+		Endpoint localEndpoint;
 		bool bound;

 	public:
@@ -22,7 +20,7 @@ namespace ehs

 		/// Properly initializes the socket.
 		/// @param [in] type The ip version to initialize the socket with.
-		BaseUDP(AddrType type);
+		BaseUDP(IP version);

 		BaseUDP(BaseUDP&& udp) noexcept;

@@ -40,13 +38,13 @@ namespace ehs
 		/// @param [in] address The ip address to bind to.
 		/// @param [in] port The port to bind to.
 		/// @note Used for servers.
-		virtual void Bind(AddrType type, const Str_8& address, UInt_16 port) = 0;
+		virtual void Bind(const Endpoint &endpoint) = 0;

 		/// Sends data to the endpoint.
 		/// @param [in] type The ip version of the endpoint.
 		/// @param [in] address The ip address of the endpoint.
 		/// @param [in] port The port of the endpoint is bound to.
-		virtual UInt_64 Send(AddrType type, const Str_8& address, UInt_16 port, const Byte* data, UInt_64 size) = 0;
+		virtual UInt_64 Send(const Endpoint &endpoint, const Byte *data, UInt_64 size) = 0;

 		/// Receives data from the endpoint.
 		/// @param [out] type The ip version of the endpoint.
@@ -55,7 +53,7 @@ namespace ehs
 		/// @param [out] data The incoming data from the endpoint.
 		/// @param [in] size The max size of the buffer in bytes to store the data.
 		/// @returns The size of the incoming data in bytes.
-		virtual UInt_64 Receive(AddrType* type, Str_8* address, UInt_16* port, Byte* data, UInt_64 size) = 0;
+		virtual UInt_64 Receive(Endpoint *endpoint, Byte *data, UInt_64 size) = 0;

 		/// Retrieves whether or not this socket is bound to an ip address and port.
 		/// @returns The result.
@@ -69,17 +67,11 @@ namespace ehs
 		/// @returns The result.
 		virtual bool IsBlocking() const = 0;

-		/// Retrieves the bound ip version.
-		/// @returns The result.
-		AddrType GetLocalAddressType() const;
+		virtual void SetIPv6Only(bool value) = 0;

-		/// Retrieves the bound ip address.
-		/// @returns The bound ip address.
-		Str_8 GetLocalAddress() const;
+		virtual bool IsIPv6Only() const = 0;

-		/// Retrieves the bound port.
-		/// @returns The bound port.
-		UInt_16 GetLocalPort() const;
+		Endpoint GetLocalEndpoint() const;

 		/// Retrieves whether or not this socket was initialized.
 		/// @returns The result.
--- a/include/ehs/io/socket/DNS.h
+++ b/include/ehs/io/socket/DNS.h
@@ -1,17 +1,9 @@
 #pragma once

-#include "ehs/EHS.h"
-#include "ehs/Str.h"
-#include "Socket.h"
+#include "ehs/system/OS.h"

-namespace ehs
-{
-    class DNS
-    {
-    public:
-		/// Resolves a hostname to an ip address.
-		/// @param [in] hostname The given hostname to resolve.
-		/// @returns The resulting ip address.
-        static Str_8 Resolve(const Str_8& hostname);
-    };
-}
+#if defined(EHS_OS_WINDOWS)
+	#include "DNS_W32.h"
+#elif defined(EHS_OS_LINUX)
+	#include "DNS_LNX.h"
+#endif
--- a/include/ehs/io/socket/DNS_LNX.h
+++ b/include/ehs/io/socket/DNS_LNX.h
@@ -0,0 +1,17 @@
+#pragma once
+
+#include "BaseDNS.h"
+#include "ehs/EHS.h"
+#include "ehs/Str.h"
+#include "Socket.h"
+
+namespace ehs
+{
+    class EHS_LIB_IO DNS final : public BaseDNS
+    {
+    public:
+    	static Str_8 Resolve(IP type, const Str_8 &hostname);
+
+        static Str_8 Resolve(const Str_8 &hostname);
+    };
+}
--- a/Show More
+++ b/Show More