4 files changed, 26 insertions, 3 deletions
diff --git a/zencore/filesystem.cpp b/zencore/filesystem.cpp
index a06c00e41..f6ba92f98 100644
--- a/zencore/filesystem.cpp
+++ b/zencore/filesystem.cpp
@@ -522,6 +522,23 @@ WriteFile(std::filesystem::path Path, IoBuffer Data)
 	WriteFile(Path, &DataPtr, 1);
 }
 
+IoBuffer 
+FileContents::Flatten()
+{
+	if (Data.size() == 1)
+	{
+		return Data[0];
+	}
+	else if (Data.empty())
+	{
+		return {};
+	}
+	else
+	{
+		ZEN_NOT_IMPLEMENTED();
+	}
+}
+
 FileContents
 ReadFile(std::filesystem::path Path)
 {
@@ -815,7 +832,7 @@ TEST_CASE("filesystem")
 	using namespace std::filesystem;
 
 	// GetExePath
-	path BinPath = GetRunningExecutablePath();
+	path	   BinPath	   = GetRunningExecutablePath();
 	const bool ExpectedExe = BinPath.stem() == "zencore-test" || BinPath.stem() == "zenserver-test";
 	CHECK(ExpectedExe);
 	CHECK(is_regular_file(BinPath));
diff --git a/zencore/include/zencore/filesystem.h b/zencore/include/zencore/filesystem.h
index 6678528f6..c7ac7140d 100644
--- a/zencore/include/zencore/filesystem.h
+++ b/zencore/include/zencore/filesystem.h
@@ -2,9 +2,10 @@
 
 #pragma once
 
-#include "stream.h"
 #include "zencore.h"
 
+#include <zencore/iobuffer.h>
+
 #include <filesystem>
 #include <functional>
 
@@ -36,6 +37,8 @@ struct FileContents
 {
 	std::vector<IoBuffer> Data;
 	std::error_code		  ErrorCode;
+
+	IoBuffer Flatten();
 };
 
 ZENCORE_API FileContents ReadFile(std::filesystem::path Path);
diff --git a/zencore/include/zencore/iobuffer.h b/zencore/include/zencore/iobuffer.h
index ed52184d2..263cf672d 100644
--- a/zencore/include/zencore/iobuffer.h
+++ b/zencore/include/zencore/iobuffer.h
@@ -25,6 +25,7 @@ enum class ZenContentType : uint8_t
 	kCbPackageOffer		= 6,
 	kCompressedBinary	= 7,
 	kUnknownContentType = 8,
+	kHTML				= 9,
 	kCOUNT
 };
 
@@ -54,6 +55,8 @@ ToString(ZenContentType ContentType)
 			return "compressed-binary"sv;
 		case ZenContentType::kYAML:
 			return "yaml"sv;
+		case ZenContentType::kHTML:
+			return "html"sv;
 	}
 }
 
diff --git a/zencore/include/zencore/refcount.h b/zencore/include/zencore/refcount.h
index 0a1e15614..320718f5b 100644
--- a/zencore/include/zencore/refcount.h
+++ b/zencore/include/zencore/refcount.h
@@ -17,7 +17,7 @@ namespace zen {
 class RefCounted
 {
 public:
-	RefCounted() = default;
+	RefCounted()		  = default;
 	virtual ~RefCounted() = default;
 
 	inline uint32_t AddRef() const { return AtomicIncrement(const_cast<RefCounted*>(this)->m_RefCount); }