diff --git a/.devcontainer b/.devcontainer
new file mode 160000
index 0000000..89803cb
--- /dev/null
+++ b/.devcontainer
@@ -0,0 +1 @@
+Subproject commit 89803cb72f1eedbdb78ac9629d28cf320ea9b699
diff --git a/.devcontainer/amd64-container/Dockerfile b/.devcontainer/amd64-container/Dockerfile
deleted file mode 100644
index 2b0c7f1..0000000
--- a/.devcontainer/amd64-container/Dockerfile
+++ /dev/null
@@ -1,22 +0,0 @@
-FROM effectiverange/er-devc-amd64:latest
-
-ARG USERNAME=$USER
-ARG USER_UID=1000
-ARG USER_GID=$USER_UID
-
-# [Optional] Uncomment this section to install additional vcpkg ports.
-# RUN su vscode -c "${VCPKG_ROOT}/vcpkg install <your-port-name-here>"
-
-# Create the user and get ownership of /opt/cross for package installation
-RUN groupadd --gid $USER_GID $USERNAME \
-    && useradd -s /bin/bash --uid $USER_UID --gid $USER_GID -m $USERNAME \
-    && echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME \
-    && chmod 0440 /etc/sudoers.d/$USERNAME && chown -R $USERNAME:$USERNAME /opt/debs /var/chroot/buildroot \
-    && sed -ri "s/(users=.*)/\1,$USERNAME/g" /etc/schroot/chroot.d/buildroot
-
-# ********************************************************
-# * Anything else you want to do like clean up goes here *
-# ********************************************************
-
-# [Optional] Set the default user. Omit if you want to keep the default as root.
-USER $USERNAME    
diff --git a/.devcontainer/amd64-container/devcontainer.json b/.devcontainer/amd64-container/devcontainer.json
deleted file mode 100644
index cdd0392..0000000
--- a/.devcontainer/amd64-container/devcontainer.json
+++ /dev/null
@@ -1,61 +0,0 @@
-// For format details, see https://aka.ms/devcontainer.json. For config options, see the
-// README at: https://github.com/devcontainers/templates/tree/main/src/cpp
-{
-	"name": "AMD64",
-	"build": {
-		"dockerfile": "Dockerfile",
-		"args": {
-			"USERNAME": "${env:USER}",
-			// NOTE: if user GID != UID we'll get issues
-			// TODO: figure out a way to get the user's GID
-			"USER_UID": "1000",
-		},
-	},
-	"runArgs": [
-		"--privileged",
-		"--net=host"
-	],
-	"remoteUser": "${env:USER}",
-	"mounts": [
-		"type=bind,source=${env:HOME},target=${env:HOME}"
-	]
-	// Features to add to the dev container. More info: https://containers.dev/features.
-	// "features": {},
-	// Use 'forwardPorts' to make a list of ports inside the container available locally.
-	// "forwardPorts": [],
-	// Use 'postCreateCommand' to run commands after the container is created.
-	// "postCreateCommand": "gcc -v",
-	// Configure tool-specific properties.
-	,
-	"containerEnv": {
-		"CMAKE_TOOLCHAIN_FILE": "/usr/share/cmake/toolchain.cmake",
-		"CMAKE_GENERATOR": "Ninja"
-	},
-	"customizations": {
-		"vscode": {
-			"extensions": [
-				"jeff-hykin.better-cpp-syntax",
-				"ms-python.black-formatter",
-				"ms-vscode.cpptools-extension-pack",
-				"matepek.vscode-catch2-test-adapter",
-				"xaver.clang-format",
-				"ms-vscode.cmake-tools",
-				"streetsidesoftware.code-spell-checker",
-				"ms-vscode-remote.remote-containers",
-				"ms-azuretools.vscode-docker",
-				"eamodio.gitlens",
-				"ms-vsliveshare.vsliveshare",
-				"ms-python.python",
-				"ms-vscode-remote.vscode-remote-extensionpack",
-				"llvm-vs-code-extensions.vscode-clangd",
-				"GitHub.copilot-chat",
-				"GitHub.copilot",
-				"github.vscode-github-actions",
-				"GitHub.vscode-pull-request-github",
-				"EffectiveRangeLLC.erdev"
-			]
-		}
-	},
-	// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
-	// "remoteUser": "root"
-}
\ No newline at end of file
diff --git a/.devcontainer/armhf-container/Dockerfile b/.devcontainer/armhf-container/Dockerfile
deleted file mode 100644
index 7f6fb7e..0000000
--- a/.devcontainer/armhf-container/Dockerfile
+++ /dev/null
@@ -1,22 +0,0 @@
-FROM effectiverange/er-devc-armhf:latest
-
-ARG USERNAME=$USER
-ARG USER_UID=1000
-ARG USER_GID=$USER_UID
-
-# [Optional] Uncomment this section to install additional vcpkg ports.
-# RUN su vscode -c "${VCPKG_ROOT}/vcpkg install <your-port-name-here>"
-
-# Create the user and get ownership of /opt/cross for package installation
-RUN groupadd --gid $USER_GID $USERNAME \
-    && useradd -s /bin/bash --uid $USER_UID --gid $USER_GID -m $USERNAME \
-    && echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME \
-    && chmod 0440 /etc/sudoers.d/$USERNAME && chown -R $USERNAME:$USERNAME /opt/debs /var/chroot/buildroot \
-    && sed -ri "s/(users=.*)/\1,$USERNAME/g" /etc/schroot/chroot.d/buildroot
-
-# ********************************************************
-# * Anything else you want to do like clean up goes here *
-# ********************************************************
-
-# [Optional] Set the default user. Omit if you want to keep the default as root.
-USER $USERNAME    
diff --git a/.devcontainer/armhf-container/devcontainer.json b/.devcontainer/armhf-container/devcontainer.json
deleted file mode 100644
index d659c7c..0000000
--- a/.devcontainer/armhf-container/devcontainer.json
+++ /dev/null
@@ -1,61 +0,0 @@
-// For format details, see https://aka.ms/devcontainer.json. For config options, see the
-// README at: https://github.com/devcontainers/templates/tree/main/src/cpp
-{
-	"name": "ARMHF-Cross",
-	"build": {
-		"dockerfile": "Dockerfile",
-		"args": {
-			"USERNAME": "${env:USER}",
-			// NOTE: if user GID != UID we'll get issues
-			// TODO: figure out a way to get the user's GID
-			"USER_UID": "1000",
-		},
-	},
-	"runArgs": [
-		"--privileged",
-		"--net=host"
-	],
-	"remoteUser": "${env:USER}",
-	"mounts": [
-		"type=bind,source=${env:HOME},target=${env:HOME}"
-	]
-	// Features to add to the dev container. More info: https://containers.dev/features.
-	// "features": {},
-	// Use 'forwardPorts' to make a list of ports inside the container available locally.
-	// "forwardPorts": [],
-	// Use 'postCreateCommand' to run commands after the container is created.
-	// "postCreateCommand": "gcc -v",
-	// Configure tool-specific properties.
-	,
-	"containerEnv": {
-		"CMAKE_TOOLCHAIN_FILE": "/usr/share/cmake/toolchain.cmake",
-		"CMAKE_GENERATOR": "Ninja"
-	},
-	"customizations": {
-		"vscode": {
-			"extensions": [
-				"jeff-hykin.better-cpp-syntax",
-				"ms-python.black-formatter",
-				"ms-vscode.cpptools-extension-pack",
-				"matepek.vscode-catch2-test-adapter",
-				"xaver.clang-format",
-				"ms-vscode.cmake-tools",
-				"streetsidesoftware.code-spell-checker",
-				"ms-vscode-remote.remote-containers",
-				"ms-azuretools.vscode-docker",
-				"eamodio.gitlens",
-				"ms-vsliveshare.vsliveshare",
-				"ms-python.python",
-				"ms-vscode-remote.vscode-remote-extensionpack",
-				"llvm-vs-code-extensions.vscode-clangd",
-				"GitHub.copilot-chat",
-				"GitHub.copilot",
-				"github.vscode-github-actions",
-				"GitHub.vscode-pull-request-github",
-				"EffectiveRangeLLC.erdev"
-			],
-		}
-	},
-	// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
-	// "remoteUser": "root"
-}
\ No newline at end of file
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..f1b0753
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule ".devcontainer"]
+	path = .devcontainer
+	url = https://github.com/EffectiveRange/devcontainer-defs