Update dbl list C++ tests

Update C++ version of wapp_str8_node_from_str8
Update dbl list C tests
2025-12-17 03:37:56 +00:00 · 2025-12-17 03:37:29 +00:00 · 2025-12-17 02:52:29 +00:00 · 2025-12-17 02:52:15 +00:00 · 2025-12-17 02:50:53 +00:00 · 2025-12-17 02:49:48 +00:00
93 changed files with 6526 additions and 5688 deletions
--- a/.gitea/workflows/release.yml
+++ b/.gitea/workflows/release.yml
@@ -1,81 +0,0 @@
-name: Release
-
-on:
-  push:
-    branches:
-      - main  # or your default branch
-
-jobs:
-  release:
-    runs-on: self-hosted
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-            fetch-depth: 0   # fetch full history
-            tags: true       # fetch all tags
-
-      - name: Check/Create Tag
-        id: tag
-        run: |
-          VERSION=$(cat VERSION | tr -d '[:space:]')  # read version and trim whitespace
-          echo "Version: $VERSION"
-
-          if git rev-parse "v$VERSION" >/dev/null 2>&1; then
-            echo "Tag v$VERSION already exists. Skipping release."
-            exit 0
-          fi
-
-          # Tag does not exist → create it
-          echo "Creating tag v$VERSION"
-          git tag "v$VERSION"
-          git push origin "v$VERSION"
-
-          echo "version=$VERSION" >> $GITHUB_OUTPUT
-
-      - name: Build Artifacts
-        if: steps.tag.outputs.version
-        run: |
-          chmod +x ./package
-          ./package
-          ls -l dist/
-
-      - name: Create Release
-        if: steps.tag.outputs.version
-        id: create_release
-        run: |
-          VERSION="${{ steps.tag.outputs.version }}"
-          RESPONSE=$(curl -s -X POST \
-            -H "Authorization: token ${{ secrets.GITEA_TOKEN }}" \
-            -H "Content-Type: application/json" \
-            "https://git.thewizardapprentice.com/api/v1/repos/${{ gitea.repository }}/releases" \
-            -d '{
-              "tag_name": "v'"$VERSION"'",
-              "name": "wapp-v'"$VERSION"'",
-              "body": "Automated release for wapp-v'"$VERSION"'",
-              "draft": false,
-              "prerelease": false
-            }')
-
-          echo "$RESPONSE"
-          RELEASE_ID=$(echo $RESPONSE | jq -r '.id')
-          echo "release_id=$RELEASE_ID" >> $GITHUB_OUTPUT
-
-      - name: Upload Artifacts
-        if: steps.tag.outputs.version
-        run: |
-          RELEASE_ID="${{ steps.create_release.outputs.release_id }}"
-          for FILE in dist/*; do
-            FILENAME=$(basename "$FILE")
-            echo "Uploading $FILENAME"
-            curl -X POST \
-              -H "Authorization: token ${{ secrets.GITEA_TOKEN }}" \
-              -H "Content-Type: application/octet-stream" \
-              --data-binary @"$FILE" \
-              "https://git.thewizardapprentice.com/api/v1/repos/${{ gitea.repository }}/releases/$RELEASE_ID/assets?name=$FILENAME"
-          done
-
-      - name: Cleanup
-        if: steps.tag.outputs.version
-        run: rm -rf dist/*
--- a/201
+++ b/201
@@ -1,201 +0,0 @@
-                             Apache License
-                       Version 2.0, January 2004
-                    http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-  "License" shall mean the terms and conditions for use, reproduction,
-  and distribution as defined by Sections 1 through 9 of this document.
-
-  "Licensor" shall mean the copyright owner or entity authorized by
-  the copyright owner that is granting the License.
-
-  "Legal Entity" shall mean the union of the acting entity and all
-  other entities that control, are controlled by, or are under common
-  control with that entity. For the purposes of this definition,
-  "control" means (i) the power, direct or indirect, to cause the
-  direction or management of such entity, whether by contract or
-  otherwise, or (ii) ownership of fifty percent (50%) or more of the
-  outstanding shares, or (iii) beneficial ownership of such entity.
-
-  "You" (or "Your") shall mean an individual or Legal Entity
-  exercising permissions granted by this License.
-
-  "Source" form shall mean the preferred form for making modifications,
-  including but not limited to software source code, documentation
-  source, and configuration files.
-
-  "Object" form shall mean any form resulting from mechanical
-  transformation or translation of a Source form, including but
-  not limited to compiled object code, generated documentation,
-  and conversions to other media types.
-
-  "Work" shall mean the work of authorship, whether in Source or
-  Object form, made available under the License, as indicated by a
-  copyright notice that is included in or attached to the work
-  (an example is provided in the Appendix below).
-
-  "Derivative Works" shall mean any work, whether in Source or Object
-  form, that is based on (or derived from) the Work and for which the
-  editorial revisions, annotations, elaborations, or other modifications
-  represent, as a whole, an original work of authorship. For the purposes
-  of this License, Derivative Works shall not include works that remain
-  separable from, or merely link (or bind by name) to the interfaces of,
-  the Work and Derivative Works thereof.
-
-  "Contribution" shall mean any work of authorship, including
-  the original version of the Work and any modifications or additions
-  to that Work or Derivative Works thereof, that is intentionally
-  submitted to Licensor for inclusion in the Work by the copyright owner
-  or by an individual or Legal Entity authorized to submit on behalf of
-  the copyright owner. For the purposes of this definition, "submitted"
-  means any form of electronic, verbal, or written communication sent
-  to the Licensor or its representatives, including but not limited to
-  communication on electronic mailing lists, source code control systems,
-  and issue tracking systems that are managed by, or on behalf of, the
-  Licensor for the purpose of discussing and improving the Work, but
-  excluding communication that is conspicuously marked or otherwise
-  designated in writing by the copyright owner as "Not a Contribution."
-
-  "Contributor" shall mean Licensor and any individual or Legal Entity
-  on behalf of whom a Contribution has been received by Licensor and
-  subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of
-  this License, each Contributor hereby grants to You a perpetual,
-  worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-  copyright license to reproduce, prepare Derivative Works of,
-  publicly display, publicly perform, sublicense, and distribute the
-  Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of
-  this License, each Contributor hereby grants to You a perpetual,
-  worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-  (except as stated in this section) patent license to make, have made,
-  use, offer to sell, sell, import, and otherwise transfer the Work,
-  where such license applies only to those patent claims licensable
-  by such Contributor that are necessarily infringed by their
-  Contribution(s) alone or by combination of their Contribution(s)
-  with the Work to which such Contribution(s) was submitted. If You
-  institute patent litigation against any entity (including a
-  cross-claim or counterclaim in a lawsuit) alleging that the Work
-  or a Contribution incorporated within the Work constitutes direct
-  or contributory patent infringement, then any patent licenses
-  granted to You under this License for that Work shall terminate
-  as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the
-  Work or Derivative Works thereof in any medium, with or without
-  modifications, and in Source or Object form, provided that You
-  meet the following conditions:
-
-  (a) You must give any other recipients of the Work or
-      Derivative Works a copy of this License; and
-
-  (b) You must cause any modified files to carry prominent notices
-      stating that You changed the files; and
-
-  (c) You must retain, in the Source form of any Derivative Works
-      that You distribute, all copyright, patent, trademark, and
-      attribution notices from the Source form of the Work,
-      excluding those notices that do not pertain to any part of
-      the Derivative Works; and
-
-  (d) If the Work includes a "NOTICE" text file as part of its
-      distribution, then any Derivative Works that You distribute must
-      include a readable copy of the attribution notices contained
-      within such NOTICE file, excluding those notices that do not
-      pertain to any part of the Derivative Works, in at least one
-      of the following places: within a NOTICE text file distributed
-      as part of the Derivative Works; within the Source form or
-      documentation, if provided along with the Derivative Works; or,
-      within a display generated by the Derivative Works, if and
-      wherever such third-party notices normally appear. The contents
-      of the NOTICE file are for informational purposes only and
-      do not modify the License. You may add Your own attribution
-      notices within Derivative Works that You distribute, alongside
-      or as an addendum to the NOTICE text from the Work, provided
-      that such additional attribution notices cannot be construed
-      as modifying the License.
-
-  You may add Your own copyright statement to Your modifications and
-  may provide additional or different license terms and conditions
-  for use, reproduction, or distribution of Your modifications, or
-  for any such Derivative Works as a whole, provided Your use,
-  reproduction, and distribution of the Work otherwise complies with
-  the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise,
-  any Contribution intentionally submitted for inclusion in the Work
-  by You to the Licensor shall be under the terms and conditions of
-  this License, without any additional terms or conditions.
-  Notwithstanding the above, nothing herein shall supersede or modify
-  the terms of any separate license agreement you may have executed
-  with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade
-  names, trademarks, service marks, or product names of the Licensor,
-  except as required for reasonable and customary use in describing the
-  origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or
-  agreed to in writing, Licensor provides the Work (and each
-  Contributor provides its Contributions) on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-  implied, including, without limitation, any warranties or conditions
-  of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-  PARTICULAR PURPOSE. You are solely responsible for determining the
-  appropriateness of using or redistributing the Work and assume any
-  risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory,
-  whether in tort (including negligence), contract, or otherwise,
-  unless required by applicable law (such as deliberate and grossly
-  negligent acts) or agreed to in writing, shall any Contributor be
-  liable to You for damages, including any direct, indirect, special,
-  incidental, or consequential damages of any character arising as a
-  result of this License or out of the use or inability to use the
-  Work (including but not limited to damages for loss of goodwill,
-  work stoppage, computer failure or malfunction, or any and all
-  other commercial damages or losses), even if such Contributor
-  has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing
-  the Work or Derivative Works thereof, You may choose to offer,
-  and charge a fee for, acceptance of support, warranty, indemnity,
-  or other liability obligations and/or rights consistent with this
-  License. However, in accepting such obligations, You may act only
-  on Your own behalf and on Your sole responsibility, not on behalf
-  of any other Contributor, and only if You agree to indemnify,
-  defend, and hold each Contributor harmless for any liability
-  incurred by, or claims asserted against, such Contributor by reason
-  of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-  To apply the Apache License to your work, attach the following
-  boilerplate notice, with the fields enclosed by brackets "[]"
-  replaced with your own identifying information. (Don't include
-  the brackets!)  The text should be enclosed in the appropriate
-  comment syntax for the file format. We also recommend that a
-  file or class name and description of purpose be included on the
-  same "printed page" as the copyright notice for easier
-  identification within third-party archives.
-
-Copyright [2026] [Abdelrahman Said]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--- a/18
+++ b/18
@@ -1,4 +1,4 @@
-.PHONY: help full base os prng testing uuid all clean builddir build-test run-test install build-lib
+.PHONY: help full base os prng testing uuid all clean builddir build-test run-test install build-lib ccodegen

 # External variables
 CC             = clang
@@ -21,14 +21,13 @@ override TEST_INCLUDE       := -Isrc $(shell find tests -type d | xargs -I{} ech
 override TEST_SRC           := $(shell find tests -type f -name "*.c" | xargs -I{} echo -n "{} ")
 override TEST_C_SRC         := src/wapp.c $(TEST_SRC)
 override TEST_CXX_SRC       := $(shell find tests -type f -name "*.cc" | xargs -I{} echo -n "{} ")
-override LIB_BASENAME       := wapp
-override OBJ_OUT            := $(BUILD_DIR)/$(LIB_BASENAME).o
-override LIB_STATIC_NAME    := lib$(LIB_BASENAME).a
-override LIB_OUT            := $(BUILD_DIR)/$(LIB_STATIC_NAME)
+override LIB_NAME           := wapp
+override OBJ_OUT            := $(BUILD_DIR)/$(LIB_NAME).o
+override LIB_OUT            := $(BUILD_DIR)/lib$(LIB_NAME).a
 override TEST_C_OUT         := $(BUILD_DIR)/wapptest
 override TEST_CXX_OUT       := $(BUILD_DIR)/wapptestcc
 override ABS_INSTALL_PREFIX := $(shell mkdir -p $(INSTALL_PREFIX) && realpath $(INSTALL_PREFIX))
-override INCLUDE_INSTALL    := $(ABS_INSTALL_PREFIX)/include/$(LIB_BASENAME)
+override INCLUDE_INSTALL    := $(ABS_INSTALL_PREFIX)/include/$(LIB_NAME)
 override LIB_INSTALL        := $(ABS_INSTALL_PREFIX)/lib
 override HEADER_INSTALL_CMD := scripts/header_install.sh

@@ -46,7 +45,7 @@ endif

 # Disable runtime asserts
 ifeq ($(RUNTIME_ASSERT), false)
-	override BUILD_FLAGS += -DWAPP_NO_RUNTIME_ASSERT
+	override BUILD_FLAGS += WAPP_NO_RUNTIME_ASSERT
 endif

 ifeq ($(CC),gcc)
@@ -146,8 +145,6 @@ uuid: install

 clean:
 	@rm -rf "$(BUILD_DIR)"
-	@rm -rf "$(INCLUDE_INSTALL)"
-	@rm -f "$(LIB_INSTALL)/$(LIB_STATIC_NAME)"

 builddir:
 	@mkdir -p "$(BUILD_DIR)"
@@ -178,3 +175,6 @@ build-lib: builddir
 	$(CC) -c $(CSTD) $(CFLAGS) $(BUILD_FLAGS) $(LIBFLAGS) $(LIB_SRC) -o "$(OBJ_OUT)"
 	$(AR) r "$(LIB_OUT)" "$(OBJ_OUT)"
 	@rm "$(OBJ_OUT)"
+
+ccodegen:
+	$(CC) $(CSTD) $(CFLAGS) $(BUILD_FLAGS) $(LIBFLAGS) -Isrc/os src/os/wapp_os.c ccodegen/*.c -o ccgen
--- a/README.md
+++ b/README.md
@@ -1,5 +1,3 @@
 # Wizard Apprentice Standard Library

-**Wizard Apprentice Standard Library** (`wapp`) is a lightweight collection of reusable utilities for **C and C++** projects.
-
-For more information about the library and how to use it, check the [wiki](https://git.thewizardapprentice.com/abdelrahman/wizapp-stdlib/wiki).
+A base layer for C/C++ projects
--- a/1
+++ b/1
@@ -1 +0,0 @@
-1.0.0
--- a/build.ps1
+++ b/build.ps1
@@ -52,6 +52,9 @@ mkdir -p $ObjDir > $null
 mkdir -p $OutDir > $null
 mkdir -p $TestsDir > $null

+# Run code generation
+Invoke-Expression "python -m codegen"
+
 # Build and run C tests
 Invoke-Expression "$Compiler $GeneralFlags $CStd $IncludeDirs $TestIncludeDirs $SrcFiles $TestCSrcFiles $TestCOutputFlags" -ErrorAction Stop
 Invoke-Expression "$TestsDir/$TestCOutputBasename.exe"
--- a/BIN
+++ b/BIN
--- a/ccodegen/datatypes.c
+++ b/ccodegen/datatypes.c
@@ -0,0 +1,522 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
+#include "datatypes.h"
+#include "dbl_list.h"
+#include "type_enums.h"
+#include "wapp_core.h"
+
+#define ERR_MSG "Not enough capacity in dst buffer"
+#define CFILE_DISCLAIMER "/**\n" \
+  " * THIS FILE IS AUTOMATICALLY GENERATED. ANY MODIFICATIONS TO IT WILL BE OVERWRITTEN.\n" \
+  " */\n\n"
+
+void cobject_to_string(Str8 *dst, const CObject *object) {
+  wapp_debug_assert(dst != NULL && object != NULL, "`allocator`, `dst` and `object` should not be NULL");
+
+  switch (object->kind) {
+    case COBJECT_CTYPE:
+      ctype_to_string(dst, object->object.c_type);
+      break;
+    case COBJECT_CQUALIFIER:
+      cqualifier_to_string(dst, object->object.c_qualifier);
+      break;
+    case COBJECT_CPOINTERTYPE:
+      cpointertype_to_string(dst, object->object.c_pointertype);
+      break;
+    case COBJECT_CPOINTER:
+      cpointer_to_string(dst, &(object->object.c_pointer));
+      break;
+    case COBJECT_CENUMVAL:
+      cenumval_to_string(dst, &(object->object.c_enumval));
+      break;
+    case COBJECT_CENUM:
+      cenum_to_string(dst, &(object->object.c_enum));
+      break;
+    case COBJECT_CMACRO:
+      cmacro_to_string(dst, &(object->object.c_macro));
+      break;
+    case COBJECT_CSTRUCT:
+      cstruct_to_string(dst, &(object->object.c_struct));
+      break;
+    case COBJECT_CUSERTYPE:
+      cusertype_to_string(dst, &(object->object.c_usertype));
+      break;
+    case COBJECT_CDATATYPE:
+      cdatatype_to_string(dst, &(object->object.c_datatype));
+      break;
+    case COBJECT_CARG:
+      carg_to_string(dst, &(object->object.c_arg));
+      break;
+    case COBJECT_CFUNC:
+      cfunc_to_string(dst, &(object->object.c_func));
+      break;
+    case COBJECT_CINCULDE:
+      cinclude_to_string(dst, &(object->object.c_include));
+      break;
+    case COBJECT_CHEADER:
+      cheader_to_string(dst, &(object->object.c_header));
+      break;
+    case COBJECT_CSOURCE:
+      csource_to_string(dst, &(object->object.c_source));
+      break;
+    default:
+      break;
+  }
+}
+
+void ctype_to_string(Str8 *dst, CType ctype) {
+  wapp_runtime_assert(ctypes[ctype].size <= dst->capacity, ERR_MSG);
+  wapp_str8_copy_str8_capped(dst, &ctypes[ctype]);
+}
+
+void cqualifier_to_string(Str8 *dst, CQualifier cqualifier) {
+  wapp_runtime_assert(cqualifiers[cqualifier].size <= dst->capacity, ERR_MSG);
+  wapp_str8_copy_str8_capped(dst, &cqualifiers[cqualifier]);
+}
+
+void cpointertype_to_string(Str8 *dst, CPointerType cpointertype) {
+  wapp_runtime_assert(cpointertypes[cpointertype].size <= dst->capacity, ERR_MSG);
+  wapp_str8_copy_str8_capped(dst, &cpointertypes[cpointertype]);
+}
+
+void cpointer_to_string(Str8 *dst, const CPointer *cpointer) {
+  wapp_debug_assert(dst != NULL && cpointer != NULL, "`dst` and `cpointer` should not be NULL");
+
+  u64 total_size = cpointertypes[cpointer->type].size + cqualifiers[cpointer->qualifier].size;
+  wapp_runtime_assert(total_size <= dst->capacity, ERR_MSG);
+  wapp_str8_format(dst,
+                   WAPP_STR8_SPEC WAPP_STR8_SPEC,
+                   wapp_str8_varg(cpointertypes[cpointer->type]),
+                   wapp_str8_varg(cqualifiers[cpointer->qualifier]));
+}
+
+void cenumval_to_string(Str8 *dst, const CEnumVal *cenumval) {
+  wapp_debug_assert(dst != NULL && cenumval != NULL, "`dst` and `cenumval` should not be NULL");
+
+  Str8 tmp     = wapp_str8_buf(CCGEN_BUF_TINY);
+  u64 tmp_size = 0;
+  if (cenumval->value != NULL) {
+    wapp_str8_format(&tmp, " = %d", *(cenumval->value));
+    tmp_size = tmp.size;
+  }
+
+  u64 total_size = cenumval->name.size + tmp_size;
+  wapp_runtime_assert(total_size <= dst->capacity, ERR_MSG);
+  wapp_str8_format(dst,
+                   WAPP_STR8_SPEC WAPP_STR8_SPEC,
+                   wapp_str8_varg(cenumval->name),
+                   wapp_str8_varg(tmp));
+}
+
+void cenum_to_string(Str8 *dst, const CEnum *cenum) {
+  wapp_debug_assert(dst != NULL && cenum != NULL, "`dst` and `cenum` should not be NULL");
+
+  Str8 header = wapp_str8_buf(CCGEN_BUF_LARGE);
+  Str8 values = wapp_str8_buf(CCGEN_BUF_MAX);
+  Str8 footer = wapp_str8_buf(CCGEN_BUF_LARGE);
+  Str8 tmp    = wapp_str8_buf(CCGEN_BUF_LARGE);
+
+  if (cenum->add_typedef) {
+    wapp_str8_copy_cstr_capped(&header, "typedef enum {\n");
+    wapp_str8_format(&footer, "} " WAPP_STR8_SPEC ";\n", wapp_str8_varg(cenum->name));
+  } else {
+    wapp_str8_format(&header, "enum " WAPP_STR8_SPEC " {\n", wapp_str8_varg(cenum->name));
+    wapp_str8_copy_cstr_capped(&footer, "};\n");
+  }
+
+  for (u64 i = 0; i < cenum->values.node_count; ++i) {
+    cenumval_to_string(&tmp, wapp_cenumval_list_get(&(cenum->values), i)->item);
+    // Add 4 for extra characters
+    wapp_runtime_assert(tmp.size + 4 <= values.capacity - values.size, ERR_MSG);
+    wapp_str8_concat_capped(&values, &wapp_str8_lit_ro("  "));
+    wapp_str8_concat_capped(&values, &tmp);
+    wapp_str8_concat_capped(&values, &wapp_str8_lit_ro(",\n"));
+  }
+
+  u64 total_size = header.size + values.size + footer.size;
+  wapp_runtime_assert(total_size <= dst->capacity, ERR_MSG);
+  wapp_str8_format(dst,
+                   WAPP_STR8_SPEC WAPP_STR8_SPEC WAPP_STR8_SPEC,
+                   wapp_str8_varg(header),
+                   wapp_str8_varg(values),
+                   wapp_str8_varg(footer));
+}
+
+void cmacro_to_string(Str8 *dst, const CMacro *cmacro) {
+  wapp_debug_assert(dst != NULL && cmacro != NULL, "`dst` and `cmacro` should not be NULL");
+
+  Str8 def       = wapp_str8_lit("#define ");
+  u64 total_size = def.size + cmacro->name.size + cmacro->value.size + 1; // Add 1 for newline
+  wapp_runtime_assert(total_size <= dst->capacity, ERR_MSG);
+  wapp_str8_format(dst,
+                   WAPP_STR8_SPEC WAPP_STR8_SPEC " " WAPP_STR8_SPEC "\n",
+                   wapp_str8_varg(def),
+                   wapp_str8_varg(cmacro->name),
+                   wapp_str8_varg(cmacro->value));
+}
+
+void cstruct_to_string(Str8 *dst, const CStruct *cstruct) {
+  wapp_debug_assert(dst != NULL && cstruct != NULL, "`dst` and `cstruct` should not be NULL");
+
+  Str8 declaration = wapp_str8_buf(CCGEN_BUF_LARGE);
+  Str8 definition  = wapp_str8_buf(CCGEN_BUF_MAX);
+
+  declare_cstruct(&declaration, cstruct);
+  define_cstruct(&definition, cstruct);
+
+  u64 total_size = declaration.size + definition.size;
+  wapp_runtime_assert(total_size <= dst->capacity, ERR_MSG);
+  wapp_str8_format(dst, WAPP_STR8_SPEC WAPP_STR8_SPEC,
+                   wapp_str8_varg(declaration), wapp_str8_varg(definition));
+}
+
+void declare_cstruct(Str8 *dst, const CStruct *cstruct) {
+  wapp_debug_assert(dst != NULL && cstruct != NULL, "`dst` and `cstruct` should not be NULL");
+
+  Str8 tmp = wapp_str8_buf(CCGEN_BUF_MAX);
+  wapp_str8_format(&tmp,
+                   "typedef struct " WAPP_STR8_SPEC " " WAPP_STR8_SPEC ";\n",
+                   wapp_str8_varg(cstruct->name),
+                   wapp_str8_varg(cstruct->typedef_name.size > 0 ? cstruct->typedef_name : cstruct->name));
+
+  wapp_runtime_assert(tmp.size <= dst->capacity, ERR_MSG);
+  wapp_str8_copy_str8_capped(dst, &tmp);
+}
+
+void define_cstruct(Str8 *dst, const CStruct *cstruct) {
+  wapp_debug_assert(dst != NULL && cstruct != NULL, "`dst` and `cstruct` should not be NULL");
+
+  Str8 definition = wapp_str8_buf(CCGEN_BUF_LARGE);
+  Str8 args       = wapp_str8_buf(CCGEN_BUF_MAX);
+  Str8 footer     = wapp_str8_lit_ro("};\n");
+  Str8 tmp        = wapp_str8_buf(CCGEN_BUF_MEDIUM);
+
+  wapp_str8_format(&definition, "struct " WAPP_STR8_SPEC " {\n", wapp_str8_varg(cstruct->name));
+
+  for (u64 i = 0; i < cstruct->args.node_count; ++i) {
+    carg_to_string(&tmp, wapp_carg_list_get(&(cstruct->args), i)->item);
+    // Add 4 for extra characters
+    wapp_runtime_assert(tmp.size + 4 <= args.capacity - args.size, ERR_MSG);
+    wapp_str8_concat_capped(&args, &wapp_str8_lit_ro("  "));
+    wapp_str8_concat_capped(&args, &tmp);
+    wapp_str8_concat_capped(&args, &wapp_str8_lit_ro(";\n"));
+  }
+
+  u64 total_size = definition.size + args.size + footer.size;
+  wapp_runtime_assert(total_size <= dst->capacity, ERR_MSG);
+  wapp_str8_format(dst,
+                   WAPP_STR8_SPEC WAPP_STR8_SPEC WAPP_STR8_SPEC,
+                   wapp_str8_varg(definition),
+                   wapp_str8_varg(args),
+                   wapp_str8_varg(footer));
+}
+
+void cusertype_to_string(Str8 *dst, const CUserType *cusertype) {
+  wapp_debug_assert(dst != NULL && cusertype != NULL, "`dst` and `cusertype` should not be NULL");
+
+  switch (cusertype->kind) {
+    case CUSERTYPE_CENUM:
+      cenum_to_string(dst, &(cusertype->type.c_enum));
+      break;
+    case CUSERTYPE_CSTRUCT:
+      cstruct_to_string(dst, &(cusertype->type.c_struct));
+      break;
+    default:
+      break;
+  }
+}
+
+void cdatatype_to_string(Str8 *dst, const CDataType *cdatatype) {
+  wapp_debug_assert(dst != NULL && cdatatype != NULL, "`dst` and `cdatatype` should not be NULL");
+
+  switch (cdatatype->kind) {
+    case CDATATYPE_CTYPE:
+      ctype_to_string(dst, cdatatype->type.c_type);
+      break;
+    case CDATATYPE_CUSERTYPE:
+      cusertype_to_string(dst, &(cdatatype->type.c_usertype));
+      break;
+    case CDATATYPE_STR:
+      wapp_runtime_assert(cdatatype->type.str.size <= dst->capacity, ERR_MSG);
+      wapp_str8_copy_str8_capped(dst, &(cdatatype->type.str));
+      break;
+    default:
+      break;
+  }
+}
+
+void carg_to_string(Str8 *dst, const CArg *carg) {
+  wapp_debug_assert(dst != NULL && carg != NULL, "`dst` and `carg` should not be NULL");
+
+  Str8 qualifier = wapp_str8_buf(CCGEN_BUF_MEDIUM);
+  Str8 type      = wapp_str8_buf(CCGEN_BUF_LARGE);
+  Str8 pointer   = wapp_str8_buf(CCGEN_BUF_MEDIUM);
+  Str8 array     = wapp_str8_buf(CCGEN_BUF_MEDIUM);
+
+  cqualifier_to_string(&qualifier, carg->qualifier);
+  cdatatype_to_string(&type, &(carg->type));
+  wapp_str8_concat_capped(&type, &wapp_str8_lit_ro(" "));
+  cpointer_to_string(&pointer, &(carg->pointer));
+  if (carg->is_array) { wapp_str8_copy_cstr_capped(&array, "[]"); }
+
+  u64 total_size = qualifier.size + type.size + pointer.size + array.size + carg->name.size;
+  wapp_runtime_assert(total_size <= dst->capacity, ERR_MSG);
+  wapp_str8_format(dst, WAPP_STR8_SPEC WAPP_STR8_SPEC WAPP_STR8_SPEC WAPP_STR8_SPEC WAPP_STR8_SPEC,
+                   wapp_str8_varg(qualifier), wapp_str8_varg(type), wapp_str8_varg(pointer),
+                   wapp_str8_varg(carg->name), wapp_str8_varg(array));
+}
+
+void cfunc_to_string(Str8 *dst, const CFunc *cfunc) {
+  wapp_debug_assert(dst != NULL && cfunc != NULL, "`dst` and `cfunc` should not be NULL");
+
+  Str8 qualifiers = wapp_str8_buf(CCGEN_BUF_LARGE);
+  Str8 args       = wapp_str8_buf(CCGEN_BUF_LARGE);
+  Str8 ret_type   = wapp_str8_buf(CCGEN_BUF_SMALL);
+  Str8 pointer    = wapp_str8_buf(CCGEN_BUF_SMALL);
+  Str8 tmp        = wapp_str8_buf(CCGEN_BUF_MEDIUM);
+  CQualifier *qf  = NULL;
+  CArg *arg       = NULL;
+
+  for (u64 i = 0; i < cfunc->qualifiers.node_count; ++i) {
+    qf = wapp_cqualifier_list_get(&(cfunc->qualifiers), i)->item;
+    if (*qf == CQUALIFIER_NONE) { continue; }
+
+    cqualifier_to_string(&tmp, *qf);
+
+    wapp_runtime_assert(tmp.size + 1 <= qualifiers.capacity - qualifiers.size, ERR_MSG);
+    if (qualifiers.size > 0) { wapp_str8_concat_capped(&qualifiers, &wapp_str8_lit_ro(" ")); }
+
+    wapp_str8_concat_capped(&qualifiers, &tmp);
+  }
+
+  for (u64 i = 0; i < cfunc->args.node_count; ++i) {
+    arg = wapp_carg_list_get(&(cfunc->args), i)->item;
+    carg_to_string(&tmp, arg);
+
+    wapp_runtime_assert(tmp.size + 2 <= args.capacity - args.size, ERR_MSG);
+    wapp_str8_concat_capped(&args, &tmp);
+    if (i + 1 < cfunc->args.node_count) { wapp_str8_concat_capped(&args, &wapp_str8_lit_ro(", ")); }
+  }
+
+  cdatatype_to_string(&ret_type, &(cfunc->ret_type));
+  cpointer_to_string(&pointer, &(cfunc->pointer));
+
+  u64 total_size = cfunc->name.size + qualifiers.size + args.size + ret_type.size + pointer.size + 4;
+  wapp_runtime_assert(total_size <= dst->capacity, ERR_MSG);
+  wapp_str8_format(dst,
+                   WAPP_STR8_SPEC WAPP_STR8_SPEC " " WAPP_STR8_SPEC WAPP_STR8_SPEC "(" WAPP_STR8_SPEC ")",
+                   wapp_str8_varg(qualifiers),
+                   wapp_str8_varg(ret_type),
+                   wapp_str8_varg(pointer),
+                   wapp_str8_varg(cfunc->name),
+                   wapp_str8_varg(args));
+}
+
+void declare_cfunc(Str8 *dst, const CFunc *cfunc) {
+  wapp_debug_assert(dst != NULL && cfunc != NULL, "`dst` and `cfunc` should not be NULL");
+
+  Str8 tmp = wapp_str8_buf(CCGEN_BUF_MAX);
+  cfunc_to_string(&tmp, cfunc);
+
+  wapp_runtime_assert(tmp.size + 2 <= dst->capacity, ERR_MSG);
+  wapp_str8_format(dst, WAPP_STR8_SPEC ";\n", wapp_str8_varg(tmp));
+}
+
+void define_cfunc(Str8 *dst, const CFunc *cfunc) {
+  wapp_debug_assert(dst != NULL && cfunc != NULL, "`dst` and `cfunc` should not be NULL");
+
+  Str8 tmp = wapp_str8_buf(CCGEN_BUF_MAX);
+  cfunc_to_string(&tmp, cfunc);
+
+  wapp_runtime_assert(tmp.size + cfunc->body.size + 8 <= dst->capacity, ERR_MSG);
+  wapp_str8_format(dst, WAPP_STR8_SPEC " {\n" WAPP_STR8_SPEC "\n}\n\n",
+                   wapp_str8_varg(tmp), wapp_str8_varg(cfunc->body));
+}
+
+void cinclude_to_string(Str8 *dst, const CInclude *cinclude) {
+  wapp_debug_assert(dst != NULL && cinclude != NULL, "`dst` and `cinclude` should not be NULL");
+
+  Str8 header_str = wapp_str8_buf(CCGEN_BUF_LARGE);
+  if (!cheaderinclude_to_string(&header_str, &(cinclude->header))) { return; }
+
+  Str8 inc = wapp_str8_lit("#include ");
+  Str8 open_symbol = wapp_str8_buf(CCGEN_BUF_MIN);
+  Str8 close_symbol = wapp_str8_buf(CCGEN_BUF_MIN);
+
+  if (cinclude->is_local) {
+    wapp_str8_concat_capped(&open_symbol, &wapp_str8_lit_ro("\""));
+    wapp_str8_concat_capped(&close_symbol, &wapp_str8_lit_ro("\""));
+    if (cinclude->same_dir) { wapp_str8_concat_capped(&open_symbol, &wapp_str8_lit_ro("./")); }
+  } else {
+    wapp_str8_concat_capped(&open_symbol, &wapp_str8_lit_ro("<"));
+    wapp_str8_concat_capped(&close_symbol, &wapp_str8_lit_ro(">"));
+  }
+
+  u64 total_size = header_str.size + inc.size + open_symbol.size + close_symbol.size;
+  wapp_runtime_assert(total_size <= dst->capacity, ERR_MSG);
+  wapp_str8_format(dst,
+                   WAPP_STR8_SPEC WAPP_STR8_SPEC WAPP_STR8_SPEC WAPP_STR8_SPEC "\n",
+                   wapp_str8_varg(inc),
+                   wapp_str8_varg(open_symbol),
+                   wapp_str8_varg(header_str),
+                   wapp_str8_varg(close_symbol));
+}
+
+void cheader_to_string(Str8 *dst, const CHeader *cheader) {
+  wapp_debug_assert(dst != NULL && cheader != NULL, "`dst` and `cheader` should not be NULL");
+
+  Allocator arena = wapp_mem_arena_allocator_init(MB(64));
+  Str8 *output = wapp_str8_alloc_buf(&arena, KB(32));
+  wapp_runtime_assert(output != NULL, "Failed to allocate buffer");
+
+  Str8 header_guard_name = wapp_str8_buf(CCGEN_BUF_SMALL);
+  Str8 tmp = wapp_str8_buf(CCGEN_BUF_MAX);
+
+  // ADD HEADER GUARD AND START C LINKAGE
+  wapp_str8_to_upper(&header_guard_name, &(cheader->name));
+  wapp_str8_concat_capped(&header_guard_name, &wapp_str8_lit_ro("_H"));
+  wapp_str8_format(&tmp, "#ifndef " WAPP_STR8_SPEC "\n#define " WAPP_STR8_SPEC "\n\n"
+                   "#ifdef WAPP_PLATFORM_CPP\nBEGIN_C_LINKAGE\n#endif // !WAPP_PLATFORM_CPP\n\n",
+                   wapp_str8_varg(header_guard_name), wapp_str8_varg(header_guard_name));
+  wapp_str8_alloc_concat(&arena, output, &tmp);
+
+  for (u64 i = 0; i < cheader->includes.node_count; ++i) {
+    cinclude_to_string(&tmp, wapp_cinclude_list_get(&(cheader->includes), i)->item);
+    wapp_str8_alloc_concat(&arena, output, &tmp);
+  }
+  if (cheader->includes.node_count > 0) { wapp_str8_alloc_concat(&arena, output, &wapp_str8_lit_ro("\n")); }
+
+  for (u64 i = 0; i < cheader->macros.node_count; ++i) {
+    cmacro_to_string(&tmp, wapp_cmacro_list_get(&(cheader->macros), i)->item);
+    wapp_str8_alloc_concat(&arena, output, &tmp);
+  }
+  if (cheader->macros.node_count > 0) { wapp_str8_alloc_concat(&arena, output, &wapp_str8_lit_ro("\n")); }
+
+  if (cheader->cpp_macros.node_count > 0) {
+    wapp_str8_alloc_concat(&arena, output, &wapp_str8_lit_ro("#ifdef WAPP_PLATFORM_CPP\n"));
+
+    for (u64 i = 0; i < cheader->cpp_macros.node_count; ++i) {
+      cmacro_to_string(&tmp, wapp_cmacro_list_get(&(cheader->cpp_macros), i)->item);
+      wapp_str8_alloc_concat(&arena, output, &tmp);
+    }
+
+    wapp_str8_alloc_concat(&arena, output, &wapp_str8_lit_ro("#else\n"));
+
+    for (u64 i = 0; i < cheader->c_macros.node_count; ++i) {
+      cmacro_to_string(&tmp, wapp_cmacro_list_get(&(cheader->c_macros), i)->item);
+      wapp_str8_alloc_concat(&arena, output, &tmp);
+    }
+
+    wapp_str8_alloc_concat(&arena, output, &wapp_str8_lit_ro("#endif // !WAPP_PLATFORM_CPP\n\n"));
+  }
+
+  for (u64 i = 0; i < cheader->decl_types.node_count; ++i) {
+    declare_cstruct(&tmp, wapp_cstruct_list_get(&(cheader->decl_types), i)->item);
+    wapp_str8_alloc_concat(&arena, output, &tmp);
+  }
+  if (cheader->decl_types.node_count > 0) { wapp_str8_alloc_concat(&arena, output, &wapp_str8_lit_ro("\n")); }
+
+  for (u64 i = 0; i < cheader->types.node_count; ++i) {
+    cusertype_to_string(&tmp, wapp_cusertype_list_get(&(cheader->types), i)->item);
+    wapp_str8_concat_capped(&tmp, &wapp_str8_lit_ro("\n"));
+    wapp_str8_alloc_concat(&arena, output, &tmp);
+  }
+
+  for (u64 i = 0; i < cheader->funcs.node_count; ++i) {
+    declare_cfunc(&tmp, wapp_cfunc_list_get(&(cheader->funcs), i)->item);
+    wapp_str8_alloc_concat(&arena, output, &tmp);
+  }
+
+  // END C LINKAGE AND CLOSE HEADER GUARD
+  wapp_str8_format(&tmp, "\n#ifdef WAPP_PLATFORM_CPP\nEND_C_LINKAGE\n#endif // !WAPP_PLATFORM_CPP\n\n"
+                   "#endif // !" WAPP_STR8_SPEC "\n", wapp_str8_varg(header_guard_name));
+  wapp_str8_alloc_concat(&arena, output, &tmp);
+
+  wapp_runtime_assert(output->size <= dst->capacity, ERR_MSG);
+  wapp_str8_copy_str8_capped(dst, output);
+
+  wapp_mem_arena_allocator_destroy(&arena);
+}
+
+void csource_to_string(Str8 *dst, const CSource *csource) {
+  wapp_debug_assert(dst != NULL && csource != NULL, "`dst` and `csource` should not be NULL");
+
+  Allocator arena = wapp_mem_arena_allocator_init(MB(64));
+  Str8 *output = wapp_str8_alloc_buf(&arena, KB(32));
+  Str8 *internal_funcs_def = wapp_str8_alloc_buf(&arena, KB(16));
+  wapp_runtime_assert(output != NULL && internal_funcs_def != NULL, "Failed to allocate buffer");
+
+  Str8 tmp = wapp_str8_buf(CCGEN_BUF_MAX);
+
+  for (u64 i = 0; i < csource->includes.node_count; ++i) {
+    cinclude_to_string(&tmp, wapp_cinclude_list_get(&(csource->includes), i)->item);
+    wapp_str8_alloc_concat(&arena, output, &tmp);
+  }
+  if (csource->includes.node_count > 0) { wapp_str8_alloc_concat(&arena, output, &wapp_str8_lit_ro("\n")); }
+
+  for (u64 i = 0; i < csource->macros.node_count; ++i) {
+    cmacro_to_string(&tmp, wapp_cmacro_list_get(&(csource->macros), i)->item);
+    wapp_str8_alloc_concat(&arena, output, &tmp);
+  }
+  if (csource->macros.node_count > 0) { wapp_str8_alloc_concat(&arena, output, &wapp_str8_lit_ro("\n")); }
+
+  for (u64 i = 0; i < csource->decl_types.node_count; ++i) {
+    declare_cstruct(&tmp, wapp_cstruct_list_get(&(csource->decl_types), i)->item);
+    wapp_str8_alloc_concat(&arena, output, &tmp);
+  }
+  if (csource->decl_types.node_count > 0) { wapp_str8_alloc_concat(&arena, output, &wapp_str8_lit_ro("\n")); }
+
+  for (u64 i = 0; i < csource->types.node_count; ++i) {
+    cusertype_to_string(&tmp, wapp_cusertype_list_get(&(csource->types), i)->item);
+    wapp_str8_concat_capped(&tmp, &wapp_str8_lit_ro("\n"));
+    wapp_str8_alloc_concat(&arena, output, &tmp);
+  }
+
+  Str8RO _wapp_intern = wapp_str8_lit_ro("wapp_intern ");
+  for (u64 i = 0; i < csource->internal_funcs.node_count; ++i) {
+    declare_cfunc(&tmp, wapp_cfunc_list_get(&(csource->internal_funcs), i)->item);
+    wapp_str8_alloc_concat(&arena, output, &_internal);
+    wapp_str8_alloc_concat(&arena, output, &tmp);
+
+    define_cfunc(&tmp, wapp_cfunc_list_get(&(csource->internal_funcs), i)->item);
+    wapp_str8_alloc_concat(&arena, internal_funcs_def, &_internal);
+    wapp_str8_alloc_concat(&arena, internal_funcs_def, &tmp);
+  }
+  if (csource->internal_funcs.node_count > 0) { wapp_str8_alloc_concat(&arena, output, &wapp_str8_lit_ro("\n")); }
+
+  for (u64 i = 0; i < csource->funcs.node_count; ++i) {
+    define_cfunc(&tmp, wapp_cfunc_list_get(&(csource->funcs), i)->item);
+    wapp_str8_alloc_concat(&arena, output, &tmp);
+  }
+
+  wapp_runtime_assert(output->size + internal_funcs_def->size <= dst->capacity, ERR_MSG);
+  wapp_str8_copy_str8_capped(dst, output);
+  wapp_str8_concat_capped(dst, internal_funcs_def);
+
+  wapp_mem_arena_allocator_destroy(&arena);
+}
+
+b8 cheaderinclude_to_string(Str8 *dst, const CHeaderInclude *cheaderinclude) {
+  wapp_debug_assert(dst != NULL && cheaderinclude != NULL, "`dst` and `cheaderinclude` should not be NULL");
+
+  switch (cheaderinclude->kind) {
+    case C_HEADER_INCLUDE_STR:
+      wapp_runtime_assert(cheaderinclude->header.name.size <= dst->capacity, ERR_MSG);
+      wapp_str8_format(dst, WAPP_STR8_SPEC, wapp_str8_varg(cheaderinclude->header.name));
+      return true;
+    case C_HEADER_INCLUDE_HEADER:
+      // Take extension into account
+      wapp_runtime_assert(cheaderinclude->header.header.name.size + 2 <= dst->capacity, ERR_MSG);
+      wapp_str8_format(
+        dst,
+        WAPP_STR8_SPEC ".%s",
+        wapp_str8_varg(cheaderinclude->header.header.name),
+        cheaderinclude->header.header.extension == CFILE_EXT_H ? "h" : "c"
+      );
+      return true;
+    default:
+      return false;
+  }
+
+  return false;
+}
--- a/ccodegen/datatypes.h
+++ b/ccodegen/datatypes.h
@@ -0,0 +1,280 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
+#ifndef DATATYPES_H
+#define DATATYPES_H
+
+#include "wapp_core.h"
+#include "dbl_list.h"
+#include "type_enums.h"
+
+#ifndef CCGEN_BUF_MIN
+#define CCGEN_BUF_MIN 16
+#endif // !CCGEN_BUF_MIN
+
+#ifndef CCGEN_BUF_TINY
+#define CCGEN_BUF_TINY 32
+#endif // !CCGEN_BUF_TINY
+
+#ifndef CCGEN_BUF_SMALL
+#define CCGEN_BUF_SMALL 512
+#endif // !CCGEN_BUF_SMALL
+
+#ifndef CCGEN_BUF_MEDIUM
+#define CCGEN_BUF_MEDIUM 1024
+#endif // !CCGEN_BUF_MEDIUM
+
+#ifndef CCGEN_BUF_LARGE
+#define CCGEN_BUF_LARGE 4096
+#endif // !CCGEN_BUF_LARGE
+
+#ifndef CCGEN_BUF_MAX
+#define CCGEN_BUF_MAX 8192
+#endif // !CCGEN_BUF_MAX
+
+#define CENUM(NAME, VALUES, TYPEDEF) ((CEnum){ .name = (NAME), .values = (VALUES), .add_typedef = (TYPEDEF) })
+#define CSTRUCT(NAME, ARGS, TYPEDEF_NAME_PTR) ((CStruct){ .name = (NAME), .args = (ARGS), .typedef_name = (TYPEDEF_NAME_PTR) })
+
+#define CUSERTYPE_ENUM(ENUM) ((CUserType){ .kind = CUSERTYPE_CENUM, .type.c_enum = ENUM })
+#define CUSERTYPE_STRUCT(STRUCT) ((CUserType){ .kind = CUSERTYPE_CSTRUCT, .type.c_struct = STRUCT })
+
+#define CDATATYPE_CTYPE(VALUE) ((CDataType){ .kind = CDATATYPE_CTYPE, .type.c_type = (VALUE) })
+#define CDATATYPE_USERTYPE(USERTYPE) ((CDataType){ .kind = CDATATYPE_CUSERTYPE, .type.c_usertype = (USERTYPE) })
+#define CDATATYPE_STR(STR) ((CDataType){ .kind = CDATATYPE_STR, .type.str = (STR) })
+
+#define CHEADERINCLUDE_STR(NAME) ((CHeaderInclude){ .kind = C_HEADER_INCLUDE_STR, .header.name = (NAME) })
+#define CHEADERINCLUDE_CHEADER(CHEADER) ((CHeaderInclude){ .kind = C_HEADER_INCLUDE_HEADER, .header.header = (CHEADER) })
+
+#define COBJECT_TYPE(VALUE)                                                    \
+  ((CObject){ .kind = COBJECT_CTYPE, .object.c_type = (VALUE) })
+#define COBJECT_QUALIFIER(VALUE)                                               \
+  ((CObject){ .kind = COBJECT_CQUALIFIER, .object.c_qualifier = (VALUE) })
+#define COBJECT_POINTERTYPE(VALUE)                                             \
+  ((CObject){ .kind = COBJECT_CPOINTERTYPE, .object.c_pointertype = (VALUE) })
+#define COBJECT_POINTER(CPOINTER)                                              \
+  ((CObject){ .kind = COBJECT_CPOINTER, .object.c_pointer = (CPOINTER) })
+#define COBJECT_ENUMVAL(CENUMVAL)                                              \
+  ((CObject){ .kind = COBJECT_CENUMVAL, .object.c_enumval = (CENUMVAL) })
+#define COBJECT_ENUM(ENUM)                                                     \
+  ((CObject){ .kind = COBJECT_CENUM, .object.c_enum = (ENUM) })
+#define COBJECT_MACRO(CMACRO)                                                  \
+  ((CObject){ .kind = COBJECT_CMACRO, .object.c_macro = (CMACRO) })
+#define COBJECT_STRUCT(STRUCT)                                                 \
+  ((CObject){ .kind = COBJECT_CSTRUCT, .object.c_struct = STRUCT })
+#define COBJECT_USERTYPE(USERTYPE)                                             \
+  ((CObject){ .kind = COBJECT_CUSERTYPE, .object.c_usertype = (USERTYPE) })
+#define COBJECT_DATATYPE(DATATYPE)                                             \
+  ((CObject){ .kind = COBJECT_CDATATYPE, .object.c_datatype = (DATATYPE) })
+#define COBJECT_ARG(CARG)                                                      \
+  ((CObject){ .kind = COBJECT_CARG, .object.c_arg = (CARG) })
+#define COBJECT_FUNC(CFUNC)                                                    \
+  ((CObject){ .kind = COBJECT_CFUNC, .object.c_func = (CFUNC) })
+#define COBJECT_INCULDE(CINCLUDE)                                              \
+  ((CObject){ .kind = COBJECT_CINCULDE, .object.c_include = (CINCLUDE) })
+#define COBJECT_HEADER(CHEADER)                                                \
+  ((CObject){ .kind = COBJECT_CHEADER, .object.c_header = (CHEADER) })
+#define COBJECT_SOURCE(CSOURCE)                                                \
+  ((CObject){ .kind = COBJECT_CSOURCE, .object.c_source = (CSOURCE) })
+
+typedef enum {
+  CUSERTYPE_CENUM,
+  CUSERTYPE_CSTRUCT,
+
+  COUNT_CUSERTYPEKIND,
+} CUserTypeKind;
+
+typedef enum {
+  CDATATYPE_CTYPE,
+  CDATATYPE_CUSERTYPE,
+  CDATATYPE_STR,
+
+  COUNT_CDATATYPEKIND,
+} CDataTypeKind;
+
+typedef enum {
+  CFILE_EXT_H,
+  CFILE_EXT_C,
+
+  COUNT_CFILE_EXT,
+} CFileExtension;
+
+typedef enum {
+  C_HEADER_INCLUDE_STR,
+  C_HEADER_INCLUDE_HEADER,
+
+  COUNT_CHEADERINCLUDEKIND,
+} CHeaderIncludeKind;
+
+typedef enum {
+  COBJECT_CTYPE,
+  COBJECT_CQUALIFIER,
+  COBJECT_CPOINTERTYPE,
+  COBJECT_CPOINTER,
+  COBJECT_CENUMVAL,
+  COBJECT_CENUM,
+  COBJECT_CMACRO,
+  COBJECT_CSTRUCT,
+  COBJECT_CUSERTYPE,
+  COBJECT_CDATATYPE,
+  COBJECT_CARG,
+  COBJECT_CFUNC,
+  COBJECT_CINCULDE,
+  COBJECT_CHEADER,
+  COBJECT_CSOURCE,
+
+  COUNT_COBJECTKIND,
+} CObjectKind;
+
+typedef struct cpointer        CPointer;
+typedef struct cenumval        CEnumVal;
+typedef struct cenum           CEnum;
+typedef struct cmacro          CMacro;
+typedef struct cstruct         CStruct;
+typedef struct cusertype       CUserType;
+typedef struct cdatatype       CDataType;
+typedef struct carg            CArg;
+typedef struct cfunc           CFunc;
+typedef struct cheader_include CHeaderInclude;
+typedef struct cinclude        CInclude;
+typedef struct cheader         CHeader;
+typedef struct csource         CSource;
+typedef struct cobject         CObject;
+
+struct cpointer {
+  CPointerType type;
+  CQualifier qualifier;
+};
+
+struct cenumval {
+  Str8 name;
+  i32 *value;
+};
+
+struct cenum {
+  Str8 name;
+  CEnumValList values;
+  b8 add_typedef;
+};
+
+struct cmacro {
+  Str8 name;
+  Str8 value;
+};
+
+struct cstruct {
+  Str8 name;
+  CArgList args;
+  Str8 typedef_name;
+};
+
+struct cusertype {
+  CUserTypeKind kind;
+  union {
+    CEnum c_enum;
+    CStruct c_struct;
+  } type;
+};
+
+struct cdatatype {
+  CDataTypeKind kind;
+  union {
+    CType c_type;
+    CUserType c_usertype;
+    Str8 str;
+  } type;
+};
+
+struct carg {
+  Str8 name;
+  CDataType type;
+  CPointer pointer;
+  CQualifier qualifier;
+  b8 is_array;
+};
+
+struct cfunc {
+  Str8 name;
+  CDataType ret_type;
+  CArgList args;
+  Str8 body;
+  CPointer pointer;
+  CQualifierList qualifiers;
+};
+
+#define CFILE_ARGS          \
+  Str8 name;                \
+  CFileExtension extension; \
+  CIncludeList includes;    \
+  CUserTypeList types;      \
+  CFuncList funcs;          \
+  CStructList decl_types;   \
+  CMacroList macros;        \
+  CMacroList c_macros;      \
+  CMacroList cpp_macros     \
+
+struct cheader {
+  CFILE_ARGS;
+};
+
+struct csource {
+  CFILE_ARGS;
+  CFuncList internal_funcs;
+};
+
+struct cheader_include {
+  CHeaderIncludeKind kind;
+  union {
+    Str8 name;
+    CHeader header;
+  } header;
+};
+
+struct cinclude {
+  CHeaderInclude header;
+  b8 is_local;
+  b8 same_dir;
+};
+
+struct cobject {
+  CObjectKind kind;
+  union {
+    CType c_type;
+    CQualifier c_qualifier;
+    CPointerType c_pointertype;
+    CPointer c_pointer;
+    CEnumVal c_enumval;
+    CEnum c_enum;
+    CMacro c_macro;
+    CStruct c_struct;
+    CUserType c_usertype;
+    CDataType c_datatype;
+    CArg c_arg;
+    CFunc c_func;
+    CInclude c_include;
+    CHeader c_header;
+    CSource c_source;
+  } object;
+};
+
+void cobject_to_string(Str8 *dst, const CObject *object);
+void ctype_to_string(Str8 *dst, CType ctype);
+void cqualifier_to_string(Str8 *dst, CQualifier cqualifier);
+void cpointertype_to_string(Str8 *dst, CPointerType cpointertype);
+void cpointer_to_string(Str8 *dst, const CPointer *cpointer);
+void cenumval_to_string(Str8 *dst, const CEnumVal *cenumval);
+void cenum_to_string(Str8 *dst, const CEnum *cenum);
+void cmacro_to_string(Str8 *dst, const CMacro *cmacro);
+void cstruct_to_string(Str8 *dst, const CStruct *cstruct);
+void declare_cstruct(Str8 *dst, const CStruct *cstruct);
+void define_cstruct(Str8 *dst, const CStruct *cstruct);
+void cusertype_to_string(Str8 *dst, const CUserType *cusertype);
+void cdatatype_to_string(Str8 *dst, const CDataType *cdatatype);
+void carg_to_string(Str8 *dst, const CArg *carg);
+void cfunc_to_string(Str8 *dst, const CFunc *cfunc);
+void declare_cfunc(Str8 *dst, const CFunc *cfunc);
+void define_cfunc(Str8 *dst, const CFunc *cfunc);
+void cinclude_to_string(Str8 *dst, const CInclude *cinclude);
+void cheader_to_string(Str8 *dst, const CHeader *cheader);
+void csource_to_string(Str8 *dst, const CSource *csource);
+b8 cheaderinclude_to_string(Str8 *dst, const CHeaderInclude *cheaderinclude);
+
+#endif // !DATATYPES_H
--- a/ccodegen/dbl_list.c
+++ b/ccodegen/dbl_list.c
--- a/ccodegen/dbl_list.h
+++ b/ccodegen/dbl_list.h
@@ -0,0 +1,222 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
+#ifndef CCGEN_DBL_LIST_H
+#define CCGEN_DBL_LIST_H
+
+#include "wapp_core.h"
+#include "type_enums.h"
+
+#ifdef WAPP_PLATFORM_CPP
+BEGIN_C_LINKAGE
+#endif // !WAPP_PLATFORM_CPP
+
+#ifdef WAPP_PLATFORM_CPP
+#define wapp_cenumval_list_node(ITEM_PTR) CEnumValNode{ITEM_PTR, nullptr, nullptr}
+#define wapp_carg_list_node(ITEM_PTR) CArgNode{ITEM_PTR, nullptr, nullptr}
+#define wapp_cqualifier_list_node(ITEM_PTR) CQualifierNode{ITEM_PTR, nullptr, nullptr}
+#define wapp_cinclude_list_node(ITEM_PTR) CIncludeNode{ITEM_PTR, nullptr, nullptr}
+#define wapp_cusertype_list_node(ITEM_PTR) CUserTypeNode{ITEM_PTR, nullptr, nullptr}
+#define wapp_cfunc_list_node(ITEM_PTR) CFuncNode{ITEM_PTR, nullptr, nullptr}
+#define wapp_cstruct_list_node(ITEM_PTR) CStructNode{ITEM_PTR, nullptr, nullptr}
+#define wapp_cmacro_list_node(ITEM_PTR) CMacroNode{ITEM_PTR, nullptr, nullptr}
+#else
+#define wapp_cenumval_list_node(ITEM_PTR) ((CEnumValNode){.item = ITEM_PTR})
+#define wapp_carg_list_node(ITEM_PTR) ((CArgNode){.item = ITEM_PTR})
+#define wapp_cqualifier_list_node(ITEM_PTR) ((CQualifierNode){.item = ITEM_PTR})
+#define wapp_cinclude_list_node(ITEM_PTR) ((CIncludeNode){.item = ITEM_PTR})
+#define wapp_cusertype_list_node(ITEM_PTR) ((CUserTypeNode){.item = ITEM_PTR})
+#define wapp_cfunc_list_node(ITEM_PTR) ((CFuncNode){.item = ITEM_PTR})
+#define wapp_cstruct_list_node(ITEM_PTR) ((CStructNode){.item = ITEM_PTR})
+#define wapp_cmacro_list_node(ITEM_PTR) ((CMacroNode){.item = ITEM_PTR})
+#endif // !WAPP_PLATFORM_CPP
+
+typedef struct cenumval CEnumVal;
+typedef struct carg CArg;
+typedef struct cinclude CInclude;
+typedef struct cusertype CUserType;
+typedef struct cfunc CFunc;
+typedef struct cstruct CStruct;
+typedef struct cmacro CMacro;
+
+typedef struct CEnumValNode CEnumValNode;
+struct CEnumValNode {
+  CEnumVal *item;
+  CEnumValNode *prev;
+  CEnumValNode *next;
+};
+
+typedef struct CEnumValList CEnumValList;
+struct CEnumValList {
+  CEnumValNode *first;
+  CEnumValNode *last;
+  u64 node_count;
+};
+
+typedef struct CArgNode CArgNode;
+struct CArgNode {
+  CArg *item;
+  CArgNode *prev;
+  CArgNode *next;
+};
+
+typedef struct CArgList CArgList;
+struct CArgList {
+  CArgNode *first;
+  CArgNode *last;
+  u64 node_count;
+};
+
+typedef struct CQualifierNode CQualifierNode;
+struct CQualifierNode {
+  CQualifier *item;
+  CQualifierNode *prev;
+  CQualifierNode *next;
+};
+
+typedef struct CQualifierList CQualifierList;
+struct CQualifierList {
+  CQualifierNode *first;
+  CQualifierNode *last;
+  u64 node_count;
+};
+
+typedef struct CIncludeNode CIncludeNode;
+struct CIncludeNode {
+  CInclude *item;
+  CIncludeNode *prev;
+  CIncludeNode *next;
+};
+
+typedef struct CIncludeList CIncludeList;
+struct CIncludeList {
+  CIncludeNode *first;
+  CIncludeNode *last;
+  u64 node_count;
+};
+
+typedef struct CUserTypeNode CUserTypeNode;
+struct CUserTypeNode {
+  CUserType *item;
+  CUserTypeNode *prev;
+  CUserTypeNode *next;
+};
+
+typedef struct CUserTypeList CUserTypeList;
+struct CUserTypeList {
+  CUserTypeNode *first;
+  CUserTypeNode *last;
+  u64 node_count;
+};
+
+typedef struct CFuncNode CFuncNode;
+struct CFuncNode {
+  CFunc *item;
+  CFuncNode *prev;
+  CFuncNode *next;
+};
+
+typedef struct CFuncList CFuncList;
+struct CFuncList {
+  CFuncNode *first;
+  CFuncNode *last;
+  u64 node_count;
+};
+
+typedef struct CStructNode CStructNode;
+struct CStructNode {
+  CStruct *item;
+  CStructNode *prev;
+  CStructNode *next;
+};
+
+typedef struct CStructList CStructList;
+struct CStructList {
+  CStructNode *first;
+  CStructNode *last;
+  u64 node_count;
+};
+
+typedef struct CMacroNode CMacroNode;
+struct CMacroNode {
+  CMacro *item;
+  CMacroNode *prev;
+  CMacroNode *next;
+};
+
+typedef struct CMacroList CMacroList;
+struct CMacroList {
+  CMacroNode *first;
+  CMacroNode *last;
+  u64 node_count;
+};
+
+CEnumValNode *wapp_cenumval_list_get(const CEnumValList *list, u64 index);
+void wapp_cenumval_list_push_front(CEnumValList *list, CEnumValNode *node);
+void wapp_cenumval_list_push_back(CEnumValList *list, CEnumValNode *node);
+void wapp_cenumval_list_insert(CEnumValList *list, CEnumValNode *node, u64 index);
+CEnumValNode *wapp_cenumval_list_pop_front(CEnumValList *list);
+CEnumValNode *wapp_cenumval_list_pop_back(CEnumValList *list);
+CEnumValNode *wapp_cenumval_list_remove(CEnumValList *list, u64 index);
+void wapp_cenumval_list_empty(CEnumValList *list);
+CArgNode *wapp_carg_list_get(const CArgList *list, u64 index);
+void wapp_carg_list_push_front(CArgList *list, CArgNode *node);
+void wapp_carg_list_push_back(CArgList *list, CArgNode *node);
+void wapp_carg_list_insert(CArgList *list, CArgNode *node, u64 index);
+CArgNode *wapp_carg_list_pop_front(CArgList *list);
+CArgNode *wapp_carg_list_pop_back(CArgList *list);
+CArgNode *wapp_carg_list_remove(CArgList *list, u64 index);
+void wapp_carg_list_empty(CArgList *list);
+CQualifierNode *wapp_cqualifier_list_get(const CQualifierList *list, u64 index);
+void wapp_cqualifier_list_push_front(CQualifierList *list, CQualifierNode *node);
+void wapp_cqualifier_list_push_back(CQualifierList *list, CQualifierNode *node);
+void wapp_cqualifier_list_insert(CQualifierList *list, CQualifierNode *node, u64 index);
+CQualifierNode *wapp_cqualifier_list_pop_front(CQualifierList *list);
+CQualifierNode *wapp_cqualifier_list_pop_back(CQualifierList *list);
+CQualifierNode *wapp_cqualifier_list_remove(CQualifierList *list, u64 index);
+void wapp_cqualifier_list_empty(CQualifierList *list);
+CIncludeNode *wapp_cinclude_list_get(const CIncludeList *list, u64 index);
+void wapp_cinclude_list_push_front(CIncludeList *list, CIncludeNode *node);
+void wapp_cinclude_list_push_back(CIncludeList *list, CIncludeNode *node);
+void wapp_cinclude_list_insert(CIncludeList *list, CIncludeNode *node, u64 index);
+CIncludeNode *wapp_cinclude_list_pop_front(CIncludeList *list);
+CIncludeNode *wapp_cinclude_list_pop_back(CIncludeList *list);
+CIncludeNode *wapp_cinclude_list_remove(CIncludeList *list, u64 index);
+void wapp_cinclude_list_empty(CIncludeList *list);
+CUserTypeNode *wapp_cusertype_list_get(const CUserTypeList *list, u64 index);
+void wapp_cusertype_list_push_front(CUserTypeList *list, CUserTypeNode *node);
+void wapp_cusertype_list_push_back(CUserTypeList *list, CUserTypeNode *node);
+void wapp_cusertype_list_insert(CUserTypeList *list, CUserTypeNode *node, u64 index);
+CUserTypeNode *wapp_cusertype_list_pop_front(CUserTypeList *list);
+CUserTypeNode *wapp_cusertype_list_pop_back(CUserTypeList *list);
+CUserTypeNode *wapp_cusertype_list_remove(CUserTypeList *list, u64 index);
+void wapp_cusertype_list_empty(CUserTypeList *list);
+CFuncNode *wapp_cfunc_list_get(const CFuncList *list, u64 index);
+void wapp_cfunc_list_push_front(CFuncList *list, CFuncNode *node);
+void wapp_cfunc_list_push_back(CFuncList *list, CFuncNode *node);
+void wapp_cfunc_list_insert(CFuncList *list, CFuncNode *node, u64 index);
+CFuncNode *wapp_cfunc_list_pop_front(CFuncList *list);
+CFuncNode *wapp_cfunc_list_pop_back(CFuncList *list);
+CFuncNode *wapp_cfunc_list_remove(CFuncList *list, u64 index);
+void wapp_cfunc_list_empty(CFuncList *list);
+CStructNode *wapp_cstruct_list_get(const CStructList *list, u64 index);
+void wapp_cstruct_list_push_front(CStructList *list, CStructNode *node);
+void wapp_cstruct_list_push_back(CStructList *list, CStructNode *node);
+void wapp_cstruct_list_insert(CStructList *list, CStructNode *node, u64 index);
+CStructNode *wapp_cstruct_list_pop_front(CStructList *list);
+CStructNode *wapp_cstruct_list_pop_back(CStructList *list);
+CStructNode *wapp_cstruct_list_remove(CStructList *list, u64 index);
+void wapp_cstruct_list_empty(CStructList *list);
+CMacroNode *wapp_cmacro_list_get(const CMacroList *list, u64 index);
+void wapp_cmacro_list_push_front(CMacroList *list, CMacroNode *node);
+void wapp_cmacro_list_push_back(CMacroList *list, CMacroNode *node);
+void wapp_cmacro_list_insert(CMacroList *list, CMacroNode *node, u64 index);
+CMacroNode *wapp_cmacro_list_pop_front(CMacroList *list);
+CMacroNode *wapp_cmacro_list_pop_back(CMacroList *list);
+CMacroNode *wapp_cmacro_list_remove(CMacroList *list, u64 index);
+void wapp_cmacro_list_empty(CMacroList *list);
+
+#ifdef WAPP_PLATFORM_CPP
+END_C_LINKAGE
+#endif // !WAPP_PLATFORM_CPP
+
+#endif // !DBL_LIST_H
--- a/ccodegen/main.c
+++ b/ccodegen/main.c
@@ -0,0 +1,10 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
+#include "datatypes.h"
+#include "type_enums.h"
+#include "wapp_core.h"
+#include <stdio.h>
+
+int main(void) {
+  return 0;
+}
--- a/ccodegen/type_enums.h
+++ b/ccodegen/type_enums.h
@@ -0,0 +1,84 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
+#ifndef TYPE_ENUMS_H
+#define TYPE_ENUMS_H
+
+#include "wapp_core.h"
+
+typedef enum {
+  CTYPE_VOID,
+  CTYPE_B8,
+  CTYPE_CHAR,
+  CTYPE_C8,
+  CTYPE_C16,
+  CTYPE_C32,
+  CTYPE_I8,
+  CTYPE_I16,
+  CTYPE_I32,
+  CTYPE_I64,
+  CTYPE_U8,
+  CTYPE_U16,
+  CTYPE_U32,
+  CTYPE_U64,
+  CTYPE_F32,
+  CTYPE_F64,
+  CTYPE_F128,
+  CTYPE_IPTR,
+  CTYPE_UPTR,
+
+  COUNT_CTYPE,
+} CType;
+wapp_intern Str8RO ctypes[COUNT_CTYPE] = {
+  [CTYPE_VOID] = wapp_str8_lit_ro("void"),
+  [CTYPE_B8]   = wapp_str8_lit_ro("b8"),
+  [CTYPE_CHAR] = wapp_str8_lit_ro("char"),
+  [CTYPE_C8]   = wapp_str8_lit_ro("c8"),
+  [CTYPE_C16]  = wapp_str8_lit_ro("c16"),
+  [CTYPE_C32]  = wapp_str8_lit_ro("c32"),
+  [CTYPE_I8]   = wapp_str8_lit_ro("i8"),
+  [CTYPE_I16]  = wapp_str8_lit_ro("i16"),
+  [CTYPE_I32]  = wapp_str8_lit_ro("i32"),
+  [CTYPE_I64]  = wapp_str8_lit_ro("i64"),
+  [CTYPE_U8]   = wapp_str8_lit_ro("u8"),
+  [CTYPE_U16]  = wapp_str8_lit_ro("u16"),
+  [CTYPE_U32]  = wapp_str8_lit_ro("u32"),
+  [CTYPE_U64]  = wapp_str8_lit_ro("u64"),
+  [CTYPE_F32]  = wapp_str8_lit_ro("f32"),
+  [CTYPE_F64]  = wapp_str8_lit_ro("f64"),
+  [CTYPE_F128] = wapp_str8_lit_ro("f128"),
+  [CTYPE_IPTR] = wapp_str8_lit_ro("iptr"),
+  [CTYPE_UPTR] = wapp_str8_lit_ro("uptr"),
+};
+
+typedef enum {
+  CQUALIFIER_NONE,
+  CQUALIFIER_CONST,
+  CQUALIFIER_EXTERNAL,
+  CQUALIFIER_INTERNAL,
+  CQUALIFIER_PERSISTENT,
+
+  COUNT_CQUALIFIER,
+} CQualifier;
+wapp_intern Str8RO cqualifiers[COUNT_CQUALIFIER] = {
+  [CQUALIFIER_NONE]       = wapp_str8_lit_ro(""),
+  [CQUALIFIER_CONST]      = wapp_str8_lit_ro("const "),
+  [CQUALIFIER_EXTERNAL]   = wapp_str8_lit_ro("wapp_extern "),
+  [CQUALIFIER_INTERNAL]   = wapp_str8_lit_ro("wapp_intern "),
+  [CQUALIFIER_PERSISTENT] = wapp_str8_lit_ro("wapp_persist "),
+};
+
+
+typedef enum {
+  CPOINTERTYPE_NONE,
+  CPOINTERTYPE_SINGLE,
+  CPOINTERTYPE_DOUBLE,
+
+  COUNT_CPOINTERTYPE,
+} CPointerType;
+wapp_intern Str8RO cpointertypes[COUNT_CPOINTERTYPE] = {
+  [CPOINTERTYPE_NONE]   = wapp_str8_lit_ro(""),
+  [CPOINTERTYPE_SINGLE] = wapp_str8_lit_ro("*"),
+  [CPOINTERTYPE_DOUBLE] = wapp_str8_lit_ro("**"),
+};
+
+#endif // !TYPE_ENUMS_H
--- a/11
+++ b/11
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-cp -r src wapp
-
-mkdir -p dist
-
-ARCHIVE_NAME="wapp-v$(cat VERSION)"
-tar -czvf dist/$ARCHIVE_NAME.tar.gz wapp
-zip -r dist/$ARCHIVE_NAME.zip wapp
-
-rm -rf wapp
--- a/src/base/array/array.c
+++ b/src/base/array/array.c
@@ -7,260 +7,169 @@
 #include "../../common/aliases/aliases.h"
 #include <stddef.h>

-#define _array_header(ARRAY) (ArrayHeader *)(wapp_pointer_offset(ARRAY, (i64)sizeof(ArrayHeader) * -1))
+#define _offset_pointer(PTR, OFFSET) ((void *)((uptr)(PTR) + (OFFSET)))

-wapp_persist inline void _array_validate(const GenericArray array, u64 item_size);
+void *_array_get(GenericArray *array, u64 index, u64 item_size) {
+  wapp_runtime_assert(array != NULL, "`array` should not be NULL");
+  wapp_runtime_assert(WAPP_ARRAY_MAGIC == array->magic, "`array` is not a valid wapp array");
+  wapp_runtime_assert(item_size == array->item_size, "Invalid item type provided");
+  wapp_runtime_assert(index < array->count, "`index` is out of bounds");

-u64 _array_count(GenericArray array) {
-	wapp_debug_assert(array != NULL, "`array` should not be NULL");
-
-	ArrayHeader *header = _array_header(array);
-	wapp_runtime_assert(WAPP_ARRAY_MAGIC == header->magic, "`array` is not a valid wapp array");
-
-	return header->count;
+  return _offset_pointer(array->items, array->item_size * index);
 }

-u64 _array_capacity(GenericArray array) {
-	wapp_debug_assert(array != NULL, "`array` should not be NULL");
-
-	ArrayHeader *header = _array_header(array);
-	wapp_runtime_assert(WAPP_ARRAY_MAGIC == header->magic, "`array` is not a valid wapp array");
-
-	return header->capacity;
+void _array_set(GenericArray *array, u64 index, void *value, u64 item_size) {
+  void *item = _array_get(array, index, item_size);
+  memcpy(item, value, array->item_size);
 }

-u64 _array_item_size(GenericArray array) {
-	wapp_debug_assert(array != NULL, "`array` should not be NULL");
+void _array_append_capped(GenericArray *array, void *value, u64 item_size) {
+  wapp_runtime_assert(array != NULL, "`array` should not be NULL");
+  wapp_runtime_assert(WAPP_ARRAY_MAGIC == array->magic, "`array` is not a valid wapp array");
+  wapp_runtime_assert(item_size == array->item_size, "Invalid item type provided");

-	ArrayHeader *header = _array_header(array);
-	wapp_runtime_assert(WAPP_ARRAY_MAGIC == header->magic, "`array` is not a valid wapp array");
+  if (array->count >= array->capacity) { return; }

-	return header->item_size;
+  u64 index = (array->count)++;
+  _array_set(array, index, value, item_size);
 }

-void _array_set_count(GenericArray array, u64 count) {
-	wapp_debug_assert(array != NULL, "`array` should not be NULL");
+void _array_extend_capped(GenericArray *dst, const GenericArray *src, u64 item_size) {
+  wapp_runtime_assert(dst != NULL && src != NULL, "`dst` and `src` should not be NULL");
+  wapp_runtime_assert(WAPP_ARRAY_MAGIC == dst->magic, "`dst` is not a valid wapp array");
+  wapp_runtime_assert(WAPP_ARRAY_MAGIC == src->magic, "`src` is not a valid wapp array");
+  wapp_runtime_assert(item_size == dst->item_size && item_size == src->item_size, "Invalid item type provided");

-	ArrayHeader *header = _array_header(array);
-	wapp_runtime_assert(WAPP_ARRAY_MAGIC == header->magic, "`array` is not a valid wapp array");
+  u64 remaining_capacity = dst->capacity - dst->count;

-	header->count = count;
+  u64 copy_count = src->count < remaining_capacity ? src->count : remaining_capacity;
+  void *dst_ptr = _offset_pointer(dst->items, dst->count * dst->item_size);
+  memcpy(dst_ptr, src->items, copy_count * src->item_size);
+  dst->count += copy_count;
 }

-void *_array_get(GenericArray array, u64 index, u64 item_size) {
-	wapp_runtime_assert(array != NULL, "`array` should not be NULL");
-	_array_validate(array, item_size);
+void _array_copy_capped(GenericArray *dst, const GenericArray *src, u64 item_size) {
+  wapp_runtime_assert(dst != NULL && src != NULL, "`dst` and `src` should not be NULL");
+  wapp_runtime_assert(WAPP_ARRAY_MAGIC == dst->magic, "`dst` is not a valid wapp array");
+  wapp_runtime_assert(WAPP_ARRAY_MAGIC == src->magic, "`src` is not a valid wapp array");
+  wapp_runtime_assert(item_size == dst->item_size && item_size == src->item_size, "Invalid item type provided");

-	ArrayHeader *header = _array_header(array);
-	wapp_runtime_assert(index < header->count, "`index` is out of bounds");
-
-	return wapp_pointer_offset(array, header->item_size * index);
+  _array_clear(dst, item_size);
+  u64 copy_count = src->count < dst->capacity ? src->count : dst->capacity;
+  memcpy(dst->items, src->items, copy_count * src->item_size);
+  dst->count = copy_count;
 }

-void _array_set(GenericArray array, u64 index, void *value, u64 item_size) {
-	void *item = _array_get(array, index, item_size);
+GenericArray *_array_append_alloc(const Allocator *allocator, GenericArray *array, void *value, u64 item_size) {
+  wapp_runtime_assert(allocator != NULL && array != NULL, "`allocator` and `array` should not be NULL");
+  wapp_runtime_assert(WAPP_ARRAY_MAGIC == array->magic, "`array` is not a valid wapp array");
+  wapp_runtime_assert(item_size == array->item_size, "Invalid item type provided");

-	ArrayHeader *header = _array_header(array);
-	memcpy(item, value, header->item_size);
-}
+  GenericArray *output = array;

-void _array_append_capped(GenericArray array, void *value, u64 item_size) {
-	wapp_runtime_assert(array != NULL, "`array` should not be NULL");
-	_array_validate(array, item_size);
+  if (array->count >= array->capacity) {
+    u64 new_capacity = wapp_misc_utils_u64_round_up_pow2(array->capacity * 2);
+    output           = (GenericArray *)_array_alloc_capacity(allocator, new_capacity, array->item_size);
+    if (!output) {
+      output = array;
+      goto RETURN_ARRAY_APPEND_ALLOC;
+    }
+    _array_copy_capped(output, array, item_size);
+  }

-	ArrayHeader *header = _array_header(array);
-	if (header->count >= header->capacity) { return; }
-
-	u64 index = (header->count)++;
-	_array_set(array, index, value, item_size);
-}
-
-void _array_extend_capped(GenericArray dst, const GenericArray src, u64 item_size) {
-	wapp_runtime_assert(dst != NULL && src != NULL, "`dst` and `src` should not be NULL");
-	_array_validate(dst, item_size);
-	_array_validate(src, item_size);
-
-	ArrayHeader *src_header = _array_header(src);
-	ArrayHeader *dst_header = _array_header(dst);
-	u64 remaining_capacity = dst_header->capacity - dst_header->count;
-
-	u64 copy_count = src_header->count < remaining_capacity ? src_header->count : remaining_capacity;
-	void *dst_ptr  = wapp_pointer_offset(dst, dst_header->count * dst_header->item_size);
-	memcpy(dst_ptr, src, copy_count * src_header->item_size);
-	dst_header->count += copy_count;
-}
-
-void _array_copy_capped(GenericArray dst, const GenericArray src, u64 item_size) {
-	wapp_runtime_assert(dst != NULL && src != NULL, "`dst` and `src` should not be NULL");
-	_array_validate(dst, item_size);
-	_array_validate(src, item_size);
-
-	_array_clear(dst, item_size);
-
-	ArrayHeader *src_header = _array_header(src);
-	ArrayHeader *dst_header = _array_header(dst);
-	u64 copy_count = src_header->count < dst_header->capacity ? src_header->count : dst_header->capacity;
-	memcpy((void *)dst, (void *)src, copy_count * src_header->item_size);
-	dst_header->count = copy_count;
-}
-
-GenericArray _array_append_alloc(const Allocator *allocator, GenericArray array, void *value,
-                                 ArrayInitFlags flags, u64 item_size) {
-	wapp_runtime_assert(allocator != NULL && array != NULL, "`allocator` and `array` should not be NULL");
-	_array_validate(array, item_size);
-
-	GenericArray output = array;
-
-	ArrayHeader *header = _array_header(array);
-	if (header->count >= header->capacity) {
-		u64 new_capacity = wapp_misc_utils_u64_round_up_pow2(header->capacity * 2);
-		output           = (GenericArray )_array_alloc_capacity(allocator, new_capacity, flags,
-		                                                        header->item_size);
-		if (!output) {
-			output = array;
-			goto RETURN_ARRAY_APPEND_ALLOC;
-		}
-		_array_copy_capped(output, array, item_size);
-	}
-
-	_array_append_capped(output, value, item_size);
-
-	if ((flags & ARRAY_INIT_FILLED) == ARRAY_INIT_FILLED) {
-		_array_set_count(output, _array_capacity(output));
-	}
+  _array_append_capped(output, value, item_size);

 RETURN_ARRAY_APPEND_ALLOC:
-	return output;
+  return output;
 }

-GenericArray _array_extend_alloc(const Allocator *allocator, GenericArray dst, const GenericArray src,
-                                 ArrayInitFlags flags, u64 item_size) {
-	wapp_runtime_assert(allocator != NULL && dst != NULL && src != NULL, "`allocator`, `dst` and `src` should not be NULL");
-	_array_validate(dst, item_size);
-	_array_validate(src, item_size);
+GenericArray *_array_extend_alloc(const Allocator *allocator, GenericArray *dst, const GenericArray *src, u64 item_size) {
+  wapp_runtime_assert(allocator != NULL && dst != NULL && src != NULL, "`allocator`, `dst` and `src` should not be NULL");
+  wapp_runtime_assert(WAPP_ARRAY_MAGIC == dst->magic, "`dst` is not a valid wapp array");
+  wapp_runtime_assert(WAPP_ARRAY_MAGIC == src->magic, "`src` is not a valid wapp array");
+  wapp_runtime_assert(item_size == dst->item_size && item_size == src->item_size, "Invalid item type provided");

-	GenericArray output = dst;
+  GenericArray *output = dst;

-	ArrayHeader *src_header = _array_header(src);
-	ArrayHeader *dst_header = _array_header(dst);
-	u64 remaining_capacity = dst_header->capacity - dst_header->count;
-	if (src_header->count >= remaining_capacity) {
-		u64 new_capacity  = wapp_misc_utils_u64_round_up_pow2(dst_header->capacity * 2);
-		output            = (GenericArray )_array_alloc_capacity(allocator, new_capacity,
-		                                                         flags, dst_header->item_size);
-		if (!output) {
-			output = dst;
-			goto RETURN_ARRAY_EXTEND_ALLOC;
-		}
-		_array_copy_capped(output, dst, item_size);
-	}
+  u64 remaining_capacity = dst->capacity - dst->count;
+  if (src->count >= remaining_capacity) {
+    u64 new_capacity = wapp_misc_utils_u64_round_up_pow2(dst->capacity * 2);
+    output           = (GenericArray *)_array_alloc_capacity(allocator, new_capacity, dst->item_size);
+    if (!output) {
+      output = dst;
+      goto RETURN_ARRAY_EXTEND_ALLOC;
+    }
+    _array_copy_capped(output, dst, item_size);
+  }

-	_array_extend_capped(output, src, item_size);
-
-	if ((flags & ARRAY_INIT_FILLED) == ARRAY_INIT_FILLED) {
-		_array_set_count(output, _array_capacity(output));
-	}
+  _array_extend_capped(output, src, item_size);

 RETURN_ARRAY_EXTEND_ALLOC:
-	return output;
+  return output;
 }

-GenericArray _array_copy_alloc(const Allocator *allocator, GenericArray dst, const GenericArray src,
-                               ArrayInitFlags flags, u64 item_size) {
-	wapp_runtime_assert(allocator != NULL && dst != NULL && src != NULL, "`allocator`, `dst` and `src` should not be NULL");
-	_array_validate(dst, item_size);
-	_array_validate(src, item_size);
+GenericArray *_array_copy_alloc(const Allocator *allocator, GenericArray *dst, const GenericArray *src, u64 item_size) {
+  wapp_runtime_assert(allocator != NULL && dst != NULL && src != NULL, "`allocator`, `dst` and `src` should not be NULL");
+  wapp_runtime_assert(WAPP_ARRAY_MAGIC == dst->magic, "`dst` is not a valid wapp array");
+  wapp_runtime_assert(WAPP_ARRAY_MAGIC == src->magic, "`src` is not a valid wapp array");
+  wapp_runtime_assert(item_size == dst->item_size && item_size == src->item_size, "Invalid item type provided");

-	GenericArray output = dst;
+  GenericArray *output = dst;

-	ArrayHeader *src_header = _array_header(src);
-	ArrayHeader *dst_header = _array_header(dst);
-	if (src_header->count >= dst_header->capacity) {
-		u64 new_capacity  = wapp_misc_utils_u64_round_up_pow2(dst_header->capacity * 2);
-		output            = (GenericArray )_array_alloc_capacity(allocator, new_capacity,
-		                                                         flags, src_header->item_size);
-		if (!output) {
-			output = dst;
-			goto RETURN_ARRAY_COPY_ALLOC;
-		}
-	}
+  if (src->count >= dst->capacity) {
+    u64 new_capacity = wapp_misc_utils_u64_round_up_pow2(dst->capacity * 2);
+    output           = (GenericArray *)_array_alloc_capacity(allocator, new_capacity, src->item_size);
+    if (!output) {
+      output = dst;
+      goto RETURN_ARRAY_COPY_ALLOC;
+    }
+  }

-	_array_copy_capped(output, src, item_size);
-
-	if ((flags & ARRAY_INIT_FILLED) == ARRAY_INIT_FILLED) {
-		_array_set_count(output, _array_capacity(output));
-	}
+  _array_copy_capped(output, src, item_size);

 RETURN_ARRAY_COPY_ALLOC:
-	return output;
+  return output;
 }

-void *_array_pop(GenericArray array, u64 item_size) {
-	wapp_runtime_assert(array != NULL, "`array` should not be NULL");
-	_array_validate(array, item_size);
+void *_array_pop(GenericArray *array, u64 item_size) {
+  wapp_runtime_assert(array != NULL, "`array` should not be NULL");
+  wapp_runtime_assert(WAPP_ARRAY_MAGIC == array->magic, "`array` is not a valid wapp array");
+  wapp_runtime_assert(item_size == array->item_size, "Invalid item type provided");

-	ArrayHeader *header = _array_header(array);
-	if (header->count == 0) { return NULL; }
+  if (array->count == 0) { return NULL; }

-	u64 index = header->count - 1;
-	void *out = _array_get(array, index, item_size);
-	--(header->count);
-	return out;
+  u64 index = array->count - 1;
+  void *out = _array_get(array, index, item_size);
+  --(array->count);
+  return out;
 }

-void _array_clear(GenericArray array, u64 item_size) {
-	wapp_runtime_assert(array != NULL, "`array` should not be NULL");
-	_array_validate(array, item_size);
+void _array_clear(GenericArray *array, u64 item_size) {
+  wapp_runtime_assert(array != NULL, "`array` should not be NULL");
+  wapp_runtime_assert(WAPP_ARRAY_MAGIC == array->magic, "`array` is not a valid wapp array");
+  wapp_runtime_assert(item_size == array->item_size, "Invalid item type provided");

-	ArrayHeader *header = _array_header(array);
-	header->count = 0;
+  array->count = 0;
 }

-u64 _array_calc_alloc_size(u64 capacity, u64 item_size) {
-	return sizeof(ArrayHeader) + item_size * capacity;
-}
+GenericArray *_array_alloc_capacity(const Allocator *allocator, u64 capacity, u64 item_size) {
+  wapp_runtime_assert(allocator != NULL, "`allocator` should not be NULL");

-GenericArray _array_alloc_capacity(const Allocator *allocator, u64 capacity, ArrayInitFlags flags,
-                                   u64 item_size) {
-	wapp_runtime_assert(allocator != NULL, "`allocator` should not be NULL");
+  GenericArray *output = NULL;

-	GenericArray output = NULL;
+  u64 allocation_size = sizeof(GenericArray) + item_size * capacity;

-	u64 allocation_size = _array_calc_alloc_size(capacity, item_size);
-	void *buffer        = wapp_mem_allocator_alloc(allocator, allocation_size);
-	if (!buffer) {
-		goto RETURN_ARRAY_ALLOC;
-	}
+  output = wapp_mem_allocator_alloc(allocator, allocation_size);
+  if (!output) {
+    goto RETURN_ARRAY_ALLOC;
+  }

-	output = _array_from_preallocated_buffer(buffer, allocation_size, flags, item_size);
+  output->magic     = WAPP_ARRAY_MAGIC;
+  output->count     = 0;
+  output->capacity  = capacity;
+  output->item_size = item_size;
+  output->items     = (void *)(output + 1);

 RETURN_ARRAY_ALLOC:
-	return output;
-}
-
-
-GenericArray _array_from_preallocated_buffer(void *buffer, u64 buffer_size, ArrayInitFlags flags,
-                                             u64 item_size) {
-	wapp_runtime_assert(buffer != NULL, "`buffer` should not be NULL");
-
-	i64 data_buffer_size = (i64)buffer_size - (i64)(sizeof(ArrayHeader));
-	if (data_buffer_size <= 0) {
-		return NULL;
-	}
-
-	u64 item_capacity   = (u64)data_buffer_size / item_size;
-	ArrayHeader *header = (ArrayHeader *)buffer;
-	GenericArray output = (u8 *)(header + 1);
-	header->magic       = WAPP_ARRAY_MAGIC;
-	header->count       = flags & ARRAY_INIT_FILLED ? item_capacity : 0;
-	header->capacity    = item_capacity;
-	header->item_size   = item_size;
-
-	return output;
-}
-
-wapp_persist inline void _array_validate(const GenericArray array, u64 item_size) {
-	ArrayHeader *header = _array_header(array);
-	wapp_runtime_assert(WAPP_ARRAY_MAGIC == header->magic, "`array` is not a valid wapp array");
-	wapp_runtime_assert(item_size == header->item_size, "Invalid item type provided");
+  return output;
 }
--- a/src/base/array/array.h
+++ b/src/base/array/array.h
@@ -17,197 +17,144 @@ BEGIN_C_LINKAGE
 #define _calc_array_count(TYPE, ...) wapp_misc_utils_va_args_count(TYPE, __VA_ARGS__)
 #define _calc_array_capacity(TYPE, ...) wapp_misc_utils_u64_round_up_pow2(_calc_array_count(TYPE, __VA_ARGS__) * 2)

-typedef struct Str8 Str8;
+#define wapp_array_alloc_capacity(ELEM_TYPE, ARRAY_TYPE, ALLOCATOR_PTR, CAPACITY)   \
+  ((ARRAY_TYPE *)_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY, sizeof(ELEM_TYPE)))

-// NOTE (Abdelrahman): Typedefs to distinguish arrays from regular pointers
-typedef void  *GenericArray;
-typedef void **VoidPtrArray;
-typedef c8    *C8Array;
-typedef c16   *C16Array;
-typedef c32   *C32Array;
-typedef u8    *U8Array;
-typedef u16   *U16Array;
-typedef u32   *U32Array;
-typedef u64   *U64Array;
-typedef b8    *B8Array;
-typedef i8    *I8Array;
-typedef i16   *I16Array;
-typedef i32   *I32Array;
-typedef i64   *I64Array;
-typedef f32   *F32Array;
-typedef f64   *F64Array;
-typedef f128  *F128Array;
-typedef uptr  *UptrArray;
-typedef iptr  *IptrArray;
-typedef Str8  *Str8Array;
-
-typedef enum {
-	ARRAY_INIT_NONE   = 0,
-	ARRAY_INIT_FILLED = 1 << 1,
-} ArrayInitFlags;
+#define WAPP_DEF_ARRAY_TYPE(T, NAME) \
+  typedef struct {                   \
+    u64 magic;                       \
+    u64 count;                       \
+    u64 capacity;                    \
+    u64 item_size;                   \
+    T *items;                        \
+  } NAME

 #ifdef WAPP_PLATFORM_CPP
-#define wapp_array(TYPE, ...) ([&]() {                                                             \
-	u64 capacity = _calc_array_capacity(TYPE, __VA_ARGS__);                                          \
-	                                                                                                 \
-	TYPE items[_calc_array_capacity(TYPE, __VA_ARGS__)] = {__VA_ARGS__};                             \
-	                                                                                                 \
-	wapp_persist u8 array[                                                                           \
-		sizeof(ArrayHeader) + _calc_array_capacity(TYPE, __VA_ARGS__) * sizeof(TYPE)                   \
-	] = {0};                                                                                         \
-	ArrayHeader *header = (ArrayHeader *)array;                                                      \
-	header->magic       = WAPP_ARRAY_MAGIC;                                                          \
-	header->count       = _calc_array_count(TYPE, __VA_ARGS__);                                      \
-	header->capacity    = _calc_array_capacity(TYPE, __VA_ARGS__);                                   \
-	header->item_size   = sizeof(TYPE);                                                              \
-	                                                                                                 \
-	u8 *buf = (u8 *)(header + 1);                                                                    \
-	memcpy(buf, items, capacity * sizeof(TYPE));                                                     \
-	return (TYPE *)buf;                                                                              \
+#define wapp_array(ELEM_TYPE, ARRAY_TYPE, ...) ([&]() {                                  \
+  wapp_persist ELEM_TYPE items[sizeof(ELEM_TYPE) == sizeof(*((ARRAY_TYPE{}).items)) ?    \
+    _calc_array_capacity(ELEM_TYPE, __VA_ARGS__) : -1                                    \
+  ] = {__VA_ARGS__};                                                                     \
+                                                                                         \
+  return ARRAY_TYPE{                                                                     \
+    WAPP_ARRAY_MAGIC,                                                                    \
+    _calc_array_count(ELEM_TYPE, __VA_ARGS__),                                           \
+    _calc_array_capacity(ELEM_TYPE, __VA_ARGS__),                                        \
+    sizeof(ELEM_TYPE),                                                                   \
+    items,                                                                               \
+  };                                                                                     \
 }())
-#define wapp_array_with_capacity(TYPE, CAPACITY, FLAGS) ([&]() {                                   \
-	wapp_persist u8 array[                                                                           \
-		sizeof(ArrayHeader) + CAPACITY * sizeof(TYPE)                                                  \
-	] = {0};                                                                                         \
-	ArrayHeader *header = (ArrayHeader *)array;                                                      \
-	header->magic       = WAPP_ARRAY_MAGIC;                                                          \
-	header->count       = (FLAGS & ARRAY_INIT_FILLED) ? CAPACITY : 0;                                \
-	header->capacity    = CAPACITY;                                                                  \
-	header->item_size   = sizeof(TYPE);                                                              \
-	                                                                                                 \
-	return (TYPE *)(header + 1);                                                                     \
+#define wapp_array_with_capacity(ELEM_TYPE, ARRAY_TYPE, CAPACITY) ([&]() {               \
+  wapp_persist ELEM_TYPE items[sizeof(ELEM_TYPE) == sizeof(*((ARRAY_TYPE{}).items)) ?    \
+    CAPACITY : -1] = {};                                                                 \
+                                                                                         \
+  return ARRAY_TYPE{                                                                     \
+    WAPP_ARRAY_MAGIC,                                                                    \
+    0,                                                                                   \
+    CAPACITY,                                                                            \
+    sizeof(ELEM_TYPE),                                                                   \
+    items,                                                                               \
+  };                                                                                     \
 }())
-#define wapp_array_pop(TYPE, ARRAY) ([&]() {                                                       \
-	if (ARRAY == NULL || _array_count((GenericArray)ARRAY) == 0) {                                   \
-		TYPE result{};                                                                                 \
-		return result;                                                                                 \
-	}                                                                                                \
-	                                                                                                 \
-	return *((TYPE *)_array_pop((GenericArray)ARRAY, sizeof(TYPE)));                                 \
+#define wapp_array_pop(ELEM_TYPE, ARRAY_PTR) ([&]() {                                    \
+  if (ARRAY_PTR == NULL || (ARRAY_PTR)->count == 0) {                                    \
+    ELEM_TYPE result{};                                                                  \
+    return result;                                                                       \
+  }                                                                                      \
+                                                                                         \
+  return *((ELEM_TYPE *)_array_pop((GenericArray *)ARRAY_PTR, sizeof(ELEM_TYPE)));              \
 }())
 #else
-#define _stack_array(TYPE, SIZE) struct {ArrayHeader header;                                       \
-                                         TYPE items[SIZE];                                         \
-                                         wapp_misc_utils_reserve_padding(sizeof(ArrayHeader) +     \
-                                                                         sizeof(TYPE) * SIZE);}
-#define wapp_array(TYPE, ...)                                                                      \
-	((TYPE *)(                                                                                       \
-		(_stack_array(TYPE, _calc_array_capacity(TYPE, __VA_ARGS__))){                                 \
-			.header = {                                                                                  \
-				.magic     = WAPP_ARRAY_MAGIC,                                                             \
-				.count     = _calc_array_count(TYPE, __VA_ARGS__),                                         \
-				.capacity  = _calc_array_capacity(TYPE, __VA_ARGS__),                                      \
-				.item_size = sizeof(TYPE),                                                                 \
-			},                                                                                           \
-			.items  = {__VA_ARGS__},                                                                     \
-		}.items                                                                                        \
-	))
-#define wapp_array_with_capacity(TYPE, CAPACITY, FLAGS)                                            \
-	((TYPE *)(                                                                                       \
-		(_stack_array(TYPE, CAPACITY)){                                                                \
-			.header = {                                                                                  \
-				.magic     = WAPP_ARRAY_MAGIC,                                                             \
-				.count     = (FLAGS & ARRAY_INIT_FILLED) ? CAPACITY : 0,                                   \
-				.capacity  = CAPACITY,                                                                     \
-				.item_size = sizeof(TYPE),                                                                 \
-			},                                                                                           \
-			.items  = {0},                                                                               \
-		}.items                                                                                        \
-	))
-#define wapp_array_pop(TYPE, ARRAY)                                                                \
-	(ARRAY == NULL || _array_count((GenericArray)ARRAY) == 0 ?                                       \
-		(TYPE){0} :                                                                                    \
-		*((TYPE *)_array_pop((GenericArray)ARRAY, sizeof(TYPE)))                                       \
-	)
+#define wapp_array(ELEM_TYPE, ARRAY_TYPE, ...)                                      \
+  ((ARRAY_TYPE){                                                                    \
+    .magic     = WAPP_ARRAY_MAGIC,                                                  \
+    .count     = _calc_array_count(ELEM_TYPE, __VA_ARGS__),                         \
+    .capacity  = _calc_array_capacity(ELEM_TYPE, __VA_ARGS__),                      \
+    .item_size = sizeof(ELEM_TYPE),                                                 \
+    .items     = (ELEM_TYPE[sizeof(ELEM_TYPE) == sizeof(*((ARRAY_TYPE){0}.items)) ? \
+                            _calc_array_capacity(ELEM_TYPE, __VA_ARGS__) :          \
+                            -1]){__VA_ARGS__}                                       \
+  })
+#define wapp_array_with_capacity(ELEM_TYPE, ARRAY_TYPE, CAPACITY)                   \
+  ((ARRAY_TYPE){                                                                    \
+    .magic     = WAPP_ARRAY_MAGIC,                                                  \
+    .count     = 0,                                                                 \
+    .capacity  = CAPACITY,                                                          \
+    .item_size = sizeof(ELEM_TYPE),                                                 \
+    .items     = (ELEM_TYPE[sizeof(ELEM_TYPE) == sizeof(*((ARRAY_TYPE){0}.items)) ? \
+                            CAPACITY : -1]){0}                                      \
+  })
+#define wapp_array_pop(ELEM_TYPE, ARRAY_PTR)                                        \
+  (ARRAY_PTR != NULL && (ARRAY_PTR)->count > 0 ?                                    \
+    *((ELEM_TYPE *)_array_pop((GenericArray *)ARRAY_PTR, sizeof(ELEM_TYPE))) :             \
+    (ELEM_TYPE){0}                                                                  \
+  )
 #endif // !WAPP_PLATFORM_CPP

-#define wapp_array_count(ARRAY)                                                                    \
-	(_array_count((GenericArray)ARRAY))
-#define wapp_array_capacity(ARRAY)                                                                 \
-	(_array_capacity((GenericArray)ARRAY))
-#define wapp_array_item_size(ARRAY)                                                                \
-	(_array_item_size((GenericArray)ARRAY))
-#define wapp_array_set_count(ARRAY, COUNT)                                                         \
-	(_array_set_count((GenericArray)ARRAY, COUNT))
-#define wapp_array_get(TYPE, ARRAY, INDEX)                                                         \
-	((TYPE *)_array_get((GenericArray)ARRAY,                                                         \
-	                    INDEX,                                                                       \
-	                    sizeof(TYPE)))
-#define wapp_array_set(TYPE, ARRAY, INDEX, VALUE_PTR)                                              \
-	(_array_set((GenericArray)ARRAY,                                                                 \
-	            INDEX,                                                                               \
-	            (u8 *)VALUE_PTR,                                                                     \
-	            sizeof(TYPE)))
-#define wapp_array_append_capped(TYPE, ARRAY, VALUE_PTR)                                           \
-	(_array_append_capped((GenericArray)ARRAY,                                                       \
-	                      (u8 *)VALUE_PTR,                                                           \
-	                      sizeof(TYPE)))
-#define wapp_array_extend_capped(TYPE, DST_ARRAY, SRC_ARRAY)                                       \
-	(_array_extend_capped((GenericArray)DST_ARRAY,                                                   \
-	                      (GenericArray)SRC_ARRAY,                                                   \
-	                      sizeof(TYPE)))
-#define wapp_array_copy_capped(TYPE, DST_ARRAY, SRC_ARRAY)                                         \
-	(_array_copy_capped((GenericArray)DST_ARRAY,                                                     \
-	                    (GenericArray)SRC_ARRAY,                                                     \
-	                    sizeof(TYPE)))
-#define wapp_array_append_alloc(TYPE, ALLOCATOR_PTR, ARRAY, VALUE_PTR, FLAGS)                      \
-	((TYPE *)_array_append_alloc(ALLOCATOR_PTR,                                                      \
-	                             (GenericArray)ARRAY,                                                \
-	                             (u8 *)VALUE_PTR,                                                    \
-	                             FLAGS,                                                              \
-	                             sizeof(TYPE)))
-#define wapp_array_extend_alloc(TYPE, ALLOCATOR_PTR, DST_ARRAY, SRC_ARRAY, FLAGS)                  \
-	((TYPE *)_array_extend_alloc(ALLOCATOR_PTR,                                                      \
-	                             (GenericArray)DST_ARRAY,                                            \
-	                             (GenericArray)SRC_ARRAY,                                            \
-	                             FLAGS,                                                              \
-	                             sizeof(TYPE)))
-#define wapp_array_copy_alloc(TYPE, ALLOCATOR_PTR, DST_ARRAY, SRC_ARRAY, FLAGS)                    \
-	((TYPE *)_array_copy_alloc(ALLOCATOR_PTR,                                                        \
-	                           (GenericArray)DST_ARRAY,                                              \
-	                           (GenericArray)SRC_ARRAY,                                              \
-	                           FLAGS,                                                                \
-	                           sizeof(TYPE)))
-#define wapp_array_clear(TYPE, ARRAY)                                                              \
-	(_array_clear((GenericArray)ARRAY,                                                               \
-	             sizeof(TYPE)))
-#define wapp_array_calc_alloc_size(TYPE, CAPACITY) _array_calc_alloc_size(CAPACITY, sizeof(TYPE))
-#define wapp_array_alloc_capacity(TYPE, ALLOCATOR_PTR, CAPACITY, FLAGS)                            \
-	((TYPE *)_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY, FLAGS, sizeof(TYPE)))
-#define wapp_array_from_preallcated_buffer(TYPE, BUFFER, BUFFER_SIZE)                              \
-	((TYPE *)_array_from_preallcated_buffer(BUFFER, BUFFER_SIZE, sizeof(TYPE)))
+#define wapp_array_get(ELEM_TYPE, ARRAY_PTR, INDEX)                                                 \
+  ((ELEM_TYPE *)_array_get((GenericArray *)ARRAY_PTR, INDEX, sizeof(ELEM_TYPE)))
+#define wapp_array_set(ELEM_TYPE, ARRAY_PTR, INDEX, VALUE_PTR)                                      \
+  _array_set((GenericArray *)ARRAY_PTR, INDEX, (void *)VALUE_PTR, sizeof(ELEM_TYPE))
+#define wapp_array_append_capped(ELEM_TYPE, ARRAY_PTR, VALUE_PTR)                                   \
+  _array_append_capped((GenericArray *)ARRAY_PTR, (void *)VALUE_PTR, sizeof(ELEM_TYPE))
+#define wapp_array_extend_capped(ELEM_TYPE, DST_ARRAY_PTR, SRC_ARRAY_PTR)                           \
+  _array_extend_capped(                                                                             \
+    (GenericArray *)DST_ARRAY_PTR, (GenericArray *)SRC_ARRAY_PTR, sizeof(ELEM_TYPE)                 \
+  )
+#define wapp_array_copy_capped(ELEM_TYPE, DST_ARRAY_PTR, SRC_ARRAY_PTR)                             \
+  _array_copy_capped(                                                                               \
+    (GenericArray *)DST_ARRAY_PTR, (GenericArray *)SRC_ARRAY_PTR, sizeof(ELEM_TYPE)                 \
+  )
+#define wapp_array_append_alloc(ELEM_TYPE, ARRAY_TYPE, ALLOCATOR_PTR, ARRAY_PTR, VALUE_PTR)         \
+  (ARRAY_TYPE *)_array_append_alloc(                                                                \
+    ALLOCATOR_PTR, (GenericArray *)ARRAY_PTR, (void *)VALUE_PTR, sizeof(ELEM_TYPE)                  \
+  )
+#define wapp_array_extend_alloc(ELEM_TYPE, ARRAY_TYPE, ALLOCATOR_PTR, DST_ARRAY_PTR, SRC_ARRAY_PTR) \
+  (ARRAY_TYPE *)_array_extend_alloc(                                                                \
+    ALLOCATOR_PTR, (GenericArray *)DST_ARRAY_PTR, (GenericArray *)SRC_ARRAY_PTR, sizeof(ELEM_TYPE)  \
+  )
+#define wapp_array_copy_alloc(ELEM_TYPE, ARRAY_TYPE, ALLOCATOR_PTR, DST_ARRAY_PTR, SRC_ARRAY_PTR)   \
+  (ARRAY_TYPE *)_array_copy_alloc(                                                                  \
+    ALLOCATOR_PTR, (GenericArray *)DST_ARRAY_PTR, (GenericArray *)SRC_ARRAY_PTR, sizeof(ELEM_TYPE)  \
+  )
+#define wapp_array_clear(ELEM_TYPE, ARRAY_PTR)                                                      \
+  _array_clear((GenericArray *)ARRAY_PTR, sizeof(ELEM_TYPE))

+WAPP_DEF_ARRAY_TYPE(void, GenericArray);

-typedef struct header ArrayHeader;
-struct header {
-  u64 magic;
-  u64 count;
-  u64 capacity;
-  u64 item_size;
-};
+void         *_array_get(GenericArray *array, u64 index, u64 item_size);
+void          _array_set(GenericArray *array, u64 index, void *value, u64 item_size);
+void          _array_append_capped(GenericArray *array, void *value, u64 item_size);
+void          _array_extend_capped(GenericArray *dst, const GenericArray *src, u64 item_size);
+void          _array_copy_capped(GenericArray *dst, const GenericArray *src, u64 item_size);
+GenericArray *_array_append_alloc(const Allocator *allocator, GenericArray *array, void *value, u64 item_size);
+GenericArray *_array_extend_alloc(const Allocator *allocator, GenericArray *dst, const GenericArray *src, u64 item_size);
+GenericArray *_array_copy_alloc(const Allocator *allocator, GenericArray *dst, const GenericArray *src, u64 item_size);
+void         *_array_pop(GenericArray *array, u64 item_size);
+void          _array_clear(GenericArray *array, u64 item_size);
+GenericArray *_array_alloc_capacity(const Allocator *allocator, u64 capacity, u64 item_size);

-u64          _array_count(GenericArray array);
-u64          _array_capacity(GenericArray array);
-u64          _array_item_size(GenericArray array);
-void         _array_set_count(GenericArray array, u64 count);
-void        *_array_get(GenericArray array, u64 index, u64 item_size);
-void         _array_set(GenericArray array, u64 index, void *value, u64 item_size);
-void         _array_append_capped(GenericArray array, void *value, u64 item_size);
-void         _array_extend_capped(GenericArray dst, const GenericArray src, u64 item_size);
-void         _array_copy_capped(GenericArray dst, const GenericArray src, u64 item_size);
-GenericArray _array_append_alloc(const Allocator *allocator, GenericArray array, void *value,
-                                 ArrayInitFlags flags, u64 item_size);
-GenericArray _array_extend_alloc(const Allocator *allocator, GenericArray dst, const GenericArray src,
-                                 ArrayInitFlags flags, u64 item_size);
-GenericArray _array_copy_alloc(const Allocator *allocator, GenericArray dst, const GenericArray src,
-                               ArrayInitFlags flags, u64 item_size);
-void        *_array_pop(GenericArray array, u64 item_size);
-void         _array_clear(GenericArray array, u64 item_size);
-u64          _array_calc_alloc_size(u64 capacity, u64 item_size);
-GenericArray _array_alloc_capacity(const Allocator *allocator, u64 capacity, ArrayInitFlags flags,
-                                   u64 item_size);
-GenericArray _array_from_preallocated_buffer(void *buffer, u64 buffer_size, ArrayInitFlags flags,
-                                             u64 item_size);
+// Base array types
+typedef struct str8 Str8;
+
+WAPP_DEF_ARRAY_TYPE(void *, VoidPtrArray);
+WAPP_DEF_ARRAY_TYPE(c8    , C8Array);
+WAPP_DEF_ARRAY_TYPE(c16   , C16Array);
+WAPP_DEF_ARRAY_TYPE(c32   , C32Array);
+WAPP_DEF_ARRAY_TYPE(u8    , U8Array);
+WAPP_DEF_ARRAY_TYPE(u16   , U16Array);
+WAPP_DEF_ARRAY_TYPE(u32   , U32Array);
+WAPP_DEF_ARRAY_TYPE(u64   , U64Array);
+WAPP_DEF_ARRAY_TYPE(b8    , B8Array);
+WAPP_DEF_ARRAY_TYPE(i8    , I8Array);
+WAPP_DEF_ARRAY_TYPE(i16   , I16Array);
+WAPP_DEF_ARRAY_TYPE(i32   , I32Array);
+WAPP_DEF_ARRAY_TYPE(i64   , I64Array);
+WAPP_DEF_ARRAY_TYPE(f32   , F32Array);
+WAPP_DEF_ARRAY_TYPE(f64   , F64Array);
+WAPP_DEF_ARRAY_TYPE(f128  , F128Array);
+WAPP_DEF_ARRAY_TYPE(uptr  , UptrArray);
+WAPP_DEF_ARRAY_TYPE(iptr  , IptrArray);
+WAPP_DEF_ARRAY_TYPE(Str8  , Str8Array);

 #ifdef WAPP_PLATFORM_CPP
 END_C_LINKAGE
--- a/src/base/dbl_list/dbl_list.c
+++ b/src/base/dbl_list/dbl_list.c
@@ -1,5 +1,3 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
 #include "./dbl_list.h"
 #include "../mem/allocator/mem_allocator.h"
 #include "../../common/assert/assert.h"
@@ -8,252 +6,250 @@
 #include <stddef.h>

 wapp_intern GenericList _node_to_list(GenericNode *node, u64 item_size);
-wapp_intern inline void _dbl_list_validate(const GenericList *list, u64 item_size);
-wapp_intern inline void _dbl_list_node_validate(const GenericList *list, const GenericNode *node, u64 item_size);
+wapp_intern void _dbl_list_validate(const GenericList *list, u64 item_size);
+wapp_intern void _dbl_list_node_validate(const GenericNode *node, u64 item_size);

 GenericList *_dbl_list_alloc(const Allocator *allocator, u64 item_size) {
-	wapp_debug_assert(allocator != NULL, "`allocator` should not be NULL");
+  wapp_debug_assert(allocator != NULL, "`allocator` should not be NULL");

-	GenericList *list = wapp_mem_allocator_alloc(allocator, sizeof(GenericList));
-	if (!list) { goto DBL_LIST_ALLOC_RETURN; }
+  GenericList *list = wapp_mem_allocator_alloc(allocator, sizeof(GenericList));
+  if (!list) { goto DBL_LIST_ALLOC_RETURN; }

-	memset((void *)list, 0, sizeof(GenericList));
-	list->magic     = WAPP_DBL_LIST_MAGIC;
-	list->item_size = item_size;
+  memset((void *)list, 0, sizeof(GenericList));
+  list->magic     = WAPP_DBL_LIST_MAGIC;
+  list->item_size = item_size;

 DBL_LIST_ALLOC_RETURN:
-	return list;
+  return list;
 }

-GenericNode *_dbl_list_node_alloc(const Allocator *allocator, void *item, u64 item_size) {
-	wapp_debug_assert(allocator != NULL, "`allocator` should not be NULL");
+GenericNode *_dbl_list_node_alloc(const Allocator *allocator, u64 item_size) {
+  wapp_debug_assert(allocator != NULL, "`allocator` should not be NULL");

-	GenericNode *node = wapp_mem_allocator_alloc(allocator, sizeof(GenericNode));
-	if (!node) { goto DBL_LIST_NODE_ALLOC_RETURN; }
+  GenericNode *node = wapp_mem_allocator_alloc(allocator, sizeof(GenericNode));
+  if (!node) { goto DBL_LIST_NODE_ALLOC_RETURN; }

-	memset((void *)node, 0, sizeof(GenericNode));
-	node->item             = item;
-	node->header.magic     = WAPP_DBL_NODE_MAGIC;
-	node->header.item_size = item_size;
+  memset((void *)node, 0, sizeof(GenericNode));
+  node->magic     = WAPP_DBL_NODE_MAGIC;
+  node->item_size = item_size;

 DBL_LIST_NODE_ALLOC_RETURN:
-	return node;
+  return node;
 }

 GenericNode *_dbl_list_get(const GenericList *list, u64 index, u64 item_size) {
-	wapp_debug_assert(list != NULL, "`list` should not be NULL");
-	_dbl_list_validate(list, item_size);
-	wapp_runtime_assert(index < list->node_count, "`index` is out of bounds");
+  wapp_debug_assert(list != NULL, "`list` should not be NULL");
+  _dbl_list_validate(list, item_size);
+  wapp_runtime_assert(index < list->node_count, "`index` is out of bounds");

-	GenericNode *output  = NULL;
-	GenericNode *current = list->first;
-	for (u64 i = 1; i <= index; ++i) {
-		current = current->header.next;
-	}
+  GenericNode *output  = NULL;
+  GenericNode *current = list->first;
+  for (u64 i = 1; i <= index; ++i) {
+    current = current->next;
+  }

-	output = current;
+  output = current;

-	return output;
+  return output;
 }

 void _dbl_list_push_front(GenericList *list, GenericNode *node, u64 item_size) {
-	wapp_debug_assert(list != NULL && node != NULL && (node->item) != NULL, "`list`, `node` and `node->item` should not be NULL");
-	_dbl_list_validate(list, item_size);
-	_dbl_list_node_validate(list, node, item_size);
+  wapp_debug_assert(list != NULL && node != NULL && (node->item) != NULL, "`list`, `node` and `node->item` should not be NULL");
+  _dbl_list_validate(list, item_size);
+  _dbl_list_node_validate(node, item_size);

-	GenericList node_list = _node_to_list(node, item_size);
+  GenericList node_list = _node_to_list(node, item_size);

-	if (list->node_count == 0) {
-		*list = node_list;
-		return;
-	}
+  if (list->node_count == 0) {
+    *list = node_list;
+    return;
+  }

-	list->node_count += node_list.node_count;
+  list->node_count += node_list.node_count;

-	GenericNode *first = list->first;
-	if (first) {
-		first->header.prev = node_list.last;
-	}
+  GenericNode *first = list->first;
+  if (first) {
+    first->prev = node_list.last;
+  }

-	list->first          = node_list.first;
-	node_list.last->header.next = first;
+  list->first          = node_list.first;
+  node_list.last->next = first;
 }

 void _dbl_list_push_back(GenericList *list, GenericNode *node, u64 item_size) {
-	wapp_debug_assert(list != NULL && node != NULL && (node->item) != NULL, "`list`, `node` and `node->item` should not be NULL");
-	_dbl_list_validate(list, item_size);
-	_dbl_list_node_validate(list, node, item_size);
+  wapp_debug_assert(list != NULL && node != NULL && (node->item) != NULL, "`list`, `node` and `node->item` should not be NULL");
+  _dbl_list_validate(list, item_size);
+  _dbl_list_node_validate(node, item_size);

-	GenericList node_list = _node_to_list(node, item_size);
+  GenericList node_list = _node_to_list(node, item_size);

-	if (list->node_count == 0) {
-		*list = node_list;
-		return;
-	}
+  if (list->node_count == 0) {
+    *list = node_list;
+    return;
+  }

-	list->node_count += node_list.node_count;
+  list->node_count += node_list.node_count;

-	GenericNode *last = list->last;
-	if (last) {
-		last->header.next = node_list.first;
-	}
+  GenericNode *last = list->last;
+  if (last) {
+    last->next = node_list.first;
+  }

-	list->last            = node_list.last;
-	node_list.first->header.prev = last;
+  list->last            = node_list.last;
+  node_list.first->prev = last;
 }

 void _dbl_list_insert(GenericList *list, GenericNode *node, u64 index, u64 item_size) {
-	wapp_debug_assert(list != NULL && node != NULL && (node->item) != NULL, "`list`, `node` and `node->item` should not be NULL");
-	_dbl_list_validate(list, item_size);
-	_dbl_list_node_validate(list, node, item_size);
+  wapp_debug_assert(list != NULL && node != NULL && (node->item) != NULL, "`list`, `node` and `node->item` should not be NULL");
+  _dbl_list_validate(list, item_size);
+  _dbl_list_node_validate(node, item_size);

-	if (index == 0) {
-		_dbl_list_push_front(list, node, item_size);
-		return;
-	} else if (index == list->node_count) {
-		_dbl_list_push_back(list, node, item_size);
-		return;
-	}
+  if (index == 0) {
+    _dbl_list_push_front(list, node, item_size);
+    return;
+  } else if (index == list->node_count) {
+    _dbl_list_push_back(list, node, item_size);
+    return;
+  }

-	GenericNode *dst_node = _dbl_list_get(list, index, item_size);
-	if (!dst_node) {
-		return;
-	}
+  GenericNode *dst_node = _dbl_list_get(list, index, item_size);
+  if (!dst_node) {
+    return;
+  }

-	GenericList node_list = _node_to_list(node, item_size);
+  GenericList node_list = _node_to_list(node, item_size);

-	list->node_count += node_list.node_count;
+  list->node_count += node_list.node_count;

-	GenericNode *prev = dst_node->header.prev;
+  GenericNode *prev = dst_node->prev;

-	dst_node->header.prev = node_list.last;
-	prev->header.next     = node_list.first;
+  dst_node->prev = node_list.last;
+  prev->next     = node_list.first;

-	node_list.first->header.prev = prev;
-	node_list.last->header.next  = dst_node;
+  node_list.first->prev = prev;
+  node_list.last->next  = dst_node;
 }

 GenericNode *_dbl_list_pop_front(GenericList *list, u64 item_size) {
-	wapp_debug_assert(list != NULL, "`list` should not be NULL");
-	_dbl_list_validate(list, item_size);
+  wapp_debug_assert(list != NULL, "`list` should not be NULL");
+  _dbl_list_validate(list, item_size);

-	GenericNode *output = NULL;
+  GenericNode *output = NULL;

-	if (list->node_count == 0) {
-		goto RETURN_LIST_POP_FRONT;
-	}
+  if (list->node_count == 0) {
+    goto RETURN_I32_LIST_POP_FRONT;
+  }

-	output = list->first;
+  output = list->first;

-	if (list->node_count == 1) {
-		*list = (GenericList){.magic = WAPP_DBL_LIST_MAGIC, .item_size = item_size};
-		goto RETURN_LIST_POP_FRONT;
-	}
+  if (list->node_count == 1) {
+    *list = (GenericList){0};
+    goto RETURN_I32_LIST_POP_FRONT;
+  }

-	--(list->node_count);
-	list->first = output->header.next;
+  --(list->node_count);
+  list->first = output->next;

-	output->header.prev = output->header.next = NULL;
+  output->prev = output->next = NULL;

-RETURN_LIST_POP_FRONT:
-	return output;
+RETURN_I32_LIST_POP_FRONT:
+  return output;
 }

 GenericNode *_dbl_list_pop_back(GenericList *list, u64 item_size) {
-	wapp_debug_assert(list != NULL, "`list` should not be NULL");
-	_dbl_list_validate(list, item_size);
+  wapp_debug_assert(list != NULL, "`list` should not be NULL");
+  _dbl_list_validate(list, item_size);

-	GenericNode *output = NULL;
+  GenericNode *output = NULL;

-	if (list->node_count == 0) {
-		goto RETURN_LIST_POP_BACK;
-	}
+  if (list->node_count == 0) {
+    goto RETURN_I32_LIST_POP_BACK;
+  }

-	output = list->last;
+  output = list->last;

-	if (list->node_count == 1) {
-		*list = (GenericList){.magic = WAPP_DBL_LIST_MAGIC, .item_size = item_size};
-		goto RETURN_LIST_POP_BACK;
-	}
+  if (list->node_count == 1) {
+    *list = (GenericList){.magic = WAPP_DBL_LIST_MAGIC, .item_size = item_size};
+    goto RETURN_I32_LIST_POP_BACK;
+  }

-	--(list->node_count);
-	list->last = output->header.prev;
+  --(list->node_count);
+  list->last = output->prev;

-	output->header.prev = output->header.next = NULL;
+  output->prev = output->next = NULL;

-RETURN_LIST_POP_BACK:
-	return output;
+RETURN_I32_LIST_POP_BACK:
+  return output;
 }

 GenericNode *_dbl_list_remove(GenericList *list, u64 index, u64 item_size) {
-	wapp_debug_assert(list != NULL, "`list` should not be NULL");
-	_dbl_list_validate(list, item_size);
+  wapp_debug_assert(list != NULL, "`list` should not be NULL");
+  _dbl_list_validate(list, item_size);

-	GenericNode *output = NULL;
+  GenericNode *output = NULL;

-	if (index == 0) {
-		output = _dbl_list_pop_front(list, item_size);
-		goto RETURN_LIST_REMOVE;
-	} else if (index == list->node_count) {
-		output = _dbl_list_pop_back(list, item_size);
-		goto RETURN_LIST_REMOVE;
-	}
+  if (index == 0) {
+    output = _dbl_list_pop_front(list, item_size);
+    goto RETURN_I32_LIST_REMOVE;
+  } else if (index == list->node_count) {
+    output = _dbl_list_pop_back(list, item_size);
+    goto RETURN_I32_LIST_REMOVE;
+  }

-	output = _dbl_list_get(list, index, item_size);
-	if (!output) {
-		goto RETURN_LIST_REMOVE;
-	}
+  output = _dbl_list_get(list, index, item_size);
+  if (!output) {
+    goto RETURN_I32_LIST_REMOVE;
+  }

-	output->header.prev->header.next = output->header.next;
-	output->header.next->header.prev = output->header.prev;
+  output->prev->next = output->next;
+  output->next->prev = output->prev;

-	--(list->node_count);
+  --(list->node_count);

-	output->header.prev = output->header.next = NULL;
+  output->prev = output->next = NULL;

-RETURN_LIST_REMOVE:
-	return output;
+RETURN_I32_LIST_REMOVE:
+  return output;
 }

 void _dbl_list_empty(GenericList *list, u64 item_size) {
-	wapp_debug_assert(list != NULL, "`list` should not be NULL");
-	_dbl_list_validate(list, item_size);
+  wapp_debug_assert(list != NULL, "`list` should not be NULL");
+  _dbl_list_validate(list, item_size);

-	u64 count = list->node_count;
-	for (u64 i = 0; i < count; ++i) {
-		_dbl_list_pop_back(list, item_size);
-	}
+  u64 count = list->node_count;
+  for (u64 i = 0; i < count; ++i) {
+    _dbl_list_pop_back(list, item_size);
+  }
 }

 wapp_intern GenericList _node_to_list(GenericNode *node, u64 item_size) {
-	GenericList output = {
-		.magic      = WAPP_DBL_LIST_MAGIC,
-		.first      = node,
-		.last       = node,
-		.node_count = 1,
-		.item_size  = item_size,
-	};
+  GenericList output = {
+    .magic      = WAPP_DBL_LIST_MAGIC,
+    .first      = node,
+    .last       = node,
+    .node_count = 1,
+    .item_size  = item_size,
+  };

-	while (output.first->header.prev != NULL) {
-		output.first = output.first->header.prev;
-		++(output.node_count);
-	}
+  while (output.first->prev != NULL) {
+    output.first = output.first->prev;
+    ++(output.node_count);
+  }

-	while (output.last->header.next != NULL) {
-		output.last = output.last->header.next;
-		++(output.node_count);
-	}
+  while (output.last->next != NULL) {
+    output.last = output.last->next;
+    ++(output.node_count);
+  }

-	return output;
+  return output;
 }

-wapp_intern inline void _dbl_list_validate(const GenericList *list, u64 item_size) {
-	wapp_runtime_assert(list->magic == WAPP_DBL_LIST_MAGIC, "`list` isn't a valid wapp list type");
-	wapp_runtime_assert(list->item_size == item_size, "Invalid item provided");
+wapp_intern void _dbl_list_validate(const GenericList *list, u64 item_size) {
+  wapp_runtime_assert(list->magic == WAPP_DBL_LIST_MAGIC, "`list` isn't a valid wapp list type");
+  wapp_runtime_assert(list->item_size == item_size, "Invalid item provided");
 }

-wapp_intern inline void _dbl_list_node_validate(const GenericList *list, const GenericNode *node, u64 item_size) {
-	wapp_runtime_assert(node->header.magic == WAPP_DBL_NODE_MAGIC, "`node` isn't a valid wapp node type");
-	wapp_runtime_assert(list->item_size == node->header.item_size, "Mismatched `list` and `node` types");
-	wapp_runtime_assert(node->header.item_size == item_size, "Invalid item provided");
+wapp_intern void _dbl_list_node_validate(const GenericNode *node, u64 item_size) {
+  wapp_runtime_assert(node->magic == WAPP_DBL_NODE_MAGIC, "`node` isn't a valid wapp node type");
+  wapp_runtime_assert(node->item_size == item_size, "Invalid item provided");
 }
--- a/src/base/dbl_list/dbl_list.h
+++ b/src/base/dbl_list/dbl_list.h
@@ -1,5 +1,3 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
 #ifndef DBL_LIST_H
 #define DBL_LIST_H

@@ -14,160 +12,63 @@ BEGIN_C_LINKAGE
 #define WAPP_DBL_LIST_MAGIC (u64)0x57415f444c5354
 #define WAPP_DBL_NODE_MAGIC (u64)0x57415f444e44

-typedef struct GenericNode GenericNode;
-
-typedef struct {
-	u64 magic;
-	u64 item_size;
-	GenericNode *prev;
-	GenericNode *next;
-} NodeHeader;
-
-struct GenericNode {
-	NodeHeader header;
-	void *item;
-};
-
-typedef struct {
-	u64 magic;
-	u64 node_count;
-	u64 item_size;
-	GenericNode *first;
-	GenericNode *last;
-} GenericList;
-
-// NOTE (Abdelrahman): GenericList typedefs for readability
-typedef GenericList VoidPtrList;
-typedef GenericList C8List;
-typedef GenericList C16List;
-typedef GenericList C32List;
-typedef GenericList U8List;
-typedef GenericList U16List;
-typedef GenericList U32List;
-typedef GenericList U64List;
-typedef GenericList B8List;
-typedef GenericList I8List;
-typedef GenericList I16List;
-typedef GenericList I32List;
-typedef GenericList I64List;
-typedef GenericList F32List;
-typedef GenericList F64List;
-typedef GenericList F128List;
-typedef GenericList UptrList;
-typedef GenericList IptrList;
-typedef GenericList Str8List;
-
-// NOTE (Abdelrahman): GenericNode typedefs for readability
-typedef GenericNode VoidPtrNode;
-typedef GenericNode C8Node;
-typedef GenericNode C16Node;
-typedef GenericNode C32Node;
-typedef GenericNode U8Node;
-typedef GenericNode U16Node;
-typedef GenericNode U32Node;
-typedef GenericNode U64Node;
-typedef GenericNode B8Node;
-typedef GenericNode I8Node;
-typedef GenericNode I16Node;
-typedef GenericNode I32Node;
-typedef GenericNode I64Node;
-typedef GenericNode F32Node;
-typedef GenericNode F64Node;
-typedef GenericNode F128Node;
-typedef GenericNode UptrNode;
-typedef GenericNode IptrNode;
-typedef GenericNode Str8Node;
+#define WAPP_DEF_DBL_LIST_TYPE(T, NODE_NAME, LIST_NAME) \
+  typedef struct NODE_NAME NODE_NAME;                   \
+  struct NODE_NAME {                                    \
+    u64 magic;                                          \
+    T *item;                                            \
+    NODE_NAME *prev;                                    \
+    NODE_NAME *next;                                    \
+    u64 item_size;                                      \
+  };                                                    \
+                                                        \
+  typedef struct {                                      \
+    u64 magic;                                          \
+    NODE_NAME *first;                                   \
+    NODE_NAME *last;                                    \
+    u64 node_count;                                     \
+    u64 item_size;                                      \
+  } LIST_NAME

 #ifdef WAPP_PLATFORM_CPP
-#define wapp_dbl_list(TYPE)                                                                        \
-	GenericList{WAPP_DBL_LIST_MAGIC, 0, sizeof(TYPE), nullptr, nullptr}
-#define _dbl_list_node(TYPE, ITEM_PTR) ([&]() {                                                    \
-	wapp_persist GenericNode node = {                                                                \
-		NodeHeader{WAPP_DBL_NODE_MAGIC, sizeof(TYPE), nullptr, nullptr},                               \
-		ITEM_PTR,                                                                                      \
-	};                                                                                               \
-                                                                                                   \
-	return &node;                                                                                    \
-}())
+#define wapp_dbl_list(ELEM_TYPE, LIST_TYPE)                                     \
+  LIST_TYPE{WAPP_DBL_LIST_MAGIC, nullptr, nullptr, 0, sizeof(ELEM_TYPE)}
+#define wapp_dbl_list_node(ELEM_TYPE, NODE_TYPE, ELEM_PTR)                      \
+  NODE_TYPE{WAPP_DBL_NODE_MAGIC, ELEM_PTR, nullptr, nullptr, sizeof(ELEM_TYPE)}
 #else
-#define wapp_dbl_list(TYPE) (                                                                      \
-	(GenericList){.magic = WAPP_DBL_LIST_MAGIC, .item_size = sizeof(TYPE)}                           \
+#define wapp_dbl_list(ELEM_TYPE, LIST_TYPE) (                                                 \
+  (LIST_TYPE){.magic = WAPP_DBL_LIST_MAGIC, .item_size = sizeof(ELEM_TYPE)}                   \
 )
-#define _dbl_list_node(TYPE, ITEM_PTR) (                                                           \
-	&((GenericNode){.header = {.magic = WAPP_DBL_NODE_MAGIC, .item_size = sizeof(TYPE)},             \
-	                .item = ITEM_PTR})                                                               \
+#define wapp_dbl_list_node(ELEM_TYPE, NODE_TYPE, ELEM_PTR) (                                  \
+  (NODE_TYPE){.magic = WAPP_DBL_NODE_MAGIC, .item = ELEM_PTR, .item_size = sizeof(ELEM_TYPE)} \
 )
 #endif // !WAPP_PLATFORM_CPP

-#define wapp_dbl_list_alloc(TYPE, ALLOCATOR)                                                       \
-	(_dbl_list_alloc(ALLOCATOR, sizeof(TYPE)))
-#define wapp_dbl_list_get(TYPE, LIST_PTR, ITEM_INDEX)                                              \
-	((TYPE *)(_dbl_list_get(LIST_PTR, ITEM_INDEX, sizeof(TYPE))->item))
-#define wapp_dbl_list_get_node(TYPE, LIST_PTR, ITEM_INDEX)                                         \
-	(_dbl_list_get(LIST_PTR, ITEM_INDEX, sizeof(TYPE)))
-#define wapp_dbl_list_get_node_item(TYPE, NODE_PTR)                                                \
-	((TYPE *)(                                                                                       \
-		(NODE_PTR == NULL) ?                                                                           \
-		NULL :                                                                                         \
-		(NODE_PTR)->item                                                                               \
-	))
-#define wapp_dbl_list_push_front(TYPE, LIST_PTR, ITEM_PTR)                                         \
-	(_dbl_list_push_front(LIST_PTR, _dbl_list_node(TYPE, ITEM_PTR), sizeof(TYPE)))
-#define wapp_dbl_list_push_back(TYPE, LIST_PTR, ITEM_PTR)                                          \
-	(_dbl_list_push_back(LIST_PTR, _dbl_list_node(TYPE, ITEM_PTR), sizeof(TYPE)))
-#define wapp_dbl_list_insert(TYPE, LIST_PTR, ITEM_PTR, ITEM_INDEX)                                 \
-	(_dbl_list_insert(LIST_PTR, _dbl_list_node(TYPE, ITEM_PTR),                                      \
-	                  ITEM_INDEX, sizeof(TYPE)))
-#define wapp_dbl_list_push_front_alloc(TYPE, ALLOCATOR, LIST_PTR, ITEM_PTR)                        \
-	(_dbl_list_push_front(LIST_PTR, _dbl_list_node_alloc(ALLOCATOR, ITEM_PTR, sizeof(TYPE)),         \
-	                      sizeof(TYPE)))
-#define wapp_dbl_list_push_back_alloc(TYPE, ALLOCATOR, LIST_PTR, ITEM_PTR)                         \
-	(_dbl_list_push_back(LIST_PTR, _dbl_list_node_alloc(ALLOCATOR, ITEM_PTR, sizeof(TYPE)),          \
-	                     sizeof(TYPE)))
-#define wapp_dbl_list_insert_alloc(TYPE, ALLOCATOR, LIST_PTR, ITEM_PTR, ITEM_INDEX)                \
-	(_dbl_list_insert(LIST_PTR, _dbl_list_node_alloc(ALLOCATOR, ITEM_PTR, sizeof(TYPE)),             \
-	                  ITEM_INDEX, sizeof(TYPE)))
-#define wapp_dbl_list_pop_front(TYPE, LIST_PTR)                                                    \
-	((TYPE *)(                                                                                       \
-		(LIST_PTR == NULL || (LIST_PTR)->node_count == 0) ?                                            \
-		NULL :                                                                                         \
-		_dbl_list_pop_front(LIST_PTR, sizeof(TYPE))->item                                              \
-	))
-#define wapp_dbl_list_pop_back(TYPE, LIST_PTR)                                                     \
-	((TYPE *)(                                                                                       \
-		(LIST_PTR == NULL || (LIST_PTR)->node_count == 0) ?                                            \
-		NULL :                                                                                         \
-		_dbl_list_pop_back(LIST_PTR, sizeof(TYPE))->item                                               \
-	))
-#define wapp_dbl_list_remove(TYPE, LIST_PTR, ITEM_INDEX)                                           \
-	((TYPE *)(                                                                                       \
-		(LIST_PTR == NULL || (LIST_PTR)->node_count == 0 || ITEM_INDEX >= (LIST_PTR)->node_count) ?    \
-		NULL :                                                                                         \
-		_dbl_list_remove(LIST_PTR, ITEM_INDEX, sizeof(TYPE))->item                                     \
-	))
-#define wapp_dbl_list_pop_front_node(TYPE, LIST_PTR)                                               \
-	(                                                                                                \
-		(LIST_PTR == NULL || (LIST_PTR)->node_count == 0) ?                                            \
-		NULL :                                                                                         \
-		_dbl_list_pop_front(LIST_PTR, sizeof(TYPE))                                                    \
-	)
-#define wapp_dbl_list_pop_back_node(TYPE, LIST_PTR)                                                \
-	(                                                                                                \
-		(LIST_PTR == NULL || (LIST_PTR)->node_count == 0) ?                                            \
-		NULL :                                                                                         \
-		_dbl_list_pop_back(LIST_PTR, sizeof(TYPE))                                                     \
-	)
-#define wapp_dbl_list_remove_node(TYPE, LIST_PTR, ITEM_INDEX)                                      \
-	(                                                                                                \
-		(LIST_PTR == NULL || (LIST_PTR)->node_count == 0 || ITEM_INDEX >= (LIST_PTR)->node_count) ?    \
-		NULL :                                                                                         \
-		_dbl_list_remove(LIST_PTR, ITEM_INDEX, sizeof(TYPE))                                           \
-	)
-#define wapp_dbl_list_empty(TYPE, LIST_PTR)                                                        \
-	(_dbl_list_empty(LIST_PTR, sizeof(TYPE)))
+#define wapp_dbl_list_alloc(ELEM_TYPE, LIST_TYPE, ALLOCATOR)                                        \
+  (LIST_TYPE *)_dbl_list_alloc(ALLOCATOR, sizeof(ELEM_TYPE))
+#define wapp_dbl_list_node_alloc(ELEM_TYPE, NODE_TYPE, ALLOCATOR)                                   \
+  (NODE_TYPE *)_dbl_list_node_alloc(ALLOCATOR, sizeof(ELEM_TYPE))
+#define wapp_dbl_list_get(ELEM_TYPE, NODE_TYPE, LIST_PTR, ELEM_INDEX)                               \
+  (NODE_TYPE *)_dbl_list_get((GenericList *)LIST_PTR, ELEM_INDEX, sizeof(ELEM_TYPE))
+#define wapp_dbl_list_push_front(ELEM_TYPE, LIST_PTR, NODE_PTR)                                     \
+  _dbl_list_push_front((GenericList *)LIST_PTR, (GenericNode *)NODE_PTR, sizeof(ELEM_TYPE))
+#define wapp_dbl_list_push_back(ELEM_TYPE, LIST_PTR, NODE_PTR)                                      \
+  _dbl_list_push_back((GenericList *)LIST_PTR, (GenericNode *)NODE_PTR, sizeof(ELEM_TYPE))
+#define wapp_dbl_list_insert(ELEM_TYPE, LIST_PTR, NODE_PTR, ELEM_INDEX)                             \
+  _dbl_list_insert((GenericList *)LIST_PTR, (GenericNode *)NODE_PTR, ELEM_INDEX, sizeof(ELEM_TYPE))
+#define wapp_dbl_list_pop_front(ELEM_TYPE, NODE_TYPE, LIST_PTR)                                     \
+  (NODE_TYPE *)_dbl_list_pop_front((GenericList *)LIST_PTR, sizeof(ELEM_TYPE))
+#define wapp_dbl_list_pop_back(ELEM_TYPE, NODE_TYPE, LIST_PTR)                                      \
+  (NODE_TYPE *)_dbl_list_pop_back((GenericList *)LIST_PTR, sizeof(ELEM_TYPE))
+#define wapp_dbl_list_remove(ELEM_TYPE, NODE_TYPE, LIST_PTR, ELEM_INDEX)                            \
+  (NODE_TYPE *)_dbl_list_remove((GenericList *)LIST_PTR, ELEM_INDEX, sizeof(ELEM_TYPE))
+#define wapp_dbl_list_empty(ELEM_TYPE, LIST_PTR)                                                    \
+  _dbl_list_empty((GenericList *)LIST_PTR, sizeof(ELEM_TYPE))
+
+WAPP_DEF_DBL_LIST_TYPE(void, GenericNode, GenericList);

 GenericList *_dbl_list_alloc(const Allocator *allocator, u64 item_size);
-GenericNode *_dbl_list_node_alloc(const Allocator *allocator, void *item, u64 item_size);
+GenericNode *_dbl_list_node_alloc(const Allocator *allocator, u64 item_size);
 GenericNode *_dbl_list_get(const GenericList *list, u64 index, u64 item_size);
 void         _dbl_list_push_front(GenericList *list, GenericNode *node, u64 item_size);
 void         _dbl_list_push_back(GenericList *list, GenericNode *node, u64 item_size);
@@ -177,6 +78,29 @@ GenericNode *_dbl_list_pop_back(GenericList *list, u64 item_size);
 GenericNode *_dbl_list_remove(GenericList *list, u64 index, u64 item_size);
 void         _dbl_list_empty(GenericList *list, u64 item_size);

+// Base list types
+typedef struct str8 Str8;
+
+WAPP_DEF_DBL_LIST_TYPE(void *, VoidPtrNode, VoidPtrList);
+WAPP_DEF_DBL_LIST_TYPE(c8    , C8Node     , C8List);
+WAPP_DEF_DBL_LIST_TYPE(c16   , C16Node    , C16List);
+WAPP_DEF_DBL_LIST_TYPE(c32   , C32Node    , C32List);
+WAPP_DEF_DBL_LIST_TYPE(u8    , U8Node     , U8List);
+WAPP_DEF_DBL_LIST_TYPE(u16   , U16Node    , U16List);
+WAPP_DEF_DBL_LIST_TYPE(u32   , U32Node    , U32List);
+WAPP_DEF_DBL_LIST_TYPE(u64   , U64Node    , U64List);
+WAPP_DEF_DBL_LIST_TYPE(b8    , B8Node     , B8List);
+WAPP_DEF_DBL_LIST_TYPE(i8    , I8Node     , I8List);
+WAPP_DEF_DBL_LIST_TYPE(i16   , I16Node    , I16List);
+WAPP_DEF_DBL_LIST_TYPE(i32   , I32Node    , I32List);
+WAPP_DEF_DBL_LIST_TYPE(i64   , I64Node    , I64List);
+WAPP_DEF_DBL_LIST_TYPE(f32   , F32Node    , F32List);
+WAPP_DEF_DBL_LIST_TYPE(f64   , F64Node    , F64List);
+WAPP_DEF_DBL_LIST_TYPE(f128  , F128Node   , F128List);
+WAPP_DEF_DBL_LIST_TYPE(uptr  , UptrNode   , UptrList);
+WAPP_DEF_DBL_LIST_TYPE(iptr  , IptrNode   , IptrList);
+WAPP_DEF_DBL_LIST_TYPE(Str8  , Str8Node   , Str8List);
+
 #ifdef WAPP_PLATFORM_CPP
 END_C_LINKAGE
 #endif // !WAPP_PLATFORM_CPP
--- a/src/base/mem/allocator/mem_allocator.c
+++ b/src/base/mem/allocator/mem_allocator.c
@@ -6,30 +6,30 @@
 #include <stdlib.h>

 void *wapp_mem_allocator_alloc(const Allocator *allocator, u64 size) {
-	wapp_debug_assert(allocator != NULL && (allocator->alloc) != NULL, "`allocator` and `allocator->alloc` should not be NULL");
-	return allocator->alloc(size, allocator->obj);
+  wapp_debug_assert(allocator != NULL && (allocator->alloc) != NULL, "`allocator` and `allocator->alloc` should not be NULL");
+  return allocator->alloc(size, allocator->obj);
 }

 void *wapp_mem_allocator_alloc_aligned(const Allocator *allocator, u64 size, u64 alignment) {
-	wapp_debug_assert(allocator != NULL && (allocator->alloc_aligned) != NULL, "`allocator` and `allocator->alloc_aligned` should not be NULL");
-	return allocator->alloc_aligned(size, alignment, allocator->obj);
+  wapp_debug_assert(allocator != NULL && (allocator->alloc_aligned) != NULL, "`allocator` and `allocator->alloc_aligned` should not be NULL");
+  return allocator->alloc_aligned(size, alignment, allocator->obj);
 }

 void *wapp_mem_allocator_realloc(const Allocator *allocator, void *ptr, u64 old_size, u64 new_size) {
-	wapp_debug_assert(allocator != NULL && (allocator->realloc) != NULL, "`allocator` and `allocator->realloc` should not be NULL");
-	return allocator->realloc(ptr, old_size, new_size, allocator->obj);
+  wapp_debug_assert(allocator != NULL && (allocator->realloc) != NULL, "`allocator` and `allocator->realloc` should not be NULL");
+  return allocator->realloc(ptr, old_size, new_size, allocator->obj);
 }

 void *wapp_mem_allocator_realloc_aligned(const Allocator *allocator, void *ptr, u64 old_size,
                                         u64 new_size, u64 alignment) {
-	wapp_debug_assert(allocator != NULL && (allocator->realloc_aligned) != NULL, "`allocator` and `allocator->realloc_aligned` should not be NULL");
-	return allocator->realloc_aligned(ptr, old_size, new_size, alignment, allocator->obj);
+  wapp_debug_assert(allocator != NULL && (allocator->realloc_aligned) != NULL, "`allocator` and `allocator->realloc_aligned` should not be NULL");
+  return allocator->realloc_aligned(ptr, old_size, new_size, alignment, allocator->obj);
 }

 void wapp_mem_allocator_free(const Allocator *allocator, void **ptr, u64 size) {
-	if (!allocator || !(allocator->free)) {
-		return;
-	}
+  if (!allocator || !(allocator->free)) {
+    return;
+  }

-	allocator->free(ptr, size, allocator->obj);
+  allocator->free(ptr, size, allocator->obj);
 }
--- a/src/base/mem/allocator/mem_allocator.h
+++ b/src/base/mem/allocator/mem_allocator.h
@@ -11,26 +11,26 @@
 BEGIN_C_LINKAGE
 #endif // !WAPP_PLATFORM_CPP

-typedef void  *(MemAllocFunc)(u64 size, void *alloc_obj);
-typedef void  *(MemAllocAlignedFunc)(u64 size, u64 alignment, void *alloc_obj);
-typedef void  *(MemReallocFunc)(void *ptr, u64 old_size, u64 new_size, void *alloc_obj);
-typedef void  *(MemReallocAlignedFunc)(void *ptr, u64 old_size, u64 new_size, u64 alignment, void *alloc_obj);
-typedef void   (MemFreeFunc)(void **ptr, u64 size, void *alloc_obj);
+typedef void *(MemAllocFunc)(u64 size, void *alloc_obj);
+typedef void *(MemAllocAlignedFunc)(u64 size, u64 alignment, void *alloc_obj);
+typedef void *(MemReallocFunc)(void *ptr, u64 old_size, u64 new_size, void *alloc_obj);
+typedef void *(MemReallocAlignedFunc)(void *ptr, u64 old_size, u64 new_size, u64 alignment, void *alloc_obj);
+typedef void  (MemFreeFunc)(void **ptr, u64 size, void *alloc_obj);

-typedef struct Allocator Allocator;
-struct Allocator {
-	void *obj;
-	MemAllocFunc *alloc;
-	MemAllocAlignedFunc *alloc_aligned;
-	MemReallocFunc *realloc;
-	MemReallocAlignedFunc *realloc_aligned;
-	MemFreeFunc *free;
+typedef struct allocator Allocator;
+struct allocator {
+  void *obj;
+  MemAllocFunc *alloc;
+  MemAllocAlignedFunc *alloc_aligned;
+  MemReallocFunc *realloc;
+  MemReallocAlignedFunc *realloc_aligned;
+  MemFreeFunc *free;
 };

 #ifdef WAPP_PLATFORM_CPP
 #define wapp_mem_allocator_invalid(ALLOCATOR) ([&]() {      \
-	Allocator alloc{};                                        \
-	return memcmp(ALLOCATOR, &alloc, sizeof(Allocator)) == 0; \
+  Allocator alloc{};                                        \
+  return memcmp(ALLOCATOR, &alloc, sizeof(Allocator)) == 0; \
 }())
 #else
 #define wapp_mem_allocator_invalid(ALLOCATOR) (memcmp(ALLOCATOR, &((Allocator){0}), sizeof(Allocator)) == 0)
--- a/src/base/mem/utils/mem_utils.c
+++ b/src/base/mem/utils/mem_utils.c
@@ -3,23 +3,24 @@
 #include "mem_utils.h"
 #include "../../../common/aliases/aliases.h"
 #include "../../../common/assert/assert.h"
-#include "../../../common/misc/misc_utils.h"
 #include <stddef.h>

+wapp_intern b8 is_power_of_two(u64 num) { return (num & (num - 1)) == 0; }
+
 void *wapp_mem_util_align_forward(void *ptr, u64 alignment) {
-	wapp_debug_assert(ptr != NULL, "`ptr` should not be NULL");
-	wapp_runtime_assert(wapp_is_power_of_two(alignment), "`alignment` value is not a power of two");
+  wapp_debug_assert(ptr != NULL, "`ptr` should not be NULL");
+  wapp_runtime_assert(is_power_of_two(alignment), "`alignment` value is not a power of two");

-	uptr p      = (uptr)ptr;
-	uptr align  = (uptr)alignment;
+  uptr p = (uptr)ptr;
+  uptr align = (uptr)alignment;

-	// Similar to p % align, but it's a faster implementation that works fine
-	// because align is guaranteed to be a power of 2
-	uptr modulo = p & (align - 1);
+  // Similar to p % align, but it's a faster implementation that works fine
+  // because align is guaranteed to be a power of 2
+  uptr modulo = p & (align - 1);

-	if (modulo != 0) {
-		p += align - modulo;
-	}
+  if (modulo != 0) {
+    p += align - modulo;
+  }

-	return (void *)p;
+  return (void *)p;
 }
--- a/src/base/queue/queue.c
+++ b/src/base/queue/queue.c
@@ -1,85 +0,0 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
-#include "queue.h"
-#include "../array/array.h"
-#include "../../common/assert/assert.h"
-#include "../../common/misc/misc_utils.h"
-#include <string.h>
-
-void _queue_push(GenericQueue *queue, void *item, u64 item_size) {
-	wapp_debug_assert(queue != NULL, "`queue` should not be NULL");
-	wapp_runtime_assert(item_size == wapp_array_item_size(queue->items), "Invalid type");
-
-	u64 capacity = wapp_array_capacity(queue->items);
-	if (queue->count >= capacity) { return; }
-
-	u64 index = (queue->back)++;
-	_array_set(queue->items, index, item, item_size);
-	++(queue->count);
-
-	if (queue->back >= capacity) {
-		queue->back = 0;
-	}
-}
-
-GenericQueue *_queue_push_alloc(const Allocator *allocator, GenericQueue *queue, void *item, u64 item_size) {
-	wapp_debug_assert(allocator != NULL && queue != NULL && item != NULL,
-	                  "`allocator`, `queue` and `item` should not be NULL");
-	wapp_runtime_assert(item_size == wapp_array_item_size(queue->items), "Invalid type");
-
-	GenericQueue *output = queue;
-
-	u64 capacity = wapp_array_capacity(queue->items);
-	if (queue->count >= capacity) {
-		u64 new_capacity = wapp_misc_utils_u64_round_up_pow2(capacity * 2);
-		u64 array_size   = _array_calc_alloc_size(new_capacity, item_size);
-		u64 alloc_size   = sizeof(GenericQueue) + array_size;
-		void *buffer     = wapp_mem_allocator_alloc(allocator, alloc_size);
-		if (!buffer) {
-			goto RETURN_QUEUE_PUSH_ALLOC;
-		}
-
-		memset((void *)buffer, 0, alloc_size);
-
-		output        = (GenericQueue *)buffer;
-		output->items = _array_from_preallocated_buffer((void *)(output + 1), array_size, ARRAY_INIT_FILLED, item_size);
-
-		// NOTE (Abdelrahman): When the queue is full, the front and back indices should
-		// always be the same
-		u64 front_count     = capacity - queue->front;
-		u64 back_count      = queue->back;
-		void *copy_boundary = (void *)((uptr)(queue->items) + (queue->front * item_size));
-
-		memcpy(output->items, copy_boundary, front_count * item_size);
-		if (back_count > 0) {
-			void *back_copy_dst = (void *)((uptr)(output->items) + (front_count * item_size));
-			memcpy(back_copy_dst, queue->items, back_count * item_size);
-		}
-
-		output->front = 0;
-		output->back  = front_count + back_count;
-		output->count = queue->count;
-	}
-
-	_queue_push(output, item, item_size);
-
-RETURN_QUEUE_PUSH_ALLOC:
-	return output;
-}
-
-void *_queue_pop(GenericQueue *queue, u64 item_size) {
-	wapp_debug_assert(queue != NULL, "`queue` should not be NULL");
-	wapp_runtime_assert(item_size == wapp_array_item_size(queue->items), "Invalid type");
-
-	if (queue->count == 0) { return NULL; }
-
-	u64 index = (queue->front)++;
-	--(queue->count);
-
-	u64 capacity = wapp_array_capacity(queue->items);
-	if (queue->front >= capacity) {
-		queue->front = 0;
-	}
-
-	return _array_get(queue->items, index, item_size);
-}
--- a/src/base/queue/queue.h
+++ b/src/base/queue/queue.h
@@ -1,100 +0,0 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
-#ifndef QUEUE_H
-#define QUEUE_H
-
-#include "../array/array.h"
-#include "../mem/allocator/mem_allocator.h"
-#include "../../common/aliases/aliases.h"
-#include "../../common/platform/platform.h"
-
-#ifdef WAPP_PLATFORM_CPP
-BEGIN_C_LINKAGE
-#endif // !WAPP_PLATFORM_CPP
-
-typedef struct {
-	GenericArray items;
-	u64 front;
-	u64 back;
-	u64 count;
-} GenericQueue;
-
-// NOTE (Abdelrahman): GenericQueue typedefs for readability
-typedef GenericQueue VoidPtrQueue;
-typedef GenericQueue C8Queue;
-typedef GenericQueue C16Queue;
-typedef GenericQueue C32Queue;
-typedef GenericQueue U8Queue;
-typedef GenericQueue U16Queue;
-typedef GenericQueue U32Queue;
-typedef GenericQueue U64Queue;
-typedef GenericQueue B8Queue;
-typedef GenericQueue I8Queue;
-typedef GenericQueue I16Queue;
-typedef GenericQueue I32Queue;
-typedef GenericQueue I64Queue;
-typedef GenericQueue F32Queue;
-typedef GenericQueue F64Queue;
-typedef GenericQueue F128Queue;
-typedef GenericQueue UptrQueue;
-typedef GenericQueue IptrQueue;
-typedef GenericQueue Str8Queue;
-
-#ifdef WAPP_PLATFORM_CPP
-#define wapp_queue(TYPE, CAPACITY) ([&]() {                                                        \
-	wapp_persist GenericArray arr   = wapp_array_with_capacity(TYPE, CAPACITY, ARRAY_INIT_FILLED);   \
-	wapp_persist GenericQueue queue = {                                                              \
-		arr,                                                                                           \
-		0,                                                                                             \
-		0,                                                                                             \
-		0,                                                                                             \
-	};                                                                                               \
-                                                                                                   \
-	return queue;                                                                                    \
-}())
-#define wapp_queue_alloc(TYPE, ALLOCATOR_PTR, CAPACITY) ([&]() {                                   \
-	wapp_persist GenericQueue queue = {                                                              \
-		wapp_array_alloc_capacity(TYPE, ALLOCATOR_PTR, CAPACITY, ARRAY_INIT_FILLED),                   \
-		0,                                                                                             \
-		0,                                                                                             \
-		0,                                                                                             \
-	};                                                                                               \
-                                                                                                   \
-	return queue;                                                                                    \
-}())
-#else
-#define wapp_queue(TYPE, CAPACITY) ((GenericQueue){                                                \
-	.items = wapp_array_with_capacity(TYPE, CAPACITY, ARRAY_INIT_FILLED),                            \
-	.front = 0,                                                                                      \
-	.back  = 0,                                                                                      \
-	.count = 0,                                                                                      \
-})
-#define wapp_queue_alloc(TYPE, ALLOCATOR_PTR, CAPACITY) ((GenericQueue){                           \
-	.items = wapp_array_alloc_capacity(TYPE, ALLOCATOR_PTR, CAPACITY, ARRAY_INIT_FILLED),            \
-	.front = 0,                                                                                      \
-	.back  = 0,                                                                                      \
-	.count = 0,                                                                                      \
-})
-#endif // !WAPP_PLATFORM_CPP
-
-#define wapp_queue_capacity(QUEUE_PTR) (wapp_array_capacity((QUEUE_PTR)->items))
-#define wapp_queue_item_size(QUEUE_PTR) (wapp_array_item_size((QUEUE_PTR)->items))
-#define wapp_queue_push(TYPE, QUEUE_PTR, VALUE_PTR) (                                              \
-	_queue_push(QUEUE_PTR, VALUE_PTR, sizeof(TYPE))                                                  \
-)
-#define wapp_queue_push_alloc(TYPE, ALLOCATOR_PTR, QUEUE_PTR, VALUE_PTR) (                         \
-	_queue_push_alloc(ALLOCATOR_PTR, QUEUE_PTR, VALUE_PTR, sizeof(TYPE))                             \
-)
-#define wapp_queue_pop(TYPE, QUEUE_PTR) (                                                          \
-	(TYPE *)_queue_pop(QUEUE_PTR, sizeof(TYPE))                                                      \
-)
-
-void _queue_push(GenericQueue *queue, void *item, u64 item_size);
-GenericQueue *_queue_push_alloc(const Allocator *allocator, GenericQueue *queue, void *item, u64 item_size);
-void *_queue_pop(GenericQueue *queue, u64 item_size);
-
-#ifdef WAPP_PLATFORM_CPP
-END_C_LINKAGE
-#endif // !WAPP_PLATFORM_CPP
-
-#endif // !QUEUE_H
--- a/src/base/strings/str8/str8.c
+++ b/src/base/strings/str8/str8.c
@@ -14,467 +14,479 @@
 #define STR8_BUF_ALLOC_SIZE(CAPACITY) (sizeof(Str8) + sizeof(c8) * CAPACITY)

 Str8 *wapp_str8_alloc_buf(const Allocator *allocator, u64 capacity) {
-	wapp_debug_assert(allocator != NULL, "`allocator` should not be NULL");
+  wapp_debug_assert(allocator != NULL, "`allocator` should not be NULL");

-	Str8 *str = wapp_mem_allocator_alloc(allocator, STR8_BUF_ALLOC_SIZE(capacity));
-	if (!str) {
-		goto RETURN_STR8;
-	}
+  Str8 *str = wapp_mem_allocator_alloc(allocator, STR8_BUF_ALLOC_SIZE(capacity));
+  if (!str) {
+    goto RETURN_STR8;
+  }

-	str->buf      = (u8 *)str + sizeof(Str8);
-	str->size     = 0;
-	str->capacity = capacity;
+  str->buf      = (u8 *)str + sizeof(Str8);
+  str->size     = 0;
+  str->capacity = capacity;

 RETURN_STR8:
-	return str;
+  return str;
 }

 Str8 *wapp_str8_alloc_and_fill_buf(const Allocator *allocator, u64 capacity) {
-	Str8 *out = wapp_str8_alloc_buf(allocator, capacity);
-	if (out) {
-		memset(out->buf, 0, capacity);
-		out->size = capacity;
-	}
-	return out;
+  Str8 *out = wapp_str8_alloc_buf(allocator, capacity);
+  if (out) {
+    memset(out->buf, 0, capacity);
+    out->size = capacity;
+  }
+  return out;
 }

 Str8 *wapp_str8_alloc_cstr(const Allocator *allocator, const char *str) {
-	wapp_debug_assert(allocator != NULL && str != NULL, "`allocator` and `str` should not be NULL");
+  wapp_debug_assert(allocator != NULL && str != NULL, "`allocator` and `str` should not be NULL");

-	u64 length    = strlen(str);
-	Str8 *output  = wapp_str8_alloc_buf(allocator, length * 2);
-	if (!output) {
-		goto RETURN_ALLOC_CSTR;
-	}
+  u64 length = strlen(str);
+  Str8 *output     = wapp_str8_alloc_buf(allocator, length * 2);
+  if (!output) {
+    goto RETURN_ALLOC_CSTR;
+  }

-	output->size = length;
-	memcpy(output->buf, str, length);
+  output->size = length;
+  memcpy(output->buf, str, length);

 RETURN_ALLOC_CSTR:
-	return output;
+  return output;
 }

 Str8 *wapp_str8_alloc_str8(const Allocator *allocator, Str8RO *str) {
-	wapp_debug_assert(allocator != NULL && str != NULL, "`allocator` and `str` should not be NULL");
+  wapp_debug_assert(allocator != NULL && str != NULL, "`allocator` and `str` should not be NULL");

-	Str8 *output = wapp_str8_alloc_buf(allocator, str->capacity);
-	if (!output) {
-		goto RETURN_ALLOC_STR8;
-	}
+  Str8 *output = wapp_str8_alloc_buf(allocator, str->capacity);
+  if (!output) {
+    goto RETURN_ALLOC_STR8;
+  }

-	output->size = str->size;
-	memcpy(output->buf, str->buf, str->size);
+  output->size = str->size;
+  memcpy(output->buf, str->buf, str->size);

 RETURN_ALLOC_STR8:
-	return output;
+  return output;
 }

 Str8 *wapp_str8_alloc_substr(const Allocator *allocator, Str8RO *str, u64 start, u64 end) {
-	wapp_debug_assert(allocator != NULL && str != NULL, "`allocator` and `str` should not be NULL");
+  wapp_debug_assert(allocator != NULL && str != NULL, "`allocator` and `str` should not be NULL");

-	Str8 *output = NULL;
+  Str8 *output = NULL;

-	if (start >= str->size || start >= end) {
-		goto RETURN_ALLOC_SUBSTR;
-	}
+  if (start >= str->size || start >= end) {
+    goto RETURN_ALLOC_SUBSTR;
+  }

-	if (end > str->size) {
-		end = str->size;
-	}
+  if (end > str->size) {
+    end = str->size;
+  }

-	output = wapp_str8_alloc_buf(allocator, str->capacity);
-	if (!output) {
-		goto RETURN_ALLOC_SUBSTR;
-	}
+  output = wapp_str8_alloc_buf(allocator, str->capacity);
+  if (!output) {
+    goto RETURN_ALLOC_SUBSTR;
+  }

-	output->size = end - start;
-	memcpy(output->buf, str->buf + start, output->size);
+  output->size = end - start;
+  memcpy(output->buf, str->buf + start, output->size);

 RETURN_ALLOC_SUBSTR:
-	return output;
+  return output;
 }

 void wapp_str8_dealloc_buf(const Allocator *allocator, Str8 **str) {
-	wapp_debug_assert(allocator != NULL && str != NULL && (*str) != NULL, "Either `allocator` is NULL or `str` is an invalid double pointer");
-	wapp_mem_allocator_free(allocator, (void **)str, STR8_BUF_ALLOC_SIZE((*str)->capacity));
+  wapp_debug_assert(allocator != NULL && str != NULL && (*str) != NULL, "Either `allocator` is NULL or `str` is an invalid double pointer");
+  wapp_mem_allocator_free(allocator, (void **)str, STR8_BUF_ALLOC_SIZE((*str)->capacity));
 }

 c8 wapp_str8_get(const Str8 *str, u64 index) {
-	if (index >= str->size) {
-		return '\0';
-	}
+  if (index >= str->size) {
+    return '\0';
+  }

-	return str->buf[index];
+  return str->buf[index];
 }

 void wapp_str8_set(Str8 *str, u64 index, c8 c) {
-	if (index >= str->size) {
-		return;
-	}
+  if (index >= str->size) {
+    return;
+  }

-	str->buf[index] = c;
+  str->buf[index] = c;
 }

 void wapp_str8_push_back(Str8 *str, c8 c) {
-	if (!(str->size < str->capacity)) {
-		return;
-	}
+  if (!(str->size < str->capacity)) {
+    return;
+  }

-	u64 index = (str->size)++;
-	wapp_str8_set(str, index, c);
+  u64 index = (str->size)++;
+  wapp_str8_set(str, index, c);
 }

 b8 wapp_str8_equal(Str8RO *s1, Str8RO *s2) {
-	if (s1->size != s2->size) {
-		return false;
-	}
+  if (s1->size != s2->size) {
+    return false;
+  }

-	return wapp_str8_equal_to_count(s1, s2, s1->size);
+  return wapp_str8_equal_to_count(s1, s2, s1->size);
 }

 b8 wapp_str8_equal_to_count(Str8RO* s1, Str8RO* s2, u64 count) {
-	if (!s1 || !s2) {
-		return false;
-	}
+  if (!s1 || !s2) {
+      return false;
+  }

-	return memcmp(s1->buf, s2->buf, count) == 0;
+  return memcmp(s1->buf, s2->buf, count) == 0;
 }

 Str8 wapp_str8_slice(Str8RO *str, u64 start, u64 end) {
-	if (start >= str->size || start >= end) {
-		start  = str->size;
-		end    = str->size;
-	}
+  if (start >= str->size || start >= end) {
+    start = str->size;
+    end   = str->size;
+  }

-	if (end > str->size) {
-		end = str->size;
-	}
+  if (end > str->size) {
+    end = str->size;
+  }

-	return (Str8RO){
-		.capacity = end - start,
-		.size     = end - start,
-		.buf      = str->buf + start,
-	};
+  return (Str8RO){
+    .capacity = end - start,
+    .size     = end - start,
+    .buf      = str->buf + start,
+  };
 }

 Str8 *wapp_str8_alloc_concat(const Allocator *allocator, Str8 *dst, Str8RO *src) {
-	wapp_debug_assert(allocator != NULL && dst != NULL && src != NULL, "`allocator`, `dst` and `src` should not be NULL");
+  wapp_debug_assert(allocator != NULL && dst != NULL && src != NULL, "`allocator`, `dst` and `src` should not be NULL");

-	Str8 *output  = NULL;
-	u64 remaining = dst->capacity - dst->size;
-	if (src->size <= remaining) {
-		output = dst;
-		goto SOURCE_STRING_STR8_CONCAT;
-	}
+  Str8 *output  = NULL;
+  u64 remaining = dst->capacity - dst->size;
+  if (src->size <= remaining) {
+    output = dst;
+    goto SOURCE_STRING_STR8_CONCAT;
+  }

-	u64 capacity = dst->capacity + src->size;
+  u64 capacity = dst->capacity + src->size;

-	output = wapp_str8_alloc_buf(allocator, capacity);
-	if (!output) {
-		goto RETURN_STR8_CONCAT;
-	}
+  output = wapp_str8_alloc_buf(allocator, capacity);
+  if (!output) {
+    goto RETURN_STR8_CONCAT;
+  }

-	wapp_str8_concat_capped(output, dst);
+  wapp_str8_concat_capped(output, dst);

 SOURCE_STRING_STR8_CONCAT:
-	wapp_str8_concat_capped(output, src);
+  wapp_str8_concat_capped(output, src);

 RETURN_STR8_CONCAT:
-	return output;
+  return output;
 }

 void wapp_str8_concat_capped(Str8 *dst, Str8RO *src) {
-	wapp_debug_assert(dst != NULL && src != NULL, "`dst` and `src` should not be NULL");
+  wapp_debug_assert(dst != NULL && src != NULL, "`dst` and `src` should not be NULL");

-	u64 remaining = dst->capacity - dst->size;
-	u64 to_copy   = remaining < src->size ? remaining : src->size;
+  u64 remaining = dst->capacity - dst->size;
+  u64 to_copy   = remaining < src->size ? remaining : src->size;

-	memcpy(dst->buf + dst->size, src->buf, to_copy);
-	dst->size += to_copy;
+  memcpy(dst->buf + dst->size, src->buf, to_copy);
+  dst->size += to_copy;
 }

 void wapp_str8_copy_cstr_capped(Str8 *dst, const char *src) {
-	wapp_debug_assert(dst != NULL && src != NULL, "`dst` and `src` should not be NULL");
+  wapp_debug_assert(dst != NULL && src != NULL, "`dst` and `src` should not be NULL");

-	u64 length  = strlen(src);
-	u64 to_copy = length <= dst->capacity ? length : dst->capacity;
+  u64 length  = strlen(src);
+  u64 to_copy = length <= dst->capacity ? length : dst->capacity;

-	memset(dst->buf, 0, dst->size);
-	memcpy(dst->buf, src, to_copy);
-	dst->size = to_copy;
+  memset(dst->buf, 0, dst->size);
+  memcpy(dst->buf, src, to_copy);
+  dst->size = to_copy;
 }

 void wapp_str8_copy_str8_capped(Str8 *dst, Str8RO *src) {
-	wapp_debug_assert(dst != NULL && src != NULL, "`dst` and `src` should not be NULL");
+  wapp_debug_assert(dst != NULL && src != NULL, "`dst` and `src` should not be NULL");

-	u64 to_copy = src->size <= dst->capacity ? src->size : dst->capacity;
+  u64 to_copy = src->size <= dst->capacity ? src->size : dst->capacity;

-	memset(dst->buf, 0, dst->size);
-	memcpy(dst->buf, src->buf, to_copy);
-	dst->size = to_copy;
+  memset(dst->buf, 0, dst->size);
+  memcpy(dst->buf, src->buf, to_copy);
+  dst->size = to_copy;
 }

 void wapp_str8_copy_to_cstr(char *dst, Str8RO *src, u64 dst_capacity) {
-	wapp_debug_assert(dst != NULL && src != NULL, "`dst` and `src` should not be NULL");
+  wapp_debug_assert(dst != NULL && src != NULL, "`dst` and `src` should not be NULL");

-	u64 to_copy = src->size < dst_capacity ? src->size : dst_capacity - 1;
+  u64 to_copy = src->size < dst_capacity ? src->size : dst_capacity - 1;

-	memset(dst, 0, dst_capacity);
-	memcpy(dst, src->buf, to_copy);
+  memset(dst, 0, dst_capacity);
+  memcpy(dst, src->buf, to_copy);
 }

 void wapp_str8_format(Str8 *dst, const char *format, ...) {
-	wapp_debug_assert(dst != NULL && format != NULL, "`dst` and `format` should not be NULL");
+  wapp_debug_assert(dst != NULL && format != NULL, "`dst` and `format` should not be NULL");

-	va_list args1;
-	va_list args2;
+  va_list args1;
+  va_list args2;

-	va_start(args1, format);
-	va_copy(args2, args1);
+  va_start(args1, format);
+  va_copy(args2, args1);

-	u64 total_size = vsnprintf(NULL, 0, format, args1);
-	dst->size      = total_size <= dst->capacity ? total_size : dst->capacity;
+  u64 total_size = vsnprintf(NULL, 0, format, args1);
+  dst->size      = total_size <= dst->capacity ? total_size : dst->capacity;

-	vsnprintf((char *)(dst->buf), dst->capacity, format, args2);
+  vsnprintf((char *)(dst->buf), dst->capacity, format, args2);

-	va_end(args1);
-	va_end(args2);
+  va_end(args1);
+  va_end(args2);
 }

 void wapp_str8_to_lower(Str8 *dst, Str8RO *src) {
-	wapp_debug_assert(src != NULL && dst != NULL, "`dst` and `src` should not be NULL");
-	wapp_debug_assert(dst->capacity >= src->capacity, "`dst` does not have enough capacity");
+  wapp_debug_assert(src != NULL && dst != NULL, "`dst` and `src` should not be NULL");
+  wapp_debug_assert(dst->capacity >= src->capacity, "`dst` does not have enough capacity");

-	dst->size = src->size;
+  dst->size = src->size;

-	// NOTE (Abdelrahman): Uses a while loop instead of a for loop to get rid of
-	// MSVC Spectre mitigation warnings
-	u64 index  = 0;
-	b8 running = true;
-	while (running) {
-		wapp_str8_set(dst, index, (u8)tolower(wapp_str8_get(src, index)));
-		++index;
-		running = index < src->size;
-	}
+  // NOTE (Abdelrahman): Uses a while loop instead of a for loop to get rid of
+  // MSVC Spectre mitigation warnings
+  u64 index  = 0;
+  b8 running = true;
+  while (running) {
+    wapp_str8_set(dst, index, (u8)tolower(wapp_str8_get(src, index)));
+    ++index;
+    running = index < src->size;
+  }
 }

 void wapp_str8_to_upper(Str8 *dst, Str8RO *src) {
-	wapp_debug_assert(src != NULL && dst != NULL, "`dst` and `src` should not be NULL");
-	wapp_debug_assert(dst->capacity >= src->capacity, "`dst` does not have enough capacity");
+  wapp_debug_assert(src != NULL && dst != NULL, "`dst` and `src` should not be NULL");
+  wapp_debug_assert(dst->capacity >= src->capacity, "`dst` does not have enough capacity");

-	dst->size = src->size;
+  dst->size = src->size;

-	// NOTE (Abdelrahman): Uses a while loop instead of a for loop to get rid of
-	// MSVC Spectre mitigation warnings
-	u64 index  = 0;
-	b8 running = true;
-	while (running) {
-		wapp_str8_set(dst, index, (u8)toupper(wapp_str8_get(src, index)));
-		++index;
-		running = index < src->size;
-	}
+  // NOTE (Abdelrahman): Uses a while loop instead of a for loop to get rid of
+  // MSVC Spectre mitigation warnings
+  u64 index  = 0;
+  b8 running = true;
+  while (running) {
+    wapp_str8_set(dst, index, (u8)toupper(wapp_str8_get(src, index)));
+    ++index;
+    running = index < src->size;
+  }
 }

-void wapp_str8_from_bytes(Str8 *dst, const U8Array src) {
-	wapp_debug_assert(src != NULL && dst != NULL, "`dst` and `src` should not be NULL");
+void wapp_str8_from_bytes(Str8 *dst, const U8Array *src) {
+  wapp_debug_assert(src != NULL && dst != NULL, "`dst` and `src` should not be NULL");

-	u64 size = wapp_array_count(src) * wapp_array_item_size(src);
+  u64 size = src->count * src->item_size;

-	wapp_debug_assert(dst->capacity >= size, "`dst` does not have enough capacity");
+  wapp_debug_assert(dst->capacity >= size, "`dst` does not have enough capacity");

-	dst->size = size;
-	memcpy(dst->buf, src, size);
+  dst->size = size;
+  memcpy(dst->buf, src->items, size);
 }

 i64 wapp_str8_find(Str8RO *str, Str8RO substr) {
-	if (!str || substr.size > str->size) {
-		return -1;
-	}
+  if (!str || substr.size > str->size) {
+    return -1;
+  }

-	// NOTE (Abdelrahman): Uses a while loop instead of a for loop to get rid of
-	// MSVC Spectre mitigation warnings
-	u64 char_index  = 0;
-	b8 running      = char_index < str->size;
-	while (running) {
-		const c8 *sub = str->buf + char_index;
-		if (memcmp(sub, substr.buf, substr.size) == 0) {
-			return char_index;
-		}
+  // NOTE (Abdelrahman): Uses a while loop instead of a for loop to get rid of
+  // MSVC Spectre mitigation warnings
+  u64 char_index = 0;
+  b8 running    = char_index < str->size;
+  while (running) {
+    const c8 *sub = str->buf + char_index;
+    if (memcmp(sub, substr.buf, substr.size) == 0) {
+      return char_index;
+    }

-		++char_index;
-		running = char_index < str->size;
-	}
+    ++char_index;
+    running = char_index < str->size;
+  }

-	return -1;
+  return -1;
 }

 i64 wapp_str8_rfind(Str8RO *str, Str8RO substr) {
-	if (!str || substr.size > str->size) {
-		return -1;
-	}
+  if (!str || substr.size > str->size) {
+    return -1;
+  }

-	// NOTE (Abdelrahman): Uses a while loop instead of a for loop to get rid of
-	// MSVC Spectre mitigation warnings
-	i64 char_index = str->size - substr.size;
-	b8 running     = char_index >= 0;
-	while (running) {
-		const c8 *sub = str->buf + char_index;
-		if (memcmp(sub, substr.buf, substr.size) == 0) {
-			return char_index;
-		}
+  // NOTE (Abdelrahman): Uses a while loop instead of a for loop to get rid of
+  // MSVC Spectre mitigation warnings
+  i64 char_index = str->size - substr.size;
+  b8 running    = char_index >= 0;
+  while (running) {
+    const c8 *sub = str->buf + char_index;
+    if (memcmp(sub, substr.buf, substr.size) == 0) {
+      return char_index;
+    }

-		--char_index;
-		running = char_index >= 0;
-	}
+    --char_index;
+    running = char_index >= 0;
+  }

-	return -1;
+  return -1;
 }

 Str8List *wapp_str8_split_with_max(const Allocator *allocator, Str8RO *str, Str8RO *delimiter, i64 max_splits) {
-	wapp_debug_assert(allocator != NULL && str != NULL && delimiter != NULL, "`allocator`, `str` and `delimiter` should not be NULL");
+  wapp_debug_assert(allocator != NULL && str != NULL && delimiter != NULL, "`allocator`, `str` and `delimiter` should not be NULL");

-	Str8List *output = wapp_dbl_list_alloc(Str8, allocator);
+  Str8List *output = wapp_dbl_list_alloc(Str8, Str8List, allocator);

-	if (delimiter->size > str->size) {
-		Str8 *full = wapp_str8_alloc_str8(allocator, str);
-		if (full) {
-			wapp_dbl_list_push_back_alloc(Str8, allocator, output, full);
-		}
+  if (delimiter->size > str->size) {
+    Str8 *full     = wapp_str8_alloc_str8(allocator, str);
+    Str8Node *node = wapp_dbl_list_node_alloc(Str8, Str8Node, allocator);
+    if (node) {
+      node->item = full;
+      wapp_dbl_list_push_back(Str8, output, node);
+    }

-		goto RETURN_STR8_SPLIT;
-	}
+    goto RETURN_STR8_SPLIT;
+  }

-	i64 start  = 0;
-	i64 end    = 0;
-	i64 splits = 0;
-	Str8 *rest = wapp_str8_alloc_str8(allocator, str);
-	Str8 *before_str;
+  i64 start   = 0;
+  i64 end     = 0;
+  i64 splits  = 0;
+  Str8 *rest = wapp_str8_alloc_str8(allocator, str);
+  Str8 *before_str;

-	while ((end = wapp_str8_find(rest, *delimiter)) != -1) {
-		if (max_splits > 0 && splits >= max_splits) {
-			break;
-		}
+  while ((end = wapp_str8_find(rest, *delimiter)) != -1) {
+    if (max_splits > 0 && splits >= max_splits) {
+      break;
+    }

-		before_str = wapp_str8_alloc_substr(allocator, str, start, start + end);
-		if (before_str) {
-			wapp_dbl_list_push_back_alloc(Str8, allocator, output, before_str);
-		}
+    before_str     = wapp_str8_alloc_substr(allocator, str, start, start + end);
+    Str8Node *node = wapp_dbl_list_node_alloc(Str8, Str8Node, allocator);
+    if (node && before_str) {
+      node->item = before_str;
+      wapp_dbl_list_push_back(Str8, output, node);
+    }

-		wapp_mem_allocator_free(allocator, (void **)&rest, sizeof(Str8));
-		rest   = wapp_str8_alloc_substr(allocator, str, start + end + delimiter->size, str->size);
-		start += end + delimiter->size;
+    wapp_mem_allocator_free(allocator, (void **)&rest, sizeof(Str8));
+    rest   = wapp_str8_alloc_substr(allocator, str, start + end + delimiter->size, str->size);
+    start += end + delimiter->size;

-		++splits;
-	}
+    ++splits;
+  }

-	// Ensure the last part of the string after the delimiter is added to the list
-	rest = wapp_str8_alloc_substr(allocator, str, start, str->size);
-	if (rest) {
-		wapp_dbl_list_push_back_alloc(Str8, allocator, output, rest);
-	}
+  // Ensure the last part of the string after the delimiter is added to the list
+  rest           = wapp_str8_alloc_substr(allocator, str, start, str->size);
+  Str8Node *node = wapp_dbl_list_node_alloc(Str8, Str8Node, allocator);
+  if (node && rest) {
+    node->item = rest;
+    wapp_dbl_list_push_back(Str8, output, node);
+  }

 RETURN_STR8_SPLIT:
-	return output;
+  return output;
 }

 Str8List *wapp_str8_rsplit_with_max(const Allocator *allocator, Str8RO *str, Str8RO *delimiter, i64 max_splits) {
-	wapp_debug_assert(allocator != NULL && str != NULL && delimiter != NULL, "`allocator`, `str` and `delimiter` should not be NULL");
+  wapp_debug_assert(allocator != NULL && str != NULL && delimiter != NULL, "`allocator`, `str` and `delimiter` should not be NULL");

-	Str8List *output = wapp_dbl_list_alloc(Str8, allocator);
+  Str8List *output = wapp_dbl_list_alloc(Str8, Str8List, allocator);

-	if (delimiter->size > str->size) {
-		Str8 *full = wapp_str8_alloc_str8(allocator, str);
-		if (full) {
-			wapp_dbl_list_push_back_alloc(Str8, allocator, output, full);
-		}
+  if (delimiter->size > str->size) {
+    Str8 *full     = wapp_str8_alloc_str8(allocator, str);
+    Str8Node *node = wapp_dbl_list_node_alloc(Str8, Str8Node, allocator);
+    if (node && full) {
+      node->item = full;
+      wapp_dbl_list_push_back(Str8, output, node);
+    }

-		goto RETURN_STR8_SPLIT;
-	}
+    goto RETURN_STR8_SPLIT;
+  }

-	i64 end    = 0;
-	i64 splits = 0;
-	Str8 *rest = wapp_str8_alloc_str8(allocator, str);
-	Str8 *after_str;
+  i64 end     = 0;
+  i64 splits  = 0;
+  Str8 *rest = wapp_str8_alloc_str8(allocator, str);
+  Str8 *after_str;

-	while ((end = wapp_str8_rfind(rest, *delimiter)) != -1) {
-		if (max_splits > 0 && splits >= max_splits) {
-			break;
-		}
+  while ((end = wapp_str8_rfind(rest, *delimiter)) != -1) {
+    if (max_splits > 0 && splits >= max_splits) {
+      break;
+    }

-		after_str = wapp_str8_alloc_substr(allocator, rest, end + delimiter->size, str->size);
-		if (after_str) {
-			wapp_dbl_list_push_front_alloc(Str8, allocator, output, after_str);
-		}
+    after_str     = wapp_str8_alloc_substr(allocator, rest, end + delimiter->size, str->size);
+    Str8Node *node = wapp_dbl_list_node_alloc(Str8, Str8Node, allocator);
+    if (node) {
+      node->item = after_str;
+      wapp_dbl_list_push_front(Str8, output, node);
+    }

-		wapp_mem_allocator_free(allocator, (void **)&rest, sizeof(Str8));
-		rest = wapp_str8_alloc_substr(allocator, rest, 0, end);
+    wapp_mem_allocator_free(allocator, (void **)&rest, sizeof(Str8));
+    rest   = wapp_str8_alloc_substr(allocator, rest, 0, end);

-		++splits;
-	}
+    ++splits;
+  }

-	rest = wapp_str8_alloc_substr(allocator, str, 0, rest->size);
-	if (rest) {
-		wapp_dbl_list_push_front_alloc(Str8, allocator, output, rest);
-	}
+  rest           = wapp_str8_alloc_substr(allocator, str, 0, rest->size);
+  Str8Node *node = wapp_dbl_list_node_alloc(Str8, Str8Node, allocator);
+  if (node && rest) {
+    node->item = rest;
+    wapp_dbl_list_push_front(Str8, output, node);
+  }

 RETURN_STR8_SPLIT:
-	return output;
+  return output;
 }

 Str8 *wapp_str8_join(const Allocator *allocator, const Str8List *list, Str8RO *delimiter) {
-	wapp_debug_assert(allocator != NULL && list != NULL && delimiter != NULL, "`allocator`, `list` and `delimiter` should not be NULL");
+  wapp_debug_assert(allocator != NULL && list != NULL && delimiter != NULL, "`allocator`, `list` and `delimiter` should not be NULL");

-	u64 capacity = wapp_str8_list_total_size(list) + (delimiter->size * (list->node_count - 1));
-	Str8 *output = wapp_str8_alloc_buf(allocator, capacity * 2);
+  u64 capacity = wapp_str8_list_total_size(list) + (delimiter->size * (list->node_count - 1));
+  Str8 *output = wapp_str8_alloc_buf(allocator, capacity * 2);

-	// NOTE (Abdelrahman): Uses a while loop instead of a for loop to get rid of
-	// MSVC Spectre mitigation warnings
-	Str8 *node;
-	u64 node_index = 0;
-	b8 running     = node_index < list->node_count;
-	while (running) {
-		node = wapp_dbl_list_get(Str8, list, node_index);
-		if (!node) {
-			break;
-		}
+  // NOTE (Abdelrahman): Uses a while loop instead of a for loop to get rid of
+  // MSVC Spectre mitigation warnings
+  Str8Node *node;
+  u64 node_index = 0;
+  b8 running    = node_index < list->node_count;
+  while (running) {
+    node = wapp_dbl_list_get(Str8, Str8Node, list, node_index);
+    if (!node) {
+        break;
+    }

-		wapp_str8_concat_capped(output, node);
+    wapp_str8_concat_capped(output, node->item);

-		// NOTE (Abdelrahman): Comparison extracted to variable to silence
-		// MSVC Spectre mitigation warnings
-		b8 not_last = node_index + 1 < list->node_count;
-		if (not_last) {
-			wapp_str8_concat_capped(output, delimiter);
-		}
+    // NOTE (Abdelrahman): Comparison extracted to variable to silence
+    // MSVC Spectre mitigation warnings
+    b8 not_last = node_index + 1 < list->node_count;
+    if (not_last) {
+      wapp_str8_concat_capped(output, delimiter);
+    }

-		++node_index;
-		running = node_index < list->node_count;
-	}
+    ++node_index;
+    running = node_index < list->node_count;
+  }

-	return output;
+  return output;
 }

 u64 wapp_str8_list_total_size(const Str8List *list) {
-	if (!list) {
-		return 0;
-	}
+  if (!list) {
+    return 0;
+  }

-	// NOTE (Abdelrahman): Uses a while loop instead of a for loop to get rid of
-	// MSVC Spectre mitigation warnings
-	Str8 *node;
-	u64 node_index = 0;
-	u64 output     = 0;
-	b8 running     = node_index < list->node_count;
-	while (running) {
-		node = wapp_dbl_list_get(Str8, list, node_index);
-		if (!node) {
-				break;
-		}
+  // NOTE (Abdelrahman): Uses a while loop instead of a for loop to get rid of
+  // MSVC Spectre mitigation warnings
+  Str8Node* node;
+  u64 node_index = 0;
+  u64 output     = 0;
+  b8 running    = node_index < list->node_count;
+  while (running) {
+      node = wapp_dbl_list_get(Str8, Str8Node, list, node_index);
+      if (!node) {
+          break;
+      }

-		output += node->size;
-		++node_index;
-		running = node_index < list->node_count;
-	}
+      output += node->item->size;
+      ++node_index;
+      running = node_index < list->node_count;
+  }

-	return output;
+  return output;
 }
--- a/src/base/strings/str8/str8.h
+++ b/src/base/strings/str8/str8.h
@@ -15,11 +15,11 @@
 BEGIN_C_LINKAGE
 #endif // !WAPP_PLATFORM_CPP

-typedef struct Str8 Str8;
-struct Str8 {
-	u64 capacity;
-	u64 size;
-	c8 *buf;
+typedef struct str8 Str8;
+struct str8 {
+  u64 capacity;
+  u64 size;
+  c8 *buf;
 };

 typedef const Str8 Str8RO;
@@ -37,16 +37,16 @@ typedef const Str8 Str8RO;
 #ifdef WAPP_PLATFORM_CPP
 // Uses a lambda to achieve the same behaviour achieved by the C macro
 #define wapp_str8_buf(CAPACITY) ([&](){ \
-	wapp_persist c8 buf[CAPACITY] = {};   \
-	memset(buf, 0, CAPACITY);             \
-	return Str8{CAPACITY, 0, buf};        \
+  wapp_persist c8 buf[CAPACITY] = {};   \
+  memset(buf, 0, CAPACITY);             \
+  return Str8{CAPACITY, 0, buf};        \
 }())

 // Uses a lambda to achieve the same behaviour achieved by the C macro
 #define wapp_str8_lit(STRING) ([&]() {                            \
-	wapp_persist c8 buf[sizeof(STRING) * 2] = {};                   \
-	memcpy(buf, STRING, sizeof(STRING));                            \
-	return Str8{(sizeof(STRING) - 1) * 2, sizeof(STRING) - 1, buf}; \
+  wapp_persist c8 buf[sizeof(STRING) * 2] = {};                   \
+  memcpy(buf, STRING, sizeof(STRING));                            \
+  return Str8{(sizeof(STRING) - 1) * 2, sizeof(STRING) - 1, buf}; \
 }())

 #define wapp_str8_lit_ro(STRING) Str8RO{sizeof(STRING) - 1, sizeof(STRING) - 1, (c8 *)STRING}
@@ -56,20 +56,18 @@ typedef const Str8 Str8RO;

 // Utilises the fact that memcpy returns pointer to dest buffer and that getting
 // address of compound literals is valid in C to create a string on the stack
-#define wapp_str8_lit(STRING) ((Str8){.capacity  = (sizeof(STRING) - 1) * 2,               \
-                                      .size      = sizeof(STRING) - 1,                     \
-                                      .buf       = memcpy(&((c8 [sizeof(STRING) * 2]){0}), \
-                                                          STRING,                          \
-                                                          sizeof(STRING))})
-#define wapp_str8_lit_ro(STRING) ((Str8RO){.capacity  = sizeof(STRING) - 1,  \
-                                           .size      = sizeof(STRING) - 1,  \
-                                           .buf       = (c8 *)STRING})
+#define wapp_str8_lit(STRING) ((Str8){.capacity = (sizeof(STRING) - 1) * 2, \
+                                      .size     = sizeof(STRING) - 1,       \
+                                      .buf      = memcpy(&((c8 [sizeof(STRING) * 2]){0}), STRING, sizeof(STRING))})
+#define wapp_str8_lit_ro(STRING) ((Str8RO){.capacity = sizeof(STRING) - 1, \
+                                           .size     = sizeof(STRING) - 1, \
+                                           .buf      = (c8 *)STRING})
 // To be used only when initialising a static storage variable in compilers that don't support
 // initialisers with the syntax of wapp_str8_lit_ro (e.g. gcc). Should only be used when necessary
 // and only be assigned to a Str8RO variable to avoid any attempt at modifying the string
-#define wapp_str8_lit_ro_initialiser_list(STRING) {.capacity  = sizeof(STRING) - 1,  \
-                                                   .size      = sizeof(STRING) - 1,  \
-                                                   .buf       = (c8 *)STRING}
+#define wapp_str8_lit_ro_initialiser_list(STRING) {.capacity = sizeof(STRING) - 1, \
+                                                   .size     = sizeof(STRING) - 1, \
+                                                   .buf      = (c8 *)STRING}
 #endif // !WAPP_PLATFORM_CPP

 /**
@@ -91,8 +89,8 @@ void wapp_str8_dealloc_buf(const Allocator *allocator, Str8 **str);
 c8   wapp_str8_get(Str8RO *str, u64 index);
 void wapp_str8_set(Str8 *str, u64 index, c8 c);
 void wapp_str8_push_back(Str8 *str, c8 c);
-b8   wapp_str8_equal(Str8RO *s1, Str8RO *s2);
-b8   wapp_str8_equal_to_count(Str8RO* s1, Str8RO* s2, u64 count);
+b8  wapp_str8_equal(Str8RO *s1, Str8RO *s2);
+b8  wapp_str8_equal_to_count(Str8RO* s1, Str8RO* s2, u64 count);
 Str8 wapp_str8_slice(Str8RO *str, u64 start, u64 end);
 void wapp_str8_concat_capped(Str8 *dst, Str8RO *src);
 void wapp_str8_copy_cstr_capped(Str8 *dst, const char *src);
@@ -101,7 +99,7 @@ void wapp_str8_copy_to_cstr(char *dst, Str8RO *src, u64 dst_capacity);
 void wapp_str8_format(Str8 *dst, const char *format, ...);
 void wapp_str8_to_lower(Str8 *dst, Str8RO *src);
 void wapp_str8_to_upper(Str8 *dst, Str8RO *src);
-void wapp_str8_from_bytes(Str8 *dst, const U8Array src);
+void wapp_str8_from_bytes(Str8 *dst, const U8Array *src);

 /**
 * Str8 find functions
@@ -125,6 +123,27 @@ u64 wapp_str8_list_total_size(const Str8List *list);

 #ifdef WAPP_PLATFORM_CPP
 END_C_LINKAGE
+
+#include <type_traits>
+
+template <typename T>
+constexpr bool is_lvalue(T&&) {
+  return std::is_lvalue_reference<T>{};
+}
+
+#define wapp_str8_node_from_cstr(STRING) wapp_dbl_list_node(Str8, Str8Node, [&]() { \
+  wapp_persist Str8 str = wapp_str8_lit(STRING);                                    \
+  return &str;                                                                      \
+}())
+#define wapp_str8_node_from_str8(STRING) wapp_dbl_list_node(Str8, Str8Node, [&]() { \
+  if (is_lvalue(STRING)) { return &STRING; }                                        \
+                                                                                    \
+  wapp_persist Str8 str = STRING;                                                   \
+  return &str;                                                                      \
+}())
+#else
+#define wapp_str8_node_from_cstr(STRING) wapp_dbl_list_node(Str8, Str8Node, &wapp_str8_lit(STRING))
+#define wapp_str8_node_from_str8(STRING) wapp_dbl_list_node(Str8, Str8Node, &(STRING))
 #endif // !WAPP_PLATFORM_CPP

 #endif // !STR8_H
--- a/src/base/wapp_base.c
+++ b/src/base/wapp_base.c
@@ -6,7 +6,6 @@
 #include "wapp_base.h"
 #include "array/array.c"
 #include "dbl_list/dbl_list.c"
-#include "queue/queue.c"
 #include "mem/allocator/mem_allocator.c"
 #include "mem/utils/mem_utils.c"
 #include "strings/str8/str8.c"
--- a/src/base/wapp_base.h
+++ b/src/base/wapp_base.h
@@ -3,9 +3,8 @@
 #ifndef WAPP_BASE_H
 #define WAPP_BASE_H

-#include "array/array.h"
 #include "dbl_list/dbl_list.h"
-#include "queue/queue.h"
+#include "array/array.h"
 #include "mem/allocator/mem_allocator.h"
 #include "mem/utils/mem_utils.h"
 #include "strings/str8/str8.h"
--- a/src/common/aliases/aliases.h
+++ b/src/common/aliases/aliases.h
@@ -7,28 +7,28 @@
 #include <stdint.h>

 #if defined(WAPP_PLATFORM_C) && WAPP_PLATFORM_C_VERSION >= WAPP_PLATFORM_C11_VERSION && !defined(WAPP_PLATFORM_APPLE)
-	#include <uchar.h>
+  #include <uchar.h>

-	#if WAPP_PLATFORM_C_VERSION >= WAPP_PLATFORM_C23_VERSION
-		typedef char8_t c8;
-	#else
-		typedef uint8_t c8;
-	#endif // !WAPP_PLATFORM_C23_VERSION
+  #if WAPP_PLATFORM_C_VERSION >= WAPP_PLATFORM_C23_VERSION
+    #define c8 char8_t
+  #else
+    #define c8 uint8_t
+  #endif // !WAPP_PLATFORM_C23_VERSION

-	typedef char16_t c16;
-	typedef char32_t c32;
+  #define c16 char16_t
+  #define c32 char32_t
 #else
-	typedef uint8_t c8;
-	typedef uint16_t c16;
-	typedef uint32_t c32;
+  #define c8 uint8_t
+  #define c16 uint16_t
+  #define c32 uint32_t
 #endif // !WAPP_PLATFORM_C

-typedef uint8_t u8;
-typedef uint16_t u16;
-typedef uint32_t u32;
-typedef uint64_t u64;
+#define u8 uint8_t
+#define u16 uint16_t
+#define u32 uint32_t
+#define u64 uint64_t

-typedef uint8_t b8;
+#define b8 uint8_t

 #ifndef WAPP_PLATFORM_CPP

@@ -42,17 +42,17 @@ typedef uint8_t b8;

 #endif // !WAPP_PLATFORM_CPP

-typedef int8_t i8;
-typedef int16_t i16;
-typedef int32_t i32;
-typedef int64_t i64;
+#define i8 int8_t
+#define i16 int16_t
+#define i32 int32_t
+#define i64 int64_t

-typedef float f32;
-typedef double f64;
-typedef long double f128;
+#define f32 float
+#define f64 double
+#define f128 long double

-typedef uintptr_t uptr;
-typedef intptr_t iptr;
+#define uptr uintptr_t
+#define iptr intptr_t

 #define wapp_extern extern
 #define wapp_intern static
--- a/src/common/assert/assert.h
+++ b/src/common/assert/assert.h
@@ -16,42 +16,42 @@ BEGIN_C_LINKAGE
 #define wapp_static_assert(EXPR, MSG) extern char ASSERTION_FAILED[EXPR ? 1 : -1]

 #ifndef WAPP_NO_RUNTIME_ASSERT
-	#define wapp_runtime_assert(EXPR, MSG) __wapp_runtime_assert(EXPR, MSG)
+  #define wapp_runtime_assert(EXPR, MSG) __wapp_runtime_assert(EXPR, MSG)
 #else
-	#define wapp_runtime_assert(EXPR, MSG)
+  #define wapp_runtime_assert(EXPR, MSG)
 #endif

 #ifdef WAPP_DEBUG_ASSERT
-	#define wapp_debug_assert(EXPR, MSG) wapp_runtime_assert(EXPR, MSG)
+  #define wapp_debug_assert(EXPR, MSG) wapp_runtime_assert(EXPR, MSG)
 #else
-	#define wapp_debug_assert(EXPR, MSG)
+  #define wapp_debug_assert(EXPR, MSG)
 #endif

 #ifdef WAPP_PLATFORM_WINDOWS
 #define __wapp_runtime_assert(EXPR, MSG) do {                                       \
-	__pragma(warning(push))                                                           \
-	__pragma(warning(disable:4127))                                                   \
-	if (!(EXPR)) {                                                                    \
-	__pragma(warning(pop))                                                            \
-		__runtime_assert_failed(EXPR, MSG);                                             \
-	}                                                                                 \
+  __pragma(warning(push))                                                           \
+  __pragma(warning(disable:4127))                                                   \
+  if (!(EXPR)) {                                                                    \
+  __pragma(warning(pop))                                                            \
+    __runtime_assert_failed(EXPR, MSG);                                             \
+  }                                                                                 \
 } while(false)
 #else
 #define __wapp_runtime_assert(EXPR, MSG) do {                                       \
-	if (!(EXPR)) {                                                                    \
-		__runtime_assert_failed(EXPR, MSG);                                             \
-	}                                                                                 \
+  if (!(EXPR)) {                                                                    \
+    __runtime_assert_failed(EXPR, MSG);                                             \
+  }                                                                                 \
 } while(false)
 #endif // !WAPP_PLATFORM_WINDOWS

 #define __runtime_assert_failed(EXPR, MSG) do {                                     \
-	fprintf(                                                                          \
-		stderr,                                                                         \
-		"%s:%d (In function `%s`): Assertion failed (%" PRIu32 ")\nDiagnostic: %s\n\n", \
-		__FILE__, __LINE__, __func__,                                                   \
-		EXPR, MSG                                                                       \
-	);                                                                                \
-	abort();                                                                          \
+  fprintf(                                                                          \
+    stderr,                                                                         \
+    "%s:%d (In function `%s`): Assertion failed (%" PRIu32 ")\nDiagnostic: %s\n\n", \
+    __FILE__, __LINE__, __func__,                                                   \
+    EXPR, MSG                                                                       \
+  );                                                                                \
+  abort();                                                                          \
 } while(false)

 #ifdef WAPP_PLATFORM_CPP
--- a/src/common/misc/misc_utils.h
+++ b/src/common/misc/misc_utils.h
@@ -9,47 +9,35 @@
 BEGIN_C_LINKAGE
 #endif // !WAPP_PLATFORM_CPP

-#define KiB(SIZE) (((u64)SIZE) << 10)
-#define MiB(SIZE) (((u64)SIZE) << 20)
-#define GiB(SIZE) (((u64)SIZE) << 30)
-#define TiB(SIZE) (((u64)SIZE) << 40)
-#define PiB(SIZE) (((u64)SIZE) << 50)
-#define EiB(SIZE) (((u64)SIZE) << 60)
+#define KB(SIZE) (SIZE * 1024ull)
+#define MB(SIZE) (KB(SIZE) * 1024)
+#define GB(SIZE) (MB(SIZE) * 1024)
+#define TB(SIZE) (GB(SIZE) * 1024)

-#define KB(SIZE) (((u64)SIZE) * 1000llu)
-#define MB(SIZE) (KB(SIZE)    * 1000llu)
-#define GB(SIZE) (MB(SIZE)    * 1000llu)
-#define TB(SIZE) (GB(SIZE)    * 1000llu)
-#define PB(SIZE) (TB(SIZE)    * 1000llu)
-#define EB(SIZE) (PB(SIZE)    * 1000llu)
-
-#define wapp_misc_utils_reserve_padding(SIZE) u8 reserved_padding[sizeof(void *) - ((SIZE) % sizeof(void *))]
+#define wapp_misc_utils_padding_size(SIZE) u8 reserved_padding[sizeof(void *) - ((SIZE) % sizeof(void *))]

 #define U64_RSHIFT_OR_1(X)  (((u64)X) | (((u64)X) >> 1))
 #define U64_RSHIFT_OR_2(X)  (((u64)X) | (((u64)X) >> 2))
 #define U64_RSHIFT_OR_4(X)  (((u64)X) | (((u64)X) >> 4))
 #define U64_RSHIFT_OR_8(X)  (((u64)X) | (((u64)X) >> 8))
-#define U64_RSHIFT_OR_16(X)  (((u64)X) | (((u64)X) >> 16))
-#define U64_RSHIFT_OR_32(X)  (((u64)X) | (((u64)X) >> 32))
+#define U64_RSHIFT_OR_16(X) (((u64)X) | (((u64)X) >> 16))
+#define U64_RSHIFT_OR_32(X) (((u64)X) | (((u64)X) >> 32))
 #define wapp_misc_utils_u64_round_up_pow2(X) ( \
-	(                                            \
-		U64_RSHIFT_OR_32(                          \
-			U64_RSHIFT_OR_16(                        \
-				U64_RSHIFT_OR_8(                       \
-					U64_RSHIFT_OR_4(                     \
-						U64_RSHIFT_OR_2(                   \
-							U64_RSHIFT_OR_1(X - 1)           \
-						)                                  \
-					)                                    \
-				)                                      \
-			)                                        \
-		)                                          \
-	) + 1                                        \
+  ( \
+    U64_RSHIFT_OR_32( \
+      U64_RSHIFT_OR_16( \
+        U64_RSHIFT_OR_8( \
+          U64_RSHIFT_OR_4( \
+            U64_RSHIFT_OR_2( \
+              U64_RSHIFT_OR_1(X - 1) \
+            ) \
+          ) \
+        ) \
+      ) \
+    ) \
+  ) + 1 \
 )

-#define wapp_is_power_of_two(NUM) ((NUM & (NUM - 1)) == 0)
-#define wapp_pointer_offset(PTR, OFFSET) ((void *)((uptr)(PTR) + (OFFSET)))
-
 #ifdef WAPP_PLATFORM_CPP
 END_C_LINKAGE

--- a/src/common/platform/platform.h
+++ b/src/common/platform/platform.h
@@ -4,111 +4,111 @@
 #define PLATFORM_H

 #if defined(__ANDROID__)
-	#define WAPP_PLATFORM_ANDROID
-	#define WAPP_PLATFORM_POSIX
+  #define WAPP_PLATFORM_ANDROID
+  #define WAPP_PLATFORM_POSIX
 #elif defined(__FreeBSD__)
-	#define WAPP_PLATFORM_FREE_BSD
-	#define WAPP_PLATFORM_BSD
-	#define WAPP_PLATFORM_POSIX
+  #define WAPP_PLATFORM_FREE_BSD
+  #define WAPP_PLATFORM_BSD
+  #define WAPP_PLATFORM_POSIX
 #elif defined(__NetBSD__)
-	#define WAPP_PLATFORM_NET_BSD
-	#define WAPP_PLATFORM_BSD
-	#define WAPP_PLATFORM_POSIX
+  #define WAPP_PLATFORM_NET_BSD
+  #define WAPP_PLATFORM_BSD
+  #define WAPP_PLATFORM_POSIX
 #elif defined(__OpenBSD__)
-	#define WAPP_PLATFORM_OPEN_BSD
-	#define WAPP_PLATFORM_BSD
-	#define WAPP_PLATFORM_POSIX
+  #define WAPP_PLATFORM_OPEN_BSD
+  #define WAPP_PLATFORM_BSD
+  #define WAPP_PLATFORM_POSIX
 #elif defined(__DragonFly__)
-	#define WAPP_PLATFORM_DRAGON_FLY
-	#define WAPP_PLATFORM_BSD
-	#define WAPP_PLATFORM_POSIX
+  #define WAPP_PLATFORM_DRAGON_FLY
+  #define WAPP_PLATFORM_BSD
+  #define WAPP_PLATFORM_POSIX
 #elif defined(__bsdi__)
-	#define WAPP_PLATFORM_BSD
-	#define WAPP_PLATFORM_POSIX
+  #define WAPP_PLATFORM_BSD
+  #define WAPP_PLATFORM_POSIX
 #elif defined(__linux__) || defined(linux) || defined(__linux) || defined(__gnu_linux__)
-	#define WAPP_PLATFORM_LINUX
-	#define WAPP_PLATFORM_POSIX
+  #define WAPP_PLATFORM_LINUX
+  #define WAPP_PLATFORM_POSIX
 #elif defined(__GNU__) || defined(__gnu_hurd__)
-	#define WAPP_PLATFORM_GNU
-	#define WAPP_PLATFORM_POSIX
+  #define WAPP_PLATFORM_GNU
+  #define WAPP_PLATFORM_POSIX
 #elif defined(__APPLE__) || defined(__MACH__)
-	#include <TargetConditionals.h>
-	#if TARGET_OS_IPHONE
-		#define WAPP_PLATFORM_IOS
-		#define WAPP_PLATFORM_APPLE
-		#define WAPP_PLATFORM_POSIX
-	#elif TARGET_OS_MAC
-		#define WAPP_PLATFORM_MACOS
-		#define WAPP_PLATFORM_APPLE
-		#define WAPP_PLATFORM_POSIX
-	#else
-		#error "Unrecognised Apple platform"
-	#endif
+  #include <TargetConditionals.h>
+  #if TARGET_OS_IPHONE
+    #define WAPP_PLATFORM_IOS
+    #define WAPP_PLATFORM_APPLE
+    #define WAPP_PLATFORM_POSIX
+  #elif TARGET_OS_MAC
+    #define WAPP_PLATFORM_MACOS
+    #define WAPP_PLATFORM_APPLE
+    #define WAPP_PLATFORM_POSIX
+  #else
+    #error "Unrecognised Apple platform"
+  #endif
 #elif defined(_WIN64)
-	#define WAPP_PLATFORM_WINDOWS64
-	#define WAPP_PLATFORM_WINDOWS
+  #define WAPP_PLATFORM_WINDOWS64
+  #define WAPP_PLATFORM_WINDOWS
 #elif defined(_WIN32)
-	#define WAPP_PLATFORM_WINDOWS32
-	#define WAPP_PLATFORM_WINDOWS
+  #define WAPP_PLATFORM_WINDOWS32
+  #define WAPP_PLATFORM_WINDOWS
 #elif defined(__CYGWIN__)
-	#define WAPP_PLATFORM_CYGWIN
-	#define WAPP_PLATFORM_WINDOWS
+  #define WAPP_PLATFORM_CYGWIN
+  #define WAPP_PLATFORM_WINDOWS
 #elif defined(__unix__) || defined(__unix)
-	#define WAPP_PLATFORM_UNIX
-	#define WAPP_PLATFORM_POSIX
+  #define WAPP_PLATFORM_UNIX
+  #define WAPP_PLATFORM_POSIX
 #else
-	#error "Unrecognised platform"
+  #error "Unrecognised platform"
 #endif

 #ifdef __cplusplus
-	#define WAPP_PLATFORM_CPP
-	#define WAPP_PLATFORM_CPP_VERSION __cplusplus
-	#define WAPP_PLATFORM_CPP98_VERSION 199711L
-	#define WAPP_PLATFORM_CPP11_VERSION 201103L
-	#define WAPP_PLATFORM_CPP14_VERSION 201402L
-	#define WAPP_PLATFORM_CPP17_VERSION 201703L
-	#define WAPP_PLATFORM_CPP20_VERSION 202002L
-	#define WAPP_PLATFORM_CPP23_VERSION 202302L
+  #define WAPP_PLATFORM_CPP
+  #define WAPP_PLATFORM_CPP_VERSION __cplusplus
+  #define WAPP_PLATFORM_CPP98_VERSION 199711L
+  #define WAPP_PLATFORM_CPP11_VERSION 201103L
+  #define WAPP_PLATFORM_CPP14_VERSION 201402L
+  #define WAPP_PLATFORM_CPP17_VERSION 201703L
+  #define WAPP_PLATFORM_CPP20_VERSION 202002L
+  #define WAPP_PLATFORM_CPP23_VERSION 202302L

-	#if WAPP_PLATFORM_CPP_VERSION == WAPP_PLATFORM_CPP98_VERSION
-		#define WAPP_PLATFORM_CPP98
-	#elif WAPP_PLATFORM_CPP_VERSION == WAPP_PLATFORM_CPP11_VERSION
-		#define WAPP_PLATFORM_CPP11
-	#elif WAPP_PLATFORM_CPP_VERSION == WAPP_PLATFORM_CPP14_VERSION
-		#define WAPP_PLATFORM_CPP14
-	#elif WAPP_PLATFORM_CPP_VERSION == WAPP_PLATFORM_CPP17_VERSION
-		#define WAPP_PLATFORM_CPP17
-	#elif WAPP_PLATFORM_CPP_VERSION == WAPP_PLATFORM_CPP20_VERSION
-		#define WAPP_PLATFORM_CPP20
-	#elif WAPP_PLATFORM_CPP_VERSION == WAPP_PLATFORM_CPP23_VERSION
-		#define WAPP_PLATFORM_CPP23
-	#else
-		#error "Unrecognised C++ version"
-	#endif
+  #if WAPP_PLATFORM_CPP_VERSION == WAPP_PLATFORM_CPP98_VERSION
+    #define WAPP_PLATFORM_CPP98
+  #elif WAPP_PLATFORM_CPP_VERSION == WAPP_PLATFORM_CPP11_VERSION
+    #define WAPP_PLATFORM_CPP11
+  #elif WAPP_PLATFORM_CPP_VERSION == WAPP_PLATFORM_CPP14_VERSION
+    #define WAPP_PLATFORM_CPP14
+  #elif WAPP_PLATFORM_CPP_VERSION == WAPP_PLATFORM_CPP17_VERSION
+    #define WAPP_PLATFORM_CPP17
+  #elif WAPP_PLATFORM_CPP_VERSION == WAPP_PLATFORM_CPP20_VERSION
+    #define WAPP_PLATFORM_CPP20
+  #elif WAPP_PLATFORM_CPP_VERSION == WAPP_PLATFORM_CPP23_VERSION
+    #define WAPP_PLATFORM_CPP23
+  #else
+    #error "Unrecognised C++ version"
+  #endif
 #else
-	#define WAPP_PLATFORM_C
+  #define WAPP_PLATFORM_C

-	#if defined(__STDC_VERSION__)
-		#define WAPP_PLATFORM_C_VERSION __STDC_VERSION__
-		#define WAPP_PLATFORM_C99_VERSION 199901L
-		#define WAPP_PLATFORM_C11_VERSION 201112L
-		#define WAPP_PLATFORM_C17_VERSION 201710L
-		#define WAPP_PLATFORM_C23_VERSION 202311L
+  #if defined(__STDC_VERSION__)
+    #define WAPP_PLATFORM_C_VERSION __STDC_VERSION__
+    #define WAPP_PLATFORM_C99_VERSION 199901L
+    #define WAPP_PLATFORM_C11_VERSION 201112L
+    #define WAPP_PLATFORM_C17_VERSION 201710L
+    #define WAPP_PLATFORM_C23_VERSION 202311L

-		#if WAPP_PLATFORM_C_VERSION == WAPP_PLATFORM_C99_VERSION
-			#define WAPP_PLATFORM_C99
-		#elif WAPP_PLATFORM_C_VERSION == WAPP_PLATFORM_C11_VERSION
-			#define WAPP_PLATFORM_C11
-		#elif WAPP_PLATFORM_C_VERSION == WAPP_PLATFORM_C17_VERSION
-			#define WAPP_PLATFORM_C17
-		#elif WAPP_PLATFORM_C_VERSION == WAPP_PLATFORM_C23_VERSION
-			#define WAPP_PLATFORM_C23
-		#else
-			#error "Unrecognised C version"
-		#endif
-	#else
-		#define WAPP_PLATFORM_C89
-	#endif
+    #if WAPP_PLATFORM_C_VERSION == WAPP_PLATFORM_C99_VERSION
+      #define WAPP_PLATFORM_C99
+    #elif WAPP_PLATFORM_C_VERSION == WAPP_PLATFORM_C11_VERSION
+      #define WAPP_PLATFORM_C11
+    #elif WAPP_PLATFORM_C_VERSION == WAPP_PLATFORM_C17_VERSION
+      #define WAPP_PLATFORM_C17
+    #elif WAPP_PLATFORM_C_VERSION == WAPP_PLATFORM_C23_VERSION
+      #define WAPP_PLATFORM_C23
+    #else
+      #error "Unrecognised C version"
+    #endif
+  #else
+    #define WAPP_PLATFORM_C89
+  #endif
 #endif // !__cplusplus

 #endif // !PLATFORM_H
--- a/src/os/allocators/arena/mem_arena.c
+++ b/src/os/allocators/arena/mem_arena.c
@@ -6,6 +6,7 @@
 #include "../../../common/assert/assert.h"
 #include "../../../common/misc/misc_utils.h"
 #include "../../../base/mem/utils/mem_utils.h"
+#include <stdlib.h>
 #include <string.h>

 #ifndef DEFAULT_ALIGNMENT
@@ -14,179 +15,132 @@
 #define DEFAULT_ALIGNMENT (2 * sizeof(void *))
 #endif /* ifndef DEFAULT_ALIGNMENT */

-#define ARENA_MINIMUM_CAPACITY KiB(16) // Allocate minimum of 4 pages
+#define ARENA_MINIMUM_CAPACITY KB(16) // Allocate minimum of 4 pages

-typedef enum {
-	ARENA_STORAGE_TYPE_ALLOCATED,
-	ARENA_STORAGE_TYPE_BUFFER,
-} ArenaStorageType;
-
-struct Arena {
-	u8 *buf;
-	u8 *offset;
-	u8 *prev_offset;
-	u64 capacity;
-	ArenaStorageType type;
-	b8 committed;
-
-	wapp_misc_utils_reserve_padding(sizeof(u8 *) * 3 + sizeof(u64) + sizeof(ArenaStorageType) + sizeof(b8));
-};
-
-b8 wapp_mem_arena_init_buffer(Arena **arena, u8 *buffer, u64 buffer_size) {
-	if (!arena || *arena || buffer_size < sizeof(Arena)) {
-		return false;
-	}
-
-	*arena           = (Arena *)buffer;
-	Arena *arena_ptr = *arena;
-
-	arena_ptr->buf         = (u8 *)(arena_ptr + 1);
-	arena_ptr->offset      = arena_ptr->buf;
-	arena_ptr->prev_offset = NULL;
-	arena_ptr->capacity    = buffer_size - sizeof(Arena);
-	arena_ptr->type        = ARENA_STORAGE_TYPE_BUFFER;
-	arena_ptr->committed   = true;
-
-	return true;
-}
-
-b8 wapp_mem_arena_init_allocated_custom(Arena **arena, u64 base_capacity, MemAllocFlags flags, b8 zero_buffer) {
-	if (!arena || *arena || base_capacity == 0) {
-		return false;
-	}
-
-	u64 size       = sizeof(Arena) + (base_capacity >= ARENA_MINIMUM_CAPACITY ? base_capacity : ARENA_MINIMUM_CAPACITY);
-	u64 alloc_size = wapp_misc_utils_u64_round_up_pow2(size);
-	u8 *allocated  = (u8 *)wapp_os_mem_alloc(NULL, alloc_size, WAPP_MEM_ACCESS_READ_WRITE, flags,
-	                                         zero_buffer ? WAPP_MEM_INIT_INITIALISED : WAPP_MEM_INIT_UNINITIALISED);
-	if (!allocated) {
-		return false;
-	}
-
-	b8 committed = (flags & WAPP_MEM_ALLOC_COMMIT) == WAPP_MEM_ALLOC_COMMIT;
+struct arena {
+  u8 *buf;
+  u8 *offset;
+  u64 capacity;
+  b8 committed;

 #ifdef WAPP_PLATFORM_WINDOWS
-	if (!committed) {
-		wapp_os_mem_alloc(allocated, sizeof(Arena), WAPP_MEM_ACCESS_READ_WRITE, WAPP_MEM_ALLOC_COMMIT,
-		                  WAPP_MEM_INIT_INITIALISED);
-	}
+  wapp_misc_utils_padding_size(sizeof(u8 *) * 2 + sizeof(u64) + sizeof(b8));
 #endif // ifdef WAPP_PLATFORM_WINDOWS
+};

-	if (!wapp_mem_arena_init_buffer(arena, allocated, alloc_size)) {
-		wapp_mem_arena_destroy(arena);
-		return false;
-	}
+b8 wapp_mem_arena_init_custom(Arena **arena, u64 base_capacity, MemAllocFlags flags, b8 zero_buffer) {
+  if (!arena || *arena || base_capacity == 0) {
+    return false;
+  }

-	Arena *arena_ptr     = *arena;
-	arena_ptr->type      = ARENA_STORAGE_TYPE_ALLOCATED;
-	arena_ptr->committed = committed;
+  *arena = (Arena *)calloc(1, sizeof(Arena));
+  Arena *arena_ptr = *arena;
+  if (!arena_ptr) {
+    return false;
+  }

-	return true;
+  u64 arena_capacity = wapp_misc_utils_u64_round_up_pow2(
+      base_capacity >= ARENA_MINIMUM_CAPACITY ?
+      base_capacity :
+      ARENA_MINIMUM_CAPACITY
+  );
+
+  arena_ptr->buf = (u8 *)wapp_mem_util_alloc(NULL, arena_capacity, WAPP_MEM_ACCESS_READ_WRITE, flags,
+                                             zero_buffer ? WAPP_MEM_INIT_INITIALISED : WAPP_MEM_INIT_UNINITIALISED);
+
+  if (!(arena_ptr->buf)) {
+    wapp_mem_arena_destroy(arena);
+    return false;
+  }
+
+  arena_ptr->capacity  = arena_capacity;
+  arena_ptr->offset    = arena_ptr->buf;
+  arena_ptr->committed = (flags & WAPP_MEM_ALLOC_COMMIT) == WAPP_MEM_ALLOC_COMMIT;
+
+  return true;
 }

 void *wapp_mem_arena_alloc(Arena *arena, u64 size) {
-	return wapp_mem_arena_alloc_aligned(arena, size, DEFAULT_ALIGNMENT);
+  return wapp_mem_arena_alloc_aligned(arena, size, DEFAULT_ALIGNMENT);
 }

 void *wapp_mem_arena_alloc_aligned(Arena *arena, u64 size, u64 alignment) {
-	wapp_debug_assert(arena != NULL, "`arena` should not be NULL");
+  wapp_debug_assert(arena != NULL, "`arena` should not be NULL");

-	u8 *alloc_start = arena->offset;
+  u8 *alloc_start = arena->offset;

-	u8 *output = wapp_mem_util_align_forward((void *)alloc_start, alignment);
-	if (output + size >= arena->buf + arena->capacity) {
-		return NULL;
-	}
+  u8 *output = wapp_mem_util_align_forward((void *)alloc_start, alignment);
+  if (output + size >= arena->buf + arena->capacity) {
+    return NULL;
+  }

-	arena->offset = output + size;
+  arena->offset = output + size;

 #ifdef WAPP_PLATFORM_WINDOWS
-	if (arena->type == ARENA_STORAGE_TYPE_ALLOCATED && !(arena->committed)) {
-		wapp_os_mem_alloc(alloc_start, (uptr)(arena->offset) - (uptr)(alloc_start),
-		                  WAPP_MEM_ACCESS_READ_WRITE, WAPP_MEM_ALLOC_COMMIT,
-		                  WAPP_MEM_INIT_UNINITIALISED);
-	}
+  if (!(arena->committed)) {
+    wapp_mem_util_alloc(alloc_start, (uptr)(arena->offset) - (uptr)(alloc_start),
+                        WAPP_MEM_ACCESS_READ_WRITE, WAPP_MEM_ALLOC_COMMIT,
+                        WAPP_MEM_INIT_UNINITIALISED);
+  }
 #endif // ifdef WAPP_PLATFORM_WINDOWS

-	memset(output, 0, size);
+  memset(output, 0, size);

-	return (void *)output;
+  return (void *)output;
 }

 void *wapp_mem_arena_realloc(Arena *arena, void *ptr, u64 old_size, u64 new_size) {
-	wapp_debug_assert(arena != NULL, "`arena` should not be NULL");
+  if ((u8*)ptr < arena->buf || (u8*)ptr > arena->offset ||
+      arena->offset + new_size >= arena->buf + arena->capacity) {
+    return NULL;
+  }

-	if ((u8*)ptr < arena->buf || (u8*)ptr > arena->offset ||
-		  arena->offset + new_size >= arena->buf + arena->capacity) {
-		return NULL;
-	}
+  void *new_ptr = wapp_mem_arena_alloc(arena, new_size);
+  if (!new_ptr) {
+    return NULL;
+  }

-	void *new_ptr = wapp_mem_arena_alloc(arena, new_size);
-	if (!new_ptr) {
-		return NULL;
-	}
+  u64 copy_size = new_size <= old_size ? new_size : old_size;
+  memcpy(new_ptr, ptr, copy_size);

-	u64 copy_size = new_size <= old_size ? new_size : old_size;
-	memcpy(new_ptr, ptr, copy_size);
-
-	return new_ptr;
+  return new_ptr;
 }

 void *wapp_mem_arena_realloc_aligned(Arena *arena, void *ptr, u64 old_size, u64 new_size, u64 alignment) {
-	wapp_debug_assert(arena != NULL, "`arena` should not be NULL");
+  if ((u8*)ptr < arena->buf || (u8*)ptr > arena->offset ||
+      arena->offset + new_size >= arena->buf + arena->capacity) {
+    return NULL;
+  }

-	if ((u8*)ptr < arena->buf || (u8*)ptr > arena->offset ||
-		  arena->offset + new_size >= arena->buf + arena->capacity) {
-		return NULL;
-	}
+  void *new_ptr = wapp_mem_arena_alloc_aligned(arena, new_size, alignment);
+  if (!new_ptr) {
+    return NULL;
+  }

-	void *new_ptr = wapp_mem_arena_alloc_aligned(arena, new_size, alignment);
-	if (!new_ptr) {
-		return NULL;
-	}
+  u64 copy_size = new_size <= old_size ? new_size : old_size;
+  memcpy(new_ptr, ptr, copy_size);

-	u64 copy_size = new_size <= old_size ? new_size : old_size;
-	memcpy(new_ptr, ptr, copy_size);
-
-	return new_ptr;
-}
-
-void wapp_mem_arena_temp_begin(Arena *arena) {
-	wapp_debug_assert(arena != NULL, "`arena` should not be NULL");
-
-	if (arena->prev_offset != NULL) {
-		return;
-	}
-
-	arena->prev_offset = arena->offset;
-}
-
-void wapp_mem_arena_temp_end(Arena *arena) {
-	wapp_debug_assert(arena != NULL, "`arena` should not be NULL");
-
-	if (arena->prev_offset == NULL) {
-		return;
-	}
-
-	arena->offset      = arena->prev_offset;
-	arena->prev_offset = NULL;
+  return new_ptr;
 }

 void wapp_mem_arena_clear(Arena *arena) {
-	wapp_debug_assert(arena != NULL, "`arena` should not be NULL");
+  wapp_debug_assert(arena != NULL, "`arena` should not be NULL");

-	memset(arena->buf, 0, arena->offset - arena->buf);
-	arena->offset = arena->buf;
+  memset(arena->buf, 0, arena->offset - arena->buf);
+  arena->offset = arena->buf;
 }

 void wapp_mem_arena_destroy(Arena **arena) {
-	wapp_debug_assert(arena != NULL && (*arena) != NULL, "`arena` double pointer is not valid");
+  wapp_debug_assert(arena != NULL && (*arena) != NULL, "`arena` double pointer is not valid");

-	Arena *arena_ptr = *arena;
+  Arena *arena_ptr = *arena;
+  if (arena_ptr->buf) {
+    wapp_mem_util_free(arena_ptr->buf, arena_ptr->capacity);
+  }

-	if (arena_ptr->type == ARENA_STORAGE_TYPE_ALLOCATED) {
-		wapp_os_mem_free(*arena, sizeof(Arena) + arena_ptr->capacity);
-	}
+  arena_ptr->buf = arena_ptr->offset = NULL;
+  arena_ptr->capacity = 0;

-	*arena = NULL;
+  free(*arena);
+  *arena = NULL;
 }
--- a/src/os/allocators/arena/mem_arena.h
+++ b/src/os/allocators/arena/mem_arena.h
@@ -11,32 +11,29 @@
 BEGIN_C_LINKAGE
 #endif // !WAPP_PLATFORM_CPP

-typedef struct Arena Arena;
+typedef struct arena Arena;

-#define wapp_mem_arena_init_allocated(arena_dptr, base_capacity)                                                           \
-	(wapp_mem_arena_init_allocated_custom(arena_dptr, base_capacity, WAPP_MEM_ALLOC_RESERVE, false))
-#define wapp_mem_arena_init_allocated_commit(arena_dptr, base_capacity)                                                    \
-	(wapp_mem_arena_init_allocated_custom(arena_dptr, base_capacity, WAPP_MEM_ALLOC_RESERVE | WAPP_MEM_ALLOC_COMMIT, false))
-#define wapp_mem_arena_init_allocated_zero(arena_dptr, base_capacity)                                                      \
-	(wapp_mem_arena_init_allocated_custom(arena_dptr, base_capacity, WAPP_MEM_ALLOC_RESERVE, true))
-#define wapp_mem_arena_init_allocated_commit_and_zero(arena_dptr, base_capacity)                                           \
-	(wapp_mem_arena_init_allocated_custom(arena_dptr, base_capacity, WAPP_MEM_ALLOC_RESERVE | WAPP_MEM_ALLOC_COMMIT, true))
+#define wapp_mem_arena_init(arena_dptr, base_capacity)                         \
+  (wapp_mem_arena_init_custom(arena_dptr, base_capacity, WAPP_MEM_ALLOC_RESERVE, false))
+#define wapp_mem_arena_init_commit(arena_dptr, base_capacity)                  \
+  (wapp_mem_arena_init_custom(arena_dptr, base_capacity, WAPP_MEM_ALLOC_RESERVE | WAPP_MEM_ALLOC_COMMIT, false))
+#define wapp_mem_arena_init_zero(arena_dptr, base_capacity)                    \
+  (wapp_mem_arena_init_custom(arena_dptr, base_capacity, WAPP_MEM_ALLOC_RESERVE, true))
+#define wapp_mem_arena_init_commit_and_zero(arena_dptr, base_capacity)         \
+  (wapp_mem_arena_init_custom(arena_dptr, base_capacity, WAPP_MEM_ALLOC_RESERVE | WAPP_MEM_ALLOC_COMMIT, true))

 /**
- * Arena initialisation function. `wapp_mem_arena_init_allocated_custom` provides the most
+ * Arena initialisation function. `wapp_mem_arena_init_custom` provides the most
 * control over how the Arena is initialised. Wrapper macros are provided for
 * easier use.
 */
-b8    wapp_mem_arena_init_allocated_custom(Arena **arena, u64 base_capacity, MemAllocFlags flags, b8 zero_buffer);
-b8    wapp_mem_arena_init_buffer(Arena **arena, u8 *buffer, u64 buffer_size);
+b8  wapp_mem_arena_init_custom(Arena **arena, u64 base_capacity, MemAllocFlags flags, b8 zero_buffer);
 void *wapp_mem_arena_alloc(Arena *arena, u64 size);
 void *wapp_mem_arena_alloc_aligned(Arena *arena, u64 size, u64 alignment);
 void *wapp_mem_arena_realloc(Arena *arena, void *ptr, u64 old_size, u64 new_size);
 void *wapp_mem_arena_realloc_aligned(Arena *arena, void *ptr, u64 old_size, u64 new_size, u64 alignment);
-void  wapp_mem_arena_temp_begin(Arena *arena);
-void  wapp_mem_arena_temp_end(Arena *arena);
-void  wapp_mem_arena_clear(Arena *arena);
-void  wapp_mem_arena_destroy(Arena **arena);
+void wapp_mem_arena_clear(Arena *arena);
+void wapp_mem_arena_destroy(Arena **arena);

 #ifdef WAPP_PLATFORM_CPP
 END_C_LINKAGE
--- a/src/os/allocators/arena/mem_arena_allocator.c
+++ b/src/os/allocators/arena/mem_arena_allocator.c
@@ -4,84 +4,56 @@
 #include "mem_arena.h"
 #include "../../mem/mem_os.h"
 #include "../../../common/aliases/aliases.h"
-#include "../../../common/assert/assert.h"

-wapp_intern void initialise_arena_allocator(Allocator *allocator);
-wapp_intern void *mem_arena_alloc(u64 size, void *alloc_obj);
-wapp_intern void *mem_arena_alloc_aligned(u64 size, u64 alignment, void *alloc_obj);
-wapp_intern void *mem_arena_realloc(void *ptr, u64 old_size, u64 new_size, void *alloc_obj);
-wapp_intern void *mem_arena_realloc_aligned(void *ptr, u64 old_size, u64 new_size, u64 alignment,
-                                            void *alloc_obj);
+wapp_intern inline void *mem_arena_alloc(u64 size, void *alloc_obj);
+wapp_intern inline void *mem_arena_alloc_aligned(u64 size, u64 alignment, void *alloc_obj);
+wapp_intern inline void *mem_arena_realloc(void *ptr, u64 old_size, u64 new_size, void *alloc_obj);
+wapp_intern inline void *mem_arena_realloc_aligned(void *ptr, u64 old_size, u64 new_size, u64 alignment,
+                                                void *alloc_obj);

-Allocator wapp_mem_arena_allocator_init_with_buffer(u8 *buffer, u64 buffer_size) {
-	Allocator allocator = {0};
-	b8 initialised = wapp_mem_arena_init_buffer((Arena **)(&allocator.obj), buffer, buffer_size);
-	if (!initialised) {
-		return allocator;
-	}
-
-	initialise_arena_allocator(&allocator);
-
-	return allocator;
-}

 Allocator wapp_mem_arena_allocator_init_custom(u64 base_capacity, MemAllocFlags flags, b8 zero_buffer) {
-	Allocator allocator = {0};
-	b8 initialised = wapp_mem_arena_init_allocated_custom((Arena **)(&allocator.obj), base_capacity, flags, zero_buffer);
-	if (!initialised) {
-		return allocator;
-	}
+  Allocator allocator = {0};
+  b8 initialised = wapp_mem_arena_init_custom((Arena **)(&allocator.obj), base_capacity, flags, zero_buffer);
+  if (!initialised) {
+    return allocator;
+  }

-	initialise_arena_allocator(&allocator);
+  allocator.alloc           = mem_arena_alloc;
+  allocator.alloc_aligned   = mem_arena_alloc_aligned;
+  allocator.realloc         = mem_arena_realloc;
+  allocator.realloc_aligned = mem_arena_realloc_aligned;

-	return allocator;
-}
-
-void wapp_mem_arena_allocator_temp_begin(const Allocator *allocator) {
-	wapp_debug_assert(allocator != NULL, "`allocator` should not be NULL");
-	wapp_mem_arena_temp_begin((Arena *)(allocator->obj));
-}
-
-void wapp_mem_arena_allocator_temp_end(const Allocator *allocator) {
-	wapp_debug_assert(allocator != NULL, "`allocator` should not be NULL");
-	wapp_mem_arena_temp_end((Arena *)(allocator->obj));
+  return allocator;
 }

 void wapp_mem_arena_allocator_clear(Allocator *allocator) {
-	wapp_debug_assert(allocator != NULL, "`allocator` should not be NULL");
-	wapp_mem_arena_clear((Arena *)(allocator->obj));
+  wapp_mem_arena_clear((Arena *)(allocator->obj));
 }

 void wapp_mem_arena_allocator_destroy(Allocator *allocator) {
-	wapp_debug_assert(allocator != NULL, "`allocator` should not be NULL");
-	wapp_mem_arena_destroy((Arena **)(&(allocator->obj)));
-	*allocator = (Allocator){0};
+  wapp_mem_arena_destroy((Arena **)(&(allocator->obj)));
+  *allocator = (Allocator){0};
 }

-wapp_intern void initialise_arena_allocator(Allocator *allocator) {
-	allocator->alloc           = mem_arena_alloc;
-	allocator->alloc_aligned   = mem_arena_alloc_aligned;
-	allocator->realloc         = mem_arena_realloc;
-	allocator->realloc_aligned = mem_arena_realloc_aligned;
+
+wapp_intern inline void *mem_arena_alloc(u64 size, void *alloc_obj) {
+  Arena *arena = (Arena *)alloc_obj;
+  return wapp_mem_arena_alloc(arena, size);
 }

-wapp_intern void *mem_arena_alloc(u64 size, void *alloc_obj) {
-	Arena *arena = (Arena *)alloc_obj;
-	return wapp_mem_arena_alloc(arena, size);
+wapp_intern inline void *mem_arena_alloc_aligned(u64 size, u64 alignment, void *alloc_obj) {
+  Arena *arena = (Arena *)alloc_obj;
+  return wapp_mem_arena_alloc_aligned(arena, size, alignment);
 }

-wapp_intern void *mem_arena_alloc_aligned(u64 size, u64 alignment, void *alloc_obj) {
-	Arena *arena = (Arena *)alloc_obj;
-	return wapp_mem_arena_alloc_aligned(arena, size, alignment);
+wapp_intern inline void *mem_arena_realloc(void *ptr, u64 old_size, u64 new_size, void *alloc_obj) {
+  Arena *arena = (Arena *)alloc_obj;
+  return wapp_mem_arena_realloc(arena, ptr, old_size, new_size);
 }

-wapp_intern void *mem_arena_realloc(void *ptr, u64 old_size, u64 new_size, void *alloc_obj) {
-	Arena *arena = (Arena *)alloc_obj;
-	return wapp_mem_arena_realloc(arena, ptr, old_size, new_size);
-}
-
-wapp_intern void *mem_arena_realloc_aligned(void *ptr, u64 old_size, u64 new_size, u64 alignment,
-                                            void *alloc_obj) {
-	Arena *arena = (Arena *)alloc_obj;
-	return wapp_mem_arena_realloc_aligned(arena, ptr, old_size, new_size, alignment);
+wapp_intern inline void *mem_arena_realloc_aligned(void *ptr, u64 old_size, u64 new_size, u64 alignment,
+                                                void *alloc_obj) {
+  Arena *arena = (Arena *)alloc_obj;
+  return wapp_mem_arena_realloc_aligned(arena, ptr, old_size, new_size, alignment);
 }
--- a/src/os/allocators/arena/mem_arena_allocator.h
+++ b/src/os/allocators/arena/mem_arena_allocator.h
@@ -12,14 +12,14 @@
 BEGIN_C_LINKAGE
 #endif // !WAPP_PLATFORM_CPP

-#define wapp_mem_arena_allocator_init(base_capacity)                                                           \
-	(wapp_mem_arena_allocator_init_custom(base_capacity, WAPP_MEM_ALLOC_RESERVE, false))
-#define wapp_mem_arena_allocator_init_commit(base_capacity)                                                    \
-	(wapp_mem_arena_allocator_init_custom(base_capacity, WAPP_MEM_ALLOC_RESERVE | WAPP_MEM_ALLOC_COMMIT, false))
-#define wapp_mem_arena_allocator_init_zero(base_capacity)                                                      \
-	(wapp_mem_arena_allocator_init_custom(base_capacity, WAPP_MEM_ALLOC_RESERVE, true))
-#define wapp_mem_arena_allocator_init_commit_and_zero(base_capacity)                                           \
-	(wapp_mem_arena_allocator_init_custom(base_capacity, WAPP_MEM_ALLOC_RESERVE | WAPP_MEM_ALLOC_COMMIT, true))
+#define wapp_mem_arena_allocator_init(base_capacity)                           \
+  (wapp_mem_arena_allocator_init_custom(base_capacity, WAPP_MEM_ALLOC_RESERVE, false))
+#define wapp_mem_arena_allocator_init_commit(base_capacity)                    \
+  (wapp_mem_arena_allocator_init_custom(base_capacity, WAPP_MEM_ALLOC_RESERVE | WAPP_MEM_ALLOC_COMMIT, false))
+#define wapp_mem_arena_allocator_init_zero(base_capacity)                      \
+  (wapp_mem_arena_allocator_init_custom(base_capacity, WAPP_MEM_ALLOC_RESERVE, true))
+#define wapp_mem_arena_allocator_init_commit_and_zero(base_capacity)           \
+  (wapp_mem_arena_allocator_init_custom(base_capacity, WAPP_MEM_ALLOC_RESERVE | WAPP_MEM_ALLOC_COMMIT, true))

 /**
 * Wraps an Arena in an Allocator object. It attempts to initialise the Arena
@@ -33,11 +33,8 @@ BEGIN_C_LINKAGE
 * the Arena is initialised. Wrapper macros are provided for easier use.
 */
 Allocator wapp_mem_arena_allocator_init_custom(u64 base_capacity, MemAllocFlags flags, b8 zero_buffer);
-Allocator wapp_mem_arena_allocator_init_with_buffer(u8 *buffer, u64 buffer_size);
-void      wapp_mem_arena_allocator_temp_begin(const Allocator *allocator);
-void      wapp_mem_arena_allocator_temp_end(const Allocator *allocator);
-void      wapp_mem_arena_allocator_clear(Allocator *allocator);
-void      wapp_mem_arena_allocator_destroy(Allocator *allocator);
+void wapp_mem_arena_allocator_clear(Allocator *allocator);
+void wapp_mem_arena_allocator_destroy(Allocator *allocator);

 #ifdef WAPP_PLATFORM_CPP
 END_C_LINKAGE
--- a/src/os/cpath/cpath.c
+++ b/src/os/cpath/cpath.c
@@ -12,125 +12,124 @@
 #include <string.h>

 u32 wapp_cpath_join_path(Str8 *dst, const Str8List *parts) {
-	if (!dst || !parts) {
-		return CPATH_JOIN_INVALID_ARGS;
-	}
+  if (!dst || !parts) {
+    return CPATH_JOIN_INVALID_ARGS;
+  }

-	if (parts->node_count == 0) {
-		return CPATH_JOIN_EMPTY_PARTS;
-	}
+  if (parts->node_count == 0) {
+    return CPATH_JOIN_EMPTY_PARTS;
+  }

-	Str8 separator = wapp_str8_buf(4);
-	wapp_str8_push_back(&separator, WAPP_PATH_SEP);
+  Str8 separator = wapp_str8_buf(4);
+  wapp_str8_push_back(&separator, WAPP_PATH_SEP);

-	u64 required_capacity = parts->node_count * separator.size + wapp_str8_list_total_size(parts);
-	if (dst->capacity < required_capacity) {
-		return CPATH_JOIN_INSUFFICIENT_DST_CAPACITY;
-	}
+  u64 required_capacity = parts->node_count * separator.size + wapp_str8_list_total_size(parts);
+  if (dst->capacity < required_capacity) {
+    return CPATH_JOIN_INSUFFICIENT_DST_CAPACITY;
+  }

-	// Handle first node
-	Str8 *first_node = wapp_dbl_list_get(Str8, parts, 0);
-	wapp_str8_copy_str8_capped(dst, first_node);
+  // Handle first node
+  const Str8Node *first_node = wapp_dbl_list_get(Str8, Str8Node, parts, 0);
+  wapp_str8_copy_str8_capped(dst, first_node->item);

-	// NOTE (Abdelrahman): Uses a while loop instead of a for loop to get rid of
-	// MSVC Spectre mitigation warnings
-	Str8 *node       = first_node;
-	u64 node_index   = 1;
-	b8 running       = node_index < parts->node_count;
-	while (running) {
-		node = wapp_dbl_list_get(Str8, parts, node_index);
-		if (node->size == 0) {
-			goto CPATH_JOIN_LOOP_END;
-		}
+  // NOTE (Abdelrahman): Uses a while loop instead of a for loop to get rid of
+  // MSVC Spectre mitigation warnings
+  const Str8Node *node = first_node;
+  u64 node_index       = 1;
+  b8 running          = node_index < parts->node_count;
+  while (running && node->next) {
+    node = node->next;
+    if (node->item->size == 0) {
+      continue;
+    }

-		if (dst->size > 0) {
-			char dst_last   = wapp_str8_get(dst, dst->size - 1);
-			char node_start = wapp_str8_get(node, 0);
-			b8 add_path_sep = dst_last != WAPP_PATH_SEP && node_start != WAPP_PATH_SEP;
+    if (dst->size > 0) {
+      char dst_last    = wapp_str8_get(dst, dst->size - 1);
+      char node_start  = wapp_str8_get(node->item, 0);
+      b8 add_path_sep = dst_last != WAPP_PATH_SEP && node_start != WAPP_PATH_SEP;

-			if (add_path_sep) {
-				wapp_str8_concat_capped(dst, &separator);
-			}
-		}
+      if (add_path_sep) {
+        wapp_str8_concat_capped(dst, &separator);
+      }
+    }

-		wapp_str8_concat_capped(dst, node);
+    wapp_str8_concat_capped(dst, node->item);

-CPATH_JOIN_LOOP_END:
-		++node_index;
-		running = node_index < parts->node_count;
-	}
+    ++node_index;
+    running = node_index < parts->node_count;
+  }

-	return CPATH_JOIN_SUCCESS;
+  return CPATH_JOIN_SUCCESS;
 }

 Str8 *dirup(const Allocator *allocator, Str8RO *path, u64 levels) {
-	Str8 *output = NULL;
-	if (!allocator || !path) {
-		goto RETURN_DIRUP;
-	}
+  Str8 *output = NULL;
+  if (!allocator || !path) {
+    goto RETURN_DIRUP;
+  }

-	b8 absolute    = wapp_str8_get(path, 0) == WAPP_PATH_SEP;
-	Str8 separator = wapp_str8_buf(4);
-	wapp_str8_push_back(&separator, WAPP_PATH_SEP);
+  b8 absolute   = wapp_str8_get(path, 0) == WAPP_PATH_SEP;
+  Str8 separator = wapp_str8_buf(4);
+  wapp_str8_push_back(&separator, WAPP_PATH_SEP);

-	if (path->size == 0) {
-		output = wapp_str8_alloc_buf(allocator, 16);
-		if (!output) {
-			goto RETURN_DIRUP;
-		}
+  if (path->size == 0) {
+    output = wapp_str8_alloc_buf(allocator, 16);
+    if (!output) {
+      goto RETURN_DIRUP;
+    }

-		wapp_str8_push_back(output, absolute ? WAPP_PATH_SEP : '.');
-		goto RETURN_DIRUP;
-	}
+    wapp_str8_push_back(output, absolute ? WAPP_PATH_SEP : '.');
+    goto RETURN_DIRUP;
+  }

-	if (levels < 1) {
-		output = wapp_str8_alloc_str8(allocator, path);
-		goto RETURN_DIRUP;
-	}
+  if (levels < 1) {
+    output = wapp_str8_alloc_str8(allocator, path);
+    goto RETURN_DIRUP;
+  }

-	Allocator tmp_arena = wapp_mem_arena_allocator_init(MiB(8));
-	if (wapp_mem_allocator_invalid(&tmp_arena)) {
-		goto RETURN_DIRUP;
-	}
+  Allocator tmp_arena = wapp_mem_arena_allocator_init(MB(8));
+  if (wapp_mem_allocator_invalid(&tmp_arena)) {
+    goto RETURN_DIRUP;
+  }

-	Str8List *parts = wapp_str8_split(&tmp_arena, path, &separator);
-	if (!parts) {
-		goto RETURN_DIRUP;
-	}
+  Str8List *parts = wapp_str8_split(&tmp_arena, path, &separator);
+  if (!parts) {
+    goto RETURN_DIRUP;
+  }

-	if (levels >= parts->node_count) {
-		output = wapp_str8_alloc_buf(allocator, 16);
-		if (!output) {
-			goto LIST_CLEANUP_DIRUP;
-		}
+  if (levels >= parts->node_count) {
+    output = wapp_str8_alloc_buf(allocator, 16);
+    if (!output) {
+      goto LIST_CLEANUP_DIRUP;
+    }

-		wapp_str8_push_back(output, absolute ? WAPP_PATH_SEP : '.');
-	} else {
-		for (u64 i = 0; i < levels; ++i) {
-			wapp_dbl_list_pop_back(Str8, parts);
-		}
-		
-		u64 alignment  = sizeof(void *) * 2;
-		u64 alloc_size = wapp_str8_list_total_size(parts) + parts->node_count * separator.size;
-		u64 modulo     = alloc_size & (alignment - 1);
-		alloc_size    += alignment - modulo;
+    wapp_str8_push_back(output, absolute ? WAPP_PATH_SEP : '.');
+  } else {
+    for (u64 i = 0; i < levels; ++i) {
+      wapp_dbl_list_pop_back(Str8, Str8Node, parts);
+    }
+    
+    u64 alignment  = sizeof(void *) * 2;
+    u64 alloc_size = wapp_str8_list_total_size(parts) + parts->node_count * separator.size;
+    u64 modulo     = alloc_size & (alignment - 1);
+    alloc_size    += alignment - modulo;

-		output = wapp_str8_alloc_buf(allocator, alloc_size);
-		if (output) {
-			if (absolute) {
-				wapp_str8_push_back(output, WAPP_PATH_SEP);
-			}
+    output = wapp_str8_alloc_buf(allocator, alloc_size);
+    if (output) {
+      if (absolute) {
+        wapp_str8_push_back(output, WAPP_PATH_SEP);
+      }

-			Str8 *joined = wapp_str8_join(&tmp_arena, parts, &separator);
-			if (joined) {
-				wapp_str8_concat_capped(output, joined);
-			}
-		}
-	}
+      Str8 *joined = wapp_str8_join(&tmp_arena, parts, &separator);
+      if (joined) {
+        wapp_str8_concat_capped(output, joined);
+      }
+    }
+  }

 LIST_CLEANUP_DIRUP:
-	wapp_mem_arena_allocator_destroy(&tmp_arena);
+  wapp_mem_arena_allocator_destroy(&tmp_arena);

 RETURN_DIRUP:
-	return output;
+  return output;
 }
--- a/src/os/cpath/cpath.h
+++ b/src/os/cpath/cpath.h
@@ -18,7 +18,7 @@ BEGIN_C_LINKAGE
 #define WAPP_PATH_MAX PATH_MAX
 #elif defined(WAPP_PLATFORM_WINDOWS)
 #define WIN32_LEAN_AND_MEAN
-#include <Windows.h>
+#include <windows.h>
 #define WAPP_PATH_SEP '\\'
 #define WAPP_PATH_MAX MAX_PATH
 #else
@@ -29,13 +29,13 @@ BEGIN_C_LINKAGE
 #define wapp_cpath_dirup(ALLOCATOR, PATH, COUNT) dirup(ALLOCATOR, PATH, COUNT)

 enum {
-	CPATH_JOIN_SUCCESS = 0,
-	CPATH_JOIN_INVALID_ARGS,
-	CPATH_JOIN_EMPTY_PARTS,
-	CPATH_JOIN_INSUFFICIENT_DST_CAPACITY,
+  CPATH_JOIN_SUCCESS = 0,
+  CPATH_JOIN_INVALID_ARGS,
+  CPATH_JOIN_EMPTY_PARTS,
+  CPATH_JOIN_INSUFFICIENT_DST_CAPACITY,
 };

-u32   wapp_cpath_join_path(Str8 *dst, const Str8List *parts);
+u32  wapp_cpath_join_path(Str8 *dst, const Str8List *parts);
 Str8 *dirup(const Allocator *allocator, Str8RO *path, u64 levels);

 #ifdef WAPP_PLATFORM_CPP
--- a/src/os/file/file.c
+++ b/src/os/file/file.c
@@ -6,124 +6,104 @@
 #include "../../common/aliases/aliases.h"
 #include "../../base/array/array.h"
 #include "../../base/strings/str8/str8.h"
+#include <stdio.h>

-WFile *wapp_file_open(const Allocator *allocator, Str8RO *filepath, FileAccessMode mode) {
-	wapp_debug_assert(allocator != NULL && filepath != NULL, "`allocator` and `filepath` should not be NULL");
-	wapp_debug_assert(filepath->size < WAPP_PATH_MAX, "`filepath` exceeds max path limit.");
-	return _file_open(allocator, filepath, mode);
+File *wapp_file_open(Str8RO *filepath, FileAccessMode mode) {
+  wapp_persist const char *modes[FILE_ACCESS_MODE_COUNT] = {
+    [WAPP_FA_MODE_R]      = "r",
+    [WAPP_FA_MODE_W]      = "w",
+    [WAPP_FA_MODE_A]      = "a",
+    [WAPP_FA_MODE_R_EX]   = "r+",
+    [WAPP_FA_MODE_W_EX]   = "w+",
+    [WAPP_FA_MODE_A_EX]   = "a+",
+    [WAPP_FA_MODE_RB]     = "rb",
+    [WAPP_FA_MODE_WB]     = "wb",
+    [WAPP_FA_MODE_AB]     = "ab",
+    [WAPP_FA_MODE_RB_EX]  = "rb+",
+    [WAPP_FA_MODE_WB_EX]  = "wb+",
+    [WAPP_FA_MODE_AB_EX]  = "ab+",
+    [WAPP_FA_MODE_WX]     = "wx",
+    [WAPP_FA_MODE_WX_EX]  = "wx+",
+    [WAPP_FA_MODE_WBX]    = "wbx",
+    [WAPP_FA_MODE_WBX_EX] = "wbx+",
+  };
+  wapp_persist c8 tmp[WAPP_PATH_MAX] = {0};
+  wapp_debug_assert(filepath->size < WAPP_PATH_MAX, "`filepath` exceeds max path limit.");
+
+  memset(tmp, 0, WAPP_PATH_MAX);
+  memcpy(tmp, filepath->buf, filepath->size);
+
+  return fopen((const char *)tmp, modes[mode]);
 }

-i64 wapp_file_get_current_position(WFile *file) {
-	wapp_debug_assert(file != NULL, "`file` should not be NULL.");
-	return _file_seek(file, 0, WAPP_SEEK_CURRENT);
+u64 wapp_file_get_current_position(File *file) {
+  wapp_debug_assert(file != NULL, "`file` should not be NULL.");
+  return (u64)ftell(file);
 }

-i64 wapp_file_seek(WFile *file, i64 offset, FileSeekOrigin origin) {
-	wapp_debug_assert(file != NULL, "`file` should not be NULL.");
-	return _file_seek(file, offset, origin);
+i32 wapp_file_seek(File *file, u64 offset, FileSeekOrigin origin) {
+  wapp_debug_assert(file != NULL, "`file` should not be NULL.");
+  // TODO (Abdelrahman): Revisit conversion to long
+  return fseek(file, (long)offset, origin);
 }

-i64 wapp_file_get_length(WFile *file) {
-	wapp_debug_assert(file != NULL, "`file` should not be NULL.");
+u64 wapp_file_get_length(File *file) {
+  wapp_debug_assert(file != NULL, "`file` should not be NULL.");

-	i64 current = wapp_file_get_current_position(file);
+  u64 current = wapp_file_get_current_position(file);

-	_file_seek(file, 0, WAPP_SEEK_END);
+  wapp_file_seek(file, 0, WAPP_SEEK_END);

-	i64 output = wapp_file_get_current_position(file);
+  u64 output = ftell(file);

-	// Restore position
-	_file_seek(file, current, WAPP_SEEK_START);
+  // Restore position
+  wapp_file_seek(file, current, WAPP_SEEK_START);

-	return output;
+  return output;
 }

-u64 wapp_file_read(void *dst_buf, WFile *file, u64 byte_count) {
-	wapp_debug_assert(dst_buf != NULL && file != NULL,
-	                  "`dst_buf` and `file` should not be NULL.");
+u64 wapp_file_read(GenericArray *dst_buf, File *file, u64 item_count) {
+  wapp_debug_assert(dst_buf != NULL && file != NULL,
+                    "`dst_buf` and `file` should not be NULL.");

-	i64 file_length = wapp_file_get_length(file);
-	if (file_length < 0) {
-		return 0;
-	}
+  u64 file_length       = wapp_file_get_length(file);
+  u64 item_size         = dst_buf->item_size;
+  u64 dst_byte_capacity = dst_buf->capacity * item_size;
+  u64 req_byte_count    = item_count * item_size;
+  u64 copy_byte_count   = 0;

-	return _file_read(dst_buf, byte_count, file, file_length);
+  if (req_byte_count <= file_length && req_byte_count <= dst_byte_capacity) {
+    copy_byte_count = req_byte_count;
+  } else {
+    copy_byte_count = file_length <= dst_byte_capacity ? file_length : dst_byte_capacity;
+  }
+
+  u64 count = fread(dst_buf->items, sizeof(u8), copy_byte_count, file);
+  if (ferror(file)) { return 0; }
+
+  dst_buf->count = count / item_size;
+
+  return dst_buf->count;
 }

-i64 wapp_file_write(const void *src_buf, WFile *file, u64 byte_count) {
-	wapp_debug_assert(src_buf != NULL && file != NULL,
-	                  "`src_buf` and `file` should not be NULL.");
-	return _file_write(src_buf, file, byte_count);
+u64 wapp_file_write(const GenericArray *src_buf, File *file, u64 item_count) {
+  wapp_debug_assert(src_buf != NULL && file != NULL,
+                    "`src_buf` and `file` should not be NULL.");
+
+  u64 item_size      = src_buf->item_size;
+  u64 src_byte_count = src_buf->count * item_size;
+  u64 req_byte_count = item_count * item_size;
+  u64 to_copy        = req_byte_count <= src_byte_count ? req_byte_count : src_byte_count;
+
+  return fwrite(src_buf->items, sizeof(u8), to_copy, file);
 }

-u64 wapp_file_read_array(GenericArray dst_buf, WFile *file, u64 item_count) {
-	wapp_debug_assert(dst_buf != NULL && file != NULL,
-	                  "`dst_buf` and `file` should not be NULL.");
-
-	i64 _file_length = wapp_file_get_length(file);
-	if (_file_length < 0) {
-		return 0;
-	}
-
-	u64 file_length       = (u64)_file_length;
-	u64 item_size         = wapp_array_item_size(dst_buf);
-	u64 dst_byte_capacity = wapp_array_capacity(dst_buf) * item_size;
-	u64 req_byte_count    = item_count * item_size;
-	u64 copy_byte_count   = 0;
-
-	if (req_byte_count <= file_length && req_byte_count <= dst_byte_capacity) {
-		copy_byte_count = req_byte_count;
-	} else {
-		copy_byte_count = file_length <= dst_byte_capacity ? file_length : dst_byte_capacity;
-	}
-
-	u64 byte_count = _file_read(dst_buf, copy_byte_count, file, file_length);
-	if (byte_count == 0) {
-		return 0;
-	}
-
-	wapp_array_set_count(dst_buf, byte_count / item_size);
-
-	return wapp_array_count(dst_buf);
+i32 wapp_file_flush(File *file) {
+  wapp_debug_assert(file != NULL, "`file` should not be NULL.");
+  return fflush(file);
 }

-i64 wapp_file_write_array(const GenericArray src_buf, WFile *file, u64 item_count) {
-	wapp_debug_assert(src_buf != NULL && file != NULL,
-	                  "`src_buf` and `file` should not be NULL.");
-
-	u64 item_size      = wapp_array_item_size(src_buf);
-	u64 src_byte_count = wapp_array_count(src_buf) * item_size;
-	u64 req_byte_count = item_count * item_size;
-	u64 to_copy        = req_byte_count <= src_byte_count ? req_byte_count : src_byte_count;
-
-	i64 bytes_written = _file_write(src_buf, file, to_copy);
-	if (bytes_written < 0) {
-		return 0;
-	}
-
-	return (u64)bytes_written / item_size;
-}
-
-i32 wapp_file_flush(WFile *file) {
-	wapp_debug_assert(file != NULL, "`file` should not be NULL.");
-	return _file_flush(file);
-}
-
-i32 wapp_file_close(WFile *file) {
-	wapp_debug_assert(file != NULL, "`file` should not be NULL.");
-	return _file_close(file);
-}
-
-i32 wapp_file_rename(Str8RO *old_filepath, Str8RO *new_filepath) {
-	wapp_debug_assert(old_filepath != NULL && new_filepath != NULL,
-	                  "`old_filepath` and `new_filepath` should not be NULL");
-	wapp_debug_assert(old_filepath->size < WAPP_PATH_MAX, "`old_filepath` exceeds max path limit.");
-	wapp_debug_assert(new_filepath->size < WAPP_PATH_MAX, "`new_filepath` exceeds max path limit.");
-	return _file_rename(old_filepath, new_filepath);
-}
-
-i32 wapp_file_remove(Str8RO *filepath) {
-	wapp_debug_assert(filepath != NULL, "`filepath` should not be NULL");
-	wapp_debug_assert(filepath->size < WAPP_PATH_MAX, "`filepath` exceeds max path limit.");
-	return _file_remove(filepath);
+i32 wapp_file_close(File *file) {
+  wapp_debug_assert(file != NULL, "`file` should not be NULL.");
+  return fclose(file);
 }
--- a/src/os/file/file.h
+++ b/src/os/file/file.h
@@ -3,58 +3,51 @@
 #ifndef FILE_H
 #define FILE_H

-#include "../../base/mem/allocator/mem_allocator.h"
 #include "../../common/aliases/aliases.h"
 #include "../../base/strings/str8/str8.h"
+#include <stdio.h>

 #ifdef WAPP_PLATFORM_CPP
 BEGIN_C_LINKAGE
 #endif // !WAPP_PLATFORM_CPP

-typedef struct WFile WFile;
+typedef FILE File;

 typedef enum {
-	WAPP_ACCESS_READ,                       // Equivalent to r
-	WAPP_ACCESS_WRITE,                      // Equivalent to w
-	WAPP_ACCESS_APPEND,                     // Equivalent to a
-	WAPP_ACCESS_READ_EX,                    // Equivalent to r+
-	WAPP_ACCESS_WRITE_EX,                   // Equivalent to w+
-	WAPP_ACCESS_APPEND_EX,                  // Equivalent to a+
-	WAPP_ACCESS_WRITE_FAIL_ON_EXIST,        // Equivalent to wx
-	WAPP_ACCESS_WRITE_FAIL_ON_EXIST_EX,     // Equivalent to wx+
+  WAPP_FA_MODE_R,      // Equivalent to r
+  WAPP_FA_MODE_W,      // Equivalent to w
+  WAPP_FA_MODE_A,      // Equivalent to a
+  WAPP_FA_MODE_R_EX,   // Equivalent to r+
+  WAPP_FA_MODE_W_EX,   // Equivalent to w+
+  WAPP_FA_MODE_A_EX,   // Equivalent to a+
+  WAPP_FA_MODE_RB,     // Equivalent to rb
+  WAPP_FA_MODE_WB,     // Equivalent to wb
+  WAPP_FA_MODE_AB,     // Equivalent to ab
+  WAPP_FA_MODE_RB_EX,  // Equivalent to rb+
+  WAPP_FA_MODE_WB_EX,  // Equivalent to wb+
+  WAPP_FA_MODE_AB_EX,  // Equivalent to ab+
+  WAPP_FA_MODE_WX,     // Equivalent to wx
+  WAPP_FA_MODE_WX_EX,  // Equivalent to wx+
+  WAPP_FA_MODE_WBX,    // Equivalent to wbx
+  WAPP_FA_MODE_WBX_EX, // Equivalent to wbx+

-	FILE_ACCESS_MODE_COUNT,
+  FILE_ACCESS_MODE_COUNT,
 } FileAccessMode;

 typedef enum {
-	WAPP_SEEK_START,
-	WAPP_SEEK_CURRENT,
-	WAPP_SEEK_END,
-
-	FILE_SEEK_ORIGIN_COUNT,
+  WAPP_SEEK_START   = SEEK_SET,
+  WAPP_SEEK_CURRENT = SEEK_CUR,
+  WAPP_SEEK_END     = SEEK_END,
 } FileSeekOrigin;

-WFile *wapp_file_open(const Allocator *allocator, Str8RO *filepath, FileAccessMode mode);
-i64    wapp_file_get_current_position(WFile *file);
-i64    wapp_file_seek(WFile *file, i64 offset, FileSeekOrigin origin);
-i64    wapp_file_get_length(WFile *file);
-u64    wapp_file_read(void *dst_buf, WFile *file, u64 byte_count);
-i64    wapp_file_write(const void *src_buf, WFile *file, u64 byte_count);
-u64    wapp_file_read_array(GenericArray dst_buf, WFile *file, u64 item_count);
-i64    wapp_file_write_array(const GenericArray src_buf, WFile *file, u64 item_count);
-i32    wapp_file_flush(WFile *file);
-i32    wapp_file_close(WFile *file);
-i32    wapp_file_rename(Str8RO *old_filepath, Str8RO *new_filepath);
-i32    wapp_file_remove(Str8RO *filepath);
-
-extern WFile *_file_open(const Allocator *allocator, Str8RO *filepath, FileAccessMode mode);
-extern i64    _file_seek(WFile *file, i64 offset, FileSeekOrigin origin);
-extern u64    _file_read(void *dst_buf, u64 byte_count, WFile *file, u64 file_length);
-extern i64    _file_write(const void *src_buf, WFile *file, u64 byte_count);
-extern i32    _file_flush(WFile *file);
-extern i32    _file_close(WFile *file);
-extern i32    _file_rename(Str8RO *old_filepath, Str8RO *new_filepath);
-extern i32    _file_remove(Str8RO *filepath);
+File *wapp_file_open(Str8RO *filename, FileAccessMode mode);
+u64   wapp_file_get_current_position(File *file);
+i32   wapp_file_seek(File *file, u64 offset, FileSeekOrigin origin);
+u64   wapp_file_get_length(File *file);
+u64   wapp_file_read(GenericArray *dst_buf, File *file, u64 item_count);
+u64   wapp_file_write(const GenericArray *src_buf, File *file, u64 item_count);
+i32   wapp_file_flush(File *file);
+i32   wapp_file_close(File *file);

 #ifdef WAPP_PLATFORM_CPP
 END_C_LINKAGE
--- a/src/os/file/posix/file_posix.c
+++ b/src/os/file/posix/file_posix.c
@@ -1,119 +0,0 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
-#include "file_posix.h"
-#include "../../../common/platform/platform.h"
-
-#ifdef WAPP_PLATFORM_POSIX
-
-#include "../file.h"
-#include "../../cpath/cpath.h"
-#include "../../../common/aliases/aliases.h"
-#include "../../../base/array/array.h"
-#include "../../../base/strings/str8/str8.h"
-
-#ifdef WAPP_PLATFORM_APPLE
-#define _FILE_OFFSET_BITS 64
-#define lseek64 lseek
-#endif // !WAPP_PLATFORM_APPLE
-
-#define __USE_LARGEFILE64
-#include <fcntl.h>
-#include <unistd.h>
-#include <sys/types.h>
-
-wapp_intern i32 file_flags[FILE_ACCESS_MODE_COUNT] = {
-	[WAPP_ACCESS_READ]                       = O_RDONLY,
-	[WAPP_ACCESS_WRITE]                      = O_WRONLY | O_CREAT,
-	[WAPP_ACCESS_APPEND]                     = O_WRONLY | O_APPEND | O_CREAT,
-	[WAPP_ACCESS_READ_EX]                    = O_RDWR,
-	[WAPP_ACCESS_WRITE_EX]                   = O_RDWR | O_CREAT,
-	[WAPP_ACCESS_APPEND_EX]                  = O_RDWR | O_APPEND | O_CREAT,
-	[WAPP_ACCESS_WRITE_FAIL_ON_EXIST]        = O_WRONLY | O_CREAT | O_EXCL,
-	[WAPP_ACCESS_WRITE_FAIL_ON_EXIST_EX]     = O_RDWR | O_CREAT | O_EXCL,
-};
-
-wapp_intern mode_t file_modes[FILE_ACCESS_MODE_COUNT] = {
-	[WAPP_ACCESS_READ]                       = 0,
-	[WAPP_ACCESS_WRITE]                      = S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP,
-	[WAPP_ACCESS_APPEND]                     = S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP,
-	[WAPP_ACCESS_READ_EX]                    = 0,
-	[WAPP_ACCESS_WRITE_EX]                   = S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP,
-	[WAPP_ACCESS_APPEND_EX]                  = S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP,
-	[WAPP_ACCESS_WRITE_FAIL_ON_EXIST]        = S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP,
-	[WAPP_ACCESS_WRITE_FAIL_ON_EXIST_EX]     = S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP,
-};
-
-wapp_intern i32 file_seek_origins[FILE_SEEK_ORIGIN_COUNT] = {
-	[WAPP_SEEK_START]   = SEEK_SET,
-	[WAPP_SEEK_CURRENT] = SEEK_CUR,
-	[WAPP_SEEK_END]     = SEEK_END,
-};
-
-WFile *_file_open(const Allocator *allocator, Str8RO *filepath, FileAccessMode mode) {
-	wapp_persist c8 tmp[WAPP_PATH_MAX] = {0};
-	memset(tmp, 0, WAPP_PATH_MAX);
-	memcpy(tmp, filepath->buf, filepath->size);
-
-	i32 fd = open((const char *)tmp, file_flags[mode], file_modes[mode]);
-	if (fd < 0) {
-		return NULL;
-	}
-
-	WFile *output = wapp_mem_allocator_alloc(allocator, sizeof(WFile));
-	if (output) {
-		output->fd = fd;
-	}
-
-	return output;
-}
-
-i64 _file_seek(WFile *file, i64 offset, FileSeekOrigin origin) {
-	return lseek64(file->fd, offset, file_seek_origins[origin]);
-}
-
-u64 _file_read(void *dst_buf, u64 byte_count, WFile *file, u64 file_length) {
-	u64 copy_byte_count = file_length <= byte_count ? file_length : byte_count;
-
-	i64 count = read(file->fd, dst_buf, copy_byte_count);
-	if (count < 0) { return 0; }
-
-	return count;
-}
-
-i64 _file_write(const void *src_buf, WFile *file, u64 byte_count) {
-	return write(file->fd, src_buf, byte_count);
-}
-
-i32 _file_flush(WFile *file) {
-	return fsync(file->fd);
-}
-
-i32 _file_close(WFile *file) {
-	return close(file->fd);
-}
-
-i32 _file_rename(Str8RO *old_filepath, Str8RO *new_filepath) {
-	wapp_persist c8 old_tmp[WAPP_PATH_MAX] = {0};
-	wapp_persist c8 new_tmp[WAPP_PATH_MAX] = {0};
-	memset(old_tmp, 0, WAPP_PATH_MAX);
-	memcpy(old_tmp, old_filepath->buf, old_filepath->size);
-	memset(new_tmp, 0, WAPP_PATH_MAX);
-	memcpy(new_tmp, new_filepath->buf, new_filepath->size);
-
-	i32 link_result = link((const char *)old_tmp, (const char *)new_tmp);
-	if (link_result == 0) {
-		_file_remove(old_filepath);
-	}
-
-	return link_result;
-}
-
-i32 _file_remove(Str8RO *filepath) {
-	wapp_persist c8 tmp[WAPP_PATH_MAX] = {0};
-	memset(tmp, 0, WAPP_PATH_MAX);
-	memcpy(tmp, filepath->buf, filepath->size);
-
-	return unlink((const char *)tmp);
-}
-
-#endif // !WAPP_PLATFORM_POSIX
--- a/src/os/file/posix/file_posix.h
+++ b/src/os/file/posix/file_posix.h
@@ -1,27 +0,0 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
-#ifndef FILE_POSIX_H
-#define FILE_POSIX_H
-
-#include "../../../common/aliases/aliases.h"
-#include "../../../common/platform/platform.h"
-
-#ifdef WAPP_PLATFORM_CPP
-BEGIN_C_LINKAGE
-#endif // !WAPP_PLATFORM_CPP
-
-#ifdef WAPP_PLATFORM_POSIX
-
-#define END_OF_LINE "\n"
-
-struct WFile {
-	i32 fd;
-};
-
-#endif // !WAPP_PLATFORM_POSIX
-
-#ifdef WAPP_PLATFORM_CPP
-END_C_LINKAGE
-#endif // !WAPP_PLATFORM_CPP
-
-#endif // !FILE_POSIX_H
--- a/src/os/file/win/file_win.c
+++ b/src/os/file/win/file_win.c
@@ -1,159 +0,0 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
-#include "file_win.h"
-#include "../../../common/platform/platform.h"
-
-#ifdef WAPP_PLATFORM_WINDOWS
-
-#include "../file.h"
-#include "../../cpath/cpath.h"
-#include "../../../common/aliases/aliases.h"
-#include "../../../base/array/array.h"
-#include "../../../base/strings/str8/str8.h"
-#define WIN32_LEAN_AND_MEAN
-#include <Windows.h>
-#include <fileapi.h>
-#include <intsafe.h>
-
-wapp_intern DWORD file_accesses[FILE_ACCESS_MODE_COUNT] = {
-	[WAPP_ACCESS_READ]                       = FILE_READ_DATA,
-	[WAPP_ACCESS_WRITE]                      = FILE_WRITE_DATA,
-	[WAPP_ACCESS_APPEND]                     = FILE_APPEND_DATA,
-	[WAPP_ACCESS_READ_EX]                    = FILE_READ_DATA | FILE_WRITE_DATA,
-	[WAPP_ACCESS_WRITE_EX]                   = FILE_READ_DATA | FILE_WRITE_DATA,
-	[WAPP_ACCESS_APPEND_EX]                  = FILE_READ_DATA | FILE_APPEND_DATA,
-	[WAPP_ACCESS_WRITE_FAIL_ON_EXIST]        = FILE_WRITE_DATA,
-	[WAPP_ACCESS_WRITE_FAIL_ON_EXIST_EX]     = FILE_READ_DATA | FILE_WRITE_DATA,
-};
-
-wapp_intern DWORD creation_dispositions[FILE_ACCESS_MODE_COUNT] = {
-	[WAPP_ACCESS_READ]                       = OPEN_EXISTING,
-	[WAPP_ACCESS_WRITE]                      = CREATE_ALWAYS,
-	[WAPP_ACCESS_APPEND]                     = OPEN_ALWAYS,
-	[WAPP_ACCESS_READ_EX]                    = OPEN_EXISTING,
-	[WAPP_ACCESS_WRITE_EX]                   = CREATE_ALWAYS,
-	[WAPP_ACCESS_APPEND_EX]                  = OPEN_ALWAYS,
-	[WAPP_ACCESS_WRITE_FAIL_ON_EXIST]        = CREATE_NEW,
-	[WAPP_ACCESS_WRITE_FAIL_ON_EXIST_EX]     = CREATE_NEW,
-};
-
-wapp_intern DWORD sharing_modes[FILE_ACCESS_MODE_COUNT] = {
-	[WAPP_ACCESS_READ]                       = FILE_SHARE_READ | FILE_SHARE_WRITE,
-	[WAPP_ACCESS_WRITE]                      = FILE_SHARE_READ,
-	[WAPP_ACCESS_APPEND]                     = FILE_SHARE_READ,
-	[WAPP_ACCESS_READ_EX]                    = FILE_SHARE_READ | FILE_SHARE_WRITE,
-	[WAPP_ACCESS_WRITE_EX]                   = FILE_SHARE_READ,
-	[WAPP_ACCESS_APPEND_EX]                  = FILE_SHARE_READ,
-	[WAPP_ACCESS_WRITE_FAIL_ON_EXIST]        = FILE_SHARE_READ,
-	[WAPP_ACCESS_WRITE_FAIL_ON_EXIST_EX]     = FILE_SHARE_READ,
-};
-
-wapp_intern DWORD file_seek_origins[FILE_SEEK_ORIGIN_COUNT] = {
-	[WAPP_SEEK_START]   = FILE_BEGIN,
-	[WAPP_SEEK_CURRENT] = FILE_CURRENT,
-	[WAPP_SEEK_END]     = FILE_END,
-};
-
-WFile *_file_open(const Allocator *allocator, Str8RO *filepath, FileAccessMode mode) {
-	wapp_persist c8 tmp[WAPP_PATH_MAX] = {0};
-	memset(tmp, 0, WAPP_PATH_MAX);
-	memcpy(tmp, filepath->buf, filepath->size);
-
-	HANDLE fh = CreateFileA((LPCSTR)tmp,
-	                        file_accesses[mode],
-	                        sharing_modes[mode],
-	                        NULL,
-	                        creation_dispositions[mode],
-	                        FILE_ATTRIBUTE_NORMAL,
-	                        NULL);
-	if (fh == INVALID_HANDLE_VALUE) {
-		return NULL;
-	}
-
-	WFile *output = wapp_mem_allocator_alloc(allocator, sizeof(WFile));
-	if (output) {
-		output->fh = fh;
-	}
-
-	return output;
-}
-
-i64 _file_seek(WFile *file, i64 offset, FileSeekOrigin origin) {
-	LARGE_INTEGER distance = {0};
-	LARGE_INTEGER output   = {0};
-
-	distance.QuadPart = offset;
-
-	if (!SetFilePointerEx(file->fh, distance, &output, file_seek_origins[origin])) {
-		return -1;
-	}
-
-	return output.QuadPart;
-}
-
-u64 _file_read(void* dst_buf, u64 byte_count, WFile* file, u64 file_length) {
-	u64 copy_byte_count = file_length <= byte_count ? file_length : byte_count;
-	wapp_debug_assert(copy_byte_count <= DWORD_MAX, "Attempting to read large number of bytes at once");
-
-	DWORD read_count = 0;
-	if (!ReadFile(file->fh, dst_buf, (DWORD)copy_byte_count, &read_count, NULL)) {
-		return 0;
-	}
-
-	return (u64)read_count;
-}
-
-i64 _file_write(const void *src_buf, WFile *file, u64 byte_count) {
-	wapp_debug_assert(byte_count <= DWORD_MAX, "Attempting to write large number of bytes at once");
-
-	DWORD write_count = 0;
-	if (!WriteFile(file->fh, src_buf, (DWORD)byte_count, &write_count, NULL)) {
-		return 0;
-	}
-	return (i64)write_count;
-}
-
-i32 _file_flush(WFile *file) {
-	if (!FlushFileBuffers(file->fh)) {
-		return -1;
-	}
-
-	return 0;
-}
-
-i32 _file_close(WFile *file) {
-	if (!CloseHandle(file->fh)) {
-		return -1;
-	}
-
-	return 0;
-}
-
-i32 _file_rename(Str8RO *old_filepath, Str8RO *new_filepath) {
-	wapp_persist c8 old_tmp[WAPP_PATH_MAX] = {0};
-	wapp_persist c8 new_tmp[WAPP_PATH_MAX] = {0};
-	memset(old_tmp, 0, WAPP_PATH_MAX);
-	memcpy(old_tmp, old_filepath->buf, old_filepath->size);
-	memset(new_tmp, 0, WAPP_PATH_MAX);
-	memcpy(new_tmp, new_filepath->buf, new_filepath->size);
-
-	if (!MoveFile((LPCSTR)old_tmp, (LPCSTR)new_tmp)) {
-		return -1;
-	}
-
-	return 0;
-}
-
-i32 _file_remove(Str8RO *filepath) {
-	wapp_persist c8 tmp[WAPP_PATH_MAX] = {0};
-	memset(tmp, 0, WAPP_PATH_MAX);
-	memcpy(tmp, filepath->buf, filepath->size);
-
-	if (!DeleteFile((LPCSTR)tmp)) {
-		return -1;
-	}
-
-	return 0;
-}
-
-#endif // !WAPP_PLATFORM_WINDOWS
--- a/src/os/file/win/file_win.h
+++ b/src/os/file/win/file_win.h
@@ -1,31 +0,0 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
-#ifndef FILE_WIN_H
-#define FILE_WIN_H
-
-#include "../../../common/aliases/aliases.h"
-#include "../../../common/platform/platform.h"
-
-#ifdef WAPP_PLATFORM_CPP
-BEGIN_C_LINKAGE
-#endif // !WAPP_PLATFORM_CPP
-
-#ifdef WAPP_PLATFORM_WINDOWS
-
-#define END_OF_LINE "\r\n"
-
-#define WIN32_LEAN_AND_MEAN
-#include <Windows.h>
-#include <fileapi.h>
-
-struct WFile {
-	HANDLE fh;
-};
-
-#endif // !WAPP_PLATFORM_WINDOWS
-
-#ifdef WAPP_PLATFORM_CPP
-END_C_LINKAGE
-#endif // !WAPP_PLATFORM_CPP
-
-#endif // !FILE_WIN_H
--- a/src/os/mem/mem_os.c
+++ b/src/os/mem/mem_os.c
@@ -15,16 +15,16 @@
 #error "Unrecognised platform"
 #endif

-void *wapp_os_mem_alloc(void *addr, u64 size, MemAccess access, MemAllocFlags flags, MemInitType type) {
-	void *output = os_mem_allocate(addr, size, access, flags, type);
+void *wapp_mem_util_alloc(void *addr, u64 size, MemAccess access, MemAllocFlags flags, MemInitType type) {
+  void *output = mem_util_allocate(addr, size, access, flags, type);

-	if (type == WAPP_MEM_INIT_INITIALISED) {
-		memset(output, 0, size);
-	}
+  if (type == WAPP_MEM_INIT_INITIALISED) {
+    memset(output, 0, size);
+  }

-	return output;
+  return output;
 }

-void wapp_os_mem_free(void *ptr, u64 size) {
-	os_mem_free(ptr, size);
+void wapp_mem_util_free(void *ptr, u64 size) {
+  mem_util_free(ptr, size);
 }
--- a/src/os/mem/mem_os.h
+++ b/src/os/mem/mem_os.h
@@ -20,11 +20,11 @@ BEGIN_C_LINKAGE
 #error "Unrecognised platform"
 #endif

-void *wapp_os_mem_alloc(void *addr, u64 size, MemAccess access, MemAllocFlags flags, MemInitType type);
-void wapp_os_mem_free(void *ptr, u64 size);
+void *wapp_mem_util_alloc(void *addr, u64 size, MemAccess access, MemAllocFlags flags, MemInitType type);
+void wapp_mem_util_free(void *ptr, u64 size);

-wapp_extern void *os_mem_allocate(void *addr, u64 size, MemAccess access, MemAllocFlags flags, MemInitType type);
-wapp_extern void os_mem_free(void *ptr, u64 size);
+wapp_extern void *mem_util_allocate(void *addr, u64 size, MemAccess access, MemAllocFlags flags, MemInitType type);
+wapp_extern void mem_util_free(void *ptr, u64 size);

 #ifdef WAPP_PLATFORM_CPP
 END_C_LINKAGE
--- a/src/os/mem/mem_os_ops.h
+++ b/src/os/mem/mem_os_ops.h
@@ -10,17 +10,17 @@ BEGIN_C_LINKAGE
 #endif // !WAPP_PLATFORM_CPP

 typedef enum mem_access {
-	WAPP_MEM_ACCESS_NONE,
-	WAPP_MEM_ACCESS_READ_ONLY,
-	WAPP_MEM_ACCESS_EXEC_ONLY,
-	WAPP_MEM_ACCESS_READ_WRITE,
-	WAPP_MEM_ACCESS_READ_EXEC,
-	WAPP_MEM_ACCESS_READ_WRITE_EXEC,
+  WAPP_MEM_ACCESS_NONE,
+  WAPP_MEM_ACCESS_READ_ONLY,
+  WAPP_MEM_ACCESS_EXEC_ONLY,
+  WAPP_MEM_ACCESS_READ_WRITE,
+  WAPP_MEM_ACCESS_READ_EXEC,
+  WAPP_MEM_ACCESS_READ_WRITE_EXEC,
 } MemAccess;

 typedef enum mem_init_type {
-	WAPP_MEM_INIT_UNINITIALISED,
-	WAPP_MEM_INIT_INITIALISED,
+  WAPP_MEM_INIT_UNINITIALISED,
+  WAPP_MEM_INIT_INITIALISED,
 } MemInitType;

 #ifdef WAPP_PLATFORM_CPP
--- a/src/os/mem/posix/mem_os_posix.c
+++ b/src/os/mem/posix/mem_os_posix.c
@@ -10,27 +10,27 @@
 #include <sys/mman.h>

 wapp_intern const i32 access_types[] = {
-	[WAPP_MEM_ACCESS_NONE]            = PROT_NONE,
-	[WAPP_MEM_ACCESS_READ_ONLY]       = PROT_READ,
-	[WAPP_MEM_ACCESS_EXEC_ONLY]       = PROT_EXEC,
-	[WAPP_MEM_ACCESS_READ_WRITE]      = PROT_READ | PROT_WRITE,
-	[WAPP_MEM_ACCESS_READ_EXEC]       = PROT_READ | PROT_EXEC,
-	[WAPP_MEM_ACCESS_READ_WRITE_EXEC] = PROT_READ | PROT_WRITE | PROT_EXEC,
+    [WAPP_MEM_ACCESS_NONE]            = PROT_NONE,
+    [WAPP_MEM_ACCESS_READ_ONLY]       = PROT_READ,
+    [WAPP_MEM_ACCESS_EXEC_ONLY]       = PROT_EXEC,
+    [WAPP_MEM_ACCESS_READ_WRITE]      = PROT_READ | PROT_WRITE,
+    [WAPP_MEM_ACCESS_READ_EXEC]       = PROT_READ | PROT_EXEC,
+    [WAPP_MEM_ACCESS_READ_WRITE_EXEC] = PROT_READ | PROT_WRITE | PROT_EXEC,
 };

-void *os_mem_allocate(void *addr, u64 size, MemAccess access, MemAllocFlags flags, MemInitType type) {
-	(void)type;
-	i32 alloc_flags = flags | MAP_ANON | MAP_PRIVATE;
+void *mem_util_allocate(void *addr, u64 size, MemAccess access, MemAllocFlags flags, MemInitType type) {
+  (void)type;
+  i32 alloc_flags = flags | MAP_ANON | MAP_PRIVATE;

 #if defined(WAPP_PLATFORM_LINUX) || defined(WAPP_PLATFORM_GNU) || defined(WAPP_PLATFORM_NET_BSD)
-	alloc_flags |= MAP_NORESERVE;
+  alloc_flags |= MAP_NORESERVE;
 #endif

-	return mmap(addr, size, access_types[access], alloc_flags, -1, 0);
+  return mmap(addr, size, access_types[access], alloc_flags, -1, 0);
 }

-void os_mem_free(void *ptr, u64 size) {
-	munmap(ptr, size);
+void mem_util_free(void *ptr, u64 size) {
+  munmap(ptr, size);
 }

 #endif // !WAPP_PLATFORM_POSIX
--- a/src/os/mem/posix/mem_os_posix.h
+++ b/src/os/mem/posix/mem_os_posix.h
@@ -15,14 +15,14 @@ BEGIN_C_LINKAGE

 typedef enum mem_alloc_flags {
 #if defined(WAPP_PLATFORM_LINUX) || defined(WAPP_PLATFORM_GNU)
-	WAPP_MEM_ALLOC_RESERVE = 0,
-	WAPP_MEM_ALLOC_COMMIT  = MAP_POPULATE,
+  WAPP_MEM_ALLOC_RESERVE = 0,
+  WAPP_MEM_ALLOC_COMMIT  = MAP_POPULATE,
 #elif defined(WAPP_PLATFORM_FREE_BSD)
-	WAPP_MEM_ALLOC_RESERVE = 0,
-	WAPP_MEM_ALLOC_COMMIT  = MAP_PREFAULT_READ,
+  WAPP_MEM_ALLOC_RESERVE = 0,
+  WAPP_MEM_ALLOC_COMMIT  = MAP_PREFAULT_READ,
 #elif defined(WAPP_PLATFORM_BSD) || defined(WAPP_PLATFORM_UNIX) || defined(WAPP_PLATFORM_APPLE)
-	WAPP_MEM_ALLOC_RESERVE = 0,
-	WAPP_MEM_ALLOC_COMMIT  = 0,
+  WAPP_MEM_ALLOC_RESERVE = 0,
+  WAPP_MEM_ALLOC_COMMIT  = 0,
 #endif
 } MemAllocFlags;

--- a/src/os/mem/win/mem_os_win.c
+++ b/src/os/mem/win/mem_os_win.c
@@ -13,25 +13,25 @@
 #include <memoryapi.h>

 wapp_intern const i32 access_types[] = {
-	[WAPP_MEM_ACCESS_NONE]            = PAGE_NOACCESS,
-	[WAPP_MEM_ACCESS_READ_ONLY]       = PAGE_READONLY,
-	[WAPP_MEM_ACCESS_EXEC_ONLY]       = PAGE_EXECUTE,
-	[WAPP_MEM_ACCESS_READ_WRITE]      = PAGE_READWRITE,
-	[WAPP_MEM_ACCESS_READ_EXEC]       = PAGE_EXECUTE_READ,
-	[WAPP_MEM_ACCESS_READ_WRITE_EXEC] = PAGE_EXECUTE_READWRITE,
+    [WAPP_MEM_ACCESS_NONE]            = PAGE_NOACCESS,
+    [WAPP_MEM_ACCESS_READ_ONLY]       = PAGE_READONLY,
+    [WAPP_MEM_ACCESS_EXEC_ONLY]       = PAGE_EXECUTE,
+    [WAPP_MEM_ACCESS_READ_WRITE]      = PAGE_READWRITE,
+    [WAPP_MEM_ACCESS_READ_EXEC]       = PAGE_EXECUTE_READ,
+    [WAPP_MEM_ACCESS_READ_WRITE_EXEC] = PAGE_EXECUTE_READWRITE,
 };

-void *os_mem_allocate(void *addr, u64 size, MemAccess access, MemAllocFlags flags, MemInitType type) {
-	// Ensure memory is committed if it's meant to be initialised
-	if (type == WAPP_MEM_INIT_INITIALISED) {
-		flags |= WAPP_MEM_ALLOC_COMMIT;
-	}
+void *mem_util_allocate(void *addr, u64 size, MemAccess access, MemAllocFlags flags, MemInitType type) {
+  // Ensure memory is committed if it's meant to be initialised
+  if (type == WAPP_MEM_INIT_INITIALISED) {
+    flags |= WAPP_MEM_ALLOC_COMMIT;
+  }

-	return VirtualAlloc(addr, (SIZE_T)size, flags, access_types[access]);
+  return VirtualAlloc(addr, (SIZE_T)size, flags, access_types[access]);
 }

-void os_mem_free(void *ptr, u64 size) {
-	VirtualFree(ptr, size, MEM_RELEASE);
+void mem_util_free(void *ptr, u64 size) {
+  VirtualFree(ptr, size, MEM_RELEASE);
 }

 #endif // !WAPP_PLATFORM_WINDOWS
--- a/src/os/mem/win/mem_os_win.h
+++ b/src/os/mem/win/mem_os_win.h
@@ -16,8 +16,8 @@ BEGIN_C_LINKAGE
 #include <memoryapi.h>

 typedef enum mem_alloc_flags {
-	WAPP_MEM_ALLOC_RESERVE = MEM_RESERVE,
-	WAPP_MEM_ALLOC_COMMIT  = MEM_COMMIT,
+  WAPP_MEM_ALLOC_RESERVE = MEM_RESERVE,
+  WAPP_MEM_ALLOC_COMMIT  = MEM_COMMIT,
 } MemAllocFlags;

 #endif // !WAPP_PLATFORM_WINDOWS
--- a/src/os/shell/commander/commander.c
+++ b/src/os/shell/commander/commander.c
@@ -17,85 +17,85 @@
 #define CMD_BUF_LEN 8192
 #define OUT_BUF_LEN 4096

-wapp_intern CMDResult execute_command(Str8RO *cmd, CMDOutHandling out_handling, Str8 *out_buf);
-wapp_intern CMDError get_command_output(FILE *fp, CMDOutHandling out_handling, Str8 *out_buf);
+wapp_intern inline CMDResult execute_command(Str8RO *cmd, CMDOutHandling out_handling, Str8 *out_buf);
+wapp_intern inline CMDError get_command_output(FILE *fp, CMDOutHandling out_handling, Str8 *out_buf);

 CMDResult wapp_shell_commander_execute(CMDOutHandling out_handling, Str8 *out_buf, const Str8List *cmd) {
-	if (!cmd) {
-		return CMD_NO_EXIT(SHELL_ERR_INVALID_ARGS);
-	}
+  if (!cmd) {
+    return CMD_NO_EXIT(SHELL_ERR_INVALID_ARGS);
+  }

-	Allocator arena = wapp_mem_arena_allocator_init(KiB(500));
+  Allocator arena = wapp_mem_arena_allocator_init(KB(500));

-	Str8 *cmd_str = wapp_str8_join(&arena, cmd, &wapp_str8_lit_ro(" "));
-	if (!cmd_str) {
-		wapp_mem_arena_allocator_destroy(&arena);
-		return CMD_NO_EXIT(SHELL_ERR_ALLOCATION_FAIL);
-	}
+  Str8 *cmd_str = wapp_str8_join(&arena, cmd, &wapp_str8_lit_ro(" "));
+  if (!cmd_str) {
+    wapp_mem_arena_allocator_destroy(&arena);
+    return CMD_NO_EXIT(SHELL_ERR_ALLOCATION_FAIL);
+  }

-	// Redirect output
-	cmd_str = wapp_str8_alloc_concat(&arena, cmd_str, &wapp_str8_lit_ro(" 2>&1"));
+  // Redirect output
+  cmd_str = wapp_str8_alloc_concat(&arena, cmd_str, &wapp_str8_lit_ro(" 2>&1"));

-	CMDResult output = execute_command(cmd_str, out_handling, out_buf);
+  CMDResult output = execute_command(cmd_str, out_handling, out_buf);

-	wapp_mem_arena_allocator_destroy(&arena);
+  wapp_mem_arena_allocator_destroy(&arena);

-	return output;
+  return output;
 }

-wapp_intern CMDResult execute_command(Str8RO *cmd, CMDOutHandling out_handling, Str8 *out_buf) {
-	char cmd_buf[CMD_BUF_LEN] = {0};
-	wapp_str8_copy_to_cstr(cmd_buf, cmd, CMD_BUF_LEN);
+wapp_intern inline CMDResult execute_command(Str8RO *cmd, CMDOutHandling out_handling, Str8 *out_buf) {
+  char cmd_buf[CMD_BUF_LEN] = {0};
+  wapp_str8_copy_to_cstr(cmd_buf, cmd, CMD_BUF_LEN);

-	FILE *fp = wapp_shell_utils_popen(cmd_buf, "r");
-	if (!fp) {
-		return CMD_NO_EXIT(SHELL_ERR_PROC_START_FAIL);
-	}
+  FILE *fp = wapp_shell_utils_popen(cmd_buf, "r");
+  if (!fp) {
+    return CMD_NO_EXIT(SHELL_ERR_PROC_START_FAIL);
+  }

-	CMDResult output;
+  CMDResult output;

-	CMDError err = get_command_output(fp, out_handling, out_buf);
-	if (err > SHELL_ERR_NO_ERROR) {
-		output = CMD_NO_EXIT(err);
-		goto EXECUTE_COMMAND_CLOSE;
-	}
+  CMDError err = get_command_output(fp, out_handling, out_buf);
+  if (err > SHELL_ERR_NO_ERROR) {
+    output = CMD_NO_EXIT(err);
+    goto EXECUTE_COMMAND_CLOSE;
+  }

-	i32 st = EXIT_SUCCESS;
-	err = get_output_status(fp, &st);
-	if (err > SHELL_ERR_NO_ERROR) {
-		output = CMD_NO_EXIT(err);
-		goto EXECUTE_COMMAND_CLOSE;
-	}
+  i32 st = EXIT_SUCCESS;
+  err = get_output_status(fp, &st);
+  if (err > SHELL_ERR_NO_ERROR) {
+    output = CMD_NO_EXIT(err);
+    goto EXECUTE_COMMAND_CLOSE;
+  }

-	// Process is already closed in get_output_status
-	fp = NULL;
+  // Process is already closed in get_output_status
+  fp = NULL;

-	output = (CMDResult){
-		.exited    = true,
-		.exit_code = st,
-		.error     = SHELL_ERR_NO_ERROR,
-	};
+  output = (CMDResult){
+      .exited = true,
+      .exit_code = st,
+      .error = SHELL_ERR_NO_ERROR,
+  };

 EXECUTE_COMMAND_CLOSE:
-	if (fp) {
-		wapp_shell_utils_pclose(fp);
-	}
-	return output;
+  if (fp) {
+    wapp_shell_utils_pclose(fp);
+  }
+  return output;
 }

-wapp_intern CMDError get_command_output(FILE *fp, CMDOutHandling out_handling, Str8 *out_buf) {
-	Str8 out = wapp_str8_buf(OUT_BUF_LEN);
+wapp_intern inline CMDError get_command_output(FILE *fp, CMDOutHandling out_handling, Str8 *out_buf) {
+  Str8 out = wapp_str8_buf(OUT_BUF_LEN);

-	out.size = fread((void *)out.buf, sizeof(u8), out.capacity, fp);
-	if (out_handling == SHELL_OUTPUT_CAPTURE && out_buf != NULL) {
-		if (out.size >= out_buf->capacity) {
-			return SHELL_ERR_OUT_BUF_FULL;
-		}
+  out.size = fread((void *)out.buf, sizeof(u8), out.capacity, fp);
+  if (out_handling == SHELL_OUTPUT_CAPTURE && out_buf != NULL) {
+    if (out.size >= out_buf->capacity) {
+      return SHELL_ERR_OUT_BUF_FULL;
+    }

-		wapp_str8_concat_capped(out_buf, &out);
-	} else if (out_handling == SHELL_OUTPUT_PRINT) {
-		printf(WAPP_STR8_SPEC, wapp_str8_varg(out));
-	}
+    wapp_str8_concat_capped(out_buf, &out);
+  } else if (out_handling == SHELL_OUTPUT_PRINT) {
+    printf(WAPP_STR8_SPEC, wapp_str8_varg(out));
+  }

-	return SHELL_ERR_NO_ERROR;
+  return SHELL_ERR_NO_ERROR;
 }
--- a/src/os/shell/commander/commander_output.h
+++ b/src/os/shell/commander/commander_output.h
@@ -5,34 +5,36 @@

 #include "../../../common/aliases/aliases.h"
 #include "../../../common/platform/platform.h"
-#include "../../../common/misc/misc_utils.h"

 #ifdef WAPP_PLATFORM_CPP
 BEGIN_C_LINKAGE
 #endif // !WAPP_PLATFORM_CPP

 typedef enum {
-	SHELL_OUTPUT_DISCARD,
-	SHELL_OUTPUT_PRINT,
-	SHELL_OUTPUT_CAPTURE,
+  SHELL_OUTPUT_DISCARD,
+  SHELL_OUTPUT_PRINT,
+  SHELL_OUTPUT_CAPTURE,
 } CMDOutHandling;

 typedef enum {
-	SHELL_ERR_NO_ERROR,
-	SHELL_ERR_INVALID_ARGS,
-	SHELL_ERR_ALLOCATION_FAIL,
-	SHELL_ERR_PROC_START_FAIL,
-	SHELL_ERR_OUT_BUF_FULL,
-	SHELL_ERR_PROC_EXIT_FAIL,
+  SHELL_ERR_NO_ERROR,
+  SHELL_ERR_INVALID_ARGS,
+  SHELL_ERR_ALLOCATION_FAIL,
+  SHELL_ERR_PROC_START_FAIL,
+  SHELL_ERR_OUT_BUF_FULL,
+  SHELL_ERR_PROC_EXIT_FAIL,
 } CMDError;

-typedef struct CMDResult CMDResult;
-struct CMDResult {
-	i32 exit_code;
-	CMDError error;
-	b8 exited;
+typedef struct commander_result CMDResult;
+struct commander_result {
+  i32 exit_code;
+  CMDError error;
+  b8 exited;

-	wapp_misc_utils_reserve_padding(sizeof(b8) + sizeof(i32) + sizeof(CMDError));
+#ifdef WAPP_PLATFORM_WINDOWS
+  #include "../../../../common/misc/misc_utils.h"
+  wapp_misc_utils_padding_size(sizeof(b8) + sizeof(i32) + sizeof(CMDError));
+#endif // !WAPP_PLATFORM_WINDOWS
 };

 #ifdef WAPP_PLATFORM_CPP
--- a/src/os/shell/commander/posix/commander_posix.c
+++ b/src/os/shell/commander/posix/commander_posix.c
@@ -11,15 +11,15 @@
 #include <stdlib.h>

 CMDError get_output_status(FILE *fp, i32 *status_out) {
-	*status_out = wapp_shell_utils_pclose(fp);
+  *status_out = wapp_shell_utils_pclose(fp);

-	if (!WIFEXITED(*status_out)) {
-		return SHELL_ERR_PROC_EXIT_FAIL;
-	}
+  if (!WIFEXITED(*status_out)) {
+    return SHELL_ERR_PROC_EXIT_FAIL;
+  }

-	*status_out = WEXITSTATUS(*status_out);
+  *status_out = WEXITSTATUS(*status_out);

-	return SHELL_ERR_NO_ERROR;
+  return SHELL_ERR_NO_ERROR;
 }

 #endif // !WAPP_PLATFORM_POSIX
--- a/src/os/shell/commander/win/commander_win.c
+++ b/src/os/shell/commander/win/commander_win.c
@@ -10,15 +10,15 @@
 #include <stdio.h>

 CMDError get_output_status(FILE *fp, i32 *status_out) {
-	if (!feof(fp)) {
-		// Ensure process is closed on failure
-		wapp_shell_utils_pclose(fp);
-		return SHELL_ERR_PROC_EXIT_FAIL;
-	}
+  if (!feof(fp)) {
+    // Ensure process is closed on failure
+    wapp_shell_utils_pclose(fp);
+    return SHELL_ERR_PROC_EXIT_FAIL;
+  }

-	*status_out = wapp_shell_utils_pclose(fp);
+  *status_out = wapp_shell_utils_pclose(fp);

-	return SHELL_ERR_NO_ERROR;
+  return SHELL_ERR_NO_ERROR;
 }

 #endif // !WAPP_PLATFORM_WINDOWS
--- a/src/os/shell/termcolour/posix/termcolour_posix.c
+++ b/src/os/shell/termcolour/posix/termcolour_posix.c
@@ -10,27 +10,27 @@
 #include <stdio.h>

 wapp_intern Str8RO colours[COUNT_TERM_COLOUR] = {
-	[WAPP_TERM_COLOUR_FG_BLACK]      = wapp_str8_lit_ro_initialiser_list("\033[30m"),
-	[WAPP_TERM_COLOUR_FG_RED]        = wapp_str8_lit_ro_initialiser_list("\033[31m"),
-	[WAPP_TERM_COLOUR_FG_GREEN]      = wapp_str8_lit_ro_initialiser_list("\033[32m"),
-	[WAPP_TERM_COLOUR_FG_BLUE]       = wapp_str8_lit_ro_initialiser_list("\033[34m"),
-	[WAPP_TERM_COLOUR_FG_CYAN]       = wapp_str8_lit_ro_initialiser_list("\033[36m"),
-	[WAPP_TERM_COLOUR_FG_MAGENTA]    = wapp_str8_lit_ro_initialiser_list("\033[35m"),
-	[WAPP_TERM_COLOUR_FG_YELLOW]     = wapp_str8_lit_ro_initialiser_list("\033[33m"),
-	[WAPP_TERM_COLOUR_FG_WHITE]      = wapp_str8_lit_ro_initialiser_list("\033[37m"),
-	[WAPP_TERM_COLOUR_FG_BR_BLACK]   = wapp_str8_lit_ro_initialiser_list("\033[90m"),
-	[WAPP_TERM_COLOUR_FG_BR_RED]     = wapp_str8_lit_ro_initialiser_list("\033[91m"),
-	[WAPP_TERM_COLOUR_FG_BR_GREEN]   = wapp_str8_lit_ro_initialiser_list("\033[92m"),
-	[WAPP_TERM_COLOUR_FG_BR_BLUE]    = wapp_str8_lit_ro_initialiser_list("\033[94m"),
-	[WAPP_TERM_COLOUR_FG_BR_CYAN]    = wapp_str8_lit_ro_initialiser_list("\033[96m"),
-	[WAPP_TERM_COLOUR_FG_BR_MAGENTA] = wapp_str8_lit_ro_initialiser_list("\033[95m"),
-	[WAPP_TERM_COLOUR_FG_BR_YELLOW]  = wapp_str8_lit_ro_initialiser_list("\033[93m"),
-	[WAPP_TERM_COLOUR_FG_BR_WHITE]   = wapp_str8_lit_ro_initialiser_list("\033[97m"),
-	[WAPP_TERM_COLOUR_CLEAR]         = wapp_str8_lit_ro_initialiser_list("\033[0m"),
+    [WAPP_TERM_COLOUR_FG_BLACK]      = wapp_str8_lit_ro_initialiser_list("\033[30m"),
+    [WAPP_TERM_COLOUR_FG_RED]        = wapp_str8_lit_ro_initialiser_list("\033[31m"),
+    [WAPP_TERM_COLOUR_FG_GREEN]      = wapp_str8_lit_ro_initialiser_list("\033[32m"),
+    [WAPP_TERM_COLOUR_FG_BLUE]       = wapp_str8_lit_ro_initialiser_list("\033[34m"),
+    [WAPP_TERM_COLOUR_FG_CYAN]       = wapp_str8_lit_ro_initialiser_list("\033[36m"),
+    [WAPP_TERM_COLOUR_FG_MAGENTA]    = wapp_str8_lit_ro_initialiser_list("\033[35m"),
+    [WAPP_TERM_COLOUR_FG_YELLOW]     = wapp_str8_lit_ro_initialiser_list("\033[33m"),
+    [WAPP_TERM_COLOUR_FG_WHITE]      = wapp_str8_lit_ro_initialiser_list("\033[37m"),
+    [WAPP_TERM_COLOUR_FG_BR_BLACK]   = wapp_str8_lit_ro_initialiser_list("\033[90m"),
+    [WAPP_TERM_COLOUR_FG_BR_RED]     = wapp_str8_lit_ro_initialiser_list("\033[91m"),
+    [WAPP_TERM_COLOUR_FG_BR_GREEN]   = wapp_str8_lit_ro_initialiser_list("\033[92m"),
+    [WAPP_TERM_COLOUR_FG_BR_BLUE]    = wapp_str8_lit_ro_initialiser_list("\033[94m"),
+    [WAPP_TERM_COLOUR_FG_BR_CYAN]    = wapp_str8_lit_ro_initialiser_list("\033[96m"),
+    [WAPP_TERM_COLOUR_FG_BR_MAGENTA] = wapp_str8_lit_ro_initialiser_list("\033[95m"),
+    [WAPP_TERM_COLOUR_FG_BR_YELLOW]  = wapp_str8_lit_ro_initialiser_list("\033[93m"),
+    [WAPP_TERM_COLOUR_FG_BR_WHITE]   = wapp_str8_lit_ro_initialiser_list("\033[97m"),
+    [WAPP_TERM_COLOUR_CLEAR]         = wapp_str8_lit_ro_initialiser_list("\033[0m"),
 };

 void print_coloured_text(Str8RO *text, TerminalColour colour) {
-	printf(WAPP_STR8_SPEC WAPP_STR8_SPEC, wapp_str8_varg(colours[colour]), wapp_str8_varg((*text)));
+  printf(WAPP_STR8_SPEC WAPP_STR8_SPEC, wapp_str8_varg(colours[colour]), wapp_str8_varg((*text)));
 }

 #endif // !WAPP_PLATFORM_POSIX
--- a/src/os/shell/termcolour/termcolour.c
+++ b/src/os/shell/termcolour/termcolour.c
@@ -5,14 +5,14 @@
 #include "../../../base/strings/str8/str8.h"

 void wapp_shell_termcolour_print_text(Str8RO *text, TerminalColour colour) {
-	if (colour < WAPP_TERM_COLOUR_FG_BLACK || colour > WAPP_TERM_COLOUR_FG_BR_WHITE) {
-		return;
-	}
+  if (colour < WAPP_TERM_COLOUR_FG_BLACK || colour > WAPP_TERM_COLOUR_FG_BR_WHITE) {
+    return;
+  }

-	print_coloured_text(text, colour);
+  print_coloured_text(text, colour);
 }

 void wapp_shell_termcolour_clear_colour(void) {
-	Str8RO empty = wapp_str8_lit_ro("");
-	print_coloured_text(&empty, WAPP_TERM_COLOUR_CLEAR);
+  Str8RO empty = wapp_str8_lit_ro("");
+  print_coloured_text(&empty, WAPP_TERM_COLOUR_CLEAR);
 }
--- a/src/os/shell/termcolour/terminal_colours.h
+++ b/src/os/shell/termcolour/terminal_colours.h
@@ -11,25 +11,25 @@ BEGIN_C_LINKAGE
 #endif // !WAPP_PLATFORM_CPP

 typedef enum {
-	WAPP_TERM_COLOUR_FG_BLACK,
-	WAPP_TERM_COLOUR_FG_RED,
-	WAPP_TERM_COLOUR_FG_GREEN,
-	WAPP_TERM_COLOUR_FG_BLUE,
-	WAPP_TERM_COLOUR_FG_CYAN,
-	WAPP_TERM_COLOUR_FG_MAGENTA,
-	WAPP_TERM_COLOUR_FG_YELLOW,
-	WAPP_TERM_COLOUR_FG_WHITE,
-	WAPP_TERM_COLOUR_FG_BR_BLACK,
-	WAPP_TERM_COLOUR_FG_BR_RED,
-	WAPP_TERM_COLOUR_FG_BR_GREEN,
-	WAPP_TERM_COLOUR_FG_BR_BLUE,
-	WAPP_TERM_COLOUR_FG_BR_CYAN,
-	WAPP_TERM_COLOUR_FG_BR_MAGENTA,
-	WAPP_TERM_COLOUR_FG_BR_YELLOW,
-	WAPP_TERM_COLOUR_FG_BR_WHITE,
-	WAPP_TERM_COLOUR_CLEAR,
+  WAPP_TERM_COLOUR_FG_BLACK,
+  WAPP_TERM_COLOUR_FG_RED,
+  WAPP_TERM_COLOUR_FG_GREEN,
+  WAPP_TERM_COLOUR_FG_BLUE,
+  WAPP_TERM_COLOUR_FG_CYAN,
+  WAPP_TERM_COLOUR_FG_MAGENTA,
+  WAPP_TERM_COLOUR_FG_YELLOW,
+  WAPP_TERM_COLOUR_FG_WHITE,
+  WAPP_TERM_COLOUR_FG_BR_BLACK,
+  WAPP_TERM_COLOUR_FG_BR_RED,
+  WAPP_TERM_COLOUR_FG_BR_GREEN,
+  WAPP_TERM_COLOUR_FG_BR_BLUE,
+  WAPP_TERM_COLOUR_FG_BR_CYAN,
+  WAPP_TERM_COLOUR_FG_BR_MAGENTA,
+  WAPP_TERM_COLOUR_FG_BR_YELLOW,
+  WAPP_TERM_COLOUR_FG_BR_WHITE,
+  WAPP_TERM_COLOUR_CLEAR,

-	COUNT_TERM_COLOUR,
+  COUNT_TERM_COLOUR,
 } TerminalColour;

 #ifdef WAPP_PLATFORM_CPP
--- a/src/os/shell/termcolour/win/termcolour_win.c
+++ b/src/os/shell/termcolour/win/termcolour_win.c
@@ -7,67 +7,67 @@
 #ifdef WAPP_PLATFORM_WINDOWS

 #include "../terminal_colours.h"
-#include "../../../../common/misc/misc_utils.h"
+#include "../../../../../common/misc/misc_utils.h"
 #include <stdio.h>

 #define WIN32_LEAN_AND_MEAN
 #include <Windows.h>

-typedef struct TermcolourData TermcolourData;
-struct TermcolourData {
-	HANDLE handle;
-	WORD   default_colour;
-	WORD   current_colour;
+typedef struct termcolour_data TermcolourData;
+struct termcolour_data {
+  HANDLE handle;
+  WORD   default_colour;
+  WORD   current_colour;

-	wapp_misc_utils_reserve_padding(sizeof(HANDLE) + sizeof(WORD) + sizeof(WORD));
+  wapp_misc_utils_padding_size(sizeof(HANDLE) + sizeof(WORD) + sizeof(WORD));
 };

 wapp_intern void init_data(TermcolourData *data);

 wapp_intern WORD colours[COUNT_TERM_COLOUR] = {
-	[WAPP_TERM_COLOUR_FG_BLACK]      = 0,
-	[WAPP_TERM_COLOUR_FG_RED]        = FOREGROUND_RED,
-	[WAPP_TERM_COLOUR_FG_GREEN]      = FOREGROUND_GREEN,
-	[WAPP_TERM_COLOUR_FG_BLUE]       = FOREGROUND_BLUE,
-	[WAPP_TERM_COLOUR_FG_CYAN]       = FOREGROUND_GREEN | FOREGROUND_BLUE,
-	[WAPP_TERM_COLOUR_FG_MAGENTA]    = FOREGROUND_RED | FOREGROUND_BLUE,
-	[WAPP_TERM_COLOUR_FG_YELLOW]     = FOREGROUND_RED | FOREGROUND_GREEN,
-	[WAPP_TERM_COLOUR_FG_WHITE]      = FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE,
-	[WAPP_TERM_COLOUR_FG_BR_BLACK]   = FOREGROUND_INTENSITY,
-	[WAPP_TERM_COLOUR_FG_BR_RED]     = FOREGROUND_RED | FOREGROUND_INTENSITY,
-	[WAPP_TERM_COLOUR_FG_BR_GREEN]   = FOREGROUND_GREEN | FOREGROUND_INTENSITY,
-	[WAPP_TERM_COLOUR_FG_BR_BLUE]    = FOREGROUND_BLUE | FOREGROUND_INTENSITY,
-	[WAPP_TERM_COLOUR_FG_BR_CYAN]    = FOREGROUND_GREEN | FOREGROUND_BLUE | FOREGROUND_INTENSITY,
-	[WAPP_TERM_COLOUR_FG_BR_MAGENTA] = FOREGROUND_RED | FOREGROUND_BLUE | FOREGROUND_INTENSITY,
-	[WAPP_TERM_COLOUR_FG_BR_YELLOW]  = FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_INTENSITY,
-	[WAPP_TERM_COLOUR_FG_BR_WHITE]   = FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE | FOREGROUND_INTENSITY,
+    [WAPP_TERM_COLOUR_FG_BLACK]      = 0,
+    [WAPP_TERM_COLOUR_FG_RED]        = FOREGROUND_RED,
+    [WAPP_TERM_COLOUR_FG_GREEN]      = FOREGROUND_GREEN,
+    [WAPP_TERM_COLOUR_FG_BLUE]       = FOREGROUND_BLUE,
+    [WAPP_TERM_COLOUR_FG_CYAN]       = FOREGROUND_GREEN | FOREGROUND_BLUE,
+    [WAPP_TERM_COLOUR_FG_MAGENTA]    = FOREGROUND_RED | FOREGROUND_BLUE,
+    [WAPP_TERM_COLOUR_FG_YELLOW]     = FOREGROUND_RED | FOREGROUND_GREEN,
+    [WAPP_TERM_COLOUR_FG_WHITE]      = FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE,
+    [WAPP_TERM_COLOUR_FG_BR_BLACK]   = FOREGROUND_INTENSITY,
+    [WAPP_TERM_COLOUR_FG_BR_RED]     = FOREGROUND_RED | FOREGROUND_INTENSITY,
+    [WAPP_TERM_COLOUR_FG_BR_GREEN]   = FOREGROUND_GREEN | FOREGROUND_INTENSITY,
+    [WAPP_TERM_COLOUR_FG_BR_BLUE]    = FOREGROUND_BLUE | FOREGROUND_INTENSITY,
+    [WAPP_TERM_COLOUR_FG_BR_CYAN]    = FOREGROUND_GREEN | FOREGROUND_BLUE | FOREGROUND_INTENSITY,
+    [WAPP_TERM_COLOUR_FG_BR_MAGENTA] = FOREGROUND_RED | FOREGROUND_BLUE | FOREGROUND_INTENSITY,
+    [WAPP_TERM_COLOUR_FG_BR_YELLOW]  = FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_INTENSITY,
+    [WAPP_TERM_COLOUR_FG_BR_WHITE]   = FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE | FOREGROUND_INTENSITY,
 };

 void print_coloured_text(Str8RO *text, TerminalColour colour) {
-	wapp_persist TermcolourData data = {0};
-	if (data.handle == 0) {
-		init_data(&data);
-	}
+  wapp_persist TermcolourData data = {0};
+  if (data.handle == 0) {
+    init_data(&data);
+  }

-	if (colour == WAPP_TERM_COLOUR_CLEAR) {
-		data.current_colour = data.default_colour;
-	} else {
-		data.current_colour = colours[colour];
-	}
+  if (colour == WAPP_TERM_COLOUR_CLEAR) {
+    data.current_colour = data.default_colour;
+  } else {
+    data.current_colour = colours[colour];
+  }

-	SetConsoleTextAttribute(data.handle, data.current_colour);
-	printf(WAPP_STR8_SPEC, wapp_str8_varg((*text)));
+  SetConsoleTextAttribute(data.handle, data.current_colour);
+  printf(WAPP_STR8_SPEC, wapp_str8_varg((*text)));
 }

 wapp_intern void init_data(TermcolourData *data) {
-	// create handle
-	data->handle = GetStdHandle(STD_OUTPUT_HANDLE);
+  // create handle
+  data->handle = GetStdHandle(STD_OUTPUT_HANDLE);

-	// get console colour information
-	CONSOLE_SCREEN_BUFFER_INFO csbi;
-	GetConsoleScreenBufferInfo(data->handle, &csbi);
-	data->default_colour = csbi.wAttributes;
-	data->current_colour = data->default_colour;
+  // get console colour information
+  CONSOLE_SCREEN_BUFFER_INFO csbi;
+  GetConsoleScreenBufferInfo(data->handle, &csbi);
+  data->default_colour = csbi.wAttributes;
+  data->current_colour = data->default_colour;
 }

 #endif // !WAPP_PLATFORM_WINDOWS
--- a/src/os/shell/utils/shell_utils.h
+++ b/src/os/shell/utils/shell_utils.h
@@ -12,11 +12,11 @@ BEGIN_C_LINKAGE
 #endif // !WAPP_PLATFORM_CPP

 #ifdef WAPP_PLATFORM_WINDOWS
-	#define wapp_shell_utils_popen  _popen
-	#define wapp_shell_utils_pclose _pclose
+  #define wapp_shell_utils_popen  _popen
+  #define wapp_shell_utils_pclose _pclose
 #else
-	#define wapp_shell_utils_popen  popen
-	#define wapp_shell_utils_pclose pclose
+  #define wapp_shell_utils_popen  popen
+  #define wapp_shell_utils_pclose pclose
 #endif /* ifdef WAPP_PLATFORM_WINDOWS */

 #ifdef WAPP_PLATFORM_CPP
--- a/src/os/wapp_os.c
+++ b/src/os/wapp_os.c
@@ -5,8 +5,6 @@

 #include "wapp_os.h"
 #include "file/file.c"
-#include "file/posix/file_posix.c"
-#include "file/win/file_win.c"
 #include "shell/termcolour/posix/termcolour_posix.c"
 #include "shell/termcolour/win/termcolour_win.c"
 #include "shell/termcolour/termcolour.c"
--- a/src/os/wapp_os.h
+++ b/src/os/wapp_os.h
@@ -4,8 +4,6 @@
 #define WAPP_CORE_H

 #include "file/file.h"
-#include "file/posix/file_posix.h"
-#include "file/win/file_win.h"
 #include "shell/termcolour/termcolour.h"
 #include "shell/termcolour/terminal_colours.h"
 #include "shell/commander/commander.h"
--- a/src/prng/xorshift/xorshift.c
+++ b/src/prng/xorshift/xorshift.c
@@ -7,9 +7,9 @@
 #include <stdlib.h>
 #include <time.h>

-typedef struct SplitMix64State SplitMix64State;
-struct SplitMix64State {
-	u64 seed;
+typedef struct split_mix_64_state SplitMix64State;
+struct split_mix_64_state {
+  u64 seed;
 };

 wapp_intern u64 rol64(u64 x, u64 bits);
@@ -18,118 +18,118 @@ wapp_intern void seed_os_generator(void);
 wapp_intern u64 generate_random_number(void);

 XOR256State wapp_prng_xorshift_init_state(void) {
-	wapp_persist b8 seeded = false;
-	if (!seeded) {
-		seeded = true;
-		seed_os_generator();
-	}
+  wapp_persist b8 seeded = false;
+  if (!seeded) {
+    seeded = true;
+    seed_os_generator();
+  }

-	SplitMix64State sm64 = {.seed = generate_random_number()};
+  SplitMix64State sm64 = {.seed = generate_random_number()};

-	return (XOR256State){
-		.x = split_mix_64(&sm64),
-		.y = split_mix_64(&sm64),
-		.z = split_mix_64(&sm64),
-		.w = split_mix_64(&sm64),
-	};
+  return (XOR256State){
+      .x = split_mix_64(&sm64),
+      .y = split_mix_64(&sm64),
+      .z = split_mix_64(&sm64),
+      .w = split_mix_64(&sm64),
+  };
 }

 u64 wapp_prng_xorshift_256(XOR256State *state) {
-	u64 t = state->x ^ (state->x << 11);
+  u64 t = state->x ^ (state->x << 11);

-	state->x = state->y;
-	state->y = state->z;
-	state->z = state->w;
-	state->w = (state->w ^ (state->w >> 19)) ^ (t ^ (t >> 8));
+  state->x = state->y;
+  state->y = state->z;
+  state->z = state->w;
+  state->w = (state->w ^ (state->w >> 19)) ^ (t ^ (t >> 8));

-	return state->w;
+  return state->w;
 }

 u64 wapp_prng_xorshift_256ss(XOR256State *state) {
-	const u64 result = rol64(state->z * 5, 7) * 9;
-	const u64 t = state->z << 17;
+  const u64 result = rol64(state->z * 5, 7) * 9;
+  const u64 t = state->z << 17;

-	state->y ^= state->w;
-	state->x ^= state->z;
-	state->z ^= state->y;
-	state->w ^= state->x;
+  state->y ^= state->w;
+  state->x ^= state->z;
+  state->z ^= state->y;
+  state->w ^= state->x;

-	state->y ^= t;
-	state->x = rol64(state->x, 45);
+  state->y ^= t;
+  state->x = rol64(state->x, 45);

-	return result;
+  return result;
 }

 u64 wapp_prng_xorshift_256p(XOR256State *state) {
-	const u64 result = state->w + state->x;
-	const u64 t = state->z << 17;
+  const u64 result = state->w + state->x;
+  const u64 t = state->z << 17;

-	state->y ^= state->w;
-	state->x ^= state->z;
-	state->z ^= state->y;
-	state->w ^= state->x;
+  state->y ^= state->w;
+  state->x ^= state->z;
+  state->z ^= state->y;
+  state->w ^= state->x;

-	state->y ^= t;
-	state->x  = rol64(state->x, 45);
+  state->y ^= t;
+  state->x = rol64(state->x, 45);

-	return result;
+  return result;
 }

 wapp_intern u64 rol64(u64 x, u64 bits) {
-	return (x << bits) | (x >> (64 - bits));
+  return (x << bits) | (x >> (64 - bits));
 }

 wapp_intern u64 split_mix_64(SplitMix64State *state) {
-	state->seed += 0x9E3779B97f4A7C15;
+  state->seed += 0x9E3779B97f4A7C15;

-	u64 result = state->seed;
-	result = (result ^ (result >> 30)) * 0xBF58476D1CE4E5B9;
-	result = (result ^ (result >> 27)) * 0x94D049BB133111EB;
+  u64 result = state->seed;
+  result = (result ^ (result >> 30)) * 0xBF58476D1CE4E5B9;
+  result = (result ^ (result >> 27)) * 0x94D049BB133111EB;

-	return result ^ (result >> 31);
+  return result ^ (result >> 31);
 }

 #if defined(WAPP_PLATFORM_C) && WAPP_PLATFORM_C_VERSION >= WAPP_PLATFORM_C11_VERSION
 #ifdef WAPP_PLATFORM_POSIX
 wapp_intern void seed_os_generator(void) {
-	struct timespec ts = {0};
-	int result = clock_gettime(CLOCK_MONOTONIC_RAW, &ts);
-	wapp_runtime_assert(result == 0, "Invalid seed value");
+    struct timespec ts = {0};
+    int result = clock_gettime(CLOCK_MONOTONIC_RAW, &ts);
+    wapp_runtime_assert(result == 0, "Invalid seed value");

-	srand48(ts.tv_nsec);
+    srand48(ts.tv_nsec);
 }

 wapp_intern u64 generate_random_number(void) {
-	return lrand48();
+  return lrand48();
 }
 #else
 wapp_intern void seed_os_generator(void) {
-	struct timespec ts = {0};
-	int result = timespec_get(&ts, TIME_UTC);
-	wapp_runtime_assert(result != 0, "Invalid seed value");
+    struct timespec ts = {0};
+    int result = timespec_get(&ts, TIME_UTC);
+    wapp_runtime_assert(result != 0, "Invalid seed value");

-	srand(ts.tv_nsec);
+    srand(ts.tv_nsec);
 }

 wapp_intern u64 generate_random_number(void) {
-	i32 n1 = rand();
-	i32 n2 = rand();
+  i32 n1 = rand();
+  i32 n2 = rand();

-	return (((u64)n1) << 32 | (u64)n2);
+  return (((u64)n1) << 32 | (u64)n2);
 }
 #endif // !WAPP_PLATFORM_POSIX
 #else
 wapp_intern void seed_os_generator(void) {
-	time_t result = time(NULL);
-	wapp_runtime_assert(result != (time_t)(-1), "Invalid seed value");
+    time_t result = time(NULL);
+    wapp_runtime_assert(result != (time_t)(-1), "Invalid seed value");

-	srand(result);
+    srand(result);
 }

 wapp_intern u64 generate_random_number(void) {
-	i32 n1 = rand();
-	i32 n2 = rand();
+  i32 n1 = rand();
+  i32 n2 = rand();

-	return (((u64)n1) << 32 | (u64)n2);
+  return (((u64)n1) << 32 | (u64)n2);
 }
 #endif // !WAPP_PLATFORM_C
--- a/src/prng/xorshift/xorshift.h
+++ b/src/prng/xorshift/xorshift.h
@@ -10,12 +10,12 @@
 BEGIN_C_LINKAGE
 #endif // !WAPP_PLATFORM_CPP

-typedef struct XOR256State XOR256State;
-struct XOR256State {
-	u64 x;
-	u64 y;
-	u64 z;
-	u64 w;
+typedef struct xor_256_state XOR256State;
+struct xor_256_state {
+  u64 x;
+  u64 y;
+  u64 z;
+  u64 w;
 };

 XOR256State wapp_prng_xorshift_init_state(void);
--- a/src/testing/tester/tester.c
+++ b/src/testing/tester/tester.c
@@ -11,45 +11,45 @@
 wapp_intern void handle_test_result(TestFuncResult result);

 void run_tests(TestFunc *func1, ...) {
-	printf("\n");
+  printf("\n");

-	handle_test_result(func1());
+  handle_test_result(func1());

-	va_list args;
-	va_start(args, func1);
+  va_list args;
+  va_start(args, func1);

-	TestFunc *func = va_arg(args, TestFunc *);
+  TestFunc *func = va_arg(args, TestFunc *);

-	while (func) {
-		TestFuncResult result = func();
-		handle_test_result(result);
+  while (func) {
+    TestFuncResult result = func();
+    handle_test_result(result);

-		func = va_arg(args, TestFunc *);
-	}
+    func = va_arg(args, TestFunc *);
+  }

-	va_end(args);
+  va_end(args);

-	printf("\n");
+  printf("\n");
 }

 wapp_intern void handle_test_result(TestFuncResult result) {
-	TerminalColour colour;
-	Str8 result_text = wapp_str8_buf(64);
+  TerminalColour colour;
+  Str8 result_text = wapp_str8_buf(64);

-	if (result.passed) {
-		colour = WAPP_TERM_COLOUR_FG_BR_GREEN;
-		wapp_str8_copy_cstr_capped(&result_text, "PASSED");
-	} else {
-		colour = WAPP_TERM_COLOUR_FG_BR_RED;
-		wapp_str8_copy_cstr_capped(&result_text, "FAILED");
-	}
+  if (result.passed) {
+    colour = WAPP_TERM_COLOUR_FG_BR_GREEN;
+    wapp_str8_copy_cstr_capped(&result_text, "PASSED");
+  } else {
+    colour = WAPP_TERM_COLOUR_FG_BR_RED;
+    wapp_str8_copy_cstr_capped(&result_text, "FAILED");
+  }

-	printf("[");
-	wapp_shell_termcolour_print_text(&result_text, colour);
-	wapp_shell_termcolour_clear_colour();
-	printf("] " WAPP_STR8_SPEC "\n", wapp_str8_varg(result.name));
+  printf("[");
+  wapp_shell_termcolour_print_text(&result_text, colour);
+  wapp_shell_termcolour_clear_colour();
+  printf("] " WAPP_STR8_SPEC "\n", wapp_str8_varg(result.name));

-	if (!result.passed) {
-		exit(EXIT_FAILURE);
-	}
+  if (!result.passed) {
+    exit(EXIT_FAILURE);
+  }
 }
--- a/src/testing/tester/tester.h
+++ b/src/testing/tester/tester.h
@@ -10,19 +10,21 @@
 #ifdef WAPP_PLATFORM_CPP
 BEGIN_C_LINKAGE

-#define wapp_tester_result(PASSED) (TestFuncResult{wapp_str8_lit_ro(__func__), PASSED, {}})
+#define wapp_tester_result(PASSED) (TestFuncResult{wapp_str8_lit_ro(__func__), PASSED})
 #else
 #define wapp_tester_result(PASSED) ((TestFuncResult){.name = wapp_str8_lit_ro(__func__), .passed = PASSED})
 #endif // !WAPP_PLATFORM_CPP

 #define wapp_tester_run_tests(...) run_tests(__VA_ARGS__, NULL)

-typedef struct TestFuncResult TestFuncResult;
-struct TestFuncResult {
-	Str8 name;
-	b8 passed;
+typedef struct test_func_result TestFuncResult;
+struct test_func_result {
+  Str8 name;
+  b8 passed;

-	wapp_misc_utils_reserve_padding(sizeof(Str8) + sizeof(b8));
+#ifdef WAPP_PLATFORM_WINDOWS
+  wapp_misc_utils_padding_size(sizeof(Str8RO) + sizeof(b8));
+#endif // WAPP_PLATFORM_WINDOWS
 };

 typedef TestFuncResult(TestFunc)(void);
--- a/src/uuid/uuid.c
+++ b/src/uuid/uuid.c
@@ -9,50 +9,50 @@

 #define UUID_STR_FORMAT ("%.8" PRIx64 "-%.4" PRIx64 "-%.4" PRIx64 "-%.4" PRIx64 "-%.12" PRIx64)

-typedef struct UUID4 UUID4;
-struct UUID4 {
-	u64 high;
-	u64 low;
+typedef struct uuid4 UUID4;
+struct uuid4 {
+  u64 high;
+  u64 low;
 };

 wapp_intern UUID4 generate_uuid4(void);
 wapp_intern void  uuid4_to_uuid(const UUID4* uuid4, WUUID *uuid);

 WUUID *wapp_uuid_init_uuid4(WUUID *uuid) {
-	wapp_debug_assert(uuid != NULL, "`uuid` should not be NULL");
+  wapp_debug_assert(uuid != NULL, "`uuid` should not be NULL");

-	UUID4 uuid4 = generate_uuid4();
-	uuid4_to_uuid(&uuid4, uuid);
+  UUID4 uuid4 = generate_uuid4();
+  uuid4_to_uuid(&uuid4, uuid);

-	return uuid;
+  return uuid;
 }

 wapp_intern UUID4 generate_uuid4(void) {
-	wapp_persist XOR256State state = {0};
-	wapp_persist b8 initialised = false;
+  wapp_persist XOR256State state = {0};
+  wapp_persist b8 initialised = false;

-	if (!initialised) {
-		initialised = true;
-		state       = wapp_prng_xorshift_init_state();
-	}
+  if (!initialised) {
+    initialised = true;
+    state       = wapp_prng_xorshift_init_state();
+  }

-	UUID4 uuid = (UUID4){
-		.high  = wapp_prng_xorshift_256(&state),
-		.low  = wapp_prng_xorshift_256(&state),
-	};
+  UUID4 uuid = (UUID4){
+    .high = wapp_prng_xorshift_256(&state),
+    .low  = wapp_prng_xorshift_256(&state),
+  };

-	uuid.high = (uuid.high  & 0xffffffffffff0fff) | 0x0000000000004000;
-	uuid.low  = (uuid.low   & 0x3fffffffffffffff) | 0x8000000000000000;
+  uuid.high = (uuid.high & 0xffffffffffff0fff) | 0x0000000000004000;
+  uuid.low  = (uuid.low  & 0x3fffffffffffffff) | 0x8000000000000000;

-	return uuid;
+  return uuid;
 }

 wapp_intern void uuid4_to_uuid(const UUID4* uuid4, WUUID *uuid) {
-	u64 group1 = uuid4->high >> 32;
-	u64 group2 = (uuid4->high << 32) >> 48;
-	u64 group3 = (uuid4->high << 48) >> 48;
-	u64 group4 = uuid4->low >> 48;
-	u64 group5 = (uuid4->low << 16) >> 16;
+  u64 group1 = uuid4->high >> 32;
+  u64 group2 = (uuid4->high << 32) >> 48;
+  u64 group3 = (uuid4->high << 48) >> 48;
+  u64 group4 = uuid4->low >> 48;
+  u64 group5 = (uuid4->low << 16) >> 16;

-	wapp_str8_format(&(uuid->uuid), UUID_STR_FORMAT, group1, group2, group3, group4, group5);
+  wapp_str8_format(&(uuid->uuid), UUID_STR_FORMAT, group1, group2, group3, group4, group5);
 }
--- a/src/uuid/uuid.h
+++ b/src/uuid/uuid.h
@@ -15,13 +15,11 @@ BEGIN_C_LINKAGE
 #define WAPP_UUID_SPEC WAPP_STR8_SPEC
 #define wapp_uuid_varg(WUUID) wapp_str8_varg((WUUID).uuid)

-typedef struct WUUID WUUID;
-struct WUUID {
-	Str8 uuid;
+typedef struct wapp_uuid WUUID;
+struct wapp_uuid {
+  Str8 uuid;
 };

-// TODO (Abdelrahman): Update UUID implementation to work properly with C++ and tests for validation
-
 #define wapp_uuid_gen_uuid4() *(wapp_uuid_init_uuid4(&wapp_uuid_create()))

 /* Low level UUID API */
--- a/tests/allocator/test_allocator.c
+++ b/tests/allocator/test_allocator.c
@@ -2,66 +2,16 @@
 #include "wapp.h"
 #include <stdlib.h>

-// NOTE (Abdelrahman): Cannot query size of Arena here so it's hardcoded. Similarly, since arena
-// allocation are aligned to power of 2 boundaries, the number of i32 values needed is hardcoded.
-#define TEMP_BUF_SIZE (40 + sizeof(i32) * 8)
-
-wapp_intern u8 temp_buf[TEMP_BUF_SIZE] = {0};
-wapp_intern Allocator temp_allocator   = {0};
-
 TestFuncResult test_arena_allocator(void) {
-	Allocator allocator = wapp_mem_arena_allocator_init(4096);
-	b8 result           = allocator.obj != NULL && allocator.alloc != NULL &&
-	                      allocator.alloc_aligned != NULL &&
-	                      allocator.realloc != NULL && allocator.realloc_aligned != NULL &&
-	                      allocator.free == NULL;
-	void *ptr           = wapp_mem_allocator_alloc(&allocator, 20);
-	result              = result && (ptr != NULL);
+  Allocator allocator = wapp_mem_arena_allocator_init(4096);
+  b8 result          = allocator.obj != NULL && allocator.alloc != NULL &&
+                        allocator.alloc_aligned != NULL &&
+                        allocator.realloc != NULL && allocator.realloc_aligned != NULL &&
+                        allocator.free == NULL;
+  void *ptr           = wapp_mem_allocator_alloc(&allocator, 20);
+  result              = result && (ptr != NULL);

-	wapp_mem_arena_allocator_destroy(&allocator);
+  wapp_mem_arena_allocator_destroy(&allocator);

-	return wapp_tester_result(result);
-}
-
-TestFuncResult test_arena_allocator_with_buffer(void) {
-	u8 buffer[KiB(4)] = {0};
-
-	Allocator allocator = wapp_mem_arena_allocator_init_with_buffer(buffer, KiB(4));
-	b8 result           = allocator.obj != NULL && allocator.alloc != NULL &&
-	                      allocator.alloc_aligned != NULL &&
-	                      allocator.realloc != NULL && allocator.realloc_aligned != NULL &&
-	                      allocator.free == NULL;
-	void *ptr           = wapp_mem_allocator_alloc(&allocator, 20);
-	result              = result && (ptr != NULL);
-
-	wapp_mem_arena_allocator_destroy(&allocator);
-
-	return wapp_tester_result(result);
-}
-
-TestFuncResult test_arena_allocator_temp_begin(void) {
-	temp_allocator = wapp_mem_arena_allocator_init_with_buffer(temp_buf, TEMP_BUF_SIZE);
-
-	i32 *num1 = (i32 *)wapp_mem_allocator_alloc(&temp_allocator, sizeof(i32));
-	b8 result = num1 != NULL;
-
-	wapp_mem_arena_allocator_temp_begin(&temp_allocator);
-	i32 *num2 = (i32 *)wapp_mem_allocator_alloc(&temp_allocator, sizeof(i32));
-	result    = result && num2 != NULL;
-	i32 *num3 = (i32 *)wapp_mem_allocator_alloc(&temp_allocator, sizeof(i32));
-	result    = result && num3 == NULL;
-
-	return wapp_tester_result(result);
-}
-
-TestFuncResult test_arena_allocator_temp_end(void) {
-	wapp_mem_arena_allocator_temp_end(&temp_allocator);
-	i32 *num1 = (i32 *)wapp_mem_allocator_alloc(&temp_allocator, sizeof(i32));
-	b8 result = num1 != NULL;
-	i32 *num2 = (i32 *)wapp_mem_allocator_alloc(&temp_allocator, sizeof(i32));
-	result    = result && num2 == NULL;
-
-	wapp_mem_arena_allocator_destroy(&temp_allocator);
-
-	return wapp_tester_result(result);
+  return wapp_tester_result(result);
 }
--- a/tests/allocator/test_allocator.cc
+++ b/tests/allocator/test_allocator.cc
@@ -2,66 +2,16 @@
 #include "wapp.h"
 #include <stdlib.h>

-// NOTE (Abdelrahman): Cannot query size of Arena here so it's hardcoded. Similarly, since arena
-// allocation are aligned to power of 2 boundaries, the number of i32 values needed is hardcoded.
-#define TEMP_BUF_SIZE (40 + sizeof(i32) * 8)
-
-wapp_intern u8 temp_buf[TEMP_BUF_SIZE] = {};
-wapp_intern Allocator temp_allocator   = {};
-
 TestFuncResult test_arena_allocator(void) {
-	Allocator allocator = wapp_mem_arena_allocator_init(4096);
-	b8 result           = allocator.obj != nullptr && allocator.alloc != nullptr &&
-	                      allocator.alloc_aligned != nullptr &&
-	                      allocator.realloc != nullptr && allocator.realloc_aligned != nullptr &&
-	                      allocator.free == nullptr;
-	void *ptr           = wapp_mem_allocator_alloc(&allocator, 20);
-	result              = result && (ptr != nullptr);
+  Allocator allocator = wapp_mem_arena_allocator_init(4096);
+  b8 result          = allocator.obj != nullptr && allocator.alloc != nullptr &&
+                        allocator.alloc_aligned != nullptr &&
+                        allocator.realloc != nullptr && allocator.realloc_aligned != nullptr &&
+                        allocator.free == nullptr;
+  void *ptr           = wapp_mem_allocator_alloc(&allocator, 20);
+  result              = result && (ptr != nullptr);

-	wapp_mem_arena_allocator_destroy(&allocator);
+  wapp_mem_arena_allocator_destroy(&allocator);

-	return wapp_tester_result(result);
-}
-
-TestFuncResult test_arena_allocator_with_buffer(void) {
-	u8 buffer[KiB(4)] = {0};
-
-	Allocator allocator = wapp_mem_arena_allocator_init_with_buffer(buffer, KiB(4));
-	b8 result           = allocator.obj != NULL && allocator.alloc != NULL &&
-	                      allocator.alloc_aligned != NULL &&
-	                      allocator.realloc != NULL && allocator.realloc_aligned != NULL &&
-	                      allocator.free == NULL;
-	void *ptr           = wapp_mem_allocator_alloc(&allocator, 20);
-	result              = result && (ptr != NULL);
-
-	wapp_mem_arena_allocator_destroy(&allocator);
-
-	return wapp_tester_result(result);
-}
-
-TestFuncResult test_arena_allocator_temp_begin(void) {
-	temp_allocator = wapp_mem_arena_allocator_init_with_buffer(temp_buf, TEMP_BUF_SIZE);
-
-	i32 *num1 = (i32 *)wapp_mem_allocator_alloc(&temp_allocator, sizeof(i32));
-	b8 result = num1 != NULL;
-
-	wapp_mem_arena_allocator_temp_begin(&temp_allocator);
-	i32 *num2 = (i32 *)wapp_mem_allocator_alloc(&temp_allocator, sizeof(i32));
-	result    = result && num2 != NULL;
-	i32 *num3 = (i32 *)wapp_mem_allocator_alloc(&temp_allocator, sizeof(i32));
-	result    = result && num3 == NULL;
-
-	return wapp_tester_result(result);
-}
-
-TestFuncResult test_arena_allocator_temp_end(void) {
-	wapp_mem_arena_allocator_temp_end(&temp_allocator);
-	i32 *num1 = (i32 *)wapp_mem_allocator_alloc(&temp_allocator, sizeof(i32));
-	b8 result = num1 != NULL;
-	i32 *num2 = (i32 *)wapp_mem_allocator_alloc(&temp_allocator, sizeof(i32));
-	result    = result && num2 == NULL;
-
-	wapp_mem_arena_allocator_destroy(&temp_allocator);
-
-	return wapp_tester_result(result);
+  return wapp_tester_result(result);
 }
--- a/tests/allocator/test_allocator.h
+++ b/tests/allocator/test_allocator.h
@@ -4,8 +4,5 @@
 #include "wapp.h"

 TestFuncResult test_arena_allocator(void);
-TestFuncResult test_arena_allocator_with_buffer(void);
-TestFuncResult test_arena_allocator_temp_begin(void);
-TestFuncResult test_arena_allocator_temp_end(void);

 #endif // !TEST_ALLOCATOR_H
--- a/tests/arena/test_arena.c
+++ b/tests/arena/test_arena.c
@@ -2,167 +2,110 @@
 #include "wapp.h"
 #include <stdlib.h>

-#define ARENA_CAPACITY KiB(16)
-#define ARENA_BUF_SIZE KiB(4)
-// NOTE (Abdelrahman): Cannot query size of Arena here so it's hardcoded. Similarly, since arena
-// allocation are aligned to power of 2 boundaries, the number of i32 values needed is hardcoded.
-#define TEMP_BUF_SIZE (40 + sizeof(i32) * 8)
+#define ARENA_CAPACITY KB(16)

-wapp_intern Arena *arena               = NULL;
-wapp_intern i32 count                  = 20;
-wapp_intern i32 *array                 = NULL;
-wapp_intern Arena *buf_arena           = NULL;
-wapp_intern u8 buf[ARENA_BUF_SIZE]     = {0};
-wapp_intern Arena *temp_arena          = NULL;
-wapp_intern u8 temp_buf[TEMP_BUF_SIZE] = {0};
+wapp_intern Arena *arena = NULL;
+wapp_intern i32 count    = 20;
+wapp_intern i32 *array   = NULL;

-TestFuncResult test_arena_init_buffer(void) {
-	b8 result = wapp_mem_arena_init_buffer(&buf_arena, buf, ARENA_BUF_SIZE);
-	return wapp_tester_result(result);
-}
+TestFuncResult test_arena_init(void) {
+  b8 result = wapp_mem_arena_init(&arena, ARENA_CAPACITY);

-TestFuncResult test_arena_init_allocated(void) {
-	b8 result = wapp_mem_arena_init_allocated(&arena, ARENA_CAPACITY);
-
-	return wapp_tester_result(result);
+  return wapp_tester_result(result);
 }

 TestFuncResult test_arena_init_succeeds_when_reserving_very_large_size(void) {
-	Arena *large_arena = NULL;
-	u64 capacity       = GiB(512);
-	b8 result          = wapp_mem_arena_init_allocated(&large_arena, capacity);
-	if (result) {
-		wapp_mem_arena_destroy(&large_arena);
-	}
+  Arena *large_arena = NULL;
+  u64 capacity       = GB(512);
+  b8 result         = wapp_mem_arena_init(&large_arena, capacity);
+  if (result) {
+    wapp_mem_arena_destroy(&large_arena);
+  }

-	return wapp_tester_result(result);
-}
-
-TestFuncResult test_arena_alloc_with_buffer(void) {
-	i32 *arr  = (i32 *)wapp_mem_arena_alloc(arena, count * sizeof(i32));
-	b8 result = arr != NULL;
-
-	for (i32 i = 0; i < count; ++i) {
-		arr[i] = i * 10;
-	}
-
-	return wapp_tester_result(result);
+  return wapp_tester_result(result);
 }

 TestFuncResult test_arena_alloc_succeeds_when_within_capacity(void) {
-	array     = wapp_mem_arena_alloc(arena, count * sizeof(i32));
-	b8 result = array != NULL;
+  array       = wapp_mem_arena_alloc(arena, count * sizeof(i32));
+  b8 result  = array != NULL;

-	for (i32 i = 0; i < count; ++i) {
-		array[i] = i * 10;
-	}
+  for (i32 i = 0; i < count; ++i) {
+    array[i] = i * 10;
+  }

-	return wapp_tester_result(result);
+  return wapp_tester_result(result);
 }

 TestFuncResult test_arena_alloc_fails_when_over_capacity(void) {
-	u8 *bytes = wapp_mem_arena_alloc(arena, ARENA_CAPACITY * 2);
-	b8 result = bytes == NULL;
+  u8 *bytes   = wapp_mem_arena_alloc(arena, ARENA_CAPACITY * 2);
+  b8 result  = bytes == NULL;

-	return wapp_tester_result(result);
+  return wapp_tester_result(result);
 }

 TestFuncResult test_arena_realloc_bigger_size(void) {
-	u64 old_count = 10;
-	u64 new_count = 20;
-	i32 *bytes    = wapp_mem_arena_alloc(arena, old_count * sizeof(i32));
+  u64 old_count = 10;
+  u64 new_count = 20;
+  i32 *bytes    = wapp_mem_arena_alloc(arena, old_count * sizeof(i32));

-	for (u64 i = 0; i < old_count; ++i) {
-		bytes[i] = (i32)i;
-	}
+  for (u64 i = 0; i < old_count; ++i) {
+    bytes[i] = (i32)i;
+  }

-	i32 *new_bytes = wapp_mem_arena_realloc(arena, bytes, old_count * sizeof(i32), new_count * sizeof(i32));
-	if (!new_bytes) {
-		return wapp_tester_result(false);
-	}
+  i32 *new_bytes = wapp_mem_arena_realloc(arena, bytes, old_count * sizeof(i32), new_count * sizeof(i32));
+  if (!new_bytes) {
+    return wapp_tester_result(false);
+  }

-	for (u64 i = 0; i < new_count; ++i) {
-		if (i < old_count && new_bytes[i] != bytes[i]) {
-			return wapp_tester_result(false);
-		}
-	}
+  for (u64 i = 0; i < new_count; ++i) {
+    if (i < old_count && new_bytes[i] != bytes[i]) {
+      return wapp_tester_result(false);
+    }
+  }

-	return wapp_tester_result(true);
+  return wapp_tester_result(true);
 }

 TestFuncResult test_arena_realloc_smaller_size(void) {
-	u64 old_count = 10;
-	u64 new_count = 5;
-	i32 *bytes    = wapp_mem_arena_alloc(arena, old_count * sizeof(i32));
+  u64 old_count = 10;
+  u64 new_count = 5;
+  i32 *bytes    = wapp_mem_arena_alloc(arena, old_count * sizeof(i32));

-	for (u64 i = 0; i < old_count; ++i) {
-		bytes[i] = (i32)i;
-	}
+  for (u64 i = 0; i < old_count; ++i) {
+    bytes[i] = (i32)i;
+  }

-	i32 *new_bytes = wapp_mem_arena_realloc(arena, bytes, old_count * sizeof(i32), new_count * sizeof(i32));
-	if (!new_bytes) {
-		return wapp_tester_result(false);
-	}
+  i32 *new_bytes = wapp_mem_arena_realloc(arena, bytes, old_count * sizeof(i32), new_count * sizeof(i32));
+  if (!new_bytes) {
+    return wapp_tester_result(false);
+  }

-	for (u64 i = 0; i < new_count; ++i) {
-		if (i < new_count && new_bytes[i] != bytes[i]) {
-			return wapp_tester_result(false);
-		}
-	}
+  for (u64 i = 0; i < new_count; ++i) {
+    if (i < new_count && new_bytes[i] != bytes[i]) {
+      return wapp_tester_result(false);
+    }
+  }

-	return wapp_tester_result(true);
-}
-
-TestFuncResult test_arena_temp_begin(void) {
-	b8 result = wapp_mem_arena_init_buffer(&temp_arena, temp_buf, TEMP_BUF_SIZE);
-	i32 *num1 = (i32 *)wapp_mem_arena_alloc(temp_arena, sizeof(i32));
-	result    = result && num1 != NULL;
-
-	wapp_mem_arena_temp_begin(temp_arena);
-	i32 *num2 = (i32 *)wapp_mem_arena_alloc(temp_arena, sizeof(i32));
-	result    = result && num2 != NULL;
-	i32 *num3 = (i32 *)wapp_mem_arena_alloc(temp_arena, sizeof(i32));
-	result    = result && num3 == NULL;
-
-	return wapp_tester_result(result);
-}
-
-TestFuncResult test_arena_temp_end(void) {
-	wapp_mem_arena_temp_end(temp_arena);
-	i32 *num1 = (i32 *)wapp_mem_arena_alloc(temp_arena, sizeof(i32));
-	b8 result = num1 != NULL;
-	i32 *num2 = (i32 *)wapp_mem_arena_alloc(temp_arena, sizeof(i32));
-	result    = result && num2 == NULL;
-
-	wapp_mem_arena_destroy(&temp_arena);
-
-	return wapp_tester_result(result);
+  return wapp_tester_result(true);
 }

 TestFuncResult test_arena_clear(void) {
-	wapp_mem_arena_clear(arena);
-	b8 result = true;
+  wapp_mem_arena_clear(arena);
+  b8 result = true;

-	for (i32 i = 0; i < count; ++i) {
-		if (array[i] != 0) {
-			result = false;
-			break;
-		}
-	}
+  for (i32 i = 0; i < count; ++i) {
+    if (array[i] != 0) {
+      result = false;
+      break;
+    }
+  }

-	return wapp_tester_result(result);
+  return wapp_tester_result(result);
 }

-TestFuncResult test_arena_destroy_buffer(void) {
-	wapp_mem_arena_destroy(&buf_arena);
-	b8 result = buf_arena == NULL;
+TestFuncResult test_arena_destroy(void) {
+  wapp_mem_arena_destroy(&arena);
+  b8 result = arena == NULL;

-	return wapp_tester_result(result);
-}
-
-TestFuncResult test_arena_destroy_allocated(void) {
-	wapp_mem_arena_destroy(&arena);
-	b8 result = arena == NULL;
-
-	return wapp_tester_result(result);
+  return wapp_tester_result(result);
 }
--- a/tests/arena/test_arena.cc
+++ b/tests/arena/test_arena.cc
@@ -2,167 +2,110 @@
 #include "wapp.h"
 #include <stdlib.h>

-#define ARENA_CAPACITY KiB(16)
-#define ARENA_BUF_SIZE KiB(4)
-// NOTE (Abdelrahman): Cannot query size of Arena here so it's hardcoded. Similarly, since arena
-// allocation are aligned to power of 2 boundaries, the number of i32 values needed is hardcoded.
-#define TEMP_BUF_SIZE (40 + sizeof(i32) * 8)
+#define ARENA_CAPACITY KB(16)

-wapp_intern Arena *arena               = NULL;
-wapp_intern i32 count                  = 20;
-wapp_intern i32 *array                 = NULL;
-wapp_intern Arena *buf_arena           = NULL;
-wapp_intern u8 buf[ARENA_BUF_SIZE]     = {};
-wapp_intern Arena *temp_arena          = NULL;
-wapp_intern u8 temp_buf[TEMP_BUF_SIZE] = {};
+wapp_intern Arena *arena = nullptr;
+wapp_intern i32 count    = 20;
+wapp_intern i32 *array   = nullptr;

-TestFuncResult test_arena_init_buffer(void) {
-	b8 result = wapp_mem_arena_init_buffer(&buf_arena, buf, ARENA_BUF_SIZE);
-	return wapp_tester_result(result);
-}
+TestFuncResult test_arena_init(void) {
+  b8 result = wapp_mem_arena_init(&arena, ARENA_CAPACITY);

-TestFuncResult test_arena_init_allocated(void) {
-	b8 result = wapp_mem_arena_init_allocated(&arena, ARENA_CAPACITY);
-
-	return wapp_tester_result(result);
+  return wapp_tester_result(result);
 }

 TestFuncResult test_arena_init_succeeds_when_reserving_very_large_size(void) {
-	Arena *large_arena = nullptr;
-	u64 capacity       = GiB(512);
-	b8 result          = wapp_mem_arena_init_allocated(&large_arena, capacity);
-	if (result) {
-		wapp_mem_arena_destroy(&large_arena);
-	}
+  Arena *large_arena = nullptr;
+  u64 capacity       = GB(512);
+  b8 result         = wapp_mem_arena_init(&large_arena, capacity);
+  if (result) {
+    wapp_mem_arena_destroy(&large_arena);
+  }

-	return wapp_tester_result(result);
-}
-
-TestFuncResult test_arena_alloc_with_buffer(void) {
-	i32 *arr  = (i32 *)wapp_mem_arena_alloc(arena, count * sizeof(i32));
-	b8 result = arr != NULL;
-
-	for (i32 i = 0; i < count; ++i) {
-		arr[i] = i * 10;
-	}
-
-	return wapp_tester_result(result);
+  return wapp_tester_result(result);
 }

 TestFuncResult test_arena_alloc_succeeds_when_within_capacity(void) {
-	array     = (i32 *)wapp_mem_arena_alloc(arena, count * sizeof(i32));
-	b8 result = array != nullptr;
+  array       = (i32 *)wapp_mem_arena_alloc(arena, count * sizeof(i32));
+  b8 result  = array != nullptr;

-	for (i32 i = 0; i < count; ++i) {
-		array[i] = i * 10;
-	}
+  for (i32 i = 0; i < count; ++i) {
+    array[i] = i * 10;
+  }

-	return wapp_tester_result(result);
+  return wapp_tester_result(result);
 }

 TestFuncResult test_arena_alloc_fails_when_over_capacity(void) {
-	u8 *bytes = (u8 *)wapp_mem_arena_alloc(arena, ARENA_CAPACITY * 2);
-	b8 result = bytes == nullptr;
+  u8 *bytes   = (u8 *)wapp_mem_arena_alloc(arena, ARENA_CAPACITY * 2);
+  b8 result  = bytes == nullptr;

-	return wapp_tester_result(result);
+  return wapp_tester_result(result);
 }

 TestFuncResult test_arena_realloc_bigger_size(void) {
-	u64 old_count = 10;
-	u64 new_count = 20;
-	i32 *bytes    = (i32 *)wapp_mem_arena_alloc(arena, old_count * sizeof(i32));
+  u64 old_count = 10;
+  u64 new_count = 20;
+  i32 *bytes    = (i32 *)wapp_mem_arena_alloc(arena, old_count * sizeof(i32));

-	for (u64 i = 0; i < old_count; ++i) {
-		bytes[i] = (i32)i;
-	}
+  for (u64 i = 0; i < old_count; ++i) {
+    bytes[i] = (i32)i;
+  }

-	i32 *new_bytes = (i32 *)wapp_mem_arena_realloc(arena, bytes, old_count * sizeof(i32), new_count * sizeof(i32));
-	if (!new_bytes) {
-		return wapp_tester_result(false);
-	}
+  i32 *new_bytes = (i32 *)wapp_mem_arena_realloc(arena, bytes, old_count * sizeof(i32), new_count * sizeof(i32));
+  if (!new_bytes) {
+    return wapp_tester_result(false);
+  }

-	for (u64 i = 0; i < new_count; ++i) {
-		if (i < old_count && new_bytes[i] != bytes[i]) {
-			return wapp_tester_result(false);
-		}
-	}
+  for (u64 i = 0; i < new_count; ++i) {
+    if (i < old_count && new_bytes[i] != bytes[i]) {
+      return wapp_tester_result(false);
+    }
+  }

-	return wapp_tester_result(true);
+  return wapp_tester_result(true);
 }

 TestFuncResult test_arena_realloc_smaller_size(void) {
-	u64 old_count = 10;
-	u64 new_count = 5;
-	i32 *bytes    = (i32 *)wapp_mem_arena_alloc(arena, old_count * sizeof(i32));
+  u64 old_count = 10;
+  u64 new_count = 5;
+  i32 *bytes    = (i32 *)wapp_mem_arena_alloc(arena, old_count * sizeof(i32));

-	for (u64 i = 0; i < old_count; ++i) {
-		bytes[i] = (i32)i;
-	}
+  for (u64 i = 0; i < old_count; ++i) {
+    bytes[i] = (i32)i;
+  }

-	i32 *new_bytes = (i32 *)wapp_mem_arena_realloc(arena, bytes, old_count * sizeof(i32), new_count * sizeof(i32));
-	if (!new_bytes) {
-		return wapp_tester_result(false);
-	}
+  i32 *new_bytes = (i32 *)wapp_mem_arena_realloc(arena, bytes, old_count * sizeof(i32), new_count * sizeof(i32));
+  if (!new_bytes) {
+    return wapp_tester_result(false);
+  }

-	for (u64 i = 0; i < new_count; ++i) {
-		if (i < new_count && new_bytes[i] != bytes[i]) {
-			return wapp_tester_result(false);
-		}
-	}
+  for (u64 i = 0; i < new_count; ++i) {
+    if (i < new_count && new_bytes[i] != bytes[i]) {
+      return wapp_tester_result(false);
+    }
+  }

-	return wapp_tester_result(true);
-}
-
-TestFuncResult test_arena_temp_begin(void) {
-	b8 result = wapp_mem_arena_init_buffer(&temp_arena, temp_buf, TEMP_BUF_SIZE);
-	i32 *num1 = (i32 *)wapp_mem_arena_alloc(temp_arena, sizeof(i32));
-	result    = result && num1 != NULL;
-
-	wapp_mem_arena_temp_begin(temp_arena);
-	i32 *num2 = (i32 *)wapp_mem_arena_alloc(temp_arena, sizeof(i32));
-	result    = result && num2 != NULL;
-	i32 *num3 = (i32 *)wapp_mem_arena_alloc(temp_arena, sizeof(i32));
-	result    = result && num3 == NULL;
-
-	return wapp_tester_result(result);
-}
-
-TestFuncResult test_arena_temp_end(void) {
-	wapp_mem_arena_temp_end(temp_arena);
-	i32 *num1 = (i32 *)wapp_mem_arena_alloc(temp_arena, sizeof(i32));
-	b8 result = num1 != NULL;
-	i32 *num2 = (i32 *)wapp_mem_arena_alloc(temp_arena, sizeof(i32));
-	result    = result && num2 == NULL;
-
-	wapp_mem_arena_destroy(&temp_arena);
-
-	return wapp_tester_result(result);
+  return wapp_tester_result(true);
 }

 TestFuncResult test_arena_clear(void) {
-	wapp_mem_arena_clear(arena);
-	b8 result = true;
+  wapp_mem_arena_clear(arena);
+  b8 result = true;

-	for (i32 i = 0; i < count; ++i) {
-		if (array[i] != 0) {
-			result = false;
-			break;
-		}
-	}
+  for (i32 i = 0; i < count; ++i) {
+    if (array[i] != 0) {
+      result = false;
+      break;
+    }
+  }

-	return wapp_tester_result(result);
+  return wapp_tester_result(result);
 }

-TestFuncResult test_arena_destroy_buffer(void) {
-	wapp_mem_arena_destroy(&buf_arena);
-	b8 result = buf_arena == NULL;
+TestFuncResult test_arena_destroy(void) {
+  wapp_mem_arena_destroy(&arena);
+  b8 result = arena == nullptr;

-	return wapp_tester_result(result);
-}
-
-TestFuncResult test_arena_destroy_allocated(void) {
-	wapp_mem_arena_destroy(&arena);
-	b8 result = arena == nullptr;
-
-	return wapp_tester_result(result);
+  return wapp_tester_result(result);
 }
--- a/tests/arena/test_arena.h
+++ b/tests/arena/test_arena.h
@@ -3,18 +3,13 @@

 #include "wapp.h"

-TestFuncResult test_arena_init_buffer(void);
-TestFuncResult test_arena_init_allocated(void);
+TestFuncResult test_arena_init(void);
 TestFuncResult test_arena_init_succeeds_when_reserving_very_large_size(void);
-TestFuncResult test_arena_alloc_with_buffer(void);
 TestFuncResult test_arena_alloc_succeeds_when_within_capacity(void);
 TestFuncResult test_arena_alloc_fails_when_over_capacity(void);
 TestFuncResult test_arena_realloc_bigger_size(void);
 TestFuncResult test_arena_realloc_smaller_size(void);
 TestFuncResult test_arena_clear(void);
-TestFuncResult test_arena_temp_begin(void);
-TestFuncResult test_arena_temp_end(void);
-TestFuncResult test_arena_destroy_buffer(void);
-TestFuncResult test_arena_destroy_allocated(void);
+TestFuncResult test_arena_destroy(void);

 #endif // !TEST_ARENA_H
--- a/tests/array/test_i32_array.c
+++ b/tests/array/test_i32_array.c
@@ -2,272 +2,269 @@
 #include "wapp.h"

 TestFuncResult test_i32_array(void) {
-	b8 result;
+  b8 result;

-	I32Array array = wapp_array(i32, 1, 2, 3, 4, 5, 6, 7);
-	result = wapp_array_count(array) == 7 && wapp_array_capacity(array) == 16;
+  I32Array array = wapp_array(i32, I32Array, 1, 2, 3, 4, 5, 6, 7);
+  result = array.count == 7 && array.capacity == 16;

-	i32 *item;
-	u64 count  = wapp_array_count(array);
-	u64 index  = 0;
-	b8 running = true;
-	while (running) {
-		item   = wapp_array_get(i32, array, index);
-		result = result && item && *item == (i32)(index + 1);
+  i32 *item;
+  u64 count   = array.count;
+  u64 index   = 0;
+  b8 running  = true;
+  while (running) {
+      item   = wapp_array_get(i32, &array, index);
+      result = result && item && *item == (i32)(index + 1);

-		++index;
-		running = index < count;
-	}
+      ++index;
+      running = index < count;
+  }

-	return wapp_tester_result(result);
+  return wapp_tester_result(result);
 }

 TestFuncResult test_i32_array_with_capacity(void) {
-	b8 result;
+  b8 result;

-	I32Array array1 = wapp_array_with_capacity(i32, 64, ARRAY_INIT_NONE);
-	result = wapp_array_count(array1) == 0 && wapp_array_capacity(array1) == 64;
+  I32Array array = wapp_array_with_capacity(i32, I32Array, 64);
+  result = array.count == 0 && array.capacity == 64;

-	I32Array array2 = wapp_array_with_capacity(i32, 64, ARRAY_INIT_FILLED);
-	result = wapp_array_count(array2) == 64 && wapp_array_capacity(array2) == 64;
-
-	return wapp_tester_result(result);
+  return wapp_tester_result(result);
 }

 TestFuncResult test_i32_array_get(void) {
-	b8 result = true;
+  b8 result = true;

-	I32Array array = wapp_array(i32, 0, 1, 2, 3, 4, 5, 6, 7, 8);
+  I32Array array = wapp_array(i32, I32Array, 0, 1, 2, 3, 4, 5, 6, 7, 8);

-	i32 *item;
-	u64 count  = wapp_array_count(array);
-	u64 index  = 0;
-	b8 running = true;
-	while (running) {
-		item   = wapp_array_get(i32, array, index);
-		result = result && item && *item == (i32)index;
+  i32 *item;
+  u64 count   = array.count;
+  u64 index   = 0;
+  b8 running  = true;
+  while (running) {
+    item   = wapp_array_get(i32, &array, index);
+    result = result && item && *item == (i32)index;

-		++index;
-		running = index < count;
-	}
+    ++index;
+    running = index < count;
+  }

-	return wapp_tester_result(result);
+  return wapp_tester_result(result);
 }

 TestFuncResult test_i32_array_set(void) {
-	b8 result = true;
+  b8 result = true;

-	I32Array array = wapp_array(i32, 0, 1, 2, 3, 4, 5, 6, 7, 8);
+  I32Array array = wapp_array(i32, I32Array, 0, 1, 2, 3, 4, 5, 6, 7, 8);

-	i32 *item;
-	u64 count  = wapp_array_count(array);
-	u64 index  = 0;
-	b8 running = true;
-	while (running) {
-		i32 num = (i32)(index * 2);
-		wapp_array_set(i32, array, index, &num);
-		item   = wapp_array_get(i32, array, index);
-		result = result && item && *item == (i32)(index * 2);
+  i32 *item;
+  u64 count   = array.count;
+  u64 index   = 0;
+  b8 running  = true;
+  while (running) {
+    i32 num = (i32)(index * 2);
+    wapp_array_set(i32, &array, index, &num);
+    item   = wapp_array_get(i32, &array, index);
+    result = result && item && *item == (i32)(index * 2);

-		++index;
-		running = index < count;
-	}
+    ++index;
+    running = index < count;
+  }

-	return wapp_tester_result(result);
+  return wapp_tester_result(result);
 }

 TestFuncResult test_i32_array_append_capped(void) {
-	b8 result;
+  b8 result;

-	I32Array array = wapp_array_with_capacity(i32, 64, ARRAY_INIT_NONE);
-	wapp_array_append_capped(i32, array, &((i32){10}));
+  I32Array array = wapp_array_with_capacity(i32, I32Array, 64);
+  wapp_array_append_capped(i32, &array, &((i32){10}));

-	result    = wapp_array_count(array) == 1;
-	i32 *item = wapp_array_get(i32, array, 0);
-	result = result && item && *item == 10;
+  result    = array.count == 1;
+  i32 *item = wapp_array_get(i32, &array, 0);
+  result = result && item && *item == 10;

-	array = wapp_array(i32, 1);
-	wapp_array_append_capped(i32, array, &((i32){10}));
+  array = wapp_array(i32, I32Array, 1);
+  wapp_array_append_capped(i32, &array, &((i32){10}));

-	result = result && wapp_array_count(array) == 2;
+  result = result && array.count == 2;

-	return wapp_tester_result(result);
+  return wapp_tester_result(result);
 }

 TestFuncResult test_i32_array_extend_capped(void) {
-	b8 result;
+  b8 result;

-	I32Array array1 = wapp_array(i32, 1, 2, 3, 4);
-	I32Array array2 = wapp_array(i32, 10, 20);
+  I32Array array1 = wapp_array(i32, I32Array, 1, 2, 3, 4);
+  I32Array array2 = wapp_array(i32, I32Array, 10, 20);

-	result = wapp_array_count(array1) == 4 && wapp_array_count(array2) == 2;
+  result = array1.count == 4 && array2.count == 2;

-	wapp_array_extend_capped(i32, array1, array2);
+  wapp_array_extend_capped(i32, &array1, &array2);

-	result = result && wapp_array_count(array1) == 6;
+  result = result && array1.count == 6;

-	return wapp_tester_result(result);
+  return wapp_tester_result(result);
 }

 TestFuncResult test_i32_array_copy_capped(void) {
-	b8 result;
+  b8 result;

-	I32Array src  = wapp_array(i32, 1, 2, 3, 4, 5);
-	I32Array dst1 = wapp_array(i32, 1, 2, 3, 4, 5, 6);
-	I32Array dst2 = wapp_array(i32, 1, 2);
+  I32Array src  = wapp_array(i32, I32Array, 1, 2, 3, 4, 5);
+  I32Array dst1 = wapp_array(i32, I32Array, 1, 2, 3, 4, 5, 6);
+  I32Array dst2 = wapp_array(i32, I32Array, 1, 2);

-	u64 expected_count = 5;
-	wapp_array_copy_capped(i32, dst1, src);
-	result = wapp_array_count(dst1) == expected_count;
+  u64 expected_count = 5;
+  wapp_array_copy_capped(i32, &dst1, &src);
+  result = dst1.count == expected_count;

-	u64 index  = 0;
-	b8 running = true;
-	while (running) {
-		result = result && *wapp_array_get(i32, src, index) == *wapp_array_get(i32, dst1, index);
+  u64 index    = 0;
+  b8 running  = true;
+  while (running) {
+    result = result && *wapp_array_get(i32, &src, index) == *wapp_array_get(i32, &dst1, index);

-		++index;
-		running = index < expected_count;
-	}
+    ++index;
+    running = index < expected_count;
+  }

-	expected_count = 4;
-	wapp_array_copy_capped(i32, dst2, src);
-	result = result && wapp_array_count(dst2) == expected_count;
+  expected_count = 4;
+  wapp_array_copy_capped(i32, &dst2, &src);
+  result = result && dst2.count == expected_count;

-	index   = 0;
-	running = true;
-	while (running) {
-		result = result && *wapp_array_get(i32, src, index) == *wapp_array_get(i32, dst2, index);
+  index   = 0;
+  running = true;
+  while (running) {
+    result = result && *wapp_array_get(i32, &src, index) == *wapp_array_get(i32, &dst2, index);

-		++index;
-		running = index < expected_count;
-	}
+    ++index;
+    running = index < expected_count;
+  }

-	return wapp_tester_result(result);
+  return wapp_tester_result(result);
 }

 TestFuncResult test_i32_array_alloc_capacity(void) {
-	b8 result;
+  b8 result;

-	Allocator allocator = wapp_mem_arena_allocator_init(MiB(4));
-	u64 capacity        = 32;
-	I32Array array      = wapp_array_alloc_capacity(i32, &allocator, capacity, ARRAY_INIT_NONE);
+  Allocator allocator = wapp_mem_arena_allocator_init(MB(4));
+  u64 capacity        = 32;
+  I32Array *array     = wapp_array_alloc_capacity(i32, I32Array, &allocator, capacity);

-	result = array && wapp_array_capacity(array) == capacity;
+  result = array && array->capacity == capacity;

-	wapp_mem_arena_allocator_destroy(&allocator);
+  wapp_mem_arena_allocator_destroy(&allocator);

-	return wapp_tester_result(result);
+  return wapp_tester_result(result);
 }

 TestFuncResult test_i32_array_append_alloc(void) {
-	b8 result;
+  b8 result;

-	Allocator allocator = wapp_mem_arena_allocator_init(MiB(4));
-	I32Array array1     = wapp_array(i32, 1, 2, 3, 4, 5, 6, 7, 8);
-	I32Array array2     = wapp_array(i32, 1, 2);
+  Allocator allocator = wapp_mem_arena_allocator_init(MB(4));
+  I32Array array1     = wapp_array(i32, I32Array, 1, 2, 3, 4, 5, 6, 7, 8);
+  I32Array array2     = wapp_array(i32, I32Array, 1, 2);

-	I32Array arr_ptr = wapp_array_append_alloc(i32, &allocator, array1, &((i32){10}), ARRAY_INIT_NONE);
-	result = arr_ptr == array1;
+  I32Array *arr_ptr = wapp_array_append_alloc(i32, I32Array, &allocator, &array1, &((i32){10}));
+  result = arr_ptr == &array1;

-	u64 count  = 4;
-	u64 index  = 0;
-	b8 running = true;
-	while (running) {
-		i32 num = (i32)index;
-		arr_ptr = wapp_array_append_alloc(i32, &allocator, array2, &num, ARRAY_INIT_NONE);
+  u64 count    = 4;
+  u64 index    = 0;
+  b8 running  = true;
+  while (running) {
+    i32 num = (i32)index;
+    arr_ptr = wapp_array_append_alloc(i32, I32Array, &allocator, &array2, &num);

-		++index;
-		running = index < count;
-	}
-	result = result && arr_ptr != array2;
+    ++index;
+    running = index < count;
+  }
+  result = result && arr_ptr != &array2;

-	wapp_mem_arena_allocator_destroy(&allocator);
+  wapp_mem_arena_allocator_destroy(&allocator);

-	return wapp_tester_result(result);
+  return wapp_tester_result(result);
 }

 TestFuncResult test_i32_array_extend_alloc(void) {
-	b8 result;
+  b8 result;

-	Allocator allocator = wapp_mem_arena_allocator_init(MiB(4));
-	I32Array array1     = wapp_array(i32, 1, 2, 3, 4, 5, 6, 7, 8);
-	I32Array array2     = wapp_array(i32, 1, 2);
-	I32Array array3     = wapp_array(i32, 1, 2, 3, 4);
+  Allocator allocator = wapp_mem_arena_allocator_init(MB(4));
+  I32Array array1     = wapp_array(i32, I32Array, 1, 2, 3, 4, 5, 6, 7, 8);
+  I32Array array2     = wapp_array(i32, I32Array, 1, 2);
+  I32Array array3     = wapp_array(i32, I32Array, 1, 2, 3, 4);

-	I32Array arr_ptr = wapp_array_extend_alloc(i32, &allocator, array1, array3, ARRAY_INIT_NONE);
-	result = arr_ptr == array1;
+  I32Array *arr_ptr = wapp_array_extend_alloc(i32, I32Array, &allocator, &array1, &array3);
+  result = arr_ptr == &array1;

-	arr_ptr = wapp_array_extend_alloc(i32, &allocator, array2, array3, ARRAY_INIT_NONE);
-	result  = result && arr_ptr != array2;
+  arr_ptr = wapp_array_extend_alloc(i32, I32Array, &allocator, &array2, &array3);
+  result  = result && arr_ptr != &array2;

-	wapp_mem_arena_allocator_destroy(&allocator);
+  wapp_mem_arena_allocator_destroy(&allocator);

-	return wapp_tester_result(result);
+  return wapp_tester_result(result);
 }

 TestFuncResult test_i32_array_copy_alloc(void) {
-	b8 result;
+  b8 result;

-	Allocator allocator = wapp_mem_arena_allocator_init(MiB(4));
-	I32Array src        = wapp_array(i32, 1, 2, 3, 4, 5);
-	I32Array dst1       = wapp_array(i32, 1, 2, 3, 4, 5, 6);
-	I32Array dst2       = wapp_array(i32, 1, 2);
-	I32Array array      = NULL;
+  Allocator allocator = wapp_mem_arena_allocator_init(MB(4));
+  I32Array src        = wapp_array(i32, I32Array, 1, 2, 3, 4, 5);
+  I32Array dst1       = wapp_array(i32, I32Array, 1, 2, 3, 4, 5, 6);
+  I32Array dst2       = wapp_array(i32, I32Array, 1, 2);
+  I32Array *array_ptr = NULL;

-	u64 expected_count = 5;
-	array = wapp_array_copy_alloc(i32, &allocator, dst1, src, ARRAY_INIT_NONE);
-	result = wapp_array_count(array) == expected_count && array == dst1;
+  u64 expected_count = 5;
+  array_ptr = wapp_array_copy_alloc(i32, I32Array, &allocator, &dst1, &src);
+  result = array_ptr->count == expected_count && array_ptr == &dst1;

-	u64 index  = 0;
-	b8 running = true;
-	while (running) {
-		result = result && *wapp_array_get(i32, src, index) == *wapp_array_get(i32, array, index);
+  u64 index    = 0;
+  b8 running  = true;
+  while (running) {
+    result = result && *wapp_array_get(i32, &src, index) == *wapp_array_get(i32, array_ptr, index);

-		++index;
-		running = index < expected_count;
-	}
+    ++index;
+    running = index < expected_count;
+  }

-	expected_count = 5;
-	array          = wapp_array_copy_alloc(i32, &allocator, dst2, src, ARRAY_INIT_NONE);
-	result         = result && wapp_array_count(array) == expected_count && array != dst2;
+  expected_count = 5;
+  array_ptr = wapp_array_copy_alloc(i32, I32Array, &allocator, &dst2, &src);
+  result = result && array_ptr->count == expected_count && array_ptr != &dst2;

-	index   = 0;
-	running = true;
-	while (running) {
-		result = result && *wapp_array_get(i32, src, index) == *wapp_array_get(i32, array, index);
+  index   = 0;
+  running = true;
+  while (running) {
+    result = result && *wapp_array_get(i32, &src, index) == *wapp_array_get(i32, array_ptr, index);

-		++index;
-		running = index < expected_count;
-	}
+    ++index;
+    running = index < expected_count;
+  }

-	wapp_mem_arena_allocator_destroy(&allocator);
+  wapp_mem_arena_allocator_destroy(&allocator);

-	return wapp_tester_result(result);
+  return wapp_tester_result(result);
 }

 TestFuncResult test_i32_array_pop(void) {
-	b8 result;
+  b8 result;

-	I32Array array1 = wapp_array(i32, 0, 1, 2, 3, 4, 5, 6, 7, 8);
-	I32Array array2 = wapp_array_with_capacity(i32, 32, ARRAY_INIT_NONE);
+  I32Array array1 = wapp_array(i32, I32Array, 0, 1, 2, 3, 4, 5, 6, 7, 8);
+  I32Array array2 = wapp_array_with_capacity(i32, I32Array, 32);

-	i32 item1 = wapp_array_pop(i32, array1);
-	i32 item2 = wapp_array_pop(i32, array2);
+  i32 item1 = wapp_array_pop(i32, &array1);
+  i32 item2 = wapp_array_pop(i32, &array2);

-	result = item1 == 8 && item2 == 0;
+  result = item1 == 8 && item2 == 0;

-	return wapp_tester_result(result);
+  return wapp_tester_result(result);
 }

 TestFuncResult test_i32_array_clear(void) {
-	b8 result;
+  b8 result;

-	I32Array array = wapp_array(i32, 0, 1, 2, 3, 4, 5, 6, 7, 8);
-	result = wapp_array_count(array) == 9;
+  I32Array array = wapp_array(i32, I32Array, 0, 1, 2, 3, 4, 5, 6, 7, 8);
+  result = array.count == 9;

-	wapp_array_clear(i32, array);
+  wapp_array_clear(i32, &array);

-	result = result && wapp_array_count(array) == 0;
+  result = result && array.count == 0;

-	return wapp_tester_result(result);
+  return wapp_tester_result(result);
 }
--- a/tests/array/test_i32_array.cc
+++ b/tests/array/test_i32_array.cc
@@ -2,275 +2,272 @@
 #include "wapp.h"

 TestFuncResult test_i32_array(void) {
-	b8 result;
+  b8 result;

-	I32Array array = wapp_array(i32, 1, 2, 3, 4, 5, 6, 7);
-	result = wapp_array_count(array) == 7 && wapp_array_capacity(array) == 16;
+  I32Array array = wapp_array(i32, I32Array, 1, 2, 3, 4, 5, 6, 7);
+  result = array.count == 7 && array.capacity == 16;

-	i32 *item;
-	u64 count  = wapp_array_count(array);
-	u64 index  = 0;
-	b8 running = true;
-	while (running) {
-			item   = wapp_array_get(i32, array, index);
-			result = result && item && (*item == (i32)(index + 1));
+  i32 *item;
+  u64 count    = array.count;
+  u64 index    = 0;
+  b8 running  = true;
+  while (running) {
+      item   = wapp_array_get(i32, &array, index);
+      result = result && item && (*item == (i32)(index + 1));

-			++index;
-			running = index < count;
-	}
+      ++index;
+      running = index < count;
+  }

-	return wapp_tester_result(result);
+  return wapp_tester_result(result);
 }

 TestFuncResult test_i32_array_with_capacity(void) {
-	b8 result;
+  b8 result;

-	I32Array array1 = wapp_array_with_capacity(i32, 64, ARRAY_INIT_NONE);
-	result = wapp_array_count(array1) == 0 && wapp_array_capacity(array1) == 64;
+  I32Array array = wapp_array_with_capacity(i32, I32Array, 64);
+  result = array.count == 0 && array.capacity == 64;

-	I32Array array2 = wapp_array_with_capacity(i32, 64, ARRAY_INIT_FILLED);
-	result = wapp_array_count(array2) == 64 && wapp_array_capacity(array2) == 64;
-
-	return wapp_tester_result(result);
+  return wapp_tester_result(result);
 }

 TestFuncResult test_i32_array_get(void) {
-	b8 result = true;
+  b8 result = true;

-	I32Array array = wapp_array(i32, 0, 1, 2, 3, 4, 5, 6, 7, 8);
+  I32Array array = wapp_array(i32, I32Array, 0, 1, 2, 3, 4, 5, 6, 7, 8);

-	i32 *item;
-	u64 count  = wapp_array_count(array);
-	u64 index  = 0;
-	b8 running = true;
-	while (running) {
-		item   = wapp_array_get(i32, array, index);
-		result = result && item && (*item == (i32)index);
+  i32 *item;
+  u64 count    = array.count;
+  u64 index    = 0;
+  b8 running  = true;
+  while (running) {
+    item   = wapp_array_get(i32, &array, index);
+    result = result && item && (*item == (i32)index);

-		++index;
-		running = index < count;
-	}
+    ++index;
+    running = index < count;
+  }

-	return wapp_tester_result(result);
+  return wapp_tester_result(result);
 }

 TestFuncResult test_i32_array_set(void) {
-	b8 result = true;
+  b8 result = true;

-	I32Array array = wapp_array(i32, 0, 1, 2, 3, 4, 5, 6, 7, 8);
+  I32Array array = wapp_array(i32, I32Array, 0, 1, 2, 3, 4, 5, 6, 7, 8);

-	i32 *item;
-	u64 count  = wapp_array_count(array);
-	u64 index  = 0;
-	b8 running = true;
-	while (running) {
-		i32 num = (i32)(index * 2);
-		wapp_array_set(i32, array, index, &num);
-		item   = wapp_array_get(i32, array, index);
-		result = result && item && (*item == (i32)(index * 2));
+  i32 *item;
+  u64 count    = array.count;
+  u64 index    = 0;
+  b8 running  = true;
+  while (running) {
+    i32 num = (i32)(index * 2);
+    wapp_array_set(i32, &array, index, &num);
+    item   = wapp_array_get(i32, &array, index);
+    result = result && item && (*item == (i32)(index * 2));

-		++index;
-		running = index < count;
-	}
+    ++index;
+    running = index < count;
+  }

-	return wapp_tester_result(result);
+  return wapp_tester_result(result);
 }

 TestFuncResult test_i32_array_append_capped(void) {
-	b8 result;
+  b8 result;

-	I32Array array = wapp_array_with_capacity(i32, 64, ARRAY_INIT_NONE);
-	i32 item1 = 10;
-	wapp_array_append_capped(i32, array, &item1);
+  I32Array array = wapp_array_with_capacity(i32, I32Array, 64);
+  i32 item1 = 10;
+  wapp_array_append_capped(i32, &array, &item1);

-	result = wapp_array_count(array) == 1;
-	i32 *item = wapp_array_get(i32, array, 0);
-	result = result && item && *item == 10;
+  result = array.count == 1;
+  i32 *item = wapp_array_get(i32, &array, 0);
+  result = result && item && *item == 10;

-	array = wapp_array(i32, 1);
-	i32 item2 = 10;
-	wapp_array_append_capped(i32, array, &item2);
+  array = wapp_array(i32, I32Array, 1);
+  i32 item2 = 10;
+  wapp_array_append_capped(i32, &array, &item2);

-	result = result && wapp_array_count(array) == 2;
+  result = result && array.count == 2;

-	return wapp_tester_result(result);
+  return wapp_tester_result(result);
 }

 TestFuncResult test_i32_array_extend_capped(void) {
-	b8 result;
+  b8 result;

-	I32Array array1 = wapp_array(i32, 1, 2, 3, 4);
-	I32Array array2 = wapp_array(i32, 10, 20);
+  I32Array array1 = wapp_array(i32, I32Array, 1, 2, 3, 4);
+  I32Array array2 = wapp_array(i32, I32Array, 10, 20);

-	result = wapp_array_count(array1) == 4 && wapp_array_count(array2) == 2;
+  result = array1.count == 4 && array2.count == 2;

-	wapp_array_extend_capped(i32, array1, array2);
+  wapp_array_extend_capped(i32, &array1, &array2);

-	result = result && wapp_array_count(array1) == 6;
+  result = result && array1.count == 6;

-	return wapp_tester_result(result);
+  return wapp_tester_result(result);
 }

 TestFuncResult test_i32_array_copy_capped(void) {
-	b8 result;
+  b8 result;

-	I32Array src  = wapp_array(i32, 1, 2, 3, 4, 5);
-	I32Array dst1 = wapp_array(i32, 1, 2, 3, 4, 5, 6);
-	I32Array dst2 = wapp_array(i32, 1, 2);
+  I32Array src  = wapp_array(i32, I32Array, 1, 2, 3, 4, 5);
+  I32Array dst1 = wapp_array(i32, I32Array, 1, 2, 3, 4, 5, 6);
+  I32Array dst2 = wapp_array(i32, I32Array, 1, 2);

-	u64 expected_count = 5;
-	wapp_array_copy_capped(i32, dst1, src);
-	result = wapp_array_count(dst1) == expected_count;
+  u64 expected_count = 5;
+  wapp_array_copy_capped(i32, &dst1, &src);
+  result = dst1.count == expected_count;

-	u64 index  = 0;
-	b8 running = true;
-	while (running) {
-		result = result && (*wapp_array_get(i32, src, index) == *wapp_array_get(i32, dst1, index));
+  u64 index    = 0;
+  b8 running  = true;
+  while (running) {
+    result = result && (*wapp_array_get(i32, &src, index) == *wapp_array_get(i32, &dst1, index));

-		++index;
-		running = index < expected_count;
-	}
+    ++index;
+    running = index < expected_count;
+  }

-	expected_count = 4;
-	wapp_array_copy_capped(i32, dst2, src);
-	result = result && wapp_array_count(dst2) == expected_count;
+  expected_count = 4;
+  wapp_array_copy_capped(i32, &dst2, &src);
+  result = result && dst2.count == expected_count;

-	index   = 0;
-	running = true;
-	while (running) {
-		result = result && (*wapp_array_get(i32, src, index) == *wapp_array_get(i32, dst2, index));
+  index   = 0;
+  running = true;
+  while (running) {
+    result = result && (*wapp_array_get(i32, &src, index) == *wapp_array_get(i32, &dst2, index));

-		++index;
-		running = index < expected_count;
-	}
+    ++index;
+    running = index < expected_count;
+  }

-	return wapp_tester_result(result);
+  return wapp_tester_result(result);
 }

 TestFuncResult test_i32_array_alloc_capacity(void) {
-	b8 result;
+  b8 result;

-	Allocator allocator = wapp_mem_arena_allocator_init(MiB(4));
-	u64 capacity        = 32;
-	I32Array array      = wapp_array_alloc_capacity(i32, &allocator, capacity, ARRAY_INIT_NONE);
+  Allocator allocator = wapp_mem_arena_allocator_init(MB(4));
+  u64 capacity        = 32;
+  I32Array *array     = wapp_array_alloc_capacity(i32, I32Array, &allocator, capacity);

-	result = array && wapp_array_capacity(array) == capacity;
+  result = array && array->capacity == capacity;

-	wapp_mem_arena_allocator_destroy(&allocator);
+  wapp_mem_arena_allocator_destroy(&allocator);

-	return wapp_tester_result(result);
+  return wapp_tester_result(result);
 }

 TestFuncResult test_i32_array_append_alloc(void) {
-	b8 result;
+  b8 result;

-	Allocator allocator = wapp_mem_arena_allocator_init(MiB(4));
-	I32Array array1     = wapp_array(i32, 1, 2, 3, 4, 5, 6, 7, 8);
-	I32Array array2     = wapp_array(i32, 1, 2);
+  Allocator allocator = wapp_mem_arena_allocator_init(MB(4));
+  I32Array array1     = wapp_array(i32, I32Array, 1, 2, 3, 4, 5, 6, 7, 8);
+  I32Array array2     = wapp_array(i32, I32Array, 1, 2);

-	i32 num = 10;
-	I32Array arr_ptr = wapp_array_append_alloc(i32, &allocator, array1, &num, ARRAY_INIT_NONE);
-	result = arr_ptr == array1;
+  i32 num = 10;
+  I32Array *arr_ptr = wapp_array_append_alloc(i32, I32Array, &allocator, &array1, &num);
+  result = arr_ptr == &array1;

-	u64 count  = 4;
-	u64 index  = 0;
-	b8 running = true;
-	while (running) {
-		num = (i32)index;
-		arr_ptr = wapp_array_append_alloc(i32, &allocator, array2, &num, ARRAY_INIT_NONE);
+  u64 count    = 4;
+  u64 index    = 0;
+  b8 running  = true;
+  while (running) {
+    num = (i32)index;
+    arr_ptr = wapp_array_append_alloc(i32, I32Array, &allocator, &array2, &num);

-		++index;
-		running = index < count;
-	}
-	result = result && arr_ptr != array2;
+    ++index;
+    running = index < count;
+  }
+  result = result && arr_ptr != &array2;

-	wapp_mem_arena_allocator_destroy(&allocator);
+  wapp_mem_arena_allocator_destroy(&allocator);

-	return wapp_tester_result(result);
+  return wapp_tester_result(result);
 }

 TestFuncResult test_i32_array_extend_alloc(void) {
-	b8 result;
+  b8 result;

-	Allocator allocator = wapp_mem_arena_allocator_init(MiB(4));
-	I32Array array1     = wapp_array(i32, 1, 2, 3, 4, 5, 6, 7, 8);
-	I32Array array2     = wapp_array(i32, 1, 2);
-	I32Array array3     = wapp_array(i32, 1, 2, 3, 4);
+  Allocator allocator = wapp_mem_arena_allocator_init(MB(4));
+  I32Array array1     = wapp_array(i32, I32Array, 1, 2, 3, 4, 5, 6, 7, 8);
+  I32Array array2     = wapp_array(i32, I32Array, 1, 2);
+  I32Array array3     = wapp_array(i32, I32Array, 1, 2, 3, 4);

-	I32Array array = wapp_array_extend_alloc(i32, &allocator, array1, array3, ARRAY_INIT_NONE);
-	result = array == array1;
+  I32Array *arr_ptr = wapp_array_extend_alloc(i32, I32Array, &allocator, &array1, &array3);
+  result = arr_ptr == &array1;

-	array = wapp_array_extend_alloc(i32, &allocator, array2, array3, ARRAY_INIT_NONE);
-	result  = result && array != array2;
+  arr_ptr = wapp_array_extend_alloc(i32, I32Array, &allocator, &array2, &array3);
+  result  = result && arr_ptr != &array2;

-	wapp_mem_arena_allocator_destroy(&allocator);
+  wapp_mem_arena_allocator_destroy(&allocator);

-	return wapp_tester_result(result);
+  return wapp_tester_result(result);
 }

 TestFuncResult test_i32_array_copy_alloc(void) {
-	b8 result;
+  b8 result;

-	Allocator allocator = wapp_mem_arena_allocator_init(MiB(4));
-	I32Array src        = wapp_array(i32, 1, 2, 3, 4, 5);
-	I32Array dst1       = wapp_array(i32, 1, 2, 3, 4, 5, 6);
-	I32Array dst2       = wapp_array(i32, 1, 2);
-	I32Array array      = nullptr;
+  Allocator allocator = wapp_mem_arena_allocator_init(MB(4));
+  I32Array src        = wapp_array(i32, I32Array, 1, 2, 3, 4, 5);
+  I32Array dst1       = wapp_array(i32, I32Array, 1, 2, 3, 4, 5, 6);
+  I32Array dst2       = wapp_array(i32, I32Array, 1, 2);
+  I32Array *array_ptr = nullptr;

-	u64 expected_count = 5;
-	array = wapp_array_copy_alloc(i32, &allocator, dst1, src, ARRAY_INIT_NONE);
-	result = wapp_array_count(array) == expected_count && array == dst1;
+  u64 expected_count = 5;
+  array_ptr = wapp_array_copy_alloc(i32, I32Array, &allocator, &dst1, &src);
+  result = array_ptr->count == expected_count && array_ptr == &dst1;

-	u64 index  = 0;
-	b8 running = true;
-	while (running) {
-		result = result && (*wapp_array_get(i32, src, index) == *wapp_array_get(i32, array, index));
+  u64 index    = 0;
+  b8 running  = true;
+  while (running) {
+    result = result && (*wapp_array_get(i32, &src, index) == *wapp_array_get(i32, array_ptr, index));

-		++index;
-		running = index < expected_count;
-	}
+    ++index;
+    running = index < expected_count;
+  }

-	expected_count = 5;
-	array          = wapp_array_copy_alloc(i32, &allocator, dst2, src, ARRAY_INIT_NONE);
-	result         = result && wapp_array_count(array) == expected_count && array != dst2;
+  expected_count = 5;
+  array_ptr = wapp_array_copy_alloc(i32, I32Array, &allocator, &dst2, &src);
+  result = result && array_ptr->count == expected_count && array_ptr != &dst2;

-	index   = 0;
-	running = true;
-	while (running) {
-		result = result && (*wapp_array_get(i32, src, index) == *wapp_array_get(i32, array, index));
+  index   = 0;
+  running = true;
+  while (running) {
+    result = result && (*wapp_array_get(i32, &src, index) == *wapp_array_get(i32, array_ptr, index));

-		++index;
-		running = index < expected_count;
-	}
+    ++index;
+    running = index < expected_count;
+  }

-	wapp_mem_arena_allocator_destroy(&allocator);
+  wapp_mem_arena_allocator_destroy(&allocator);

-	return wapp_tester_result(result);
+  return wapp_tester_result(result);
 }

 TestFuncResult test_i32_array_clear(void) {
-	b8 result;
+  b8 result;

-	I32Array array = wapp_array(i32, 0, 1, 2, 3, 4, 5, 6, 7, 8);
-	result = wapp_array_count(array) == 9;
+  I32Array array = wapp_array(i32, I32Array, 0, 1, 2, 3, 4, 5, 6, 7, 8);
+  result = array.count == 9;

-	wapp_array_clear(i32, array);
+  wapp_array_clear(i32, &array);

-	result = result && wapp_array_count(array) == 0;
+  result = result && array.count == 0;

-	return wapp_tester_result(result);
+  return wapp_tester_result(result);
 }

 TestFuncResult test_i32_array_pop(void) {
-	b8 result;
+  b8 result;

-	I32Array array1 = wapp_array(i32, 0, 1, 2, 3, 4, 5, 6, 7, 8);
-	I32Array array2 = wapp_array_with_capacity(i32, 32, ARRAY_INIT_NONE);
+  I32Array array1 = wapp_array(i32, I32Array, 0, 1, 2, 3, 4, 5, 6, 7, 8);
+  I32Array array2 = wapp_array_with_capacity(i32, I32Array, 32);

-	i32 item1 = wapp_array_pop(i32, array1);
-	i32 item2 = wapp_array_pop(i32, array2);
+  i32 item1 = wapp_array_pop(i32, &array1);
+  i32 item2 = wapp_array_pop(i32, &array2);

-	result = item1 == 8 && item2 == 0;
+  result = item1 == 8 && item2 == 0;

-	return wapp_tester_result(result);
+  return wapp_tester_result(result);
 }
--- a/tests/array/test_str8_array.c
+++ b/tests/array/test_str8_array.c
@@ -3,23 +3,23 @@
 #include "test_str8_array.h"

 TestFuncResult test_str8_array(void) {
-	b8 result;
+  b8 result;

-	Str8 expected[] = {wapp_str8_lit("Hello"), wapp_str8_lit("Hi"), wapp_str8_lit("Bye")};
-	Str8Array array = wapp_array(Str8, wapp_str8_lit("Hello"), wapp_str8_lit("Hi"), wapp_str8_lit("Bye"));
-	result = wapp_array_count(array) == 3 && wapp_array_capacity(array) == 8;
+  Str8 expected[] = {wapp_str8_lit("Hello"), wapp_str8_lit("Hi"), wapp_str8_lit("Bye")};
+  Str8Array array = wapp_array(Str8, Str8Array, wapp_str8_lit("Hello"), wapp_str8_lit("Hi"), wapp_str8_lit("Bye"));
+  result = array.count == 3 && array.capacity == 8;

-	Str8 *item;
-	u64 count  = wapp_array_count(array);
-	u64 index  = 0;
-	b8 running = true;
-	while (running) {
-		item   = wapp_array_get(Str8, array, index);
-		result = result && item && (wapp_str8_equal(item, &expected[index]));
+  Str8 *item;
+  u64 count   = array.count;
+  u64 index   = 0;
+  b8 running = true;
+  while (running) {
+      item   = wapp_array_get(Str8, &array, index);
+      result = result && item && (wapp_str8_equal(item, &expected[index]));

-		++index;
-		running = index < count;
-	}
+      ++index;
+      running = index < count;
+  }

-	return wapp_tester_result(result);
+  return wapp_tester_result(result);
 }
--- a/tests/array/test_str8_array.cc
+++ b/tests/array/test_str8_array.cc
@@ -3,28 +3,28 @@
 #include "test_str8_array.h"

 TestFuncResult test_str8_array(void) {
-	b8 result;
+  b8 result;

-	Str8 expected[] = {wapp_str8_lit("Hello"), wapp_str8_lit("Hi"), wapp_str8_lit("Bye")};
+  Str8 expected[] = {wapp_str8_lit("Hello"), wapp_str8_lit("Hi"), wapp_str8_lit("Bye")};

-	Str8 str1       = wapp_str8_lit("Hello");
-	Str8 str2       = wapp_str8_lit("Hi");
-	Str8 str3       = wapp_str8_lit("Bye");
-	Str8Array array = wapp_array(Str8, str1, str2, str3);
+  Str8 str1       = wapp_str8_lit("Hello");
+  Str8 str2       = wapp_str8_lit("Hi");
+  Str8 str3       = wapp_str8_lit("Bye");
+  Str8Array array = wapp_array(Str8, Str8Array, str1, str2, str3);

-	result = wapp_array_count(array) == 3 && wapp_array_capacity(array) == 8;
+  result = array.count == 3 && array.capacity == 8;

-	Str8 *item;
-	u64 count  = wapp_array_count(array);
-	u64 index  = 0;
-	b8 running = true;
-	while (running) {
-		item   = wapp_array_get(Str8, array, index);
-		result = result && item && (wapp_str8_equal(item, &expected[index]));
+  Str8 *item;
+  u64 count   = array.count;
+  u64 index   = 0;
+  b8 running = true;
+  while (running) {
+    item   = wapp_array_get(Str8, &array, index);
+    result = result && item && (wapp_str8_equal(item, &expected[index]));

-		++index;
-		running = index < count;
-	}
+    ++index;
+    running = index < count;
+  }

-	return wapp_tester_result(result);
+  return wapp_tester_result(result);
 }
--- a/tests/cpath/test_cpath.c
+++ b/tests/cpath/test_cpath.c
@@ -7,175 +7,175 @@
 #define TMP_BUF_SIZE  1024

 TestFuncResult test_cpath_join_path(void) {
-	b8 result;
+  b8 result;

-	Str8 expected = wapp_str8_buf(MAIN_BUF_SIZE);
-	Str8 out      = wapp_str8_buf(MAIN_BUF_SIZE);
-	Str8 tmp      = wapp_str8_buf(TMP_BUF_SIZE);
+  Str8 expected = wapp_str8_buf(MAIN_BUF_SIZE);
+  Str8 out      = wapp_str8_buf(MAIN_BUF_SIZE);
+  Str8 tmp      = wapp_str8_buf(TMP_BUF_SIZE);

-	wapp_str8_format(&expected, "%chome%cabdelrahman%cDocuments", WAPP_PATH_SEP, WAPP_PATH_SEP, WAPP_PATH_SEP);
-	wapp_str8_format(&tmp, "%c", WAPP_PATH_SEP);
+  wapp_str8_format(&expected, "%chome%cabdelrahman%cDocuments", WAPP_PATH_SEP, WAPP_PATH_SEP, WAPP_PATH_SEP);
+  wapp_str8_format(&tmp, "%c", WAPP_PATH_SEP);

-	Str8List parts = wapp_dbl_list(Str8);
-	wapp_dbl_list_push_back(Str8, &parts, &tmp);
-	wapp_dbl_list_push_back(Str8, &parts, &wapp_str8_lit("home"));
-	wapp_dbl_list_push_back(Str8, &parts, &wapp_str8_lit("abdelrahman"));
-	wapp_dbl_list_push_back(Str8, &parts, &wapp_str8_lit("Documents"));
+  Str8List parts = wapp_dbl_list(Str8, Str8List);
+  wapp_dbl_list_push_back(Str8, &parts, &wapp_str8_node_from_str8(tmp));
+  wapp_dbl_list_push_back(Str8, &parts, &wapp_str8_node_from_cstr("home"));
+  wapp_dbl_list_push_back(Str8, &parts, &wapp_str8_node_from_cstr("abdelrahman"));
+  wapp_dbl_list_push_back(Str8, &parts, &wapp_str8_node_from_cstr("Documents"));

-	wapp_cpath_join_path(&out, &parts);
-	result = wapp_str8_equal(&out, &expected);
+  wapp_cpath_join_path(&out, &parts);
+  result = wapp_str8_equal(&out, &expected);

-	wapp_dbl_list_pop_front(Str8, &parts);
+  wapp_dbl_list_pop_front(Str8, Str8Node, &parts);

-	wapp_str8_format(&expected, "home%cabdelrahman%cDocuments", WAPP_PATH_SEP, WAPP_PATH_SEP);
+  wapp_str8_format(&expected, "home%cabdelrahman%cDocuments", WAPP_PATH_SEP, WAPP_PATH_SEP);

-	wapp_cpath_join_path(&out, &parts);
-	result = result && wapp_str8_equal(&out, &expected);
+  wapp_cpath_join_path(&out, &parts);
+  result = result && wapp_str8_equal(&out, &expected);

-	wapp_str8_concat_capped(&tmp, &wapp_str8_lit_ro("home"));
-	wapp_dbl_list_pop_front(Str8, &parts);
-	wapp_dbl_list_push_front(Str8, &parts, &tmp);
+  wapp_str8_concat_capped(&tmp, &wapp_str8_lit_ro("home"));
+  wapp_dbl_list_pop_front(Str8, Str8Node, &parts);
+  wapp_dbl_list_push_front(Str8, &parts, &wapp_str8_node_from_str8(tmp));

-	wapp_str8_format(&expected, "%chome%cabdelrahman%cDocuments", WAPP_PATH_SEP, WAPP_PATH_SEP, WAPP_PATH_SEP);
+  wapp_str8_format(&expected, "%chome%cabdelrahman%cDocuments", WAPP_PATH_SEP, WAPP_PATH_SEP, WAPP_PATH_SEP);

-	wapp_cpath_join_path(&out, &parts);
-	result = result && wapp_str8_equal(&out, &expected);
+  wapp_cpath_join_path(&out, &parts);
+  result = result && wapp_str8_equal(&out, &expected);

-	wapp_str8_format(&tmp, "home%c", WAPP_PATH_SEP);
-	wapp_dbl_list_pop_front(Str8, &parts);
-	wapp_dbl_list_push_front(Str8, &parts, &wapp_str8_lit("home"));
+  wapp_str8_format(&tmp, "home%c", WAPP_PATH_SEP);
+  wapp_dbl_list_pop_front(Str8, Str8Node, &parts);
+  wapp_dbl_list_push_front(Str8, &parts, &wapp_str8_node_from_cstr("home"));

-	wapp_str8_format(&expected, "home%cabdelrahman%cDocuments", WAPP_PATH_SEP, WAPP_PATH_SEP);
+  wapp_str8_format(&expected, "home%cabdelrahman%cDocuments", WAPP_PATH_SEP, WAPP_PATH_SEP);

-	wapp_cpath_join_path(&out, &parts);
-	result = result && wapp_str8_equal(&out, &expected);
+  wapp_cpath_join_path(&out, &parts);
+  result = result && wapp_str8_equal(&out, &expected);

-	wapp_dbl_list_empty(Str8, &parts);
+  wapp_dbl_list_empty(Str8, &parts);

-	wapp_str8_format(&tmp, "%chome", WAPP_PATH_SEP);
-	wapp_dbl_list_push_back(Str8, &parts, &tmp);
-	wapp_dbl_list_push_back(Str8, &parts, &wapp_str8_lit(""));
+  wapp_str8_format(&tmp, "%chome", WAPP_PATH_SEP);
+  wapp_dbl_list_push_back(Str8, &parts, &wapp_str8_node_from_str8(tmp));
+  wapp_dbl_list_push_back(Str8, &parts, &wapp_str8_node_from_cstr(""));

-	wapp_str8_format(&expected, "%chome", WAPP_PATH_SEP);
+  wapp_str8_format(&expected, "%chome", WAPP_PATH_SEP);

-	wapp_cpath_join_path(&out, &parts);
-	result = result && wapp_str8_equal(&out, &expected);
+  wapp_cpath_join_path(&out, &parts);
+  result = result && wapp_str8_equal(&out, &expected);

-	wapp_dbl_list_pop_front(Str8, &parts);
-	wapp_dbl_list_push_back(Str8, &parts, &wapp_str8_lit(""));
+  wapp_dbl_list_pop_front(Str8, Str8Node, &parts);
+  wapp_dbl_list_push_back(Str8, &parts, &wapp_str8_node_from_cstr(""));

-	wapp_str8_format(&expected, "%s", "");
+  wapp_str8_format(&expected, "%s", "");

-	wapp_cpath_join_path(&out, &parts);
-	result = result && wapp_str8_equal(&out, &expected);
+  wapp_cpath_join_path(&out, &parts);
+  result = result && wapp_str8_equal(&out, &expected);

-	wapp_dbl_list_pop_back(Str8, &parts);
-	wapp_dbl_list_push_back(Str8, &parts, &wapp_str8_lit("home"));
+  wapp_dbl_list_pop_back(Str8, Str8Node, &parts);
+  wapp_dbl_list_push_back(Str8, &parts, &wapp_str8_node_from_cstr("home"));

-	wapp_str8_copy_cstr_capped(&expected, "home");
+  wapp_str8_copy_cstr_capped(&expected, "home");

-	wapp_cpath_join_path(&out, &parts);
-	result = result && wapp_str8_equal(&out, &expected);
+  wapp_cpath_join_path(&out, &parts);
+  result = result && wapp_str8_equal(&out, &expected);

-	return wapp_tester_result(result);
+  return wapp_tester_result(result);
 }

 TestFuncResult test_cpath_dirname(void) {
-	Allocator arena = wapp_mem_arena_allocator_init(MiB(8));
-	if (wapp_mem_allocator_invalid(&arena)) {
-		return wapp_tester_result(false);
-	}
+  Allocator arena = wapp_mem_arena_allocator_init(MB(8));
+  if (wapp_mem_allocator_invalid(&arena)) {
+    return wapp_tester_result(false);
+  }

-	b8 result;
-	Str8 *output = NULL;
+  b8 result;
+  Str8 *output = NULL;

-	Str8 expected = wapp_str8_buf(MAIN_BUF_SIZE);
-	Str8 tmp      = wapp_str8_buf(TMP_BUF_SIZE);
+  Str8 expected = wapp_str8_buf(MAIN_BUF_SIZE);
+  Str8 tmp      = wapp_str8_buf(TMP_BUF_SIZE);

-	// CASE 1
-	wapp_str8_format(&tmp, "%c", WAPP_PATH_SEP);
-	wapp_str8_format(&expected, "%c", WAPP_PATH_SEP);
+  // CASE 1
+  wapp_str8_format(&tmp, "%c", WAPP_PATH_SEP);
+  wapp_str8_format(&expected, "%c", WAPP_PATH_SEP);

-	output = wapp_cpath_dirname(&arena, &tmp);
-	result = output != NULL && wapp_str8_equal(output, &expected);
+  output = wapp_cpath_dirname(&arena, &tmp);
+  result = output != NULL && wapp_str8_equal(output, &expected);

-	// CASE 2
-	wapp_str8_format(&expected, "%s", ".");
+  // CASE 2
+  wapp_str8_format(&expected, "%s", ".");

-	output = wapp_cpath_dirname(&arena, &wapp_str8_lit("home"));
-	result = result && output != NULL && wapp_str8_equal(output, &expected);
+  output = wapp_cpath_dirname(&arena, &wapp_str8_lit("home"));
+  result = result && output != NULL && wapp_str8_equal(output, &expected);

-	// CASE 3
-	output = wapp_cpath_dirname(&arena, &wapp_str8_lit(""));
-	result = result && output != NULL && wapp_str8_equal(output, &expected);
+  // CASE 3
+  output = wapp_cpath_dirname(&arena, &wapp_str8_lit(""));
+  result = result && output != NULL && wapp_str8_equal(output, &expected);

-	// CASE 4
-	wapp_str8_format(&tmp, "%chome%ctest", WAPP_PATH_SEP, WAPP_PATH_SEP);
-	wapp_str8_format(&expected, "%chome", WAPP_PATH_SEP);
+  // CASE 4
+  wapp_str8_format(&tmp, "%chome%ctest", WAPP_PATH_SEP, WAPP_PATH_SEP);
+  wapp_str8_format(&expected, "%chome", WAPP_PATH_SEP);

-	output = wapp_cpath_dirname(&arena, &tmp);
-	result = result && output != NULL && wapp_str8_equal(output, &expected);
+  output = wapp_cpath_dirname(&arena, &tmp);
+  result = result && output != NULL && wapp_str8_equal(output, &expected);

-	// CASE 5
-	wapp_str8_format(&tmp, "%chome%ctest%c", WAPP_PATH_SEP, WAPP_PATH_SEP, WAPP_PATH_SEP);
-	wapp_str8_format(&expected, "%chome", WAPP_PATH_SEP);
+  // CASE 5
+  wapp_str8_format(&tmp, "%chome%ctest%c", WAPP_PATH_SEP, WAPP_PATH_SEP, WAPP_PATH_SEP);
+  wapp_str8_format(&expected, "%chome", WAPP_PATH_SEP);

-	output = wapp_cpath_dirname(&arena, &tmp);
-	result = result && output != NULL && wapp_str8_equal(output, &expected);
+  output = wapp_cpath_dirname(&arena, &tmp);
+  result = result && output != NULL && wapp_str8_equal(output, &expected);

-	wapp_mem_arena_allocator_destroy(&arena);
+  wapp_mem_arena_allocator_destroy(&arena);

-	return wapp_tester_result(result);
+  return wapp_tester_result(result);
 }

 TestFuncResult test_cpath_dirup(void) {
-	Allocator arena = wapp_mem_arena_allocator_init(MiB(8));
-	if (wapp_mem_allocator_invalid(&arena)) {
-		return wapp_tester_result(false);
-	}
+  Allocator arena = wapp_mem_arena_allocator_init(MB(8));
+  if (wapp_mem_allocator_invalid(&arena)) {
+    return wapp_tester_result(false);
+  }

-	b8 result;
-	Str8 *output = NULL;
+  b8 result;
+  Str8 *output = NULL;

-	Str8 expected = wapp_str8_buf(MAIN_BUF_SIZE);
-	Str8 tmp      = wapp_str8_buf(TMP_BUF_SIZE);
+  Str8 expected = wapp_str8_buf(MAIN_BUF_SIZE);
+  Str8 tmp      = wapp_str8_buf(TMP_BUF_SIZE);

-	// CASE 1
-	wapp_str8_format(&tmp, "%c", WAPP_PATH_SEP);
-	wapp_str8_format(&expected, "%c", WAPP_PATH_SEP);
+  // CASE 1
+  wapp_str8_format(&tmp, "%c", WAPP_PATH_SEP);
+  wapp_str8_format(&expected, "%c", WAPP_PATH_SEP);

-	output = wapp_cpath_dirup(&arena, &tmp, 3);
-	result = output != NULL && wapp_str8_equal(output, &expected);
+  output = wapp_cpath_dirup(&arena, &tmp, 3);
+  result = output != NULL && wapp_str8_equal(output, &expected);

-	// CASE 2
-	wapp_str8_format(&tmp, "%chome%cabdelrahman%cDocuments", WAPP_PATH_SEP, WAPP_PATH_SEP, WAPP_PATH_SEP);
-	wapp_str8_format(&expected, "%c", WAPP_PATH_SEP);
+  // CASE 2
+  wapp_str8_format(&tmp, "%chome%cabdelrahman%cDocuments", WAPP_PATH_SEP, WAPP_PATH_SEP, WAPP_PATH_SEP);
+  wapp_str8_format(&expected, "%c", WAPP_PATH_SEP);

-	output = wapp_cpath_dirup(&arena, &tmp, 3);
-	result = result && output != NULL && wapp_str8_equal(output, &expected);
+  output = wapp_cpath_dirup(&arena, &tmp, 3);
+  result = result && output != NULL && wapp_str8_equal(output, &expected);

-	// CASE 3
-	wapp_str8_format(&tmp, "home%cabdelrahman%cDocuments", WAPP_PATH_SEP, WAPP_PATH_SEP);
-	wapp_str8_copy_cstr_capped(&expected, ".");
+  // CASE 3
+  wapp_str8_format(&tmp, "home%cabdelrahman%cDocuments", WAPP_PATH_SEP, WAPP_PATH_SEP);
+  wapp_str8_copy_cstr_capped(&expected, ".");

-	output = wapp_cpath_dirup(&arena, &tmp, 3);
-	result = result && output != NULL && wapp_str8_equal(output, &expected);
+  output = wapp_cpath_dirup(&arena, &tmp, 3);
+  result = result && output != NULL && wapp_str8_equal(output, &expected);

-	// CASE 4
-	wapp_str8_format(&tmp, "%chome%cabdelrahman%cDocuments", WAPP_PATH_SEP, WAPP_PATH_SEP, WAPP_PATH_SEP);
-	wapp_str8_format(&expected, "%chome", WAPP_PATH_SEP);
+  // CASE 4
+  wapp_str8_format(&tmp, "%chome%cabdelrahman%cDocuments", WAPP_PATH_SEP, WAPP_PATH_SEP, WAPP_PATH_SEP);
+  wapp_str8_format(&expected, "%chome", WAPP_PATH_SEP);

-	output = wapp_cpath_dirup(&arena, &tmp, 2);
-	result = result && output != NULL && wapp_str8_equal(output, &expected);
+  output = wapp_cpath_dirup(&arena, &tmp, 2);
+  result = result && output != NULL && wapp_str8_equal(output, &expected);

-	// CASE 5
-	wapp_str8_format(&tmp, "home%cabdelrahman%cDocuments", WAPP_PATH_SEP, WAPP_PATH_SEP);
-	wapp_str8_copy_cstr_capped(&expected, "home");
+  // CASE 5
+  wapp_str8_format(&tmp, "home%cabdelrahman%cDocuments", WAPP_PATH_SEP, WAPP_PATH_SEP);
+  wapp_str8_copy_cstr_capped(&expected, "home");

-	output = wapp_cpath_dirup(&arena, &tmp, 2);
-	result = result && output != NULL && wapp_str8_equal(output, &expected);
+  output = wapp_cpath_dirup(&arena, &tmp, 2);
+  result = result && output != NULL && wapp_str8_equal(output, &expected);

-	wapp_mem_arena_allocator_destroy(&arena);
+  wapp_mem_arena_allocator_destroy(&arena);

-	return wapp_tester_result(result);
+  return wapp_tester_result(result);
 }
--- a/tests/cpath/test_cpath.cc
+++ b/tests/cpath/test_cpath.cc
@@ -7,195 +7,198 @@
 #define TMP_BUF_SIZE  1024

 TestFuncResult test_cpath_join_path(void) {
-	b8 result;
+  b8 result;

-	Str8 expected = wapp_str8_buf(MAIN_BUF_SIZE);
-	Str8 out      = wapp_str8_buf(MAIN_BUF_SIZE);
-	Str8 tmp      = wapp_str8_buf(TMP_BUF_SIZE);
+  Str8 expected = wapp_str8_buf(MAIN_BUF_SIZE);
+  Str8 out      = wapp_str8_buf(MAIN_BUF_SIZE);
+  Str8 tmp      = wapp_str8_buf(TMP_BUF_SIZE);

-	wapp_str8_format(&expected, "%chome%cabdelrahman%cDocuments", WAPP_PATH_SEP, WAPP_PATH_SEP, WAPP_PATH_SEP);
-	wapp_str8_format(&tmp, "%c", WAPP_PATH_SEP);
+  wapp_str8_format(&expected, "%chome%cabdelrahman%cDocuments", WAPP_PATH_SEP, WAPP_PATH_SEP, WAPP_PATH_SEP);
+  wapp_str8_format(&tmp, "%c", WAPP_PATH_SEP);

-	Str8List parts = wapp_dbl_list(Str8);
+  Str8List parts = wapp_dbl_list(Str8, Str8List);

-	wapp_dbl_list_push_back(Str8, &parts, &tmp);
+  Str8Node tmp_node = wapp_str8_node_from_str8(tmp);
+  wapp_dbl_list_push_back(Str8, &parts, &tmp_node);

-	Str8 home = wapp_str8_lit("home");
-	wapp_dbl_list_push_back(Str8, &parts, &home);
+  Str8Node home_node = wapp_str8_node_from_cstr("home");
+  wapp_dbl_list_push_back(Str8, &parts, &home_node);

-	Str8 user = wapp_str8_lit("abdelrahman");
-	wapp_dbl_list_push_back(Str8, &parts, &user);
+  Str8Node user_node = wapp_str8_node_from_cstr("abdelrahman");
+  wapp_dbl_list_push_back(Str8, &parts, &user_node);

-	Str8 docs = wapp_str8_lit("Documents");
-	wapp_dbl_list_push_back(Str8, &parts, &docs);
+  Str8Node docs_node = wapp_str8_node_from_cstr("Documents");
+  wapp_dbl_list_push_back(Str8, &parts, &docs_node);

-	wapp_cpath_join_path(&out, &parts);
-	result = wapp_str8_equal(&out, &expected);
+  wapp_cpath_join_path(&out, &parts);
+  result = wapp_str8_equal(&out, &expected);

-	wapp_dbl_list_pop_front(Str8, &parts);
+  wapp_dbl_list_pop_front(Str8, Str8Node, &parts);

-	wapp_str8_format(&expected, "home%cabdelrahman%cDocuments", WAPP_PATH_SEP, WAPP_PATH_SEP);
+  wapp_str8_format(&expected, "home%cabdelrahman%cDocuments", WAPP_PATH_SEP, WAPP_PATH_SEP);

-	wapp_cpath_join_path(&out, &parts);
-	result = result && wapp_str8_equal(&out, &expected);
+  wapp_cpath_join_path(&out, &parts);
+  result = result && wapp_str8_equal(&out, &expected);

-	Str8RO str = wapp_str8_lit_ro("home");
-	wapp_str8_concat_capped(&tmp, &str);
-	wapp_dbl_list_pop_front(Str8, &parts);
+  Str8RO str = wapp_str8_lit_ro("home");
+  wapp_str8_concat_capped(&tmp, &str);
+  wapp_dbl_list_pop_front(Str8, Str8Node, &parts);

-	wapp_dbl_list_push_front(Str8, &parts, &tmp);
+  Str8Node tmp_node_2 = wapp_str8_node_from_str8(tmp);
+  wapp_dbl_list_push_front(Str8, &parts, &tmp_node_2);

-	wapp_str8_format(&expected, "%chome%cabdelrahman%cDocuments", WAPP_PATH_SEP, WAPP_PATH_SEP, WAPP_PATH_SEP);
+  wapp_str8_format(&expected, "%chome%cabdelrahman%cDocuments", WAPP_PATH_SEP, WAPP_PATH_SEP, WAPP_PATH_SEP);

-	wapp_cpath_join_path(&out, &parts);
-	result = result && wapp_str8_equal(&out, &expected);
+  wapp_cpath_join_path(&out, &parts);
+  result = result && wapp_str8_equal(&out, &expected);

-	wapp_str8_format(&tmp, "home%c", WAPP_PATH_SEP);
-	wapp_dbl_list_pop_front(Str8, &parts);
+  wapp_str8_format(&tmp, "home%c", WAPP_PATH_SEP);
+  wapp_dbl_list_pop_front(Str8, Str8Node, &parts);

-	Str8 home_2 = wapp_str8_lit("home");
-	wapp_dbl_list_push_front(Str8, &parts, &home_2);
+  Str8Node home_node_2 = wapp_str8_node_from_cstr("home");
+  wapp_dbl_list_push_front(Str8, &parts, &home_node_2);

-	wapp_str8_format(&expected, "home%cabdelrahman%cDocuments", WAPP_PATH_SEP, WAPP_PATH_SEP);
+  wapp_str8_format(&expected, "home%cabdelrahman%cDocuments", WAPP_PATH_SEP, WAPP_PATH_SEP);

-	wapp_cpath_join_path(&out, &parts);
-	result = result && wapp_str8_equal(&out, &expected);
+  wapp_cpath_join_path(&out, &parts);
+  result = result && wapp_str8_equal(&out, &expected);

-	wapp_dbl_list_empty(Str8, &parts);
+  wapp_dbl_list_empty(Str8, &parts);

-	wapp_str8_format(&tmp, "%chome", WAPP_PATH_SEP);
+  wapp_str8_format(&tmp, "%chome", WAPP_PATH_SEP);

-	wapp_dbl_list_push_back(Str8, &parts, &tmp);
+  Str8Node tmp_node_3 = wapp_str8_node_from_str8(tmp);
+  wapp_dbl_list_push_back(Str8, &parts, &tmp_node_3);

-	Str8 empty = wapp_str8_lit("");
-	wapp_dbl_list_push_back(Str8, &parts, &empty);
+  Str8Node empty_node = wapp_str8_node_from_cstr("");
+  wapp_dbl_list_push_back(Str8, &parts, &empty_node);

-	wapp_str8_format(&expected, "%chome", WAPP_PATH_SEP);
+  wapp_str8_format(&expected, "%chome", WAPP_PATH_SEP);

-	wapp_cpath_join_path(&out, &parts);
-	result = result && wapp_str8_equal(&out, &expected);
+  wapp_cpath_join_path(&out, &parts);
+  result = result && wapp_str8_equal(&out, &expected);

-	wapp_dbl_list_pop_front(Str8, &parts);
+  wapp_dbl_list_pop_front(Str8, Str8Node, &parts);

-	Str8 empty_2 = wapp_str8_lit("");
-	wapp_dbl_list_push_back(Str8, &parts, &empty_2);
+  Str8Node empty_node_2 = wapp_str8_node_from_cstr("");
+  wapp_dbl_list_push_back(Str8, &parts, &empty_node_2);

-	wapp_str8_format(&expected, "%s", "");
+  wapp_str8_format(&expected, "%s", "");

-	wapp_cpath_join_path(&out, &parts);
-	result = result && wapp_str8_equal(&out, &expected);
+  wapp_cpath_join_path(&out, &parts);
+  result = result && wapp_str8_equal(&out, &expected);

-	wapp_dbl_list_pop_back(Str8, &parts);
+  wapp_dbl_list_pop_back(Str8, Str8Node, &parts);

-	Str8 home_3 = wapp_str8_lit("home");
-	wapp_dbl_list_push_back(Str8, &parts, &home_3);
+  Str8Node home_node_3 = wapp_str8_node_from_cstr("home");
+  wapp_dbl_list_push_back(Str8, &parts, &home_node_3);

-	wapp_str8_copy_cstr_capped(&expected, "home");
+  wapp_str8_copy_cstr_capped(&expected, "home");

-	wapp_cpath_join_path(&out, &parts);
-	result = result && wapp_str8_equal(&out, &expected);
+  wapp_cpath_join_path(&out, &parts);
+  result = result && wapp_str8_equal(&out, &expected);

-	return wapp_tester_result(result);
+  return wapp_tester_result(result);
 }

 TestFuncResult test_cpath_dirname(void) {
-	Allocator arena = wapp_mem_arena_allocator_init(MiB(8));
-	if (wapp_mem_allocator_invalid(&arena)) {
-		return wapp_tester_result(false);
-	}
+  Allocator arena = wapp_mem_arena_allocator_init(MB(8));
+  if (wapp_mem_allocator_invalid(&arena)) {
+    return wapp_tester_result(false);
+  }

-	b8 result;
-	Str8 *output = nullptr;
+  b8 result;
+  Str8 *output = nullptr;

-	Str8 expected = wapp_str8_buf(MAIN_BUF_SIZE);
-	Str8 tmp      = wapp_str8_buf(TMP_BUF_SIZE);
+  Str8 expected = wapp_str8_buf(MAIN_BUF_SIZE);
+  Str8 tmp      = wapp_str8_buf(TMP_BUF_SIZE);

-	// CASE 1
-	wapp_str8_format(&tmp, "%c", WAPP_PATH_SEP);
-	wapp_str8_format(&expected, "%c", WAPP_PATH_SEP);
+  // CASE 1
+  wapp_str8_format(&tmp, "%c", WAPP_PATH_SEP);
+  wapp_str8_format(&expected, "%c", WAPP_PATH_SEP);

-	output = wapp_cpath_dirname(&arena, &tmp);
-	result = output != nullptr && wapp_str8_equal(output, &expected);
+  output = wapp_cpath_dirname(&arena, &tmp);
+  result = output != nullptr && wapp_str8_equal(output, &expected);

-	// CASE 2
-	wapp_str8_format(&expected, "%s", ".");
+  // CASE 2
+  wapp_str8_format(&expected, "%s", ".");

-	Str8 path = wapp_str8_lit("home");
-	output    = wapp_cpath_dirname(&arena, &path);
-	result    = result && output != nullptr && wapp_str8_equal(output, &expected);
+  Str8 path = wapp_str8_lit("home");
+  output = wapp_cpath_dirname(&arena, &path);
+  result = result && output != nullptr && wapp_str8_equal(output, &expected);

-	// CASE 3
-	path   = wapp_str8_lit("");
-	output = wapp_cpath_dirname(&arena, &path);
-	result = result && output != nullptr && wapp_str8_equal(output, &expected);
+  // CASE 3
+  path = wapp_str8_lit("");
+  output = wapp_cpath_dirname(&arena, &path);
+  result = result && output != nullptr && wapp_str8_equal(output, &expected);

-	// CASE 4
-	wapp_str8_format(&tmp, "%chome%ctest", WAPP_PATH_SEP, WAPP_PATH_SEP);
-	wapp_str8_format(&expected, "%chome", WAPP_PATH_SEP);
+  // CASE 4
+  wapp_str8_format(&tmp, "%chome%ctest", WAPP_PATH_SEP, WAPP_PATH_SEP);
+  wapp_str8_format(&expected, "%chome", WAPP_PATH_SEP);

-	output = wapp_cpath_dirname(&arena, &tmp);
-	result = result && output != nullptr && wapp_str8_equal(output, &expected);
+  output = wapp_cpath_dirname(&arena, &tmp);
+  result = result && output != nullptr && wapp_str8_equal(output, &expected);

-	// CASE 5
-	wapp_str8_format(&tmp, "%chome%ctest%c", WAPP_PATH_SEP, WAPP_PATH_SEP, WAPP_PATH_SEP);
-	wapp_str8_format(&expected, "%chome", WAPP_PATH_SEP);
+  // CASE 5
+  wapp_str8_format(&tmp, "%chome%ctest%c", WAPP_PATH_SEP, WAPP_PATH_SEP, WAPP_PATH_SEP);
+  wapp_str8_format(&expected, "%chome", WAPP_PATH_SEP);

-	output = wapp_cpath_dirname(&arena, &tmp);
-	result = result && output != nullptr && wapp_str8_equal(output, &expected);
+  output = wapp_cpath_dirname(&arena, &tmp);
+  result = result && output != nullptr && wapp_str8_equal(output, &expected);

-	wapp_mem_arena_allocator_destroy(&arena);
+  wapp_mem_arena_allocator_destroy(&arena);

-	return wapp_tester_result(result);
+  return wapp_tester_result(result);
 }

 TestFuncResult test_cpath_dirup(void) {
-	Allocator arena = wapp_mem_arena_allocator_init(MiB(8));
-	if (wapp_mem_allocator_invalid(&arena)) {
-		return wapp_tester_result(false);
-	}
+  Allocator arena = wapp_mem_arena_allocator_init(MB(8));
+  if (wapp_mem_allocator_invalid(&arena)) {
+    return wapp_tester_result(false);
+  }

-	b8 result;
-	Str8 *output = nullptr;
+  b8 result;
+  Str8 *output = nullptr;

-	Str8 expected = wapp_str8_buf(MAIN_BUF_SIZE);
-	Str8 tmp      = wapp_str8_buf(TMP_BUF_SIZE);
+  Str8 expected = wapp_str8_buf(MAIN_BUF_SIZE);
+  Str8 tmp      = wapp_str8_buf(TMP_BUF_SIZE);

-	// CASE 1
-	wapp_str8_format(&tmp, "%c", WAPP_PATH_SEP);
-	wapp_str8_format(&expected, "%c", WAPP_PATH_SEP);
+  // CASE 1
+  wapp_str8_format(&tmp, "%c", WAPP_PATH_SEP);
+  wapp_str8_format(&expected, "%c", WAPP_PATH_SEP);

-	output = wapp_cpath_dirup(&arena, &tmp, 3);
-	result = output != nullptr && wapp_str8_equal(output, &expected);
+  output = wapp_cpath_dirup(&arena, &tmp, 3);
+  result = output != nullptr && wapp_str8_equal(output, &expected);

-	// CASE 2
-	wapp_str8_format(&tmp, "%chome%cabdelrahman%cDocuments", WAPP_PATH_SEP, WAPP_PATH_SEP, WAPP_PATH_SEP);
-	wapp_str8_format(&expected, "%c", WAPP_PATH_SEP);
+  // CASE 2
+  wapp_str8_format(&tmp, "%chome%cabdelrahman%cDocuments", WAPP_PATH_SEP, WAPP_PATH_SEP, WAPP_PATH_SEP);
+  wapp_str8_format(&expected, "%c", WAPP_PATH_SEP);

-	output = wapp_cpath_dirup(&arena, &tmp, 3);
-	result = result && output != nullptr && wapp_str8_equal(output, &expected);
+  output = wapp_cpath_dirup(&arena, &tmp, 3);
+  result = result && output != nullptr && wapp_str8_equal(output, &expected);

-	// CASE 3
-	wapp_str8_format(&tmp, "home%cabdelrahman%cDocuments", WAPP_PATH_SEP, WAPP_PATH_SEP);
-	wapp_str8_copy_cstr_capped(&expected, ".");
+  // CASE 3
+  wapp_str8_format(&tmp, "home%cabdelrahman%cDocuments", WAPP_PATH_SEP, WAPP_PATH_SEP);
+  wapp_str8_copy_cstr_capped(&expected, ".");

-	output = wapp_cpath_dirup(&arena, &tmp, 3);
-	result = result && output != nullptr && wapp_str8_equal(output, &expected);
+  output = wapp_cpath_dirup(&arena, &tmp, 3);
+  result = result && output != nullptr && wapp_str8_equal(output, &expected);

-	// CASE 4
-	wapp_str8_format(&tmp, "%chome%cabdelrahman%cDocuments", WAPP_PATH_SEP, WAPP_PATH_SEP, WAPP_PATH_SEP);
-	wapp_str8_format(&expected, "%chome", WAPP_PATH_SEP);
+  // CASE 4
+  wapp_str8_format(&tmp, "%chome%cabdelrahman%cDocuments", WAPP_PATH_SEP, WAPP_PATH_SEP, WAPP_PATH_SEP);
+  wapp_str8_format(&expected, "%chome", WAPP_PATH_SEP);

-	output = wapp_cpath_dirup(&arena, &tmp, 2);
-	result = result && output != nullptr && wapp_str8_equal(output, &expected);
+  output = wapp_cpath_dirup(&arena, &tmp, 2);
+  result = result && output != nullptr && wapp_str8_equal(output, &expected);

-	// CASE 5
-	wapp_str8_format(&tmp, "home%cabdelrahman%cDocuments", WAPP_PATH_SEP, WAPP_PATH_SEP);
-	wapp_str8_copy_cstr_capped(&expected, "home");
+  // CASE 5
+  wapp_str8_format(&tmp, "home%cabdelrahman%cDocuments", WAPP_PATH_SEP, WAPP_PATH_SEP);
+  wapp_str8_copy_cstr_capped(&expected, "home");

-	output = wapp_cpath_dirup(&arena, &tmp, 2);
-	result = result && output != nullptr && wapp_str8_equal(output, &expected);
+  output = wapp_cpath_dirup(&arena, &tmp, 2);
+  result = result && output != nullptr && wapp_str8_equal(output, &expected);

-	wapp_mem_arena_allocator_destroy(&arena);
+  wapp_mem_arena_allocator_destroy(&arena);

-	return wapp_tester_result(result);
+  return wapp_tester_result(result);
 }
--- a/tests/file/test_file.c
+++ b/tests/file/test_file.c
@@ -1,118 +0,0 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
-#include "test_file.h"
-
-#define DST_CAPACITY 5
-wapp_intern Allocator arena           = {0};
-wapp_intern Str8RO test_filename      = wapp_str8_lit_ro_initialiser_list("wapptest.bin");
-wapp_intern Str8RO new_filename       = wapp_str8_lit_ro_initialiser_list("wapptest2.bin");
-wapp_intern WFile *test_fp            = NULL;
-wapp_intern I32Array src_array1       = wapp_array(i32,  0,  1,  2,  3,  4);
-wapp_intern I32Array src_array2       = wapp_array(i32,  5,  6,  7,  8,  9);
-wapp_intern I32Array src_array3       = wapp_array(i32, 10, 11, 12, 13, 14);
-wapp_intern I32Array dst_array        = wapp_array_with_capacity(i32, DST_CAPACITY, false);
-wapp_intern i32 dst_buf[DST_CAPACITY] = {0};
-
-TestFuncResult test_wapp_file_open(void) {
-	arena   = wapp_mem_arena_allocator_init(KiB(16));
-	test_fp = wapp_file_open(&arena, &test_filename, WAPP_ACCESS_WRITE_EX);
-	return wapp_tester_result(test_fp != NULL);
-}
-
-TestFuncResult test_wapp_file_get_current_position(void) {
-	i64 pos = wapp_file_get_current_position(test_fp);
-	return wapp_tester_result(pos == 0);
-}
-
-TestFuncResult test_wapp_file_seek(void) {
-	wapp_file_write_array((GenericArray)src_array1, test_fp, wapp_array_count(src_array1));
-
-	i64 seek_result = wapp_file_seek(test_fp, 0, WAPP_SEEK_END);
-	b8 result       = seek_result == (i64)(wapp_array_count(src_array1) * wapp_array_item_size(src_array1));
-
-	wapp_file_seek(test_fp, 0, WAPP_SEEK_START);
-
-	return wapp_tester_result(result);
-}
-
-TestFuncResult test_wapp_file_get_length(void) {
-	i64 length = wapp_file_get_length(test_fp);
-	return wapp_tester_result(length == (i64)(wapp_array_count(src_array1) * wapp_array_item_size(src_array1)));
-}
-
-TestFuncResult test_wapp_file_read(void) {
-	wapp_file_seek(test_fp, 0, WAPP_SEEK_START);
-
-	u64 byte_count = DST_CAPACITY * sizeof(i32);
-	u64 count      = wapp_file_read((void *)dst_buf, test_fp, byte_count);
-	b8 result      = count == byte_count;
-
-	// NOTE (Abdelrahman): Uses a while loop instead of a for loop to get rid of
-	// MSVC Spectre mitigation warnings
-	u64 index  = 0;
-	b8 running = true;
-	while (running) {
-		result = result && (dst_buf[index] == *wapp_array_get(i32, src_array1, index));
-		++index;
-		running = index < DST_CAPACITY;
-	}
-
-	return wapp_tester_result(result);
-}
-
-TestFuncResult test_wapp_file_write(void) {
-	wapp_file_seek(test_fp, 0, WAPP_SEEK_END);
-
-	u64 expected_count = wapp_array_count(src_array2) * wapp_array_item_size(src_array2);
-	i64 count = wapp_file_write((void *)src_array2, test_fp, expected_count);
-
-	return wapp_tester_result(count >= 0 && (u64)count == expected_count);
-}
-
-TestFuncResult test_wapp_file_read_array(void) {
-	wapp_file_seek(test_fp, 0, WAPP_SEEK_START);
-
-	u64 count = wapp_file_read_array((GenericArray)dst_array, test_fp, wapp_array_count(src_array1));
-	b8 result = count == wapp_array_count(src_array1) &&
-	            wapp_array_count(dst_array) == wapp_array_count(src_array1);
-
-	// NOTE (Abdelrahman): Uses a while loop instead of a for loop to get rid of
-	// MSVC Spectre mitigation warnings
-	u64 index  = 0;
-	b8 running = true;
-	while (running) {
-		result = result && (*wapp_array_get(i32, dst_array, index) == *wapp_array_get(i32, src_array1, index));
-		++index;
-		running = index < wapp_array_count(dst_array);
-	}
-
-	return wapp_tester_result(result);
-}
-
-TestFuncResult test_wapp_file_write_array(void) {
-	wapp_file_seek(test_fp, 0, WAPP_SEEK_END);
-
-	i64 count = wapp_file_write_array((GenericArray)src_array3, test_fp, wapp_array_count(src_array3));
-
-	return wapp_tester_result(count >= 0 && (u64)count == wapp_array_count(src_array3));
-}
-
-TestFuncResult test_wapp_file_flush(void) {
-	i32 flush_result = wapp_file_flush(test_fp);
-	return wapp_tester_result(flush_result == 0);
-}
-
-TestFuncResult test_wapp_file_close(void) {
-	i32 close_result = wapp_file_close(test_fp);
-	return wapp_tester_result(close_result == 0);
-}
-
-TestFuncResult test_wapp_file_rename(void) {
-	i32 rename_result = wapp_file_rename(&test_filename, &new_filename);
-	return wapp_tester_result(rename_result == 0);
-}
-
-TestFuncResult test_wapp_file_remove(void) {
-	i32 remove_result = wapp_file_remove(&new_filename);
-	return wapp_tester_result(remove_result == 0);
-}
--- a/tests/file/test_file.cc
+++ b/tests/file/test_file.cc
@@ -1,122 +0,0 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
-#include "test_file.h"
-
-#define DST_CAPACITY 5
-wapp_intern Allocator arena           = {};
-wapp_intern Str8RO test_filename      = wapp_str8_lit_ro_initialiser_list("wapptest.bin");
-wapp_intern Str8RO new_filename       = wapp_str8_lit_ro_initialiser_list("wapptest2.bin");
-wapp_intern WFile *test_fp            = NULL;
-wapp_intern i32 dst_buf[DST_CAPACITY] = {0};
-wapp_intern I32Array src_array1;
-wapp_intern I32Array src_array2;
-wapp_intern I32Array src_array3;
-wapp_intern I32Array dst_array ;
-
-TestFuncResult test_wapp_file_open(void) {
-	arena      = wapp_mem_arena_allocator_init(KiB(16));
-	src_array1 = wapp_array(i32,  0,  1,  2,  3,  4);
-	src_array2 = wapp_array(i32,  5,  6,  7,  8,  9);
-	src_array3 = wapp_array(i32, 10, 11, 12, 13, 14);
-	dst_array  = wapp_array_with_capacity(i32, DST_CAPACITY, false);
-	test_fp    = wapp_file_open(&arena, &test_filename, WAPP_ACCESS_WRITE_EX);
-	return wapp_tester_result(test_fp != NULL);
-}
-
-TestFuncResult test_wapp_file_get_current_position(void) {
-	i64 pos = wapp_file_get_current_position(test_fp);
-	return wapp_tester_result(pos == 0);
-}
-
-TestFuncResult test_wapp_file_seek(void) {
-	wapp_file_write_array((GenericArray)src_array1, test_fp, wapp_array_count(src_array1));
-
-	i64 seek_result = wapp_file_seek(test_fp, 0, WAPP_SEEK_END);
-	b8 result       = seek_result == (i64)(wapp_array_count(src_array1) * wapp_array_item_size(src_array1));
-
-	wapp_file_seek(test_fp, 0, WAPP_SEEK_START);
-
-	return wapp_tester_result(result);
-}
-
-TestFuncResult test_wapp_file_get_length(void) {
-	i64 length = wapp_file_get_length(test_fp);
-	return wapp_tester_result(length == (i64)(wapp_array_count(src_array1) * wapp_array_item_size(src_array1)));
-}
-
-TestFuncResult test_wapp_file_read(void) {
-	wapp_file_seek(test_fp, 0, WAPP_SEEK_START);
-
-	u64 byte_count = DST_CAPACITY * sizeof(i32);
-	u64 count      = wapp_file_read((void *)dst_buf, test_fp, byte_count);
-	b8 result      = count == byte_count;
-
-	// NOTE (Abdelrahman): Uses a while loop instead of a for loop to get rid of
-	// MSVC Spectre mitigation warnings
-	u64 index  = 0;
-	b8 running = true;
-	while (running) {
-		result = result && (dst_buf[index] == *wapp_array_get(i32, src_array1, index));
-		++index;
-		running = index < DST_CAPACITY;
-	}
-
-	return wapp_tester_result(result);
-}
-
-TestFuncResult test_wapp_file_write(void) {
-	wapp_file_seek(test_fp, 0, WAPP_SEEK_END);
-
-	u64 expected_count = wapp_array_count(src_array2) * wapp_array_item_size(src_array2);
-	i64 count = wapp_file_write((void *)src_array2, test_fp, expected_count);
-
-	return wapp_tester_result(count >= 0 && (u64)count == expected_count);
-}
-
-TestFuncResult test_wapp_file_read_array(void) {
-	wapp_file_seek(test_fp, 0, WAPP_SEEK_START);
-
-	u64 count = wapp_file_read_array((GenericArray)dst_array, test_fp, wapp_array_count(src_array1));
-	b8 result = count == wapp_array_count(src_array1) &&
-	            wapp_array_count(dst_array) == wapp_array_count(src_array1);
-
-	// NOTE (Abdelrahman): Uses a while loop instead of a for loop to get rid of
-	// MSVC Spectre mitigation warnings
-	u64 index  = 0;
-	b8 running = true;
-	while (running) {
-		result = result && (*wapp_array_get(i32, dst_array, index) == *wapp_array_get(i32, src_array1, index));
-		++index;
-		running = index < wapp_array_count(dst_array);
-	}
-
-	return wapp_tester_result(result);
-}
-
-TestFuncResult test_wapp_file_write_array(void) {
-	wapp_file_seek(test_fp, 0, WAPP_SEEK_END);
-
-	i64 count = wapp_file_write_array((GenericArray)src_array3, test_fp, wapp_array_count(src_array3));
-
-	return wapp_tester_result(count >= 0 && (u64)count == wapp_array_count(src_array3));
-}
-
-TestFuncResult test_wapp_file_flush(void) {
-	i32 flush_result = wapp_file_flush(test_fp);
-	return wapp_tester_result(flush_result == 0);
-}
-
-TestFuncResult test_wapp_file_close(void) {
-	i32 close_result = wapp_file_close(test_fp);
-	return wapp_tester_result(close_result == 0);
-}
-
-TestFuncResult test_wapp_file_rename(void) {
-	i32 rename_result = wapp_file_rename(&test_filename, &new_filename);
-	return wapp_tester_result(rename_result == 0);
-}
-
-TestFuncResult test_wapp_file_remove(void) {
-	i32 remove_result = wapp_file_remove(&new_filename);
-	return wapp_tester_result(remove_result == 0);
-}
--- a/tests/file/test_file.h
+++ b/tests/file/test_file.h
@@ -1,21 +0,0 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
-#ifndef TEST_FILE_H
-#define TEST_FILE_H
-
-#include "wapp.h"
-
-TestFuncResult test_wapp_file_open(void);
-TestFuncResult test_wapp_file_get_current_position(void);
-TestFuncResult test_wapp_file_seek(void);
-TestFuncResult test_wapp_file_get_length(void);
-TestFuncResult test_wapp_file_read(void);
-TestFuncResult test_wapp_file_write(void);
-TestFuncResult test_wapp_file_read_array(void);
-TestFuncResult test_wapp_file_write_array(void);
-TestFuncResult test_wapp_file_flush(void);
-TestFuncResult test_wapp_file_close(void);
-TestFuncResult test_wapp_file_rename(void);
-TestFuncResult test_wapp_file_remove(void);
-
-#endif // !TEST_FILE_H
--- a/tests/queue/test_queue.c
+++ b/tests/queue/test_queue.c
@@ -1,98 +0,0 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
-#include "wapp.h"
-#include "test_queue.h"
-
-#define CAPACITY 8
-
-TestFuncResult test_queue_push(void) {
-	I32Queue queue = wapp_queue(i32, CAPACITY);
-
-	for (u64 i = 0; i < CAPACITY; ++i) {
-		i32 item = (i32)i;
-		wapp_queue_push(i32, &queue, &item);
-	}
-
-	b8 result = true;
-	for (u64 i = 0; i < CAPACITY; ++i) {
-		i32 *value = ((i32 *)(queue.items)) + i;
-		result = result && value != NULL && *value == (i32)i;
-	}
-
-	return wapp_tester_result(result);
-}
-
-TestFuncResult test_queue_push_alloc(void) {
-	Allocator arena = wapp_mem_arena_allocator_init(MiB(64));
-	I32Queue queue  = wapp_queue(i32, CAPACITY);
-
-	for (u64 i = 0; i < CAPACITY; ++i) {
-		i32 item = (i32)i;
-		wapp_queue_push(i32, &queue, &item);
-	}
-
-	b8 result = true;
-	i32 item  = 8;
-	u64 new_capacity = CAPACITY * 2;
-	I32Queue *new_queue = wapp_queue_push_alloc(i32, &arena, &queue, &item);
-	if (new_queue && new_queue != &queue) {
-		queue = *new_queue;
-	}
-	u64 capacity = wapp_queue_capacity(&queue);
-	result = result && capacity == new_capacity;
-
-	for (u64 i = 0; i < 2; ++i) {
-		wapp_queue_pop(i32, &queue);
-	}
-
-	u64 remaining = wapp_queue_capacity(&queue) - queue.count;
-	for (u64 i = 0; i < remaining; ++i) {
-		item = remaining + i;
-		wapp_queue_push(i32, &queue, &item);
-	}
-
-	++item;
-	new_queue = wapp_queue_push_alloc(i32, &arena, &queue, &item);
-	if (new_queue && new_queue != &queue) {
-		queue = *new_queue;
-	}
-
-	result = result && wapp_queue_capacity(&queue) == new_capacity * 2;
-
-	i32 *arr = (i32 *)queue.items;
-	for (u64 i = 0; i < queue.count; ++i) {
-		// NOTE (Abdelrahman): First queue value is currently 2
-		result = result && arr[i] == (i32)(2 + i);
-	}
-
-	wapp_mem_arena_allocator_destroy(&arena);
-
-	return wapp_tester_result(result);
-}
-
-TestFuncResult test_queue_pop(void) {
-	I32Queue queue = wapp_queue(i32, CAPACITY);
-	for (u64 i = 0; i < CAPACITY; ++i) {
-		i32 item = (i32)i;
-		wapp_queue_push(i32, &queue, &item);
-	}
-
-	b8 result      = true;
-	u64 half_count = queue.count / 2;
-	for (u64 i = 0; i < half_count; ++i) {
-		i32 *value = wapp_queue_pop(i32, &queue);
-		result = result && value != NULL && *value == (i32)i;
-	}
-
-	for (u64 i = 0; i < half_count; ++i) {
-		i32 item = (i32)i + CAPACITY;
-		wapp_queue_push(i32, &queue, &item);
-	}
-
-	for (u64 i = 0; i < CAPACITY; ++i) {
-		i32 *value = wapp_queue_pop(i32, &queue);
-		result = result && value != NULL && *value == (i32)half_count + (i32)i;
-	}
-
-	return wapp_tester_result(result);
-}
--- a/tests/queue/test_queue.cc
+++ b/tests/queue/test_queue.cc
@@ -1,96 +0,0 @@
-#include "wapp.h"
-#include "test_queue.h"
-
-#define CAPACITY 8
-
-TestFuncResult test_queue_push(void) {
-	I32Queue queue = wapp_queue(i32, CAPACITY);
-
-	for (u64 i = 0; i < CAPACITY; ++i) {
-		i32 item = (i32)i;
-		wapp_queue_push(i32, &queue, &item);
-	}
-
-	b8 result = true;
-	for (u64 i = 0; i < CAPACITY; ++i) {
-		i32 *value = ((i32 *)(queue.items)) + i;
-		result = result && value != NULL && *value == (i32)i;
-	}
-
-	return wapp_tester_result(result);
-}
-
-TestFuncResult test_queue_push_alloc(void) {
-	Allocator arena = wapp_mem_arena_allocator_init(MiB(64));
-	I32Queue queue  = wapp_queue(i32, CAPACITY);
-
-	for (u64 i = 0; i < CAPACITY; ++i) {
-		i32 item = (i32)i;
-		wapp_queue_push(i32, &queue, &item);
-	}
-
-	b8 result = true;
-	i32 item  = 8;
-	u64 new_capacity = CAPACITY * 2;
-	I32Queue *new_queue = wapp_queue_push_alloc(i32, &arena, &queue, &item);
-	if (new_queue && new_queue != &queue) {
-		queue = *new_queue;
-	}
-	u64 capacity = wapp_queue_capacity(&queue);
-	result = result && capacity == new_capacity;
-
-	for (u64 i = 0; i < 2; ++i) {
-		wapp_queue_pop(i32, &queue);
-	}
-
-	u64 remaining = wapp_queue_capacity(&queue) - queue.count;
-	for (u64 i = 0; i < remaining; ++i) {
-		item = remaining + i;
-		wapp_queue_push(i32, &queue, &item);
-	}
-
-	++item;
-	new_queue = wapp_queue_push_alloc(i32, &arena, &queue, &item);
-	if (new_queue && new_queue != &queue) {
-		queue = *new_queue;
-	}
-
-	result = result && wapp_queue_capacity(&queue) == new_capacity * 2;
-
-	i32 *arr = (i32 *)queue.items;
-	for (u64 i = 0; i < queue.count; ++i) {
-		// NOTE (Abdelrahman): First queue value is currently 2
-		result = result && arr[i] == (i32)(2 + i);
-	}
-
-	wapp_mem_arena_allocator_destroy(&arena);
-
-	return wapp_tester_result(result);
-}
-
-TestFuncResult test_queue_pop(void) {
-	I32Queue queue = wapp_queue(i32, CAPACITY);
-	for (u64 i = 0; i < CAPACITY; ++i) {
-		i32 item = (i32)i;
-		wapp_queue_push(i32, &queue, &item);
-	}
-
-	b8 result      = true;
-	u64 half_count = queue.count / 2;
-	for (u64 i = 0; i < half_count; ++i) {
-		i32 *value = wapp_queue_pop(i32, &queue);
-		result = result && value != NULL && *value == (i32)i;
-	}
-
-	for (u64 i = 0; i < half_count; ++i) {
-		i32 item = (i32)i + CAPACITY;
-		wapp_queue_push(i32, &queue, &item);
-	}
-
-	for (u64 i = 0; i < CAPACITY; ++i) {
-		i32 *value = wapp_queue_pop(i32, &queue);
-		result = result && value != NULL && *value == (i32)half_count + (i32)i;
-	}
-
-	return wapp_tester_result(result);
-}
--- a/tests/queue/test_queue.h
+++ b/tests/queue/test_queue.h
@@ -1,12 +0,0 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
-#ifndef TEST_QUEUE_H
-#define TEST_QUEUE_H
-
-#include "wapp.h"
-
-TestFuncResult test_queue_push(void);
-TestFuncResult test_queue_push_alloc(void);
-TestFuncResult test_queue_pop(void);
-
-#endif // !TEST_QUEUE_H
--- a/tests/shell_commander/test_shell_commander.c
+++ b/tests/shell_commander/test_shell_commander.c
@@ -5,58 +5,58 @@
 #include <string.h>

 TestFuncResult test_commander_cmd_success(void) {
-	Str8List cmd = wapp_dbl_list(Str8);
-	wapp_dbl_list_push_back(Str8, &cmd, &wapp_str8_lit("echo"));
-	wapp_dbl_list_push_back(Str8, &cmd, &wapp_str8_lit("hello world"));
+  Str8List cmd = wapp_dbl_list(Str8, Str8List);
+  wapp_dbl_list_push_back(Str8, &cmd, &wapp_str8_node_from_cstr("echo"));
+  wapp_dbl_list_push_back(Str8, &cmd, &wapp_str8_node_from_cstr("hello world"));

-	CMDResult result = wapp_shell_commander_execute(SHELL_OUTPUT_DISCARD, NULL, &cmd);
-	b8 succeeded     = result.exited && result.exit_code == EXIT_SUCCESS &&
-	                   result.error == SHELL_ERR_NO_ERROR;
+  CMDResult result = wapp_shell_commander_execute(SHELL_OUTPUT_DISCARD, NULL, &cmd);
+  b8 succeeded    = result.exited && result.exit_code == EXIT_SUCCESS &&
+                     result.error == SHELL_ERR_NO_ERROR;

-	return wapp_tester_result(succeeded);
+  return wapp_tester_result(succeeded);
 }

 TestFuncResult test_commander_cmd_failure(void) {
-	Str8List cmd = wapp_dbl_list(Str8);
-	wapp_dbl_list_push_back(Str8, &cmd, &wapp_str8_lit("grep"));
+  Str8List cmd = wapp_dbl_list(Str8, Str8List);
+  wapp_dbl_list_push_back(Str8, &cmd, &wapp_str8_node_from_cstr("grep"));

-	CMDResult result = wapp_shell_commander_execute(SHELL_OUTPUT_DISCARD, NULL, &cmd);
-	b8 failed        = result.exited && result.exit_code != EXIT_SUCCESS &&
-	                   result.error == SHELL_ERR_NO_ERROR;
+  CMDResult result = wapp_shell_commander_execute(SHELL_OUTPUT_DISCARD, NULL, &cmd);
+  b8 failed       = result.exited && result.exit_code != EXIT_SUCCESS &&
+                     result.error == SHELL_ERR_NO_ERROR;

-	return wapp_tester_result(failed);
+  return wapp_tester_result(failed);
 }

 TestFuncResult test_commander_cmd_out_buf_success(void) {
-	Str8 buf      = wapp_str8_buf(64);
-	Str8 expected = wapp_str8_buf(64);
-	char msg[]    = "hello world";
-	wapp_str8_copy_cstr_capped(&expected, msg);
+  Str8 buf          = wapp_str8_buf(64);
+  Str8 expected     = wapp_str8_buf(64);
+  char msg[]        = "hello world";
+  wapp_str8_copy_cstr_capped(&expected, msg);

-	Str8List cmd = wapp_dbl_list(Str8);
-	wapp_dbl_list_push_back(Str8, &cmd, &wapp_str8_lit("echo"));
-	wapp_dbl_list_push_back(Str8, &cmd, &wapp_str8_lit(msg));
+  Str8List cmd = wapp_dbl_list(Str8, Str8List);
+  wapp_dbl_list_push_back(Str8, &cmd, &wapp_str8_node_from_cstr("echo"));
+  wapp_dbl_list_push_back(Str8, &cmd, &wapp_str8_node_from_cstr(msg));

-	CMDResult result = wapp_shell_commander_execute(SHELL_OUTPUT_CAPTURE, &buf, &cmd);
-	b8 succeeded     = result.exited && result.exit_code == EXIT_SUCCESS &&
-	                   result.error == SHELL_ERR_NO_ERROR && wapp_str8_equal_to_count(&buf, &expected, strlen(msg));
+  CMDResult result = wapp_shell_commander_execute(SHELL_OUTPUT_CAPTURE, &buf, &cmd);
+  b8 succeeded    = result.exited && result.exit_code == EXIT_SUCCESS &&
+                     result.error == SHELL_ERR_NO_ERROR && wapp_str8_equal_to_count(&buf, &expected, strlen(msg));

-	return wapp_tester_result(succeeded);
+  return wapp_tester_result(succeeded);
 }

 TestFuncResult test_commander_cmd_out_buf_failure(void) {
-	Str8 buf      = wapp_str8_buf(4);
-	Str8 expected = wapp_str8_buf(64);
-	char msg[]    = "hello world";
-	wapp_str8_copy_cstr_capped(&expected, msg);
+  Str8 buf         = wapp_str8_buf(4);
+  Str8 expected    = wapp_str8_buf(64);
+  char msg[]       = "hello world";
+  wapp_str8_copy_cstr_capped(&expected, msg);

-	Str8List cmd = wapp_dbl_list(Str8);
-	wapp_dbl_list_push_back(Str8, &cmd, &wapp_str8_lit("echo"));
-	wapp_dbl_list_push_back(Str8, &cmd, &wapp_str8_lit(msg));
+  Str8List cmd = wapp_dbl_list(Str8, Str8List);
+  wapp_dbl_list_push_back(Str8, &cmd, &wapp_str8_node_from_cstr("echo"));
+  wapp_dbl_list_push_back(Str8, &cmd, &wapp_str8_node_from_cstr(msg));

-	CMDResult result = wapp_shell_commander_execute(SHELL_OUTPUT_CAPTURE, &buf, &cmd);
-	b8 failed        = !result.exited && result.exit_code != EXIT_SUCCESS &&
-	                   result.error == SHELL_ERR_OUT_BUF_FULL && !wapp_str8_equal(&buf, &expected);
+  CMDResult result = wapp_shell_commander_execute(SHELL_OUTPUT_CAPTURE, &buf, &cmd);
+  b8 failed       = !result.exited && result.exit_code != EXIT_SUCCESS &&
+                     result.error == SHELL_ERR_OUT_BUF_FULL && !wapp_str8_equal(&buf, &expected);

-	return wapp_tester_result(failed);
+  return wapp_tester_result(failed);
 }
--- a/tests/shell_commander/test_shell_commander.cc
+++ b/tests/shell_commander/test_shell_commander.cc
@@ -5,65 +5,65 @@
 #include <string.h>

 TestFuncResult test_commander_cmd_success(void) {
-	Str8List cmd  = wapp_dbl_list(Str8);
-	Str8 echo  = wapp_str8_lit("echo");
-	Str8 msg  = wapp_str8_lit("hello world");
-	wapp_dbl_list_push_back(Str8, &cmd, &echo);
-	wapp_dbl_list_push_back(Str8, &cmd, &msg);
+  Str8List cmd  = wapp_dbl_list(Str8, Str8List);
+  Str8Node echo = wapp_str8_node_from_cstr("echo");
+  Str8Node msg  = wapp_str8_node_from_cstr("hello world");
+  wapp_dbl_list_push_back(Str8, &cmd, &echo);
+  wapp_dbl_list_push_back(Str8, &cmd, &msg);

-	CMDResult result  = wapp_shell_commander_execute(SHELL_OUTPUT_DISCARD, nullptr, &cmd);
-	b8 succeeded      = result.exited && result.exit_code == EXIT_SUCCESS &&
-	                    result.error == SHELL_ERR_NO_ERROR;
+  CMDResult result = wapp_shell_commander_execute(SHELL_OUTPUT_DISCARD, nullptr, &cmd);
+  b8 succeeded    = result.exited && result.exit_code == EXIT_SUCCESS &&
+                     result.error == SHELL_ERR_NO_ERROR;

-	return wapp_tester_result(succeeded);
+  return wapp_tester_result(succeeded);
 }

 TestFuncResult test_commander_cmd_failure(void) {
-	Str8List cmd  = wapp_dbl_list(Str8);
-	Str8 grep  = wapp_str8_lit("grep");
-	wapp_dbl_list_push_back(Str8, &cmd, &grep);
+  Str8List cmd  = wapp_dbl_list(Str8, Str8List);
+  Str8Node grep = wapp_str8_node_from_cstr("grep");
+  wapp_dbl_list_push_back(Str8, &cmd, &grep);

-	CMDResult result  = wapp_shell_commander_execute(SHELL_OUTPUT_DISCARD, nullptr, &cmd);
-	b8 failed          = result.exited && result.exit_code != EXIT_SUCCESS &&
-	                    result.error == SHELL_ERR_NO_ERROR;
+  CMDResult result = wapp_shell_commander_execute(SHELL_OUTPUT_DISCARD, nullptr, &cmd);
+  b8 failed       = result.exited && result.exit_code != EXIT_SUCCESS &&
+                     result.error == SHELL_ERR_NO_ERROR;

-	return wapp_tester_result(failed);
+  return wapp_tester_result(failed);
 }

 TestFuncResult test_commander_cmd_out_buf_success(void) {
-	Str8 buf      = wapp_str8_buf(64);
-	Str8 expected  = wapp_str8_buf(64);
-	char msg[]    = "hello world";
-	wapp_str8_copy_cstr_capped(&expected, msg);
+  Str8 buf          = wapp_str8_buf(64);
+  Str8 expected     = wapp_str8_buf(64);
+  char msg[]        = "hello world";
+  wapp_str8_copy_cstr_capped(&expected, msg);

-	Str8List cmd  = wapp_dbl_list(Str8);
-	Str8 echo  = wapp_str8_lit("echo");
-	Str8 arg  = wapp_str8_lit(msg);
-	wapp_dbl_list_push_back(Str8, &cmd, &echo);
-	wapp_dbl_list_push_back(Str8, &cmd, &arg);
+  Str8List cmd  = wapp_dbl_list(Str8, Str8List);
+  Str8Node echo = wapp_str8_node_from_cstr("echo");
+  Str8Node arg  = wapp_str8_node_from_cstr(msg);
+  wapp_dbl_list_push_back(Str8, &cmd, &echo);
+  wapp_dbl_list_push_back(Str8, &cmd, &arg);

-	CMDResult result  = wapp_shell_commander_execute(SHELL_OUTPUT_CAPTURE, &buf, &cmd);
-	b8 succeeded      = result.exited && result.exit_code == EXIT_SUCCESS &&
-	                    result.error == SHELL_ERR_NO_ERROR && wapp_str8_equal_to_count(&buf, &expected, strlen(msg));
+  CMDResult result = wapp_shell_commander_execute(SHELL_OUTPUT_CAPTURE, &buf, &cmd);
+  b8 succeeded    = result.exited && result.exit_code == EXIT_SUCCESS &&
+                     result.error == SHELL_ERR_NO_ERROR && wapp_str8_equal_to_count(&buf, &expected, strlen(msg));

-	return wapp_tester_result(succeeded);
+  return wapp_tester_result(succeeded);
 }

 TestFuncResult test_commander_cmd_out_buf_failure(void) {
-	Str8 buf      = wapp_str8_buf(4);
-	Str8 expected  = wapp_str8_buf(64);
-	char msg[]    = "hello world";
-	wapp_str8_copy_cstr_capped(&expected, msg);
+  Str8 buf         = wapp_str8_buf(4);
+  Str8 expected    = wapp_str8_buf(64);
+  char msg[]       = "hello world";
+  wapp_str8_copy_cstr_capped(&expected, msg);

-	Str8List cmd  = wapp_dbl_list(Str8);
-	Str8 echo  = wapp_str8_lit("echo");
-	Str8 arg  = wapp_str8_lit(msg);
-	wapp_dbl_list_push_back(Str8, &cmd, &echo);
-	wapp_dbl_list_push_back(Str8, &cmd, &arg);
+  Str8List cmd  = wapp_dbl_list(Str8, Str8List);
+  Str8Node echo = wapp_str8_node_from_cstr("echo");
+  Str8Node arg  = wapp_str8_node_from_cstr(msg);
+  wapp_dbl_list_push_back(Str8, &cmd, &echo);
+  wapp_dbl_list_push_back(Str8, &cmd, &arg);

-	CMDResult result  = wapp_shell_commander_execute(SHELL_OUTPUT_CAPTURE, &buf, &cmd);
-	b8 failed          = !result.exited && result.exit_code != EXIT_SUCCESS &&
-	                    result.error == SHELL_ERR_OUT_BUF_FULL && !wapp_str8_equal(&buf, &expected);
+  CMDResult result = wapp_shell_commander_execute(SHELL_OUTPUT_CAPTURE, &buf, &cmd);
+  b8 failed       = !result.exited && result.exit_code != EXIT_SUCCESS &&
+                     result.error == SHELL_ERR_OUT_BUF_FULL && !wapp_str8_equal(&buf, &expected);

-	return wapp_tester_result(failed);
+  return wapp_tester_result(failed);
 }
--- a/tests/str8/test_str8.c
+++ b/tests/str8/test_str8.c
--- a/tests/str8/test_str8.cc
+++ b/tests/str8/test_str8.cc
--- a/tests/str8/test_str8_list.c
+++ b/tests/str8/test_str8_list.c
@@ -2,229 +2,262 @@
 #include "wapp.h"

 TestFuncResult test_str8_list_get(void) {
-	b8 result;
+  b8 result;

-	Str8 s1 = wapp_str8_lit("1");
-	Str8 s2 = wapp_str8_lit("2");
-	Str8 s3 = wapp_str8_lit("3");
-	Str8 s4 = wapp_str8_lit("4");
-	Str8 s5 = wapp_str8_lit("5");
+  Str8 s1 = wapp_str8_lit("1");
+  Str8 s2 = wapp_str8_lit("2");
+  Str8 s3 = wapp_str8_lit("3");
+  Str8 s4 = wapp_str8_lit("4");
+  Str8 s5 = wapp_str8_lit("5");

-	Str8List list = wapp_dbl_list(Str8);
+  Str8List list = wapp_dbl_list(Str8, Str8List);
+  Str8Node n1   = wapp_str8_node_from_str8(s1);
+  Str8Node n2   = wapp_str8_node_from_str8(s2);
+  Str8Node n3   = wapp_str8_node_from_str8(s3);
+  Str8Node n4   = wapp_str8_node_from_str8(s4);
+  Str8Node n5   = wapp_str8_node_from_str8(s5);

-	wapp_dbl_list_push_back(Str8, &list, &s1);
-	wapp_dbl_list_push_back(Str8, &list, &s2);
-	wapp_dbl_list_push_back(Str8, &list, &s3);
-	wapp_dbl_list_push_back(Str8, &list, &s4);
-	wapp_dbl_list_push_back(Str8, &list, &s5);
+  wapp_dbl_list_push_back(Str8, &list, &n1);
+  wapp_dbl_list_push_back(Str8, &list, &n2);
+  wapp_dbl_list_push_back(Str8, &list, &n3);
+  wapp_dbl_list_push_back(Str8, &list, &n4);
+  wapp_dbl_list_push_back(Str8, &list, &n5);

-	Str8 *node = wapp_dbl_list_get(Str8, &list, 0);
-	result = node == &s1 && wapp_str8_equal(node, &s1);
+  Str8Node *node = wapp_dbl_list_get(Str8, Str8Node, &list, 0);
+  result = node->item == &s1 && wapp_str8_equal(node->item, &s1);

-	node   = wapp_dbl_list_get(Str8, &list, 1);
-	result = result && node == &s2 && wapp_str8_equal(node, &s2);
+  node = wapp_dbl_list_get(Str8, Str8Node, &list, 1);
+  result = result && node->item == &s2 && wapp_str8_equal(node->item, &s2);

-	node   = wapp_dbl_list_get(Str8, &list, 2);
-	result = result && node == &s3 && wapp_str8_equal(node, &s3);
+  node = wapp_dbl_list_get(Str8, Str8Node, &list, 2);
+  result = result && node->item == &s3 && wapp_str8_equal(node->item, &s3);

-	node   = wapp_dbl_list_get(Str8, &list, 3);
-	result = result && node == &s4 && wapp_str8_equal(node, &s4);
+  node = wapp_dbl_list_get(Str8, Str8Node, &list, 3);
+  result = result && node->item == &s4 && wapp_str8_equal(node->item, &s4);

-	node   = wapp_dbl_list_get(Str8, &list, 4);
-	result = result && node == &s5 && wapp_str8_equal(node, &s5);
+  node = wapp_dbl_list_get(Str8, Str8Node, &list, 4);
+  result = result && node->item == &s5 && wapp_str8_equal(node->item, &s5);

-	return wapp_tester_result(result);
+  return wapp_tester_result(result);
 }

 TestFuncResult test_str8_list_push_front(void) {
-	b8 result;
+  b8 result;

-	Str8 s1 = wapp_str8_lit("1");
-	Str8 s2 = wapp_str8_lit("2");
-	Str8 s3 = wapp_str8_lit("3");
+  Str8 s1 = wapp_str8_lit("1");
+  Str8 s2 = wapp_str8_lit("2");
+  Str8 s3 = wapp_str8_lit("3");

-	Str8List list = wapp_dbl_list(Str8);
+  Str8List list = wapp_dbl_list(Str8, Str8List);
+  Str8Node n1   = wapp_str8_node_from_str8(s1);
+  Str8Node n2   = wapp_str8_node_from_str8(s2);
+  Str8Node n3   = wapp_str8_node_from_str8(s3);

-	wapp_dbl_list_push_front(Str8, &list, &s1);
-	result = list.first == list.last && list.first->item == &s1 && wapp_str8_list_total_size(&list) == 1 && list.node_count == 1;
+  wapp_dbl_list_push_front(Str8, &list, &n1);
+  result = list.first == list.last && list.first == &n1 && list.first->item == &s1 && wapp_str8_list_total_size(&list) == 1 && list.node_count == 1;

-	wapp_dbl_list_push_front(Str8, &list, &s2);
-	result = result && list.first->item == &s2 && wapp_str8_list_total_size(&list) == 2 && list.node_count == 2;
+  wapp_dbl_list_push_front(Str8, &list, &n2);
+  result = result && list.first == &n2 && list.first->item == &s2 && wapp_str8_list_total_size(&list) == 2 && list.node_count == 2;

-	wapp_dbl_list_push_front(Str8, &list, &s3);
-	result = result && list.first->item == &s3 && wapp_str8_list_total_size(&list) == 3 && list.node_count == 3;
+  wapp_dbl_list_push_front(Str8, &list, &n3);
+  result = result && list.first == &n3 && list.first->item == &s3 && wapp_str8_list_total_size(&list) == 3 && list.node_count == 3;

-	return wapp_tester_result(result);
+  return wapp_tester_result(result);
 }

 TestFuncResult test_str8_list_push_back(void) {
-	b8 result;
+  b8 result;

-	Str8 s1 = wapp_str8_lit("1");
-	Str8 s2 = wapp_str8_lit("2");
-	Str8 s3 = wapp_str8_lit("3");
+  Str8 s1 = wapp_str8_lit("1");
+  Str8 s2 = wapp_str8_lit("2");
+  Str8 s3 = wapp_str8_lit("3");

-	Str8List list = wapp_dbl_list(Str8);
+  Str8List list = wapp_dbl_list(Str8, Str8List);
+  Str8Node n1   = wapp_str8_node_from_str8(s1);
+  Str8Node n2   = wapp_str8_node_from_str8(s2);
+  Str8Node n3   = wapp_str8_node_from_str8(s3);

-	wapp_dbl_list_push_back(Str8, &list, &s1);
-	result = list.first == list.last && list.last->item == &s1 && wapp_str8_list_total_size(&list) == 1 && list.node_count == 1;
+  wapp_dbl_list_push_back(Str8, &list, &n1);
+  result = list.first == list.last && list.last == &n1 && list.last->item == &s1 && wapp_str8_list_total_size(&list) == 1 && list.node_count == 1;

-	wapp_dbl_list_push_back(Str8, &list, &s2);
-	result = result && list.last->item == &s2 && wapp_str8_list_total_size(&list) == 2 && list.node_count == 2;
+  wapp_dbl_list_push_back(Str8, &list, &n2);
+  result = result && list.last == &n2 && list.last->item == &s2 && wapp_str8_list_total_size(&list) == 2 && list.node_count == 2;

-	wapp_dbl_list_push_back(Str8, &list, &s3);
-	result = result && list.last->item == &s3 && wapp_str8_list_total_size(&list) == 3 && list.node_count == 3;
+  wapp_dbl_list_push_back(Str8, &list, &n3);
+  result = result && list.last == &n3 && list.last->item == &s3 && wapp_str8_list_total_size(&list) == 3 && list.node_count == 3;

-	return wapp_tester_result(result);
+  return wapp_tester_result(result);
 }

 TestFuncResult test_str8_list_insert(void) {
-	b8 result;
+  b8 result;

-	Str8 s1 = wapp_str8_lit("1");
-	Str8 s2 = wapp_str8_lit("2");
-	Str8 s3 = wapp_str8_lit("3");
-	Str8 s4 = wapp_str8_lit("4");
-	Str8 s5 = wapp_str8_lit("5");
-	Str8 s6 = wapp_str8_lit("6");
-	Str8 s7 = wapp_str8_lit("7");
+  Str8 s1 = wapp_str8_lit("1");
+  Str8 s2 = wapp_str8_lit("2");
+  Str8 s3 = wapp_str8_lit("3");
+  Str8 s4 = wapp_str8_lit("4");
+  Str8 s5 = wapp_str8_lit("5");
+  Str8 s6 = wapp_str8_lit("6");
+  Str8 s7 = wapp_str8_lit("7");

-	Str8List list = wapp_dbl_list(Str8);
+  Str8List list = wapp_dbl_list(Str8, Str8List);
+  Str8Node n1   = wapp_str8_node_from_str8(s1);
+  Str8Node n2   = wapp_str8_node_from_str8(s2);
+  Str8Node n3   = wapp_str8_node_from_str8(s3);
+  Str8Node n4   = wapp_str8_node_from_str8(s4);
+  Str8Node n5   = wapp_str8_node_from_str8(s5);
+  Str8Node n6   = wapp_str8_node_from_str8(s6);
+  Str8Node n7   = wapp_str8_node_from_str8(s7);

-	wapp_dbl_list_push_back(Str8, &list, &s1);
-	wapp_dbl_list_push_back(Str8, &list, &s2);
-	wapp_dbl_list_push_back(Str8, &list, &s3);
-	wapp_dbl_list_push_back(Str8, &list, &s4);
-	wapp_dbl_list_push_back(Str8, &list, &s5);
+  wapp_dbl_list_push_back(Str8, &list, &n1);
+  wapp_dbl_list_push_back(Str8, &list, &n2);
+  wapp_dbl_list_push_back(Str8, &list, &n3);
+  wapp_dbl_list_push_back(Str8, &list, &n4);
+  wapp_dbl_list_push_back(Str8, &list, &n5);

-	Str8 *node;
-	wapp_dbl_list_insert(Str8, &list, &s6, 2);
-	node    = wapp_dbl_list_get(Str8, &list, 2);
-	result  = node != NULL && node == &s6 && wapp_str8_list_total_size(&list) == 6 && list.node_count == 6;
-	wapp_dbl_list_insert(Str8, &list, &s7, 5);
-	node    = wapp_dbl_list_get(Str8, &list, 5);
-	result  = result && node != NULL && node == &s7 && wapp_str8_list_total_size(&list) == 7 && list.node_count == 7;
+  Str8Node *node;
+  wapp_dbl_list_insert(Str8, &list, &n6, 2);
+  node   = wapp_dbl_list_get(Str8, Str8Node, &list, 2);
+  result = node != NULL && node->item == &s6 && wapp_str8_list_total_size(&list) == 6 && list.node_count == 6;
+  wapp_dbl_list_insert(Str8, &list, &n7, 5);
+  node   = wapp_dbl_list_get(Str8, Str8Node, &list, 5);
+  result = result && node != NULL && node->item == &s7 && wapp_str8_list_total_size(&list) == 7 && list.node_count == 7;

-	return wapp_tester_result(result);
+  return wapp_tester_result(result);
 }

 TestFuncResult test_str8_list_pop_front(void) {
-	b8 result;
+  b8 result;

-	Str8 s1 = wapp_str8_lit("1");
-	Str8 s2 = wapp_str8_lit("2");
-	Str8 s3 = wapp_str8_lit("3");
-	Str8 s4 = wapp_str8_lit("4");
-	Str8 s5 = wapp_str8_lit("5");
+  Str8 s1 = wapp_str8_lit("1");
+  Str8 s2 = wapp_str8_lit("2");
+  Str8 s3 = wapp_str8_lit("3");
+  Str8 s4 = wapp_str8_lit("4");
+  Str8 s5 = wapp_str8_lit("5");

-	Str8List list = wapp_dbl_list(Str8);
+  Str8List list = wapp_dbl_list(Str8, Str8List);
+  Str8Node n1   = wapp_str8_node_from_str8(s1);
+  Str8Node n2   = wapp_str8_node_from_str8(s2);
+  Str8Node n3   = wapp_str8_node_from_str8(s3);
+  Str8Node n4   = wapp_str8_node_from_str8(s4);
+  Str8Node n5   = wapp_str8_node_from_str8(s5);

-	wapp_dbl_list_push_back(Str8, &list, &s1);
-	wapp_dbl_list_push_back(Str8, &list, &s2);
-	wapp_dbl_list_push_back(Str8, &list, &s3);
-	wapp_dbl_list_push_back(Str8, &list, &s4);
-	wapp_dbl_list_push_back(Str8, &list, &s5);
+  wapp_dbl_list_push_back(Str8, &list, &n1);
+  wapp_dbl_list_push_back(Str8, &list, &n2);
+  wapp_dbl_list_push_back(Str8, &list, &n3);
+  wapp_dbl_list_push_back(Str8, &list, &n4);
+  wapp_dbl_list_push_back(Str8, &list, &n5);

-	Str8 *node = wapp_dbl_list_pop_front(Str8, &list);
-	result = node == &s1 && wapp_str8_equal(node, &s1) && wapp_str8_list_total_size(&list) == 4 && list.node_count == 4;
+  Str8Node *node = wapp_dbl_list_pop_front(Str8, Str8Node, &list);
+  result = node == &n1 && node->item == &s1 && wapp_str8_equal(node->item, &s1) && wapp_str8_list_total_size(&list) == 4 && list.node_count == 4;

-	node   = wapp_dbl_list_pop_front(Str8, &list);
-	result = result && node == &s2 && wapp_str8_equal(node, &s2) && wapp_str8_list_total_size(&list) == 3 && list.node_count == 3;
+  node = wapp_dbl_list_pop_front(Str8, Str8Node, &list);
+  result = result && node == &n2 && node->item == &s2 && wapp_str8_equal(node->item, &s2) && wapp_str8_list_total_size(&list) == 3 && list.node_count == 3;

-	node   = wapp_dbl_list_pop_front(Str8, &list);
-	result = result && node == &s3 && wapp_str8_equal(node, &s3) && wapp_str8_list_total_size(&list) == 2 && list.node_count == 2;
+  node = wapp_dbl_list_pop_front(Str8, Str8Node, &list);
+  result = result && node == &n3 && node->item == &s3 && wapp_str8_equal(node->item, &s3) && wapp_str8_list_total_size(&list) == 2 && list.node_count == 2;

-	node   = wapp_dbl_list_pop_front(Str8, &list);
-	result = result && node == &s4 && wapp_str8_equal(node, &s4) && wapp_str8_list_total_size(&list) == 1 && list.node_count == 1;
+  node = wapp_dbl_list_pop_front(Str8, Str8Node, &list);
+  result = result && node == &n4 && node->item == &s4 && wapp_str8_equal(node->item, &s4) && wapp_str8_list_total_size(&list) == 1 && list.node_count == 1;

-	node   = wapp_dbl_list_pop_front(Str8, &list);
-	result = result && node == &s5 && wapp_str8_equal(node, &s5) && wapp_str8_list_total_size(&list) == 0 && list.node_count == 0;
+  node = wapp_dbl_list_pop_front(Str8, Str8Node, &list);
+  result = result && node == &n5 && node->item == &s5 && wapp_str8_equal(node->item, &s5) && wapp_str8_list_total_size(&list) == 0 && list.node_count == 0;

-	return wapp_tester_result(result);
+  return wapp_tester_result(result);
 }

 TestFuncResult test_str8_list_pop_back(void) {
-	b8 result;
+  b8 result;

-	Str8 s1 = wapp_str8_lit("1");
-	Str8 s2 = wapp_str8_lit("2");
-	Str8 s3 = wapp_str8_lit("3");
-	Str8 s4 = wapp_str8_lit("4");
-	Str8 s5 = wapp_str8_lit("5");
+  Str8 s1 = wapp_str8_lit("1");
+  Str8 s2 = wapp_str8_lit("2");
+  Str8 s3 = wapp_str8_lit("3");
+  Str8 s4 = wapp_str8_lit("4");
+  Str8 s5 = wapp_str8_lit("5");

-	Str8List list = wapp_dbl_list(Str8);
+  Str8List list = wapp_dbl_list(Str8, Str8List);
+  Str8Node n1   = wapp_str8_node_from_str8(s1);
+  Str8Node n2   = wapp_str8_node_from_str8(s2);
+  Str8Node n3   = wapp_str8_node_from_str8(s3);
+  Str8Node n4   = wapp_str8_node_from_str8(s4);
+  Str8Node n5   = wapp_str8_node_from_str8(s5);

-	wapp_dbl_list_push_front(Str8, &list, &s1);
-	wapp_dbl_list_push_front(Str8, &list, &s2);
-	wapp_dbl_list_push_front(Str8, &list, &s3);
-	wapp_dbl_list_push_front(Str8, &list, &s4);
-	wapp_dbl_list_push_front(Str8, &list, &s5);
+  wapp_dbl_list_push_front(Str8, &list, &n1);
+  wapp_dbl_list_push_front(Str8, &list, &n2);
+  wapp_dbl_list_push_front(Str8, &list, &n3);
+  wapp_dbl_list_push_front(Str8, &list, &n4);
+  wapp_dbl_list_push_front(Str8, &list, &n5);

-	Str8 *node = wapp_dbl_list_pop_back(Str8, &list);
-	result = node == &s1 && wapp_str8_equal(node, &s1) && wapp_str8_list_total_size(&list) == 4 && list.node_count == 4;
+  Str8Node *node = wapp_dbl_list_pop_back(Str8, Str8Node, &list);
+  result = node == &n1 && node->item == &s1 && wapp_str8_equal(node->item, &s1) && wapp_str8_list_total_size(&list) == 4 && list.node_count == 4;

-	node   = wapp_dbl_list_pop_back(Str8, &list);
-	result = result && node == &s2 && wapp_str8_equal(node, &s2) && wapp_str8_list_total_size(&list) == 3 && list.node_count == 3;
+  node = wapp_dbl_list_pop_back(Str8, Str8Node, &list);
+  result = result && node == &n2 && node->item == &s2 && wapp_str8_equal(node->item, &s2) && wapp_str8_list_total_size(&list) == 3 && list.node_count == 3;

-	node   = wapp_dbl_list_pop_back(Str8, &list);
-	result = result && node == &s3 && wapp_str8_equal(node, &s3) && wapp_str8_list_total_size(&list) == 2 && list.node_count == 2;
+  node = wapp_dbl_list_pop_back(Str8, Str8Node, &list);
+  result = result && node == &n3 && node->item == &s3 && wapp_str8_equal(node->item, &s3) && wapp_str8_list_total_size(&list) == 2 && list.node_count == 2;

-	node   = wapp_dbl_list_pop_back(Str8, &list);
-	result = result && node == &s4 && wapp_str8_equal(node, &s4) && wapp_str8_list_total_size(&list) == 1 && list.node_count == 1;
+  node = wapp_dbl_list_pop_back(Str8, Str8Node, &list);
+  result = result && node == &n4 && node->item == &s4 && wapp_str8_equal(node->item, &s4) && wapp_str8_list_total_size(&list) == 1 && list.node_count == 1;

-	node   = wapp_dbl_list_pop_back(Str8, &list);
-	result = result && node == &s5 && wapp_str8_equal(node, &s5) && wapp_str8_list_total_size(&list) == 0 && list.node_count == 0;
+  node = wapp_dbl_list_pop_back(Str8, Str8Node, &list);
+  result = result && node == &n5 && node->item == &s5 && wapp_str8_equal(node->item, &s5) && wapp_str8_list_total_size(&list) == 0 && list.node_count == 0;

-	return wapp_tester_result(result);
+  return wapp_tester_result(result);
 }

 TestFuncResult test_str8_list_remove(void) {
-	b8 result;
+  b8 result;

-	Str8 s1 = wapp_str8_lit("1");
-	Str8 s2 = wapp_str8_lit("2");
-	Str8 s3 = wapp_str8_lit("3");
-	Str8 s4 = wapp_str8_lit("4");
-	Str8 s5 = wapp_str8_lit("5");
+  Str8 s1 = wapp_str8_lit("1");
+  Str8 s2 = wapp_str8_lit("2");
+  Str8 s3 = wapp_str8_lit("3");
+  Str8 s4 = wapp_str8_lit("4");
+  Str8 s5 = wapp_str8_lit("5");

-	Str8List list = wapp_dbl_list(Str8);
+  Str8List list = wapp_dbl_list(Str8, Str8List);
+  Str8Node n1   = wapp_str8_node_from_str8(s1);
+  Str8Node n2   = wapp_str8_node_from_str8(s2);
+  Str8Node n3   = wapp_str8_node_from_str8(s3);
+  Str8Node n4   = wapp_str8_node_from_str8(s4);
+  Str8Node n5   = wapp_str8_node_from_str8(s5);

-	wapp_dbl_list_push_back(Str8, &list, &s1);
-	wapp_dbl_list_push_back(Str8, &list, &s2);
-	wapp_dbl_list_push_back(Str8, &list, &s3);
-	wapp_dbl_list_push_back(Str8, &list, &s4);
-	wapp_dbl_list_push_back(Str8, &list, &s5);
+  wapp_dbl_list_push_back(Str8, &list, &n1);
+  wapp_dbl_list_push_back(Str8, &list, &n2);
+  wapp_dbl_list_push_back(Str8, &list, &n3);
+  wapp_dbl_list_push_back(Str8, &list, &n4);
+  wapp_dbl_list_push_back(Str8, &list, &n5);

-	Str8 *node = wapp_dbl_list_remove(Str8, &list, 0);
-	result = node == &s1 && wapp_str8_equal(node, &s1) && wapp_str8_list_total_size(&list) == 4 && list.node_count == 4;
+  Str8Node *node = wapp_dbl_list_remove(Str8, Str8Node, &list, 0);
+  result = node == &n1 && node->item == &s1 && wapp_str8_equal(node->item, &s1) && wapp_str8_list_total_size(&list) == 4 && list.node_count == 4;

-	node   = wapp_dbl_list_remove(Str8, &list, 0);
-	result = result && node == &s2 && wapp_str8_equal(node, &s2) && wapp_str8_list_total_size(&list) == 3 && list.node_count == 3;
+  node = wapp_dbl_list_remove(Str8, Str8Node, &list, 0);
+  result = result && node == &n2 && node->item == &s2 && wapp_str8_equal(node->item, &s2) && wapp_str8_list_total_size(&list) == 3 && list.node_count == 3;

-	node   = wapp_dbl_list_remove(Str8, &list, 0);
-	result = result && node == &s3 && wapp_str8_equal(node, &s3) && wapp_str8_list_total_size(&list) == 2 && list.node_count == 2;
+  node = wapp_dbl_list_remove(Str8, Str8Node, &list, 0);
+  result = result && node == &n3 && node->item == &s3 && wapp_str8_equal(node->item, &s3) && wapp_str8_list_total_size(&list) == 2 && list.node_count == 2;

-	node   = wapp_dbl_list_remove(Str8, &list, 0);
-	result = result && node == &s4 && wapp_str8_equal(node, &s4) && wapp_str8_list_total_size(&list) == 1 && list.node_count == 1;
+  node = wapp_dbl_list_remove(Str8, Str8Node, &list, 0);
+  result = result && node == &n4 && node->item == &s4 && wapp_str8_equal(node->item, &s4) && wapp_str8_list_total_size(&list) == 1 && list.node_count == 1;

-	node   = wapp_dbl_list_remove(Str8, &list, 0);
-	result = result && node == &s5 && wapp_str8_equal(node, &s5) && wapp_str8_list_total_size(&list) == 0 && list.node_count == 0;
+  node = wapp_dbl_list_remove(Str8, Str8Node, &list, 0);
+  result = result && node == &n5 && node->item == &s5 && wapp_str8_equal(node->item, &s5) && wapp_str8_list_total_size(&list) == 0 && list.node_count == 0;

-	return wapp_tester_result(result);
+  return wapp_tester_result(result);
 }

 TestFuncResult test_str8_list_empty(void) {
-	b8 result;
+  b8 result;

-	Str8List list = wapp_dbl_list(Str8);
-	wapp_dbl_list_push_back(Str8, &list, &wapp_str8_lit("Hello"));
-	wapp_dbl_list_push_back(Str8, &list, &wapp_str8_lit("from"));
-	wapp_dbl_list_push_back(Str8, &list, &wapp_str8_lit("wizapp"));
-	wapp_dbl_list_push_back(Str8, &list, &wapp_str8_lit("stdlib"));
+  Str8List list = wapp_dbl_list(Str8, Str8List);
+  wapp_dbl_list_push_back(Str8, &list, &wapp_str8_node_from_cstr("Hello"));
+  wapp_dbl_list_push_back(Str8, &list, &wapp_str8_node_from_cstr("from"));
+  wapp_dbl_list_push_back(Str8, &list, &wapp_str8_node_from_cstr("wizapp"));
+  wapp_dbl_list_push_back(Str8, &list, &wapp_str8_node_from_cstr("stdlib"));

-	wapp_dbl_list_empty(Str8, &list);
+  wapp_dbl_list_empty(Str8, &list);

-	result = list.first == NULL && list.last == NULL && list.node_count == 0 && wapp_str8_list_total_size(&list) == 0;
+  result = list.first == NULL && list.last == NULL && list.node_count == 0 && wapp_str8_list_total_size(&list) == 0;

-	return wapp_tester_result(result);
+  return wapp_tester_result(result);
 }
--- a/tests/str8/test_str8_list.cc
+++ b/tests/str8/test_str8_list.cc
@@ -2,237 +2,270 @@
 #include "wapp.h"

 TestFuncResult test_str8_list_get(void) {
-	b8 result;
+  b8 result;

-	Str8 s1 = wapp_str8_lit("1");
-	Str8 s2 = wapp_str8_lit("2");
-	Str8 s3 = wapp_str8_lit("3");
-	Str8 s4 = wapp_str8_lit("4");
-	Str8 s5 = wapp_str8_lit("5");
+  Str8 s1 = wapp_str8_lit("1");
+  Str8 s2 = wapp_str8_lit("2");
+  Str8 s3 = wapp_str8_lit("3");
+  Str8 s4 = wapp_str8_lit("4");
+  Str8 s5 = wapp_str8_lit("5");

-	Str8List list = wapp_dbl_list(Str8);
+  Str8List list = wapp_dbl_list(Str8, Str8List);
+  Str8Node n1   = wapp_str8_node_from_str8(s1);
+  Str8Node n2   = wapp_str8_node_from_str8(s2);
+  Str8Node n3   = wapp_str8_node_from_str8(s3);
+  Str8Node n4   = wapp_str8_node_from_str8(s4);
+  Str8Node n5   = wapp_str8_node_from_str8(s5);

-	wapp_dbl_list_push_back(Str8, &list, &s1);
-	wapp_dbl_list_push_back(Str8, &list, &s2);
-	wapp_dbl_list_push_back(Str8, &list, &s3);
-	wapp_dbl_list_push_back(Str8, &list, &s4);
-	wapp_dbl_list_push_back(Str8, &list, &s5);
+  wapp_dbl_list_push_back(Str8, &list, &n1);
+  wapp_dbl_list_push_back(Str8, &list, &n2);
+  wapp_dbl_list_push_back(Str8, &list, &n3);
+  wapp_dbl_list_push_back(Str8, &list, &n4);
+  wapp_dbl_list_push_back(Str8, &list, &n5);

-	Str8 *node = wapp_dbl_list_get(Str8, &list, 0);
-	result = node == &s1 && wapp_str8_equal(node, &s1);
+  Str8Node *node = wapp_dbl_list_get(Str8, Str8Node, &list, 0);
+  result = node->item == &s1 && wapp_str8_equal(node->item, &s1);

-	node   = wapp_dbl_list_get(Str8, &list, 1);
-	result = result && node == &s2 && wapp_str8_equal(node, &s2);
+  node = wapp_dbl_list_get(Str8, Str8Node, &list, 1);
+  result = result && node->item == &s2 && wapp_str8_equal(node->item, &s2);

-	node   = wapp_dbl_list_get(Str8, &list, 2);
-	result = result && node == &s3 && wapp_str8_equal(node, &s3);
+  node = wapp_dbl_list_get(Str8, Str8Node, &list, 2);
+  result = result && node->item == &s3 && wapp_str8_equal(node->item, &s3);

-	node   = wapp_dbl_list_get(Str8, &list, 3);
-	result = result && node == &s4 && wapp_str8_equal(node, &s4);
+  node = wapp_dbl_list_get(Str8, Str8Node, &list, 3);
+  result = result && node->item == &s4 && wapp_str8_equal(node->item, &s4);

-	node   = wapp_dbl_list_get(Str8, &list, 4);
-	result = result && node == &s5 && wapp_str8_equal(node, &s5);
+  node = wapp_dbl_list_get(Str8, Str8Node, &list, 4);
+  result = result && node->item == &s5 && wapp_str8_equal(node->item, &s5);

-	return wapp_tester_result(result);
+  return wapp_tester_result(result);
 }

 TestFuncResult test_str8_list_push_front(void) {
-	b8 result;
+  b8 result;

-	Str8 s1 = wapp_str8_lit("1");
-	Str8 s2 = wapp_str8_lit("2");
-	Str8 s3 = wapp_str8_lit("3");
+  Str8 s1 = wapp_str8_lit("1");
+  Str8 s2 = wapp_str8_lit("2");
+  Str8 s3 = wapp_str8_lit("3");

-	Str8List list = wapp_dbl_list(Str8);
+  Str8List list = wapp_dbl_list(Str8, Str8List);
+  Str8Node n1   = wapp_str8_node_from_str8(s1);
+  Str8Node n2   = wapp_str8_node_from_str8(s2);
+  Str8Node n3   = wapp_str8_node_from_str8(s3);

-	wapp_dbl_list_push_front(Str8, &list, &s1);
-	result = list.first == list.last && list.first->item == &s1 && wapp_str8_list_total_size(&list) == 1 && list.node_count == 1;
+  wapp_dbl_list_push_front(Str8, &list, &n1);
+  result = list.first == list.last && list.first == &n1 && list.first->item == &s1 && wapp_str8_list_total_size(&list) == 1 && list.node_count == 1;

-	wapp_dbl_list_push_front(Str8, &list, &s2);
-	result = result && list.first->item == &s2 && wapp_str8_list_total_size(&list) == 2 && list.node_count == 2;
+  wapp_dbl_list_push_front(Str8, &list, &n2);
+  result = result && list.first == &n2 && list.first->item == &s2 && wapp_str8_list_total_size(&list) == 2 && list.node_count == 2;

-	wapp_dbl_list_push_front(Str8, &list, &s3);
-	result = result && list.first->item == &s3 && wapp_str8_list_total_size(&list) == 3 && list.node_count == 3;
+  wapp_dbl_list_push_front(Str8, &list, &n3);
+  result = result && list.first == &n3 && list.first->item == &s3 && wapp_str8_list_total_size(&list) == 3 && list.node_count == 3;

-	return wapp_tester_result(result);
+  return wapp_tester_result(result);
 }

 TestFuncResult test_str8_list_push_back(void) {
-	b8 result;
+  b8 result;

-	Str8 s1 = wapp_str8_lit("1");
-	Str8 s2 = wapp_str8_lit("2");
-	Str8 s3 = wapp_str8_lit("3");
+  Str8 s1 = wapp_str8_lit("1");
+  Str8 s2 = wapp_str8_lit("2");
+  Str8 s3 = wapp_str8_lit("3");

-	Str8List list = wapp_dbl_list(Str8);
+  Str8List list = wapp_dbl_list(Str8, Str8List);
+  Str8Node n1   = wapp_str8_node_from_str8(s1);
+  Str8Node n2   = wapp_str8_node_from_str8(s2);
+  Str8Node n3   = wapp_str8_node_from_str8(s3);

-	wapp_dbl_list_push_back(Str8, &list, &s1);
-	result = list.first == list.last && list.last->item == &s1 && wapp_str8_list_total_size(&list) == 1 && list.node_count == 1;
+  wapp_dbl_list_push_back(Str8, &list, &n1);
+  result = list.first == list.last && list.last == &n1 && list.last->item == &s1 && wapp_str8_list_total_size(&list) == 1 && list.node_count == 1;

-	wapp_dbl_list_push_back(Str8, &list, &s2);
-	result = result && list.last->item == &s2 && wapp_str8_list_total_size(&list) == 2 && list.node_count == 2;
+  wapp_dbl_list_push_back(Str8, &list, &n2);
+  result = result && list.last == &n2 && list.last->item == &s2 && wapp_str8_list_total_size(&list) == 2 && list.node_count == 2;

-	wapp_dbl_list_push_back(Str8, &list, &s3);
-	result = result && list.last->item == &s3 && wapp_str8_list_total_size(&list) == 3 && list.node_count == 3;
+  wapp_dbl_list_push_back(Str8, &list, &n3);
+  result = result && list.last == &n3 && list.last->item == &s3 && wapp_str8_list_total_size(&list) == 3 && list.node_count == 3;

-	return wapp_tester_result(result);
+  return wapp_tester_result(result);
 }

 TestFuncResult test_str8_list_insert(void) {
-	b8 result;
+  b8 result;

-	Str8 s1 = wapp_str8_lit("1");
-	Str8 s2 = wapp_str8_lit("2");
-	Str8 s3 = wapp_str8_lit("3");
-	Str8 s4 = wapp_str8_lit("4");
-	Str8 s5 = wapp_str8_lit("5");
-	Str8 s6 = wapp_str8_lit("6");
-	Str8 s7 = wapp_str8_lit("7");
+  Str8 s1 = wapp_str8_lit("1");
+  Str8 s2 = wapp_str8_lit("2");
+  Str8 s3 = wapp_str8_lit("3");
+  Str8 s4 = wapp_str8_lit("4");
+  Str8 s5 = wapp_str8_lit("5");
+  Str8 s6 = wapp_str8_lit("6");
+  Str8 s7 = wapp_str8_lit("7");

-	Str8List list = wapp_dbl_list(Str8);
+  Str8List list = wapp_dbl_list(Str8, Str8List);
+  Str8Node n1   = wapp_str8_node_from_str8(s1);
+  Str8Node n2   = wapp_str8_node_from_str8(s2);
+  Str8Node n3   = wapp_str8_node_from_str8(s3);
+  Str8Node n4   = wapp_str8_node_from_str8(s4);
+  Str8Node n5   = wapp_str8_node_from_str8(s5);
+  Str8Node n6   = wapp_str8_node_from_str8(s6);
+  Str8Node n7   = wapp_str8_node_from_str8(s7);

-	wapp_dbl_list_push_back(Str8, &list, &s1);
-	wapp_dbl_list_push_back(Str8, &list, &s2);
-	wapp_dbl_list_push_back(Str8, &list, &s3);
-	wapp_dbl_list_push_back(Str8, &list, &s4);
-	wapp_dbl_list_push_back(Str8, &list, &s5);
+  wapp_dbl_list_push_back(Str8, &list, &n1);
+  wapp_dbl_list_push_back(Str8, &list, &n2);
+  wapp_dbl_list_push_back(Str8, &list, &n3);
+  wapp_dbl_list_push_back(Str8, &list, &n4);
+  wapp_dbl_list_push_back(Str8, &list, &n5);

-	Str8 *node;
-	wapp_dbl_list_insert(Str8, &list, &s6, 2);
-	node   = wapp_dbl_list_get(Str8, &list, 2);
-	result = node != NULL && node == &s6 && wapp_str8_list_total_size(&list) == 6 && list.node_count == 6;
-	wapp_dbl_list_insert(Str8, &list, &s7, 5);
-	node   = wapp_dbl_list_get(Str8, &list, 5);
-	result = result && node != NULL && node == &s7 && wapp_str8_list_total_size(&list) == 7 && list.node_count == 7;
+  Str8Node *node;
+  wapp_dbl_list_insert(Str8, &list, &n6, 2);
+  node   = wapp_dbl_list_get(Str8, Str8Node, &list, 2);
+  result = node != NULL && node->item == &s6 && wapp_str8_list_total_size(&list) == 6 && list.node_count == 6;
+  wapp_dbl_list_insert(Str8, &list, &n7, 5);
+  node   = wapp_dbl_list_get(Str8, Str8Node, &list, 5);
+  result = result && node != NULL && node->item == &s7 && wapp_str8_list_total_size(&list) == 7 && list.node_count == 7;

-	return wapp_tester_result(result);
+  return wapp_tester_result(result);
 }

 TestFuncResult test_str8_list_pop_front(void) {
-	b8 result;
+  b8 result;

-	Str8 s1 = wapp_str8_lit("1");
-	Str8 s2 = wapp_str8_lit("2");
-	Str8 s3 = wapp_str8_lit("3");
-	Str8 s4 = wapp_str8_lit("4");
-	Str8 s5 = wapp_str8_lit("5");
+  Str8 s1 = wapp_str8_lit("1");
+  Str8 s2 = wapp_str8_lit("2");
+  Str8 s3 = wapp_str8_lit("3");
+  Str8 s4 = wapp_str8_lit("4");
+  Str8 s5 = wapp_str8_lit("5");

-	Str8List list = wapp_dbl_list(Str8);
+  Str8List list = wapp_dbl_list(Str8, Str8List);
+  Str8Node n1   = wapp_str8_node_from_str8(s1);
+  Str8Node n2   = wapp_str8_node_from_str8(s2);
+  Str8Node n3   = wapp_str8_node_from_str8(s3);
+  Str8Node n4   = wapp_str8_node_from_str8(s4);
+  Str8Node n5   = wapp_str8_node_from_str8(s5);

-	wapp_dbl_list_push_back(Str8, &list, &s1);
-	wapp_dbl_list_push_back(Str8, &list, &s2);
-	wapp_dbl_list_push_back(Str8, &list, &s3);
-	wapp_dbl_list_push_back(Str8, &list, &s4);
-	wapp_dbl_list_push_back(Str8, &list, &s5);
+  wapp_dbl_list_push_back(Str8, &list, &n1);
+  wapp_dbl_list_push_back(Str8, &list, &n2);
+  wapp_dbl_list_push_back(Str8, &list, &n3);
+  wapp_dbl_list_push_back(Str8, &list, &n4);
+  wapp_dbl_list_push_back(Str8, &list, &n5);

-	Str8 *node = wapp_dbl_list_pop_front(Str8, &list);
-	result = node == &s1 && wapp_str8_equal(node, &s1) && wapp_str8_list_total_size(&list) == 4 && list.node_count == 4;
+  Str8Node *node = wapp_dbl_list_pop_front(Str8, Str8Node, &list);
+  result = node == &n1 && node->item == &s1 && wapp_str8_equal(node->item, &s1) && wapp_str8_list_total_size(&list) == 4 && list.node_count == 4;

-	node   = wapp_dbl_list_pop_front(Str8, &list);
-	result = result && node == &s2 && wapp_str8_equal(node, &s2) && wapp_str8_list_total_size(&list) == 3 && list.node_count == 3;
+  node = wapp_dbl_list_pop_front(Str8, Str8Node, &list);
+  result = result && node == &n2 && node->item == &s2 && wapp_str8_equal(node->item, &s2) && wapp_str8_list_total_size(&list) == 3 && list.node_count == 3;

-	node   = wapp_dbl_list_pop_front(Str8, &list);
-	result = result && node == &s3 && wapp_str8_equal(node, &s3) && wapp_str8_list_total_size(&list) == 2 && list.node_count == 2;
+  node = wapp_dbl_list_pop_front(Str8, Str8Node, &list);
+  result = result && node == &n3 && node->item == &s3 && wapp_str8_equal(node->item, &s3) && wapp_str8_list_total_size(&list) == 2 && list.node_count == 2;

-	node   = wapp_dbl_list_pop_front(Str8, &list);
-	result = result && node == &s4 && wapp_str8_equal(node, &s4) && wapp_str8_list_total_size(&list) == 1 && list.node_count == 1;
+  node = wapp_dbl_list_pop_front(Str8, Str8Node, &list);
+  result = result && node == &n4 && node->item == &s4 && wapp_str8_equal(node->item, &s4) && wapp_str8_list_total_size(&list) == 1 && list.node_count == 1;

-	node   = wapp_dbl_list_pop_front(Str8, &list);
-	result = result && node == &s5 && wapp_str8_equal(node, &s5) && wapp_str8_list_total_size(&list) == 0 && list.node_count == 0;
+  node = wapp_dbl_list_pop_front(Str8, Str8Node, &list);
+  result = result && node == &n5 && node->item == &s5 && wapp_str8_equal(node->item, &s5) && wapp_str8_list_total_size(&list) == 0 && list.node_count == 0;

-	return wapp_tester_result(result);
+  return wapp_tester_result(result);
 }

 TestFuncResult test_str8_list_pop_back(void) {
-	b8 result;
+  b8 result;

-	Str8 s1 = wapp_str8_lit("1");
-	Str8 s2 = wapp_str8_lit("2");
-	Str8 s3 = wapp_str8_lit("3");
-	Str8 s4 = wapp_str8_lit("4");
-	Str8 s5 = wapp_str8_lit("5");
+  Str8 s1 = wapp_str8_lit("1");
+  Str8 s2 = wapp_str8_lit("2");
+  Str8 s3 = wapp_str8_lit("3");
+  Str8 s4 = wapp_str8_lit("4");
+  Str8 s5 = wapp_str8_lit("5");

-	Str8List list = wapp_dbl_list(Str8);
+  Str8List list = wapp_dbl_list(Str8, Str8List);
+  Str8Node n1   = wapp_str8_node_from_str8(s1);
+  Str8Node n2   = wapp_str8_node_from_str8(s2);
+  Str8Node n3   = wapp_str8_node_from_str8(s3);
+  Str8Node n4   = wapp_str8_node_from_str8(s4);
+  Str8Node n5   = wapp_str8_node_from_str8(s5);

-	wapp_dbl_list_push_front(Str8, &list, &s1);
-	wapp_dbl_list_push_front(Str8, &list, &s2);
-	wapp_dbl_list_push_front(Str8, &list, &s3);
-	wapp_dbl_list_push_front(Str8, &list, &s4);
-	wapp_dbl_list_push_front(Str8, &list, &s5);
+  wapp_dbl_list_push_front(Str8, &list, &n1);
+  wapp_dbl_list_push_front(Str8, &list, &n2);
+  wapp_dbl_list_push_front(Str8, &list, &n3);
+  wapp_dbl_list_push_front(Str8, &list, &n4);
+  wapp_dbl_list_push_front(Str8, &list, &n5);

-	Str8 *node = wapp_dbl_list_pop_back(Str8, &list);
-	result = node == &s1 && wapp_str8_equal(node, &s1) && wapp_str8_list_total_size(&list) == 4 && list.node_count == 4;
+  Str8Node *node = wapp_dbl_list_pop_back(Str8, Str8Node, &list);
+  result = node == &n1 && node->item == &s1 && wapp_str8_equal(node->item, &s1) && wapp_str8_list_total_size(&list) == 4 && list.node_count == 4;

-	node   = wapp_dbl_list_pop_back(Str8, &list);
-	result = result && node == &s2 && wapp_str8_equal(node, &s2) && wapp_str8_list_total_size(&list) == 3 && list.node_count == 3;
+  node = wapp_dbl_list_pop_back(Str8, Str8Node, &list);
+  result = result && node == &n2 && node->item == &s2 && wapp_str8_equal(node->item, &s2) && wapp_str8_list_total_size(&list) == 3 && list.node_count == 3;

-	node   = wapp_dbl_list_pop_back(Str8, &list);
-	result = result && node == &s3 && wapp_str8_equal(node, &s3) && wapp_str8_list_total_size(&list) == 2 && list.node_count == 2;
+  node = wapp_dbl_list_pop_back(Str8, Str8Node, &list);
+  result = result && node == &n3 && node->item == &s3 && wapp_str8_equal(node->item, &s3) && wapp_str8_list_total_size(&list) == 2 && list.node_count == 2;

-	node   = wapp_dbl_list_pop_back(Str8, &list);
-	result = result && node == &s4 && wapp_str8_equal(node, &s4) && wapp_str8_list_total_size(&list) == 1 && list.node_count == 1;
+  node = wapp_dbl_list_pop_back(Str8, Str8Node, &list);
+  result = result && node == &n4 && node->item == &s4 && wapp_str8_equal(node->item, &s4) && wapp_str8_list_total_size(&list) == 1 && list.node_count == 1;

-	node   = wapp_dbl_list_pop_back(Str8, &list);
-	result = result && node == &s5 && wapp_str8_equal(node, &s5) && wapp_str8_list_total_size(&list) == 0 && list.node_count == 0;
+  node = wapp_dbl_list_pop_back(Str8, Str8Node, &list);
+  result = result && node == &n5 && node->item == &s5 && wapp_str8_equal(node->item, &s5) && wapp_str8_list_total_size(&list) == 0 && list.node_count == 0;

-	return wapp_tester_result(result);
+  return wapp_tester_result(result);
 }

 TestFuncResult test_str8_list_remove(void) {
-	b8 result;
+  b8 result;

-	Str8 s1 = wapp_str8_lit("1");
-	Str8 s2 = wapp_str8_lit("2");
-	Str8 s3 = wapp_str8_lit("3");
-	Str8 s4 = wapp_str8_lit("4");
-	Str8 s5 = wapp_str8_lit("5");
+  Str8 s1 = wapp_str8_lit("1");
+  Str8 s2 = wapp_str8_lit("2");
+  Str8 s3 = wapp_str8_lit("3");
+  Str8 s4 = wapp_str8_lit("4");
+  Str8 s5 = wapp_str8_lit("5");

-	Str8List list = wapp_dbl_list(Str8);
+  Str8List list = wapp_dbl_list(Str8, Str8List);
+  Str8Node n1   = wapp_str8_node_from_str8(s1);
+  Str8Node n2   = wapp_str8_node_from_str8(s2);
+  Str8Node n3   = wapp_str8_node_from_str8(s3);
+  Str8Node n4   = wapp_str8_node_from_str8(s4);
+  Str8Node n5   = wapp_str8_node_from_str8(s5);

-	wapp_dbl_list_push_back(Str8, &list, &s1);
-	wapp_dbl_list_push_back(Str8, &list, &s2);
-	wapp_dbl_list_push_back(Str8, &list, &s3);
-	wapp_dbl_list_push_back(Str8, &list, &s4);
-	wapp_dbl_list_push_back(Str8, &list, &s5);
+  wapp_dbl_list_push_back(Str8, &list, &n1);
+  wapp_dbl_list_push_back(Str8, &list, &n2);
+  wapp_dbl_list_push_back(Str8, &list, &n3);
+  wapp_dbl_list_push_back(Str8, &list, &n4);
+  wapp_dbl_list_push_back(Str8, &list, &n5);

-	Str8 *node = wapp_dbl_list_remove(Str8, &list, 0);
-	result = node == &s1 && wapp_str8_equal(node, &s1) && wapp_str8_list_total_size(&list) == 4 && list.node_count == 4;
+  Str8Node *node = wapp_dbl_list_remove(Str8, Str8Node, &list, 0);
+  result = node == &n1 && node->item == &s1 && wapp_str8_equal(node->item, &s1) && wapp_str8_list_total_size(&list) == 4 && list.node_count == 4;

-	node   = wapp_dbl_list_remove(Str8, &list, 0);
-	result = result && node == &s2 && wapp_str8_equal(node, &s2) && wapp_str8_list_total_size(&list) == 3 && list.node_count == 3;
+  node = wapp_dbl_list_remove(Str8, Str8Node, &list, 0);
+  result = result && node == &n2 && node->item == &s2 && wapp_str8_equal(node->item, &s2) && wapp_str8_list_total_size(&list) == 3 && list.node_count == 3;

-	node   = wapp_dbl_list_remove(Str8, &list, 0);
-	result = result && node == &s3 && wapp_str8_equal(node, &s3) && wapp_str8_list_total_size(&list) == 2 && list.node_count == 2;
+  node = wapp_dbl_list_remove(Str8, Str8Node, &list, 0);
+  result = result && node == &n3 && node->item == &s3 && wapp_str8_equal(node->item, &s3) && wapp_str8_list_total_size(&list) == 2 && list.node_count == 2;

-	node   = wapp_dbl_list_remove(Str8, &list, 0);
-	result = result && node == &s4 && wapp_str8_equal(node, &s4) && wapp_str8_list_total_size(&list) == 1 && list.node_count == 1;
+  node = wapp_dbl_list_remove(Str8, Str8Node, &list, 0);
+  result = result && node == &n4 && node->item == &s4 && wapp_str8_equal(node->item, &s4) && wapp_str8_list_total_size(&list) == 1 && list.node_count == 1;

-	node   = wapp_dbl_list_remove(Str8, &list, 0);
-	result = result && node == &s5 && wapp_str8_equal(node, &s5) && wapp_str8_list_total_size(&list) == 0 && list.node_count == 0;
+  node = wapp_dbl_list_remove(Str8, Str8Node, &list, 0);
+  result = result && node == &n5 && node->item == &s5 && wapp_str8_equal(node->item, &s5) && wapp_str8_list_total_size(&list) == 0 && list.node_count == 0;

-	return wapp_tester_result(result);
+  return wapp_tester_result(result);
 }

 TestFuncResult test_str8_list_empty(void) {
-	b8 result;
+  b8 result;

-	Str8List list = wapp_dbl_list(Str8);
+  Str8List list = wapp_dbl_list(Str8, Str8List);

-	Str8 hello = wapp_str8_lit("Hello");
-	wapp_dbl_list_push_back(Str8, &list, &hello);
+  Str8Node hello = wapp_str8_node_from_cstr("Hello");
+  wapp_dbl_list_push_back(Str8, &list, &hello);

-	Str8 from = wapp_str8_lit("from");
-	wapp_dbl_list_push_back(Str8, &list, &from);
+  Str8Node from = wapp_str8_node_from_cstr("from");
+  wapp_dbl_list_push_back(Str8, &list, &from);

-	Str8 wizapp = wapp_str8_lit("wizapp");
-	wapp_dbl_list_push_back(Str8, &list, &wizapp);
+  Str8Node wizapp = wapp_str8_node_from_cstr("wizapp");
+  wapp_dbl_list_push_back(Str8, &list, &wizapp);

-	Str8 stdlib = wapp_str8_lit("stdlib");
-	wapp_dbl_list_push_back(Str8, &list, &stdlib);
+  Str8Node stdlib = wapp_str8_node_from_cstr("stdlib");
+  wapp_dbl_list_push_back(Str8, &list, &stdlib);

-	wapp_dbl_list_empty(Str8, &list);
+  wapp_dbl_list_empty(Str8, &list);

-	result = list.first == NULL && list.last == NULL && list.node_count == 0 && wapp_str8_list_total_size(&list) == 0;
+  result = list.first == NULL && list.last == NULL && list.node_count == 0 && wapp_str8_list_total_size(&list) == 0;

-	return wapp_tester_result(result);
+  return wapp_tester_result(result);
 }
--- a/tests/wapptest.c
+++ b/tests/wapptest.c
@@ -4,102 +4,77 @@
 #include "test_arena.h"
 #include "test_str8_array.h"
 #include "test_i32_array.h"
-#include "test_queue.h"
 #include "test_cpath.h"
-#include "test_file.h"
 #include "test_shell_commander.h"
 #include "wapp.h"
 #include <stdlib.h>

 int main(void) {
-	wapp_tester_run_tests(
-		test_arena_allocator,
-		test_arena_allocator_with_buffer,
-		test_arena_allocator_temp_begin,
-		test_arena_allocator_temp_end,
-		test_arena_init_buffer,
-		test_arena_init_allocated,
-		test_arena_init_succeeds_when_reserving_very_large_size,
-		test_arena_alloc_with_buffer,
-		test_arena_alloc_succeeds_when_within_capacity,
-		test_arena_alloc_fails_when_over_capacity,
-		test_arena_realloc_bigger_size,
-		test_arena_realloc_smaller_size,
-		test_arena_temp_begin,
-		test_arena_temp_end,
-		test_arena_clear,
-		test_arena_destroy_buffer,
-		test_arena_destroy_allocated,
-		test_str8_array,
-		test_i32_array,
-		test_i32_array_with_capacity,
-		test_i32_array_get,
-		test_i32_array_set,
-		test_i32_array_append_capped,
-		test_i32_array_extend_capped,
-		test_i32_array_copy_capped,
-		test_i32_array_alloc_capacity,
-		test_i32_array_append_alloc,
-		test_i32_array_extend_alloc,
-		test_i32_array_copy_alloc,
-		test_i32_array_pop,
-		test_i32_array_clear,
-		test_queue_push,
-		test_queue_push_alloc,
-		test_queue_pop,
-		test_str8_lit,
-		test_str8_lit_ro,
-		test_str8_buf,
-		test_str8_alloc_buf,
-		test_str8_alloc_cstr,
-		test_str8_alloc_str8,
-		test_str8_alloc_substr,
-		test_str8_alloc_concat,
-		test_str8_get_index_within_bounds,
-		test_str8_get_index_out_of_bounds,
-		test_str8_set,
-		test_str8_equal,
-		test_str8_slice,
-		test_str8_concat_capped,
-		test_str8_copy_cstr_capped,
-		test_str8_copy_str8_capped,
-		test_str8_format,
-		test_str8_find,
-		test_str8_rfind,
-		test_str8_split,
-		test_str8_split_with_max,
-		test_str8_rsplit,
-		test_str8_rsplit_with_max,
-		test_str8_join,
-		test_str8_from_bytes,
-		test_str8_list_get,
-		test_str8_list_push_front,
-		test_str8_list_push_back,
-		test_str8_list_insert,
-		test_str8_list_pop_front,
-		test_str8_list_pop_back,
-		test_str8_list_remove,
-		test_str8_list_empty,
-		test_cpath_join_path,
-		test_cpath_dirname,
-		test_cpath_dirup,
-		test_wapp_file_open,
-		test_wapp_file_get_current_position,
-		test_wapp_file_seek,
-		test_wapp_file_get_length,
-		test_wapp_file_read,
-		test_wapp_file_write,
-		test_wapp_file_read_array,
-		test_wapp_file_write_array,
-		test_wapp_file_flush,
-		test_wapp_file_close,
-		test_wapp_file_rename,
-		test_wapp_file_remove,
-		test_commander_cmd_success,
-		test_commander_cmd_failure,
-		test_commander_cmd_out_buf_success,
-		test_commander_cmd_out_buf_failure
-	);
+  wapp_tester_run_tests(
+      test_arena_allocator,
+      test_arena_init,
+      test_arena_init_succeeds_when_reserving_very_large_size,
+      test_arena_alloc_succeeds_when_within_capacity,
+      test_arena_alloc_fails_when_over_capacity,
+      test_arena_realloc_bigger_size,
+      test_arena_realloc_smaller_size,
+      test_arena_clear,
+      test_arena_destroy,
+      test_str8_array,
+      test_i32_array,
+      test_i32_array_with_capacity,
+      test_i32_array_get,
+      test_i32_array_set,
+      test_i32_array_append_capped,
+      test_i32_array_extend_capped,
+      test_i32_array_copy_capped,
+      test_i32_array_alloc_capacity,
+      test_i32_array_append_alloc,
+      test_i32_array_extend_alloc,
+      test_i32_array_copy_alloc,
+      test_i32_array_pop,
+      test_i32_array_clear,
+      test_str8_lit,
+      test_str8_lit_ro,
+      test_str8_buf,
+      test_str8_alloc_buf,
+      test_str8_alloc_cstr,
+      test_str8_alloc_str8,
+      test_str8_alloc_substr,
+      test_str8_alloc_concat,
+      test_str8_get_index_within_bounds,
+      test_str8_get_index_out_of_bounds,
+      test_str8_set,
+      test_str8_equal,
+      test_str8_slice,
+      test_str8_concat_capped,
+      test_str8_copy_cstr_capped,
+      test_str8_copy_str8_capped,
+      test_str8_format,
+      test_str8_find,
+      test_str8_rfind,
+      test_str8_split,
+      test_str8_split_with_max,
+      test_str8_rsplit,
+      test_str8_rsplit_with_max,
+      test_str8_join,
+      test_str8_from_bytes,
+      test_str8_list_get,
+      test_str8_list_push_front,
+      test_str8_list_push_back,
+      test_str8_list_insert,
+      test_str8_list_pop_front,
+      test_str8_list_pop_back,
+      test_str8_list_remove,
+      test_str8_list_empty,
+      test_cpath_join_path,
+      test_cpath_dirname,
+      test_cpath_dirup,
+      test_commander_cmd_success,
+      test_commander_cmd_failure,
+      test_commander_cmd_out_buf_success,
+      test_commander_cmd_out_buf_failure
+  );

-	return EXIT_SUCCESS;
+  return EXIT_SUCCESS;
 }
--- a/tests/wapptest.cc
+++ b/tests/wapptest.cc
@@ -4,102 +4,77 @@
 #include "test_arena.h"
 #include "test_str8_array.h"
 #include "test_i32_array.h"
-#include "test_queue.h"
 #include "test_cpath.h"
-#include "test_file.h"
 #include "test_shell_commander.h"
 #include "wapp.h"
 #include <stdlib.h>

 int main(void) {
-	wapp_tester_run_tests(
-		test_arena_allocator,
-		test_arena_allocator_with_buffer,
-		test_arena_allocator_temp_begin,
-		test_arena_allocator_temp_end,
-		test_arena_init_buffer,
-		test_arena_init_allocated,
-		test_arena_init_succeeds_when_reserving_very_large_size,
-		test_arena_alloc_with_buffer,
-		test_arena_alloc_succeeds_when_within_capacity,
-		test_arena_alloc_fails_when_over_capacity,
-		test_arena_realloc_bigger_size,
-		test_arena_realloc_smaller_size,
-		test_arena_temp_begin,
-		test_arena_temp_end,
-		test_arena_clear,
-		test_arena_destroy_buffer,
-		test_arena_destroy_allocated,
-		test_str8_array,
-		test_i32_array,
-		test_i32_array_with_capacity,
-		test_i32_array_get,
-		test_i32_array_set,
-		test_i32_array_append_capped,
-		test_i32_array_extend_capped,
-		test_i32_array_copy_capped,
-		test_i32_array_alloc_capacity,
-		test_i32_array_append_alloc,
-		test_i32_array_extend_alloc,
-		test_i32_array_copy_alloc,
-		test_i32_array_pop,
-		test_i32_array_clear,
-		test_queue_push,
-		test_queue_push_alloc,
-		test_queue_pop,
-		test_str8_lit,
-		test_str8_lit_ro,
-		test_str8_buf,
-		test_str8_alloc_buf,
-		test_str8_alloc_cstr,
-		test_str8_alloc_str8,
-		test_str8_alloc_substr,
-		test_str8_alloc_concat,
-		test_str8_get_index_within_bounds,
-		test_str8_get_index_out_of_bounds,
-		test_str8_set,
-		test_str8_equal,
-		test_str8_slice,
-		test_str8_concat_capped,
-		test_str8_copy_cstr_capped,
-		test_str8_copy_str8_capped,
-		test_str8_format,
-		test_str8_find,
-		test_str8_rfind,
-		test_str8_split,
-		test_str8_split_with_max,
-		test_str8_rsplit,
-		test_str8_rsplit_with_max,
-		test_str8_join,
-		test_str8_from_bytes,
-		test_str8_list_get,
-		test_str8_list_push_front,
-		test_str8_list_push_back,
-		test_str8_list_insert,
-		test_str8_list_pop_front,
-		test_str8_list_pop_back,
-		test_str8_list_remove,
-		test_str8_list_empty,
-		test_cpath_join_path,
-		test_cpath_dirname,
-		test_cpath_dirup,
-		test_wapp_file_open,
-		test_wapp_file_get_current_position,
-		test_wapp_file_seek,
-		test_wapp_file_get_length,
-		test_wapp_file_read,
-		test_wapp_file_write,
-		test_wapp_file_read_array,
-		test_wapp_file_write_array,
-		test_wapp_file_flush,
-		test_wapp_file_close,
-		test_wapp_file_rename,
-		test_wapp_file_remove,
-		test_commander_cmd_success,
-		test_commander_cmd_failure,
-		test_commander_cmd_out_buf_success,
-		test_commander_cmd_out_buf_failure
-	);
+  wapp_tester_run_tests(
+      test_arena_allocator,
+      test_arena_init,
+      test_arena_init_succeeds_when_reserving_very_large_size,
+      test_arena_alloc_succeeds_when_within_capacity,
+      test_arena_alloc_fails_when_over_capacity,
+      test_arena_realloc_bigger_size,
+      test_arena_realloc_smaller_size,
+      test_arena_clear,
+      test_arena_destroy,
+      test_str8_array,
+      test_i32_array,
+      test_i32_array_with_capacity,
+      test_i32_array_get,
+      test_i32_array_set,
+      test_i32_array_append_capped,
+      test_i32_array_extend_capped,
+      test_i32_array_clear,
+      test_i32_array_pop,
+      test_i32_array_copy_capped,
+      test_i32_array_alloc_capacity,
+      test_i32_array_append_alloc,
+      test_i32_array_extend_alloc,
+      test_i32_array_copy_alloc,
+      test_str8_lit,
+      test_str8_lit_ro,
+      test_str8_buf,
+      test_str8_alloc_buf,
+      test_str8_alloc_cstr,
+      test_str8_alloc_str8,
+      test_str8_alloc_substr,
+      test_str8_alloc_concat,
+      test_str8_get_index_within_bounds,
+      test_str8_get_index_out_of_bounds,
+      test_str8_set,
+      test_str8_equal,
+      test_str8_slice,
+      test_str8_concat_capped,
+      test_str8_copy_cstr_capped,
+      test_str8_copy_str8_capped,
+      test_str8_format,
+      test_str8_find,
+      test_str8_rfind,
+      test_str8_split,
+      test_str8_split_with_max,
+      test_str8_rsplit,
+      test_str8_rsplit_with_max,
+      test_str8_join,
+      test_str8_from_bytes,
+      test_str8_list_get,
+      test_str8_list_push_front,
+      test_str8_list_push_back,
+      test_str8_list_insert,
+      test_str8_list_pop_front,
+      test_str8_list_pop_back,
+      test_str8_list_remove,
+      test_str8_list_empty,
+      test_cpath_join_path,
+      test_cpath_dirname,
+      test_cpath_dirup,
+      test_commander_cmd_success,
+      test_commander_cmd_failure,
+      test_commander_cmd_out_buf_success,
+      test_commander_cmd_out_buf_failure
+  );

-	return EXIT_SUCCESS;
+  return EXIT_SUCCESS;
 }
Author	SHA1	Message	Date
Abdelrahman	d79e7615a1	Update dbl list C++ tests	2025-12-17 03:37:56 +00:00
Abdelrahman	80d79fca53	Update C++ version of wapp_str8_node_from_str8	2025-12-17 03:37:29 +00:00
Abdelrahman	e90901406e	Update dbl list C tests	2025-12-17 02:52:29 +00:00
Abdelrahman	80308172ec	Add generic no codegen dbl list API	2025-12-17 02:52:15 +00:00
Abdelrahman	4805b183e8	Rename Array to GenericArray to avoid name clashes	2025-12-17 02:50:53 +00:00
Abdelrahman	d36812e632	Remove codegen	2025-12-17 02:49:48 +00:00