[nostalgia/studio] Update version to d2024.12.0

2024-12-21 19:27:00 -06:00
574 changed files with 9728 additions and 40107 deletions
@@ -1 +0,0 @@
-sample_project text eol=lf
@@ -4,7 +4,7 @@ on: [push]

 jobs:
  build:
-    runs-on: olympic
+    runs-on: nostalgia
    steps:
      - name: Check out repository code
        uses: actions/checkout@v3
@@ -17,10 +17,3 @@ jobs:
      - run: make purge configure-release
      - run: make build
      - run: make test
-      - run: make install
-      - run: mv dist/linux-x86_64-release nostalgia-linux-x86_64
-      - run: tar cf nostalgia-linux-x86_64.tar nostalgia-linux-x86_64
-      - uses: actions/upload-artifact@v3
-        with:
-          name: nostalgia-linux-x86_64
-          path: nostalgia-linux-x86_64.tar
@@ -6,14 +6,12 @@
 .mypy_cache
 .stfolder
 .stignore
-.vs
-util/scripts/__pycache__
+scripts/__pycache__
 pyenv
 CMakeLists.txt.user
 ROM.oxfs
 Session.vim
 build
-cmake-build-*
 compile_commands.json
 dist
 graph_info.json
@@ -2,4 +2,4 @@
 source:
 - src
 copyright_notice: |-
-  Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved.
+  Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
@@ -1,4 +1,4 @@
-FROM fedora:41
+FROM fedora:36

 RUN dnf update -y

@@ -1,81 +1,35 @@
 BC_VAR_PROJECT_NAME=nostalgia
 BC_VAR_PROJECT_NAME_CAP=Nostalgia
-BC_VAR_DEVENV_ROOT=util
-BUILDCORE_PATH=deps/ox/deps/buildcore
+BUILDCORE_PATH=deps/buildcore
 include ${BUILDCORE_PATH}/base.mk

 ifeq ($(BC_VAR_OS),darwin)
-	PROJECT_STUDIO=./build/${BC_VAR_CURRENT_BUILD}/bin/${BC_VAR_PROJECT_NAME_CAP}Studio.app/Contents/MacOS/${BC_VAR_PROJECT_NAME_CAP}Studio
+	NOSTALGIA_STUDIO=./build/${BC_VAR_CURRENT_BUILD}/bin/${BC_VAR_PROJECT_NAME_CAP}Studio.app/Contents/MacOS/${BC_VAR_PROJECT_NAME_CAP}Studio
 	MGBA=/Applications/mGBA.app/Contents/MacOS/mGBA
 else
-	PROJECT_STUDIO=./build/${BC_VAR_CURRENT_BUILD}/bin/${BC_VAR_PROJECT_NAME_CAP}Studio
+	NOSTALGIA_STUDIO=./build/${BC_VAR_CURRENT_BUILD}/bin/${BC_VAR_PROJECT_NAME_CAP}Studio
 	MGBA=mgba-qt
 endif
-PROJECT_PLAYER=./build/${BC_VAR_CURRENT_BUILD}/bin/${BC_VAR_PROJECT_NAME_CAP}
-
-.PHONY: git-setup-ox-remote
-git-setup-ox-remote:
-	git remote add -f ox-master git@git.drinkingtea.net:drinkingtea/ox.git
-
-.PHONY: git-pull-ox
-git-pull-ox:
-	git fetch ox-master master
-	git subtree pull --prefix deps/ox ox-master master --squash
-
-.PHONY: git-push-ox
-git-push-ox:
-	git subtree push --prefix=deps/ox ox-master master

 .PHONY: pkg-gba
-pkg-gba: build-pack build-gba-player
-	${BC_CMD_ENVRUN} ${BC_PY3} ./util/scripts/pkg-gba.py sample_project ${BC_VAR_PROJECT_NAME_CAP}
-
-.PHONY: pkg-mac
-pkg-mac: install
-	${BC_CMD_ENVRUN} ${BC_PY3} ./util/scripts/pkg-dmg.py NostalgiaStudio
-
-.PHONY: generate-studio-rsrc
-generate-studio-rsrc:
-	${BC_CMD_ENVRUN} ${BC_PY3} ./util/scripts/file-to-cpp.py --rsrc src/olympic/studio/applib/src/rsrc.json
-	${BC_CMD_ENVRUN} ${BC_PY3} ./util/scripts/file-to-cpp.py --rsrc src/nostalgia/studio/rsrc.json
-
-.PHONY: build-gba-player
-build-gba-player:
-	cmake --build ./build/gba-*
-
-.PHONY: build-player
-build-player:
-	${BC_CMD_CMAKE_BUILD} ${BC_VAR_BUILD_PATH} ${BC_VAR_PROJECT_NAME_CAP}
-
-.PHONY: build-pack
-build-pack:
-	cmake --build ./build/${BC_VAR_CURRENT_BUILD} --target ${BC_VAR_PROJECT_NAME}-pack
-
+pkg-gba: build
+	${BC_CMD_ENVRUN} ${BC_PY3} ./scripts/pkg-gba.py sample_project ${BC_VAR_PROJECT_NAME}

 .PHONY: run
-run: build-player
-	${PROJECT_PLAYER} sample_project
-
-.PHONY: build-studio
-build-studio:
-	cmake --build ./build/${BC_VAR_CURRENT_BUILD} --target ${BC_VAR_PROJECT_NAME_CAP}Studio
-
+run: build
+	./build/${BC_VAR_CURRENT_BUILD}/bin/${BC_VAR_PROJECT_NAME} sample_project
 .PHONY: run-studio
-run-studio: build-studio
-	${PROJECT_STUDIO}
-
+run-studio: build
+	${NOSTALGIA_STUDIO}
 .PHONY: gba-run
 gba-run: pkg-gba
-	${MGBA} ${BC_VAR_PROJECT_NAME_CAP}.gba
-
+	${MGBA} ${BC_VAR_PROJECT_NAME}.gba
 .PHONY: debug
 debug: build
-	${BC_CMD_HOST_DEBUGGER} ${PROJECT_PLAYER} sample_project
-
+	${BC_CMD_HOST_DEBUGGER} ./build/${BC_VAR_CURRENT_BUILD}/bin/${BC_VAR_PROJECT_NAME} sample_project
 .PHONY: debug-studio
 debug-studio: build
-	${BC_CMD_HOST_DEBUGGER} ${PROJECT_STUDIO}
-
+	${BC_CMD_HOST_DEBUGGER} ${NOSTALGIA_STUDIO}

 .PHONY: configure-gba
 configure-gba:
@@ -84,25 +38,3 @@ configure-gba:
 .PHONY: configure-gba-debug
 configure-gba-debug:
 	${BC_CMD_SETUP_BUILD} --toolchain=deps/gbabuildcore/cmake/modules/GBA.cmake --target=gba --current_build=0 --build_type=debug --build_root=${BC_VAR_BUILD_PATH}
-
-.PHONY: loc
-loc:
-	${BC_PY3} util/scripts/loc.py \
-		--search-dirs \
-			src \
-			deps/ox/src \
-			deps/buildcore \
-			deps/gbabuildcore \
-			deps/glutils \
-			deps/teagba \
-		--include-exts \
-			.cpp \
-			.hpp \
-			.py \
-			.s \
-			.cmake \
-		--exclude-paths \
-			deps/teagba/src/gba_crt0.s \
-			src/olympic/studio/applib/src/font.cpp \
-			src/olympic/studio/applib/src/font.hpp \
-			src/nostalgia/studio/icondata.cpp
@@ -93,7 +93,7 @@ purge:
 	${BC_CMD_RM_RF} compile_commands.json
 .PHONY: test
 test: build
-	${BC_CMD_ENVRUN} ${BC_CMD_PY3} -m mypy ${BC_VAR_SCRIPTS}
+	${BC_CMD_ENVRUN} mypy ${BC_VAR_SCRIPTS}
 	${BC_CMD_CMAKE_BUILD} ${BC_VAR_BUILD_PATH} test
 .PHONY: test-verbose
 test-verbose: build
@@ -11,7 +11,6 @@
 # "Python Busy Box" - adds cross-platform equivalents to Unix commands that
 #                     don't translate well to that other operating system

-import multiprocessing
 import os
 import platform
 import shutil
@@ -58,11 +57,7 @@ def cmake_build(base_path: str, target: Optional[str]) -> int:
        path = os.path.join(base_path, d)
        if not os.path.isdir(path):
            continue
-        args = ['cmake', '--build', path, f'-j{multiprocessing.cpu_count()}']
-        if path.endswith('release'):
-            args.append('--config=release')
-        elif path.endswith('debug'):
-            args.append('--config=debug')
+        args = ['cmake', '--build', path]
        if target is not None:
            args.extend(['--target', target])
        err = subprocess.run(args).returncode
@@ -35,6 +35,4 @@ def get_arch() -> str:
    arch = platform.machine().lower()
    if arch == 'amd64':
        arch = 'x86_64'
-    elif arch == 'aarch64':
-        arch = 'arm64'
    return arch
@@ -1,8 +1,8 @@
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/cmake/modules)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -nostdlib")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -nostdinc++")
-#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-unwind-tables")
-#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-unwind-tables")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-strict-aliasing")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mthumb-interwork")
@@ -1,11 +1,2 @@
-add_library(glad src/glad.c)
-
-target_include_directories(glad PUBLIC include)
-
-install(
-	TARGETS
-		glad
-	DESTINATION
-		LIBRARY DESTINATION lib
-		ARCHIVE DESTINATION lib
-)
+add_library(glad OBJECT src/glad.c)
+target_include_directories(glad PUBLIC include)
@@ -89,7 +89,7 @@ struct GLObject: public Base {
 		return id;
 	}

-	constexpr operator GLuint const&() const noexcept {
+	constexpr operator const GLuint&() const noexcept {
 		return id;
 	}

@@ -135,7 +135,7 @@ struct FrameBuffer {
 		return fbo.id;
 	}

-	constexpr operator GLuint const&() const noexcept {
+	constexpr operator const GLuint&() const noexcept {
 		return fbo.id;
 	}

@@ -158,14 +158,14 @@ struct FrameBuffer {

 class FrameBufferBind {
 	private:
-		static FrameBuffer const *s_activeFb;
-		FrameBuffer const *m_restoreFb = nullptr;
+		static const FrameBuffer *s_activeFb;
+		const FrameBuffer *m_restoreFb = nullptr;
 	public:
-		explicit FrameBufferBind(FrameBuffer const &fb) noexcept;
+		explicit FrameBufferBind(const FrameBuffer &fb) noexcept;
 		~FrameBufferBind() noexcept;
 };

-void bind(FrameBuffer const &fb) noexcept;
+void bind(const FrameBuffer &fb) noexcept;

 struct ShaderVarSet {
 	GLsizei len{};
@@ -176,7 +176,7 @@ struct ProgramSource {
 	ox::Vector<glutils::ShaderVarSet> const shaderParams;
 	GLsizei const rowLen = [this] {
 		GLsizei len{};
-		for (auto const &v : shaderParams) {
+		for (auto const&v : shaderParams) {
 			len += v.len;
 		}
 		return len;
@@ -187,23 +187,23 @@ struct ProgramSource {
 	ox::String const geomShader{};
 };

-ox::Result<GLProgram> buildShaderProgram(ProgramSource const &src) noexcept;
+ox::Result<GLProgram> buildShaderProgram(ProgramSource const&src) noexcept;

 ox::Result<GLProgram> buildShaderProgram(
-		ox::CStringView const &vert,
-		ox::CStringView const &frag,
-		ox::CStringView const &geo = "") noexcept;
+		ox::CStringView const&vert,
+		ox::CStringView const&frag,
+		ox::CStringView const&geo = "") noexcept;

 void setupShaderParams(
-		GLProgram const &shader,
-		ox::Vector<ShaderVarSet> const &vars,
+		GLProgram const&shader,
+		ox::Vector<ShaderVarSet> const&vars,
 		GLsizei vertexRowLen) noexcept;

-void setupShaderParams(GLProgram const &shader, ox::Vector<ShaderVarSet> const &vars) noexcept;
+void setupShaderParams(GLProgram const&shader, ox::Vector<ShaderVarSet> const&vars) noexcept;

-GLVertexArray generateVertexArrayObject() noexcept;
+glutils::GLVertexArray generateVertexArrayObject() noexcept;

-GLBuffer generateBuffer() noexcept;
+glutils::GLBuffer generateBuffer() noexcept;

 [[nodiscard]]
 FrameBuffer generateFrameBuffer(int width, int height) noexcept;
@@ -215,20 +215,20 @@ void resizeFrameBuffer(FrameBuffer &fb, int width, int height) noexcept;
 */
 void resizeInitFrameBuffer(FrameBuffer &fb, int width, int height) noexcept;

-void resizeInitFrameBuffer(FrameBuffer &fb, ox::Size const &sz) noexcept;
+void resizeInitFrameBuffer(FrameBuffer &fb, ox::Size const&sz) noexcept;

 struct BufferSet {
-	GLVertexArray vao;
-	GLBuffer vbo;
-	GLBuffer ebo;
-	GLTexture tex;
+	glutils::GLVertexArray vao;
+	glutils::GLBuffer vbo;
+	glutils::GLBuffer ebo;
+	glutils::GLTexture tex;
 	ox::Vector<float> vertices;
 	ox::Vector<GLuint> elements;
 };

-void sendVbo(BufferSet const &bs) noexcept;
+void sendVbo(BufferSet const&bs) noexcept;

-void sendEbo(BufferSet const &bs) noexcept;
+void sendEbo(BufferSet const&bs) noexcept;

 void clearScreen() noexcept;

@@ -46,9 +46,9 @@ template struct GLObject<deleteVertexArray>;
 template struct GLObject<deleteProgram>;
 template struct GLObject<deleteShader>;

-FrameBuffer const *FrameBufferBind::s_activeFb = nullptr;
+const FrameBuffer *FrameBufferBind::s_activeFb = nullptr;

-FrameBufferBind::FrameBufferBind(FrameBuffer const &fb) noexcept: m_restoreFb(s_activeFb) {
+FrameBufferBind::FrameBufferBind(const FrameBuffer &fb) noexcept: m_restoreFb(s_activeFb) {
 	s_activeFb = &fb;
 	glBindFramebuffer(GL_FRAMEBUFFER, fb);
 	glViewport(0, 0, fb.width, fb.height);
@@ -64,15 +64,15 @@ FrameBufferBind::~FrameBufferBind() noexcept {
 	}
 }

-void bind(FrameBuffer const &fb) noexcept {
+void bind(const FrameBuffer &fb) noexcept {
 	glBindFramebuffer(GL_FRAMEBUFFER, fb);
 	glViewport(0, 0, fb.width, fb.height);
 }


 static ox::Result<GLShader> buildShader(
-		GLuint const shaderType,
-		GLchar const *src,
+		GLuint shaderType,
+		const GLchar *src,
 		ox::StringViewCR shaderName) noexcept {
 	GLShader shader(glCreateShader(shaderType));
 	glShaderSource(shader, 1, &src, nullptr);
@@ -88,7 +88,7 @@ static ox::Result<GLShader> buildShader(
 	return shader;
 }

-ox::Result<GLProgram> buildShaderProgram(ProgramSource const &src) noexcept {
+ox::Result<GLProgram> buildShaderProgram(ProgramSource const&src) noexcept {
 	OX_REQUIRE_M(program, buildShaderProgram(
 			src.vertShader,
 			src.fragShader,
@@ -98,11 +98,11 @@ ox::Result<GLProgram> buildShaderProgram(ProgramSource const &src) noexcept {
 }

 void setupShaderParams(
-		GLProgram const &shader,
-		ox::Vector<ShaderVarSet> const &vars,
+		GLProgram const&shader,
+		ox::Vector<ShaderVarSet> const&vars,
 		GLsizei vertexRowLen) noexcept {
 	// setup vars
-	for (size_t lenWritten = 0; auto const &v : vars) {
+	for (size_t lenWritten = 0; auto const&v : vars) {
 		auto const attr = static_cast<GLuint>(glGetAttribLocation(shader, v.name.c_str()));
 		glEnableVertexAttribArray(attr);
 		glVertexAttribPointer(
@@ -113,19 +113,19 @@ void setupShaderParams(
 	}
 }

-void setupShaderParams(GLProgram const &shader, ox::Vector<ShaderVarSet> const &vars) noexcept {
+void setupShaderParams(GLProgram const&shader, ox::Vector<ShaderVarSet> const&vars) noexcept {
 	// get row len
 	GLsizei vertexRowLen{};
-	for (auto const &v : vars) {
+	for (auto const&v : vars) {
 		vertexRowLen += v.len;
 	}
 	setupShaderParams(shader, vars, vertexRowLen);
 }

 ox::Result<GLProgram> buildShaderProgram(
-		ox::CStringView const &vert,
-		ox::CStringView const &frag,
-		ox::CStringView const &geo) noexcept {
+		ox::CStringView const&vert,
+		ox::CStringView const&frag,
+		ox::CStringView const&geo) noexcept {
 	GLProgram prgm(glCreateProgram());
 	OX_REQUIRE(vs, buildShader(GL_VERTEX_SHADER, vert.c_str(), "vshad"));
 	glAttachShader(prgm, vs);
@@ -162,30 +162,16 @@ FrameBuffer generateFrameBuffer(int width, int height) noexcept {
 	// color texture
 	glGenTextures(1, &fb.color.id);
 	glBindTexture(GL_TEXTURE_2D, fb.color);
-	glTexImage2D(
-		GL_TEXTURE_2D,
-		0,
-		GL_RGB,
-		width,
-		height,
-		0,
-		GL_RGB,
-		GL_UNSIGNED_BYTE,
-		nullptr);
+	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, width, height, 0, GL_RGB, GL_UNSIGNED_BYTE, nullptr);
 	glGenerateMipmap(GL_TEXTURE_2D);
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR_MIPMAP_LINEAR);
-	glFramebufferTexture2D(
-		GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, fb.color, 0);
+	glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, fb.color, 0);
 	// depth texture
 	glGenRenderbuffers(1, &fb.depth.id);
 	glBindRenderbuffer(GL_RENDERBUFFER, fb.depth);
 	glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH24_STENCIL8, width, height);
-	glFramebufferRenderbuffer(
-		GL_FRAMEBUFFER,
-		GL_DEPTH_STENCIL_ATTACHMENT,
-		GL_RENDERBUFFER,
-		fb.depth);
+	glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT, GL_RENDERBUFFER, fb.depth);
 	// verify FBO
 	oxAssert(glCheckFramebufferStatus(GL_FRAMEBUFFER) == GL_FRAMEBUFFER_COMPLETE, "Frame Buffer is incomplete");
 	// restore primary FB
@@ -203,16 +189,7 @@ void resizeFrameBuffer(FrameBuffer &fb, int width, int height) noexcept {
 	glBindFramebuffer(GL_FRAMEBUFFER, fb);
 	// color texture
 	glBindTexture(GL_TEXTURE_2D, fb.color);
-	glTexImage2D(
-		GL_TEXTURE_2D,
-		0,
-		GL_RGB,
-		width,
-		height,
-		0,
-		GL_RGB,
-		GL_UNSIGNED_BYTE,
-		nullptr);
+	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, width, height, 0, GL_RGB, GL_UNSIGNED_BYTE, nullptr);
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
 	// depth texture
@@ -224,7 +201,7 @@ void resizeFrameBuffer(FrameBuffer &fb, int width, int height) noexcept {
 	glBindRenderbuffer(GL_RENDERBUFFER, 0);
 }

-void resizeInitFrameBuffer(FrameBuffer &fb, int const width, int const height) noexcept {
+void resizeInitFrameBuffer(FrameBuffer &fb, int width, int height) noexcept {
 	if (!fb) {
 		fb = generateFrameBuffer(width, height);
 		return;
@@ -232,18 +209,18 @@ void resizeInitFrameBuffer(FrameBuffer &fb, int const width, int const height) n
 	resizeFrameBuffer(fb, width, height);
 }

-void resizeInitFrameBuffer(FrameBuffer &fb, ox::Size const &sz) noexcept {
+void resizeInitFrameBuffer(FrameBuffer &fb, ox::Size const&sz) noexcept {
 	resizeInitFrameBuffer(fb, sz.width, sz.height);
 }

-void sendVbo(BufferSet const &bs) noexcept {
-	auto const bufferSize = static_cast<GLsizeiptr>(sizeof(decltype(bs.vertices)::value_type) * bs.vertices.size());
+void sendVbo(BufferSet const&bs) noexcept {
+	const auto bufferSize = static_cast<GLsizeiptr>(sizeof(decltype(bs.vertices)::value_type) * bs.vertices.size());
 	glBindBuffer(GL_ARRAY_BUFFER, bs.vbo);
 	glBufferData(GL_ARRAY_BUFFER, bufferSize, bs.vertices.data(), GL_DYNAMIC_DRAW);
 }

-void sendEbo(BufferSet const &bs) noexcept {
-	auto const bufferSize = static_cast<GLsizeiptr>(sizeof(decltype(bs.elements)::value_type) * bs.elements.size());
+void sendEbo(BufferSet const&bs) noexcept {
+	const auto bufferSize = static_cast<GLsizeiptr>(sizeof(decltype(bs.elements)::value_type) * bs.elements.size());
 	glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, bs.ebo);
 	glBufferData(GL_ELEMENT_ARRAY_BUFFER, bufferSize, bs.elements.data(), GL_STATIC_DRAW);
 }
@@ -6,7 +6,7 @@ endif()
 # DrinkingTea: end

 add_library(
-	imgui
+	imgui OBJECT
 		imgui.cpp
 		imgui_demo.cpp
 		imgui_draw.cpp
@@ -19,12 +19,4 @@ add_library(
 target_include_directories(
 	imgui SYSTEM PUBLIC
 		.
-)
-
-install(
-	TARGETS
-		imgui
-	DESTINATION
-		LIBRARY DESTINATION lib
-		ARCHIVE DESTINATION lib
-)
+)
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.19)
+cmake_minimum_required(VERSION 3.5)
 project(nativefiledialog-extended VERSION 1.1.1)

 set(nfd_ROOT_PROJECT OFF)
@@ -0,0 +1,12 @@
+{
+	"log_functions": [
+		{
+			"function": "ox::trace::gdblogger::captureLogFunc",
+			"ignore_frames": 3,
+			"file_var": "file",
+			"line_var": "line",
+			"channel_var": "ch",
+			"msg_var": "msg"
+		}
+	]
+}
@@ -1,20 +0,0 @@
-name: Build
-run-name: ${{ gitea.actor }} build and test
-on: [push]
-
-jobs:
-  build:
-    runs-on: olympic
-    steps:
-      - name: Check out repository code
-        uses: actions/checkout@v3
-      - run: make purge configure-debug
-      - run: make build
-      - run: make test
-      - run: make purge configure-asan
-      - run: make build
-      - run: make test
-      - run: make purge configure-release
-      - run: make build
-      - run: make test
-      - run: make install
@@ -3,9 +3,7 @@ build/gba
 build/*-asan
 build/*-debug
 build/*-release
-.current_build
 tags
-compile_commands.json
 conanbuildinfo.cmake
 conanbuildinfo.txt
 conaninfo.txt
@@ -2,7 +2,7 @@
 source:
 - src
 copyright_notice: |-
-  Copyright 2015 - 2025 gary@drinkingtea.net
+  Copyright 2015 - 2024 gary@drinkingtea.net

  This Source Code Form is subject to the terms of the Mozilla Public
  License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -0,0 +1,11 @@
+language: cpp
+sudo: false
+dist: trusty
+compiler:
+   - clang
+   - gcc
+addons:
+    apt:
+        packages:
+            - cmake
+script: ./scripts/cibuild
@@ -3,8 +3,8 @@ set(CMAKE_POLICY_DEFAULT_CMP0110 NEW) # requires CMake 3.19

 project(Ox CXX)

-include(deps/buildcore/base.cmake)
-
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
+include(address_sanitizer)

 if(NOT DEFINED OX_RUN_TESTS)
 	set(OX_RUN_TESTS ON)
@@ -78,13 +78,6 @@ include_directories(src)

 install(FILES OxConfig.cmake DESTINATION lib/cmake/ox)

-install(
-    DIRECTORY
-        include/ox
-    DESTINATION
-        include
-)
-
 if(OX_USE_STDLIB)
 	set(JSONCPP_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/deps/jsoncpp/include")
 	add_subdirectory(deps/jsoncpp)
@@ -1,18 +1,68 @@
-BC_VAR_PROJECT_NAME=ox
-BC_VAR_PROJECT_NAME_CAP=Ox
-BC_VAR_DEVENV_ROOT=util
-BUILDCORE_PATH=deps/buildcore
-include ${BUILDCORE_PATH}/base.mk
+OS=$(shell uname | tr [:upper:] [:lower:])
+HOST_ENV=${OS}-$(shell uname -m)
+DEVENV=devenv$(shell pwd | sed 's/\//-/g')
+DEVENV_IMAGE=wombatant/devenv
+ifneq ($(shell which docker 2>&1),)
+	ifeq ($(shell docker inspect --format="{{.State.Status}}" ${DEVENV} 2>&1),running)
+		ENV_RUN=docker exec -i -t --user $(shell id -u ${USER}) ${DEVENV}
+	endif
+endif

-.PHONY: git-setup-buildcore-remote
-git-setup-buildcore-remote:
-	git remote add -f buildcore-master git@git.drinkingtea.net:drinkingtea/buildcore.git
+all:
+	${ENV_RUN} ./scripts/run-make build
+preinstall:
+	${ENV_RUN} ./scripts/run-make build preinstall
+install:
+	${ENV_RUN} ./scripts/run-make build install
+clean:
+	${ENV_RUN} ./scripts/run-make build clean
+purge:
+	${ENV_RUN} rm -rf build
+test:
+	${ENV_RUN} ./scripts/run-make build test

-.PHONY: git-pull-buildcore
-git-pull-buildcore:
-	git fetch buildcore-master master
-	git subtree pull --prefix deps/buildcore buildcore-master master --squash
+devenv:
+	docker pull ${DEVENV_IMAGE}
+	docker run -d -v $(shell pwd):/usr/src/project \
+		-e LOCAL_USER_ID=$(shell id -u ${USER}) \
+		--name ${DEVENV} -t ${DEVENV_IMAGE} bash
+devenv-destroy:
+	docker rm -f ${DEVENV}
+devenv-shell:
+	${ENV_RUN} bash

-.PHONY: git-push-buildcore
-git-push-buildcore:
-	git subtree push --prefix=deps/buildcore buildcore-master master
+configure-release:
+	${ENV_RUN} rm -rf build/${HOST_ENV}-release
+	${ENV_RUN} ./scripts/setup_build ${HOST_ENV}
+	${ENV_RUN} rm -f build/current
+	${ENV_RUN} ln -s ${HOST_ENV}-release build/current
+
+configure-debug:
+	${ENV_RUN} rm -rf build/${HOST_ENV}-debug
+	${ENV_RUN} ./scripts/setup_build ${HOST_ENV} debug
+	${ENV_RUN} rm -f build/current
+	${ENV_RUN} ln -s ${HOST_ENV}-debug build/current
+
+configure-asan:
+	${ENV_RUN} rm -rf build/${HOST_ENV}-asan
+	${ENV_RUN} ./scripts/setup_build ${HOST_ENV} asan
+	${ENV_RUN} rm -f build/current
+	${ENV_RUN} ln -s ${HOST_ENV}-asan build/current
+
+configure-windows:
+	${ENV_RUN} rm -rf build/windows
+	${ENV_RUN} ./scripts/setup_build windows
+	${ENV_RUN} rm -f build/current
+	${ENV_RUN} ln -s windows build/current
+
+configure-windows-debug:
+	${ENV_RUN} rm -rf build/windows
+	${ENV_RUN} ./scripts/setup_build windows debug
+	${ENV_RUN} rm -f build/current
+	${ENV_RUN} ln -s windows build/current
+
+configure-gba:
+	${ENV_RUN} rm -rf build/gba-release
+	${ENV_RUN} ./scripts/setup_build gba
+	${ENV_RUN} rm -f build/current
+	${ENV_RUN} ln -s gba-release build/current
@@ -0,0 +1,24 @@
+set(CMAKE_SYSTEM_NAME "Generic")
+
+set(DEVKITARM $ENV{DEVKITARM})
+
+if(NOT DEVKITARM)
+	message(FATAL_ERROR "DEVKITARM environment variable not set")
+endif()
+
+set(CMAKE_C_COMPILER ${DEVKITARM}/bin/arm-none-eabi-gcc)
+set(CMAKE_CXX_COMPILER ${DEVKITARM}/bin/arm-none-eabi-g++)
+set(CMAKE_FIND_ROOT_PATH ${DEVKITARM})
+set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+
+set(CMAKE_FIND_LIBRARY_PREFIXES lib)
+set(CMAKE_FIND_LIBRARY_SUFFIXES .a)
+
+set(LINKER_FLAGS "-specs=gba.specs")
+add_definitions (
+	-DARM7
+)
+
+include(FindPackageHandleStandardArgs)
@@ -0,0 +1,18 @@
+set(CMAKE_SYSTEM_NAME Windows)
+set(TOOLCHAIN_PREFIX x86_64-w64-mingw32)
+
+# cross compilers to use for C and C++
+set(CMAKE_C_COMPILER /usr/bin/${TOOLCHAIN_PREFIX}-gcc)
+set(CMAKE_CXX_COMPILER /usr/bin/${TOOLCHAIN_PREFIX}-g++)
+set(CMAKE_RC_COMPILER /usr/bin/${TOOLCHAIN_PREFIX}-windres)
+
+# target environment on the build host system
+#   set 1st to dir with the cross compiler's C/C++ headers/libs
+set(CMAKE_FIND_ROOT_PATH /usr/${TOOLCHAIN_PREFIX})
+
+# modify default behavior of FIND_XXX() commands to
+# search for headers/libs in the target environment and
+# search for programs in the build host environment
+set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
@@ -0,0 +1,52 @@
+# This file belongs Nick Overdijk, and is from https://github.com/NickNick/wubwubcmake
+# The MIT License (MIT)
+# 
+# Copyright (c) 2013 Nick Overdijk
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy of
+# this software and associated documentation files (the "Software"), to deal in
+# the Software without restriction, including without limitation the rights to
+# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+# the Software, and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.option(USE_ASAN "Enable Address Sanitizer, if your compiler supports it" ON)
+
+option(USE_ASAN "Enable Address Sanitizer, if your compiler supports it" OFF)
+if(USE_ASAN)
+	include(CheckCXXSourceCompiles)
+	# If the compiler understands -fsanitize=address, add it to the flags (gcc since 4.8 & clang since version 3.2)
+	set(CMAKE_REQUIRED_FLAGS_BAK "${CMAKE_REQUIRED_FLAGS}")
+	set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -fsanitize=address")
+	CHECK_CXX_SOURCE_COMPILES("int main() { return 0; }" FLAG_FSANA_SUPPORTED)
+	set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS_BAK}")
+
+	if(FLAG_FSANA_SUPPORTED)
+		set(asan_flag "-fsanitize=address")
+	else(FLAG_FSANA_SUPPORTED)
+		# Alternatively, try if it understands -faddress-sanitizer (clang until version 3.2)
+		set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -faddress-sanitizer")
+		CHECK_CXX_SOURCE_COMPILES("int main() { return 0; }" FLAG_FASAN_SUPPORTED)
+		set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS_BAK}")
+
+		if(FLAG_FASAN_SUPPORTED)
+			set(asan_flag "-faddress-sanitizer")
+		endif(FLAG_FASAN_SUPPORTED)
+	endif(FLAG_FSANA_SUPPORTED)
+
+	if(FLAG_FSANA_SUPPORTED OR FLAG_FASAN_SUPPORTED)
+		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${asan_flag}")
+		set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${asan_flag}")
+		set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${asan_flag}")
+		set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${asan_flag}")
+	endif()
+
+endif(USE_ASAN)
@@ -12,7 +12,7 @@
 # CMake versions greater than the JSONCPP_NEWEST_VALIDATED_POLICIES_VERSION policies will
 # continue to generate policy warnings "CMake Warning (dev)...Policy CMP0XXX is not set:"
 #
-set(JSONCPP_OLDEST_VALIDATED_POLICIES_VERSION "3.13.2")
+set(JSONCPP_OLDEST_VALIDATED_POLICIES_VERSION "3.8.0")
 set(JSONCPP_NEWEST_VALIDATED_POLICIES_VERSION "3.13.2")
 cmake_minimum_required(VERSION ${JSONCPP_OLDEST_VALIDATED_POLICIES_VERSION})
 if("${CMAKE_VERSION}" VERSION_LESS "${JSONCPP_NEWEST_VALIDATED_POLICIES_VERSION}")
@@ -28,7 +28,10 @@ All components have a platform indicator next to them:
 Ox provides ```ox::Error``` to report errors.
 ```ox::Error``` is a struct that has overloaded operators to behave like an
 integer error code, plus some extra fields to enhance debuggability.
-```ox::Error```s will also include the file and line of the error.
+If instantiated through the ```OxError(x)``` macro, it will also include the
+file and line of the error.
+The ```OxError(x)``` macro should only be used for the initial instantiation of
+an ```ox::Error```.

 In addition to ```ox::Error``` there is also the template ```ox::Result<T>```.
 ```ox::Result``` simply wraps the type T value in a struct that also includes
@@ -46,7 +49,7 @@ ox::Result<int> foo(int i) noexcept {
 	if (i < 10) {
 		return i + 1; // implicitly calls ox::Result<T>::Result(T)
 	}
-	return ox::Error(1); // implicitly calls ox::Result<T>::Result(ox::Error)
+	return OxError(1); // implicitly calls ox::Result<T>::Result(ox::Error)
 }

 int caller1() {
@@ -178,216 +181,6 @@ variant for creating a non-const value.

 * ```OX_REQUIRE_M``` - OX_REQUIRE Mutable

-### Ox String Types
-
-Ox has six different major string types.
-These types are divided into two categories: store types and view types.
-
-String stores maintain a copy of the string data, whereas view types only
-maintain a reference to the data.
-Views should be used where you otherwise might use a const reference to a
-string store type.
-
-Having all of these different string types may sound like an interoperability
-nightmare, but taking string view types extensively where applicable makes the
-imagined interoperability issues virtually non-existent.
-
-#### String Store Types
-
-##### String / BasicString
-
-```ox::String```, or really ```ox::BasicString```, is Ox's version of
-```std::string```.
-Like ```std::string```, ```String``` allocates to store the string data.
-Also like ```std::string```, ```String``` allows for small string
-optimization for strings under 8 bytes.
-Unlike ```std::string```, the template that ```String``` is based on,
-```BasicString```, takes a parameter that allows adjusting to different size
-small string buffers.
-```ox::String``` is an alias to ```ox::BasicString<8>```.
-
-```cpp
-// s can hold up to 100 bytes, plus one for a null terminator before allocating
-ox::BasicString<100> s;
-```
-Also unlike ```std::string```, ```ox::String``` has an explicit C-string conversion
-constructor.
-This prevents accidental instantiations of ```String```.
-
-Consider the following:
-
-```cpp
-void fStd(std::string const&);
-void fOx(ox::String const&);
-
-int main() {
-    // implicit and silent instantiation of std::string, which includes an
-    // allocation
-    fStd("123456789");
-    // Will fail to compile:
-    fOx("123456789");
-    // But explicit String instantiation will work:
-    fOx(ox::String{"123456789"});
-}
-```
-
-##### IString
-
-```IString```, or "inline string", is like ```BasicString```, but it will cut
-off strings that exceed that limit.
-
-```cpp
-ox::IString<5> s; // s can hold up to 5 characters, plus a null terminator
-s = "12345";      // valid
-s = "123456";     // will compile and run, but will get cut off at '5'
-```
-
-This is useful for certain string categories that have fixed lengths, like UUID
-strings or for numbers.
-
-Ox makes use of ```IString``` in the following ways:
-
-```cpp
-using UUIDStr = ox::IString<36>;
-
-// and
-
-template<Integer_c Integer>
-[[nodiscard]]
-constexpr auto intToStr(Integer v) noexcept {
-	constexpr auto Cap = [] {
-		auto out = 0;
-		switch (sizeof(Integer)) {
-			case 1:
-				out = 3;
-				break;
-			case 2:
-				out = 5;
-				break;
-			case 4:
-				out = 10;
-				break;
-			case 8:
-				out = 21;
-				break;
-		}
-		return out + ox::is_signed_v<Integer>;
-	}();
-	ox::IString<Cap> out;
-	std::ignore = out.resize(out.cap());
-	ox::CharBuffWriter w{{out.data(), out.cap()}};
-	std::ignore = writeItoa(v, w);
-	std::ignore = out.resize(w.tellp());
-	return out;
-}
-```
-
-##### StringParam
-
-```StringParam``` is a weird type.
-Because ```String::String(const char*)``` is explicit, it becomes a pain for
-functions to take ```String```s.
-
-```cpp
-struct Type {
-    ox::String m_s;
-    explicit Type(ox::String p): m_s(std::move(p)) {
-    }
-};
-
-void f() {
-    ox::String s{"asdf"};
-    Type t1{"asdf"};             // invalid - will not compile
-    Type t2{s};                  // invalid - will not compile
-    Type t3{std::move(s)};       // valid
-    Type t4{ox::String{"asdf"}}; // valid
-}
-```
-
-```StringParam``` has implicit conversion constructors, and will appropriately
-move from r-value ```String```s or create a ```String``` if not passed
-ownership of an existing ```String```.
-Think of ```StringParam``` as a way to opt-in to implicit instantiation with
-strings.
-
-```StringParam``` can access the string as a view through the ```view()```
-function, and the ```String``` inside can be accessed by moving from the
-```StringParam```.
-
-```cpp
-struct Type {
-    ox::String m_s;
-    explicit Type(ox::StringParam p): m_s(std::move(p)) {
-    }
-};
-
-void f() {
-    ox::String s{"asdf"};
-    Type t1{"asdf"};             // valid
-    Type t2{s};                  // valid
-    Type t3{std::move(s)};       // valid
-    Type t4{ox::String{"asdf"}}; // valid
-}
-```
-
-#### String View Types
-
-##### StringView
-
-```ox::StringView``` is Ox's version of ```std::string_view```.
-```StringView``` contains a pointer to a string, along with its size.
-
-This should be the normal type taken when a function needs a string that will
-exist until it returns.
-
-##### CStringView
-
-```CStringView``` is like ```StringView```, but it comes with the promise that
-the string ends with a null terminator.
-Accordingly, it has a ```c_str()``` function in addition to the ```data()```
-function that ```StringView``` has.
-
-```CStringView``` should be used when wrapping a C API that only takes C
-strings.
-
-##### StringLiteral
-
-```StringLiteral``` is a string view type, but it kind of straddles the line
-between view and store types.
-Creating a ```StringLiteral``` is a promise that you are passing a string
-literal into the constructor.
-This means you can treat it like a store, that can be safely used as a copy of
-the data.
-Functions that take ```StringLiteral```s are allowed to assume that the data
-will have no lifetime concerns and hold onto it without any need to make a
-copy.
-It has a consteval constructor to enforce the promise that it is a compile time
-string.
-
-```cpp
-void f(ox::StringLiteral const&);
-
-int main() {
-    f("123456789");                     // valid
-    f(ox::String{"123456789"}.c_str()); // invalid - will not compile
-}
-```
-
-#### Other Variants
-
-There are a few convenience aliases as well.
-
-* StringCR = String const&
-* StringViewCR = StringView const&
-* CStringViewCR = CStringView const&
-* CString = const char*
-
-String views do not generally need const references, but it does make debugging
-easier, as we can skip the constructor call if a string view already exists.
-
-These kind of aliases probably should not exist for most types, but strings are
-fundamental and ease of use is desirable.
-
 ### Logging and Output

 Ox provides for logging and debug prints via the ```oxTrace```, ```oxDebug```, and ```oxError``` macros.
@@ -0,0 +1,8 @@
+#! /usr/bin/env bash
+
+set -e
+
+make -j release 
+make -j debug 
+make -j
+make -j test
@@ -0,0 +1,8 @@
+#! /usr/bin/env bash
+
+set -e
+
+for f in $(find $1 -maxdepth 1 -mindepth 1 -type d)
+do
+	cmake --build "$f" --target $2 --
+done
@@ -0,0 +1,34 @@
+#! /usr/bin/env bash
+
+set -e
+
+project=$(pwd)/
+
+TARGET=$1
+BUILD_TYPE=$2
+
+if [[ $TARGET == windows ]]; then
+	toolchain="-DCMAKE_TOOLCHAIN_FILE=cmake/modules/Mingw.cmake"
+elif [[ $TARGET == gba ]]; then
+	toolchain="-DCMAKE_TOOLCHAIN_FILE=cmake/modules/GBA.cmake -DOX_USE_STDLIB=OFF -DCMAKE_INSTALL_PREFIX=$DEVKITARM"
+fi
+
+if [[ $BUILD_TYPE == asan ]]; then
+	buildTypeArgs="-DUSE_ASAN=ON -DCMAKE_BUILD_TYPE=Debug"
+	buildDir="build/${TARGET}-asan"
+elif [[ $BUILD_TYPE == debug ]]; then
+	buildTypeArgs="-DCMAKE_BUILD_TYPE=Debug"
+	buildDir="build/${TARGET}-debug"
+else
+	buildTypeArgs="-DCMAKE_BUILD_TYPE=Release"
+	buildDir="build/${TARGET}-release"
+fi
+
+mkdir -p $buildDir
+pushd $buildDir
+cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
+      -GNinja \
+      $buildTypeArgs \
+		$toolchain \
+		$project
+popd
@@ -1,27 +1 @@
-if(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
-	set(OX_OS_WINDOWS TRUE)
-endif()
-if(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
-	set(OX_OS_FREEBSD TRUE)
-else()
-	set(OX_OS_FREEBSD FALSE)
-endif()
-
-if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
-	set(OX_OS_LINUX TRUE)
-else()
-	set(OX_OS_LINUX FALSE)
-endif()
-
-if(OX_USE_STDLIB)
-	add_subdirectory(oc)
-endif()
-add_subdirectory(clargs)
-add_subdirectory(claw)
-add_subdirectory(event)
-add_subdirectory(fs)
-add_subdirectory(logconn)
-add_subdirectory(mc)
-add_subdirectory(model)
-add_subdirectory(preloader)
-add_subdirectory(std)
+add_subdirectory(ox)
@@ -1,51 +0,0 @@
-add_library(
-	OxEvent
-		src/signal.cpp
-)
-
-if(NOT MSVC)
-    target_compile_options(OxEvent PRIVATE -Wsign-conversion)
-    target_compile_options(OxEvent PRIVATE -Wconversion)
-endif()
-
-if(NOT OX_BARE_METAL)
-	set_property(
-		TARGET
-			OxEvent
-		PROPERTY
-			POSITION_INDEPENDENT_CODE ON
-	)
-endif()
-
-target_compile_definitions(
-	OxEvent PUBLIC
-		$<$<BOOL:${OX_USE_STDLIB}>:OX_USE_STDLIB>
-		$<$<BOOL:${OX_NODEBUG}>:OX_NODEBUG>
-)
-
-target_link_libraries(
-	OxEvent PUBLIC
-		OxStd
-)
-
-target_include_directories(
-	OxEvent PUBLIC
-		include
-)
-
-install(
-	DIRECTORY
-		include/ox
-	DESTINATION
-		include
-)
-
-install(
-	TARGETS OxEvent
-	LIBRARY DESTINATION lib
-	ARCHIVE DESTINATION lib
-)
-
-if(OX_RUN_TESTS)
-    add_subdirectory(test)
-endif()
@@ -1,122 +0,0 @@
-/*
- * Copyright 2015 - 2025 gary@drinkingtea.net
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-#pragma once
-
-#include <ox/std/array.hpp>
-#include <ox/std/bit.hpp>
-#include <ox/std/error.hpp>
-#include <ox/std/span.hpp>
-#include <ox/std/types.hpp>
-#include <ox/std/reader.hpp>
-
-#include "err.hpp"
-
-namespace ox {
-
-template<Reader_c Reader>
-class FieldBitmapReader {
-	protected:
-		mutable size_t m_mapBlockIdx = ~size_t{};
-		mutable uint64_t m_mapBlock{};
-		size_t m_mapStart{};
-		Reader &m_reader;
-
-	public:
-		explicit constexpr FieldBitmapReader(Reader &reader) noexcept:
-			m_mapStart(reader.tellg()),
-			m_reader(reader) {
-		}
-
-		constexpr Result<bool> get(size_t idx) const noexcept {
-			constexpr auto blockBits = sizeof(m_mapBlock);
-			auto const blockIdx = idx / blockBits;
-			if (m_mapBlockIdx != blockIdx) [[unlikely]] {
-				OX_RETURN_ERROR(loadMapBlock(blockIdx));
-			}
-			idx %= blockBits;
-			return (m_mapBlock >> idx) & 1;
-		}
-
-	private:
-		constexpr Error loadMapBlock(size_t const idx) const noexcept {
-			OX_REQUIRE(g, m_reader.tellg());
-			OX_RETURN_ERROR(m_reader.seekg(static_cast<int>(m_mapStart + idx), ox::ios_base::beg));
-			Array<char, sizeof(m_mapBlock)> mapBlock{};
-			OX_RETURN_ERROR(m_reader.read(mapBlock.data(), sizeof(m_mapBlock)));
-			// Warning: narrow-conv
-			OX_RETURN_ERROR(m_reader.seekg(static_cast<int>(g), ox::ios_base::beg));
-			m_mapBlock = 0;
-			for (uint64_t i{}; auto b : mapBlock) {
-				m_mapBlock |= static_cast<uint64_t>(std::bit_cast<uint8_t>(b)) << i;
-				i += 8;
-			}
-			m_mapBlockIdx = idx;
-			return {};
-		}
-
-};
-
-
-class FieldBitmapWriter {
-	protected:
-		Span<char> m_map;
-		size_t m_mapLen{};
-
-	public:
-		explicit constexpr FieldBitmapWriter(Span<char> const &map) noexcept:
-			m_map(map),
-			m_mapLen(m_map.size()) {
-		}
-
-		constexpr auto setBuffer(Span<char> const &map) noexcept {
-			m_map = map;
-			m_mapLen = map.size();
-		}
-
-		constexpr Result<bool> get(size_t const i) const noexcept {
-			if (i / 8 < m_mapLen) {
-				return (std::bit_cast<uint8_t>(m_map[i / 8]) >> (i % 8)) & 1;
-			}
-			return Error{McPresenceMapOverflow};
-		}
-
-		constexpr Error setFields(int const fields) noexcept {
-			m_mapLen = static_cast<size_t>((fields / 8 + 1) - (fields % 8 == 0));
-			if (m_mapLen > m_map.size()) [[unlikely]] {
-				return Error{McPresenceMapOverflow};
-			}
-			return {};
-		}
-
-		constexpr void setMaxLen(int const maxLen) noexcept {
-			m_mapLen = static_cast<size_t>(maxLen);
-		}
-
-		constexpr int64_t getMaxLen() const noexcept {
-			return static_cast<int64_t>(m_mapLen);
-		}
-
-		constexpr Error set(size_t const i, bool const on) noexcept {
-			if (i / 8 < m_mapLen) {
-				char &actual = m_map[i / 8];
-				uint8_t v = std::bit_cast<uint8_t>(actual);
-				if (on) {
-					v |= 1 << (i % 8);
-				} else {
-					v &= ~static_cast<uint8_t>(1 << (i % 8));
-				}
-				actual = std::bit_cast<char>(v);
-				return {};
-			}
-			return Error{McPresenceMapOverflow};
-		}
-
-};
-
-}
@@ -1,401 +0,0 @@
-/*
- * Copyright 2015 - 2025 gary@drinkingtea.net
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-#pragma once
-
-#include <ox/model/fieldcounter.hpp>
-#include <ox/model/modelhandleradaptor.hpp>
-#include <ox/model/optype.hpp>
-#include <ox/model/types.hpp>
-#include <ox/std/bit.hpp>
-#include <ox/std/buffer.hpp>
-#include <ox/std/byteswap.hpp>
-#include <ox/std/hashmap.hpp>
-#include <ox/std/optional.hpp>
-#include <ox/std/string.hpp>
-#include <ox/std/types.hpp>
-#include <ox/std/units.hpp>
-
-#include "intops.hpp"
-#include "err.hpp"
-#include "presenceindicator.hpp"
-#include "types.hpp"
-
-namespace ox {
-
-template<Writer_c Writer>
-class MetalClawWriter: public ModelHandlerBase<MetalClawWriter<Writer>, OpType::Write> {
-
-	private:
-		Vector<char, 16> m_presenceMapBuff{};
-		FieldBitmapWriter m_fieldPresence{m_presenceMapBuff};
-		int m_field{};
-		Optional<int> m_unionIdx;
-		size_t m_writerBeginP{};
-		Writer &m_writer;
-
-	public:
-		constexpr explicit MetalClawWriter(Writer &writer, Optional<int> const &unionIdx = {}) noexcept;
-
-		constexpr ~MetalClawWriter() noexcept = default;
-
-		constexpr Error field(CString, int8_t const *val) noexcept;
-		constexpr Error field(CString, int16_t const *val) noexcept;
-		constexpr Error field(CString, int32_t const *val) noexcept;
-		constexpr Error field(CString, int64_t const *val) noexcept;
-
-		constexpr Error field(CString, uint8_t const *val) noexcept;
-		constexpr Error field(CString, uint16_t const *val) noexcept;
-		constexpr Error field(CString, uint32_t const *val) noexcept;
-		constexpr Error field(CString, uint64_t const *val) noexcept;
-
-		constexpr Error field(CString, bool const *val) noexcept;
-
-		template<typename T>
-		constexpr Error field(CString, T const *val, size_t len) noexcept;
-
-		template<typename T>
-		constexpr Error field(CString name, HashMap<String, T> const *val) noexcept;
-
-		template<size_t SmallStringSize>
-		constexpr Error field(CString, BasicString<SmallStringSize> const *val) noexcept;
-
-		template<size_t L>
-		constexpr Error field(CString, IString<L> const *val) noexcept;
-
-		constexpr Error fieldCString(CString name, CString const*val, size_t buffLen) noexcept;
-
-		constexpr Error fieldCString(CString name, CString *val) noexcept;
-
-		constexpr Error fieldCString(CString name, CString const*val) noexcept;
-
-		constexpr Error fieldCString(CString name, CString val, size_t strLen) noexcept;
-
-		template<typename T>
-		constexpr Error field(CString, T const *val) noexcept;
-
-		template<typename U, bool force = false>
-		constexpr Error field(CString, UnionView<U, force> val) noexcept;
-
-		template<typename T = std::nullptr_t>
-		constexpr Error setTypeInfo(
-				CString name = T::TypeName,
-				int version = T::TypeVersion,
-		        Vector<String> const& = {},
-				size_t fields = ModelFieldCount_v<T>) noexcept;
-
-		/**
-		 * stringLength is not implemented in MetalClawWriter
-		 */
-		[[nodiscard]]
-		constexpr auto stringLength(CString) noexcept {
-			return 0;
-		}
-
-		/**
-		 * stringLength is not implemented in MetalClawWriter
-		 */
-		[[nodiscard]]
-		constexpr auto arrayLength(CString, bool = true) noexcept {
-			return 0;
-		}
-
-		constexpr Error finalize() noexcept;
-
-	private:
-		constexpr Error appendInteger(Integer_c auto val) noexcept {
-			bool fieldSet = false;
-			if (val && (!m_unionIdx.has_value() || *m_unionIdx == m_field)) {
-				auto mi = mc::encodeInteger(val);
-				OX_RETURN_ERROR(m_writer.write(reinterpret_cast<CString>(mi.data.data()), mi.length));
-				fieldSet = true;
-			}
-			OX_RETURN_ERROR(m_fieldPresence.set(static_cast<size_t>(m_field), fieldSet));
-			++m_field;
-			return {};
-		}
-
-};
-
-extern template class ModelHandlerInterface<MetalClawWriter<BufferWriter>>;
-extern template class ModelHandlerInterface<MetalClawWriter<CharBuffWriter>>;
-
-template<Writer_c Writer>
-constexpr MetalClawWriter<Writer>::MetalClawWriter(Writer &writer, Optional<int> const &unionIdx) noexcept:
-	m_unionIdx(unionIdx),
-	m_writerBeginP(writer.tellp()),
-	m_writer(writer) {
-}
-
-template<Writer_c Writer>
-constexpr Error MetalClawWriter<Writer>::field(CString, int8_t const *val) noexcept {
-	return appendInteger(*val);
-}
-
-template<Writer_c Writer>
-constexpr Error MetalClawWriter<Writer>::field(CString, int16_t const *val) noexcept {
-	return appendInteger(*val);
-}
-
-template<Writer_c Writer>
-constexpr Error MetalClawWriter<Writer>::field(CString, int32_t const *val) noexcept {
-	return appendInteger(*val);
-}
-
-template<Writer_c Writer>
-constexpr Error MetalClawWriter<Writer>::field(CString, int64_t const *val) noexcept {
-	return appendInteger(*val);
-}
-
-template<Writer_c Writer>
-constexpr Error MetalClawWriter<Writer>::field(CString, uint8_t const *val) noexcept {
-	return appendInteger(*val);
-}
-
-template<Writer_c Writer>
-constexpr Error MetalClawWriter<Writer>::field(CString, uint16_t const *val) noexcept {
-	return appendInteger(*val);
-}
-
-template<Writer_c Writer>
-constexpr Error MetalClawWriter<Writer>::field(CString, uint32_t const *val) noexcept {
-	return appendInteger(*val);
-}
-
-template<Writer_c Writer>
-constexpr Error MetalClawWriter<Writer>::field(CString, uint64_t const *val) noexcept {
-	return appendInteger(*val);
-}
-
-template<Writer_c Writer>
-constexpr Error MetalClawWriter<Writer>::field(CString, bool const *val) noexcept {
-	if (!m_unionIdx.has_value() || *m_unionIdx == m_field) {
-		OX_RETURN_ERROR(m_fieldPresence.set(static_cast<size_t>(m_field), *val));
-	}
-	++m_field;
-	return {};
-}
-
-template<Writer_c Writer>
-template<size_t SmallStringSize>
-constexpr Error MetalClawWriter<Writer>::field(CString, BasicString<SmallStringSize> const *val) noexcept {
-	bool fieldSet = false;
-	if (val->size() && (!m_unionIdx.has_value() || *m_unionIdx == m_field)) {
-		// write the length
-		auto const strLen = mc::encodeInteger(val->size());
-		OX_RETURN_ERROR(m_writer.write(reinterpret_cast<CString>(strLen.data.data()), strLen.length));
-		// write the string
-		OX_RETURN_ERROR(m_writer.write(val->c_str(), static_cast<size_t>(val->size())));
-		fieldSet = true;
-	}
-	OX_RETURN_ERROR(m_fieldPresence.set(static_cast<size_t>(m_field), fieldSet));
-	++m_field;
-	return {};
-}
-
-template<Writer_c Writer>
-template<size_t L>
-constexpr Error MetalClawWriter<Writer>::field(CString name, IString<L> const *val) noexcept {
-	return fieldCString(name, val->data(), val->size());
-}
-
-template<Writer_c Writer>
-constexpr Error MetalClawWriter<Writer>::fieldCString(CString, CString const *val, size_t) noexcept {
-	bool fieldSet = false;
-	if (!m_unionIdx.has_value() || *m_unionIdx == m_field) {
-		OX_ALLOW_UNSAFE_BUFFERS_BEGIN
-		// this strlen is tolerated because sometimes 0 gets passed to
-		// the size param, which is a lie
-		// this code should be cleaned up at some point...
-		auto const strLen = *val ? ox::strlen(*val) : 0;
-		OX_ALLOW_UNSAFE_BUFFERS_END
-		// write the length
-		auto const strLenBuff = mc::encodeInteger(strLen);
-		OX_RETURN_ERROR(m_writer.write(reinterpret_cast<CString>(strLenBuff.data.data()), strLenBuff.length));
-		// write the string
-		OX_RETURN_ERROR(m_writer.write(*val, static_cast<size_t>(strLen)));
-		fieldSet = true;
-	}
-	OX_RETURN_ERROR(m_fieldPresence.set(static_cast<size_t>(m_field), fieldSet));
-	++m_field;
-	return {};
-}
-
-template<Writer_c Writer>
-constexpr Error MetalClawWriter<Writer>::fieldCString(CString const name, CString *val) noexcept {
-	return fieldCString(name, val, {});
-}
-
-template<Writer_c Writer>
-constexpr Error MetalClawWriter<Writer>::fieldCString(CString const name, CString const *val) noexcept {
-	return fieldCString(name, val, {});
-}
-
-template<Writer_c Writer>
-constexpr Error MetalClawWriter<Writer>::fieldCString(CString, CString const val, size_t const strLen) noexcept {
-	bool fieldSet = false;
-	if (strLen && (!m_unionIdx.has_value() || *m_unionIdx == m_field)) {
-		// write the length
-		auto const strLenBuff = mc::encodeInteger(strLen);
-		OX_RETURN_ERROR(m_writer.write(reinterpret_cast<CString>(strLenBuff.data.data()), strLenBuff.length));
-		// write the string
-		OX_RETURN_ERROR(m_writer.write(val, static_cast<size_t>(strLen)));
-		fieldSet = true;
-	}
-	OX_RETURN_ERROR(m_fieldPresence.set(static_cast<size_t>(m_field), fieldSet));
-	++m_field;
-	return {};
-}
-
-template<Writer_c Writer>
-template<typename T>
-constexpr Error MetalClawWriter<Writer>::field(CString, T const *val) noexcept {
-	if constexpr(isVector_v<T> || isArray_v<T>) {
-		return field(nullptr, val->data(), val->size());
-	} else {
-		bool fieldSet = false;
-		if (val && (!m_unionIdx.has_value() || *m_unionIdx == m_field)) {
-			auto const writeIdx = m_writer.tellp();
-			MetalClawWriter writer(m_writer);
-			OX_RETURN_ERROR(model(writer.interface(), val));
-			OX_RETURN_ERROR(writer.finalize());
-			fieldSet = writeIdx != m_writer.tellp();
-		}
-		OX_RETURN_ERROR(m_fieldPresence.set(static_cast<size_t>(m_field), fieldSet));
-		++m_field;
-		return {};
-	}
-}
-
-template<Writer_c Writer>
-template<typename U, bool force>
-constexpr Error MetalClawWriter<Writer>::field(CString, UnionView<U, force> val) noexcept {
-	bool fieldSet = false;
-	if (val.get() && (!m_unionIdx.has_value() || *m_unionIdx == m_field)) {
-		auto const writeIdx = m_writer.tellp();
-		MetalClawWriter writer(m_writer, Optional<int>(in_place, val.idx()));
-		OX_RETURN_ERROR(model(writer.interface(), val.get()));
-		OX_RETURN_ERROR(writer.finalize());
-		fieldSet = writeIdx != m_writer.tellp();
-	}
-	OX_RETURN_ERROR(m_fieldPresence.set(static_cast<size_t>(m_field), fieldSet));
-	++m_field;
-	return {};
-}
-
-template<Writer_c Writer>
-template<typename T>
-constexpr Error MetalClawWriter<Writer>::field(CString, T const *val, size_t const len) noexcept {
-	bool fieldSet = false;
-	if (len && (!m_unionIdx.has_value() || *m_unionIdx == m_field)) {
-		// write the length
-		auto const arrLen = mc::encodeInteger(len);
-		OX_RETURN_ERROR(m_writer.write(reinterpret_cast<CString>(arrLen.data.data()), arrLen.length));
-		auto const writeIdx = m_writer.tellp();
-		MetalClawWriter writer(m_writer);
-		OX_RETURN_ERROR(writer.interface()->template setTypeInfo<T>("List", 0, {}, static_cast<size_t>(len)));
-		// write the array
-		for (size_t i{}; i < len; ++i) {
-OX_ALLOW_UNSAFE_BUFFERS_BEGIN
-			OX_RETURN_ERROR(writer.interface()->field("", &val[i]));
-OX_ALLOW_UNSAFE_BUFFERS_END
-		}
-		OX_RETURN_ERROR(writer.finalize());
-		fieldSet = writeIdx != m_writer.tellp();
-	}
-	OX_RETURN_ERROR(m_fieldPresence.set(static_cast<size_t>(m_field), fieldSet));
-	++m_field;
-	return {};
-}
-
-template<Writer_c Writer>
-template<typename T>
-constexpr Error MetalClawWriter<Writer>::field(CString, HashMap<String, T> const *val) noexcept {
-	auto const &keys = val->keys();
-	auto const len = keys.size();
-	bool fieldSet = false;
-	if (len && (!m_unionIdx.has_value() || *m_unionIdx == m_field)) {
-		// write the length
-		auto const arrLen = mc::encodeInteger(len);
-		OX_RETURN_ERROR(m_writer.write(reinterpret_cast<CString>(arrLen.data.data()), arrLen.length));
-		// write map
-		MetalClawWriter writer(m_writer);
-		// double len for both key and value
-		OX_RETURN_ERROR(writer.interface()->setTypeInfo("Map", 0, {}, len * 2));
-		// this loop body needs to be in a lambda because of the potential alloca call
-		constexpr auto loopBody = [](auto &handler, auto const &key, auto const &val) -> Error {
-			auto const keyLen = key.size();
-			auto wkey = ox_malloca(keyLen + 1, char, 0);
-			memcpy(wkey.get(), key.c_str(), keyLen + 1);
-			OX_RETURN_ERROR(handler.fieldCString("", wkey.get(), keyLen));
-			OX_REQUIRE_M(value, val.at(key));
-			return handler.field("", value);
-		};
-		// write the array
-		for (size_t i{}; i < len; ++i) {
-			auto const &key = keys[i];
-			OX_RETURN_ERROR(loopBody(*writer.interface(), key, *val));
-		}
-		OX_RETURN_ERROR(writer.finalize());
-		fieldSet = true;
-	}
-	OX_RETURN_ERROR(m_fieldPresence.set(static_cast<size_t>(m_field), fieldSet));
-	++m_field;
-	return {};
-}
-
-template<Writer_c Writer>
-template<typename T>
-constexpr Error MetalClawWriter<Writer>::setTypeInfo(
-		CString,
-		int,
-		Vector<String> const&,
-		size_t const fields) noexcept {
-	auto const fieldPresenceLen = (fields - 1) / 8 + 1;
-	OX_RETURN_ERROR(m_writer.write(nullptr, fieldPresenceLen));
-	m_presenceMapBuff.resize(fieldPresenceLen);
-	m_fieldPresence.setBuffer(m_presenceMapBuff);
-	return m_fieldPresence.setFields(static_cast<int>(fields));
-}
-
-template<Writer_c Writer>
-constexpr Error MetalClawWriter<Writer>::finalize() noexcept {
-	auto const end = m_writer.tellp();
-	OX_RETURN_ERROR(m_writer.seekp(m_writerBeginP));
-	OX_RETURN_ERROR(m_writer.write(
-		m_presenceMapBuff.data(),
-		m_presenceMapBuff.size()));
-	OX_RETURN_ERROR(m_writer.seekp(end));
-	return {};
-}
-
-Result<Buffer> writeMC(Writer_c auto &writer, auto const &val) noexcept {
-	MetalClawWriter mcWriter(writer);
-	OX_RETURN_ERROR(model(mcWriter.interface(), &val));
-	OX_RETURN_ERROR(mcWriter.finalize());
-	return {};
-}
-
-Result<Buffer> writeMC(auto const &val, size_t const buffReserveSz = 2 * units::KB) noexcept {
-	Buffer buff(buffReserveSz);
-	BufferWriter bw(&buff, 0);
-	OX_RETURN_ERROR(writeMC(bw, val));
-	buff.resize(bw.tellp());
-	return buff;
-}
-
-Error writeMC(char *buff, size_t const buffLen, auto const &val, size_t *sizeOut = nullptr) noexcept {
-	CharBuffWriter bw{{buff, buffLen}};
-	OX_RETURN_ERROR(writeMC(bw, val));
-	if (sizeOut) {
-		*sizeOut = bw.tellp();
-	}
-	return {};
-}
-
-}
@@ -1,45 +0,0 @@
-add_library(
-	OxModel
-		src/desctypes.cpp
-		src/descwrite.cpp
-		src/modelvalue.cpp
-)
-
-if(NOT MSVC)
-	target_compile_options(OxModel PRIVATE -Wconversion)
-	target_compile_options(OxModel PRIVATE -Wsign-conversion)
-endif()
-
-target_link_libraries(
-	OxModel PUBLIC
-		OxStd
-)
-
-if(NOT OX_BARE_METAL)
-	set_property(
-		TARGET
-			OxModel
-		PROPERTY
-			POSITION_INDEPENDENT_CODE ON
-	)
-endif()
-
-target_link_libraries(
-	OxModel PUBLIC
-		OxStd
-)
-
-target_include_directories(
-	OxModel PUBLIC
-		include
-)
-
-install(
-	TARGETS OxModel
-	LIBRARY DESTINATION lib
-	ARCHIVE DESTINATION lib
-)
-
-if(OX_RUN_TESTS)
-	add_subdirectory(test)
-endif()
@@ -1,7 +0,0 @@
-<Type>      : <TypeName><FieldList>
-<FieldList> : <FieldList> | <FieldList><Field>
-<Field>     : <FieldType><TypeID><FieldName>
-<TypeID>    : <TypeName> | <TypeName><Type>
-<TypeName>  : <string>
-<FieldType> : <0: single> | <1: list>
-<FieldName> : <string>
@@ -1,243 +0,0 @@
-/*
- * Copyright 2015 - 2025 gary@drinkingtea.net
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-#pragma once
-
-#include <ox/std/utility.hpp>
-
-#include "modelvalue.hpp"
-
-namespace ox {
-
-template<typename Handler, OpType opType_v = Handler::opType()>
-class ModelHandlerInterface {
-	private:
-		Handler &m_handler;
-
-	public:
-		constexpr explicit ModelHandlerInterface(Handler &handler) noexcept: m_handler(handler) {
-		}
-
-		template<typename T = std::nullptr_t>
-		constexpr ox::Error setTypeInfo(
-			CString name = T::TypeName,
-			int version = T::TypeVersion,
-			Vector<String> const &typeParams = {}) noexcept {
-			return m_handler.template setTypeInfo<T>(name, version, typeParams, ModelFieldCount_v<T>);
-		}
-
-		template<typename T = std::nullptr_t>
-		constexpr ox::Error setTypeInfo(
-			CString name,
-			int version,
-			Vector<String> const &typeParams,
-			size_t fields) noexcept {
-			return m_handler.template setTypeInfo<T>(name, version, typeParams, fields);
-		}
-
-		template<size_t len>
-		constexpr Error fieldCString(CString name, char val[len]) noexcept {
-			return m_handler.fieldCString(name, &val[0], len);
-		}
-
-		template<size_t len>
-		constexpr Error fieldCString(CString name, char const val[len]) noexcept requires(opType_v != OpType::Read) {
-			if constexpr(opType_v != OpType::Read) {
-				return m_handler.fieldCString(name, &val[0], len);
-			} else {
-				return {};
-			}
-		}
-
-		constexpr Error fieldCString(CString name, char **val) noexcept {
-			return m_handler.fieldCString(name, val);
-		}
-
-		constexpr Error fieldCString(CString name, char const *const*val) noexcept requires(opType_v != OpType::Read) {
-			// this check looks pointless, but it's to address a Clang bug
-			if constexpr(opType_v != OpType::Read) {
-				return m_handler.fieldCString(name, val);
-			} else {
-				return {};
-			}
-		}
-
-		constexpr Error fieldCString(CString name, char const **val) noexcept requires(opType_v != OpType::Read) {
-			// this check looks pointless, but it's to address a Clang bug
-			if constexpr(opType_v != OpType::Read) {
-				return m_handler.fieldCString(name, val);
-			} else {
-				return {};
-			}
-		}
-
-		constexpr Error fieldCString(CString name, char **val, size_t buffLen) noexcept {
-			return m_handler.fieldCString(name, val, buffLen);
-		}
-
-		constexpr Error fieldCString(CString name, char const **val, size_t buffLen) noexcept requires(opType_v != OpType::Read) {
-			// this check looks pointless, but it's to address a Clang bug
-			if constexpr(opType_v != OpType::Read) {
-				return m_handler.fieldCString(name, val, buffLen);
-			} else {
-				return {};
-			}
-		}
-
-		constexpr Error fieldCString(CString name, char *val, size_t buffLen) noexcept {
-			return m_handler.fieldCString(name, val, buffLen);
-		}
-
-		constexpr Error fieldModelValue(char const *name, CommonPtrWith<ModelValue> auto *v) noexcept {
-			switch (v->type()) {
-				case ModelValue::Type::Undefined:
-					break;
-				case ModelValue::Type::Bool:
-					return m_handler.field(name, &v->template get<bool>());
-				case ModelValue::Type::UnsignedInteger8:
-					return m_handler.field(name, &v->template get<uint8_t>());
-				case ModelValue::Type::UnsignedInteger16:
-					return m_handler.field(name, &v->template get<uint16_t>());
-				case ModelValue::Type::UnsignedInteger32:
-					return m_handler.field(name, &v->template get<uint32_t>());
-				case ModelValue::Type::UnsignedInteger64:
-					return m_handler.field(name, &v->template get<uint64_t>());
-				case ModelValue::Type::SignedInteger8:
-					return m_handler.field(name, &v->template get<int8_t>());
-				case ModelValue::Type::SignedInteger16:
-					return m_handler.field(name, &v->template get<int16_t>());
-				case ModelValue::Type::SignedInteger32:
-					return m_handler.field(name, &v->template get<int32_t>());
-				case ModelValue::Type::SignedInteger64:
-					return m_handler.field(name, &v->template get<int64_t>());
-				case ModelValue::Type::String:
-					return m_handler.field(name, &v->template get<String>());
-				case ModelValue::Type::Object:
-					return m_handler.field(name, &v->template get<ModelObject>());
-				case ModelValue::Type::Union:
-				{
-					auto &u = v->template get<ModelUnion>();
-					if constexpr(opType_v == OpType::Read) {
-						u.setActiveField(whichFieldPresent(m_handler, name, u));
-						return m_handler.field(name, UnionView<ModelUnion, true>(&u, u.unionIdx()));
-					} else {
-						return m_handler.field(name, UnionView<ModelUnion const, true>(&u, u.unionIdx()));
-					}
-				}
-				case ModelValue::Type::Vector:
-					return m_handler.field(name, &v->template get<ModelValueVector>());
-				case ModelValue::Type::InlineArray:
-					return m_handler.field(name, &v->template get<ModelValueArray>());
-			}
-			oxErrf("invalid type: {}: {}\n", name, static_cast<int>(v->type()));
-			ox::panic("invalid type");
-			return ox::Error(1, "invalid type");
-		}
-
-		// array handler, with callback to allow handling individual elements
-		template<typename T, typename Callback>
-		constexpr Error field(CString name, Callback cb) noexcept {
-			return m_handler.template field<T, Callback>(name, cb);
-		}
-
-		template<typename T>
-		constexpr Error field(CString name, const T *v) noexcept {
-			if constexpr(ox::is_same_v<T, ModelValue>) {
-				return fieldModelValue(name, v);
-			} else {
-				return m_handler.field(name, v);
-			}
-		}
-
-		template<typename T>
-		constexpr Error field(CString name, T *v) noexcept {
-			if constexpr(ox::is_same_v<T, ModelValue>) {
-				return fieldModelValue(name, v);
-			} else {
-				return m_handler.field(name, v);
-			}
-		}
-
-		template<typename U, bool force = false>
-		constexpr Error field(CString name, UnionView<U, force> val) noexcept {
-			return m_handler.field(name, val);
-		}
-
-		constexpr Error field(CString name, auto *val, size_t len) noexcept {
-			return m_handler.field(name, val, len);
-		}
-
-		/**
-		 * Reads an array length from the current location in the buffer.
-		 * @param name
-		 * @param pass indicates that the parsing should iterate past the array length
-		 */
-		 [[nodiscard]]
-		constexpr auto arrayLength(CString name, bool pass = true) noexcept {
-			return m_handler.arrayLength(name, pass);
-		}
-
-		/**
-		 * Reads an string length from the current location in the buffer.
-		 */
-		[[nodiscard]]
-		constexpr auto stringLength(CString name) noexcept {
-			return m_handler.stringLength(name);
-		}
-
-		[[nodiscard]]
-		static constexpr auto opType() noexcept {
-			return Handler::opType();
-		}
-
-		[[nodiscard]]
-		constexpr auto handler() noexcept {
-			return m_handler;
-		}
-
-	private:
-		template<typename H>
-		static constexpr int whichFieldPresent(H &h, CString name, ModelUnion const &u) noexcept
-			requires(H::opType() == OpType::Read) {
-			return h.whichFieldPresent(name, u);
-		}
-
-		template<typename H>
-		static constexpr int whichFieldPresent(H&, CString, ModelUnion const&) noexcept
-			requires(H::opType() != OpType::Read) {
-			return 0;
-		}
-
-};
-
-template<typename Handler, OpType opType_v = Handler::opType()>
-class ModelHandlerBase {
-	private:
-		ModelHandlerInterface<Handler, opType_v> m_interface{*static_cast<Handler*>(this)};
-	public:
-		[[nodiscard]]
-		constexpr auto interface() noexcept {
-			return &m_interface;
-		}
-		[[nodiscard]]
-		static constexpr OpType opType() noexcept {
-			return opType_v;
-		}
-};
-
-
-constexpr ox::Error resizeVector(auto &vec, size_t sz) {
-	if constexpr(ox::is_same_v<decltype(vec.resize(0)), ox::Error>) {
-		return vec.resize(sz);
-	} else {
-		vec.resize(sz);
-		return {};
-	}
-}
-
-}
@@ -0,0 +1,27 @@
+if(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
+	set(OX_OS_WINDOWS TRUE)
+endif()
+if(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
+	set(OX_OS_FREEBSD TRUE)
+else()
+	set(OX_OS_FREEBSD FALSE)
+endif()
+
+if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+	set(OX_OS_LINUX TRUE)
+else()
+	set(OX_OS_LINUX FALSE)
+endif()
+
+if(OX_USE_STDLIB)
+	add_subdirectory(oc)
+endif()
+add_subdirectory(clargs)
+add_subdirectory(claw)
+add_subdirectory(event)
+add_subdirectory(fs)
+add_subdirectory(logconn)
+add_subdirectory(mc)
+add_subdirectory(model)
+add_subdirectory(preloader)
+add_subdirectory(std)
@@ -7,7 +7,7 @@ endif()

 add_library(
 	OxClArgs
-		src/clargs.cpp
+		clargs.cpp
 )

 set_property(
@@ -27,16 +27,11 @@ target_link_libraries(
 		OxStd
 )

-target_include_directories(
-	OxClArgs PUBLIC
-		include
-)
-
 install(
-	DIRECTORY
-		include/ox
+	FILES
+		clargs.hpp
 	DESTINATION
-		include
+		include/ox/clargs
 )

 install(
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -7,7 +7,7 @@
 */

 #include <ox/std/string.hpp>
-#include <ox/clargs/clargs.hpp>
+#include "clargs.hpp"

 namespace ox {

@@ -15,21 +15,21 @@ ClArgs::ClArgs(int argc, const char **args) noexcept: ClArgs({args, static_cast<

 ClArgs::ClArgs(ox::SpanView<const char*> args) noexcept {
 	for (auto i = 0u; i < args.size(); ++i) {
-		auto arg = StringView{args[i]};
+		auto arg = StringView(args[i]);
 		if (arg[0] == '-') {
-			while (arg[0] == '-' && arg.size()) {
+			while (arg[0] == '-' && arg.len()) {
 				arg = substr(arg, 1);
 			}
 			m_bools[arg] = true;
 			// parse additional arguments
 			if (i < args.size() && args[i + 1]) {
-				auto const val = StringView{args[i + 1]};
-				if (val.size() && val[0] != '-') {
+				auto val = String(args[i + 1]);
+				if (val.len() && val[i] != '-') {
 					if (val == "false") {
 						m_bools[arg] = false;
 					}
 					m_strings[arg] = val;
-					if (auto r = ox::strToInt(val); r.error == 0) {
+					if (auto r = ox::atoi(val.c_str()); r.error == 0) {
 						m_ints[arg] = r.value;
 					}
 					++i;
@@ -40,17 +40,17 @@ ClArgs::ClArgs(ox::SpanView<const char*> args) noexcept {
 }

 bool ClArgs::getBool(ox::StringViewCR arg, bool defaultValue) const noexcept {
-	auto const [value, err] = m_ints.at(arg);
+	auto [value, err] = m_ints.at(arg);
 	return !err ? *value : defaultValue;
 }

 String ClArgs::getString(ox::StringViewCR arg, ox::StringView defaultValue) const noexcept {
-	auto const [value, err] = m_strings.at(arg);
+	auto [value, err] = m_strings.at(arg);
 	return !err ? ox::String(*value) : ox::String(defaultValue);
 }

 int ClArgs::getInt(ox::StringViewCR arg, int defaultValue) const noexcept {
-	auto const [value, err] = m_ints.at(arg);
+	auto [value, err] = m_ints.at(arg);
 	return !err ? *value : defaultValue;
 }

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -1,8 +1,8 @@

 add_library(
 	OxClaw
-		src/read.cpp
-		src/write.cpp
+		read.cpp
+		write.cpp
 )

 if(NOT MSVC)
@@ -27,22 +27,9 @@ target_link_libraries(
 #	)
 #endif()

-target_include_directories(
-	OxClaw PUBLIC
-		include
-)
-
-install(
-    DIRECTORY
-        include/ox
-    DESTINATION
-        include
-)
-
-install(
-	TARGETS OxClaw
-	LIBRARY DESTINATION lib
-	ARCHIVE DESTINATION lib
+install(TARGETS OxClaw
+        LIBRARY DESTINATION lib
+        ARCHIVE DESTINATION lib
 )

 if(OX_RUN_TESTS)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -8,11 +8,11 @@

 #include <ox/std/buffer.hpp>

-#include <ox/claw/read.hpp>
+#include "read.hpp"

 namespace ox {

-Result<StringView> readClawTypeId(BufferView const buff) noexcept {
+ox::Result<ox::StringView> readClawTypeId(ox::BufferView buff) noexcept {
 	auto buffRaw = buff.data();
 	auto buffLen = buff.size();
 	size_t outSz{};
@@ -43,7 +43,7 @@ Result<StringView> readClawTypeId(BufferView const buff) noexcept {
 	return {{buff.data() + fmtSz, outSz - fmtSz - 1}};
 }

-Result<ClawHeader> readClawHeader(BufferView const buff) noexcept {
+Result<ClawHeader> readClawHeader(ox::BufferView buff) noexcept {
 	auto buffRaw = buff.data();
 	auto buffLen = buff.size();
 	const auto s1End = ox::strchr(buffRaw, ';', buffLen);
@@ -81,13 +81,13 @@ Result<ClawHeader> readClawHeader(BufferView const buff) noexcept {
 		return ox::Error(4, "Claw format does not match any supported format/version combo");
 	}
 	hdr.typeName = typeName;
-	std::ignore = ox::strToInt(versionStr).copyTo(hdr.typeVersion);
+	std::ignore = ox::atoi(versionStr).copyTo(hdr.typeVersion);
 	hdr.data = buffRaw;
 	hdr.dataSize = buffLen;
 	return hdr;
 }

-Result<BufferView> stripClawHeader(BufferView const buff) noexcept {
+Result<BufferView> stripClawHeader(ox::BufferView buff) noexcept {
 	OX_REQUIRE(header, readClawHeader(buff));
 	return {{header.data, header.dataSize}};
 }
@@ -106,14 +106,15 @@ Result<ModelObject> readClaw(TypeStore &ts, BufferView buff) noexcept {
 		{
 			ox::BufferReader br({header.data, header.dataSize});
 			MetalClawReader reader(br);
-			OX_RETURN_ERROR(model(reader.interface(), &obj));
+			ModelHandlerInterface handler(&reader);
+			OX_RETURN_ERROR(model(&handler, &obj));
 			return obj;
 		}
 		case ClawFormat::Organic:
 		{
 #ifdef OX_USE_STDLIB
 			OrganicClawReader reader({header.data, header.dataSize});
-			ModelHandlerInterface handler(reader);
+			ModelHandlerInterface handler(&reader);
 			OX_RETURN_ERROR(model(&handler, &obj));
 			return obj;
 #else
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -52,7 +52,8 @@ Error readClaw(ox::BufferView buff, T &val) {
 		{
 			ox::BufferReader br({header.data, header.dataSize});
 			MetalClawReader reader(br);
-			return model(reader.interface(), &val);
+			ModelHandlerInterface handler(&reader);
+			return model(&handler, &val);
 		}
 		case ClawFormat::Organic:
 		{
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -109,7 +109,7 @@ static std::map<ox::StringView, ox::Error(*)()> tests = {
 			"ClawHeaderReader",
 			[] {
 				constexpr auto hdr = ox::StringLiteral("O1;com.drinkingtea.ox.claw.test.Header;2;");
-				auto [ch, err] = ox::readClawHeader({hdr.c_str(), hdr.size() + 1});
+				auto [ch, err] = ox::readClawHeader({hdr.c_str(), hdr.len() + 1});
 				oxAssert(err, "Error parsing header");
 				oxAssert(ch.fmt == ox::ClawFormat::Organic, "Format wrong");
 				oxAssert(ch.typeName == "com.drinkingtea.ox.claw.test.Header", "Type name wrong");
@@ -121,7 +121,7 @@ static std::map<ox::StringView, ox::Error(*)()> tests = {
 			"ClawHeaderReader2",
 			[] {
 				constexpr auto hdr = ox::StringLiteral("M2;com.drinkingtea.ox.claw.test.Header2;3;");
-				auto [ch, err] = ox::readClawHeader({hdr.c_str(), hdr.size() + 1});
+				auto [ch, err] = ox::readClawHeader({hdr.c_str(), hdr.len() + 1});
 				oxAssert(err, "Error parsing header");
 				oxAssert(ch.fmt == ox::ClawFormat::Metal, "Format wrong");
 				oxAssert(ch.typeName == "com.drinkingtea.ox.claw.test.Header2", "Type name wrong");
@@ -134,8 +134,8 @@ static std::map<ox::StringView, ox::Error(*)()> tests = {
 			[] {
 				constexpr auto hdr = ox::StringLiteral("M2;com.drinkingtea.ox.claw.test.Header2;3;awefawf");
 				constexpr auto expected = ox::StringLiteral("com.drinkingtea.ox.claw.test.Header2;3");
-				OX_REQUIRE(actual, ox::readClawTypeId({hdr.data(), hdr.size() + 1}));
-				ox::expect(actual, expected);
+				OX_REQUIRE(actual, ox::readClawTypeId({hdr.data(), hdr.len() + 1}));
+				oxExpect(actual, expected);
 				return ox::Error{};
 			}
 		},
@@ -1,12 +1,12 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at https://mozilla.org/MPL/2.0/.
 */

-#include <ox/claw/write.hpp>
+#include "write.hpp"

 namespace ox::detail {

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -39,7 +39,7 @@ struct TypeInfoCatcher {
 	}

 	constexpr Error field(...) noexcept {
-		return {};
+		return ox::Error(0);
 	}

 	static constexpr auto opType() {
@@ -0,0 +1,46 @@
+add_library(
+    OxEvent
+        signal.cpp
+)
+
+if(NOT MSVC)
+    target_compile_options(OxEvent PRIVATE -Wsign-conversion)
+    target_compile_options(OxEvent PRIVATE -Wconversion)
+endif()
+
+if(NOT OX_BARE_METAL)
+    set_property(
+        TARGET
+            OxEvent
+        PROPERTY
+            POSITION_INDEPENDENT_CODE ON
+    )
+endif()
+
+target_compile_definitions(
+    OxEvent PUBLIC
+        $<$<BOOL:${OX_USE_STDLIB}>:OX_USE_STDLIB>
+        $<$<BOOL:${OX_NODEBUG}>:OX_NODEBUG>
+)
+
+target_link_libraries(
+    OxEvent PUBLIC
+        OxStd
+)
+
+install(
+    FILES
+        event.hpp
+        signal.hpp
+    DESTINATION
+        include/ox/event
+)
+
+install(TARGETS OxEvent
+        LIBRARY DESTINATION lib
+        ARCHIVE DESTINATION lib
+)
+
+if(OX_RUN_TESTS)
+    add_subdirectory(test)
+endif()
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -1,12 +1,12 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at https://mozilla.org/MPL/2.0/.
 */

-#include <ox/event/signal.hpp>
+#include "signal.hpp"

 namespace ox {

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -122,7 +122,7 @@ class Signal {
 			}
 		};

-		mutable Vector<UPtr<BaseSlot>> m_slots;
+		mutable Vector<UniquePtr<BaseSlot>> m_slots;

 	public:
 		~Signal() noexcept;
@@ -143,11 +143,6 @@ class Signal {

 		Error disconnectObject(const void *receiver) const noexcept;

-		[[nodiscard]]
-		size_t connectionCnt() const noexcept {
-			return m_slots.size();
-		}
-
 		void emit(Args... args) const;

 		Error emitCheckError(Args... args) const noexcept;
@@ -218,9 +213,9 @@ Error Signal<Args...>::emitCheckError(Args... args) const noexcept {
 		for (auto &f : m_slots) {
 			f->call(args...);
 		}
-		return {};
+		return ox::Error(0);
 	} catch (const ox::Exception &ex) {
-		return ox::Error(ex.errCode, ex.msg, ex.src);
+		return ox::Error(ex.file, ex.line, ex.errCode, ex.msg);
 	}
 }

@@ -303,7 +298,7 @@ class Signal<Error(Args...)> {
 			}
 		};

-		mutable Vector<UPtr<BaseSlot>> m_slots;
+		mutable Vector<UniquePtr<BaseSlot>> m_slots;

 	public:
 		~Signal() noexcept;
@@ -324,11 +319,6 @@ class Signal<Error(Args...)> {

 		Error disconnectObject(const void *receiver) const noexcept;

-		[[nodiscard]]
-		size_t connectionCnt() const noexcept {
-			return m_slots.size();
-		}
-
 		void emit(Args... args) const noexcept;

 		Error emitCheckError(Args... args) const noexcept;
@@ -410,7 +400,7 @@ Error Signal<Error(Args...)>::emitCheckError(Args... args) const noexcept {
 	for (auto &f : m_slots) {
 		OX_RETURN_ERROR(f->call(ox::forward<Args>(args)...));
 	}
-	return {};
+	return ox::Error(0);
 }

 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -5,12 +5,14 @@ endif()

 add_library(
 	OxFS
-		src/filestore/filestoretemplate.cpp
-		src/filesystem/filelocation.cpp
-		src/filesystem/pathiterator.cpp
-		src/filesystem/directory.cpp
-		src/filesystem/filesystem.cpp
-		src/filesystem/passthroughfs.cpp
+		ptrarith/nodebuffer.hpp
+		ptrarith/ptr.hpp
+		filestore/filestoretemplate.cpp
+		filesystem/filelocation.cpp
+		filesystem/pathiterator.cpp
+		filesystem/directory.cpp
+		filesystem/filesystem.cpp
+		filesystem/passthroughfs.cpp
 )

 if(NOT MSVC)
@@ -31,22 +33,10 @@ target_link_libraries(
 		OxMetalClaw
 )

-target_include_directories(
-	OxFS PUBLIC
-		include
-)
-
-install(
-	DIRECTORY
-		include/ox
-	DESTINATION
-		include
-)
-
 if(NOT OX_BARE_METAL)
 	add_executable(
 		oxfs-tool
-			src/tool.cpp
+			tool.cpp
 	)

 	target_link_libraries(
@@ -62,6 +52,29 @@ if(NOT OX_BARE_METAL)
 	)
 endif()

+install(
+	FILES
+		filestore/filestoretemplate.hpp
+	DESTINATION
+		include/ox/fs/filestore
+)
+
+install(
+	FILES
+		filesystem/filesystem.hpp
+		filesystem/pathiterator.hpp
+	DESTINATION
+		include/ox/fs/filesystem
+)
+
+install(
+	FILES
+		ptrarith/nodebuffer.hpp
+		ptrarith/ptr.hpp
+	DESTINATION
+		include/ox/fs/ptrarith
+)
+
 install(
 	TARGETS
 		OxFS
@@ -1,12 +1,12 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at https://mozilla.org/MPL/2.0/.
 */

-#include <ox/fs/filestore/filestoretemplate.hpp>
+#include "filestoretemplate.hpp"

 namespace ox {

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -230,7 +230,7 @@ template<typename size_t>
 Error FileStoreTemplate<size_t>::incLinks(uint64_t id) {
 	OX_REQUIRE_M(item, find(static_cast<size_t>(id)).validate());
 	++item->links;
-	return {};
+	return ox::Error(0);
 }

 template<typename size_t>
@@ -240,7 +240,7 @@ Error FileStoreTemplate<size_t>::decLinks(uint64_t id) {
 	if (item->links == 0) {
 		OX_RETURN_ERROR(remove(item));
 	}
-	return {};
+	return ox::Error(0);
 }

 template<typename size_t>
@@ -298,7 +298,7 @@ Error FileStoreTemplate<size_t>::write(uint64_t id64, const void *data, FsSize_t
 						        dest->id.get(), dest.offset(), destData.size());
 						fsData->rootNode = dest.offset();
 						oxTracef("ox.fs.FileStoreTemplate.write", "Root inode: {}", dest->id.get());
-						return {};
+						return ox::Error(0);
 					}
 				} else {
 					oxTrace("ox.fs.FileStoreTemplate.write.fail", "Could not place item due to absence of FileStore header.");
@@ -427,20 +427,20 @@ Error FileStoreTemplate<size_t>::resize() {
 	oxTracef("ox.fs.FileStoreTemplate.resize", "resize to: {}", newSize);
 	OX_RETURN_ERROR(m_buffer->setSize(newSize));
 	oxTracef("ox.fs.FileStoreTemplate.resize", "resized to: {}", m_buffer->size());
-	return {};
+	return ox::Error(0);
 }

 template<typename size_t>
 Error FileStoreTemplate<size_t>::resize(std::size_t size, void *newBuff) {
 	if (m_buffer->size() > size) {
-		return ox::Error{1, "new buffer is too small for existing data"};
+		return ox::Error(1);
 	}
 	m_buffSize = static_cast<size_t>(size);
 	if (newBuff) {
-		m_buffer = static_cast<Buffer*>(newBuff);
+		m_buffer = reinterpret_cast<Buffer*>(newBuff);
 		OX_RETURN_ERROR(m_buffer->setSize(static_cast<size_t>(size)));
 	}
-	return {};
+	return ox::Error(0);
 }

 template<typename size_t>
@@ -479,7 +479,7 @@ Error FileStoreTemplate<size_t>::walk(Error(*cb)(uint8_t, uint64_t, uint64_t)) {
 	for (auto i = m_buffer->iterator(); i.valid(); i.next()) {
 		OX_RETURN_ERROR(cb(i->fileType, i.ptr().offset(), i.ptr().end()));
 	}
-	return {};
+	return ox::Error(0);
 }

 template<typename size_t>
@@ -503,7 +503,7 @@ Error FileStoreTemplate<size_t>::compact() {
 	return m_buffer->compact([this, &isFirstItem](uint64_t oldAddr, ItemPtr item) -> Error {
 		if (isFirstItem) {
 			isFirstItem = false;
-			return {};
+			return ox::Error(0);
 		}
 		if (!item.valid()) {
 			return ox::Error(1);
@@ -524,7 +524,7 @@ Error FileStoreTemplate<size_t>::compact() {
 				parent->right = item;
 			}
 		}
-		return {};
+		return ox::Error(0);
 	});
 }

@@ -552,7 +552,7 @@ Error FileStoreTemplate<size_t>::placeItem(ItemPtr item) {
 		item->left = root->left;
 		item->right = root->right;
 		oxTracef("ox.fs.FileStoreTemplate.placeItem", "Overwrote Root Item: {}", item->id.get());
-		return {};
+		return ox::Error(0);
 	} else {
 		return placeItem(root, item);
 	}
@@ -573,7 +573,7 @@ Error FileStoreTemplate<size_t>::placeItem(ItemPtr root, ItemPtr item, int depth
 				item->right = right->right;
 			}
 			oxTracef("ox.fs.FileStoreTemplate.placeItem", "Placed Item: {}", item->id.get());
-			return {};
+			return ox::Error(0);
 		} else {
 			return placeItem(right, item, depth + 1);
 		}
@@ -586,7 +586,7 @@ Error FileStoreTemplate<size_t>::placeItem(ItemPtr root, ItemPtr item, int depth
 				item->right = left->right;
 			}
 			oxTracef("ox.fs.FileStoreTemplate.placeItem", "Placed Item: {}", item->id.get());
-			return {};
+			return ox::Error(0);
 		} else {
 			return placeItem(left, item, depth + 1);
 		}
@@ -624,7 +624,7 @@ Error FileStoreTemplate<size_t>::unplaceItem(ItemPtr item) {
 		} else {
 			fsData->rootNode = 0;
 		}
-		return {};
+		return ox::Error(0);
 	} else {
 		return unplaceItem(root, item);
 	}
@@ -661,7 +661,7 @@ Error FileStoreTemplate<size_t>::unplaceItem(ItemPtr root, ItemPtr item, int dep
 	if (item->left) {
 		OX_RETURN_ERROR(placeItem(m_buffer->ptr(item->left)));
 	}
-	return {};
+	return ox::Error(0);
 }

 template<typename size_t>
@@ -669,7 +669,7 @@ Error FileStoreTemplate<size_t>::remove(ItemPtr item) {
 	if (item.valid()) {
 		OX_RETURN_ERROR(unplaceItem(item));
 		OX_RETURN_ERROR(m_buffer->free(item));
-		return {};
+		return ox::Error(0);
 	}
 	return ox::Error(1);
 }
@@ -1,12 +1,12 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at https://mozilla.org/MPL/2.0/.
 */

-#include <ox/fs/filesystem/directory.hpp>
+#include "directory.hpp"

 namespace ox {

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -52,7 +52,7 @@ struct OX_PACKED DirectoryEntry {
 			if (d.valid()) {
 				d->inode = inode;
 				auto const maxStrSz = bufferSize - 1 - sizeof(*this);
-				ox::strncpy(d->name, name.data(), ox::min(maxStrSz, name.size()));
+				ox::strncpy(d->name, name.data(), ox::min(maxStrSz, name.len()));
 				return {};
 			}
 			return ox::Error(1);
@@ -219,7 +219,7 @@ Error Directory<FileStore, InodeId_t>::write(PathIterator path, uint64_t inode64
 			oxTrace("ox.fs.Directory.write.fail", "Could not read existing version of Directory");
 			return ox::Error(1, "Could not read existing version of Directory");
 		}
-		const auto pathSize = name.size() + 1;
+		const auto pathSize = name.len() + 1;
 		const auto entryDataSize = DirectoryEntry<InodeId_t>::DirectoryEntryData::spaceNeeded(pathSize);
 		const auto newSize = oldStat.size + Buffer::spaceNeeded(entryDataSize);
 		auto cpy = ox_malloca(newSize, Buffer, *old, oldStat.size);
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -8,7 +8,7 @@

 #include <ox/model/modelops.hpp>

-#include <ox/fs/filesystem/filelocation.hpp>
+#include "filelocation.hpp"

 namespace ox {

@@ -31,10 +31,10 @@ FileAddress::FileAddress(uint64_t inode) noexcept {
 FileAddress::FileAddress(ox::StringViewCR path) noexcept {
 	auto pathSize = path.bytes();
 	m_data.path = new char[pathSize + 1];
-	OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 	memcpy(m_data.path, path.data(), pathSize);
+OX_CLANG_NOWARN_BEGIN(-Wunsafe-buffer-usage)
 	m_data.path[pathSize] = 0;
-	OX_ALLOW_UNSAFE_BUFFERS_END
+OX_CLANG_NOWARN_END
 	m_type = FileAddressType::Path;
 }

@@ -48,11 +48,9 @@ FileAddress &FileAddress::operator=(const FileAddress &other) noexcept {
 		case FileAddressType::Path:
 		{
 			if (other.m_data.path) {
-				OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 				auto strSize = ox::strlen(other.m_data.path) + 1;
 				m_data.path = new char[strSize];
 				ox::memcpy(m_data.path, other.m_data.path, strSize);
-				OX_ALLOW_UNSAFE_BUFFERS_END
 			} else {
 				m_data.constPath = "";
 				m_type = FileAddressType::ConstPath;
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -24,6 +24,9 @@ enum class FileAddressType: int8_t {
 	Inode,
 };

+template<typename T>
+constexpr Error model(T *h, CommonPtrWith<class FileAddress> auto *fa) noexcept;
+
 class FileAddress {

 	template<typename T>
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -9,7 +9,7 @@
 #include <ox/std/error.hpp>
 #include <ox/std/utility.hpp>

-#include <ox/fs/filesystem/filesystem.hpp>
+#include "filesystem.hpp"

 namespace ox {

@@ -37,30 +37,6 @@ Error FileSystem::read(const FileAddress &addr, void *buffer, std::size_t size)
 	}
 }

-Result<Buffer> FileSystem::read(FileAddress const &addr, size_t const size) noexcept {
-	Result<Buffer> out;
-	out.value.resize(size);
-	switch (addr.type()) {
-		case FileAddressType::Inode:
-			OX_RETURN_ERROR(readFileInode(addr.getInode().value, out.value.data(), size));
-			break;
-		case FileAddressType::ConstPath:
-		case FileAddressType::Path:
-			OX_RETURN_ERROR(readFilePath(StringView{addr.getPath().value}, out.value.data(), size));
-			break;
-		default:
-			return ox::Error{1};
-	}
-	return out;
-}
-
-Result<Buffer> FileSystem::read(StringViewCR path, size_t const size) noexcept {
-	Result<Buffer> out;
-	out.value.resize(size);
-	OX_RETURN_ERROR(readFilePath(path, out.value.data(), size));
-	return out;
-}
-
 Result<Buffer> FileSystem::read(const FileAddress &addr) noexcept {
 	OX_REQUIRE(s, stat(addr));
 	Buffer buff(static_cast<std::size_t>(s.size));
@@ -75,31 +51,28 @@ Result<Buffer> FileSystem::read(StringViewCR path) noexcept {
 	return buff;
 }

-Error FileSystem::read(
-		FileAddress const &addr,
-		std::size_t const readStart,
-		std::size_t const readSize,
-		void *buffer,
-		std::size_t *size) noexcept {
+Error FileSystem::read(const FileAddress &addr, std::size_t readStart, std::size_t readSize, void *buffer, std::size_t *size) noexcept {
 	switch (addr.type()) {
 		case FileAddressType::Inode:
-			return readFileInodeRange(addr.getInode().value, readStart, readSize, buffer, size);
+			return read(addr.getInode().value, readStart, readSize, buffer, size);
 		case FileAddressType::ConstPath:
 		case FileAddressType::Path:
-			return readFilePathRange(addr.getPath().value, readStart, readSize, buffer, size);
+			return ox::Error(2, "Unsupported for path lookups");
 		default:
 			return ox::Error(1);
 	}
 }

-Result<size_t> FileSystem::read(
-		StringViewCR path,
-		std::size_t const readStart,
-		std::size_t const readSize,
-		Span<char> buff) noexcept {
-	size_t szOut{buff.size()};
-	OX_RETURN_ERROR(readFilePathRange(path, readStart, readSize, buff.data(), &szOut));
-	return szOut;
+Error FileSystem::remove(const FileAddress &addr, bool recursive) noexcept {
+	switch (addr.type()) {
+		case FileAddressType::Inode:
+			return remove(addr.getInode().value, recursive);
+		case FileAddressType::ConstPath:
+		case FileAddressType::Path:
+			return remove(StringView(addr.getPath().value), recursive);
+		default:
+			return ox::Error(1);
+	}
 }

 Error FileSystem::write(const FileAddress &addr, const void *buffer, uint64_t size, FileType fileType) noexcept {
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -20,7 +20,7 @@
 namespace ox {

 namespace detail {
-inline void fsBuffFree(char *buff) noexcept {
+static inline void fsBuffFree(char *buff) noexcept {
 	safeDelete(buff);
 }
 }
@@ -41,45 +41,25 @@ class FileSystem {

 		Error read(const FileAddress &addr, void *buffer, std::size_t size) noexcept;

-		Result<Buffer> read(FileAddress const &addr, size_t size) noexcept;
-
-		Result<Buffer> read(StringViewCR path, size_t size) noexcept;
-
 		Result<Buffer> read(const FileAddress &addr) noexcept;

 		Result<Buffer> read(StringViewCR path) noexcept;

-		Error read(StringViewCR path, void *buffer, std::size_t buffSize) noexcept {
+		inline Error read(StringViewCR path, void *buffer, std::size_t buffSize) noexcept {
 			return readFilePath(path, buffer, buffSize);
 		}

-		Error read(uint64_t inode, void *buffer, std::size_t buffSize) noexcept {
+		inline Error read(uint64_t inode, void *buffer, std::size_t buffSize) noexcept {
 			return readFileInode(inode, buffer, buffSize);
 		}

-		Error read(
-			FileAddress const &addr,
-			size_t readStart,
-			size_t readSize,
-			void *buffer,
-			size_t *size) noexcept;
-
-		/**
-		 *
-		 * @param path
-		 * @param readStart
-		 * @param readSize
-		 * @param buff
-		 * @return error or number of bytes read
-		 */
-		Result<size_t> read(
-			StringViewCR path, size_t readStart, size_t readSize, ox::Span<char> buff) noexcept;
+		Error read(const FileAddress &addr, std::size_t readStart, std::size_t readSize, void *buffer, std::size_t *size) noexcept;

 		virtual Result<Vector<String>> ls(StringViewCR dir) const noexcept = 0;

-		Error remove(StringViewCR path, bool recursive = false) noexcept {
-			return removePath(path, recursive);
-		}
+		virtual Error remove(StringViewCR path, bool recursive) noexcept = 0;
+
+		Error remove(const FileAddress &addr, bool recursive = false) noexcept;

 		virtual Error resize(uint64_t size, void *buffer) noexcept = 0;

@@ -87,7 +67,7 @@ class FileSystem {
 			return writeFilePath(path, buffer, size, FileType::NormalFile);
 		}

-		Error write(StringViewCR path, ox::SpanView<char> const&buff) noexcept {
+		Error write(StringViewCR path, ox::Span<char> const&buff) noexcept {
 			return write(path, buff.data(), buff.size(), FileType::NormalFile);
 		}

@@ -95,42 +75,42 @@ class FileSystem {
 			return write(inode, buffer, size, FileType::NormalFile);
 		}

-		Error write(uint64_t inode, ox::SpanView<char> const&buff) noexcept {
+		Error write(uint64_t inode, ox::Span<char> const&buff) noexcept {
 			return write(inode, buff.data(), buff.size(), FileType::NormalFile);
 		}

 		Error write(const FileAddress &addr, const void *buffer, uint64_t size, FileType fileType = FileType::NormalFile) noexcept;

-		Error write(StringViewCR path, const void *buffer, uint64_t size, FileType fileType) noexcept {
+		inline Error write(StringViewCR path, const void *buffer, uint64_t size, FileType fileType) noexcept {
 			return writeFilePath(path, buffer, size, fileType);
 		}

-		Error write(uint64_t inode, const void *buffer, uint64_t size, FileType fileType) noexcept {
+		inline Error write(uint64_t inode, const void *buffer, uint64_t size, FileType fileType) noexcept {
 			return writeFileInode(inode, buffer, size, fileType);
 		}

-		Result<FileStat> stat(uint64_t inode) const noexcept {
+		inline Result<FileStat> stat(uint64_t inode) const noexcept {
 			return statInode(inode);
 		}

-		Result<FileStat> stat(StringViewCR path) const noexcept {
+		inline Result<FileStat> stat(StringViewCR path) const noexcept {
 			return statPath(path);
 		}

 		Result<FileStat> stat(const FileAddress &addr) const noexcept;

 		[[nodiscard]]
-		bool exists(uint64_t inode) const noexcept {
+		inline bool exists(uint64_t inode) const noexcept {
 			return statInode(inode).ok();
 		}

 		[[nodiscard]]
-		bool exists(ox::StringView path) const noexcept {
+		inline bool exists(ox::StringView path) const noexcept {
 			return statPath(path).ok();
 		}

 		[[nodiscard]]
-		bool exists(FileAddress const&addr) const noexcept {
+		inline bool exists(FileAddress const&addr) const noexcept {
 			return stat(addr).ok();
 		}

@@ -160,12 +140,7 @@ class FileSystem {

 		virtual Error readFileInode(uint64_t inode, void *buffer, std::size_t size) noexcept = 0;

-		virtual Error readFilePathRange(
-			StringViewCR path, size_t readStart, size_t readSize, void *buffer, size_t *buffSize) noexcept = 0;
-
-		virtual Error readFileInodeRange(uint64_t inode, size_t readStart, size_t readSize, void *buffer, size_t *size) noexcept = 0;
-
-		virtual Error removePath(StringViewCR path, bool recursive) noexcept = 0;
+		virtual Error readFileInodeRange(uint64_t inode, std::size_t readStart, std::size_t readSize, void *buffer, std::size_t *size) noexcept = 0;

 		virtual Error writeFilePath(StringViewCR path, const void *buffer, uint64_t size, FileType fileType) noexcept = 0;

@@ -177,11 +152,11 @@ class MemFS: public FileSystem {
 	public:
 		Result<const char*> directAccess(const FileAddress &addr) const noexcept;

-		Result<const char*> directAccess(StringViewCR path) const noexcept {
+		inline Result<const char*> directAccess(StringViewCR path) const noexcept {
 			return directAccessPath(path);
 		}

-		Result<const char*> directAccess(uint64_t inode) const noexcept {
+		inline Result<const char*> directAccess(uint64_t inode) const noexcept {
 			return directAccessInode(inode);
 		}

@@ -234,11 +209,6 @@ class FileSystemTemplate: public MemFS {

 		Error readFileInodeRange(uint64_t inode, std::size_t readStart, std::size_t readSize, void *buffer, std::size_t *size) noexcept override;

-		Error readFilePathRange(
-			StringViewCR path, size_t readStart, size_t readSize, void *buffer, size_t *buffSize) noexcept override;
-
-		Error removePath(StringViewCR path, bool recursive) noexcept override;
-
 		Result<const char*> directAccessInode(uint64_t) const noexcept override;

 		Result<Vector<String>> ls(StringViewCR dir) const noexcept override;
@@ -246,6 +216,8 @@ class FileSystemTemplate: public MemFS {
 		template<typename F>
 		Error ls(StringViewCR path, F cb) const;

+		Error remove(StringViewCR path, bool recursive) noexcept override;
+
 		/**
 		 * Resizes FileSystem to minimum possible size.
 		 */
@@ -329,7 +301,7 @@ Error FileSystemTemplate<FileStore, Directory>::format(void *buff, uint64_t buff
 		return ox::Error(1);
 	}

-	return {};
+	return ox::Error(0);
 }

 template<typename FileStore, typename Directory>
@@ -346,7 +318,7 @@ Error FileSystemTemplate<FileStore, Directory>::move(StringViewCR src, StringVie
 	OX_REQUIRE_M(inode, rootDir.find(src));
 	OX_RETURN_ERROR(rootDir.write(dest, inode));
 	OX_RETURN_ERROR(rootDir.remove(src));
-	return {};
+	return ox::Error(0);
 }

 template<typename FileStore, typename Directory>
@@ -385,14 +357,35 @@ Error FileSystemTemplate<FileStore, Directory>::readFileInodeRange(uint64_t inod
 }

 template<typename FileStore, typename Directory>
-Error FileSystemTemplate<FileStore, Directory>::readFilePathRange(
-	StringViewCR path, size_t readStart, size_t readSize, void *buffer, size_t *buffSize) noexcept {
-	OX_REQUIRE(s, stat(path));
-	return readFileInodeRange(s.inode, readStart, readSize, buffer, buffSize);
+Result<const char*> FileSystemTemplate<FileStore, Directory>::directAccessInode(uint64_t inode) const noexcept {
+	auto data = m_fs.read(inode);
+	if (!data.valid()) {
+		return ox::Error(1, "Data not valid");
+	}
+	return reinterpret_cast<char*>(data.get());
 }

 template<typename FileStore, typename Directory>
-Error FileSystemTemplate<FileStore, Directory>::removePath(StringViewCR path, bool recursive) noexcept {
+Result<Vector<String>> FileSystemTemplate<FileStore, Directory>::ls(StringViewCR path) const noexcept {
+	Vector<String> out;
+	OX_RETURN_ERROR(ls(path, [&out](StringViewCR name, typename FileStore::InodeId_t) {
+		out.emplace_back(name);
+		return ox::Error(0);
+	}));
+	return out;
+}
+
+template<typename FileStore, typename Directory>
+template<typename F>
+Error FileSystemTemplate<FileStore, Directory>::ls(StringViewCR path, F cb) const {
+	oxTracef("ox.fs.FileSystemTemplate.ls", "path: {}", path);
+	OX_REQUIRE(s, stat(path));
+	Directory dir(m_fs, s.inode);
+	return dir.ls(cb);
+}
+
+template<typename FileStore, typename Directory>
+Error FileSystemTemplate<FileStore, Directory>::remove(StringViewCR path, bool recursive) noexcept {
 	OX_REQUIRE(fd, fileSystemData());
 	Directory rootDir(m_fs, fd.rootDirInode);
 	OX_REQUIRE(inode, rootDir.find(path));
@@ -407,35 +400,7 @@ Error FileSystemTemplate<FileStore, Directory>::removePath(StringViewCR path, bo
 		oxTrace("FileSystemTemplate.remove.fail", "Tried to remove directory without recursive setting.");
 		return ox::Error(1);
 	}
-	return {};
-}
-
-template<typename FileStore, typename Directory>
-Result<const char*> FileSystemTemplate<FileStore, Directory>::directAccessInode(uint64_t inode) const noexcept {
-	auto data = m_fs.read(inode);
-	if (!data.valid()) {
-		return ox::Error(1, "Data not valid");
-	}
-	return reinterpret_cast<char*>(data.get());
-}
-
-template<typename FileStore, typename Directory>
-Result<Vector<String>> FileSystemTemplate<FileStore, Directory>::ls(StringViewCR path) const noexcept {
-	Vector<String> out;
-	OX_RETURN_ERROR(ls(path, [&out](StringViewCR name, typename FileStore::InodeId_t) {
-		out.emplace_back(name);
-		return ox::Error{};
-	}));
-	return out;
-}
-
-template<typename FileStore, typename Directory>
-template<typename F>
-Error FileSystemTemplate<FileStore, Directory>::ls(StringViewCR path, F cb) const {
-	oxTracef("ox.fs.FileSystemTemplate.ls", "path: {}", path);
-	OX_REQUIRE(s, stat(path));
-	Directory dir(m_fs, s.inode);
-	return dir.ls(cb);
+	return ox::Error(0);
 }

 template<typename FileStore, typename Directory>
@@ -468,7 +433,7 @@ Error FileSystemTemplate<FileStore, Directory>::writeFilePath(

 template<typename FileStore, typename Directory>
 Error FileSystemTemplate<FileStore, Directory>::writeFileInode(uint64_t inode, const void *buffer, uint64_t size, FileType fileType) noexcept {
-	oxTrace("ox.fs.FileSystemTemplate.writeFileInode", ox::intToStr(inode));
+	oxTrace("ox.fs.FileSystemTemplate.writeFileInode", ox::itoa(inode));
 	return m_fs.write(inode, buffer, static_cast<size_t>(size), static_cast<uint8_t>(fileType));
 }

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -8,7 +8,7 @@

 #include <ox/std/error.hpp>

-#include <ox/fs/filesystem/passthroughfs.hpp>
+#include "passthroughfs.hpp"

 #if defined(OX_HAS_PASSTHROUGHFS)

@@ -60,7 +60,7 @@ Error PassThroughFS::move(StringViewCR src, StringViewCR dest) noexcept {
 	if (ec.value()) {
 		return ox::Error(1);
 	}
-	return {};
+	return ox::Error(0);
 }

 Result<Vector<String>> PassThroughFS::ls(StringViewCR dir) const noexcept {
@@ -75,6 +75,14 @@ Result<Vector<String>> PassThroughFS::ls(StringViewCR dir) const noexcept {
 	return out;
 }

+Error PassThroughFS::remove(StringViewCR path, bool recursive) noexcept {
+	if (recursive) {
+		return ox::Error(std::filesystem::remove_all(m_path / stripSlash(path)) != 0);
+	} else {
+		return ox::Error(std::filesystem::remove(m_path / stripSlash(path)) != 0);
+	}
+}
+
 Error PassThroughFS::resize(uint64_t, void*) noexcept {
 	// unsupported
 	return ox::Error(1, "resize is not supported by PassThroughFS");
@@ -93,9 +101,7 @@ Result<FileStat> PassThroughFS::statPath(StringViewCR path) const noexcept {
 	oxTracef("ox.fs.PassThroughFS.statInode", "{} {}", ec.message(), path);
 	const uint64_t size = type == FileType::Directory ? 0 : std::filesystem::file_size(p, ec);
 	oxTracef("ox.fs.PassThroughFS.statInode.size", "{} {}", path, size);
-	if (auto err = ec.value()) {
-		return ox::Error{static_cast<ox::ErrorCode>(err), "PassThroughFS: stat failed"};
-	}
+	OX_RETURN_ERROR(ox::Error(static_cast<ox::ErrorCode>(ec.value()), "PassThroughFS: stat failed"));
 	return FileStat{0, 0, size, type};
 }

@@ -148,7 +154,7 @@ Error PassThroughFS::readFilePath(StringViewCR path, void *buffer, std::size_t b
 		oxTracef("ox.fs.PassThroughFS.read.error", "Read of {} failed: {}", path, f.what());
 		return ox::Error(2);
 	}
-	return {};
+	return ox::Error(0);
 }

 Error PassThroughFS::readFileInode(uint64_t, void*, std::size_t) noexcept {
@@ -156,38 +162,11 @@ Error PassThroughFS::readFileInode(uint64_t, void*, std::size_t) noexcept {
 	return ox::Error(1, "readFileInode(uint64_t, void*, std::size_t) is not supported by PassThroughFS");
 }

-Error PassThroughFS::readFilePathRange(
-	StringViewCR path, size_t const readStart, size_t readSize, void *buffer, size_t *buffSize) noexcept {
-	try {
-		std::ifstream file(m_path / stripSlash(path), std::ios::binary | std::ios::ate);
-		auto const size = static_cast<size_t>(file.tellg());
-		readSize = ox::min(readSize, size);
-		file.seekg(static_cast<off_t>(readStart), std::ios::beg);
-		if (readSize > *buffSize) {
-			oxTracef("ox.fs.PassThroughFS.read.error", "Read failed: Buffer too small: {}", path);
-			return ox::Error{1};
-		}
-		file.read(static_cast<char*>(buffer), static_cast<std::streamsize>(readSize));
-		return {};
-	} catch (std::fstream::failure const &f) {
-		oxTracef("ox.fs.PassThroughFS.read.error", "Read of {} failed: {}", path, f.what());
-		return ox::Error{2};
-	}
-}
-
 Error PassThroughFS::readFileInodeRange(uint64_t, std::size_t, std::size_t, void*, std::size_t*) noexcept {
 	// unsupported
 	return ox::Error(1, "read(uint64_t, std::size_t, std::size_t, void*, std::size_t*) is not supported by PassThroughFS");
 }

-Error PassThroughFS::removePath(StringViewCR path, bool const recursive) noexcept {
-	if (recursive) {
-		return ox::Error{std::filesystem::remove_all(m_path / stripSlash(path)) == 0};
-	} else {
-		return ox::Error{!std::filesystem::remove(m_path / stripSlash(path))};
-	}
-}
-
 Error PassThroughFS::writeFilePath(StringViewCR path, const void *buffer, uint64_t size, FileType) noexcept {
 	const auto p = (m_path / stripSlash(path));
 	try {
@@ -197,7 +176,7 @@ Error PassThroughFS::writeFilePath(StringViewCR path, const void *buffer, uint64
 		oxTracef("ox.fs.PassThroughFS.read.error", "Write of {} failed: {}", path, f.what());
 		return ox::Error(1);
 	}
-	return {};
+	return ox::Error(0);
 }

 Error PassThroughFS::writeFileInode(uint64_t, const void*, uint64_t, FileType) noexcept {
@@ -206,7 +185,8 @@ Error PassThroughFS::writeFileInode(uint64_t, const void*, uint64_t, FileType) n
 }

 std::string_view PassThroughFS::stripSlash(StringView path) noexcept {
-	for (auto i = 0u; i < path.size() && path[0] == '/'; i++) {
+	const auto pathLen = ox::strlen(path);
+	for (auto i = 0u; i < pathLen && path[0] == '/'; i++) {
 		path = substr(path, 1);
 	}
 	return {path.data(), path.bytes()};
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -45,6 +45,8 @@ class PassThroughFS: public FileSystem {
 		template<typename F>
 		Error ls(StringViewCR dir, F cb) const noexcept;

+		Error remove(StringViewCR path, bool recursive) noexcept override;
+
 		Error resize(uint64_t size, void *buffer) noexcept override;

 		Result<FileStat> statInode(uint64_t inode) const noexcept override;
@@ -71,13 +73,8 @@ class PassThroughFS: public FileSystem {

 		Error readFileInode(uint64_t inode, void *buffer, std::size_t size) noexcept override;

-		Error readFilePathRange(
-			StringViewCR path, size_t readStart, size_t readSize, void *buffer, size_t *buffSize) noexcept override;
-
 		Error readFileInodeRange(uint64_t inode, std::size_t readStart, std::size_t readSize, void *buffer, std::size_t *size) noexcept override;

-		Error removePath(StringViewCR path, bool recursive) noexcept override;
-
 		Error writeFilePath(StringViewCR path, const void *buffer, uint64_t size, FileType fileType) noexcept override;

 		Error writeFileInode(uint64_t inode, const void *buffer, uint64_t size, FileType fileType) noexcept override;
@@ -99,7 +96,7 @@ Error PassThroughFS::ls(StringViewCR dir, F cb) const noexcept {
 	for (auto &p : di) {
 		OX_RETURN_ERROR(cb(p.path().filename().c_str(), 0));
 	}
-	return {};
+	return ox::Error(0);
 }

 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -9,7 +9,7 @@
 #include <ox/std/memops.hpp>
 #include <ox/std/strops.hpp>
 #include <ox/std/trace.hpp>
-#include <ox/fs/filesystem/pathiterator.hpp>
+#include "pathiterator.hpp"

 OX_CLANG_NOWARN_BEGIN(-Wunsafe-buffer-usage)

@@ -36,7 +36,7 @@ Error PathIterator::dirPath(char *out, std::size_t outSize) {
 	if (idx >= 0 && size < outSize) {
 		ox::memcpy(out, m_path, size);
 		out[size] = 0;
-		return {};
+		return ox::Error(0);
 	} else {
 		return ox::Error(1);
 	}
@@ -74,7 +74,7 @@ Error PathIterator::get(StringView &fileName) {
 	if (size && fileName[size - 1] == '/') {
 		fileName = ox::substr(m_path, start, start + size - 1);
 	}
-	oxAssert(fileName[fileName.size()-1] != '/', "name ends in /");
+	oxAssert(fileName[fileName.len()-1] != '/', "name ends in /");
 	return {};
 }

@@ -85,7 +85,7 @@ Error PathIterator::next(StringView &fileName) {
 	std::size_t size = 0;
 	auto retval = ox::Error(1);
 	if (m_iterator < m_maxSize && ox::strlen(&m_path[m_iterator])) {
-		retval = {};
+		retval = ox::Error(0);
 		if (m_path[m_iterator] == '/') {
 			m_iterator++;
 		}
@@ -104,11 +104,11 @@ Error PathIterator::next(StringView &fileName) {
 		}
 		fileName = ox::substr(m_path, start, start + size);
 		// truncate trailing /
-		while (fileName.size() && fileName[fileName.size() - 1] == '/') {
+		while (fileName.len() && fileName[fileName.len() - 1] == '/') {
 			fileName = ox::substr(m_path, start, start + size);
 		}
 		m_iterator += size;
-		oxAssert(fileName.size() == 0 || fileName[fileName.size()-1] != '/', "name ends in /");
+		oxAssert(fileName.len() == 0 || fileName[fileName.len()-1] != '/', "name ends in /");
 	}
 	return retval;
 }
@@ -118,7 +118,7 @@ Result<std::size_t> PathIterator::nextSize() const {
 	auto retval = ox::Error(1);
 	auto it = m_iterator;
 	if (it < m_maxSize && ox::strlen(&m_path[it])) {
-		retval = {};
+		retval = ox::Error(0);
 		if (m_path[it] == '/') {
 			it++;
 		}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -354,7 +354,7 @@ Error NodeBuffer<size_t, Item>::free(ItemPtr item) noexcept {
 		}
 	}
 	m_header.bytesUsed -= item.size();
-	return {};
+	return ox::Error(0);
 }

 template<typename size_t, typename Item>
@@ -370,7 +370,7 @@ Error NodeBuffer<size_t, Item>::setSize(std::size_t size) noexcept {
 		m_header.size = static_cast<size_t>(size);
 		auto data = reinterpret_cast<uint8_t*>(this) + end;
 		ox::memset(data, 0, size - end);
-		return {};
+		return ox::Error(0);
 	}
 }

@@ -422,7 +422,7 @@ Error NodeBuffer<size_t, Item>::compact(F cb) noexcept {
 		src = ptr(dest->next);
 		dest = uninitializedPtr(dest.offset() + dest->fullSize());
 	}
-	return {};
+	return ox::Error(0);
 }

 template<typename size_t, typename Item>
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -59,7 +59,7 @@ const std::map<ox::StringView, std::function<ox::Error(ox::StringView)>> tests =
 			"PathIterator::next1",
 			[](ox::StringView) {
 				auto constexpr path = ox::StringLiteral("/usr/share/charset.gbag");
-				ox::PathIterator it(path.c_str(), path.size());
+				ox::PathIterator it(path.c_str(), path.len());
 				ox::StringView buff;
 				oxAssert(it.next(buff) == 0 && buff == "usr", "PathIterator shows wrong next");
 				oxAssert(it.next(buff) == 0 && buff == "share", "PathIterator shows wrong next");
@@ -74,9 +74,9 @@ const std::map<ox::StringView, std::function<ox::Error(ox::StringView)>> tests =
 				ox::PathIterator it(path);
 				ox::StringView buff;
 				oxAssert(it.next(buff), "PathIterator::next returned error");
-				ox::expect(buff, "usr");
+				oxExpect(buff, "usr");
 				oxAssert(it.next(buff), "PathIterator::next returned error");
-				ox::expect(buff, "share");
+				oxExpect(buff, "share");
 				return ox::Error(0);
 			}
 		},
@@ -84,7 +84,7 @@ const std::map<ox::StringView, std::function<ox::Error(ox::StringView)>> tests =
 			"PathIterator::next3",
 			[](ox::StringView) {
 				auto const path = ox::String("/");
-				ox::PathIterator it(path.c_str(), path.size());
+				ox::PathIterator it(path.c_str(), path.len());
 				ox::StringView buff;
 				oxAssert(it.next(buff) == 0 && buff == "\0", "PathIterator shows wrong next");
 				return ox::Error(0);
@@ -106,7 +106,7 @@ const std::map<ox::StringView, std::function<ox::Error(ox::StringView)>> tests =
 			"PathIterator::next5",
 			[](ox::StringView) {
 				auto const path = ox::String("usr/share/");
-				ox::PathIterator it(path.c_str(), path.size());
+				ox::PathIterator it(path.c_str(), path.len());
 				ox::StringView buff;
 				oxAssert(it.next(buff) == 0 && buff == "usr", "PathIterator shows wrong next");
 				oxAssert(it.next(buff) == 0 && buff == "share", "PathIterator shows wrong next");
@@ -117,11 +117,9 @@ const std::map<ox::StringView, std::function<ox::Error(ox::StringView)>> tests =
 			"PathIterator::dirPath",
 			[] (ox::StringView) {
 				auto constexpr path = ox::StringLiteral("/usr/share/charset.gbag");
-				ox::PathIterator it(path.c_str(), path.size());
-				auto buff = static_cast<char*>(ox_alloca(path.size() + 1));
-				OX_ALLOW_UNSAFE_BUFFERS_BEGIN
-				oxAssert(it.dirPath(buff, path.size()) == 0 && ox::strcmp(buff, "/usr/share/") == 0, "PathIterator shows incorrect dir path");
-				OX_ALLOW_UNSAFE_BUFFERS_END
+				ox::PathIterator it(path.c_str(), path.len());
+				auto buff = static_cast<char*>(ox_alloca(path.len() + 1));
+				oxAssert(it.dirPath(buff, path.len()) == 0 && ox::strcmp(buff, "/usr/share/") == 0, "PathIterator shows incorrect dir path");
 				return ox::Error(0);
 			}
 		},
@@ -129,9 +127,7 @@ const std::map<ox::StringView, std::function<ox::Error(ox::StringView)>> tests =
 			"PathIterator::hasNext",
 			[](ox::StringView) {
 				const auto path = "/file1";
-				OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 				ox::PathIterator it(path, ox::strlen(path));
-				OX_ALLOW_UNSAFE_BUFFERS_END
 				oxAssert(it.hasNext(), "PathIterator shows incorrect hasNext");
 				oxAssert(!it.next().hasNext(), "PathIterator shows incorrect hasNext");
 				return ox::Error(0);
@@ -167,16 +163,14 @@ const std::map<ox::StringView, std::function<ox::Error(ox::StringView)>> tests =
 			[](ox::StringView) {
 				constexpr auto buffLen = 5000;
 				constexpr auto str1 = "Hello, World!";
-				OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 				constexpr auto str1Len = ox::strlen(str1) + 1;
 				constexpr auto str2 = "Hello, Moon!";
 				constexpr auto str2Len = ox::strlen(str2) + 1;
-				OX_ALLOW_UNSAFE_BUFFERS_END
 				auto list = new (ox_alloca(buffLen)) ox::ptrarith::NodeBuffer<uint32_t, ox::FileStoreItem<uint32_t>>(buffLen);
 				oxAssert(ox::FileStore32::format(list, buffLen), "FileStore::format failed.");
 				ox::FileStore32 fileStore(list, buffLen);
-				oxAssert(fileStore.write(4, str1, str1Len, 1), "FileStore::write 1 failed.");
-				oxAssert(fileStore.write(5, str2, str2Len, 1), "FileStore::write 2 failed.");
+				oxAssert(fileStore.write(4, const_cast<char*>(str1), str1Len, 1), "FileStore::write 1 failed.");
+				oxAssert(fileStore.write(5, const_cast<char*>(str2), str2Len, 1), "FileStore::write 2 failed.");

 				char str1Read[str1Len];
 				size_t str1ReadSize = 0;
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -34,7 +34,7 @@ static ox::Result<Buff> loadFsBuff(const char *path) noexcept {
 	}
 }

-static ox::Result<ox::UPtr<ox::FileSystem>> loadFs(const char *path) noexcept {
+static ox::Result<ox::UniquePtr<ox::FileSystem>> loadFs(const char *path) noexcept {
 	OX_REQUIRE(buff, loadFsBuff(path));
 	return {ox::make_unique<ox::FileSystem32>(buff.data, buff.size)};
 }
@@ -48,7 +48,7 @@ static ox::Error runLs(ox::FileSystem *fs, ox::Span<const char*> args) noexcept
 	for (const auto &file : files) {
 		oxOutf("{}\n", file);
 	}
-	return {};
+	return ox::Error(0);
 }

 static ox::Error runRead(ox::FileSystem *fs, ox::Span<const char*> args) noexcept {
@@ -57,10 +57,8 @@ static ox::Error runRead(ox::FileSystem *fs, ox::Span<const char*> args) noexcep
 		return ox::Error(1);
 	}
 	OX_REQUIRE(buff, fs->read(ox::StringView(args[1])));
-	OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 	std::ignore = fwrite(buff.data(), sizeof(decltype(buff)::value_type), buff.size(), stdout);
-	OX_ALLOW_UNSAFE_BUFFERS_END
-	return {};
+	return ox::Error(0);
 }

 static ox::Error run(int argc, const char **argv) noexcept {
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.10)

 add_library(
 	OxLogConn
-		src/logconn.cpp
+		logconn.cpp
 )

 set_property(
@@ -24,16 +24,12 @@ target_link_libraries(
 		$<$<BOOL:${OX_OS_WINDOWS}>:ws2_32>
 )

-target_include_directories(
-	OxLogConn PUBLIC
-		include
-)
-
 install(
-	DIRECTORY
-		include/ox
+	FILES
+		circularbuff.hpp
+		logconn.hpp
 	DESTINATION
-		include
+		include/ox/logconn
 )

 install(
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -14,7 +14,7 @@
    { \
 		const auto loggerErr = (loggerName).initConn(appName); \
 		if (loggerErr) { \
-			oxErrf("Could not connect to logger: {} ({}:{})\n", toStr(loggerErr), loggerErr.src.file_name(), loggerErr.src.line()); \
+			oxErrf("Could not connect to logger: {} ({}:{})\n", toStr(loggerErr), loggerErr.file, loggerErr.line); \
 		} else { \
 			ox::trace::setLogger(&(loggerName)); \
 		} \
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -23,7 +23,7 @@
 #endif


-#include <ox/logconn/logconn.hpp>
+#include "logconn.hpp"


 namespace ox {
@@ -91,28 +91,23 @@ ox::Error LoggerConn::sendInit(const InitTraceMsg &msg) noexcept {
 }

 void LoggerConn::msgSend() noexcept {
-	try {
+	while (true) {
+		std::unique_lock lk(m_waitMut);
+		m_waitCond.wait(lk);
+		if (!m_running) {
+			break;
+		}
+		std::lock_guard const buffLk(m_buffMut);
 		while (true) {
-			std::unique_lock lk(m_waitMut);
-			m_waitCond.wait(lk);
-			if (!m_running) {
+			Array<char, units::KB> tmp;
+			const auto read = m_buff.read(tmp.data(), tmp.size());
+			if (!read) {
 				break;
 			}
-			std::lock_guard const buffLk(m_buffMut);
-			while (true) {
-				Array<char, units::KB> tmp;
-				const auto read = m_buff.read(tmp.data(), tmp.size());
-				if (!read) {
-					break;
-				}
-				oxAssert(read <= tmp.size(), "logger trying to read too much data");
-				//std::printf("LoggerConn: sending %lu bytes\n", read);
-				std::ignore = send(tmp.data(), read);
-			}
+			oxAssert(read <= tmp.size(), "logger trying to read too much data");
+			//std::printf("LoggerConn: sending %lu bytes\n", read);
+			std::ignore = send(tmp.data(), read);
 		}
-	} catch (std::exception const &e) {
-		oxErrf("Exception in logger thread: {}\n", e.what());
-		oxAssert(false, "logger thread exception");
 	}
 }

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -1,7 +1,8 @@
 add_library(
 	OxMetalClaw
-		src/read.cpp
-		src/write.cpp
+		presenceindicator.cpp
+		read.cpp
+		write.cpp
 )

 if(NOT MSVC)
@@ -24,22 +25,22 @@ if(NOT OX_BARE_METAL)
 	)
 endif()

-target_include_directories(
-	OxMetalClaw PUBLIC
-		include
-)
-
 install(
-	DIRECTORY
-		include/ox
+	FILES
+		intops.hpp
+		err.hpp
+		mc.hpp
+		presenceindicator.hpp
+		read.hpp
+		types.hpp
+		write.hpp
 	DESTINATION
-		include
+		include/ox/mc
 )

-install(
-	TARGETS OxMetalClaw
-	LIBRARY DESTINATION lib
-	ARCHIVE DESTINATION lib
+install(TARGETS OxMetalClaw
+        LIBRARY DESTINATION lib
+        ARCHIVE DESTINATION lib
 )

 if(OX_RUN_TESTS)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -18,25 +18,25 @@

 namespace ox::mc {

-template<Integer_c T>
+template<typename T>
 static constexpr auto Bits = sizeof(T) << 3;

 /**
 * Returns highest bit other than possible signed bit.
 * Bit numbering starts at 0.
 */
-template<Integer_c I>
+template<typename I>
 [[nodiscard]]
-constexpr size_t highestBit(I const val) noexcept {
+constexpr std::size_t highestBit(I val) noexcept {
 	unsigned shiftStart = sizeof(I) * 8 - 1;
-	// find the most significant non-sign indicator bit
-	size_t highestBit = 0;
+	// find most significant non-sign indicator bit
+	std::size_t highestBit = 0;
 	// start at one bit lower if signed
 	if constexpr(is_signed_v<I>) {
 		--shiftStart;
 	}
 	for (auto i = shiftStart; i > 0; --i) {
-		auto const bitValue = (val >> i) & 1;
+		const auto bitValue = (val >> i) & 1;
 		if (bitValue) {
 			highestBit = i;
 			break;
@@ -45,7 +45,7 @@ constexpr size_t highestBit(I const val) noexcept {
 	return highestBit;
 }

-static_assert(highestBit(static_cast<int8_t>(0b10000000)) == 0);
+static_assert(highestBit(int8_t(0b10000000)) == 0);
 static_assert(highestBit(~static_cast<int8_t>(-1)) == 0);
 static_assert(highestBit(~static_cast<int8_t>(-2)) == 0);
 static_assert(highestBit(~static_cast<int8_t>(-3)) == 1);
@@ -53,39 +53,40 @@ static_assert(highestBit(1) == 0);
 static_assert(highestBit(2) == 1);
 static_assert(highestBit(4) == 2);
 static_assert(highestBit(8) == 3);
-static_assert(highestBit(static_cast<uint64_t>(1) << 31) == 31);
-static_assert(highestBit(static_cast<uint64_t>(1) << 63) == 63);
+static_assert(highestBit(uint64_t(1) << 31) == 31);
+static_assert(highestBit(uint64_t(1) << 63) == 63);

 struct McInt {
-	Array<uint8_t, 9> data{};
+	ox::Array<uint8_t, 9> data{};
 	// length of integer in bytes
-	size_t length = 0;
+	std::size_t length = 0;
 };

-template<Integer_c I>
+template<typename I>
 [[nodiscard]]
-constexpr McInt encodeInteger(I const pInput) noexcept {
-	auto const input = ResizedInt_t<I, 64>{pInput};
+constexpr McInt encodeInteger(I pInput) noexcept {
+	auto const input = ox::ResizedInt_t<I, 64>{pInput};
 	McInt out;
-	auto const inputNegative = is_signed_v<I> && input < 0;
-	// move input to uint64_t to allow consistent bit manipulation and to avoid
+	const auto inputNegative = is_signed_v<I> && input < 0;
+	// move input to uint64_t to allow consistent bit manipulation, and to avoid
 	// overflow concerns
-	auto const val = std::bit_cast<uint64_t>(input);
+	uint64_t val = 0;
+	ox::memcpy(&val, &input, sizeof(input));
 	if (val) {
 		// bits needed to represent number factoring in space possibly
 		// needed for signed bit
-		auto const highBit = inputNegative ? highestBit(~val) : highestBit(val);
-		auto const bits = highBit + 1 + (is_signed_v<I> ? 1 : 0);
+		const auto highBit = inputNegative ? highestBit(~val) : highestBit(val);
+		const auto bits = highBit + 1 + (is_signed_v<I> ? 1 : 0);
 		// bytes needed to store value
-		size_t bytes = bits / 8 + (bits % 8 != 0);
-		auto const bitsAvailable = bytes * 8; // bits available to integer value
-		auto const bitsNeeded = bits + bytes;
+		std::size_t bytes = bits / 8 + (bits % 8 != 0);
+		const auto bitsAvailable = bytes * 8; // bits available to integer value
+		const auto bitsNeeded = bits + bytes;
 		// factor in bits needed for bytesIndicator (does not affect bytesIndicator)
 		// bits for integer + bits needed to represent bytes > bits available
 		if (bitsNeeded > bitsAvailable && bytes != 9) {
 			++bytes;
 		}
-		auto const bytesIndicator = onMask<uint8_t>(bytes - 1);
+		const auto bytesIndicator = onMask<uint8_t>(bytes - 1);
 		// ensure we are copying from little endian representation
 		LittleEndian<uint64_t> leVal = val;
 		if (inputNegative) {
@@ -93,21 +94,17 @@ constexpr McInt encodeInteger(I const pInput) noexcept {
 		}
 		if (bytes == 9) {
 			out.data[0] = bytesIndicator;
-			OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 			ox::memcpy(&out.data[1], &leVal, 8);
-			OX_ALLOW_UNSAFE_BUFFERS_END
 			if (inputNegative) {
 				out.data[1] |= 0b1000'0000;
 			}
 		} else {
-			auto const valBits = bytes * 8;
-			uint64_t const negBit = inputNegative ? 1 : 0;
-			auto const intermediate =
+			const auto valBits = bytes * 8;
+			uint64_t negBit = inputNegative ? 1 : 0;
+			auto intermediate =
 				static_cast<uint64_t>(leVal.raw() | (negBit << (valBits - 1))) << bytes |
 				static_cast<uint64_t>(bytesIndicator);
-			OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 			ox::memcpy(&out.data[0], &intermediate, sizeof(intermediate));
-			OX_ALLOW_UNSAFE_BUFFERS_END
 		}
 		out.length = bytes;
 	}
@@ -119,8 +116,8 @@ constexpr McInt encodeInteger(I const pInput) noexcept {
 * length integer.
 */
 [[nodiscard]]
-constexpr size_t countBytes(unsigned const b) noexcept {
-	size_t i = 0;
+constexpr std::size_t countBytes(unsigned b) noexcept {
+	std::size_t i = 0;
 	while ((b >> i) & 1) ++i;
 	return i + 1;
 }
@@ -135,65 +132,61 @@ static_assert(countBytes(0b0011'1111) == 7);
 static_assert(countBytes(0b0111'1111) == 8);
 static_assert(countBytes(0b1111'1111) == 9);

-template<Integer_c I>
-constexpr Result<I> decodeInteger(Reader_c auto &rdr, size_t &bytesRead) noexcept {
+template<typename I>
+constexpr Result<I> decodeInteger(Reader_c auto&rdr, std::size_t *bytesRead) noexcept {
 	uint8_t firstByte = 0;
 	OX_RETURN_ERROR(rdr.read(&firstByte, 1));
 	OX_RETURN_ERROR(rdr.seekg(-1, ox::ios_base::cur));
-	auto const bytes = countBytes(firstByte);
+	const auto bytes = countBytes(firstByte);
 	if (bytes == 9) {
-		bytesRead = bytes;
+		*bytesRead = bytes;
 		I out = 0;
 		OX_RETURN_ERROR(rdr.seekg(1, ox::ios_base::cur));
 		OX_RETURN_ERROR(rdr.read(&out, sizeof(I)));
 		return fromLittleEndian<I>(out);
 	}
-	bytesRead = bytes;
+	*bytesRead = bytes;
 	uint64_t decoded = 0;
 	OX_RETURN_ERROR(rdr.read(&decoded, bytes));
 	decoded >>= bytes;
 	// move sign bit
 	if constexpr(is_signed_v<I>) {
-		auto const negBit = bytes * 8 - bytes - 1;
-		// move sign
-		auto const negative = (decoded >> negBit) == 1;
-		if (negative) {
-			// fill in all bits between encoded sign and real sign with 1s
-			// split it up because the 32-bit ARM can't shift more than 32 bits
-			Array<uint32_t, 2> d = {};
-			//d[0] = decoded & 0xffff'ffff;
-			//d[1] = decoded >> 32;
-		 	OX_ALLOW_UNSAFE_BUFFERS_BEGIN
-			ox::memcpy(&d[0], &decoded, sizeof(decoded));
-		 	OX_ALLOW_UNSAFE_BUFFERS_END
-			auto bit = negBit;
-			for (; bit < ox::min<size_t>(Bits<I>, 32); ++bit) {
-				d[0] |= 1 << bit;
-			}
-			bit -= 32;
-			for (; bit < Bits<I>; ++bit) {
-				d[1] |= 1 << bit;
-			}
-			I out = 0;
-			if constexpr(ox::defines::BigEndian) {
-				auto const d0Tmp = d[0];
-				d[0] = d[1];
-				d[1] = d0Tmp;
-			}
-		 	OX_ALLOW_UNSAFE_BUFFERS_BEGIN
-			ox::memcpy(&out, &d[0], sizeof(out));
-			OX_ALLOW_UNSAFE_BUFFERS_END
-			return out;
-		}
+		 const auto negBit = bytes * 8 - bytes - 1;
+		 // move sign
+		 const auto negative = (decoded >> negBit) == 1;
+		 if (negative) {
+			 // fill in all bits between encoded sign and real sign with 1s
+			 // split it up because the 32-bit ARM can't shift more than 32 bits
+			 ox::Array<uint32_t, 2> d = {};
+			 //d[0] = decoded & 0xffff'ffff;
+			 //d[1] = decoded >> 32;
+			 ox::memcpy(&d[0], &decoded, sizeof(decoded));
+			 auto bit = negBit;
+			 for (; bit < ox::min<std::size_t>(Bits<I>, 32); ++bit) {
+				 d[0] |= 1 << bit;
+			 }
+			 bit -= 32;
+			 for (; bit < Bits<I>; ++bit) {
+				 d[1] |= 1 << bit;
+			 }
+			 I out = 0;
+			 if constexpr(ox::defines::BigEndian) {
+				 const auto d0Tmp = d[0];
+				 d[0] = d[1];
+				 d[1] = d0Tmp;
+			 }
+			 ox::memcpy(&out, &d[0], sizeof(out));
+			 return out;
+		 }
 	}
 	return static_cast<I>(decoded);
 }

-template<Integer_c I>
-Result<I> decodeInteger(McInt const &m) noexcept {
-	size_t bytesRead{};
+template<typename I>
+Result<I> decodeInteger(McInt m) noexcept {
+	std::size_t bytesRead{};
 	BufferReader br({reinterpret_cast<const char*>(m.data.data()), 9});
-	return decodeInteger<I>(br, bytesRead);
+	return decodeInteger<I>(br, &bytesRead);
 }

 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2015 - 2024 gary@drinkingtea.net
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+#include "err.hpp"
+#include "presenceindicator.hpp"
+
+namespace ox {
+
+template class FieldBitmapWriterBase<uint8_t*>;
+template class FieldBitmapWriterBase<const uint8_t*>;
+
+}
@@ -0,0 +1,163 @@
+/*
+ * Copyright 2015 - 2024 gary@drinkingtea.net
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+#pragma once
+
+#include <ox/std/array.hpp>
+#include <ox/std/bit.hpp>
+#include <ox/std/error.hpp>
+#include <ox/std/types.hpp>
+#include <ox/std/reader.hpp>
+
+#include "err.hpp"
+
+namespace ox {
+
+template<Reader_c Reader>
+class FieldBitmapReader {
+	protected:
+		mutable std::size_t m_mapBlockIdx = ~std::size_t{0};
+		mutable uint64_t m_mapBlock = 0;
+		std::size_t m_mapStart = 0;
+		Reader &m_reader;
+
+	public:
+		explicit constexpr FieldBitmapReader(Reader &reader) noexcept;
+
+		constexpr Result<bool> get(std::size_t i) const noexcept;
+
+	private:
+		constexpr ox::Error loadMapBlock(std::size_t id) const noexcept;
+
+};
+
+template<Reader_c Reader>
+constexpr FieldBitmapReader<Reader>::FieldBitmapReader(Reader &reader) noexcept:
+	m_mapStart(reader.tellg()),
+	m_reader(reader) {
+}
+
+template<Reader_c Reader>
+constexpr Result<bool> FieldBitmapReader<Reader>::get(std::size_t idx) const noexcept {
+	constexpr auto blockBits = sizeof(m_mapBlock);
+	auto const blockIdx = idx / blockBits;
+	if (m_mapBlockIdx != blockIdx) [[unlikely]] {
+		OX_RETURN_ERROR(loadMapBlock(blockIdx));
+	}
+	idx %= blockBits;
+	return (m_mapBlock >> idx) & 1;
+}
+
+template<Reader_c Reader>
+constexpr ox::Error FieldBitmapReader<Reader>::loadMapBlock(std::size_t idx) const noexcept {
+	OX_REQUIRE(g, m_reader.tellg());
+	OX_RETURN_ERROR(m_reader.seekg(static_cast<int>(m_mapStart + idx), ox::ios_base::beg));
+	ox::Array<char, sizeof(m_mapBlock)> mapBlock{};
+	OX_RETURN_ERROR(m_reader.read(mapBlock.data(), sizeof(m_mapBlock)));
+	// Warning: narrow-conv
+	OX_RETURN_ERROR(m_reader.seekg(static_cast<int>(g), ox::ios_base::beg));
+	m_mapBlock = 0;
+	for (auto i = 0ull; auto b : mapBlock) {
+		m_mapBlock |= static_cast<uint64_t>(std::bit_cast<uint8_t>(b)) << i;
+		i += 8;
+	}
+	m_mapBlockIdx = idx;
+	return {};
+}
+
+
+template<typename T>
+class FieldBitmapWriterBase {
+	protected:
+		T m_map = nullptr;
+		std::size_t m_mapLen = 0;
+
+	public:
+		constexpr FieldBitmapWriterBase(T map, std::size_t maxLen) noexcept;
+
+		constexpr auto setBuffer(T map, std::size_t maxLen) noexcept;
+
+		constexpr Result<bool> get(std::size_t i) const noexcept;
+
+		constexpr void setFields(int) noexcept;
+
+		constexpr void setMaxLen(int) noexcept;
+
+		[[nodiscard]]
+		constexpr int64_t getMaxLen() const noexcept;
+
+};
+
+template<typename T>
+constexpr FieldBitmapWriterBase<T>::FieldBitmapWriterBase(T map, std::size_t maxLen) noexcept {
+	m_map = map;
+	m_mapLen = maxLen;
+}
+
+template<typename T>
+constexpr auto FieldBitmapWriterBase<T>::setBuffer(T map, std::size_t maxLen) noexcept {
+	m_map = map;
+	m_mapLen = maxLen;
+}
+
+template<typename T>
+constexpr Result<bool> FieldBitmapWriterBase<T>::get(std::size_t i) const noexcept {
+	if (i / 8 < m_mapLen) {
+		return (m_map[i / 8] >> (i % 8)) & 1;
+	} else {
+		return ox::Error(McPresenceMapOverflow);
+	}
+}
+
+template<typename T>
+constexpr void FieldBitmapWriterBase<T>::setFields(int fields) noexcept {
+	m_mapLen = static_cast<std::size_t>((fields / 8 + 1) - (fields % 8 == 0));
+}
+
+template<typename T>
+constexpr void FieldBitmapWriterBase<T>::setMaxLen(int maxLen) noexcept {
+	m_mapLen = static_cast<std::size_t>(maxLen);
+}
+
+template<typename T>
+constexpr int64_t FieldBitmapWriterBase<T>::getMaxLen() const noexcept {
+	return static_cast<int64_t>(m_mapLen);
+}
+
+extern template class FieldBitmapWriterBase<uint8_t*>;
+extern template class FieldBitmapWriterBase<const uint8_t*>;
+
+class FieldBitmap: public FieldBitmapWriterBase<uint8_t*> {
+
+	public:
+		constexpr FieldBitmap(uint8_t *map, std::size_t maxLen) noexcept;
+
+		constexpr Error set(std::size_t i, bool on) noexcept;
+
+};
+
+constexpr FieldBitmap::FieldBitmap(uint8_t *map, std::size_t maxLen) noexcept:
+	FieldBitmapWriterBase<uint8_t*>(map, maxLen) {
+}
+
+constexpr Error FieldBitmap::set(std::size_t i, bool on) noexcept {
+	if (i / 8 < m_mapLen) {
+OX_ALLOW_UNSAFE_BUFFERS_BEGIN
+		if (on) {
+			m_map[i / 8] |= 1 << (i % 8);
+		} else {
+			m_map[i / 8] &= ~static_cast<uint8_t>(1 << (i % 8));
+		}
+OX_ALLOW_UNSAFE_BUFFERS_END
+		return {};
+	} else {
+		return ox::Error(McPresenceMapOverflow);
+	}
+}
+
+}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -10,7 +10,7 @@
 #include <ox/std/buffer.hpp>
 #include <ox/std/reader.hpp>

-#include <ox/mc/read.hpp>
+#include "read.hpp"

 namespace ox {

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -32,58 +32,58 @@ class MetalClawReaderTemplate: public ModelHandlerBase<MetalClawReaderTemplate<R

 	private:
 		FieldBitmapReader<Reader> m_fieldPresence;
-		size_t m_fields{};
-		size_t m_field{};
-		Optional<int> const m_unionIdx{};
+		std::size_t m_fields = 0;
+		std::size_t m_field = 0;
+		ox::Optional<int> m_unionIdx;
 		Reader &m_reader;

 	public:
 		explicit constexpr MetalClawReaderTemplate(
 				Reader &reader,
-				Optional<int> const &unionIdx = {}) noexcept;
+				ox::Optional<int> const&unionIdx = {}) noexcept;

 		constexpr ~MetalClawReaderTemplate() noexcept;

-		constexpr Error field(CString, int8_t *val) noexcept;
-		constexpr Error field(CString, int16_t *val) noexcept;
-		constexpr Error field(CString, int32_t *val) noexcept;
-		constexpr Error field(CString, int64_t *val) noexcept;
+		constexpr Error field(const char*, int8_t *val) noexcept;
+		constexpr Error field(const char*, int16_t *val) noexcept;
+		constexpr Error field(const char*, int32_t *val) noexcept;
+		constexpr Error field(const char*, int64_t *val) noexcept;

-		constexpr Error field(CString, uint8_t *val) noexcept;
-		constexpr Error field(CString, uint16_t *val) noexcept;
-		constexpr Error field(CString, uint32_t *val) noexcept;
-		constexpr Error field(CString, uint64_t *val) noexcept;
+		constexpr Error field(const char*, uint8_t *val) noexcept;
+		constexpr Error field(const char*, uint16_t *val) noexcept;
+		constexpr Error field(const char*, uint32_t *val) noexcept;
+		constexpr Error field(const char*, uint64_t *val) noexcept;

-		constexpr Error field(CString, bool *val) noexcept;
+		constexpr Error field(const char*, bool *val) noexcept;

 		// array handler
-		constexpr Error field(CString, auto *val, size_t valLen) noexcept;
+		constexpr Error field(const char*, auto *val, std::size_t len) noexcept;

 		// map handler
 		template<typename T>
-		constexpr Error field(CString, HashMap<String, T> *val) noexcept;
+		constexpr Error field(const char*, HashMap<String, T> *val) noexcept;

 		// array handler, with callback to allow handling individual elements
 		template<typename T, typename CB>
-		constexpr Error field(CString, CB cb) noexcept;
+		constexpr Error field(const char*, CB cb) noexcept;

 		template<typename T>
-		constexpr Error field(CString, T *val) noexcept;
+		constexpr Error field(const char*, T *val) noexcept;

 		template<typename U, bool force>
-		constexpr Error field(CString, UnionView<U, force> val) noexcept;
+		constexpr Error field(const char*, UnionView<U, force> val) noexcept;

-		template<size_t SmallStringSize>
-		constexpr Error field(CString, BasicString<SmallStringSize> *val) noexcept;
+		template<std::size_t SmallStringSize>
+		constexpr Error field(const char*, BasicString<SmallStringSize> *val) noexcept;

-		template<size_t L>
-		constexpr Error field(CString, IString<L> *val) noexcept;
+		template<std::size_t L>
+		constexpr Error field(const char*, IString<L> *val) noexcept;

-		constexpr Error fieldCString(CString, char *val, size_t buffLen) noexcept;
+		constexpr Error fieldCString(const char*, char *val, std::size_t buffLen) noexcept;

-		constexpr Error fieldCString(CString, char **val) noexcept;
+		constexpr Error fieldCString(const char*, char **val) noexcept;

-		constexpr Error fieldCString(CString, char **val, size_t buffLen) noexcept;
+		constexpr Error fieldCString(const char*, char **val, std::size_t buffLen) noexcept;

 		/**
 		 * Reads an array length from the current location in the buffer.
@@ -101,13 +101,13 @@ class MetalClawReaderTemplate: public ModelHandlerBase<MetalClawReaderTemplate<R
 				const char *name = T::TypeName,
 				int version = T::TypeVersion,
 				const Vector<String>& = {},
-				size_t fields = ModelFieldCount_v<T>) noexcept;
+				std::size_t fields = ModelFieldCount_v<T>) noexcept;

 		/**
 		 * Returns a MetalClawReader to parse a child object.
 		 */
 		[[nodiscard]]
-		constexpr MetalClawReaderTemplate<Reader> child(const char *name, Optional<int> unionIdx = {}) noexcept;
+		constexpr MetalClawReaderTemplate<Reader> child(const char *name, ox::Optional<int> unionIdx = {}) noexcept;

 		/**
 		 * Indicates whether or not the next field to be read is present.
@@ -122,20 +122,20 @@ class MetalClawReaderTemplate: public ModelHandlerBase<MetalClawReaderTemplate<R
 		constexpr bool fieldPresent(int fieldNo) const noexcept;

 		[[nodiscard]]
-		constexpr int whichFieldPresent(const char *name, ModelUnion const&) const noexcept;
+		constexpr int whichFieldPresent(const char *name, const ModelUnion&) const noexcept;

 		constexpr void nextField() noexcept;

 	private:
 		template<typename I>
-		constexpr Error readInteger(I &val) noexcept;
+		constexpr Error readInteger(I *val) noexcept;

 };

 template<Reader_c Reader>
 constexpr MetalClawReaderTemplate<Reader>::MetalClawReaderTemplate(
 		Reader &reader,
-		Optional<int> const &unionIdx) noexcept:
+		ox::Optional<int> const&unionIdx) noexcept:
 		m_fieldPresence(reader),
 		m_unionIdx(unionIdx),
 		m_reader(reader) {
@@ -149,72 +149,71 @@ constexpr MetalClawReaderTemplate<Reader>::~MetalClawReaderTemplate() noexcept {
 }

 template<Reader_c Reader>
-constexpr Error MetalClawReaderTemplate<Reader>::field(CString, int8_t *val) noexcept {
-	return readInteger(*val);
+constexpr Error MetalClawReaderTemplate<Reader>::field(const char*, int8_t *val) noexcept {
+	return readInteger(val);
 }

 template<Reader_c Reader>
-constexpr Error MetalClawReaderTemplate<Reader>::field(CString, int16_t *val) noexcept {
-	return readInteger(*val);
+constexpr Error MetalClawReaderTemplate<Reader>::field(const char*, int16_t *val) noexcept {
+	return readInteger(val);
 }

 template<Reader_c Reader>
-constexpr Error MetalClawReaderTemplate<Reader>::field(CString, int32_t *val) noexcept {
-	return readInteger(*val);
+constexpr Error MetalClawReaderTemplate<Reader>::field(const char*, int32_t *val) noexcept {
+	return readInteger(val);
 }

 template<Reader_c Reader>
-constexpr Error MetalClawReaderTemplate<Reader>::field(CString, int64_t *val) noexcept {
-	return readInteger(*val);
+constexpr Error MetalClawReaderTemplate<Reader>::field(const char*, int64_t *val) noexcept {
+	return readInteger(val);
 }


 template<Reader_c Reader>
-constexpr Error MetalClawReaderTemplate<Reader>::field(CString, uint8_t *val) noexcept {
-	return readInteger(*val);
+constexpr Error MetalClawReaderTemplate<Reader>::field(const char*, uint8_t *val) noexcept {
+	return readInteger(val);
 }

 template<Reader_c Reader>
-constexpr Error MetalClawReaderTemplate<Reader>::field(CString, uint16_t *val) noexcept {
-	return readInteger(*val);
+constexpr Error MetalClawReaderTemplate<Reader>::field(const char*, uint16_t *val) noexcept {
+	return readInteger(val);
 }

 template<Reader_c Reader>
-constexpr Error MetalClawReaderTemplate<Reader>::field(CString, uint32_t *val) noexcept {
-	return readInteger(*val);
+constexpr Error MetalClawReaderTemplate<Reader>::field(const char*, uint32_t *val) noexcept {
+	return readInteger(val);
 }

 template<Reader_c Reader>
-constexpr Error MetalClawReaderTemplate<Reader>::field(CString, uint64_t *val) noexcept {
-	return readInteger(*val);
+constexpr Error MetalClawReaderTemplate<Reader>::field(const char*, uint64_t *val) noexcept {
+	return readInteger(val);
 }

 template<Reader_c Reader>
-constexpr Error MetalClawReaderTemplate<Reader>::field(CString, bool *val) noexcept {
-	if (!m_unionIdx.has_value() || static_cast<size_t>(*m_unionIdx) == m_field) {
-		auto const result = m_fieldPresence.get(static_cast<size_t>(m_field));
+constexpr Error MetalClawReaderTemplate<Reader>::field(const char*, bool *val) noexcept {
+	if (!m_unionIdx.has_value() || static_cast<std::size_t>(*m_unionIdx) == m_field) {
+		auto const result = m_fieldPresence.get(static_cast<std::size_t>(m_field));
 		*val = result.value;
 		OX_RETURN_ERROR(result);
 	}
 	++m_field;
-	return {};
+	return ox::Error(0);
 }

 // array handler
 template<Reader_c Reader>
-constexpr Error MetalClawReaderTemplate<Reader>::field(
-	const char *name, auto *val, size_t const valLen) noexcept {
-	if (!m_unionIdx.has_value() || static_cast<size_t>(*m_unionIdx) == m_field) {
-		if (m_fieldPresence.get(static_cast<size_t>(m_field))) {
+constexpr Error MetalClawReaderTemplate<Reader>::field(const char *name, auto *val, std::size_t valLen) noexcept {
+	if (!m_unionIdx.has_value() || static_cast<std::size_t>(*m_unionIdx) == m_field) {
+		if (m_fieldPresence.get(static_cast<std::size_t>(m_field))) {
 			// read the length
-			size_t bytesRead = 0;
-			OX_REQUIRE(len, mc::decodeInteger<ArrayLength>(m_reader, bytesRead));
+			std::size_t bytesRead = 0;
+			OX_REQUIRE(len, mc::decodeInteger<ArrayLength>(m_reader, &bytesRead));
 			// read the list
 			if (valLen >= len) {
 				auto reader = child({});
 				auto &handler = *reader.interface();
-				OX_RETURN_ERROR(handler.setTypeInfo("List", 0, {}, static_cast<size_t>(len)));
-				for (size_t i = 0; i < len; ++i) {
+				OX_RETURN_ERROR(handler.setTypeInfo("List", 0, {}, static_cast<std::size_t>(len)));
+				for (std::size_t i = 0; i < len; ++i) {
 OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 					OX_RETURN_ERROR(handler.field({}, &val[i]));
 OX_ALLOW_UNSAFE_BUFFERS_END
@@ -231,18 +230,18 @@ OX_ALLOW_UNSAFE_BUFFERS_END

 template<Reader_c Reader>
 template<typename T>
-constexpr Error MetalClawReaderTemplate<Reader>::field(CString, HashMap<String, T> *val) noexcept {
-	if (!m_unionIdx.has_value() || static_cast<size_t>(*m_unionIdx) == m_field) {
-		if (m_fieldPresence.get(static_cast<size_t>(m_field))) {
+constexpr Error MetalClawReaderTemplate<Reader>::field(const char*, HashMap<String, T> *val) noexcept {
+	if (!m_unionIdx.has_value() || static_cast<std::size_t>(*m_unionIdx) == m_field) {
+		if (m_fieldPresence.get(static_cast<std::size_t>(m_field))) {
 			// read the length
 			OX_REQUIRE(g, m_reader.tellg());
-			size_t bytesRead = 0;
-			OX_REQUIRE(len, mc::decodeInteger<ArrayLength>(m_reader, bytesRead));
+			std::size_t bytesRead = 0;
+			OX_REQUIRE(len, mc::decodeInteger<ArrayLength>(m_reader, &bytesRead));
 			OX_RETURN_ERROR(m_reader.seekg(g));
 			// read the list
 			auto reader = child("");
 			auto &handler = *reader.interface();
-			OX_RETURN_ERROR(handler.setTypeInfo("List", 0, {}, static_cast<size_t>(len)));
+			OX_RETURN_ERROR(handler.setTypeInfo("List", 0, {}, static_cast<std::size_t>(len)));
 			// this loop body needs to be in a lambda because of the potential alloca call
 			constexpr auto loopBody = [](auto &handler, auto &val) {
 				OX_REQUIRE(keyLen, handler.stringLength(nullptr));
@@ -251,22 +250,22 @@ constexpr Error MetalClawReaderTemplate<Reader>::field(CString, HashMap<String,
 				OX_RETURN_ERROR(handler.fieldCString("", &wkeyPtr, keyLen + 1));
 				return handler.field("", &val[wkeyPtr]);
 			};
-			for (size_t i = 0; i < len; ++i) {
+			for (std::size_t i = 0; i < len; ++i) {
 				OX_RETURN_ERROR(loopBody(handler, *val));
 			}
 		}
 	}
 	++m_field;
-	return {};
+	return ox::Error(0);
 }

 template<Reader_c Reader>
 template<typename T>
 constexpr Error MetalClawReaderTemplate<Reader>::field(const char *name, T *val) noexcept {
 	if constexpr(isVector_v<T>) {
-		if (!m_unionIdx.has_value() || static_cast<size_t>(*m_unionIdx) == m_field) {
+		if (!m_unionIdx.has_value() || static_cast<std::size_t>(*m_unionIdx) == m_field) {
 			// set size of val if the field is present, don't worry about it if not
-			if (m_fieldPresence.get(static_cast<size_t>(m_field))) {
+			if (m_fieldPresence.get(static_cast<std::size_t>(m_field))) {
 				OX_REQUIRE(len, arrayLength(name, false));
 				OX_RETURN_ERROR(ox::resizeVector(*val, len));
 				return field(name, val->data(), val->size());
@@ -276,9 +275,9 @@ constexpr Error MetalClawReaderTemplate<Reader>::field(const char *name, T *val)
 		++m_field;
 		return {};
 	} else if constexpr(isArray_v<T>) {
-		if (!m_unionIdx.has_value() || static_cast<size_t>(*m_unionIdx) == m_field) {
+		if (!m_unionIdx.has_value() || static_cast<std::size_t>(*m_unionIdx) == m_field) {
 			// set size of val if the field is present, don't worry about it if not
-			if (m_fieldPresence.get(static_cast<size_t>(m_field))) {
+			if (m_fieldPresence.get(static_cast<std::size_t>(m_field))) {
 				OX_REQUIRE(len, arrayLength(name, false));
 				if (len > val->size()) {
 					return ox::Error(1, "Input array is too long");
@@ -289,8 +288,8 @@ constexpr Error MetalClawReaderTemplate<Reader>::field(const char *name, T *val)
 		++m_field;
 		return {};
 	} else {
-		if ((!m_unionIdx.has_value() || static_cast<size_t>(*m_unionIdx) == m_field) && val) {
-			if (m_fieldPresence.get(static_cast<size_t>(m_field))) {
+		if ((!m_unionIdx.has_value() || static_cast<std::size_t>(*m_unionIdx) == m_field) && val) {
+			if (m_fieldPresence.get(static_cast<std::size_t>(m_field))) {
 				auto reader = child("");
 				OX_RETURN_ERROR(model(reader.interface(), val));
 			}
@@ -302,9 +301,9 @@ constexpr Error MetalClawReaderTemplate<Reader>::field(const char *name, T *val)

 template<Reader_c Reader>
 template<typename U, bool force>
-constexpr Error MetalClawReaderTemplate<Reader>::field(CString, UnionView<U, force> val) noexcept {
-	if ((!m_unionIdx.has_value() || static_cast<size_t>(*m_unionIdx) == m_field) && val.get()) {
-		if (m_fieldPresence.get(static_cast<size_t>(m_field))) {
+constexpr Error MetalClawReaderTemplate<Reader>::field(const char*, UnionView<U, force> val) noexcept {
+	if ((!m_unionIdx.has_value() || static_cast<std::size_t>(*m_unionIdx) == m_field) && val.get()) {
+		if (m_fieldPresence.get(static_cast<std::size_t>(m_field))) {
 			auto reader = child("", ox::Optional<int>(ox::in_place, val.idx()));
 			OX_RETURN_ERROR(model(reader.interface(), val.get()));
 		}
@@ -314,13 +313,13 @@ constexpr Error MetalClawReaderTemplate<Reader>::field(CString, UnionView<U, for
 }

 template<Reader_c Reader>
-template<size_t SmallStringSize>
-constexpr Error MetalClawReaderTemplate<Reader>::field(CString, BasicString<SmallStringSize> *val) noexcept {
-	if (!m_unionIdx.has_value() || static_cast<size_t>(*m_unionIdx) == m_field) {
-		if (m_fieldPresence.get(static_cast<size_t>(m_field))) {
+template<std::size_t SmallStringSize>
+constexpr Error MetalClawReaderTemplate<Reader>::field(const char*, BasicString<SmallStringSize> *val) noexcept {
+	if (!m_unionIdx.has_value() || static_cast<std::size_t>(*m_unionIdx) == m_field) {
+		if (m_fieldPresence.get(static_cast<std::size_t>(m_field))) {
 			// read the length
-			size_t bytesRead = 0;
-			OX_REQUIRE(size, mc::decodeInteger<StringLength>(m_reader, bytesRead));
+			std::size_t bytesRead = 0;
+			OX_REQUIRE(size, mc::decodeInteger<StringLength>(m_reader, &bytesRead));
 			const auto cap = size;
 			*val = BasicString<SmallStringSize>(cap);
 			auto data = val->data();
@@ -331,17 +330,17 @@ constexpr Error MetalClawReaderTemplate<Reader>::field(CString, BasicString<Smal
 		}
 	}
 	++m_field;
-	return {};
+	return ox::Error(0);
 }

 template<Reader_c Reader>
-template<size_t L>
-constexpr Error MetalClawReaderTemplate<Reader>::field(CString, IString<L> *val) noexcept {
-	if (!m_unionIdx.has_value() || static_cast<size_t>(*m_unionIdx) == m_field) {
-		if (m_fieldPresence.get(static_cast<size_t>(m_field))) {
+template<std::size_t L>
+constexpr Error MetalClawReaderTemplate<Reader>::field(const char*, IString<L> *val) noexcept {
+	if (!m_unionIdx.has_value() || static_cast<std::size_t>(*m_unionIdx) == m_field) {
+		if (m_fieldPresence.get(static_cast<std::size_t>(m_field))) {
 			// read the length
-			size_t bytesRead = 0;
-			OX_REQUIRE(size, mc::decodeInteger<StringLength>(m_reader, bytesRead));
+			std::size_t bytesRead = 0;
+			OX_REQUIRE(size, mc::decodeInteger<StringLength>(m_reader, &bytesRead));
 			*val = IString<L>();
 			OX_RETURN_ERROR(val->resize(size));
 			auto const data = val->data();
@@ -356,12 +355,11 @@ constexpr Error MetalClawReaderTemplate<Reader>::field(CString, IString<L> *val)
 }

 template<Reader_c Reader>
-constexpr Error MetalClawReaderTemplate<Reader>::fieldCString(
-	CString, char *val, size_t const buffLen) noexcept {
-	if (m_fieldPresence.get(static_cast<size_t>(m_field))) {
+constexpr Error MetalClawReaderTemplate<Reader>::fieldCString(const char*, char *val, std::size_t buffLen) noexcept {
+	if (m_fieldPresence.get(static_cast<std::size_t>(m_field))) {
 		// read the length
-		size_t bytesRead = 0;
-		OX_REQUIRE(size, mc::decodeInteger<StringLength>(m_reader, bytesRead));
+		std::size_t bytesRead = 0;
+		OX_REQUIRE(size, mc::decodeInteger<StringLength>(m_reader, &bytesRead));
 		if (size > buffLen) {
 			return ox::Error(McOutputBuffEnded);
 		}
@@ -372,15 +370,15 @@ constexpr Error MetalClawReaderTemplate<Reader>::fieldCString(
 		data[size] = 0;
 	}
 	++m_field;
-	return {};
+	return ox::Error(0);
 }

 template<Reader_c Reader>
-constexpr Error MetalClawReaderTemplate<Reader>::fieldCString(CString, char **val) noexcept {
-	if (m_fieldPresence.get(static_cast<size_t>(m_field))) {
+constexpr Error MetalClawReaderTemplate<Reader>::fieldCString(const char*, char **val) noexcept {
+	if (m_fieldPresence.get(static_cast<std::size_t>(m_field))) {
 		// read the length
-		size_t bytesRead = 0;
-		OX_REQUIRE(size, mc::decodeInteger<StringLength>(m_reader, bytesRead));
+		std::size_t bytesRead = 0;
+		OX_REQUIRE(size, mc::decodeInteger<StringLength>(m_reader, &bytesRead));
 		// re-allocate in case too small
 		safeDelete(*val);
 		*val = new char[size + 1];
@@ -390,16 +388,16 @@ constexpr Error MetalClawReaderTemplate<Reader>::fieldCString(CString, char **va
 		data[size] = 0;
 	}
 	++m_field;
-	return {};
+	return ox::Error(0);
 }

 template<Reader_c Reader>
-constexpr Error MetalClawReaderTemplate<Reader>::fieldCString(CString, char **val, size_t buffLen) noexcept {
-	if (!m_unionIdx.has_value() || static_cast<size_t>(*m_unionIdx) == m_field) {
-		if (m_fieldPresence.get(static_cast<size_t>(m_field))) {
+constexpr Error MetalClawReaderTemplate<Reader>::fieldCString(const char*, char **val, std::size_t buffLen) noexcept {
+	if (!m_unionIdx.has_value() || static_cast<std::size_t>(*m_unionIdx) == m_field) {
+		if (m_fieldPresence.get(static_cast<std::size_t>(m_field))) {
 			// read the length
-			size_t bytesRead = 0;
-			OX_REQUIRE(size, mc::decodeInteger<StringLength>(m_reader, bytesRead));
+			std::size_t bytesRead = 0;
+			OX_REQUIRE(size, mc::decodeInteger<StringLength>(m_reader, &bytesRead));
 			// re-allocate if too small
 			if (buffLen < size + 1) {
 				safeDelete(*val);
@@ -418,17 +416,17 @@ constexpr Error MetalClawReaderTemplate<Reader>::fieldCString(CString, char **va
 		}
 	}
 	++m_field;
-	return {};
+	return ox::Error(0);
 }

 template<Reader_c Reader>
-constexpr Result<ArrayLength> MetalClawReaderTemplate<Reader>::arrayLength(CString, bool const pass) noexcept {
-	if (!m_unionIdx.has_value() || static_cast<size_t>(*m_unionIdx) == m_field) {
-		if (m_fieldPresence.get(static_cast<size_t>(m_field))) {
+constexpr Result<ArrayLength> MetalClawReaderTemplate<Reader>::arrayLength(const char*, bool pass) noexcept {
+	if (!m_unionIdx.has_value() || static_cast<std::size_t>(*m_unionIdx) == m_field) {
+		if (m_fieldPresence.get(static_cast<std::size_t>(m_field))) {
 			// read the length
-			size_t bytesRead = 0;
+			std::size_t bytesRead = 0;
 			OX_REQUIRE(g, m_reader.tellg());
-			OX_REQUIRE(out, mc::decodeInteger<ArrayLength>(m_reader, bytesRead));
+			OX_REQUIRE(out, mc::decodeInteger<ArrayLength>(m_reader, &bytesRead));
 			if (!pass) {
 				OX_RETURN_ERROR(m_reader.seekg(g));
 			}
@@ -439,12 +437,12 @@ constexpr Result<ArrayLength> MetalClawReaderTemplate<Reader>::arrayLength(CStri
 }

 template<Reader_c Reader>
-constexpr Result<StringLength> MetalClawReaderTemplate<Reader>::stringLength(CString) noexcept {
-	if (!m_unionIdx.has_value() || static_cast<size_t>(*m_unionIdx) == m_field) {
-		if (m_fieldPresence.get(static_cast<size_t>(m_field))) {
+constexpr Result<StringLength> MetalClawReaderTemplate<Reader>::stringLength(const char*) noexcept {
+	if (!m_unionIdx.has_value() || static_cast<std::size_t>(*m_unionIdx) == m_field) {
+		if (m_fieldPresence.get(static_cast<std::size_t>(m_field))) {
 			// read the length
-			size_t bytesRead = 0;
-			auto len = mc::decodeInteger<StringLength>(m_reader, bytesRead);
+			std::size_t bytesRead = 0;
+			auto len = mc::decodeInteger<StringLength>(m_reader, &bytesRead);
 			OX_RETURN_ERROR(m_reader.seekg(-static_cast<int64_t>(bytesRead), ox::ios_base::cur));
 			return len;
 		}
@@ -454,34 +452,34 @@ constexpr Result<StringLength> MetalClawReaderTemplate<Reader>::stringLength(CSt

 template<Reader_c Reader>
 template<typename I>
-constexpr Error MetalClawReaderTemplate<Reader>::readInteger(I &val) noexcept {
-	if (!m_unionIdx.has_value() || static_cast<size_t>(*m_unionIdx) == m_field) {
-		if (m_fieldPresence.get(static_cast<size_t>(m_field))) {
-			size_t bytesRead = 0;
-			auto const result = mc::decodeInteger<I>(m_reader, bytesRead);
+constexpr Error MetalClawReaderTemplate<Reader>::readInteger(I *val) noexcept {
+	if (!m_unionIdx.has_value() || static_cast<std::size_t>(*m_unionIdx) == m_field) {
+		if (m_fieldPresence.get(static_cast<std::size_t>(m_field))) {
+			std::size_t bytesRead = 0;
+			auto const result = mc::decodeInteger<I>(m_reader, &bytesRead);
 			OX_RETURN_ERROR(result);
-			val = result.value;
+			*val = result.value;
 		} else {
-			val = 0;
+			*val = 0;
 		}
 	}
 	++m_field;
-	return {};
+	return ox::Error(0);
 }

 template<Reader_c Reader>
 template<typename T, typename CB>
-constexpr Error MetalClawReaderTemplate<Reader>::field(CString, CB cb) noexcept {
-	if (!m_unionIdx.has_value() || static_cast<size_t>(*m_unionIdx) == m_field) {
-		if (m_fieldPresence.get(static_cast<size_t>(m_field))) {
+constexpr Error MetalClawReaderTemplate<Reader>::field(const char*, CB cb) noexcept {
+	if (!m_unionIdx.has_value() || static_cast<std::size_t>(*m_unionIdx) == m_field) {
+		if (m_fieldPresence.get(static_cast<std::size_t>(m_field))) {
 			// read the length
-			size_t bytesRead = 0;
-			OX_REQUIRE(len, mc::decodeInteger<ArrayLength>(m_reader, bytesRead));
+			std::size_t bytesRead = 0;
+			OX_REQUIRE(len, mc::decodeInteger<ArrayLength>(m_reader, &bytesRead));
 			// read the list
 			auto reader = child("");
 			auto &handler = *reader.interface();
-			OX_RETURN_ERROR(handler.setTypeInfo("List", 0, {}, static_cast<size_t>(len)));
-			for (size_t i = 0; i < len; ++i) {
+			OX_RETURN_ERROR(handler.setTypeInfo("List", 0, {}, static_cast<std::size_t>(len)));
+			for (std::size_t i = 0; i < len; ++i) {
 				T val;
 				OX_RETURN_ERROR(handler.field("", &val));
 				OX_RETURN_ERROR(cb(i, &val));
@@ -489,13 +487,13 @@ constexpr Error MetalClawReaderTemplate<Reader>::field(CString, CB cb) noexcept
 		}
 	}
 	++m_field;
-	return {};
+	return ox::Error(0);
 }

 template<Reader_c Reader>
 template<typename T>
 constexpr ox::Error MetalClawReaderTemplate<Reader>::setTypeInfo(
-		CString, int, const Vector<String>&, size_t const fields) noexcept {
+		const char*, int, const Vector<String>&, std::size_t fields) noexcept {
 	m_fields = fields;
 	// Warning: narrow-conv
 	return m_reader.seekg(
@@ -505,24 +503,24 @@ constexpr ox::Error MetalClawReaderTemplate<Reader>::setTypeInfo(

 template<Reader_c Reader>
 constexpr MetalClawReaderTemplate<Reader> MetalClawReaderTemplate<Reader>::child(
-		CString,
-		Optional<int> const unionIdx) noexcept {
+		const char*,
+		ox::Optional<int> unionIdx) noexcept {
 	return MetalClawReaderTemplate<Reader>(m_reader, unionIdx);
 }

 template<Reader_c Reader>
-constexpr bool MetalClawReaderTemplate<Reader>::fieldPresent(CString) const noexcept {
-	return m_fieldPresence.get(static_cast<size_t>(m_field)).value;
+constexpr bool MetalClawReaderTemplate<Reader>::fieldPresent(const char*) const noexcept {
+	return m_fieldPresence.get(static_cast<std::size_t>(m_field)).value;
 }

 template<Reader_c Reader>
-constexpr bool MetalClawReaderTemplate<Reader>::fieldPresent(int const fieldNo) const noexcept {
-	return m_fieldPresence.get(static_cast<size_t>(fieldNo)).value;
+constexpr bool MetalClawReaderTemplate<Reader>::fieldPresent(int fieldNo) const noexcept {
+	return m_fieldPresence.get(static_cast<std::size_t>(fieldNo)).value;
 }

 template<Reader_c Reader>
 [[nodiscard]]
-constexpr int MetalClawReaderTemplate<Reader>::whichFieldPresent(CString, ModelUnion const &u) const noexcept {
+constexpr int MetalClawReaderTemplate<Reader>::whichFieldPresent(const char*, const ModelUnion &u) const noexcept {
 	FieldBitmapReader<Reader> p(m_reader);
 	for (auto i = 0u; i < u.fieldCount(); ++i) {
 		if (p.get(i)) {
@@ -540,10 +538,11 @@ constexpr void MetalClawReaderTemplate<Reader>::nextField() noexcept {
 using MetalClawReader = MetalClawReaderTemplate<ox::BufferReader>;

 template<typename T>
-Error readMC(ox::BufferView const buff, T &val) noexcept {
+Error readMC(ox::BufferView buff, T &val) noexcept {
 	BufferReader br(buff);
 	MetalClawReader reader(br);
-	return model(reader.interface(), &val);
+	ModelHandlerInterface<MetalClawReader, ox::OpType::Read> handler(&reader);
+	return model(&handler, &val);
 }

 template<typename T>
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -157,7 +157,8 @@ std::map<ox::StringView, ox::Error(*)()> tests = {
 				oxAssert(testIn.Int8                == testOut.Int8,                "Int8 value mismatch");
 				oxAssert(testIn.Union.Int           == testOut.Union.Int,           "Union.Int value mismatch");
 				oxAssert(testIn.String              == testOut.String,              "String value mismatch");
-				ox::expect(testIn.IString,               testOut.IString);
+				oxDebugf("{}", testOut.IString.len());
+				oxExpect(testIn.IString,               testOut.IString);
 				oxAssert(testIn.List[0]             == testOut.List[0],             "List[0] value mismatch");
 				oxAssert(testIn.List[1]             == testOut.List[1],             "List[1] value mismatch");
 				oxAssert(testIn.List[2]             == testOut.List[2],             "List[2] value mismatch");
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -11,7 +11,7 @@
 #include <ox/std/memops.hpp>
 #include <ox/std/trace.hpp>

-#include <ox/mc/write.hpp>
+#include "write.hpp"

 namespace ox {

--- a/Show More
+++ b/Show More