From 7ed05abdb873b2686810fe2e5f61c91fd17bc704 Mon Sep 17 00:00:00 2001
From: qwsdcvghyu89 <61093706+qwsdcvghyu89@users.noreply.github.com>
Date: Mon, 22 Sep 2025 01:51:46 +1000
Subject: [PATCH] refactor: modularize Beam into new projects and interfaces

- Introduced modularity by splitting Beam into new projects: Beam.Abstractions, Beam.Models, and Beam.Downloaders.
- Refactored existing classes into appropriate namespaces and projects.
- Replaced specific implementations with abstractions (e.g., SourceLinkBuilder to LinkBuilder, State to IState, etc.).
- Updated interfaces: added ITemplate, IArticleData, IDownloadReport, and others for improved extensibility.
- Removed deprecated classes like SourceLinkBuilder and StateChangerFactory.
- Enhanced link handling in downloaders by refactoring to use `string` over `SourceLink`.
- Consolidated shared logic under Beam.Abstractions.
---
 Beam.Abstractions/Beam.Abstractions.csproj    |   16 +
 Beam.Abstractions/IArticleData.cs             |   10 +
 Beam.Abstractions/IDataBindings.cs            |   27 +
 Beam.Abstractions/IDataProvider.cs            |   14 +
 Beam.Abstractions/IDocument.cs                |   28 +
 Beam.Abstractions/IDocumentMetaData.cs        |    7 +
 Beam.Abstractions/IDownloadReport.cs          |    3 +
 Beam.Abstractions/ILinkBuilder.cs             |   11 +
 Beam.Abstractions/IOrdered.cs                 |    6 +
 Beam.Abstractions/IReadOnlyState.cs           |    6 +
 Beam.Abstractions/IResourceDictionary.cs      |    3 +
 Beam.Abstractions/IRetryReport.cs             |    6 +
 Beam.Abstractions/IState.cs                   |    8 +
 Beam.Abstractions/IStateChangeBehaviour.cs    |   10 +
 Beam.Abstractions/IStateChangerFactory.cs     |    3 +
 Beam.Abstractions/ITemplate.cs                |    8 +
 Beam.Abstractions/IUnitDownloader.cs          |    7 +
 {Beam => Beam.Api}/ApiCall.cs                 |    0
 {Beam => Beam.Api}/ApiCallBuilder.cs          |    5 +-
 {Beam => Beam.Api}/ApiCalls.cs                |    0
 {Beam => Beam.Api}/ApiCallsBuilder.cs         |    0
 {Beam => Beam.Api}/ApiResponse.cs             |    0
 Beam.Data/BeamDataContext.cs                  |   50 +
 .../LinkBuilder.cs                            |   42 +-
 .../ResourceDictionary.cs                     |   16 +-
 Beam.Data/Template.cs                         |   19 +
 {Beam.Models => Beam.Data}/WebResource.cs     |   10 +-
 {Beam => Beam.Downloaders}/DownloadContext.cs |   32 +-
 .../DownloadContextBuilder.cs                 |   23 +-
 .../SequentialDownloader.cs                   |   15 +-
 .../SequentialFragmentDownloader.cs           |    7 +-
 {Beam => Beam.Downloaders}/UnitDownloader.cs  |   10 +-
 .../UnitDownloaderBinary.cs                   |   11 +-
 .../UnitFragmentDownloader.cs                 |   21 +-
 .../UnitFragmentDownloaderBinary.cs           |   15 +-
 Beam.Dynamic/AnchorCollectionDataProvider.cs  |   16 +-
 Beam.Dynamic/AnchorDataProvider.cs            |   13 +-
 .../Architecture.cs                           |   10 +-
 Beam.Dynamic/Beam.Dynamic.csproj              |    8 +-
 {Beam => Beam.Dynamic}/CommonStateChangers.cs |   22 +-
 Beam.Dynamic/CommonTransformers.cs            |   45 +
 Beam.Dynamic/ConstantStateChanger.cs          |    9 +
 Beam.Dynamic/DataBindings.cs                  |  365 +++---
 .../DataProviderJsonTypeInfoResolver.cs       |   37 +
 Beam.Dynamic/DropDownDataProvider.cs          |   13 +-
 Beam.Dynamic/IDataProvider.cs                 |   21 -
 .../MainArchitecture.cs                       |    6 +-
 .../NumberedStateChanger.cs                   |   12 +-
 Beam.Dynamic/StateChangerFactory.cs           |    3 +-
 .../{OnlineCleaner.cs => StringCleaner.cs}    |    2 +-
 Beam.Exceptions/AssertionException.cs         |   14 +
 Beam.Exceptions/Exceptions.Designer.cs        |  116 ++
 Beam.Exceptions/Exceptions.resx               |   39 +
 Beam.Exceptions/MapException.cs               |   11 +
 Beam.Exports/Beam.Exports.csproj              |    6 +-
 Beam.Exports/Exporter.cs                      |    7 +-
 Beam.Exports/HtmlExporter.cs                  |    2 +
 Beam.Fluent/Beam.Fluent.csproj                |    9 +-
 Beam.Fluent/DownloadBuilder.ContextStage.cs   |   10 +-
 Beam.Fluent/DownloadBuilder.DownloadStage.cs  |    1 +
 .../DownloadBuilder.IAlternativeLinkStage.cs  |    6 +-
 ...nloadBuilder.IAlternativeTransformStage.cs |    4 +-
 Beam.Fluent/DownloadBuilder.IContextStage.cs  |    7 +-
 .../DownloadBuilder.ITransformStage.cs        |    1 +
 Beam.Fluent/DownloadBuilder.LinkStage.cs      |   11 +-
 Beam.Fluent/DownloadBuilder.TransformStage.cs |    4 +-
 Beam.Fluent/DownloadBuilder.cs                |    4 +-
 Beam.Models/AsyncDownloadFailurePredicate.cs  |    3 +
 Beam.Models/AsyncTransformer.cs               |    3 +
 Beam.Models/Beam.Models.csproj                |    9 +-
 Beam.Models/BeamDataContext.cs                |   50 -
 {Beam => Beam.Models}/ByteDocument.cs         |    2 +-
 {Beam => Beam.Models}/Document.cs             |   11 +-
 {Beam => Beam.Models}/DocumentCache.cs        |    8 +-
 Beam.Models/DownloadReport.cs                 |    8 +
 Beam.Models/File.cs                           |    2 +-
 {Beam => Beam.Models}/Fragment.cs             |    2 +-
 {Beam => Beam.Models}/ImmutableState.cs       |    9 +-
 Beam.Models/LinkCollection.cs                 |   13 -
 Beam.Models/Ordered.cs                        |    6 +
 Beam.Models/Public Concrete/ArticleData.cs    |   41 +
 {Beam => Beam.Models}/RetryReport.cs          |    6 +-
 {Beam => Beam.Models}/State.cs                |   15 +-
 {Beam => Beam.Models}/StreamDocument.cs       |    2 +-
 {Beam => Beam.Models}/StringDocument.cs       |    8 +-
 .../TableOfContentsData.cs                    |   12 +-
 Beam.Models/Template.cs                       |   15 -
 Beam.Models/Tracked.cs                        |   11 -
 Beam.Playwright/Beam.Playwright.csproj        |    4 +-
 Beam.Playwright/PlaywrightUnitDownloader.cs   |    4 +-
 .../PlaywrightUnitPageDownloader.cs           |    2 +
 Beam.Stealth/Beam.Stealth.csproj              |    4 +-
 Beam.Stealth/StealthFragmentDownloader.cs     |    2 +
 Beam.Stealth/StealthFragmentPageDownloader.cs |    2 +
 Beam.Stealth/StealthUnitDownloader.cs         |    4 +
 Beam.Stealth/StealthUnitPageDownloader.cs     |    2 +
 Beam.Temporary.Cli/Beam.Temporary.Cli.csproj  |    2 +-
 Beam.Temporary.Cli/CommonTransformers.cs      |   46 -
 Beam.Temporary.Cli/NovelDefinitionBuilder.cs  |  212 ++--
 Beam.Temporary.Cli/NovelStatics.cs            | 1037 +++++++++--------
 Beam.Temporary.Cli/Program.cs                 |  445 +++----
 Beam.Temporary.Cli/QuickAndDirtyJanitor.cs    |   51 +-
 Beam.Temporary.Cli/StateChangerFactory.cs     |   34 -
 .../Templates/Classic/ClassicTemplates.cs     |   60 +-
 Beam.Tests/Beam.Tests.csproj                  |    1 +
 Beam.Tests/OnlineCleaner.Tests.cs             |    6 +-
 Beam.Tests/SouceLinkBuilder.Tests.cs          |   31 +-
 Beam.sln                                      |   30 +
 Beam/ArticleData.cs                           |   22 -
 Beam/Beam.csproj                              |    3 +-
 Beam/ConstantStateChanger.cs                  |   13 -
 Beam/DownloadEnumerable.cs                    |    1 +
 Beam/DownloadReport.cs                        |    6 -
 Beam/IAsyncEnumeratorExtensions.cs            |    4 +-
 Beam/IDocument.cs                             |   29 -
 Beam/IDocumentExtensions.cs                   |    7 -
 Beam/IDocumentMetaData.cs                     |    7 -
 Beam/IDocumentSourceLinkFactory.cs            |   10 +-
 Beam/IStateChangeBehaviour.cs                 |    8 -
 Beam/IUnitDownloader.cs                       |    6 -
 Beam/Ordered.cs                               |    3 -
 Beam/OrderedLinkGenerator.cs                  |   63 +
 Beam/OrderedSourceLinkGenerator.cs            |   60 -
 Beam/S.cs                                     |   22 +-
 Beam/SourceLink.cs                            |   37 -
 Beam/SourceLinkEnumerable.cs                  |   27 -
 Beam/StringEnumerable.cs                      |   22 +
 aeqw89.Beam/aeqw89.Beam.csproj                |   14 +-
 128 files changed, 2058 insertions(+), 1804 deletions(-)
 create mode 100644 Beam.Abstractions/Beam.Abstractions.csproj
 create mode 100644 Beam.Abstractions/IArticleData.cs
 create mode 100644 Beam.Abstractions/IDataBindings.cs
 create mode 100644 Beam.Abstractions/IDataProvider.cs
 create mode 100644 Beam.Abstractions/IDocument.cs
 create mode 100644 Beam.Abstractions/IDocumentMetaData.cs
 create mode 100644 Beam.Abstractions/IDownloadReport.cs
 create mode 100644 Beam.Abstractions/ILinkBuilder.cs
 create mode 100644 Beam.Abstractions/IOrdered.cs
 create mode 100644 Beam.Abstractions/IReadOnlyState.cs
 create mode 100644 Beam.Abstractions/IResourceDictionary.cs
 create mode 100644 Beam.Abstractions/IRetryReport.cs
 create mode 100644 Beam.Abstractions/IState.cs
 create mode 100644 Beam.Abstractions/IStateChangeBehaviour.cs
 create mode 100644 Beam.Abstractions/IStateChangerFactory.cs
 create mode 100644 Beam.Abstractions/ITemplate.cs
 create mode 100644 Beam.Abstractions/IUnitDownloader.cs
 rename {Beam => Beam.Api}/ApiCall.cs (100%)
 rename {Beam => Beam.Api}/ApiCallBuilder.cs (96%)
 rename {Beam => Beam.Api}/ApiCalls.cs (100%)
 rename {Beam => Beam.Api}/ApiCallsBuilder.cs (100%)
 rename {Beam => Beam.Api}/ApiResponse.cs (100%)
 create mode 100644 Beam.Data/BeamDataContext.cs
 rename Beam/SourceLinkBuilder.cs => Beam.Data/LinkBuilder.cs (92%)
 rename {Beam.Models => Beam.Data}/ResourceDictionary.cs (74%)
 create mode 100644 Beam.Data/Template.cs
 rename {Beam.Models => Beam.Data}/WebResource.cs (82%)
 rename {Beam => Beam.Downloaders}/DownloadContext.cs (74%)
 rename {Beam => Beam.Downloaders}/DownloadContextBuilder.cs (90%)
 rename {Beam => Beam.Downloaders}/SequentialDownloader.cs (87%)
 rename {Beam => Beam.Downloaders}/SequentialFragmentDownloader.cs (98%)
 rename {Beam => Beam.Downloaders}/UnitDownloader.cs (89%)
 rename {Beam => Beam.Downloaders}/UnitDownloaderBinary.cs (93%)
 rename {Beam => Beam.Downloaders}/UnitFragmentDownloader.cs (80%)
 rename {Beam => Beam.Downloaders}/UnitFragmentDownloaderBinary.cs (91%)
 rename {Beam.Temporary.Cli => Beam.Dynamic}/Architecture.cs (93%)
 rename {Beam => Beam.Dynamic}/CommonStateChangers.cs (52%)
 create mode 100644 Beam.Dynamic/CommonTransformers.cs
 create mode 100644 Beam.Dynamic/ConstantStateChanger.cs
 create mode 100644 Beam.Dynamic/DataProviderJsonTypeInfoResolver.cs
 delete mode 100644 Beam.Dynamic/IDataProvider.cs
 rename {Beam.Temporary.Cli => Beam.Dynamic}/MainArchitecture.cs (96%)
 rename {Beam => Beam.Dynamic}/NumberedStateChanger.cs (52%)
 rename Beam.Dynamic/{OnlineCleaner.cs => StringCleaner.cs} (97%)
 create mode 100644 Beam.Exceptions/AssertionException.cs
 create mode 100644 Beam.Exceptions/Exceptions.Designer.cs
 create mode 100644 Beam.Exceptions/Exceptions.resx
 create mode 100644 Beam.Exceptions/MapException.cs
 create mode 100644 Beam.Models/AsyncDownloadFailurePredicate.cs
 create mode 100644 Beam.Models/AsyncTransformer.cs
 delete mode 100644 Beam.Models/BeamDataContext.cs
 rename {Beam => Beam.Models}/ByteDocument.cs (94%)
 rename {Beam => Beam.Models}/Document.cs (53%)
 rename {Beam => Beam.Models}/DocumentCache.cs (93%)
 create mode 100644 Beam.Models/DownloadReport.cs
 rename {Beam => Beam.Models}/Fragment.cs (98%)
 rename {Beam => Beam.Models}/ImmutableState.cs (77%)
 delete mode 100644 Beam.Models/LinkCollection.cs
 create mode 100644 Beam.Models/Ordered.cs
 create mode 100644 Beam.Models/Public Concrete/ArticleData.cs
 rename {Beam => Beam.Models}/RetryReport.cs (65%)
 rename {Beam => Beam.Models}/State.cs (59%)
 rename {Beam => Beam.Models}/StreamDocument.cs (95%)
 rename {Beam => Beam.Models}/StringDocument.cs (73%)
 rename {Beam.Temporary.Cli => Beam.Models}/TableOfContentsData.cs (54%)
 delete mode 100644 Beam.Models/Template.cs
 delete mode 100644 Beam.Models/Tracked.cs
 delete mode 100644 Beam.Temporary.Cli/CommonTransformers.cs
 delete mode 100644 Beam.Temporary.Cli/StateChangerFactory.cs
 delete mode 100644 Beam/ArticleData.cs
 delete mode 100644 Beam/ConstantStateChanger.cs
 delete mode 100644 Beam/DownloadReport.cs
 delete mode 100644 Beam/IDocument.cs
 delete mode 100644 Beam/IDocumentExtensions.cs
 delete mode 100644 Beam/IDocumentMetaData.cs
 delete mode 100644 Beam/IStateChangeBehaviour.cs
 delete mode 100644 Beam/IUnitDownloader.cs
 delete mode 100644 Beam/Ordered.cs
 create mode 100644 Beam/OrderedLinkGenerator.cs
 delete mode 100644 Beam/OrderedSourceLinkGenerator.cs
 delete mode 100644 Beam/SourceLink.cs
 delete mode 100644 Beam/SourceLinkEnumerable.cs
 create mode 100644 Beam/StringEnumerable.cs

diff --git a/Beam.Abstractions/Beam.Abstractions.csproj b/Beam.Abstractions/Beam.Abstractions.csproj
new file mode 100644
index 0000000..bea4d88
--- /dev/null
+++ b/Beam.Abstractions/Beam.Abstractions.csproj
@@ -0,0 +1,16 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>net9.0</TargetFramework>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
+        <RootNamespace>Beam.Abstract</RootNamespace>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <PackageReference Include="aeqw89.DataKeys" Version="2.1.0" />
+      <PackageReference Include="aeqw89.PersistentData" Version="1.3.3" />
+      <PackageReference Include="HtmlAgilityPack" Version="1.11.72" />
+    </ItemGroup>
+
+</Project>
diff --git a/Beam.Abstractions/IArticleData.cs b/Beam.Abstractions/IArticleData.cs
new file mode 100644
index 0000000..b9cc6de
--- /dev/null
+++ b/Beam.Abstractions/IArticleData.cs
@@ -0,0 +1,10 @@
+namespace Beam.Abstractions;
+
+public interface IArticleData : IDocumentMetaData, IEquatable<IArticleData?> {
+    string? Name { get; set; }
+    string[] Authors { get; set; }
+    string? Language { get; set; }
+    string[] Categories { get; set; }
+    string? Version { get; set; }
+    string? Description { get; set; }
+}
\ No newline at end of file
diff --git a/Beam.Abstractions/IDataBindings.cs b/Beam.Abstractions/IDataBindings.cs
new file mode 100644
index 0000000..1155eee
--- /dev/null
+++ b/Beam.Abstractions/IDataBindings.cs
@@ -0,0 +1,27 @@
+using Beam.Dynamic;
+
+namespace Beam.Abstractions;
+
+public interface IDataBindings {
+    IDataProvider<string>? Title { get; set; }
+    IDataProvider<string[]>? Authors { get; set; }
+    IDataProvider<string>? Description { get; set; }
+    IDataProvider<string>? Content { get; set; }
+    IDataProvider<string[]>? Language { get; set; }
+    IDataProvider<string[]>? Tags { get; set; }
+    IDataProvider<string>? Publisher { get; set; }
+    IDataProvider<DateTimeOffset>? PublicationDate { get; set; }
+    IDataProvider<string>? ISBN { get; set; }
+    IDataProvider<int>? PageCount { get; set; }
+    IDataProvider<string>? CoverImage { get; set; }
+    IDataProvider<string[]>? Series { get; set; }
+    IDataProvider<int>? Edition { get; set; }
+    IDataProvider<string[]>? Contributors { get; set; }
+    IDataProvider<string[]>? Subjects { get; set; }
+    IDataProvider<string>? Rights { get; set; }
+    IDataProvider<string[]>? TableOfContents { get; set; }
+    IDataProvider<string[]>? PagesDropDown { get; set; }
+    IDataProvider<string>? NextPageButton { get; set; }
+    IDataProvider<string>? PreviousPageButton { get; set; }
+    Dictionary<string, IDataProvider?> Providers { get; set; }
+}
\ No newline at end of file
diff --git a/Beam.Abstractions/IDataProvider.cs b/Beam.Abstractions/IDataProvider.cs
new file mode 100644
index 0000000..db87588
--- /dev/null
+++ b/Beam.Abstractions/IDataProvider.cs
@@ -0,0 +1,14 @@
+using HtmlAgilityPack;
+using System.Text.Json.Serialization;
+
+namespace Beam.Dynamic;
+
+public interface IDataProvider {
+    public string GetString(HtmlDocument document)
+        => (this as IDataProvider<object>)?.Get(document)?.ToString() ?? "";
+}
+
+public interface IDataProvider<out T> : IDataProvider {
+    public T Get(HtmlDocument document);
+    //public HtmlNode? GetNode(HtmlDocument document);
+}
\ No newline at end of file
diff --git a/Beam.Abstractions/IDocument.cs b/Beam.Abstractions/IDocument.cs
new file mode 100644
index 0000000..0779c99
--- /dev/null
+++ b/Beam.Abstractions/IDocument.cs
@@ -0,0 +1,28 @@
+using aeqw89.DataKeys;
+
+namespace Beam.Abstractions;
+
+public interface IDocument {
+    /// <summary>
+    /// The file name of the document. Must be valid in both <c>UNIX</c>, 
+    /// <c>WINDOWS</c>, <c>APPLE</c>, and <c>ANDROID</c> file systems.
+    /// </summary>
+    string Filename { get; }
+
+    /// <summary>
+    /// Additional descriptive data
+    /// </summary>
+    IDictionary<IDataKey<IDocumentMetaData>, IDocumentMetaData> MetaData { get; }
+
+    /// <summary>
+    /// Retrieves the binary representation for the <see cref="IDocument"/>
+    /// </summary>
+    /// <returns>Binary representation of the <see cref="IDocument"/></returns>
+    byte[] ToBytes();
+
+    /// <summary>
+    /// Retrieves the string representation for the <see cref="IDocument"/>
+    /// </summary>
+    /// <returns>String representation of the <see cref="IDocument"/></returns>
+    string ToString();
+}
\ No newline at end of file
diff --git a/Beam.Abstractions/IDocumentMetaData.cs b/Beam.Abstractions/IDocumentMetaData.cs
new file mode 100644
index 0000000..21b93df
--- /dev/null
+++ b/Beam.Abstractions/IDocumentMetaData.cs
@@ -0,0 +1,7 @@
+using System.Text.Json;
+
+namespace Beam.Abstractions;
+
+public interface IDocumentMetaData {
+    string AsJson(JsonSerializerOptions? options = null);
+}
\ No newline at end of file
diff --git a/Beam.Abstractions/IDownloadReport.cs b/Beam.Abstractions/IDownloadReport.cs
new file mode 100644
index 0000000..615b92f
--- /dev/null
+++ b/Beam.Abstractions/IDownloadReport.cs
@@ -0,0 +1,3 @@
+namespace Beam.Abstractions;
+
+public interface IDownloadReport { }
\ No newline at end of file
diff --git a/Beam.Abstractions/ILinkBuilder.cs b/Beam.Abstractions/ILinkBuilder.cs
new file mode 100644
index 0000000..3e45db5
--- /dev/null
+++ b/Beam.Abstractions/ILinkBuilder.cs
@@ -0,0 +1,11 @@
+using Beam.Models;
+
+namespace Beam.Abstractions;
+
+public interface ILinkBuilder {
+    /// <summary>
+    /// Produces a concrete <see cref="SourceLink"/> using values from an external <see cref="State"/> object.
+    /// </summary>
+    /// <param name="parameterValues">Object providing positional values.</param>
+    string Build(IReadOnlyState parameterValues);
+}
\ No newline at end of file
diff --git a/Beam.Abstractions/IOrdered.cs b/Beam.Abstractions/IOrdered.cs
new file mode 100644
index 0000000..b94ccba
--- /dev/null
+++ b/Beam.Abstractions/IOrdered.cs
@@ -0,0 +1,6 @@
+namespace Beam.Abstractions;
+
+public interface IOrdered<out T> {
+    T Data { get; }
+    int Order { get; }
+}
\ No newline at end of file
diff --git a/Beam.Abstractions/IReadOnlyState.cs b/Beam.Abstractions/IReadOnlyState.cs
new file mode 100644
index 0000000..e76be02
--- /dev/null
+++ b/Beam.Abstractions/IReadOnlyState.cs
@@ -0,0 +1,6 @@
+namespace Beam.Models;
+
+public interface IReadOnlyState {
+    public string[] GetState();
+    IReadOnlyState Copy();
+}
\ No newline at end of file
diff --git a/Beam.Abstractions/IResourceDictionary.cs b/Beam.Abstractions/IResourceDictionary.cs
new file mode 100644
index 0000000..2e2f24b
--- /dev/null
+++ b/Beam.Abstractions/IResourceDictionary.cs
@@ -0,0 +1,3 @@
+namespace Beam.Abstractions;
+
+public interface IResourceDictionary { }
\ No newline at end of file
diff --git a/Beam.Abstractions/IRetryReport.cs b/Beam.Abstractions/IRetryReport.cs
new file mode 100644
index 0000000..d44d723
--- /dev/null
+++ b/Beam.Abstractions/IRetryReport.cs
@@ -0,0 +1,6 @@
+namespace Beam.Abstractions;
+
+public interface IRetryReport {
+    int TryNumber { get; }
+    string Link { get; }
+}
\ No newline at end of file
diff --git a/Beam.Abstractions/IState.cs b/Beam.Abstractions/IState.cs
new file mode 100644
index 0000000..1869f50
--- /dev/null
+++ b/Beam.Abstractions/IState.cs
@@ -0,0 +1,8 @@
+using Beam.Models;
+
+namespace Beam.Abstractions;
+
+public interface IState : IReadOnlyState {
+    void SetState(string[] state);
+    new IState Copy();
+}
\ No newline at end of file
diff --git a/Beam.Abstractions/IStateChangeBehaviour.cs b/Beam.Abstractions/IStateChangeBehaviour.cs
new file mode 100644
index 0000000..1a5e28b
--- /dev/null
+++ b/Beam.Abstractions/IStateChangeBehaviour.cs
@@ -0,0 +1,10 @@
+using Beam.Models;
+
+namespace Beam.Abstractions;
+
+/// <summary>
+/// Defines how a url template should should be updated, in what order, and by how much
+/// </summary>
+public interface IStateChangeBehaviour {
+    public void Apply(IState state, object stimulus);
+}
\ No newline at end of file
diff --git a/Beam.Abstractions/IStateChangerFactory.cs b/Beam.Abstractions/IStateChangerFactory.cs
new file mode 100644
index 0000000..e5e95e2
--- /dev/null
+++ b/Beam.Abstractions/IStateChangerFactory.cs
@@ -0,0 +1,3 @@
+namespace Beam.Abstractions;
+
+public interface IStateChangerFactory { }
\ No newline at end of file
diff --git a/Beam.Abstractions/ITemplate.cs b/Beam.Abstractions/ITemplate.cs
new file mode 100644
index 0000000..f87ed2e
--- /dev/null
+++ b/Beam.Abstractions/ITemplate.cs
@@ -0,0 +1,8 @@
+using aeqw89.DataKeys;
+
+namespace Beam.Abstractions;
+
+public interface ITemplate : IKeyed<ITemplate> {
+    IStateChangerFactory Factory { get; set; }
+    ILinkBuilder Builder { get; set; }
+}
\ No newline at end of file
diff --git a/Beam.Abstractions/IUnitDownloader.cs b/Beam.Abstractions/IUnitDownloader.cs
new file mode 100644
index 0000000..736197b
--- /dev/null
+++ b/Beam.Abstractions/IUnitDownloader.cs
@@ -0,0 +1,7 @@
+
+namespace Beam.Abstractions;
+
+public interface IUnitDownloader<T> {
+    public int LinksPerDownload { get; }
+    public Task<(bool, T?)> TryDownload(IOrdered<string>[] link, CancellationToken ct, int maximumRetryCount = 7, IProgress<IRetryReport>? tryProgress = null);
+}
\ No newline at end of file
diff --git a/Beam/ApiCall.cs b/Beam.Api/ApiCall.cs
similarity index 100%
rename from Beam/ApiCall.cs
rename to Beam.Api/ApiCall.cs
diff --git a/Beam/ApiCallBuilder.cs b/Beam.Api/ApiCallBuilder.cs
similarity index 96%
rename from Beam/ApiCallBuilder.cs
rename to Beam.Api/ApiCallBuilder.cs
index 2a5af0c..f4f3144 100644
--- a/Beam/ApiCallBuilder.cs
+++ b/Beam.Api/ApiCallBuilder.cs
@@ -5,6 +5,7 @@ using System.Net;
 using System.Reflection.PortableExecutable;
 using System.Text;
 using System.Threading.Tasks;
+using Beam.Abstractions;
 
 namespace Beam {
     public class ApiCallBuilder(HttpClient client) {
@@ -25,10 +26,6 @@ namespace Beam {
             return WithUri(uri.AbsoluteUri);
         }
 
-        public ApiCallBuilder WithUri(SourceLink uri) {
-            return WithUri(uri.Link);
-        }
-
         public ApiCallBuilder WithRequestData(object? data) {
             Data = data;
             return this;
diff --git a/Beam/ApiCalls.cs b/Beam.Api/ApiCalls.cs
similarity index 100%
rename from Beam/ApiCalls.cs
rename to Beam.Api/ApiCalls.cs
diff --git a/Beam/ApiCallsBuilder.cs b/Beam.Api/ApiCallsBuilder.cs
similarity index 100%
rename from Beam/ApiCallsBuilder.cs
rename to Beam.Api/ApiCallsBuilder.cs
diff --git a/Beam/ApiResponse.cs b/Beam.Api/ApiResponse.cs
similarity index 100%
rename from Beam/ApiResponse.cs
rename to Beam.Api/ApiResponse.cs
diff --git a/Beam.Data/BeamDataContext.cs b/Beam.Data/BeamDataContext.cs
new file mode 100644
index 0000000..84c680f
--- /dev/null
+++ b/Beam.Data/BeamDataContext.cs
@@ -0,0 +1,50 @@
+using aeqw89.DataKeys;
+using aeqw89.PersistentData;
+using Beam.Dynamic;
+using Beam.Models;
+
+namespace Beam.Data {
+    using BeamFile = Models.File;
+    
+    public class BeamDataContext : BaseDataDictionary {
+        #region  Tables
+        public Table<Template> Templates {
+            get => GetOrCreateTable<Template>(nameof(Templates));
+            set => Set(nameof(Templates), value);
+        }
+        
+        public Table<DataBindings> Bindings {
+            get => GetOrCreateTable<DataBindings>(nameof(Bindings));
+            set => Set(nameof(Bindings), value);
+        }
+        public Table<WebResource> Resources {
+            get => GetOrCreateTable<WebResource>(nameof(Resources));
+            set => Set(nameof(Resources), value);
+        }
+        public Table<ResourceDictionary> ResourceDictionaries {
+            get => GetOrCreateTable<ResourceDictionary>(nameof(ResourceDictionaries));
+            set => Set(nameof(ResourceDictionaries), value);
+        }
+        public Table<ImmutableState> InitialStates {
+            get => GetOrCreateTable<ImmutableState>(nameof(InitialStates));
+            set => Set(nameof(InitialStates), value);
+        }
+        public Table<BeamFile> Files {
+            get => GetOrCreateTable<BeamFile>(nameof(Files));
+            set => Set(nameof(Files), value);
+        }
+        #endregion
+        #region Junctions
+        public Junction<WebResource, ResourceDictionary> WebResourceToResourceDictionaryJunction {
+            get => GetOrCreateJunction<WebResource, ResourceDictionary>(nameof(WebResourceToResourceDictionaryJunction));
+            set => Set(nameof(WebResourceToResourceDictionaryJunction), value);
+        }
+        #endregion
+        #region Computed
+        public Dictionary<DataKey<WebResource>, ResourceDictionary[]> ResourceDictionariesByNovel =>
+            Resources.Keys.ToDictionary(x => x,
+                x => WebResourceToResourceDictionaryJunction[x].Select(y => ResourceDictionaries[y]).ToArray());
+
+        #endregion
+    }
+}
diff --git a/Beam/SourceLinkBuilder.cs b/Beam.Data/LinkBuilder.cs
similarity index 92%
rename from Beam/SourceLinkBuilder.cs
rename to Beam.Data/LinkBuilder.cs
index 9aa26bb..34312c6 100644
--- a/Beam/SourceLinkBuilder.cs
+++ b/Beam.Data/LinkBuilder.cs
@@ -1,10 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Text;
+using Beam.Abstractions;
+using Beam.Models;
+using static Beam.Exceptions.Exceptions;
 
-namespace Beam {
+namespace Beam.Data {
     /// <summary>
     /// Describes where a <see cref="Parameter"/> token should be inserted relative to the run‑time value
     /// that ultimately replaces it when building a <see cref="SourceLink"/>.
@@ -129,7 +128,7 @@ namespace Beam {
     /// </remarks>
     /// <param name="host">DNS host name (e.g. <c>api.example.com</c>).</param>
     /// <param name="protocol">Transport protocol; defaults to <c>https</c>.</param>
-    public class SourceLinkBuilder(string host, string protocol = "https") {
+    public class LinkBuilder(string host, string protocol = "https") : ILinkBuilder {
         /// <summary>
         /// Gets or sets the scheme part of the URL (e.g. <c>https</c>, <c>http</c>).
         /// </summary>
@@ -148,8 +147,8 @@ namespace Beam {
         /// <summary>
         /// Produces a deep copy whose <see cref="Segments"/> and contained collections are detached from the original.
         /// </summary>
-        public SourceLinkBuilder Clone()
-            => new SourceLinkBuilder(Host, Protocol) {
+        public LinkBuilder Clone()
+            => new LinkBuilder(Host, Protocol) {
                 Segments = [.. Segments.Select(static x => x.Clone())]
             };
 
@@ -241,7 +240,7 @@ namespace Beam {
         /// Replaces the whole <see cref="Segments"/> collection with the supplied <paramref name="segments"/>, each represented as a <see cref="LinkSegment"/>.
         /// </summary>
         /// <returns>This instance for fluent calls.</returns>
-        public SourceLinkBuilder WithSegments(params IEnumerable<string> segments) {
+        public LinkBuilder WithSegments(params IEnumerable<string> segments) {
             Segments = segments.Select(static x => new LinkSegment(x)).ToList();
             return this;
         }
@@ -250,7 +249,7 @@ namespace Beam {
         /// Replaces the <see cref="Segments"/> collection with <paramref name="count"/> empty segments.
         /// </summary>
         /// <param name="count">Number of segments to create.</param>
-        public SourceLinkBuilder WithSegments(int count)
+        public LinkBuilder WithSegments(int count)
             => WithSegments(Enumerable.Repeat("", count));
         #endregion
 
@@ -258,7 +257,7 @@ namespace Beam {
         /// <summary>
         /// Replaces parameters of the <paramref name="i"/>‑th segment using the supplied identifiers.
         /// </summary>
-        public SourceLinkBuilder WithParameters(int i, params string[] parameters) {
+        public LinkBuilder WithParameters(int i, params string[] parameters) {
             Segments[i].WithParameters(parameters);
             return this;
         }
@@ -266,7 +265,7 @@ namespace Beam {
         /// <summary>
         /// Replaces parameters of the <paramref name="i"/>‑th segment using explicit name/position tuples.
         /// </summary>
-        public SourceLinkBuilder WithParameters(int i, params (string, Position)[] parameters) {
+        public LinkBuilder WithParameters(int i, params (string, Position)[] parameters) {
             Segments[i].WithParameters(parameters);
             return this;
         }
@@ -325,12 +324,15 @@ namespace Beam {
             return count;
         }
 
+        public string Build(IReadOnlyState state)
+            => Build(state.GetState().ToArray<object>());
+
         #region Build
         /// <summary>
         /// Produces a concrete <see cref="SourceLink"/> using values from an external <see cref="State"/> object.
         /// </summary>
         /// <param name="parameterValues">Object providing positional values.</param>
-        public SourceLink Build(State parameterValues)
+        public string Build(State parameterValues)
             => Build(parameterValues.GetState());
 
         /// <summary>
@@ -339,7 +341,7 @@ namespace Beam {
         /// <param name="parameterValues">Flat array of values that will be written in the order that parameters appear when segments are enumerated left‑to‑right. Any optional parameters must still appear as null if missing.</param>
         /// <returns>The completed <see cref="SourceLink"/>.</returns>
         /// <exception cref="ArgumentOutOfRangeException">If the supplied value count does not match <see cref="GetParameterCount"/>().</exception>
-        public SourceLink Build(params object?[] parameterValues) {
+        public string Build(params object?[] parameterValues) {
             ArgumentOutOfRangeException.ThrowIfNotEqual(parameterValues.Length, GetParameterCount());
 
             StringBuilder link = new();
@@ -357,10 +359,10 @@ namespace Beam {
                         if (segment.Parameters[i].Position.HasFlag(Position.Optional))
                             continue;
                         else
-                            throw new ArgumentException(S.M.RequiredArgumentMissing);
+                            throw new ArgumentException(string.Format(link_builder_argument_missing, pvC, segment.Parameters[i].Name));
 
                     if (segment.Parameters[i].Position.HasFlag(Position.Query) && Segments[^1] != segment)
-                            throw new ArgumentException(S.M.QueryParametersOnlyAtLastSegment);
+                            throw new ArgumentException(string.Format(link_builder_query_only_at_last, i));
 
                     if (segment.Parameters[i].Position.HasFlag(Position.Query))
                         if (!startedQueryString) {
@@ -378,10 +380,10 @@ namespace Beam {
                     if (parameterValues[pvC] is not null)
                         link.Append(parameterValues[pvC++]);
                     else if (!segment.Parameters[i].Position.HasFlag(Position.Optional))
-                        throw new ArgumentException(S.M.RequiredArgumentMissing);
+                        throw new ArgumentException(string.Format(link_builder_argument_missing, pvC, segment.Parameters[i].Name));
 
                     if (segment.Parameters[i].Position.HasFlag(Position.Query | Position.After))
-                        throw new ArgumentException(S.M.QueryFlagIncompatibleWithAfterFlag);
+                        throw new ArgumentException(string.Format(link_builder_incompatible_flag, nameof(Position.Query), nameof(Position.After)));
 
                     if (segment.Parameters[i].Position.HasFlag(Position.After))
                         link.Append(segment.Parameters[i].Name);
@@ -393,7 +395,7 @@ namespace Beam {
                 link.Append(segment.Suffix);
             }
 
-            return new SourceLink(link.ToString());
+            return link.ToString();
         }
         #endregion
     }
diff --git a/Beam.Models/ResourceDictionary.cs b/Beam.Data/ResourceDictionary.cs
similarity index 74%
rename from Beam.Models/ResourceDictionary.cs
rename to Beam.Data/ResourceDictionary.cs
index 88370dd..d036181 100644
--- a/Beam.Models/ResourceDictionary.cs
+++ b/Beam.Data/ResourceDictionary.cs
@@ -1,16 +1,10 @@
-
-
+using System.Text.Json.Serialization;
 using aeqw89.DataKeys;
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Text;
-using System.Text.Json.Serialization;
-using System.Threading.Tasks;
+using Beam.Abstractions;
+using Beam.Models;
 
-namespace Beam.Models {
-    public class ResourceDictionary : IKeyed<ResourceDictionary> {
+namespace Beam.Data {
+    public class ResourceDictionary : IKeyed<ResourceDictionary>, IResourceDictionary {
         public required DataKey<ResourceDictionary> Key { get; set; }
 
         [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
diff --git a/Beam.Data/Template.cs b/Beam.Data/Template.cs
new file mode 100644
index 0000000..0245a2a
--- /dev/null
+++ b/Beam.Data/Template.cs
@@ -0,0 +1,19 @@
+using aeqw89.DataKeys;
+using Beam.Abstractions;
+using Beam.Dynamic;
+
+namespace Beam.Data {
+    public record class Template : ITemplate {
+        public required DataKey<ITemplate> Key { get; set; }
+        public required StateChangerFactory Factory { get; set; }
+        IStateChangerFactory ITemplate.Factory {
+            get => Factory;
+            set => Factory = (StateChangerFactory)value;
+        }
+        public required LinkBuilder Builder { get; set; }
+        ILinkBuilder ITemplate.Builder {
+            get => Builder;
+            set => Builder = (LinkBuilder)value;
+        }
+    }
+}
diff --git a/Beam.Models/WebResource.cs b/Beam.Data/WebResource.cs
similarity index 82%
rename from Beam.Models/WebResource.cs
rename to Beam.Data/WebResource.cs
index d92028e..1f423e1 100644
--- a/Beam.Models/WebResource.cs
+++ b/Beam.Data/WebResource.cs
@@ -1,13 +1,7 @@
-using aeqw89.PersistentData;
-using aeqw89.DataKeys;
+using aeqw89.DataKeys;
 using Beam.Dynamic;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace Beam.Models {
+namespace Beam.Data {
     /// <summary>
     /// Represents a specific resource accessible online; e.g. a book's contents.
     /// </summary>
diff --git a/Beam/DownloadContext.cs b/Beam.Downloaders/DownloadContext.cs
similarity index 74%
rename from Beam/DownloadContext.cs
rename to Beam.Downloaders/DownloadContext.cs
index 56e4fce..96009af 100644
--- a/Beam/DownloadContext.cs
+++ b/Beam.Downloaders/DownloadContext.cs
@@ -1,41 +1,33 @@
-using HtmlAgilityPack;
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using Beam.Abstractions;
+using Beam.Models;
+using HtmlAgilityPack;
 using Microsoft.Extensions.Logging;
 
-namespace Beam {
+namespace Beam.Downloaders {
     //public delegate T HtmlTransformer<out T>(HtmlDocument doc);
-    public delegate Task<U> AsyncTransformer<in T, U>(T elem);
     //public delegate Task<T> AsyncHtmlTransformer<T>(HtmlDocument doc);
     //public delegate Task<T> AsyncBinaryTransformer<T>(byte[] bin);
 
-    public class DownloadContext<RawType> : IDisposable {
+    public class DownloadContext<RawType> {
         private bool disposedValue;
-
-        public DownloadContextBuilder<RawType> CreateBuilder()
-            => DownloadContextBuilder<RawType>.FromContext(this);
-
+        
         public HttpClient Client { get; }
         public HtmlWeb Web { get; }
-        public IProgress<DownloadReport>? DownloadReporter { get; set; }
-        public IProgress<RetryReport>? RetryReporter { get; set; }
+        public IProgress<IDownloadReport>? DownloadReporter { get; set; }
+        public IProgress<IRetryReport>? RetryReporter { get; set; }
         public AsyncDownloadFailurePredicate<RawType>?[]? AsyncFailurePredicates { get;  }
         public TimeSpan TimeOut { get; set; }
-        public IEnumerable<SourceLink> Links { get; }
+        public IEnumerable<string> Links { get; }
         public CancellationToken CancellationToken { get; }
         public DocumentCache Cache { get; private set; } = [];
         public ILogger? DownloadLogger { get; set; }
 
         public DownloadContext(HtmlWeb web,
                                HttpClient client,
-                               IEnumerable<SourceLink> links,
+                               IEnumerable<string> links,
                                CancellationToken cancellationToken = default,
-                               IProgress<DownloadReport>? downloadReporter = null,
-                               IProgress<RetryReport>? retryReporter = null,
+                               IProgress<IDownloadReport>? downloadReporter = null,
+                               IProgress<IRetryReport>? retryReporter = null,
                                AsyncDownloadFailurePredicate<RawType>?[]? asyncFailurePredicates = null,
                                TimeSpan? timeOut = null,
                                ILogger? downloadLogger = null) {
diff --git a/Beam/DownloadContextBuilder.cs b/Beam.Downloaders/DownloadContextBuilder.cs
similarity index 90%
rename from Beam/DownloadContextBuilder.cs
rename to Beam.Downloaders/DownloadContextBuilder.cs
index d25e764..d92277a 100644
--- a/Beam/DownloadContextBuilder.cs
+++ b/Beam.Downloaders/DownloadContextBuilder.cs
@@ -1,21 +1,18 @@
-using HtmlAgilityPack;
+using Beam.Abstractions;
+using Beam.Models;
+using HtmlAgilityPack;
 using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace Beam {
+namespace Beam.Downloaders {
 
     public class DownloadContextBuilder<RawType> {
         private HtmlWeb _web;
         private HttpClient _client;
-        private IProgress<DownloadReport>? _downloadReporter;
-        private IProgress<RetryReport>? _retryReporter;
+        private IProgress<IDownloadReport>? _downloadReporter;
+        private IProgress<IRetryReport>? _retryReporter;
         private AsyncDownloadFailurePredicate<RawType>?[] _asyncFailurePredicates = [];
         private TimeSpan _timeOut;
-        private IEnumerable<SourceLink> _links;
+        private IEnumerable<string> _links;
         private CancellationToken _cancellationToken;
         private DocumentCache _cache;
         private ILogger? _downloadLogger;
@@ -39,12 +36,12 @@ namespace Beam {
             return this;
         }
 
-        public DownloadContextBuilder<RawType> WithDownloadReporter(IProgress<DownloadReport> downloadReporter) {
+        public DownloadContextBuilder<RawType> WithDownloadReporter(IProgress<IDownloadReport> downloadReporter) {
             _downloadReporter = downloadReporter;
             return this;
         }
 
-        public DownloadContextBuilder<RawType> WithRetryReporter(IProgress<RetryReport> retryReporter) {
+        public DownloadContextBuilder<RawType> WithRetryReporter(IProgress<IRetryReport> retryReporter) {
             _retryReporter = retryReporter;
             return this;
         }
@@ -59,7 +56,7 @@ namespace Beam {
             return this;
         }
 
-        public DownloadContextBuilder<RawType> WithLinks(IEnumerable<SourceLink> links) {
+        public DownloadContextBuilder<RawType> WithLinks(IEnumerable<string> links) {
             _links = links;
             return this;
         }
diff --git a/Beam/SequentialDownloader.cs b/Beam.Downloaders/SequentialDownloader.cs
similarity index 87%
rename from Beam/SequentialDownloader.cs
rename to Beam.Downloaders/SequentialDownloader.cs
index 18c6a88..c9f586e 100644
--- a/Beam/SequentialDownloader.cs
+++ b/Beam.Downloaders/SequentialDownloader.cs
@@ -1,14 +1,15 @@
-using HtmlAgilityPack;
+using Beam.Abstractions;
+using Beam.Models;
 using Microsoft.Extensions.Logging;
 
-namespace Beam {
+namespace Beam.Downloaders {
     public class SequentialDownloader<RawType, OutType> : IAsyncEnumerator<OutType> {
         public OutType Current { get; protected set; }
         public DownloadContext<RawType> Context { get; }
         public ILogger? Logger { get; set; }
         public int LastOrder { get; set; } = 0;
 
-        protected IEnumerator<SourceLink> LinksEnumerator;
+        protected IEnumerator<string> LinksEnumerator;
 
         public Func<IUnitDownloader<OutType>> GetUnitDownloader { get; set; }
 
@@ -41,17 +42,17 @@ namespace Beam {
             List<Ordered<string>> links = [];
 
             //Logger?.LogInformation("MoveNextAsync() \n\t -> Links.Current = {} ", LinksEnumerator.Current.Link.AbsoluteUri);
-            links.Add(new Ordered<string>(LinksEnumerator.Current.Link.AbsoluteUri, LastOrder++));
+            links.Add(new Ordered<string>(LinksEnumerator.Current, LastOrder++));
 
-            while (LinksEnumerator.MoveNext() && LinksEnumerator.Current != SourceLink.InvalidLink && links.Count < idealLinkCount)
-                links.Add(new Ordered<string>(LinksEnumerator.Current.Link.AbsoluteUri, LastOrder++));
+            while (LinksEnumerator.MoveNext() && !string.IsNullOrWhiteSpace(LinksEnumerator.Current) && links.Count < idealLinkCount)
+                links.Add(new Ordered<string>(LinksEnumerator.Current, LastOrder++));
             //Logger?.LogInformation("MoveNextAsync() \n\t -> links.Count = {} ", links.Count);
             if (links.Count == 0) {
                 Logger?.LogInformation("Out of links!");
                 return false;
             }
 
-            if (links.Any((x) => x.Data == SourceLink.InvalidLink.Link.AbsoluteUri))
+            if (links.Any((x) => string.IsNullOrWhiteSpace(x.Data)))
                 return false;
 
             var (result, downloadedT) = await unit.TryDownload(
diff --git a/Beam/SequentialFragmentDownloader.cs b/Beam.Downloaders/SequentialFragmentDownloader.cs
similarity index 98%
rename from Beam/SequentialFragmentDownloader.cs
rename to Beam.Downloaders/SequentialFragmentDownloader.cs
index 46dd51b..b4c40d5 100644
--- a/Beam/SequentialFragmentDownloader.cs
+++ b/Beam.Downloaders/SequentialFragmentDownloader.cs
@@ -1,7 +1,8 @@
-using Microsoft.Extensions.Logging;
-using System.Collections.Concurrent;
+using Beam.Abstractions;
+using Beam.Models;
+using Microsoft.Extensions.Logging;
 
-namespace Beam {
+namespace Beam.Downloaders {
     public class SequentialFragmentDownloader<RawType, OutType> : SequentialDownloader<RawType, Fragment<Ordered<OutType>>> {
         public SequentialFragmentDownloader(
             DownloadContext<RawType> context, 
diff --git a/Beam/UnitDownloader.cs b/Beam.Downloaders/UnitDownloader.cs
similarity index 89%
rename from Beam/UnitDownloader.cs
rename to Beam.Downloaders/UnitDownloader.cs
index 0a200e6..a2c192d 100644
--- a/Beam/UnitDownloader.cs
+++ b/Beam.Downloaders/UnitDownloader.cs
@@ -1,8 +1,8 @@
-using HtmlAgilityPack;
-
-namespace Beam {
-    public delegate Task<bool> AsyncDownloadFailurePredicate<in T>(T download);
+using Beam.Abstractions;
+using Beam.Models;
+using HtmlAgilityPack;
 
+namespace Beam.Downloaders {
     /// <summary>
     /// A download managing class that manages a singular download with failure-detection and exponential-backoff retries. This class is safe to instantiate per request.
     /// </summary>
@@ -45,7 +45,7 @@ namespace Beam {
             }
         }
 
-        public async Task<(bool, T?)> TryDownload(Ordered<string>[] link, CancellationToken ct, int maximumRetryCount = 7, IProgress<RetryReport>? tryProgress = null) {
+        public async Task<(bool, T?)> TryDownload(IOrdered<string>[] link, CancellationToken ct, int maximumRetryCount = 7, IProgress<IRetryReport>? tryProgress = null) {
             if (link.Length == 0)
                 return (false, default);
 
diff --git a/Beam/UnitDownloaderBinary.cs b/Beam.Downloaders/UnitDownloaderBinary.cs
similarity index 93%
rename from Beam/UnitDownloaderBinary.cs
rename to Beam.Downloaders/UnitDownloaderBinary.cs
index 4248307..f32395e 100644
--- a/Beam/UnitDownloaderBinary.cs
+++ b/Beam.Downloaders/UnitDownloaderBinary.cs
@@ -1,8 +1,7 @@
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
+using Beam.Abstractions;
+using Beam.Models;
 
-namespace Beam {
+namespace Beam.Downloaders {
     /// <summary>
     /// A download-managing class that retrieves binary data through <see cref="HttpClient"/>,
     /// applies an <see cref="AsyncBinaryTransformer{T}"/>, and supports failure detection
@@ -49,10 +48,10 @@ namespace Beam {
         }
 
         public async Task<(bool, T?)> TryDownload(
-            Ordered<string>[] link,
+            IOrdered<string>[] link,
             CancellationToken ct,
             int maximumRetryCount = 7,
-            IProgress<RetryReport>? tryProgress = null) {
+            IProgress<IRetryReport>? tryProgress = null) {
             if (link.Length == 0) return (false, default);
 
             T? result = default;
diff --git a/Beam/UnitFragmentDownloader.cs b/Beam.Downloaders/UnitFragmentDownloader.cs
similarity index 80%
rename from Beam/UnitFragmentDownloader.cs
rename to Beam.Downloaders/UnitFragmentDownloader.cs
index 4addda4..c834ab3 100644
--- a/Beam/UnitFragmentDownloader.cs
+++ b/Beam.Downloaders/UnitFragmentDownloader.cs
@@ -1,13 +1,10 @@
-using HtmlAgilityPack;
+using Beam.Abstractions;
+using Beam.Exceptions;
+using Beam.Models;
+using HtmlAgilityPack;
 using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace Beam {
+namespace Beam.Downloaders {
     public class UnitFragmentDownloader<T> : IUnitDownloader<Fragment<Ordered<T>>> {
         public UnitFragmentDownloader(HtmlWeb web,
                                       AsyncTransformer<HtmlDocument, T> transformer,
@@ -31,10 +28,10 @@ namespace Beam {
 
         private readonly IUnitDownloader<T> UnitDownloader;
 
-        async Task<(bool, Fragment<Ordered<T>>?)> IUnitDownloader<Fragment<Ordered<T>>>.TryDownload(Ordered<string>[] link, CancellationToken ct, int maximumRetryCount, IProgress<RetryReport>? tryProgress) {
+        async Task<(bool, Fragment<Ordered<T>>?)> IUnitDownloader<Fragment<Ordered<T>>>.TryDownload(IOrdered<string>[] link, CancellationToken ct, int maximumRetryCount, IProgress<IRetryReport>? tryProgress) {
             Fragment<Ordered<T>> fragment = new Fragment<Ordered<T>>(link.Length);
             if (!Fragment<Ordered<T>>.TryAcquireUpdater(fragment, out var updater))
-                throw new S.AssertionException(S.M.NewFragmentShouldBeFree);
+                throw new AssertionException(Exceptions.Exceptions.fragment_locked);
             bool isFailure = false;
             await Parallel.ForEachAsync(link, async (x, pct) => {
                 pct.ThrowIfCancellationRequested();
@@ -42,12 +39,12 @@ namespace Beam {
                 var (result, downloadedT) = await UnitDownloader.TryDownload([x], ct, maximumRetryCount, tryProgress);
                 if (!result) {
                     Interlocked.Exchange(ref isFailure, true);
-                    Logger?.LogError("Failed to retrieve {} order={}", x.Data, x.Order);
+                    Logger?.LogError("Failed to retrieve {0} order={1}", x.Data, x.Order);
                     return;
                 }
                 if (downloadedT == null) {
                     Interlocked.Exchange(ref isFailure, true);
-                    Logger?.LogCritical("Failed to retrieve {} order={}", x.Data, x.Order);
+                    Logger?.LogCritical("Failed to retrieve {0} order={1}", x.Data, x.Order);
                     return;
                 }
                 updater(new Ordered<T>(downloadedT, x.Order));
diff --git a/Beam/UnitFragmentDownloaderBinary.cs b/Beam.Downloaders/UnitFragmentDownloaderBinary.cs
similarity index 91%
rename from Beam/UnitFragmentDownloaderBinary.cs
rename to Beam.Downloaders/UnitFragmentDownloaderBinary.cs
index 7c5a342..f5c687d 100644
--- a/Beam/UnitFragmentDownloaderBinary.cs
+++ b/Beam.Downloaders/UnitFragmentDownloaderBinary.cs
@@ -1,10 +1,9 @@
-using System;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
+using Beam.Abstractions;
+using Beam.Exceptions;
+using Beam.Models;
 using Microsoft.Extensions.Logging;
 
-namespace Beam {
+namespace Beam.Downloaders {
     /// <summary>
     /// Groups multiple binary downloads into a single Fragment, applying
     /// failure detection and exponential-back-off retries for each link.
@@ -35,13 +34,13 @@ namespace Beam {
         private readonly IUnitDownloader<T> UnitDownloader;
 
         async Task<(bool, Fragment<Ordered<T>>?)> IUnitDownloader<Fragment<Ordered<T>>>.TryDownload(
-            Ordered<string>[] link,
+            IOrdered<string>[] link,
             CancellationToken ct,
             int maximumRetryCount,
-            IProgress<RetryReport>? tryProgress) {
+            IProgress<IRetryReport>? tryProgress) {
             var fragment = new Fragment<Ordered<T>>(link.Length);
             if (!Fragment<Ordered<T>>.TryAcquireUpdater(fragment, out var updater))
-                throw new S.AssertionException(S.M.NewFragmentShouldBeFree);
+                throw new AssertionException(Exceptions.Exceptions.fragment_locked);
 
             var isFailure = false;
 
diff --git a/Beam.Dynamic/AnchorCollectionDataProvider.cs b/Beam.Dynamic/AnchorCollectionDataProvider.cs
index e22e977..a79a459 100644
--- a/Beam.Dynamic/AnchorCollectionDataProvider.cs
+++ b/Beam.Dynamic/AnchorCollectionDataProvider.cs
@@ -6,7 +6,7 @@ using System.Text;
 using System.Threading.Tasks;
 
 namespace Beam.Dynamic {
-    public class AnchorCollectionDataProvider : IDataProvider<string[]>, IDataProvider<SourceLink[]> {
+    public class AnchorCollectionDataProvider : IDataProvider<string[]> {
         public IBinding? Content { get; set; }
         public string? RelativeTo { get; set; }
 
@@ -35,19 +35,5 @@ namespace Beam.Dynamic {
 
             return links.Where(x => !string.IsNullOrWhiteSpace(x)).ToArray();
         }
-
-        SourceLink[] IDataProvider<SourceLink[]>.Get(HtmlDocument document) {
-            var links = Get(document);
-
-            if (links.Length == 0)
-                return [];
-
-            List<SourceLink> slinks = [];
-            foreach (var link in links)
-                if (Uri.TryCreate(GetAbsolute(RelativeTo, link), UriKind.RelativeOrAbsolute, out _))
-                    slinks.Add(new SourceLink(GetAbsolute(RelativeTo, link)));
-
-            return slinks.ToArray();
-        }
     }
 }
diff --git a/Beam.Dynamic/AnchorDataProvider.cs b/Beam.Dynamic/AnchorDataProvider.cs
index 6bf1909..d9c2223 100644
--- a/Beam.Dynamic/AnchorDataProvider.cs
+++ b/Beam.Dynamic/AnchorDataProvider.cs
@@ -6,7 +6,7 @@ using System.Text;
 using System.Threading.Tasks;
 
 namespace Beam.Dynamic {
-    public class AnchorDataProvider : IDataProvider<SourceLink>, IDataProvider<string> {
+    public class AnchorDataProvider : IDataProvider<string> {
         public IBinding? Content { get; set; }
 
         public string Get(HtmlDocument document) {
@@ -16,16 +16,5 @@ namespace Beam.Dynamic {
             return Content.Select(document)?.GetAttributeValue("href", "") ?? "";
 
         }
-
-        SourceLink IDataProvider<SourceLink>.Get(HtmlDocument document) {
-            var content = Get(document);
-            if (content is null)
-                return SourceLink.InvalidLink;
-
-            if (!Uri.TryCreate(content, UriKind.RelativeOrAbsolute, out _))
-                return SourceLink.InvalidLink;
-
-            return new SourceLink(content);
-        }
     }
 }
diff --git a/Beam.Temporary.Cli/Architecture.cs b/Beam.Dynamic/Architecture.cs
similarity index 93%
rename from Beam.Temporary.Cli/Architecture.cs
rename to Beam.Dynamic/Architecture.cs
index c0d96ec..d93ab66 100644
--- a/Beam.Temporary.Cli/Architecture.cs
+++ b/Beam.Dynamic/Architecture.cs
@@ -1,13 +1,7 @@
 using aeqw89.DataKeys;
-using HtmlAgilityPack;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using Beam.Abstractions;
 
-namespace Beam.Temporary.Cli {
+namespace Beam.Dynamic {
     /// <summary>
     /// <para>
     ///     A collection of specific useful methods and constants that facilitate the use of the application; allows other parts of the application to depend on architecture-specific arbitrary choices without compromising the Single-Responsibility principle or increasing redundant code. 
diff --git a/Beam.Dynamic/Beam.Dynamic.csproj b/Beam.Dynamic/Beam.Dynamic.csproj
index df7f2f2..dbea70f 100644
--- a/Beam.Dynamic/Beam.Dynamic.csproj
+++ b/Beam.Dynamic/Beam.Dynamic.csproj
@@ -7,13 +7,13 @@
     </PropertyGroup>
     <ItemGroup>
         <PackageReference Include="aeqw89.DataKeys" Version="2.0.1" />
-        <PackageReference Include="aeqw89.PersistentData" Version="1.1.0" />
+        <PackageReference Include="aeqw89.PersistentData" Version="1.3.3" />
         <PackageReference Include="HtmlAgilityPack" Version="1.11.72" />
         <PackageReference Include="Microsoft.Recognizers.Text.Number" Version="1.8.13" />
     </ItemGroup>
     <ItemGroup>
-        <ProjectReference Include="..\Beam\Beam.csproj">
-            <PrivateAssets>all</PrivateAssets>
-        </ProjectReference>
+      <ProjectReference Include="..\Beam.Abstractions\Beam.Abstractions.csproj" />
+      <ProjectReference Include="..\Beam.Exceptions\Beam.Exceptions.csproj" />
+      <ProjectReference Include="..\Beam.Models\Beam.Models.csproj" />
     </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Beam/CommonStateChangers.cs b/Beam.Dynamic/CommonStateChangers.cs
similarity index 52%
rename from Beam/CommonStateChangers.cs
rename to Beam.Dynamic/CommonStateChangers.cs
index 2d5e3d8..40e0ecb 100644
--- a/Beam/CommonStateChangers.cs
+++ b/Beam.Dynamic/CommonStateChangers.cs
@@ -3,33 +3,35 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Beam.Abstractions;
 
-namespace Beam {
+namespace Beam.Dynamic {
     public static class CommonStateChangers {
         public static IStateChangeBehaviour LastAsNumber => new NumberedStateChanger((x, i) => {
-            object last = x[^1];
+            object last = x.GetState()[^1];
             if (!int.TryParse(last.ToString(), out var number))
-                throw new InvalidOperationException(S.M.StateChangeError);
-            x[^1] = (number + i).ToString();
+                throw new InvalidOperationException(Exceptions.Exceptions.state_change_error); // TODO use more specific exception
+            x.GetState()[^1] = (number + i).ToString();
         });
 
         public static IStateChangeBehaviour Constant => new ConstantStateChanger();
 
         public static IStateChangeBehaviour NthAsNumber(Index n, bool keepSuffix = true)
             => new NumberedStateChanger((x, i) => {
-                string? nth = x[n]?.ToString();
+                string? nth = x.GetState()[n]?.ToString();
+                string[] xState = x.GetState();
                 if (nth is null)
-                    throw new InvalidOperationException(S.M.StateChangeError);
+                    throw new InvalidOperationException(Exceptions.Exceptions.state_change_error); // TODO use more specific exception
                 if (!int.TryParse(nth, out var number))
                     if (keepSuffix) {
                         string[] split = nth.Split('.');
                         if (!int.TryParse(split[0], out number))
-                            throw new InvalidOperationException(S.M.StateChangeError);
-                        x[n] = (number + i) + split[1..].Aggregate((x, y) => $"{x}.{y}");
+                            throw new InvalidOperationException(Exceptions.Exceptions.state_change_error); // TODO use more specific exception
+                        xState[n] = (number + i) + split[1..].Aggregate((x, y) => $"{x}.{y}");
                         return;
                     } else
-                        throw new InvalidOperationException(S.M.StateChangeError);
-                x[n] = (number + i).ToString();
+                        throw new InvalidOperationException(Exceptions.Exceptions.state_change_error); // TODO use more specific exception
+                xState[n] = (number + i).ToString();
             });
 
 
diff --git a/Beam.Dynamic/CommonTransformers.cs b/Beam.Dynamic/CommonTransformers.cs
new file mode 100644
index 0000000..8d3d9f0
--- /dev/null
+++ b/Beam.Dynamic/CommonTransformers.cs
@@ -0,0 +1,45 @@
+using aeqw89.DataKeys;
+using Beam.Abstractions;
+using Beam.Models;
+using HtmlAgilityPack;
+
+namespace Beam.Dynamic;
+
+public static class CommonTransformers {
+    public static AsyncTransformer<HtmlDocument, ArticleData> ArticleDataTransformer(DataBindings? binding) =>
+        (x) => {
+            return Task.FromResult(new ArticleData() {
+                Authors = binding?.Authors?.Get(x)?.Select(StringCleaner.Clean)?.ToArray() ?? [],
+                Name = StringCleaner.Clean(binding?.Title?.Get(x) ?? ""),
+                Categories = binding?.Tags?.Get(x)?.Select(StringCleaner.Clean)?.ToArray() ?? [],
+                Description = StringCleaner.Clean(binding?.Description?.Get(x) ?? "")
+            });
+        };
+
+    public static AsyncTransformer<HtmlDocument, TableOfContentsData>
+        TableOfContentsTransformer(DataBindings? binding) => (x) => {
+        return Task.FromResult(new TableOfContentsData() {
+            Authors = binding?.Authors?.Get(x)?.Select(StringCleaner.Clean)?.ToArray() ?? [],
+            Name = StringCleaner.Clean(binding?.Title?.Get(x) ?? ""),
+            Categories = binding?.Tags?.Get(x)?.Select(StringCleaner.Clean)?.ToArray() ?? [],
+            Description = StringCleaner.Clean(binding?.Description?.Get(x) ?? ""),
+            ContentLinks = binding?.TableOfContents?.Get(x) ?? [],
+            PagesLinks = binding?.PagesDropDown?.Get(x) ?? []
+        });
+    };
+
+    public static AsyncTransformer<HtmlDocument, StringDocument> DocumentTransformer(DataBindings? binding,
+        IDocumentMetaData? metaData = null) => (x) => {
+        var resolved = binding?.Resolve(x);
+        var articleData = new ArticleData() {
+            Name = StringCleaner.Clean(resolved?.Title),
+        };
+        Dictionary<DataKey<IDocumentMetaData>, IDocumentMetaData> meta = [];
+        meta.Add(IArchitecture.Default.ChapterKey, articleData);
+        if (metaData is not null)
+            meta.Add(IArchitecture.Default.BookKey, metaData);
+        return Task.FromResult(new StringDocument(Path.GetRandomFileName(), StringCleaner.Clean(resolved?.Content)) {
+            MetaData = meta
+        });
+    };
+}
\ No newline at end of file
diff --git a/Beam.Dynamic/ConstantStateChanger.cs b/Beam.Dynamic/ConstantStateChanger.cs
new file mode 100644
index 0000000..95a29de
--- /dev/null
+++ b/Beam.Dynamic/ConstantStateChanger.cs
@@ -0,0 +1,9 @@
+using Beam.Abstractions;
+
+namespace Beam.Dynamic {
+    public class ConstantStateChanger : IStateChangeBehaviour {
+        public void Apply(IState state, object stimulus) {
+            return;
+        }
+    }
+}
diff --git a/Beam.Dynamic/DataBindings.cs b/Beam.Dynamic/DataBindings.cs
index 77b4371..566cda6 100644
--- a/Beam.Dynamic/DataBindings.cs
+++ b/Beam.Dynamic/DataBindings.cs
@@ -1,191 +1,192 @@
-using HtmlAgilityPack;
-using System.Text.Json.Serialization;
+using System.Text.Json.Serialization;
+using Beam.Abstractions;
+using HtmlAgilityPack;
 
-namespace Beam.Dynamic {
-    public record class DataBindings {
-        #region ---------------------- Common Bindings ----------------------
-        [JsonIgnore]
-        public IDataProvider<string>? Title {
-            get => Get<string>(nameof(Title));
-            set => Providers[nameof(Title)] = value;
-        }
-        [JsonIgnore]
-        public IDataProvider<string[]>? Authors {
-            get => Get<string[]>(nameof(Authors));
-            set => Providers[nameof(Authors)] = value;
-        }
-        [JsonIgnore]
-        public IDataProvider<string>? Description {
-            get => Get<string>(nameof(Description));
-            set => Providers[nameof(Description)] = value;
-        }
-        [JsonIgnore]
-        public IDataProvider<string>? Content {
-            get => Get<string>(nameof(Content));
-            set => Providers[nameof(Content)] = value;
-        }
-        [JsonIgnore]
-        public IDataProvider<string[]>? Language {
-            get => Get<string[]>(nameof(Language));
-            set => Providers[nameof(Language)] = value;
-        }
-        [JsonIgnore]
-        public IDataProvider<string[]>? Tags {
-            get => Get<string[]>(nameof(Tags));
-            set => Providers[nameof(Tags)] = value;
-        }
-        [JsonIgnore]
-        public IDataProvider<string>? Publisher {
-            get => Get<string>(nameof(Publisher));
-            set => Providers[nameof(Publisher)] = value;
-        }
-        [JsonIgnore]
-        public IDataProvider<DateTimeOffset>? PublicationDate {
-            get => Get<DateTimeOffset>(nameof(PublicationDate));
-            set => Providers[nameof(PublicationDate)] = value;
-        }
-        [JsonIgnore]
-        public IDataProvider<string>? ISBN {
-            get => Get<string>(nameof(ISBN));
-            set => Providers[nameof(ISBN)] = value;
-        }
-        [JsonIgnore]
-        public IDataProvider<int>? PageCount {
-            get => Get<int>(nameof(PageCount));
-            set => Providers[nameof(PageCount)] = value;
-        }
-        [JsonIgnore]
-        public IDataProvider<SourceLink>? CoverImage {
-            get => Get<SourceLink>(nameof(CoverImage));
-            set => Providers[nameof(CoverImage)] = value;
-        }
-        [JsonIgnore]
-        public IDataProvider<string[]>? Series {
-            get => Get<string[]>(nameof(Series));
-            set => Providers[nameof(Series)] = value;
-        }
-        [JsonIgnore]
-        public IDataProvider<int>? Edition {
-            get => Get<int>(nameof(Edition));
-            set => Providers[nameof(Edition)] = value;
-        }
-        [JsonIgnore]
-        public IDataProvider<string[]>? Contributors {
-            get => Get<string[]>(nameof(Contributors));
-            set => Providers[nameof(Contributors)] = value;
-        }
-        [JsonIgnore]
-        public IDataProvider<string[]>? Subjects {
-            get => Get<string[]>(nameof(Subjects));
-            set => Providers[nameof(Subjects)] = value;
-        }
-        [JsonIgnore]
-        public IDataProvider<string>? Rights {
-            get => Get<string>(nameof(Rights));
-            set => Providers[nameof(Rights)] = value;
-        }
-        [JsonIgnore]
-        public IDataProvider<SourceLink[]>? TableOfContents {
-            get => Get<SourceLink[]>(nameof(TableOfContents));
-            set => Providers[nameof(TableOfContents)] = value;
-        }
-        [JsonIgnore]
-        public IDataProvider<SourceLink[]>? PagesDropDown {
-            get => Get<SourceLink[]>(nameof(PagesDropDown));
-            set => Providers[nameof(PagesDropDown)] = value;
-        }
-        [JsonIgnore]
-        public IDataProvider<SourceLink>? NextPageButton {
-            get => Get<SourceLink>(nameof(NextPageButton));
-            set => Providers[nameof(NextPageButton)] = value;
-        }
-        [JsonIgnore]
-        public IDataProvider<SourceLink>? PreviousPageButton {
-            get => Get<SourceLink>(nameof(PreviousPageButton));
-            set => Providers[nameof(PreviousPageButton)] = value;
-        }
-        #endregion
+namespace Beam.Dynamic;
 
-        public Dictionary<string, IDataProvider?> Providers { get; set; } = [];
+public record class DataBindings : IDataBindings {
+    #region ---------------------- Common Bindings ----------------------
+    [JsonIgnore]
+    public IDataProvider<string>? Title {
+        get => Get<string>(nameof(Title));
+        set => Providers[nameof(Title)] = value;
+    }
+    [JsonIgnore]
+    public IDataProvider<string[]>? Authors {
+        get => Get<string[]>(nameof(Authors));
+        set => Providers[nameof(Authors)] = value;
+    }
+    [JsonIgnore]
+    public IDataProvider<string>? Description {
+        get => Get<string>(nameof(Description));
+        set => Providers[nameof(Description)] = value;
+    }
+    [JsonIgnore]
+    public IDataProvider<string>? Content {
+        get => Get<string>(nameof(Content));
+        set => Providers[nameof(Content)] = value;
+    }
+    [JsonIgnore]
+    public IDataProvider<string[]>? Language {
+        get => Get<string[]>(nameof(Language));
+        set => Providers[nameof(Language)] = value;
+    }
+    [JsonIgnore]
+    public IDataProvider<string[]>? Tags {
+        get => Get<string[]>(nameof(Tags));
+        set => Providers[nameof(Tags)] = value;
+    }
+    [JsonIgnore]
+    public IDataProvider<string>? Publisher {
+        get => Get<string>(nameof(Publisher));
+        set => Providers[nameof(Publisher)] = value;
+    }
+    [JsonIgnore]
+    public IDataProvider<DateTimeOffset>? PublicationDate {
+        get => Get<DateTimeOffset>(nameof(PublicationDate));
+        set => Providers[nameof(PublicationDate)] = value;
+    }
+    [JsonIgnore]
+    public IDataProvider<string>? ISBN {
+        get => Get<string>(nameof(ISBN));
+        set => Providers[nameof(ISBN)] = value;
+    }
+    [JsonIgnore]
+    public IDataProvider<int>? PageCount {
+        get => Get<int>(nameof(PageCount));
+        set => Providers[nameof(PageCount)] = value;
+    }
+    [JsonIgnore]
+    public IDataProvider<string>? CoverImage {
+        get => Get<string>(nameof(CoverImage));
+        set => Providers[nameof(CoverImage)] = value;
+    }
+    [JsonIgnore]
+    public IDataProvider<string[]>? Series {
+        get => Get<string[]>(nameof(Series));
+        set => Providers[nameof(Series)] = value;
+    }
+    [JsonIgnore]
+    public IDataProvider<int>? Edition {
+        get => Get<int>(nameof(Edition));
+        set => Providers[nameof(Edition)] = value;
+    }
+    [JsonIgnore]
+    public IDataProvider<string[]>? Contributors {
+        get => Get<string[]>(nameof(Contributors));
+        set => Providers[nameof(Contributors)] = value;
+    }
+    [JsonIgnore]
+    public IDataProvider<string[]>? Subjects {
+        get => Get<string[]>(nameof(Subjects));
+        set => Providers[nameof(Subjects)] = value;
+    }
+    [JsonIgnore]
+    public IDataProvider<string>? Rights {
+        get => Get<string>(nameof(Rights));
+        set => Providers[nameof(Rights)] = value;
+    }
+    [JsonIgnore]
+    public IDataProvider<string[]>? TableOfContents {
+        get => Get<string[]>(nameof(TableOfContents));
+        set => Providers[nameof(TableOfContents)] = value;
+    }
+    [JsonIgnore]
+    public IDataProvider<string[]>? PagesDropDown {
+        get => Get<string[]>(nameof(PagesDropDown));
+        set => Providers[nameof(PagesDropDown)] = value;
+    }
+    [JsonIgnore]
+    public IDataProvider<string>? NextPageButton {
+        get => Get<string>(nameof(NextPageButton));
+        set => Providers[nameof(NextPageButton)] = value;
+    }
+    [JsonIgnore]
+    public IDataProvider<string>? PreviousPageButton {
+        get => Get<string>(nameof(PreviousPageButton));
+        set => Providers[nameof(PreviousPageButton)] = value;
+    }
+    #endregion
 
-        private IDataProvider<T>? Get<T>(string key) {
-            if (Providers.TryGetValue(key, out var k) && k is IDataProvider<T> ks)
-                return ks;
-            return default;
-        }
+    public Dictionary<string, IDataProvider?> Providers { get; set; } = [];
 
-        public virtual ResolvedBindings Resolve(HtmlDocument doc) {
-            // explicit fields already handled below
-            var mappedKeys = new HashSet<string> {
-                nameof(Title), nameof(Authors), nameof(Description), nameof(Content),
-                nameof(Language), nameof(Tags), nameof(Publisher), nameof(PublicationDate),
-                nameof(ISBN), nameof(PageCount), nameof(CoverImage), nameof(Series),
-                nameof(Edition), nameof(Contributors), nameof(Subjects), nameof(Rights),
-                nameof(TableOfContents), nameof(PagesDropDown), nameof(NextPageButton),
-                nameof(PreviousPageButton)
-            };
-
-            var additional = new Dictionary<string, object?>();
-
-            foreach (var (key, provider) in Providers) {
-                if (!mappedKeys.Contains(key) && provider is not null) {
-                    // dynamic call so any IDataProvider<T> works
-                    additional[key] = ((dynamic)provider).Get(doc);
-                }
-            }
-
-            return new ResolvedBindings {
-                Title = Title?.Get(doc),
-                Authors = Authors?.Get(doc) ?? [],
-                Description = Description?.Get(doc),
-                Content = Content?.Get(doc),
-                Language = Language?.Get(doc),
-                Tags = Tags?.Get(doc) ?? [],
-                Publisher = Publisher?.Get(doc),
-                PublicationDate = PublicationDate?.Get(doc),
-                ISBN = ISBN?.Get(doc),
-                PageCount = PageCount?.Get(doc),
-                CoverImage = CoverImage?.Get(doc),
-                Series = Series?.Get(doc) ?? [],
-                Edition = Edition?.Get(doc),
-                Contributors = Contributors?.Get(doc) ?? [],
-                Subjects = Subjects?.Get(doc) ?? [],
-                Rights = Rights?.Get(doc),
-                TableOfContents = TableOfContents?.Get(doc) ?? [],
-                PagesDropDown = PagesDropDown?.Get(doc),
-                NextPageButton = NextPageButton?.Get(doc),
-                PreviousPageButton = PreviousPageButton?.Get(doc),
-                Additional = additional
-            };
-        }
+    private IDataProvider<T>? Get<T>(string key) {
+        if (Providers.TryGetValue(key, out var k) && k is IDataProvider<T> ks)
+            return ks;
+        return default;
     }
 
-    public record class ResolvedBindings {
-        public string? Title { get; set; }
-        public string[]? Authors { get; set; }
-        public string? Description { get; set; }
-        public string? Content { get; set; }
-        public string[]? Language { get; set; }
-        public string[]? Tags { get; set; }
-        public string? Publisher { get; set; }
-        public DateTimeOffset? PublicationDate { get; set; }
-        public string? ISBN { get; set; }
-        public int? PageCount { get; set; }
-        public SourceLink? CoverImage { get; set; }
-        public string[]? Series { get; set; }
-        public int? Edition { get; set; }
-        public string[]? Contributors { get; set; }
-        public string[]? Subjects { get; set; }
-        public string? Rights { get; set; }
-        public SourceLink[]? TableOfContents { get; set; }
-        public SourceLink[]? PagesDropDown { get; set; }
-        public SourceLink? NextPageButton { get; set; }
-        public SourceLink? PreviousPageButton { get; set; }
+    public virtual ResolvedBindings Resolve(HtmlDocument doc) {
+        // explicit fields already handled below
+        var mappedKeys = new HashSet<string> {
+            nameof(Title), nameof(Authors), nameof(Description), nameof(Content),
+            nameof(Language), nameof(Tags), nameof(Publisher), nameof(PublicationDate),
+            nameof(ISBN), nameof(PageCount), nameof(CoverImage), nameof(Series),
+            nameof(Edition), nameof(Contributors), nameof(Subjects), nameof(Rights),
+            nameof(TableOfContents), nameof(PagesDropDown), nameof(NextPageButton),
+            nameof(PreviousPageButton)
+        };
 
-        /// <summary>
-        /// Values resolved from any providers whose keys aren’t represented
-        /// by the named properties above.
-        /// </summary>
-        public Dictionary<string, object?> Additional { get; set; } = [];
+        var additional = new Dictionary<string, object?>();
+
+        foreach (var (key, provider) in Providers) {
+            if (!mappedKeys.Contains(key) && provider is not null) {
+                // dynamic call so any IDataProvider<T> works
+                additional[key] = ((dynamic)provider).Get(doc);
+            }
+        }
+
+        return new ResolvedBindings {
+            Title = Title?.Get(doc),
+            Authors = Authors?.Get(doc) ?? [],
+            Description = Description?.Get(doc),
+            Content = Content?.Get(doc),
+            Language = Language?.Get(doc),
+            Tags = Tags?.Get(doc) ?? [],
+            Publisher = Publisher?.Get(doc),
+            PublicationDate = PublicationDate?.Get(doc),
+            ISBN = ISBN?.Get(doc),
+            PageCount = PageCount?.Get(doc),
+            CoverImage = CoverImage?.Get(doc),
+            Series = Series?.Get(doc) ?? [],
+            Edition = Edition?.Get(doc),
+            Contributors = Contributors?.Get(doc) ?? [],
+            Subjects = Subjects?.Get(doc) ?? [],
+            Rights = Rights?.Get(doc),
+            TableOfContents = TableOfContents?.Get(doc) ?? [],
+            PagesDropDown = PagesDropDown?.Get(doc),
+            NextPageButton = NextPageButton?.Get(doc),
+            PreviousPageButton = PreviousPageButton?.Get(doc),
+            Additional = additional
+        };
     }
 }
+
+public record class ResolvedBindings {
+    public string? Title { get; set; }
+    public string[]? Authors { get; set; }
+    public string? Description { get; set; }
+    public string? Content { get; set; }
+    public string[]? Language { get; set; }
+    public string[]? Tags { get; set; }
+    public string? Publisher { get; set; }
+    public DateTimeOffset? PublicationDate { get; set; }
+    public string? ISBN { get; set; }
+    public int? PageCount { get; set; }
+    public string? CoverImage { get; set; }
+    public string[]? Series { get; set; }
+    public int? Edition { get; set; }
+    public string[]? Contributors { get; set; }
+    public string[]? Subjects { get; set; }
+    public string? Rights { get; set; }
+    public string[]? TableOfContents { get; set; }
+    public string[]? PagesDropDown { get; set; }
+    public string? NextPageButton { get; set; }
+    public string? PreviousPageButton { get; set; }
+
+    /// <summary>
+    /// Values resolved from any providers whose keys aren’t represented
+    /// by the named properties above.
+    /// </summary>
+    public Dictionary<string, object?> Additional { get; set; } = [];
+}
\ No newline at end of file
diff --git a/Beam.Dynamic/DataProviderJsonTypeInfoResolver.cs b/Beam.Dynamic/DataProviderJsonTypeInfoResolver.cs
new file mode 100644
index 0000000..132fb98
--- /dev/null
+++ b/Beam.Dynamic/DataProviderJsonTypeInfoResolver.cs
@@ -0,0 +1,37 @@
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using System.Text.Json.Serialization.Metadata;
+
+namespace Beam.Dynamic;
+
+// [JsonDerivedType(typeof(ParagraphedContentDataProvider), "paragraphed")]
+// [JsonDerivedType(typeof(ListContentDataProvider), "list")]
+// [JsonDerivedType(typeof(ContentsArrayDataProvider), "array")]
+// [JsonDerivedType(typeof(ContentsDataProvider), "single")]
+// [JsonDerivedType(typeof(DropDownDataProvider), "dropdown")]
+// [JsonDerivedType(typeof(AnchorCollectionDataProvider), "anchor-list")]
+// [JsonDerivedType(typeof(AnchorDataProvider), "anchor")]
+
+public class DataProviderJsonTypeInfoResolver : DefaultJsonTypeInfoResolver {
+    public override JsonTypeInfo GetTypeInfo(Type type, JsonSerializerOptions options) {
+        JsonTypeInfo jsonTypeInfo = base.GetTypeInfo(type, options);
+
+        Type basePointType = typeof(IDataProvider);
+        if (jsonTypeInfo.Type == basePointType) {
+            jsonTypeInfo.PolymorphismOptions = new JsonPolymorphismOptions {
+                UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToNearestAncestor,
+                DerivedTypes = {
+                    new JsonDerivedType(typeof(ParagraphedContentDataProvider), "paragraphed"),
+                    new JsonDerivedType(typeof(ListContentDataProvider), "list"),  
+                    new JsonDerivedType(typeof(ContentsArrayDataProvider), "array"),     
+                    new JsonDerivedType(typeof(ContentsDataProvider), "single"),
+                    new JsonDerivedType(typeof(DropDownDataProvider), "dropdown"),
+                    new JsonDerivedType(typeof(AnchorCollectionDataProvider), "anchor-list"),
+                    new JsonDerivedType(typeof(AnchorDataProvider), "anchor")      
+                }
+            };
+        }
+
+        return jsonTypeInfo;
+    }
+}
\ No newline at end of file
diff --git a/Beam.Dynamic/DropDownDataProvider.cs b/Beam.Dynamic/DropDownDataProvider.cs
index ad2ef23..4e8f359 100644
--- a/Beam.Dynamic/DropDownDataProvider.cs
+++ b/Beam.Dynamic/DropDownDataProvider.cs
@@ -11,8 +11,7 @@ using System.Threading.Tasks;
 namespace Beam.Dynamic {
     public class DropDownDataProvider
             : IDataProvider<string>, 
-              IDataProvider<string[]>, 
-              IDataProvider<SourceLink[]> {
+              IDataProvider<string[]> {
         public IBinding? Content { get; set; }
         public string? RelativeTo { get; set; } 
 
@@ -27,26 +26,24 @@ namespace Beam.Dynamic {
             return @base + '/' + relative;
         }
 
-        public SourceLink[] Get(HtmlDocument document) {
+        public string[] Get(HtmlDocument document) {
             if (Content is null)
                 return [];
             var node = Content.Select(document);
             if (node is null)
                 return [];
-            List<SourceLink> links = [];
+            List<string> links = [];
             foreach (var child in node.ChildNodes.Where(x => x.Name == "option")) {
                 var childValue = child.GetAttributeValue("value", null);
                 if (!Uri.TryCreate(GetAbsolute(RelativeTo, childValue), UriKind.Absolute, out _))
                     continue;
-                links.Add(new SourceLink(GetAbsolute(RelativeTo, childValue)));
+                links.Add((GetAbsolute(RelativeTo, childValue)));
             }
 
             return links.ToArray();
         }
 
-        string[] IDataProvider<string[]>.Get(HtmlDocument document) {
-            return this.Get(document).Select(x => x.Link.AbsoluteUri).ToArray();
-        }
+
 
         string IDataProvider<string>.Get(HtmlDocument document) {
             return JsonSerializer.Serialize(this.Get(document));
diff --git a/Beam.Dynamic/IDataProvider.cs b/Beam.Dynamic/IDataProvider.cs
deleted file mode 100644
index 2988b22..0000000
--- a/Beam.Dynamic/IDataProvider.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using HtmlAgilityPack;
-using System.Text.Json.Serialization;
-
-namespace Beam.Dynamic {
-    [JsonDerivedType(typeof(ParagraphedContentDataProvider), "paragraphed")]
-    [JsonDerivedType(typeof(ListContentDataProvider), "list")]
-    [JsonDerivedType(typeof(ContentsArrayDataProvider), "array")]
-    [JsonDerivedType(typeof(ContentsDataProvider), "single")]
-    [JsonDerivedType(typeof(DropDownDataProvider), "dropdown")]
-    [JsonDerivedType(typeof(AnchorCollectionDataProvider), "anchor-list")]
-    [JsonDerivedType(typeof(AnchorDataProvider), "anchor")]
-    public interface IDataProvider {
-        public string GetString(HtmlDocument document)
-            => (this as IDataProvider<object>)?.Get(document)?.ToString() ?? "";
-    }
-
-    public interface IDataProvider<out T> : IDataProvider {
-        public T Get(HtmlDocument document);
-        //public HtmlNode? GetNode(HtmlDocument document);
-    }
-}
\ No newline at end of file
diff --git a/Beam.Temporary.Cli/MainArchitecture.cs b/Beam.Dynamic/MainArchitecture.cs
similarity index 96%
rename from Beam.Temporary.Cli/MainArchitecture.cs
rename to Beam.Dynamic/MainArchitecture.cs
index 6aafa0b..06bd212 100644
--- a/Beam.Temporary.Cli/MainArchitecture.cs
+++ b/Beam.Dynamic/MainArchitecture.cs
@@ -1,9 +1,7 @@
 using aeqw89.DataKeys;
-using Beam.Dynamic;
-using HtmlAgilityPack;
-using Microsoft.Extensions.Logging;
+using Beam.Abstractions;
 
-namespace Beam.Temporary.Cli {
+namespace Beam.Dynamic {
     public partial interface IArchitecture {
         private class MainArchitecture : IArchitecture {
             public MainArchitecture() { }
diff --git a/Beam/NumberedStateChanger.cs b/Beam.Dynamic/NumberedStateChanger.cs
similarity index 52%
rename from Beam/NumberedStateChanger.cs
rename to Beam.Dynamic/NumberedStateChanger.cs
index de597a6..dc71e9c 100644
--- a/Beam/NumberedStateChanger.cs
+++ b/Beam.Dynamic/NumberedStateChanger.cs
@@ -1,15 +1,17 @@
-namespace Beam {
+using Beam.Abstractions;
+
+namespace Beam.Dynamic {
     public class NumberedStateChanger(NumberedStateChanger.MoveState moveState) : IStateChangeBehaviour {
-        public delegate void MoveState(State state, int amount);
+        public delegate void MoveState(IState state, int amount);
         public MoveState MoveStateDlgte { get; set; } = moveState;
 
-        public virtual void Apply(State state, object stimulus) {
+        public virtual void Apply(IState state, object stimulus) {
             if (stimulus is not int amount)
-                throw new ArgumentException(S.M.StimulusMustBeInt, nameof(stimulus));
+                throw new ArgumentException(string.Format(Exceptions.Exceptions.num_state_changer_stimulus_must_be_int, stimulus.GetType().Name), nameof(stimulus));
             Apply(state, amount);
         }
 
-        public virtual void Apply(State state, int amount) {
+        public virtual void Apply(IState state, int amount) {
             MoveStateDlgte(state, amount);
         }
 
diff --git a/Beam.Dynamic/StateChangerFactory.cs b/Beam.Dynamic/StateChangerFactory.cs
index a788464..d29ca29 100644
--- a/Beam.Dynamic/StateChangerFactory.cs
+++ b/Beam.Dynamic/StateChangerFactory.cs
@@ -4,9 +4,10 @@ using System.Linq;
 using System.Text;
 using System.Text.Json.Serialization;
 using System.Threading.Tasks;
+using Beam.Abstractions;
 
 namespace Beam.Dynamic {
-    public class StateChangerFactory {
+    public class StateChangerFactory : IStateChangerFactory {
         [JsonIgnore]
         public IStateChangeBehaviour Behavior => FactoryTable[StateChangerKey]();
         
diff --git a/Beam.Dynamic/OnlineCleaner.cs b/Beam.Dynamic/StringCleaner.cs
similarity index 97%
rename from Beam.Dynamic/OnlineCleaner.cs
rename to Beam.Dynamic/StringCleaner.cs
index 7a8097d..c3d7283 100644
--- a/Beam.Dynamic/OnlineCleaner.cs
+++ b/Beam.Dynamic/StringCleaner.cs
@@ -10,7 +10,7 @@ using System.Threading.Tasks;
 using System.Web;
 
 namespace Beam.Dynamic {
-    public static partial class OnlineCleaner {
+    public static partial class StringCleaner {
         [GeneratedRegex("&#x?[\\d\\w]{1,4};")]
         public static partial Regex MochaBlendUnicodeEscapeSequence();
 
diff --git a/Beam.Exceptions/AssertionException.cs b/Beam.Exceptions/AssertionException.cs
new file mode 100644
index 0000000..36a40d9
--- /dev/null
+++ b/Beam.Exceptions/AssertionException.cs
@@ -0,0 +1,14 @@
+namespace Beam.Exceptions;
+
+/// <summary>
+/// The kind of exception that should never happen
+/// </summary>
+[Serializable]
+public class AssertionException : Exception {
+    public AssertionException() { }
+    public AssertionException(string message) : base(message) { }
+    public AssertionException(string message, Exception inner) : base(message, inner) { }
+    protected AssertionException(
+        System.Runtime.Serialization.SerializationInfo info,
+        System.Runtime.Serialization.StreamingContext context) : base(info, context) { }
+}
diff --git a/Beam.Exceptions/Exceptions.Designer.cs b/Beam.Exceptions/Exceptions.Designer.cs
new file mode 100644
index 0000000..1d9d671
--- /dev/null
+++ b/Beam.Exceptions/Exceptions.Designer.cs
@@ -0,0 +1,116 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Beam.Exceptions {
+    using System;
+    
+    
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    public class Exceptions {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Exceptions() {
+        }
+        
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        public static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Beam.Exceptions.Exceptions", typeof(Exceptions).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        public static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to A fragment is locked when it should be free; failed to obtain updater..
+        /// </summary>
+        public static string fragment_locked {
+            get {
+                return ResourceManager.GetString("fragment_locked", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The argument at index &apos;{0}&apos; with name &apos;{1}&apos; is not marked optional and is missing..
+        /// </summary>
+        public static string link_builder_argument_missing {
+            get {
+                return ResourceManager.GetString("link_builder_argument_missing", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The flag &apos;{0}&apos; is incompatible with the flag(s) &apos;{1}&apos;.
+        /// </summary>
+        public static string link_builder_incompatible_flag {
+            get {
+                return ResourceManager.GetString("link_builder_incompatible_flag", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The query flag is only allowed on the last segment; found on segment index &apos;{0}&apos;.
+        /// </summary>
+        public static string link_builder_query_only_at_last {
+            get {
+                return ResourceManager.GetString("link_builder_query_only_at_last", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The stimulus must be an integer; got &apos;{0}&apos;.
+        /// </summary>
+        public static string num_state_changer_stimulus_must_be_int {
+            get {
+                return ResourceManager.GetString("num_state_changer_stimulus_must_be_int", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Encountered an error while changing state.
+        /// </summary>
+        public static string state_change_error {
+            get {
+                return ResourceManager.GetString("state_change_error", resourceCulture);
+            }
+        }
+    }
+}
diff --git a/Beam.Exceptions/Exceptions.resx b/Beam.Exceptions/Exceptions.resx
new file mode 100644
index 0000000..faae748
--- /dev/null
+++ b/Beam.Exceptions/Exceptions.resx
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<root>
+    <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+        <xsd:element name="root" msdata:IsDataSet="true">
+            
+        </xsd:element>
+    </xsd:schema>
+    <resheader name="resmimetype">
+        <value>text/microsoft-resx</value>
+    </resheader>
+    <resheader name="version">
+        <value>1.3</value>
+    </resheader>
+    <resheader name="reader">
+        <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    </resheader>
+    <resheader name="writer">
+        <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    </resheader>
+    <data name="link_builder_argument_missing" xml:space="preserve">
+        <value>The argument at index '{0}' with name '{1}' is not marked optional and is missing.</value>
+    </data>
+    <data name="link_builder_incompatible_flag" xml:space="preserve">
+        <value>The flag '{0}' is incompatible with the flag(s) '{1}'</value>
+    </data>
+    <data name="link_builder_query_only_at_last" xml:space="preserve">
+        <value>The query flag is only allowed on the last segment; found on segment index '{0}'</value>
+    </data>
+    <data name="num_state_changer_stimulus_must_be_int" xml:space="preserve">
+        <value>The stimulus must be an integer; got '{0}'</value>
+    </data>
+    <data name="state_change_error" xml:space="preserve">
+        <value>Encountered an error while changing state</value>
+    </data>
+    <data name="fragment_locked" xml:space="preserve">
+        <value>A fragment is locked when it should be free; failed to obtain updater.</value>
+    </data>
+</root>
\ No newline at end of file
diff --git a/Beam.Exceptions/MapException.cs b/Beam.Exceptions/MapException.cs
new file mode 100644
index 0000000..df2e78d
--- /dev/null
+++ b/Beam.Exceptions/MapException.cs
@@ -0,0 +1,11 @@
+namespace Beam.Exceptions;
+
+[Serializable]
+public class MapException : ArgumentException {
+    public MapException() { }
+    public MapException(string message) : base(message) { }
+    public MapException(string message, Exception inner) : base(message, inner) { }
+    protected MapException(
+        System.Runtime.Serialization.SerializationInfo info,
+        System.Runtime.Serialization.StreamingContext context) : base(info, context) { }
+}
\ No newline at end of file
diff --git a/Beam.Exports/Beam.Exports.csproj b/Beam.Exports/Beam.Exports.csproj
index 9ff9a61..ed33979 100644
--- a/Beam.Exports/Beam.Exports.csproj
+++ b/Beam.Exports/Beam.Exports.csproj
@@ -6,11 +6,9 @@
         <Nullable>enable</Nullable>
     </PropertyGroup>
     <ItemGroup>
-	  
+      <ProjectReference Include="..\Beam.Models\Beam.Models.csproj" />
   </ItemGroup>
     <ItemGroup>
-        <ProjectReference Include="..\Beam\Beam.csproj">
-            <PrivateAssets>all</PrivateAssets>
-        </ProjectReference>
+
     </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Beam.Exports/Exporter.cs b/Beam.Exports/Exporter.cs
index 8a6dab1..9abfca1 100644
--- a/Beam.Exports/Exporter.cs
+++ b/Beam.Exports/Exporter.cs
@@ -1,8 +1,11 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Net;
 using System.Text;
 using System.Threading.Tasks;
+using Beam.Abstractions;
+using Beam.Models;
 
 namespace Beam.Exports {
     public class PlainTextExporter : IExporter, IAsyncExporter {
@@ -24,14 +27,14 @@ namespace Beam.Exports {
             var text = Convert();
             if (!Directory.Exists(Path.GetDirectoryName(path)))
                 throw new ArgumentException(S.M.FileDirectoryDoesNotExist, nameof(path));
-            File.WriteAllText(path, text, Encoding.Unicode);
+            System.IO.File.WriteAllText(path, text, Encoding.Unicode);
         }
 
         public virtual async Task WriteAsync(string path) {
             var text = await ConvertAsync();
             if (!Directory.Exists(path))
                 throw new ArgumentException(S.M.FileDirectoryDoesNotExist, nameof(path));
-            await File.WriteAllTextAsync(path, text);
+            await System.IO.File.WriteAllTextAsync(path, text);
         }
     }
 }
diff --git a/Beam.Exports/HtmlExporter.cs b/Beam.Exports/HtmlExporter.cs
index 8bcd87c..e4a2920 100644
--- a/Beam.Exports/HtmlExporter.cs
+++ b/Beam.Exports/HtmlExporter.cs
@@ -1,4 +1,6 @@
 using System.Text;
+using Beam.Abstractions;
+using Beam.Models;
 
 namespace Beam.Exports {
     public class HtmlExporter : PlainTextExporter {
diff --git a/Beam.Fluent/Beam.Fluent.csproj b/Beam.Fluent/Beam.Fluent.csproj
index 62ea023..8d8f678 100644
--- a/Beam.Fluent/Beam.Fluent.csproj
+++ b/Beam.Fluent/Beam.Fluent.csproj
@@ -7,16 +7,19 @@
     </PropertyGroup>
     <ItemGroup>
         <PackageReference Include="aeqw89.DataKeys" Version="2.0.1" />
-        <PackageReference Include="aeqw89.PersistentData" Version="1.1.0" />
+        <PackageReference Include="aeqw89.PersistentData" Version="1.3.3" />
         <PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.7" />
         <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.7" />
         <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.7" />
         <PackageReference Include="System.Linq.Async" Version="6.0.1" />
     </ItemGroup>
     <ItemGroup>
+        <ProjectReference Include="..\Beam.Data\Beam.Data.csproj" />
+        <ProjectReference Include="..\Beam.Downloaders\Beam.Downloaders.csproj" />
         <ProjectReference Include="..\Beam.Dynamic\Beam.Dynamic.csproj">
             <PrivateAssets>all</PrivateAssets>
         </ProjectReference>
+        <ProjectReference Include="..\Beam.Exceptions\Beam.Exceptions.csproj" />
         <ProjectReference Include="..\Beam.Models\Beam.Models.csproj" />
         <ProjectReference Include="..\Beam.Playwright\Beam.Playwright.csproj">
             <PrivateAssets>all</PrivateAssets>
@@ -24,8 +27,6 @@
         <ProjectReference Include="..\Beam.Stealth\Beam.Stealth.csproj">
             <PrivateAssets>all</PrivateAssets>
         </ProjectReference>
-        <ProjectReference Include="..\Beam\Beam.csproj">
-            <PrivateAssets>all</PrivateAssets>
-        </ProjectReference>
+        <ProjectReference Include="..\Beam\Beam.csproj" />
     </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Beam.Fluent/DownloadBuilder.ContextStage.cs b/Beam.Fluent/DownloadBuilder.ContextStage.cs
index aedf227..182c725 100644
--- a/Beam.Fluent/DownloadBuilder.ContextStage.cs
+++ b/Beam.Fluent/DownloadBuilder.ContextStage.cs
@@ -1,6 +1,10 @@
-using HtmlAgilityPack;
+using Beam.Abstractions;
+using Beam.Models;
+using HtmlAgilityPack;
 using Beam.Playwright;
 using Beam.Stealth;
+using Beam;
+using Beam.Downloaders;
 
 namespace Beam.Fluent {
 public static partial class DownloadBuilder<RawType, OutType> {
@@ -33,7 +37,7 @@ public static partial class DownloadBuilder<RawType, OutType> {
                 return this;
             }
 
-            public IContextStage WithRetryReporter(IProgress<RetryReport> reporter) {
+            public IContextStage WithRetryReporter(IProgress<IRetryReport> reporter) {
                 _ctxBuilder.WithRetryReporter(reporter);
                 return this;
             }
@@ -163,7 +167,7 @@ public static partial class DownloadBuilder<RawType, OutType> {
             }
 
             private IAsyncEnumerator<Ordered<OutType>> ConstructDownloader(DownloadContext<RawType> context) {
-                var copyOfContext = context.CreateBuilder().Build();
+                var copyOfContext = DownloadContextBuilder<RawType>.FromContext(context).Build();
                 return _useFragments switch {
                     true => new SequentialFragmentDownloader<RawType, OutType>(
                         copyOfContext,
diff --git a/Beam.Fluent/DownloadBuilder.DownloadStage.cs b/Beam.Fluent/DownloadBuilder.DownloadStage.cs
index 4909c6f..6dcd6ed 100644
--- a/Beam.Fluent/DownloadBuilder.DownloadStage.cs
+++ b/Beam.Fluent/DownloadBuilder.DownloadStage.cs
@@ -1,5 +1,6 @@
 using System.Collections.Concurrent;
 using System.Text.Json;
+using Beam.Models;
 
 namespace Beam.Fluent {
 public static partial class DownloadBuilder<RawType, OutType> {
diff --git a/Beam.Fluent/DownloadBuilder.IAlternativeLinkStage.cs b/Beam.Fluent/DownloadBuilder.IAlternativeLinkStage.cs
index 25b64d9..47ead72 100644
--- a/Beam.Fluent/DownloadBuilder.IAlternativeLinkStage.cs
+++ b/Beam.Fluent/DownloadBuilder.IAlternativeLinkStage.cs
@@ -1,7 +1,9 @@
-namespace Beam.Fluent {
+using Beam.Models;
+
+namespace Beam.Fluent {
 public static partial class DownloadBuilder<RawType, OutType> {
         public interface IAlternativeLinkStage {
-            IAlternativeTransformStage WithLinks(IEnumerable<SourceLink> links);
+            IAlternativeTransformStage WithLinks(IEnumerable<string> links);
         }
     }
 }
diff --git a/Beam.Fluent/DownloadBuilder.IAlternativeTransformStage.cs b/Beam.Fluent/DownloadBuilder.IAlternativeTransformStage.cs
index b28f376..bad6e38 100644
--- a/Beam.Fluent/DownloadBuilder.IAlternativeTransformStage.cs
+++ b/Beam.Fluent/DownloadBuilder.IAlternativeTransformStage.cs
@@ -1,4 +1,6 @@
-namespace Beam.Fluent {
+using Beam.Models;
+
+namespace Beam.Fluent {
 public static partial class DownloadBuilder<RawType, OutType> {
         public interface IAlternativeTransformStage {
             IContextStage WithTransformer(AsyncTransformer<RawType, OutType> transformer);
diff --git a/Beam.Fluent/DownloadBuilder.IContextStage.cs b/Beam.Fluent/DownloadBuilder.IContextStage.cs
index 074d7dc..8212f60 100644
--- a/Beam.Fluent/DownloadBuilder.IContextStage.cs
+++ b/Beam.Fluent/DownloadBuilder.IContextStage.cs
@@ -1,4 +1,7 @@
-using Beam.Playwright;
+using Beam.Abstractions;
+using Beam.Downloaders;
+using Beam.Models;
+using Beam.Playwright;
 using Beam.Stealth;
 
 namespace Beam.Fluent {
@@ -7,7 +10,7 @@ public static partial class DownloadBuilder<RawType, OutType> {
             IContextStage Configure(Action<DownloadContextBuilder<RawType>> configure);
             IContextStage WithParallelism(int degree);
             IContextStage WithTimeout(TimeSpan timeout);
-            IContextStage WithRetryReporter(IProgress<RetryReport> reporter);
+            IContextStage WithRetryReporter(IProgress<IRetryReport> reporter);
             DownloadEnumerable<OutType> Build();
             IContextStage UseFragments();
             IContextStage UsePlaywright(PlaywrightAsyncManipulator manipulator);
diff --git a/Beam.Fluent/DownloadBuilder.ITransformStage.cs b/Beam.Fluent/DownloadBuilder.ITransformStage.cs
index 07af773..7790df5 100644
--- a/Beam.Fluent/DownloadBuilder.ITransformStage.cs
+++ b/Beam.Fluent/DownloadBuilder.ITransformStage.cs
@@ -1,4 +1,5 @@
 using Beam.Dynamic;
+using Beam.Models;
 
 namespace Beam.Fluent {
 public static partial class DownloadBuilder<RawType, OutType> {
diff --git a/Beam.Fluent/DownloadBuilder.LinkStage.cs b/Beam.Fluent/DownloadBuilder.LinkStage.cs
index a2796fb..8145bad 100644
--- a/Beam.Fluent/DownloadBuilder.LinkStage.cs
+++ b/Beam.Fluent/DownloadBuilder.LinkStage.cs
@@ -1,10 +1,11 @@
-using Beam.Models;
+using Beam.Data;
+using Beam.Downloaders;
+using Beam.Dynamic;
+using Beam.Models;
 
 namespace Beam.Fluent {
     public static partial class DownloadBuilder<RawType, OutType> {
         /* ──────────────────────────── Stage types ─────────────────────────── */
-
-
         private sealed record LinkStage(
             WebResource Source,
             State Initial,
@@ -22,7 +23,7 @@ namespace Beam.Fluent {
 
             public ITransformStage WithLinkGenerator() {
                 var template = Data.Templates[Source.Key];
-                var generator = SourceLinkEnumerable.FromGenerator(new OrderedSourceLinkGenerator(
+                var generator = StringEnumerable.FromGenerator(new OrderedLinkGenerator(
                     template.Builder,
                     new NumberedStateChanger(template.Factory.Behavior),
                     Initial, endState));
@@ -31,7 +32,7 @@ namespace Beam.Fluent {
                 return new TransformStage(Source, Data, CtxBuilder);
             }
 
-            public IAlternativeTransformStage WithLinks(IEnumerable<SourceLink> links) {
+            public IAlternativeTransformStage WithLinks(IEnumerable<string> links) {
                 CtxBuilder.WithLinks(links);
                 return new TransformStage(Source, Data, CtxBuilder);
             }
diff --git a/Beam.Fluent/DownloadBuilder.TransformStage.cs b/Beam.Fluent/DownloadBuilder.TransformStage.cs
index bd77cf3..1b04cc0 100644
--- a/Beam.Fluent/DownloadBuilder.TransformStage.cs
+++ b/Beam.Fluent/DownloadBuilder.TransformStage.cs
@@ -1,4 +1,6 @@
-using Beam.Dynamic;
+using Beam.Data;
+using Beam.Downloaders;
+using Beam.Dynamic;
 using Beam.Models;
 
 namespace Beam.Fluent {
diff --git a/Beam.Fluent/DownloadBuilder.cs b/Beam.Fluent/DownloadBuilder.cs
index fae600f..1f9ea71 100644
--- a/Beam.Fluent/DownloadBuilder.cs
+++ b/Beam.Fluent/DownloadBuilder.cs
@@ -3,6 +3,8 @@ using Beam;
 using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Generic;
+using Beam.Data;
+using Beam.Downloaders;
 using Beam.Models;
 
 namespace Beam.Fluent {
@@ -22,7 +24,7 @@ namespace Beam.Fluent {
 
         private static ILinkStage Create(DataKey<ResourceDictionary> resourceDict, BeamDataContext data, string kind) {
             var (source, initial) = Resolve(resourceDict, kind, data);
-            var ctxBuilder = new DownloadContextBuilder<RawType>().WithLinks(Array.Empty<SourceLink>()); // placeholder, filled later.
+            var ctxBuilder = new DownloadContextBuilder<RawType>().WithLinks([]); // placeholder, filled later.
             return new LinkStage(source, initial, data, ctxBuilder);
         }
 
diff --git a/Beam.Models/AsyncDownloadFailurePredicate.cs b/Beam.Models/AsyncDownloadFailurePredicate.cs
new file mode 100644
index 0000000..351a313
--- /dev/null
+++ b/Beam.Models/AsyncDownloadFailurePredicate.cs
@@ -0,0 +1,3 @@
+namespace Beam.Models;
+
+public delegate Task<bool> AsyncDownloadFailurePredicate<in T>(T download);
\ No newline at end of file
diff --git a/Beam.Models/AsyncTransformer.cs b/Beam.Models/AsyncTransformer.cs
new file mode 100644
index 0000000..9f586d1
--- /dev/null
+++ b/Beam.Models/AsyncTransformer.cs
@@ -0,0 +1,3 @@
+namespace Beam.Models;
+
+public delegate Task<U> AsyncTransformer<in T, U>(T elem);
\ No newline at end of file
diff --git a/Beam.Models/Beam.Models.csproj b/Beam.Models/Beam.Models.csproj
index a30c29b..18e8640 100644
--- a/Beam.Models/Beam.Models.csproj
+++ b/Beam.Models/Beam.Models.csproj
@@ -7,11 +7,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Beam.Dynamic\Beam.Dynamic.csproj" />
-    <ProjectReference Include="..\Beam\Beam.csproj" />
+    <ProjectReference Include="..\Beam.Abstractions\Beam.Abstractions.csproj" />
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="aeqw89.PersistentData" Version="1.3.3" />
     <PackageReference Include="EntityFramework" Version="6.5.1" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.8">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -23,4 +23,9 @@
     </PackageReference>
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="Abstract\" />
+    <Folder Include="Closed Concrete\" />
+  </ItemGroup>
+
 </Project>
diff --git a/Beam.Models/BeamDataContext.cs b/Beam.Models/BeamDataContext.cs
deleted file mode 100644
index c9d7c59..0000000
--- a/Beam.Models/BeamDataContext.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-using aeqw89.PersistentData;
-using aeqw89.DataKeys;
-using Beam.Dynamic;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Text.Json;
-using System.Threading.Tasks;
-using System.Data.Entity;
-
-
-namespace Beam.Models {
-    public class BeamDataContext : BaseDataDictionary {
-        public Dictionary<DataKey<Template>, Template> Templates {
-            get => GetOrCreateDictionary<DataKey<Template>, Template>(nameof(Templates));
-            set => Set(nameof(Templates), value);
-        }
-
-        public Dictionary<DataKey<DataBindings>, DataBindings> Bindings {
-            get => GetOrCreateDictionary<DataKey<DataBindings>, DataBindings>(nameof(Bindings));
-            set => Set(nameof(Bindings), value);
-        }
-
-        public Dictionary<DataKey<WebResource>,  HashSet<DataKey<ResourceDictionary>>> AggregatorNovels {
-            get => GetOrCreateDictionary<DataKey<WebResource>, HashSet<DataKey<ResourceDictionary>>>(nameof(AggregatorNovels));
-            set => Set(nameof(AggregatorNovels), value);
-        }
-
-        public Dictionary<DataKey<WebResource>, WebResource> Resources {
-            get => GetOrCreateDictionary<DataKey<WebResource>, WebResource>(nameof(Resources));
-            set => Set(nameof(Resources), value);
-        }
-
-        public Dictionary<DataKey<ResourceDictionary>, ResourceDictionary> ResourceDictionaries {
-            get => GetOrCreateDictionary<DataKey<ResourceDictionary>, ResourceDictionary>(nameof(ResourceDictionaries));
-            set => Set(nameof(ResourceDictionaries), value);
-        }
-
-        public Dictionary<DataKey<ImmutableState>, ImmutableState> InitialStates {
-            get => GetOrCreateDictionary<DataKey<ImmutableState>, ImmutableState>(nameof(InitialStates));
-            set => Set(nameof(InitialStates), value);
-        }
-
-        internal Dictionary<DataKey<File>, File> Files {
-            get => GetOrCreateDictionary<DataKey<File>, File>(nameof(Files));
-            set => Set(nameof(Files), value);
-        }
-    }
-}
diff --git a/Beam/ByteDocument.cs b/Beam.Models/ByteDocument.cs
similarity index 94%
rename from Beam/ByteDocument.cs
rename to Beam.Models/ByteDocument.cs
index fa2d047..33600b8 100644
--- a/Beam/ByteDocument.cs
+++ b/Beam.Models/ByteDocument.cs
@@ -1,6 +1,6 @@
 using System.Text;
 
-namespace Beam {
+namespace Beam.Models {
     public class ByteDocument(string filename, byte[] content, Encoding? encoding = null) : Document(filename, encoding) {
         public byte[] Content { get; set; } = content;
 
diff --git a/Beam/Document.cs b/Beam.Models/Document.cs
similarity index 53%
rename from Beam/Document.cs
rename to Beam.Models/Document.cs
index cacb842..c3419dd 100644
--- a/Beam/Document.cs
+++ b/Beam.Models/Document.cs
@@ -1,13 +1,16 @@
-using aeqw89.DataKeys;
-using System.Text;
+using System.Text;
+using aeqw89.DataKeys;
+using Beam.Abstractions;
 
-namespace Beam {
+namespace Beam.Models {
     public abstract class Document(string filename, Encoding? encoding = null) : IDocument {
         public string Filename { get; set; } = filename;
         public Encoding Encoding { get; set; } = encoding ?? Encoding.UTF8;
         public Dictionary<DataKey<IDocumentMetaData>, IDocumentMetaData> MetaData { get; set; } = [];
+        IDictionary<IDataKey<IDocumentMetaData>, IDocumentMetaData> IDocument.MetaData 
+            => MetaData.ToDictionary(IDataKey<IDocumentMetaData> (x) => x.Key, x => x.Value);
 
         public abstract byte[] ToBytes();
-        public override abstract string ToString();
+        public abstract override string ToString();
     }
 }
diff --git a/Beam/DocumentCache.cs b/Beam.Models/DocumentCache.cs
similarity index 93%
rename from Beam/DocumentCache.cs
rename to Beam.Models/DocumentCache.cs
index a0b1b91..5d2647b 100644
--- a/Beam/DocumentCache.cs
+++ b/Beam.Models/DocumentCache.cs
@@ -1,10 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using Beam.Abstractions;
 
-namespace Beam {
+namespace Beam.Models {
     /// <summary>
     /// Holds a collection of <see cref="IDocument"/> objects in memory to facilitate lazy loading
     /// </summary>
diff --git a/Beam.Models/DownloadReport.cs b/Beam.Models/DownloadReport.cs
new file mode 100644
index 0000000..b27dc57
--- /dev/null
+++ b/Beam.Models/DownloadReport.cs
@@ -0,0 +1,8 @@
+using Beam.Abstractions;
+
+namespace Beam.Models {
+    public struct DownloadReport : IDownloadReport {
+        // TODO implement download report
+    }
+
+}
diff --git a/Beam.Models/File.cs b/Beam.Models/File.cs
index 32c3313..49b6e2f 100644
--- a/Beam.Models/File.cs
+++ b/Beam.Models/File.cs
@@ -1,5 +1,5 @@
 namespace Beam.Models {
-    internal class File(string path, params string[] tags) {
+    public class File(string path, params string[] tags) {
         public string Path { get; set; } = path;
         public string[] Tags { get; set; } = tags;
     }
diff --git a/Beam/Fragment.cs b/Beam.Models/Fragment.cs
similarity index 98%
rename from Beam/Fragment.cs
rename to Beam.Models/Fragment.cs
index 3549aa9..8a3eda6 100644
--- a/Beam/Fragment.cs
+++ b/Beam.Models/Fragment.cs
@@ -1,7 +1,7 @@
 using System.Collections.Concurrent;
 using System.Diagnostics.CodeAnalysis;
 
-namespace Beam {
+namespace Beam.Models {
     public sealed class Fragment<T>(int size) {
         public int Size => FragmentBag.Count;
         public int MaxSize { get; } = size;
diff --git a/Beam/ImmutableState.cs b/Beam.Models/ImmutableState.cs
similarity index 77%
rename from Beam/ImmutableState.cs
rename to Beam.Models/ImmutableState.cs
index 6061dee..97bb3d6 100644
--- a/Beam/ImmutableState.cs
+++ b/Beam.Models/ImmutableState.cs
@@ -1,11 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Text.Json.Serialization;
-using System.Threading.Tasks;
+using System.Text.Json.Serialization;
 
-namespace Beam {
+namespace Beam.Models {
     public readonly struct ImmutableState {
         readonly string[] state;
 
diff --git a/Beam.Models/LinkCollection.cs b/Beam.Models/LinkCollection.cs
deleted file mode 100644
index ee5172d..0000000
--- a/Beam.Models/LinkCollection.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using aeqw89.DataKeys;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Beam.Models {
-    internal class LinkCollection(DataKey<string> key, List<SourceLink> links) {
-        public DataKey<string> Key { get; set; } = key;
-        public List<SourceLink> Links { get; set; } = links;
-    }
-}
diff --git a/Beam.Models/Ordered.cs b/Beam.Models/Ordered.cs
new file mode 100644
index 0000000..878a97c
--- /dev/null
+++ b/Beam.Models/Ordered.cs
@@ -0,0 +1,6 @@
+using Beam.Abstractions;
+
+namespace Beam.Models {
+
+    public record Ordered<T>(T Data, int Order) : IOrdered<T>;
+}
diff --git a/Beam.Models/Public Concrete/ArticleData.cs b/Beam.Models/Public Concrete/ArticleData.cs
new file mode 100644
index 0000000..f833788
--- /dev/null
+++ b/Beam.Models/Public Concrete/ArticleData.cs	
@@ -0,0 +1,41 @@
+using System.Text.Json;
+using Beam.Abstractions;
+
+namespace Beam.Models {
+    public record class ArticleData : IArticleData {
+        public string? Name { get; set; }
+        public string[] Authors { get; set; } = [];
+        public string? Language { get; set; }
+        public string[] Categories { get; set; } = [];
+        public string? Version { get; set; }
+        public string? Description { get; set; }
+
+        public string AsJson(JsonSerializerOptions? options = null) {
+            return JsonSerializer.Serialize(this, options);
+        }
+
+        public virtual bool Equals(ArticleData? other) {
+            if (other is null) return false;
+            if (ReferenceEquals(this, other)) return true;
+            return Name == other.Name && Authors.Equals(other.Authors) && Language == other.Language && Categories.Equals(other.Categories) && Version == other.Version && Description == other.Description;
+        }
+
+        public virtual bool Equals(IArticleData? other) {
+            if (other is null) return false;
+            if (ReferenceEquals(this, other)) return true;
+            return Name == other.Name && Authors.Equals(other.Authors) && Language == other.Language && Categories.Equals(other.Categories) && Version == other.Version && Description == other.Description;
+        }
+
+        public override int GetHashCode() {
+            unchecked {
+                var hashCode = (Name != null ? Name.GetHashCode() : 0);
+                hashCode = (hashCode * 397) ^ Authors.GetHashCode();
+                hashCode = (hashCode * 397) ^ (Language != null ? Language.GetHashCode() : 0);
+                hashCode = (hashCode * 397) ^ Categories.GetHashCode();
+                hashCode = (hashCode * 397) ^ (Version != null ? Version.GetHashCode() : 0);
+                hashCode = (hashCode * 397) ^ (Description != null ? Description.GetHashCode() : 0);
+                return hashCode;
+            }
+        }
+    }
+}
diff --git a/Beam/RetryReport.cs b/Beam.Models/RetryReport.cs
similarity index 65%
rename from Beam/RetryReport.cs
rename to Beam.Models/RetryReport.cs
index e099673..60d4799 100644
--- a/Beam/RetryReport.cs
+++ b/Beam.Models/RetryReport.cs
@@ -1,5 +1,7 @@
-namespace Beam {
-    public readonly struct RetryReport {
+using Beam.Abstractions;
+
+namespace Beam.Models {
+    public readonly struct RetryReport  : IRetryReport {
         public RetryReport(int tryNumber, string link) {
             TryNumber = tryNumber;
             Link = link;
diff --git a/Beam/State.cs b/Beam.Models/State.cs
similarity index 59%
rename from Beam/State.cs
rename to Beam.Models/State.cs
index 9feb285..ced03a5 100644
--- a/Beam/State.cs
+++ b/Beam.Models/State.cs
@@ -1,11 +1,7 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using Beam.Abstractions;
 
-namespace Beam {
-    public class State(string[] state) {
+namespace Beam.Models {
+    public class State(string[] state) : IState {
         string[] state = state;
 
         public string[] GetState() => state;
@@ -13,6 +9,11 @@ namespace Beam {
 
         public State Copy()
             => new((string[])state.Clone());
+        
+        IReadOnlyState IReadOnlyState.Copy() 
+            => Copy();
+        IState IState.Copy() 
+            => Copy();
 
         public string this[Index i] {
             get => state[i];
diff --git a/Beam/StreamDocument.cs b/Beam.Models/StreamDocument.cs
similarity index 95%
rename from Beam/StreamDocument.cs
rename to Beam.Models/StreamDocument.cs
index afcbd49..d036c3d 100644
--- a/Beam/StreamDocument.cs
+++ b/Beam.Models/StreamDocument.cs
@@ -1,6 +1,6 @@
 using System.Text;
 
-namespace Beam {
+namespace Beam.Models {
     internal class StreamDocument(string filename, Stream content, Encoding? encoding = null) : Document(filename) {
         public Stream Content { get; set; } = content;
         public Encoding Encoding { get; set; } = encoding ?? Encoding.UTF8;
diff --git a/Beam/StringDocument.cs b/Beam.Models/StringDocument.cs
similarity index 73%
rename from Beam/StringDocument.cs
rename to Beam.Models/StringDocument.cs
index a7fcf10..5de9ba9 100644
--- a/Beam/StringDocument.cs
+++ b/Beam.Models/StringDocument.cs
@@ -1,10 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Text;
 
-namespace Beam {
+namespace Beam.Models {
     public class StringDocument(string filename, string content, Encoding? encoding = null) : Document(filename, encoding) {
         public string Content { get; set; } = content;
 
diff --git a/Beam.Temporary.Cli/TableOfContentsData.cs b/Beam.Models/TableOfContentsData.cs
similarity index 54%
rename from Beam.Temporary.Cli/TableOfContentsData.cs
rename to Beam.Models/TableOfContentsData.cs
index e083006..05bb6b8 100644
--- a/Beam.Temporary.Cli/TableOfContentsData.cs
+++ b/Beam.Models/TableOfContentsData.cs
@@ -1,18 +1,14 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using Beam.Models;
 
-namespace Beam.Temporary.Cli {
+namespace Beam.Models {
     public record class TableOfContentsData : ArticleData {
         /// <summary>
         /// The link collection of the actual content
         /// </summary>
-        public SourceLink[]? ContentLinks { get; set; }
+        public string[]? ContentLinks { get; set; }
         /// <summary>
         /// The link collection of all the Table Of Content pages for this specific resource.
         /// </summary>
-        public SourceLink[]? PagesLinks { get; set; }
+        public string[]? PagesLinks { get; set; }
     }
 }
diff --git a/Beam.Models/Template.cs b/Beam.Models/Template.cs
deleted file mode 100644
index 2b6a701..0000000
--- a/Beam.Models/Template.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using aeqw89.DataKeys;
-using Beam.Dynamic;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Beam.Models {
-    public record class Template : IKeyed<Template> {
-        public required DataKey<Template> Key { get; set; }
-        public required StateChangerFactory Factory { get; set; }
-        public required SourceLinkBuilder Builder { get; set; }
-    }
-}
diff --git a/Beam.Models/Tracked.cs b/Beam.Models/Tracked.cs
deleted file mode 100644
index ea75474..0000000
--- a/Beam.Models/Tracked.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace Beam.Models {
-    internal class Tracked<T>(T obj) {
-        public T TrackedObject { get; set; } = obj;
-        public bool IsDirty { get; set; } = true;
-
-        public Tracked<T> SetDirty() {
-            IsDirty = true;
-            return this;
-        }
-    }
-}
diff --git a/Beam.Playwright/Beam.Playwright.csproj b/Beam.Playwright/Beam.Playwright.csproj
index bc23420..d23584c 100644
--- a/Beam.Playwright/Beam.Playwright.csproj
+++ b/Beam.Playwright/Beam.Playwright.csproj
@@ -9,8 +9,6 @@
         <PackageReference Include="Microsoft.Playwright" Version="1.52.0" />
     </ItemGroup>
     <ItemGroup>
-        <ProjectReference Include="..\Beam\Beam.csproj">
-            <PrivateAssets>all</PrivateAssets>
-        </ProjectReference>
+      <ProjectReference Include="..\Beam.Downloaders\Beam.Downloaders.csproj" />
     </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Beam.Playwright/PlaywrightUnitDownloader.cs b/Beam.Playwright/PlaywrightUnitDownloader.cs
index 6772969..e4276e8 100644
--- a/Beam.Playwright/PlaywrightUnitDownloader.cs
+++ b/Beam.Playwright/PlaywrightUnitDownloader.cs
@@ -1,4 +1,6 @@
-using Microsoft.Playwright;
+using Beam.Downloaders;
+using Beam.Models;
+using Microsoft.Playwright;
 
 namespace Beam.Playwright {
     public class PlaywrightUnitDownloader<T> : UnitDownloaderBinary<T> {
diff --git a/Beam.Playwright/PlaywrightUnitPageDownloader.cs b/Beam.Playwright/PlaywrightUnitPageDownloader.cs
index dbd262e..2642f00 100644
--- a/Beam.Playwright/PlaywrightUnitPageDownloader.cs
+++ b/Beam.Playwright/PlaywrightUnitPageDownloader.cs
@@ -1,4 +1,6 @@
 
+using Beam.Downloaders;
+using Beam.Models;
 using HtmlAgilityPack;
 using Microsoft.Playwright;
 
diff --git a/Beam.Stealth/Beam.Stealth.csproj b/Beam.Stealth/Beam.Stealth.csproj
index fb98ba3..5ceba67 100644
--- a/Beam.Stealth/Beam.Stealth.csproj
+++ b/Beam.Stealth/Beam.Stealth.csproj
@@ -10,8 +10,6 @@
         <PackageReference Include="Selenium.WebDriver" Version="4.34.0" />
     </ItemGroup>
     <ItemGroup>
-        <ProjectReference Include="..\Beam\Beam.csproj">
-            <PrivateAssets>all</PrivateAssets>
-        </ProjectReference>
+      <ProjectReference Include="..\Beam.Downloaders\Beam.Downloaders.csproj" />
     </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Beam.Stealth/StealthFragmentDownloader.cs b/Beam.Stealth/StealthFragmentDownloader.cs
index 0255c4e..20d0868 100644
--- a/Beam.Stealth/StealthFragmentDownloader.cs
+++ b/Beam.Stealth/StealthFragmentDownloader.cs
@@ -4,6 +4,8 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Beam.Downloaders;
+using Beam.Models;
 
 namespace Beam.Stealth {
     public class StealthFragmentDownloader<T> : UnitFragmentDownloaderBinary<T> {
diff --git a/Beam.Stealth/StealthFragmentPageDownloader.cs b/Beam.Stealth/StealthFragmentPageDownloader.cs
index 6d3ac2b..6a33b52 100644
--- a/Beam.Stealth/StealthFragmentPageDownloader.cs
+++ b/Beam.Stealth/StealthFragmentPageDownloader.cs
@@ -5,6 +5,8 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Beam.Downloaders;
+using Beam.Models;
 
 namespace Beam.Stealth {
     public class StealthFragmentPageDownloader<T> : UnitFragmentDownloader<T> {
diff --git a/Beam.Stealth/StealthUnitDownloader.cs b/Beam.Stealth/StealthUnitDownloader.cs
index ca3a4e0..fa2b2e9 100644
--- a/Beam.Stealth/StealthUnitDownloader.cs
+++ b/Beam.Stealth/StealthUnitDownloader.cs
@@ -6,8 +6,12 @@ using System.Diagnostics;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Beam.Downloaders;
+using Beam.Models;
 
 namespace Beam.Stealth {
+    using File = System.IO.File;
+    
     public class StealthUnitDownloader<T> : UnitDownloaderBinary<T> {
         public StealthConfig Config { get; }
         public StealthAsyncManipulator Manipulator { get; }
diff --git a/Beam.Stealth/StealthUnitPageDownloader.cs b/Beam.Stealth/StealthUnitPageDownloader.cs
index 4cdf8a2..294bee1 100644
--- a/Beam.Stealth/StealthUnitPageDownloader.cs
+++ b/Beam.Stealth/StealthUnitPageDownloader.cs
@@ -5,6 +5,8 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Beam.Downloaders;
+using Beam.Models;
 
 namespace Beam.Stealth {
     public class StealthUnitPageDownloader<T> : UnitDownloader<T> {
diff --git a/Beam.Temporary.Cli/Beam.Temporary.Cli.csproj b/Beam.Temporary.Cli/Beam.Temporary.Cli.csproj
index bdcc63c..7a82f04 100644
--- a/Beam.Temporary.Cli/Beam.Temporary.Cli.csproj
+++ b/Beam.Temporary.Cli/Beam.Temporary.Cli.csproj
@@ -12,7 +12,7 @@
     </ItemGroup>
     <ItemGroup>
         <PackageReference Include="aeqw89.DataKeys" Version="2.0.1" />
-        <PackageReference Include="aeqw89.PersistentData" Version="1.1.0" />
+        <PackageReference Include="aeqw89.PersistentData" Version="1.3.3" />
         <PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.7" />
         <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.7" />
         <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.7" />
diff --git a/Beam.Temporary.Cli/CommonTransformers.cs b/Beam.Temporary.Cli/CommonTransformers.cs
deleted file mode 100644
index fef6f89..0000000
--- a/Beam.Temporary.Cli/CommonTransformers.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-using aeqw89.DataKeys;
-using Beam.Dynamic;
-using HtmlAgilityPack;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Beam.Temporary.Cli {
-    public static class CommonTransformers {
-        public static AsyncTransformer<HtmlDocument, ArticleData> ArticleDataTransformer(DataBindings? binding) => (x) => {
-            return Task.FromResult(new ArticleData() {
-                Authors = binding?.Authors?.Get(x)?.Select(OnlineCleaner.Clean)?.ToArray() ?? [],
-                Name = OnlineCleaner.Clean(binding?.Title?.Get(x) ?? ""),
-                Categories = binding?.Tags?.Get(x)?.Select(OnlineCleaner.Clean)?.ToArray() ?? [],
-                Description = OnlineCleaner.Clean(binding?.Description?.Get(x) ?? "")
-            });
-        };
-
-        public static AsyncTransformer<HtmlDocument, TableOfContentsData> TableOfContentsTransformer(DataBindings? binding) => (x) => {
-            return Task.FromResult(new TableOfContentsData() {
-                Authors = binding?.Authors?.Get(x)?.Select(OnlineCleaner.Clean)?.ToArray() ?? [],
-                Name = OnlineCleaner.Clean(binding?.Title?.Get(x) ?? ""),
-                Categories = binding?.Tags?.Get(x)?.Select(OnlineCleaner.Clean)?.ToArray() ?? [],
-                Description = OnlineCleaner.Clean(binding?.Description?.Get(x) ?? ""),
-                ContentLinks = binding?.TableOfContents?.Get(x) ?? [],
-                PagesLinks = binding?.PagesDropDown?.Get(x) ?? []
-            });
-        };
-
-        public static AsyncTransformer<HtmlDocument, StringDocument> DocumentTransformer(DataBindings? binding, IDocumentMetaData? metaData = null) => (x) => {
-            var resolved = binding?.Resolve(x);
-            var articleData = new ArticleData() {
-                Name = OnlineCleaner.Clean(resolved?.Title),
-            };
-            Dictionary<DataKey<IDocumentMetaData>, IDocumentMetaData> meta = [];
-            meta.Add(IArchitecture.Default.ChapterKey, articleData);
-            if (metaData is not null)
-                meta.Add(IArchitecture.Default.BookKey, metaData);
-            return Task.FromResult(new StringDocument(Path.GetRandomFileName(), OnlineCleaner.Clean(resolved?.Content)) {
-                MetaData = meta
-            });
-        };
-    }
-}
diff --git a/Beam.Temporary.Cli/NovelDefinitionBuilder.cs b/Beam.Temporary.Cli/NovelDefinitionBuilder.cs
index 0540952..90af2c0 100644
--- a/Beam.Temporary.Cli/NovelDefinitionBuilder.cs
+++ b/Beam.Temporary.Cli/NovelDefinitionBuilder.cs
@@ -1,105 +1,111 @@
-using aeqw89.DataKeys;
-using Beam.Dynamic;
-using System;
-using System.Collections.Generic;
-using System.Collections.Immutable;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Beam.Models;
+// using aeqw89.DataKeys;
+// using Beam.Dynamic;
+// using System;
+// using System.Collections.Generic;
+// using System.Collections.Immutable;
+// using System.Collections.ObjectModel;
+// using System.Linq;
+// using System.Text;
+// using System.Threading.Tasks;
+// using Beam.Data;
+// using Beam.Fluent;
+// using Beam.Models;
+
+/*
+ * MAJOR TODO FIX THIS MESS
+ */
+
+//
+// namespace Beam.Temporary.Cli {
+//
+//     public record class ResourceDictionaryBuilder(string SiteKey) {
+//         private List<Func<WebResourceBuilder>> _builders;
+//
+//
+//         private record class WebResourceBuilder(string ResourceKey) {
+//             private Func<Template> _template;
+//             private Func<IReadOnlyDictionary<DataKey<DataBindings>, DataBindings>> _bindings;
+//             private string _name;
+//             private string _description;
+//             private Uri _domain;
+//
+//         }
+//
+//         private record class ResourceDictionaryRegistrar(
+//                 string SiteKey,
+//                 string FriendlyName,
+//                 IEnumerable<WebResource> Resources,
+//                 IReadOnlyDictionary<string, Template> Templates,
+//                 IReadOnlyDictionary<string, DataBindings> Bindings) : IResourceDictionaryRegistrar {
+//
+//             private Dictionary<string, ImmutableState> _states;
+//
+//             public IResourceDictionaryRegistrar AddInitialState(string key, ImmutableState state) {
+//                 _states[key] = state;
+//                 return this;
+//             }
+//
+//             public void Register(BeamDataContext sdd) {
+//                 foreach (var resource in Resources)
+//                     sdd.Resources.TryAdd(resource.Key, resource);
+//                 // foreach (var template in Templates) 
+//                 //     sdd.Templates.TryAdd(new DataKey<WebResource>(template.Key), template.Value);
+//                 foreach (var binding in Bindings)
+//                     sdd.Bindings.TryAdd(new DataKey<DataBindings>(binding.Key), binding.Value);
+//                 foreach (var state in _states)
+//                     sdd.InitialStates.TryAdd(new DataKey<ImmutableState>(state.Key), state.Value);
+//
+//                 sdd.ResourceDictionaries.TryAdd(new DataKey<ResourceDictionary>(SiteKey), new ResourceDictionary() {
+//                     Key = new DataKey<ResourceDictionary>(SiteKey),
+//                     FriendlyName = FriendlyName,
+//                     InitialStates = 
+//                 });
+//             }
+//         }
+//     }
+//
+//     public interface IResourceDictionaryRegistrar {
+//         public IResourceDictionaryRegistrar AddInitialState(string key, ImmutableState state);
+//         public void Register(BeamDataContext sdd);
+//     }
+//
+//     public interface IBindingsBuilder {
+//         public IBindingsBuilder AddBinding(DataBindings bindings);
+//         public IBindingsBuilder AddBinding(Action<DataBindings> configure);
+//         public IReadOnlyDictionary<DataKey<DataBindings>, DataBindings> Build();
+//     }
+//
+//     public interface IResourceDictionaryBuilder {
+//         public IResourceDictionaryBuilder AddResource(Func<ITemplateBuilderStage, IWebResourceBuilderStage> configure);
+//         public IResourceDictionaryBuilder WithResources(Func<ITemplateBuilderStage, IWebResourceBuilderStage>[] configure);
+//         public IResourceDictionaryBuilder WithFriendlyName(string friendlyName);
+//         public IResourceDictionaryRegistrar Then();
+//     }
+//
+//     public interface IWebResourceBuilderStage {
+//         public IWebResourceBuilderStage WithName(string name);                               // Stage 3
+//         public IWebResourceBuilderStage WithDescription(string description);                 // Stage 3
+//         public IWebResourceBuilderStage WithDomain(Uri domain);                           // Stage 3
+//         public WebResource Build();
+//     }
+//
+//     public interface IBindingBuilderStage {
+//         public IWebResourceBuilderStage WithBindings(Action<IBindingsBuilder> configure);
+//         public IWebResourceBuilderStage WithBindings(IReadOnlyDictionary<DataKey<DataBindings>, DataBindings> bindings);
+//     }
+//
+//     public interface ITemplateBuilderStage {
+//         public IBindingBuilderStage WithTemplate(Action<ITemplateBuilder> configure);
+//         public IBindingBuilderStage WithTemplate(Template template);
+//     }
+//
+//     public interface ITemplateBuilder {
+//         public ITemplateBuilder WithFactory(StateChangerFactory factory);
+//         public ITemplateBuilder WithUrlBuilder(LinkBuilder builder);
+//         public ITemplateBuilder WithUrlBuilder(Action<LinkBuilder> configure);
+//         public Template Build();
+//     }
+//
 
 
-namespace Beam.Temporary.Cli {
-
-    public record class ResourceDictionaryBuilder(string SiteKey) {
-        private List<Func<WebResourceBuilder>> _builders;
-
-
-        private record class WebResourceBuilder(string ResourceKey) {
-            private Func<Template> _template;
-            private Func<IReadOnlyDictionary<DataKey<DataBindings>, DataBindings>> _bindings;
-            private string _name;
-            private string _description;
-            private Uri _domain;
-
-        }
-
-        private record class ResourceDictionaryRegistrar(
-                string SiteKey,
-                string FriendlyName,
-                IEnumerable<WebResource> Resources,
-                IReadOnlyDictionary<string, Template> Templates,
-                IReadOnlyDictionary<string, DataBindings> Bindings) : IResourceDictionaryRegistrar {
-
-            private Dictionary<string, ImmutableState> _states;
-
-            public IResourceDictionaryRegistrar AddInitialState(string key, ImmutableState state) {
-                _states[key] = state;
-                return this;
-            }
-
-            public void Register(BeamDataContext sdd) {
-                foreach (var resource in Resources)
-                    sdd.Resources.TryAdd(resource.Key, resource);
-                foreach (var template in Templates)
-                    sdd.Templates.TryAdd(new DataKey<WebResource>(template.Key), template.Value);
-                foreach (var binding in Bindings)
-                    sdd.Bindings.TryAdd(new DataKey<DataBindings>(binding.Key), binding.Value);
-                foreach (var state in _states)
-                    sdd.InitialStates.TryAdd(new DataKey<ImmutableState>(state.Key), state.Value);
-
-                sdd.ResourceDictionaries.TryAdd(new DataKey<ResourceDictionary>(SiteKey), new ResourceDictionary() {
-                    Key = new DataKey<ResourceDictionary>(SiteKey),
-                    FriendlyName = FriendlyName,
-                    InitialStates = 
-                });
-            }
-        }
-    }
-
-    public interface IResourceDictionaryRegistrar {
-        public IResourceDictionaryRegistrar AddInitialState(string key, ImmutableState state);
-        public void Register(BeamDataContext sdd);
-    }
-
-    public interface IBindingsBuilder {
-        public IBindingsBuilder AddBinding(DataBindings bindings);
-        public IBindingsBuilder AddBinding(Action<DataBindings> configure);
-        public IReadOnlyDictionary<DataKey<DataBindings>, DataBindings> Build();
-    }
-
-    public interface IResourceDictionaryBuilder {
-        public IResourceDictionaryBuilder AddResource(Func<ITemplateBuilderStage, IWebResourceBuilderStage> configure);
-        public IResourceDictionaryBuilder WithResources(Func<ITemplateBuilderStage, IWebResourceBuilderStage>[] configure);
-        public IResourceDictionaryBuilder WithFriendlyName(string friendlyName);
-        public IResourceDictionaryRegistrar Then();
-    }
-
-    public interface IWebResourceBuilderStage {
-        public IWebResourceBuilderStage WithName(string name);                               // Stage 3
-        public IWebResourceBuilderStage WithDescription(string description);                 // Stage 3
-        public IWebResourceBuilderStage WithDomain(Uri domain);                           // Stage 3
-        public WebResource Build();
-    }
-
-    public interface IBindingBuilderStage {
-        public IWebResourceBuilderStage WithBindings(Action<IBindingsBuilder> configure);
-        public IWebResourceBuilderStage WithBindings(IReadOnlyDictionary<DataKey<DataBindings>, DataBindings> bindings);
-    }
-
-    public interface ITemplateBuilderStage {
-        public IBindingBuilderStage WithTemplate(Action<ITemplateBuilder> configure);
-        public IBindingBuilderStage WithTemplate(Template template);
-    }
-
-    public interface ITemplateBuilder {
-        public ITemplateBuilder WithFactory(StateChangerFactory factory);
-        public ITemplateBuilder WithUrlBuilder(SourceLinkBuilder builder);
-        public ITemplateBuilder WithUrlBuilder(Action<SourceLinkBuilder> configure);
-        public Template Build();
-    }
-
-
-
-}
+// }
diff --git a/Beam.Temporary.Cli/NovelStatics.cs b/Beam.Temporary.Cli/NovelStatics.cs
index 83b149d..cc68b9a 100644
--- a/Beam.Temporary.Cli/NovelStatics.cs
+++ b/Beam.Temporary.Cli/NovelStatics.cs
@@ -1,517 +1,520 @@
-
-
-using aeqw89.DataKeys;
-using Beam.Dynamic;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.CompilerServices;
-using System.Text;
-using System.Threading.Tasks;
-using Beam.Models;
-
-namespace Beam.Temporary.Cli {
-
-    public static class NovelStatics {
-        //public static void Define_LightNovelWorld_Novel_TheLegendaryMechanic(SharedDataDictionary sdd) {
-        //    var lnwAggregator = new DataKey<WebResource>("aeqw89:document:aggregators:light_novel_world");
-        //    var lnwAuxiliary = new DataKey<WebResource>("aeqw89:document:auxillaries:light_novel_world");
-        //    var novel = new TextResource() {
-        //        Key = new DataKey<TextResource>("novels:the_legendary_mechanic"),
-        //        AssociatedSource = lnwAggregator,
-        //        AssociatedMetaSource = lnwAuxiliary,
-        //        TemplateInitialData = ["the-legendary-mechanic-245", "1"],
-        //        MetaTemplateInitialData = ["the-legendary-mechanic"]
-        //    };
-        //    sdd.Novels.TryAdd(novel.Key, novel);
-
-        //    sdd.AggregatorNovels.TryAdd(lnwAggregator, [novel.Key]);
-        //}
-
-        //public static void Define_LightNovelWorl_Novel_IAloneLevelUp(SharedDataDictionary sdd) {
-        //    var lnwAggregator = new DataKey("light_novel_world").ToAggregator().As<WebResource>();
-        //    var lnwAuxiliary = new DataKey("light_novel_world").ToAuxiliary().As<WebResource>();
-        //    var novel = new TextResource() {
-        //        Key = new DataKey<TextResource>("novels:i_alone_level_up"),
-        //        AssociatedSource = lnwAggregator,
-        //        AssociatedMetaSource = lnwAuxiliary,
-        //        TemplateInitialData = ["i-alone-level-up-236", "1"],
-        //        MetaTemplateInitialData = ["i-alone-level-up-solo-leveling-05122225"]
-        //    };
-
-        //    sdd.Novels.TryAdd(novel.Key, novel);
-
-        //    sdd.AggregatorNovels.TryAdd(lnwAggregator, [novel.Key]);
-        //}
-
-        //// -----------------------------------------------------------------------------
-        //// Helper: same as in the WoDuShu file
-        //private static (DataKey<T>, DataKey<T>) CreateKeyPair<T>(
-        //    string pref1, string pref2, string common, string @namespace) {
-        //    return (
-        //        new DataKey<T>($"{pref1}:{common}").WithNamespace(@namespace),
-        //        new DataKey<T>($"{pref2}:{common}").WithNamespace(@namespace)
-        //    );
-        //}
-
-        // -----------------------------------------------------------------------------
-        // 1) Site-wide definition – YeBiQuge (m.yebiquge.com)
-        public static void Define_YeBiQuge(BeamDataContext sdd) {
-            // ---------- keys ----------
-            var yb = new DataKey<WebResource>("aeqw89:yebiquge");
-
-            var bindings = new DataKey<DataBindings>($"aeqw89:yebiquge:{nameof(IDocument).ToLower()}:bindings");
-            var bindings_info = new DataKey<DataBindings>($"aeqw89:yebiquge:{nameof(ArticleData).ToLower()}:bindings");
-            var bindings_toc = new DataKey<DataBindings>($"aeqw89:yebiquge:{nameof(TableOfContentsData).ToLower()}:bindings");
-
-            // ---------- web resources ----------
-            var aggregator = new WebResource(yb.InsertEnd(nameof(IDocument).ToLower())) {
-                Name = "YeBiQuge – Chapters",
-                Description = "Chapter pages (mobile)",
-                Domain = "https://m.yebiquge.com",
-                Bindings = bindings
-            };
-
-            var bookInfo = new WebResource(yb.InsertEnd(nameof(ArticleData).ToLower())) {
-                Name = "YeBiQuge – Book Info",
-                Description = "Book information / latest updates page",
-                Domain = "https://m.yebiquge.com",
-                Bindings = bindings_info
-            };
-
-            var tocPage = new WebResource(yb.InsertEnd(nameof(TableOfContentsData).ToLower())) {
-                Name = "YeBiQuge – TOC",
-                Description = "Full chapter list (index*.html)",
-                Domain = "https://m.yebiquge.com",
-                Bindings = bindings_toc
-            };
-
-            sdd.Resources.TryAdd(aggregator.Key, aggregator);
-            sdd.Resources.TryAdd(bookInfo.Key, bookInfo);
-            sdd.Resources.TryAdd(tocPage.Key, tocPage);
-
-            // ---------- URL templates ----------
-            // 1-a) Chapter page   /{catId}/{bookId}/{chapterId}.html
-            sdd.Templates.TryAdd(aggregator.Key, new() {
-                Factory = new(StateChangerFactory.LastAsNumber),
-                Builder = new SourceLinkBuilder("m.yebiquge.com")
-                             .WithSegments("", "", "")                       // /<cat>/<book>/<chap>
-                             .WithParameters(0, "")
-                             .WithParameters(1, "")
-                             .WithParameters(2, (".html", Position.After))  // chapId.html
-            });
-
-            // 1-b) Book-info page /{catId}/{bookId}/
-            sdd.Templates.TryAdd(bookInfo.Key, new() {
-                Factory = new(StateChangerFactory.Constant),
-                Builder = new SourceLinkBuilder("m.yebiquge.com")
-                             .WithSegments("", "")                          // /<cat>/<book>/
-                             .WithParameters(0, "")
-                             .WithParameters(1, "")
-            });
-
-            // 1-c) TOC page       /{catId}/{bookId}/index.html   (first page)
-            sdd.Templates.TryAdd(tocPage.Key, new() {
-                Factory = new(StateChangerFactory.Constant),
-                Builder = new SourceLinkBuilder("m.yebiquge.com")
-                             .WithSegments("", "", "index.html")            // /<cat>/<book>/index.html
-                             .WithParameters(0, "")
-                             .WithParameters(1, "")
-            });
-
-            // ---------- bindings ----------
-            // ── chapter page ────────────────────────────────────────────────
-            sdd.Bindings.Add(bindings, new() {
-                Title = new ContentsDataProvider {
-                    Content = new Binding { XPath = "//*[@id='nr_title']" }
-                },
-                Content = new ParagraphedContentDataProvider {
-                    Content = new Binding { XPath = "//*[@id='chaptercontent']" }
-                },
-            });
-
-            // ── book-info page ──────────────────────────────────────────────
-            sdd.Bindings.Add(bindings_info, new() {
-                Title = new ContentsDataProvider {
-                    Content = new Binding { XPath = "//div[@class='book_info']//dt[@class='name']" }
-                },
-                Authors = new ContentsArrayDataProvider {
-                    Content = new Binding {
-                        XPath = "//div[@class='book_info']//span[contains(text(),'作者')]"
-                    }
-                },
-                Description = new ParagraphedContentDataProvider {
-                    Content = new Binding { XPath = "//div[@class='book_about']/dl/dd" }
-                }
-            });
-
-            // ── TOC page ────────────────────────────────────────────────────
-            sdd.Bindings.Add(bindings_toc, new() {
-                PagesDropDown = new DropDownDataProvider {
-                    Content = new Binding { XPath = "//div[@class='fenye']//select" },
-                    RelativeTo = tocPage.Domain
-                },
-                TableOfContents = new AnchorCollectionDataProvider {
-                    Content = new Binding { XPath = "//div[@class='book_last']/dl" },
-                    RelativeTo = tocPage.Domain
-                }
-            });
-        }
-
-        // -----------------------------------------------------------------------------
-        // 2) Concrete novel – 《诡秘之主》 / Lord of the Mysteries
-        public static void Define_YeBiQuge_LordOfMysteries(BeamDataContext sdd) {
-            var yb = new DataKey<WebResource>("aeqw89:yebiquge:novels:lord_of_the_mysteries");
-            var ybAgg = yb.InsertEnd(nameof(IDocument).ToLower());
-            var ybInfo = yb.InsertEnd(nameof(ArticleData).ToLower());
-            var ybToc = yb.InsertEnd(nameof(TableOfContentsData).ToLower());
-
-            var novel = new ResourceDictionary {
-                Key = yb.To<ResourceDictionary>(),
-                FriendlyName = "Lord of the Mysteries",
-                Resources = {
-                    { nameof(IDocument)          , ybAgg  }, // chapters
-                    { nameof(ArticleData)        , ybInfo }, // book info
-                    { nameof(TableOfContentsData), ybToc  }  // full TOC
-                },
-
-                // catId = 2 , bookId = 2958 , sample chapterId = 8699808
-                InitialStates = new Dictionary<DataKey<WebResource>, ImmutableState> {
-                    { ybAgg, new ImmutableState(["2","2958","8699808"]) },
-                    { ybInfo, new ImmutableState(["2","2958"]) },
-                    { ybToc, new ImmutableState(["2","2958"]) },
-                }
-            };
-
-            sdd.ResourceDictionaries.TryAdd(novel.Key, novel);
-            sdd.AggregatorNovels.TryAdd(ybAgg, [novel.Key]);
-        }
-
-
-        // -----------------------------------------------------------------------------
-        // 1) Site-wide definition – KuaiShu5 (www.kuaishu5.com)
-        public static void Define_KuaiShu5(BeamDataContext sdd) {
-            // ---------- keys ----------
-            var ks = new DataKey<WebResource>("aeqw89:kuaishu5");
-
-            var bindings_chapter = new DataKey<DataBindings>($"aeqw89:kuaishu5:{nameof(IDocument).ToLower()}:bindings");
-            var bindings_info = new DataKey<DataBindings>($"aeqw89:kuaishu5:{nameof(ArticleData).ToLower()}:bindings");
-            var bindings_toc = new DataKey<DataBindings>($"aeqw89:kuaishu5:{nameof(TableOfContentsData).ToLower()}:bindings");
-
-            // ---------- web resources ----------
-            var chapters = new WebResource(ks.InsertEnd(nameof(IDocument).ToLower())) {
-                Name = "KuaiShu5 – Chapters",
-                Description = "Chapter pages",
-                Domain = "https://www.kuaishu5.com",
-                Bindings = bindings_chapter
-            };
-
-            var bookInfo = new WebResource(ks.InsertEnd(nameof(ArticleData).ToLower())) {
-                Name = "KuaiShu5 – Book Info",
-                Description = "Book information / landing page",
-                Domain = "https://www.kuaishu5.com",
-                Bindings = bindings_info
-            };
-
-            var tocPage = new WebResource(ks.InsertEnd(nameof(TableOfContentsData).ToLower())) {
-                Name = "KuaiShu5 – TOC",
-                Description = "Full chapter list (index page)",
-                Domain = "https://www.kuaishu5.com",
-                Bindings = bindings_toc
-            };
-
-            sdd.Resources.TryAdd(chapters.Key, chapters);
-            sdd.Resources.TryAdd(bookInfo.Key, bookInfo);
-            sdd.Resources.TryAdd(tocPage.Key, tocPage);
-
-            // ---------- URL templates ----------
-            // 1-a) Chapter page   /b{bookId}/{chapterId}.html
-            sdd.Templates.TryAdd(chapters.Key, new() {
-                Factory = new(StateChangerFactory.LastAsNumber),
-                Builder = new SourceLinkBuilder("www.kuaishu5.com")
-                               .WithSegments("", "")                           // /<seg0>/<seg1>
-                               .WithParameters(0, ("b", Position.Before))     // seg0: b{bookId}
-                               .WithParameters(1, (".html", Position.After))  // seg1: {chapterId}.html
-            });
-
-            // 1-b) Book-info page /b{bookId}/
-            sdd.Templates.TryAdd(bookInfo.Key, new() {
-                Factory = new(StateChangerFactory.Constant),
-                Builder = new SourceLinkBuilder("www.kuaishu5.com")
-                              .WithSegments("")                                // /<seg0>
-                              .WithParameters(0, ("b", Position.Before))       // seg0: b{bookId}
-            });
-
-            // 1-c) TOC page       /b{bookId}/   (same as book-info)
-            sdd.Templates.TryAdd(tocPage.Key, new() {
-                Factory = new(StateChangerFactory.Constant),
-                Builder = new SourceLinkBuilder("www.kuaishu5.com")
-                              .WithSegments("")                                // /<seg0>
-                              .WithParameters(0, ("b", Position.Before))       // seg0: b{bookId}
-            });
-
-            // ---------- bindings ----------
-            // ── chapter page ────────────────────────────────────────────────
-            sdd.Bindings.Add(bindings_chapter, new() {
-                Title = new ContentsDataProvider {
-                    Content = new Binding { XPath = "//h1[@class='bookname']" }
-                },
-                Content = new ParagraphedContentDataProvider {
-                    Content = new Binding { XPath = "//*[@id='booktxt']" }
-                }
-            });
-
-            // ── book-info page ──────────────────────────────────────────────
-            sdd.Bindings.Add(bindings_info, new() {
-                Title = new ContentsDataProvider {
-                    Content = new Binding { XPath = "//*[@id='info']/h1" }
-                },
-                Authors = new ContentsArrayDataProvider {
-                    Content = new Binding {
-                        XPath = "//*[@id='info']//p[contains(text(),'作者')]/a"
-                    }
-                },
-                Description = new ParagraphedContentDataProvider {
-                    Content = new Binding { XPath = "//*[@id='intro']" }
-                }
-            });
-
-            // ── TOC page ────────────────────────────────────────────────────
-            sdd.Bindings.Add(bindings_toc, new() {
-                PagesDropDown = new DropDownDataProvider {
-                    Content = new Binding { XPath = "//*[@id='indexselect']" },
-                    RelativeTo = tocPage.Domain
-                },
-                TableOfContents = new AnchorCollectionDataProvider {
-                    Content = new Binding { XPath = "//*[@id='content_1']" },
-                    RelativeTo = tocPage.Domain
-                }
-            });
-        }
-
-        // -----------------------------------------------------------------------------
-        // 2) Concrete novel – 《诡秘之主》 / Lord of the Mysteries
-        public static void Define_KuaiShu5_LordOfMysteries(BeamDataContext sdd) {
-            var ks = new DataKey<WebResource>("aeqw89:kuaishu5");
-            var ksChapters = ks.InsertEnd(nameof(IDocument).ToLower());
-            var ksInfo = ks.InsertEnd(nameof(ArticleData).ToLower());
-            var ksToc = ks.InsertEnd(nameof(TableOfContentsData).ToLower());
-
-            var novel = new ResourceDictionary {
-                Key = new DataKey<ResourceDictionary>("kuaishu5:novels:lord_of_the_mysteries"),
-                FriendlyName = "Lord of the Mysteries",
-                Resources =
-                {
-            { nameof(IDocument)          , ksChapters },
-            { nameof(ArticleData)        , ksInfo     },
-            { nameof(TableOfContentsData), ksToc      }
-        }
-            };
-
-            // bookId = 122722 , sample chapterId = 288372
-            sdd.InitialStates = new Dictionary<DataKey<ImmutableState>, ImmutableState>
-            {
-        { ksChapters.To<ImmutableState>(), new ImmutableState(["122722", "288372"]) },
-        { ksInfo    .To<ImmutableState>(), new ImmutableState(["122722"]) },
-        { ksToc     .To<ImmutableState>(), new ImmutableState(["122722"]) }
-    };
-
-            sdd.ResourceDictionaries.TryAdd(novel.Key, novel);
-            sdd.AggregatorNovels.TryAdd(ksChapters, [novel.Key]);
-        }
-        //public static void Define_WoDuShu_HouseOfHorrors(BeamDataDictionary sdd) {
-        //    var (wdsAgg, wdsAux) = CreateKeyPair<WebResource>("aggregators", "auxillaries", "wodushu", "aeqw89:document");
-        //    var novel = new ResourceDictionary() {
-        //        Key = new DataKey<ResourceDictionary>("novels:house_of_horrors"),
-        //        FriendlyName = "My House Of Horrors",
-        //        AssociatedSource = wdsAgg,
-        //        AssociatedMetaSource = wdsAux,
-        //        TemplateInitialData = new ImmutableState(["24349", "2896325"]),
-        //        MetaTemplateInitialData = new ImmutableState(["24349"])
-        //    };
-
-        //    sdd.ResourceDictionaries.TryAdd(novel.Key, novel);
-
-        //    sdd.AggregatorNovels.TryAdd(wdsAgg, [novel.Key]);
-        //}
-
-        private static (DataKey<T>, DataKey<T>) CreateKeyPair<T>(string pref1, string pref2, string common, string @namespace) {
-            return (
-                new DataKey<T>(pref1 + ":" + common).InsertStart(@namespace),
-                new DataKey<T>(pref2 + ":" + common).InsertStart(@namespace)
-                );
-        }
-
-        //public static void Define_WoDuShu(BeamDataDictionary sdd) {
-        //    var (wdsAgg, wdsAux) = CreateKeyPair<WebResource>("aggregators", "auxillaries", "wodushu", "aeqw89:document");
-        //    var bindings = new DataKey<DataBindings>("aeqw89:bindings:wodushu");
-        //    var aggregator = new WebResource(wdsAgg) {
-        //        Name = "WoDuShu.com",
-        //        Description = "A Chinese novel aggregator site",
-        //        Domain = "https://wodushu.com",
-        //        Bindings = bindings
-        //    };
-        //    var auxiliary = new WebResource(wdsAux) {
-        //        Name = "WoDuShu.com",
-        //        Description = "A Chinese novel aggregator site",
-        //        Domain = "https://wodushu.com",
-        //        Bindings = bindings.WithSuffix("_aux")
-        //    };
-
-        //    sdd.Templates.TryAdd(wdsAgg, new() {
-        //        Factory = new(StateChangerFactory.LastAsNumber),
-        //        Builder = new SourceLinkBuilder("www.wodushu.com")
-        //            .WithSegments("read", "", "")
-        //            .WithParameters(1, "")
-        //            .WithParameters(2, (".html", Position.After))
-        //    });
-        //    sdd.Templates.TryAdd(wdsAux, new() {
-        //        Factory = new(StateChangerFactory.Constant),
-        //        Builder = new SourceLinkBuilder("www.wodushu.com")
-        //            .WithSegments("book", "")
-        //            .WithParameters(1, "")
-        //    });
-
-        //    sdd.Resources.TryAdd(wdsAgg, aggregator);
-        //    sdd.Auxillaries.TryAdd(wdsAux, auxiliary);
-
-        //    var binding_agg = new DataKey<DataBindings>("aeqw89:bindings:wodushu");
-        //    var binding_aux = new DataKey<DataBindings>("aeqw89:bindings:wodushu_aux");
-
-        //    sdd.Bindings.Add(binding_agg, new() {
-        //        Title = new ContentsDataProvider() {
-        //            Content = new Binding() {
-        //                XPath = "/html/body/div[4]/div/div/div[2]/h1"
-        //            }
-        //        },
-
-        //        Content = new ParagraphedContentDataProvider() {
-        //            Content = new Binding() {
-        //                XPath = "//*[@id=\"content\"]"
-        //            }
-        //        },
-        //    });
-
-        //    sdd.Bindings.Add(binding_aux, new() {
-        //        Title = new ContentsDataProvider() {
-        //            Content = new Binding() {
-        //                XPath = "/html/body/div[3]/div[1]/div/div/div[2]/div[1]/h1"
-        //            }
-        //        },
-        //        Authors = new ContentsArrayDataProvider() {
-        //            Content = new Binding() {
-        //                XPath = "/html/body/div[3]/div[1]/div/div/div[2]/div[1]/div/p[1]/a"
-        //            }
-        //        },
-        //        Description = new ParagraphedContentDataProvider() {
-        //            Content = new Binding() {
-        //                XPath = "/html/body/div[3]/div[1]/div/div/div[2]/div[2]"
-        //            }
-        //        },
-        //    });
-        //}
-
-        //public static void Define_NovelFull(SharedDataDictionary sdd) {
-        //    var docNamespace = "aeqw89:document";
-        //    var nfAgg = new DataKey<WebResource>("aggregators:novel_full").WithNamespace(docNamespace);
-        //    var nfAux = new DataKey<WebResource>("auxillaries:novel_full").WithNamespace(docNamespace);
-        //    var nfBindings = new DataKey<DataBindings>("aeqw89:bindings:light_novel_world");
-        //    var aggregator = new WebResource(nfAgg) {
-        //        Name = "Novel Full",
-        //        Description = "A novel aggregator site",
-        //        Domain = "https://novelfull.net",
-        //        Bindings = nfBindings
-        //    };
-        //    var auxiliary = new WebResource(nfAux) {
-        //        Name = "Novel Full",
-        //        Description = "A novel aggregator site",
-        //        Domain = "https://novelfull.net",
-        //        Bindings = nfBindings.WithSuffix("_aux")
-        //    };
-
-        //    sdd.Templates.TryAdd(nfAux, new(StateChangerFactory.LastAsNumberPrefixed));
-
-        //    sdd.Aggregators.TryAdd(nfAgg, aggregator);
-        //    sdd.Auxillaries.TryAdd(nfAux, auxiliary);
-
-        //    var binding_agg = new DataKey<DataBindings>("aeqw89:bindings:be")
-
-        //}
-
-        //public static void Define_LightNovelWorld(SharedDataDictionary sdd) {
-        //    var lnwAggregator = new DataKey<WebResource>("aeqw89:document:aggregators:light_novel_world");
-        //    var lnwAuxiliary = new DataKey<WebResource>("aeqw89:document:auxillaries:light_novel_world");
-        //    const string lnwBindingsA = "aeqw89:bindings:light_novel_world";
-        //    var aggregator = new WebResource(lnwAggregator) {
-        //        Name = "Light Novel World",
-        //        Description = "A novel aggregator site maintained by NetherClaw",
-        //        Domain = "https://www.lightnovelworld.co",
-        //        Bindings = new DataKey<DataBindings>(lnwBindingsA)
-        //    };
-        //    const string lnwBindingsB = "aeqw89:bindings:light_novel_world_aux";
-        //    var auxiliary = new WebResource(lnwAuxiliary) {
-        //        Name = "Light Novel World",
-        //        Description = "A novel aggregator site maintained by NetherClaw",
-        //        Domain = "https://www.lightnovelworld.co",
-        //        Bindings = new DataKey<DataBindings>(lnwBindingsB)
-        //    };
-
-        //    sdd.Templates.TryAdd(lnwAuxiliary, new() {
-        //        Template = "https://www.lightnovelworld.co/novel/{0}",
-        //        IndexOfChapterIndex = -1
-        //    });
-        //    sdd.Templates.TryAdd(lnwAggregator, new() {
-        //        Template = "https://www.lightnovelworld.co/novel/{0}/chapter-{1}",
-        //        IndexOfChapterIndex = 1
-        //    });
-
-        //    sdd.Aggregators.TryAdd(aggregator.Key, aggregator);
-        //    sdd.Auxillaries.TryAdd(auxiliary.Key, auxiliary);
-
-        //    var lnwBindings = new DataKey<DataBindings>(lnwBindingsA);
-        //    var lnwBindingsAux = new DataKey<DataBindings>(lnwBindingsB);
-        //    sdd.Bindings.TryAdd(lnwBindings, new DataBindings() {
-        //        Title = new Binding("aeqw89:binding:light_novel_world:title") {
-        //            XPath = "/html/body/main/article/section/div[1]/h1/span[2]",
-        //            Type = BindingType.Single
-        //        },
-        //        Content = new("aeqw89:binding:light_novel_world:content") {
-        //            Provider = new ParagraphedContentDataProvider() {
-        //                Content = new Binding() {
-        //                    XPath = "//*[@id=\"chapter-container\"]"
-        //                }
-        //            },
-        //            Type = BindingType.UseProvider
-        //        },
-        //    });
-        //    sdd.Bindings.TryAdd(lnwBindingsAux, new DataBindings() {
-        //        Title = new("aeqw89:binding:light_novel_world_aux:title") {
-        //            XPath = "/html/body/main/article/header/div[2]/div[2]/div[1]/h1",
-        //            Type = BindingType.Single
-        //        },
-        //        Authors = new("aeqw89:binding:light_novel_world_aux:authors") {
-        //            XPath = "/html/body/main/article/header/div[2]/div[2]/div[1]/div[1]/a",
-        //            Type = BindingType.Single
-        //        },
-        //        Description = new("aeqw89:binding:light_novel_world_aux:description") {
-        //            Provider = new ParagraphedContentDataProvider() {
-        //                Content = new() {
-        //                    XPath = "/html/body/main/article/div/section/div[1]/div"
-        //                }
-        //            },
-        //            Type = BindingType.UseProvider
-        //        },
-        //        Tags = new("aeqw89:binding:light_novel_world_aux:tags") {
-        //            Provider = new ListContentDataProvider() {
-        //                Content = new() {
-        //                    XPath = "/html/body/main/article/header/div[2]/div[2]/div[3]/ul"
-        //                }
-        //            },
-        //            Type = BindingType.UseProvider
-        //        }
-        //    });
-        //}
-
-
-    }
-}
+//
+//
+// using aeqw89.DataKeys;
+// using Beam.Dynamic;
+// using System;
+// using System.Collections.Generic;
+// using System.Linq;
+// using System.Runtime.CompilerServices;
+// using System.Text;
+// using System.Threading.Tasks;
+// using Beam.Data;
+// using Beam.Fluent;
+// using Beam.Models;
+// using Beam.Models.Public_Concrete;
+//
+// namespace Beam.Temporary.Cli {
+//
+//     public static class NovelStatics {
+//         //public static void Define_LightNovelWorld_Novel_TheLegendaryMechanic(SharedDataDictionary sdd) {
+//         //    var lnwAggregator = new DataKey<WebResource>("aeqw89:document:aggregators:light_novel_world");
+//         //    var lnwAuxiliary = new DataKey<WebResource>("aeqw89:document:auxillaries:light_novel_world");
+//         //    var novel = new TextResource() {
+//         //        Key = new DataKey<TextResource>("novels:the_legendary_mechanic"),
+//         //        AssociatedSource = lnwAggregator,
+//         //        AssociatedMetaSource = lnwAuxiliary,
+//         //        TemplateInitialData = ["the-legendary-mechanic-245", "1"],
+//         //        MetaTemplateInitialData = ["the-legendary-mechanic"]
+//         //    };
+//         //    sdd.Novels.TryAdd(novel.Key, novel);
+//
+//         //    sdd.AggregatorNovels.TryAdd(lnwAggregator, [novel.Key]);
+//         //}
+//
+//         //public static void Define_LightNovelWorl_Novel_IAloneLevelUp(SharedDataDictionary sdd) {
+//         //    var lnwAggregator = new DataKey("light_novel_world").ToAggregator().As<WebResource>();
+//         //    var lnwAuxiliary = new DataKey("light_novel_world").ToAuxiliary().As<WebResource>();
+//         //    var novel = new TextResource() {
+//         //        Key = new DataKey<TextResource>("novels:i_alone_level_up"),
+//         //        AssociatedSource = lnwAggregator,
+//         //        AssociatedMetaSource = lnwAuxiliary,
+//         //        TemplateInitialData = ["i-alone-level-up-236", "1"],
+//         //        MetaTemplateInitialData = ["i-alone-level-up-solo-leveling-05122225"]
+//         //    };
+//
+//         //    sdd.Novels.TryAdd(novel.Key, novel);
+//
+//         //    sdd.AggregatorNovels.TryAdd(lnwAggregator, [novel.Key]);
+//         //}
+//
+//         //// -----------------------------------------------------------------------------
+//         //// Helper: same as in the WoDuShu file
+//         //private static (DataKey<T>, DataKey<T>) CreateKeyPair<T>(
+//         //    string pref1, string pref2, string common, string @namespace) {
+//         //    return (
+//         //        new DataKey<T>($"{pref1}:{common}").WithNamespace(@namespace),
+//         //        new DataKey<T>($"{pref2}:{common}").WithNamespace(@namespace)
+//         //    );
+//         //}
+//
+//         // -----------------------------------------------------------------------------
+//         // 1) Site-wide definition – YeBiQuge (m.yebiquge.com)
+//         public static void Define_YeBiQuge(BeamDataContext sdd) {
+//             // ---------- keys ----------
+//             var yb = new DataKey<WebResource>("aeqw89:yebiquge");
+//
+//             var bindings = new DataKey<DataBindings>($"aeqw89:yebiquge:{nameof(IDocument).ToLower()}:bindings");
+//             var bindings_info = new DataKey<DataBindings>($"aeqw89:yebiquge:{nameof(ArticleData).ToLower()}:bindings");
+//             var bindings_toc = new DataKey<DataBindings>($"aeqw89:yebiquge:{nameof(TableOfContentsData).ToLower()}:bindings");
+//
+//             // ---------- web resources ----------
+//             var aggregator = new WebResource(yb.InsertEnd(nameof(IDocument).ToLower())) {
+//                 Name = "YeBiQuge – Chapters",
+//                 Description = "Chapter pages (mobile)",
+//                 Domain = "https://m.yebiquge.com",
+//                 Bindings = bindings
+//             };
+//
+//             var bookInfo = new WebResource(yb.InsertEnd(nameof(ArticleData).ToLower())) {
+//                 Name = "YeBiQuge – Book Info",
+//                 Description = "Book information / latest updates page",
+//                 Domain = "https://m.yebiquge.com",
+//                 Bindings = bindings_info
+//             };
+//
+//             var tocPage = new WebResource(yb.InsertEnd(nameof(TableOfContentsData).ToLower())) {
+//                 Name = "YeBiQuge – TOC",
+//                 Description = "Full chapter list (index*.html)",
+//                 Domain = "https://m.yebiquge.com",
+//                 Bindings = bindings_toc
+//             };
+//
+//             sdd.Resources.TryAdd(aggregator.Key, aggregator);
+//             sdd.Resources.TryAdd(bookInfo.Key, bookInfo);
+//             sdd.Resources.TryAdd(tocPage.Key, tocPage);
+//
+//             // ---------- URL templates ----------
+//             // 1-a) Chapter page   /{catId}/{bookId}/{chapterId}.html
+//             sdd.Templates.TryAdd(aggregator.Key, new() {
+//                 Factory = new(StateChangerFactory.LastAsNumber),
+//                 Builder = new LinkBuilder("m.yebiquge.com")
+//                              .WithSegments("", "", "")                       // /<cat>/<book>/<chap>
+//                              .WithParameters(0, "")
+//                              .WithParameters(1, "")
+//                              .WithParameters(2, (".html", Position.After))  // chapId.html
+//             });
+//
+//             // 1-b) Book-info page /{catId}/{bookId}/
+//             sdd.Templates.TryAdd(bookInfo.Key, new() {
+//                 Factory = new(StateChangerFactory.Constant),
+//                 Builder = new LinkBuilder("m.yebiquge.com")
+//                              .WithSegments("", "")                          // /<cat>/<book>/
+//                              .WithParameters(0, "")
+//                              .WithParameters(1, "")
+//             });
+//
+//             // 1-c) TOC page       /{catId}/{bookId}/index.html   (first page)
+//             sdd.Templates.TryAdd(tocPage.Key, new() {
+//                 Factory = new(StateChangerFactory.Constant),
+//                 Builder = new LinkBuilder("m.yebiquge.com")
+//                              .WithSegments("", "", "index.html")            // /<cat>/<book>/index.html
+//                              .WithParameters(0, "")
+//                              .WithParameters(1, "")
+//             });
+//
+//             // ---------- bindings ----------
+//             // ── chapter page ────────────────────────────────────────────────
+//             sdd.Bindings.Add(bindings, new() {
+//                 Title = new ContentsDataProvider {
+//                     Content = new Binding { XPath = "//*[@id='nr_title']" }
+//                 },
+//                 Content = new ParagraphedContentDataProvider {
+//                     Content = new Binding { XPath = "//*[@id='chaptercontent']" }
+//                 },
+//             });
+//
+//             // ── book-info page ──────────────────────────────────────────────
+//             sdd.Bindings.Add(bindings_info, new() {
+//                 Title = new ContentsDataProvider {
+//                     Content = new Binding { XPath = "//div[@class='book_info']//dt[@class='name']" }
+//                 },
+//                 Authors = new ContentsArrayDataProvider {
+//                     Content = new Binding {
+//                         XPath = "//div[@class='book_info']//span[contains(text(),'作者')]"
+//                     }
+//                 },
+//                 Description = new ParagraphedContentDataProvider {
+//                     Content = new Binding { XPath = "//div[@class='book_about']/dl/dd" }
+//                 }
+//             });
+//
+//             // ── TOC page ────────────────────────────────────────────────────
+//             sdd.Bindings.Add(bindings_toc, new() {
+//                 PagesDropDown = new DropDownDataProvider {
+//                     Content = new Binding { XPath = "//div[@class='fenye']//select" },
+//                     RelativeTo = tocPage.Domain
+//                 },
+//                 TableOfContents = new AnchorCollectionDataProvider {
+//                     Content = new Binding { XPath = "//div[@class='book_last']/dl" },
+//                     RelativeTo = tocPage.Domain
+//                 }
+//             });
+//         }
+//
+//         // -----------------------------------------------------------------------------
+//         // 2) Concrete novel – 《诡秘之主》 / Lord of the Mysteries
+//         public static void Define_YeBiQuge_LordOfMysteries(BeamDataContext sdd) {
+//             var yb = new DataKey<WebResource>("aeqw89:yebiquge:novels:lord_of_the_mysteries");
+//             var ybAgg = yb.InsertEnd(nameof(IDocument).ToLower());
+//             var ybInfo = yb.InsertEnd(nameof(ArticleData).ToLower());
+//             var ybToc = yb.InsertEnd(nameof(TableOfContentsData).ToLower());
+//
+//             var novel = new ResourceDictionary {
+//                 Key = yb.To<ResourceDictionary>(),
+//                 FriendlyName = "Lord of the Mysteries",
+//                 Resources = {
+//                     { nameof(IDocument)          , ybAgg  }, // chapters
+//                     { nameof(ArticleData)        , ybInfo }, // book info
+//                     { nameof(TableOfContentsData), ybToc  }  // full TOC
+//                 },
+//
+//                 // catId = 2 , bookId = 2958 , sample chapterId = 8699808
+//                 InitialStates = new Dictionary<DataKey<WebResource>, ImmutableState> {
+//                     { ybAgg, new ImmutableState(["2","2958","8699808"]) },
+//                     { ybInfo, new ImmutableState(["2","2958"]) },
+//                     { ybToc, new ImmutableState(["2","2958"]) },
+//                 }
+//             };
+//
+//             sdd.ResourceDictionaries.TryAdd(novel.Key, novel);
+//             sdd.AggregatorNovels.TryAdd(ybAgg, [novel.Key]);
+//         }
+//
+//
+//         // -----------------------------------------------------------------------------
+//         // 1) Site-wide definition – KuaiShu5 (www.kuaishu5.com)
+//         public static void Define_KuaiShu5(BeamDataContext sdd) {
+//             // ---------- keys ----------
+//             var ks = new DataKey<WebResource>("aeqw89:kuaishu5");
+//
+//             var bindings_chapter = new DataKey<DataBindings>($"aeqw89:kuaishu5:{nameof(IDocument).ToLower()}:bindings");
+//             var bindings_info = new DataKey<DataBindings>($"aeqw89:kuaishu5:{nameof(ArticleData).ToLower()}:bindings");
+//             var bindings_toc = new DataKey<DataBindings>($"aeqw89:kuaishu5:{nameof(TableOfContentsData).ToLower()}:bindings");
+//
+//             // ---------- web resources ----------
+//             var chapters = new WebResource(ks.InsertEnd(nameof(IDocument).ToLower())) {
+//                 Name = "KuaiShu5 – Chapters",
+//                 Description = "Chapter pages",
+//                 Domain = "https://www.kuaishu5.com",
+//                 Bindings = bindings_chapter
+//             };
+//
+//             var bookInfo = new WebResource(ks.InsertEnd(nameof(ArticleData).ToLower())) {
+//                 Name = "KuaiShu5 – Book Info",
+//                 Description = "Book information / landing page",
+//                 Domain = "https://www.kuaishu5.com",
+//                 Bindings = bindings_info
+//             };
+//
+//             var tocPage = new WebResource(ks.InsertEnd(nameof(TableOfContentsData).ToLower())) {
+//                 Name = "KuaiShu5 – TOC",
+//                 Description = "Full chapter list (index page)",
+//                 Domain = "https://www.kuaishu5.com",
+//                 Bindings = bindings_toc
+//             };
+//
+//             sdd.Resources.TryAdd(chapters.Key, chapters);
+//             sdd.Resources.TryAdd(bookInfo.Key, bookInfo);
+//             sdd.Resources.TryAdd(tocPage.Key, tocPage);
+//
+//             // ---------- URL templates ----------
+//             // 1-a) Chapter page   /b{bookId}/{chapterId}.html
+//             sdd.Templates.TryAdd(chapters.Key, new() {
+//                 Factory = new(StateChangerFactory.LastAsNumber),
+//                 Builder = new LinkBuilder("www.kuaishu5.com")
+//                                .WithSegments("", "")                           // /<seg0>/<seg1>
+//                                .WithParameters(0, ("b", Position.Before))     // seg0: b{bookId}
+//                                .WithParameters(1, (".html", Position.After))  // seg1: {chapterId}.html
+//             });
+//
+//             // 1-b) Book-info page /b{bookId}/
+//             sdd.Templates.TryAdd(bookInfo.Key, new() {
+//                 Factory = new(StateChangerFactory.Constant),
+//                 Builder = new LinkBuilder("www.kuaishu5.com")
+//                               .WithSegments("")                                // /<seg0>
+//                               .WithParameters(0, ("b", Position.Before))       // seg0: b{bookId}
+//             });
+//
+//             // 1-c) TOC page       /b{bookId}/   (same as book-info)
+//             sdd.Templates.TryAdd(tocPage.Key, new() {
+//                 Factory = new(StateChangerFactory.Constant),
+//                 Builder = new LinkBuilder("www.kuaishu5.com")
+//                               .WithSegments("")                                // /<seg0>
+//                               .WithParameters(0, ("b", Position.Before))       // seg0: b{bookId}
+//             });
+//
+//             // ---------- bindings ----------
+//             // ── chapter page ────────────────────────────────────────────────
+//             sdd.Bindings.Add(bindings_chapter, new() {
+//                 Title = new ContentsDataProvider {
+//                     Content = new Binding { XPath = "//h1[@class='bookname']" }
+//                 },
+//                 Content = new ParagraphedContentDataProvider {
+//                     Content = new Binding { XPath = "//*[@id='booktxt']" }
+//                 }
+//             });
+//
+//             // ── book-info page ──────────────────────────────────────────────
+//             sdd.Bindings.Add(bindings_info, new() {
+//                 Title = new ContentsDataProvider {
+//                     Content = new Binding { XPath = "//*[@id='info']/h1" }
+//                 },
+//                 Authors = new ContentsArrayDataProvider {
+//                     Content = new Binding {
+//                         XPath = "//*[@id='info']//p[contains(text(),'作者')]/a"
+//                     }
+//                 },
+//                 Description = new ParagraphedContentDataProvider {
+//                     Content = new Binding { XPath = "//*[@id='intro']" }
+//                 }
+//             });
+//
+//             // ── TOC page ────────────────────────────────────────────────────
+//             sdd.Bindings.Add(bindings_toc, new() {
+//                 PagesDropDown = new DropDownDataProvider {
+//                     Content = new Binding { XPath = "//*[@id='indexselect']" },
+//                     RelativeTo = tocPage.Domain
+//                 },
+//                 TableOfContents = new AnchorCollectionDataProvider {
+//                     Content = new Binding { XPath = "//*[@id='content_1']" },
+//                     RelativeTo = tocPage.Domain
+//                 }
+//             });
+//         }
+//
+//         // -----------------------------------------------------------------------------
+//         // 2) Concrete novel – 《诡秘之主》 / Lord of the Mysteries
+//         public static void Define_KuaiShu5_LordOfMysteries(BeamDataContext sdd) {
+//             var ks = new DataKey<WebResource>("aeqw89:kuaishu5");
+//             var ksChapters = ks.InsertEnd(nameof(IDocument).ToLower());
+//             var ksInfo = ks.InsertEnd(nameof(ArticleData).ToLower());
+//             var ksToc = ks.InsertEnd(nameof(TableOfContentsData).ToLower());
+//
+//             var novel = new ResourceDictionary {
+//                 Key = new DataKey<ResourceDictionary>("kuaishu5:novels:lord_of_the_mysteries"),
+//                 FriendlyName = "Lord of the Mysteries",
+//                 Resources =
+//                 {
+//             { nameof(IDocument)          , ksChapters },
+//             { nameof(ArticleData)        , ksInfo     },
+//             { nameof(TableOfContentsData), ksToc      }
+//         }
+//             };
+//
+//             // bookId = 122722 , sample chapterId = 288372
+//             sdd.InitialStates = new Dictionary<DataKey<ImmutableState>, ImmutableState>
+//             {
+//         { ksChapters.To<ImmutableState>(), new ImmutableState(["122722", "288372"]) },
+//         { ksInfo    .To<ImmutableState>(), new ImmutableState(["122722"]) },
+//         { ksToc     .To<ImmutableState>(), new ImmutableState(["122722"]) }
+//     };
+//
+//             sdd.ResourceDictionaries.TryAdd(novel.Key, novel);
+//             sdd.AggregatorNovels.TryAdd(ksChapters, [novel.Key]);
+//         }
+//         //public static void Define_WoDuShu_HouseOfHorrors(BeamDataDictionary sdd) {
+//         //    var (wdsAgg, wdsAux) = CreateKeyPair<WebResource>("aggregators", "auxillaries", "wodushu", "aeqw89:document");
+//         //    var novel = new ResourceDictionary() {
+//         //        Key = new DataKey<ResourceDictionary>("novels:house_of_horrors"),
+//         //        FriendlyName = "My House Of Horrors",
+//         //        AssociatedSource = wdsAgg,
+//         //        AssociatedMetaSource = wdsAux,
+//         //        TemplateInitialData = new ImmutableState(["24349", "2896325"]),
+//         //        MetaTemplateInitialData = new ImmutableState(["24349"])
+//         //    };
+//
+//         //    sdd.ResourceDictionaries.TryAdd(novel.Key, novel);
+//
+//         //    sdd.AggregatorNovels.TryAdd(wdsAgg, [novel.Key]);
+//         //}
+//
+//         private static (DataKey<T>, DataKey<T>) CreateKeyPair<T>(string pref1, string pref2, string common, string @namespace) {
+//             return (
+//                 new DataKey<T>(pref1 + ":" + common).InsertStart(@namespace),
+//                 new DataKey<T>(pref2 + ":" + common).InsertStart(@namespace)
+//                 );
+//         }
+//
+//         //public static void Define_WoDuShu(BeamDataDictionary sdd) {
+//         //    var (wdsAgg, wdsAux) = CreateKeyPair<WebResource>("aggregators", "auxillaries", "wodushu", "aeqw89:document");
+//         //    var bindings = new DataKey<DataBindings>("aeqw89:bindings:wodushu");
+//         //    var aggregator = new WebResource(wdsAgg) {
+//         //        Name = "WoDuShu.com",
+//         //        Description = "A Chinese novel aggregator site",
+//         //        Domain = "https://wodushu.com",
+//         //        Bindings = bindings
+//         //    };
+//         //    var auxiliary = new WebResource(wdsAux) {
+//         //        Name = "WoDuShu.com",
+//         //        Description = "A Chinese novel aggregator site",
+//         //        Domain = "https://wodushu.com",
+//         //        Bindings = bindings.WithSuffix("_aux")
+//         //    };
+//
+//         //    sdd.Templates.TryAdd(wdsAgg, new() {
+//         //        Factory = new(StateChangerFactory.LastAsNumber),
+//         //        Builder = new SourceLinkBuilder("www.wodushu.com")
+//         //            .WithSegments("read", "", "")
+//         //            .WithParameters(1, "")
+//         //            .WithParameters(2, (".html", Position.After))
+//         //    });
+//         //    sdd.Templates.TryAdd(wdsAux, new() {
+//         //        Factory = new(StateChangerFactory.Constant),
+//         //        Builder = new SourceLinkBuilder("www.wodushu.com")
+//         //            .WithSegments("book", "")
+//         //            .WithParameters(1, "")
+//         //    });
+//
+//         //    sdd.Resources.TryAdd(wdsAgg, aggregator);
+//         //    sdd.Auxillaries.TryAdd(wdsAux, auxiliary);
+//
+//         //    var binding_agg = new DataKey<DataBindings>("aeqw89:bindings:wodushu");
+//         //    var binding_aux = new DataKey<DataBindings>("aeqw89:bindings:wodushu_aux");
+//
+//         //    sdd.Bindings.Add(binding_agg, new() {
+//         //        Title = new ContentsDataProvider() {
+//         //            Content = new Binding() {
+//         //                XPath = "/html/body/div[4]/div/div/div[2]/h1"
+//         //            }
+//         //        },
+//
+//         //        Content = new ParagraphedContentDataProvider() {
+//         //            Content = new Binding() {
+//         //                XPath = "//*[@id=\"content\"]"
+//         //            }
+//         //        },
+//         //    });
+//
+//         //    sdd.Bindings.Add(binding_aux, new() {
+//         //        Title = new ContentsDataProvider() {
+//         //            Content = new Binding() {
+//         //                XPath = "/html/body/div[3]/div[1]/div/div/div[2]/div[1]/h1"
+//         //            }
+//         //        },
+//         //        Authors = new ContentsArrayDataProvider() {
+//         //            Content = new Binding() {
+//         //                XPath = "/html/body/div[3]/div[1]/div/div/div[2]/div[1]/div/p[1]/a"
+//         //            }
+//         //        },
+//         //        Description = new ParagraphedContentDataProvider() {
+//         //            Content = new Binding() {
+//         //                XPath = "/html/body/div[3]/div[1]/div/div/div[2]/div[2]"
+//         //            }
+//         //        },
+//         //    });
+//         //}
+//
+//         //public static void Define_NovelFull(SharedDataDictionary sdd) {
+//         //    var docNamespace = "aeqw89:document";
+//         //    var nfAgg = new DataKey<WebResource>("aggregators:novel_full").WithNamespace(docNamespace);
+//         //    var nfAux = new DataKey<WebResource>("auxillaries:novel_full").WithNamespace(docNamespace);
+//         //    var nfBindings = new DataKey<DataBindings>("aeqw89:bindings:light_novel_world");
+//         //    var aggregator = new WebResource(nfAgg) {
+//         //        Name = "Novel Full",
+//         //        Description = "A novel aggregator site",
+//         //        Domain = "https://novelfull.net",
+//         //        Bindings = nfBindings
+//         //    };
+//         //    var auxiliary = new WebResource(nfAux) {
+//         //        Name = "Novel Full",
+//         //        Description = "A novel aggregator site",
+//         //        Domain = "https://novelfull.net",
+//         //        Bindings = nfBindings.WithSuffix("_aux")
+//         //    };
+//
+//         //    sdd.Templates.TryAdd(nfAux, new(StateChangerFactory.LastAsNumberPrefixed));
+//
+//         //    sdd.Aggregators.TryAdd(nfAgg, aggregator);
+//         //    sdd.Auxillaries.TryAdd(nfAux, auxiliary);
+//
+//         //    var binding_agg = new DataKey<DataBindings>("aeqw89:bindings:be")
+//
+//         //}
+//
+//         //public static void Define_LightNovelWorld(SharedDataDictionary sdd) {
+//         //    var lnwAggregator = new DataKey<WebResource>("aeqw89:document:aggregators:light_novel_world");
+//         //    var lnwAuxiliary = new DataKey<WebResource>("aeqw89:document:auxillaries:light_novel_world");
+//         //    const string lnwBindingsA = "aeqw89:bindings:light_novel_world";
+//         //    var aggregator = new WebResource(lnwAggregator) {
+//         //        Name = "Light Novel World",
+//         //        Description = "A novel aggregator site maintained by NetherClaw",
+//         //        Domain = "https://www.lightnovelworld.co",
+//         //        Bindings = new DataKey<DataBindings>(lnwBindingsA)
+//         //    };
+//         //    const string lnwBindingsB = "aeqw89:bindings:light_novel_world_aux";
+//         //    var auxiliary = new WebResource(lnwAuxiliary) {
+//         //        Name = "Light Novel World",
+//         //        Description = "A novel aggregator site maintained by NetherClaw",
+//         //        Domain = "https://www.lightnovelworld.co",
+//         //        Bindings = new DataKey<DataBindings>(lnwBindingsB)
+//         //    };
+//
+//         //    sdd.Templates.TryAdd(lnwAuxiliary, new() {
+//         //        Template = "https://www.lightnovelworld.co/novel/{0}",
+//         //        IndexOfChapterIndex = -1
+//         //    });
+//         //    sdd.Templates.TryAdd(lnwAggregator, new() {
+//         //        Template = "https://www.lightnovelworld.co/novel/{0}/chapter-{1}",
+//         //        IndexOfChapterIndex = 1
+//         //    });
+//
+//         //    sdd.Aggregators.TryAdd(aggregator.Key, aggregator);
+//         //    sdd.Auxillaries.TryAdd(auxiliary.Key, auxiliary);
+//
+//         //    var lnwBindings = new DataKey<DataBindings>(lnwBindingsA);
+//         //    var lnwBindingsAux = new DataKey<DataBindings>(lnwBindingsB);
+//         //    sdd.Bindings.TryAdd(lnwBindings, new DataBindings() {
+//         //        Title = new Binding("aeqw89:binding:light_novel_world:title") {
+//         //            XPath = "/html/body/main/article/section/div[1]/h1/span[2]",
+//         //            Type = BindingType.Single
+//         //        },
+//         //        Content = new("aeqw89:binding:light_novel_world:content") {
+//         //            Provider = new ParagraphedContentDataProvider() {
+//         //                Content = new Binding() {
+//         //                    XPath = "//*[@id=\"chapter-container\"]"
+//         //                }
+//         //            },
+//         //            Type = BindingType.UseProvider
+//         //        },
+//         //    });
+//         //    sdd.Bindings.TryAdd(lnwBindingsAux, new DataBindings() {
+//         //        Title = new("aeqw89:binding:light_novel_world_aux:title") {
+//         //            XPath = "/html/body/main/article/header/div[2]/div[2]/div[1]/h1",
+//         //            Type = BindingType.Single
+//         //        },
+//         //        Authors = new("aeqw89:binding:light_novel_world_aux:authors") {
+//         //            XPath = "/html/body/main/article/header/div[2]/div[2]/div[1]/div[1]/a",
+//         //            Type = BindingType.Single
+//         //        },
+//         //        Description = new("aeqw89:binding:light_novel_world_aux:description") {
+//         //            Provider = new ParagraphedContentDataProvider() {
+//         //                Content = new() {
+//         //                    XPath = "/html/body/main/article/div/section/div[1]/div"
+//         //                }
+//         //            },
+//         //            Type = BindingType.UseProvider
+//         //        },
+//         //        Tags = new("aeqw89:binding:light_novel_world_aux:tags") {
+//         //            Provider = new ListContentDataProvider() {
+//         //                Content = new() {
+//         //                    XPath = "/html/body/main/article/header/div[2]/div[2]/div[3]/ul"
+//         //                }
+//         //            },
+//         //            Type = BindingType.UseProvider
+//         //        }
+//         //    });
+//         //}
+//
+//
+//     }
+// }
diff --git a/Beam.Temporary.Cli/Program.cs b/Beam.Temporary.Cli/Program.cs
index 2ae59b5..9a68d11 100644
--- a/Beam.Temporary.Cli/Program.cs
+++ b/Beam.Temporary.Cli/Program.cs
@@ -1,229 +1,230 @@
-using aeqw89.PersistentData;
-using aeqw89.DataKeys;
-using Beam.Dynamic;
-using HtmlAgilityPack;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using System.Text.Json;
-using System.Text.Json.Serialization;
-using System.Text.Json.Serialization.Metadata;
-using Beam.Temporary.Cli.Templates.Classic;
-using Beam.Exports;
-using System.Diagnostics;
-using Beam.Models;
-using Beam.Stealth;
+// using aeqw89.PersistentData;
+// using aeqw89.DataKeys;
+// using Beam.Dynamic;
+// using HtmlAgilityPack;
+// using Microsoft.Extensions.DependencyInjection;
+// using Microsoft.Extensions.Logging;
+// using System.Text.Json;
+// using System.Text.Json.Serialization;
+// using System.Text.Json.Serialization.Metadata;
+// using Beam.Temporary.Cli.Templates.Classic;
+// using Beam.Exports;
+// using System.Diagnostics;
+// using Beam.Models;
+// using Beam.Models.Public_Concrete;
+// using Beam.Stealth;
 
 namespace Beam.Temporary.Cli {
     internal class Program {
+//
+//         public static JsonSerializerOptions ConversionOptions { get; internal set; } = new();
+//
+//         public static BeamDataContext BeamData { get; set; } = [];
+//
+//         public static IArchitecture Architecture = IArchitecture.Default;
+//
+//         const string BeamDataPath = "data/.dat";
 
-        public static JsonSerializerOptions ConversionOptions { get; internal set; } = new();
-
-        public static BeamDataContext BeamData { get; set; } = [];
-
-        public static IArchitecture Architecture = IArchitecture.Default;
-
-        const string BeamDataPath = "data/.dat";
-
-        static async Task Main(string[] args) {
-            ConversionOptions.Converters.AddPersistentDataRequiredConverters();
-            ConversionOptions.WriteIndented = true;
-
-            var web = new HtmlWeb();
-
-            var lf = LoggerFactory.Create((x) => x
-                 .AddConsole()
-                 .SetMinimumLevel(LogLevel.Trace)
-            );
-
-            ILogger logger = lf
-                .CreateLogger("Program");
-
-            await using var sharedContext = await DataDictionaryContext<BeamDataContext>.Create(
-                BeamDataPath,
-                false,
-                DataKind.Shared,
-                logger,
-                ConversionOptions
-            );
-
-            BeamData = sharedContext.Data;
-
-            BeamData.Clear();
-            NovelStatics.Define_YeBiQuge(BeamData);
-            NovelStatics.Define_YeBiQuge_LordOfMysteries(BeamData);
-            NovelStatics.Define_KuaiShu5(BeamData);
-            NovelStatics.Define_KuaiShu5_LordOfMysteries(BeamData);
-            ClassicTemplates.Register(BeamData);
-
-            await sharedContext.ForceSave();
-            BeamData = sharedContext.Data; // need to refresh instance after forced save!
-
-            CancellationTokenSource cts = new();
-
-            using var config = StealthConfig.Create(true, null, TimeSpan.FromMinutes(2), Browser.Chrome, lf.CreateLogger<StealthConfig>());
-            var unit = new StealthUnitPageDownloader<HtmlDocument>(new(), config, (x) => {
-                return Task.CompletedTask;
-            }, x => Task.FromResult(x));
-
-            var (success, result) = await unit.TryDownload([new("https://duckduckgo.com/?t=ffab&q=C%23+stealth+headless+browser&ia=web", 0)], default);
-            if (success)
-                logger?.LogInformation("Success! Downloaded '{}'", result?.DocumentNode.Name);
-            else
-                logger?.LogError("Failed to download!");
-
-            Console.WriteLine(result?.DocumentNode.OuterHtml);
-
-            //var novelResDict = new DataKey<ResourceDictionary>("kuaishu5:novels:lord_of_the_mysteries");
-
-            //var metadata2 = await DownloadBuilder<HtmlDocument, TableOfContentsData>.FromResource(novelResDict, nameof(TableOfContentsData), BeamData)
-            //    .WithLink()
-            //    .WithTransformer(CommonTransformers.TableOfContentsTransformer)
-            //    .Configure((x) => x
-            //        .WithDownloadLogger(logger)
-            //        .WithRetryReporter(new Progress<RetryReport>())
-            //        .WithTimeOut(TimeSpan.FromSeconds(15)))
-            //    .Build()
-            //    .FirstAsync();
-
-            //if (metadata2.Data.PagesLinks is null || metadata2.Data.PagesLinks.Length == 0)
-            //    Debugger.Break();
-
-            //var pageLinks = DownloadBuilder<HtmlDocument, TableOfContentsData>.FromScratch()
-            //    .WithLinks(metadata2.Data.PagesLinks)
-            //    .WithTransformer(CommonTransformers.TableOfContentsTransformer(BeamData.Bindings[BeamData.Resources[BeamData.ResourceDictionaries[novelResDict].Resources[nameof(TableOfContentsData)]].Bindings]))
-            //    .Configure(x => x
-            //        .WithDownloadLogger(logger)
-            //        .WithRetryReporter(new Progress<RetryReport>())
-            //        .WithTimeOut(TimeSpan.FromSeconds(15)))
-            //    .Build();
-
-            //var links = (await pageLinks
-            //        .ToListAsync())
-            //        .Where(x => x?.Data?.ContentLinks is not null)
-            //        .SelectMany(x => x.Data.ContentLinks!)
-            //        .DistinctBy(x => x.Link.AbsoluteUri);
-
-            //var downloader = DownloadBuilder<HtmlDocument, StringDocument>.FromScratch()
-            //    .WithLinks(links)
-            //    .WithTransformer(CommonTransformers.DocumentTransformer(BeamData.Bindings[BeamData.Resources[BeamData.ResourceDictionaries[novelResDict].Resources[nameof(IDocument)]].Bindings]))
-            //    .Configure(x => x
-            //        .WithDownloadLogger(logger)
-            //        .WithRetryReporter(new Progress<RetryReport>(x => logger?.LogWarning("Retrying download {} for the {} time", x.Link, x.TryNumber)))
-            //        .WithTimeOut(TimeSpan.FromSeconds(15)))
-            //    .WithParallelism(4)
-            //    .UseFragments()
-            //    .Build();
-
-            //HashSet<Ordered<StringDocument>> downloaded = [];
-            //try {
-            //    await foreach (var download in downloader) {
-            //        logger?.LogInformation("Downloaded chapter with order={}", download.Order);
-            //        try {
-            //            downloaded.Add(download);
-            //        } catch (Exception e) {
-            //            logger?.LogError(e, "Unknown error occurred");
-            //        }
-            //    }
-            //} catch (Exception e) {
-            //    logger?.LogError(e, "Uncaught error detected!");
-            //} finally {
-            //    logger?.LogInformation("Done with loop, downloaded {}", downloaded.Count);
-            //    try {
-            //        string serialized = JsonSerializer.Serialize(downloaded.Select(x => new { x.Order, x.Data.Content, x.Data.MetaData }).ToArray(), ConversionOptions);
-            //        System.IO.File.WriteAllText("lordOfTheMysteries.json", serialized);
-            //    } catch (Exception e) {
-            //        logger?.LogInformation(e, "Failed to serialize chapters");
-            //    }
-            //}
-
-            //var downloader2 = DownloadBuilder<HtmlDocument, IDocument>.FromText(novel, BeamData)
-            //    .WithRange(1..5)
-            //    .WithLinkGenerator()
-            //    .WithTransformer((x) => CommonTransformers.DocumentTransformer(x, metadata2.Data))
-            //    .Configure((x) => x
-            //        .WithDownloadLogger(logger)
-            //        .WithDownloadReporter(new Progress<DownloadReport>((x) => logger.LogInformation(x.ToString())))
-            //        .WithTimeOut(TimeSpan.FromSeconds(15))
-            //    )
-            //    .Build();
-
-
-
-            //List<Task<Ordered<IDocument>>> translationTasks = [];
-            //List<Ordered<IDocument>> documents = [];
-
-            //await foreach (var download in downloader2.Take(10)) {
-            //    if (!download.Data.MetaData.TryGetValue(Architecture.ChapterKey, out var meta))
-            //        continue;
-            //    if (meta is not ArticleData articleMetaData)
-            //        continue;
-            //    if (!download.Data.MetaData.TryGetValue(Architecture.BookKey, out var bookmeta))
-            //        continue;
-            //    if (meta is not ArticleData bookMetaData)
-            //        continue;
-            //    //Console.WriteLine($"Title: {data.Name}");
-            //    //Console.WriteLine($"Description: {data.Description}");
-            //    //Console.WriteLine($"Categories: {data.Categories.Aggregate((x, y) => $"{x}; {y}")}");
-            //    //Console.WriteLine($"Authors: {data.Authors.Aggregate((x,y) => $"{x}; {y}")}");
-            //    Console.WriteLine($"Chapter title: {articleMetaData.Name}");
-            //    Console.WriteLine($"Book title: {bookMetaData.Name}");
-            //    //Console.WriteLine($"Content: {download}");
-
-            //    //translationTasks.Add(Task.Run(async () => {
-            //    //    logger.LogInformation("Beginning translation {} task for {}", download.Order, articleMetaData.Name);
-            //    //    var ret = new Ordered<IDocument>(await QuickAndDirtyJanitor.TranslateAsync(download.Data), download.Order);
-            //    //    logger.LogInformation("Finished translation {} task for {}", download.Order, articleMetaData.Name);
-            //    //    return ret;
-            //    //}));
-            //}
-
-            //documents = (await Task.WhenAll(translationTasks)).ToList();
-
-            //string testDir = Path.Combine("txt", Path.GetRandomFileName());
-            //Directory.CreateDirectory(testDir);
-
-            //int len = documents.MaxBy((x) => x.Order)?.Order ?? -1;
-            //foreach (var document in documents.OrderBy((x) => x.Order)) {
-            //    document.Data.MetaData.TryGetValue(Architecture.ChapterKey, out var chapterMetaData);
-            //    Dictionary<string, string> linkButtons = new();
-            //    if (document.Order != 0)
-            //        linkButtons.Add("Previous", $"{document.Order - 1}.html");
-            //    if (document.Order != len)
-            //        linkButtons.Add("Next", $"{document.Order + 1}.html");
-            //    new HtmlExporter(document.Data, chapterMetaData as ArticleData, linkButtons).Write(Path.Combine(testDir, $"{document.Order}.html"));
-            //}
-
-            Console.ReadKey();
-
-            //foreach (var download in documents.OrderBy((x) => x.Order)) {
-            //    if (download.Data.TryGetTaggedMetaData<ArticleData>(Architecture.ChapterKey, out var meta))
-            //        Console.WriteLine($"{download.Order}:{meta.Name}");
-            //}
-
-            //string[] templates = new DataKey<File>[] {
-            //    HtmlBook.Keys.ContentPage,
-            //    HtmlBook.Keys.NoContentPage,
-            //    HtmlBook.Keys.TitlePage,
-            //    HtmlBook.Keys.StylesPage,
-            //}.Select(
-            //    (x) => BeamData.Files.ReadToString(x.WithNamespace("aeqw89:files:templates:classic"))
-            //).ToArray();
-
-            //HtmlBook book = new(
-            //    bookname: Path.Combine(Path.GetRandomFileName(), "I Alone Level Up"), 
-            //    new CssData(), 
-            //    new ArticleData(), 
-            //    new HtmlBookTemplates() {
-            //        ContentPageTemplate = templates[0],
-            //        NoContentTemplate = templates[1],
-            //        TitlePageTemplate = templates[2],
-            //        CssTemplate = templates[3],
-            //    },
-            //    documents: documents.Select((x) => x.Data).ToList()
-            //);
-
-            //book.Update();
-            //Console.WriteLine("One variable!");
+         static async Task Main(string[] args) {
+//             ConversionOptions.Converters.AddPersistentDataRequiredConverters();
+//             ConversionOptions.WriteIndented = true;
+//
+//             var web = new HtmlWeb();
+//
+//             var lf = LoggerFactory.Create((x) => x
+//                  .AddConsole()
+//                  .SetMinimumLevel(LogLevel.Trace)
+//             );
+//
+//             ILogger logger = lf
+//                 .CreateLogger("Program");
+//
+//             await using var sharedContext = await DataDictionaryContext<BeamDataContext>.Create(
+//                 BeamDataPath,
+//                 false,
+//                 DataKind.Shared,
+//                 logger,
+//                 ConversionOptions
+//             );
+//
+//             BeamData = sharedContext.Data;
+//
+//             BeamData.Clear();
+//             NovelStatics.Define_YeBiQuge(BeamData);
+//             NovelStatics.Define_YeBiQuge_LordOfMysteries(BeamData);
+//             NovelStatics.Define_KuaiShu5(BeamData);
+//             NovelStatics.Define_KuaiShu5_LordOfMysteries(BeamData);
+//             ClassicTemplates.Register(BeamData);
+//
+//             await sharedContext.ForceSave();
+//             BeamData = sharedContext.Data; // need to refresh instance after forced save!
+//
+//             CancellationTokenSource cts = new();
+//
+//             using var config = StealthConfig.Create(true, null, TimeSpan.FromMinutes(2), Browser.Chrome, lf.CreateLogger<StealthConfig>());
+//             var unit = new StealthUnitPageDownloader<HtmlDocument>(new(), config, (x) => {
+//                 return Task.CompletedTask;
+//             }, x => Task.FromResult(x));
+//
+//             var (success, result) = await unit.TryDownload([new("https://duckduckgo.com/?t=ffab&q=C%23+stealth+headless+browser&ia=web", 0)], default);
+//             if (success)
+//                 logger?.LogInformation("Success! Downloaded '{}'", result?.DocumentNode.Name);
+//             else
+//                 logger?.LogError("Failed to download!");
+//
+//             Console.WriteLine(result?.DocumentNode.OuterHtml);
+//
+//             //var novelResDict = new DataKey<ResourceDictionary>("kuaishu5:novels:lord_of_the_mysteries");
+//
+//             //var metadata2 = await DownloadBuilder<HtmlDocument, TableOfContentsData>.FromResource(novelResDict, nameof(TableOfContentsData), BeamData)
+//             //    .WithLink()
+//             //    .WithTransformer(CommonTransformers.TableOfContentsTransformer)
+//             //    .Configure((x) => x
+//             //        .WithDownloadLogger(logger)
+//             //        .WithRetryReporter(new Progress<RetryReport>())
+//             //        .WithTimeOut(TimeSpan.FromSeconds(15)))
+//             //    .Build()
+//             //    .FirstAsync();
+//
+//             //if (metadata2.Data.PagesLinks is null || metadata2.Data.PagesLinks.Length == 0)
+//             //    Debugger.Break();
+//
+//             //var pageLinks = DownloadBuilder<HtmlDocument, TableOfContentsData>.FromScratch()
+//             //    .WithLinks(metadata2.Data.PagesLinks)
+//             //    .WithTransformer(CommonTransformers.TableOfContentsTransformer(BeamData.Bindings[BeamData.Resources[BeamData.ResourceDictionaries[novelResDict].Resources[nameof(TableOfContentsData)]].Bindings]))
+//             //    .Configure(x => x
+//             //        .WithDownloadLogger(logger)
+//             //        .WithRetryReporter(new Progress<RetryReport>())
+//             //        .WithTimeOut(TimeSpan.FromSeconds(15)))
+//             //    .Build();
+//
+//             //var links = (await pageLinks
+//             //        .ToListAsync())
+//             //        .Where(x => x?.Data?.ContentLinks is not null)
+//             //        .SelectMany(x => x.Data.ContentLinks!)
+//             //        .DistinctBy(x => x.Link.AbsoluteUri);
+//
+//             //var downloader = DownloadBuilder<HtmlDocument, StringDocument>.FromScratch()
+//             //    .WithLinks(links)
+//             //    .WithTransformer(CommonTransformers.DocumentTransformer(BeamData.Bindings[BeamData.Resources[BeamData.ResourceDictionaries[novelResDict].Resources[nameof(IDocument)]].Bindings]))
+//             //    .Configure(x => x
+//             //        .WithDownloadLogger(logger)
+//             //        .WithRetryReporter(new Progress<RetryReport>(x => logger?.LogWarning("Retrying download {} for the {} time", x.Link, x.TryNumber)))
+//             //        .WithTimeOut(TimeSpan.FromSeconds(15)))
+//             //    .WithParallelism(4)
+//             //    .UseFragments()
+//             //    .Build();
+//
+//             //HashSet<Ordered<StringDocument>> downloaded = [];
+//             //try {
+//             //    await foreach (var download in downloader) {
+//             //        logger?.LogInformation("Downloaded chapter with order={}", download.Order);
+//             //        try {
+//             //            downloaded.Add(download);
+//             //        } catch (Exception e) {
+//             //            logger?.LogError(e, "Unknown error occurred");
+//             //        }
+//             //    }
+//             //} catch (Exception e) {
+//             //    logger?.LogError(e, "Uncaught error detected!");
+//             //} finally {
+//             //    logger?.LogInformation("Done with loop, downloaded {}", downloaded.Count);
+//             //    try {
+//             //        string serialized = JsonSerializer.Serialize(downloaded.Select(x => new { x.Order, x.Data.Content, x.Data.MetaData }).ToArray(), ConversionOptions);
+//             //        System.IO.File.WriteAllText("lordOfTheMysteries.json", serialized);
+//             //    } catch (Exception e) {
+//             //        logger?.LogInformation(e, "Failed to serialize chapters");
+//             //    }
+//             //}
+//
+//             //var downloader2 = DownloadBuilder<HtmlDocument, IDocument>.FromText(novel, BeamData)
+//             //    .WithRange(1..5)
+//             //    .WithLinkGenerator()
+//             //    .WithTransformer((x) => CommonTransformers.DocumentTransformer(x, metadata2.Data))
+//             //    .Configure((x) => x
+//             //        .WithDownloadLogger(logger)
+//             //        .WithDownloadReporter(new Progress<DownloadReport>((x) => logger.LogInformation(x.ToString())))
+//             //        .WithTimeOut(TimeSpan.FromSeconds(15))
+//             //    )
+//             //    .Build();
+//
+//
+//
+//             //List<Task<Ordered<IDocument>>> translationTasks = [];
+//             //List<Ordered<IDocument>> documents = [];
+//
+//             //await foreach (var download in downloader2.Take(10)) {
+//             //    if (!download.Data.MetaData.TryGetValue(Architecture.ChapterKey, out var meta))
+//             //        continue;
+//             //    if (meta is not ArticleData articleMetaData)
+//             //        continue;
+//             //    if (!download.Data.MetaData.TryGetValue(Architecture.BookKey, out var bookmeta))
+//             //        continue;
+//             //    if (meta is not ArticleData bookMetaData)
+//             //        continue;
+//             //    //Console.WriteLine($"Title: {data.Name}");
+//             //    //Console.WriteLine($"Description: {data.Description}");
+//             //    //Console.WriteLine($"Categories: {data.Categories.Aggregate((x, y) => $"{x}; {y}")}");
+//             //    //Console.WriteLine($"Authors: {data.Authors.Aggregate((x,y) => $"{x}; {y}")}");
+//             //    Console.WriteLine($"Chapter title: {articleMetaData.Name}");
+//             //    Console.WriteLine($"Book title: {bookMetaData.Name}");
+//             //    //Console.WriteLine($"Content: {download}");
+//
+//             //    //translationTasks.Add(Task.Run(async () => {
+//             //    //    logger.LogInformation("Beginning translation {} task for {}", download.Order, articleMetaData.Name);
+//             //    //    var ret = new Ordered<IDocument>(await QuickAndDirtyJanitor.TranslateAsync(download.Data), download.Order);
+//             //    //    logger.LogInformation("Finished translation {} task for {}", download.Order, articleMetaData.Name);
+//             //    //    return ret;
+//             //    //}));
+//             //}
+//
+//             //documents = (await Task.WhenAll(translationTasks)).ToList();
+//
+//             //string testDir = Path.Combine("txt", Path.GetRandomFileName());
+//             //Directory.CreateDirectory(testDir);
+//
+//             //int len = documents.MaxBy((x) => x.Order)?.Order ?? -1;
+//             //foreach (var document in documents.OrderBy((x) => x.Order)) {
+//             //    document.Data.MetaData.TryGetValue(Architecture.ChapterKey, out var chapterMetaData);
+//             //    Dictionary<string, string> linkButtons = new();
+//             //    if (document.Order != 0)
+//             //        linkButtons.Add("Previous", $"{document.Order - 1}.html");
+//             //    if (document.Order != len)
+//             //        linkButtons.Add("Next", $"{document.Order + 1}.html");
+//             //    new HtmlExporter(document.Data, chapterMetaData as ArticleData, linkButtons).Write(Path.Combine(testDir, $"{document.Order}.html"));
+//             //}
+//
+//             Console.ReadKey();
+//
+//             //foreach (var download in documents.OrderBy((x) => x.Order)) {
+//             //    if (download.Data.TryGetTaggedMetaData<ArticleData>(Architecture.ChapterKey, out var meta))
+//             //        Console.WriteLine($"{download.Order}:{meta.Name}");
+//             //}
+//
+//             //string[] templates = new DataKey<File>[] {
+//             //    HtmlBook.Keys.ContentPage,
+//             //    HtmlBook.Keys.NoContentPage,
+//             //    HtmlBook.Keys.TitlePage,
+//             //    HtmlBook.Keys.StylesPage,
+//             //}.Select(
+//             //    (x) => BeamData.Files.ReadToString(x.WithNamespace("aeqw89:files:templates:classic"))
+//             //).ToArray();
+//
+//             //HtmlBook book = new(
+//             //    bookname: Path.Combine(Path.GetRandomFileName(), "I Alone Level Up"), 
+//             //    new CssData(), 
+//             //    new ArticleData(), 
+//             //    new HtmlBookTemplates() {
+//             //        ContentPageTemplate = templates[0],
+//             //        NoContentTemplate = templates[1],
+//             //        TitlePageTemplate = templates[2],
+//             //        CssTemplate = templates[3],
+//             //    },
+//             //    documents: documents.Select((x) => x.Data).ToList()
+//             //);
+//
+//             //book.Update();
+//             //Console.WriteLine("One variable!");
         }
     }
 }
diff --git a/Beam.Temporary.Cli/QuickAndDirtyJanitor.cs b/Beam.Temporary.Cli/QuickAndDirtyJanitor.cs
index 7b03e06..1823b7c 100644
--- a/Beam.Temporary.Cli/QuickAndDirtyJanitor.cs
+++ b/Beam.Temporary.Cli/QuickAndDirtyJanitor.cs
@@ -1,25 +1,26 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using OpenAI;
-using OpenAI.Chat;
-
-namespace Beam.Temporary.Cli {
-    public class QuickAndDirtyJanitor {
-        static OpenAIClient client;
-
-        static QuickAndDirtyJanitor() {
-            var key = Environment.GetEnvironmentVariable("OPEN_AI_KEY");
-            client = new OpenAIClient(key);
-        }
-
-        public static async Task<IDocument> TranslateAsync(IDocument document) {
-            var chatCompletion = await client.GetChatClient("gpt-4.1").CompleteChatAsync(
-                ChatMessage.CreateSystemMessage("Translate the following text into english. If any part of the text has no direct English translation, you may choose to leave it as is. In either case, make sure to leave footnotes for any difficult to translate words. You must translate the whole text and output only your translation and footnotes. No other comments are necessary."),
-                ChatMessage.CreateUserMessage("From UNKNOWN to ENGLISH.\n" + document.ToString()));
-            return new StringDocument(document.Filename, chatCompletion.Value.Content.DefaultIfEmpty().Select((x) => x?.Text).Aggregate((x,y) => $"{x}{y}"));
-        }
-    }
-}
+// using System;
+// using System.Collections.Generic;
+// using System.Linq;
+// using System.Text;
+// using System.Threading.Tasks;
+// using Beam.Models;
+// using OpenAI;
+// using OpenAI.Chat;
+//
+// namespace Beam.Temporary.Cli {
+//     public class QuickAndDirtyJanitor {
+//         static OpenAIClient client;
+//
+//         static QuickAndDirtyJanitor() {
+//             var key = Environment.GetEnvironmentVariable("OPEN_AI_KEY");
+//             client = new OpenAIClient(key);
+//         }
+//
+//         public static async Task<IDocument> TranslateAsync(IDocument document) {
+//             var chatCompletion = await client.GetChatClient("gpt-4.1").CompleteChatAsync(
+//                 ChatMessage.CreateSystemMessage("Translate the following text into english. If any part of the text has no direct English translation, you may choose to leave it as is. In either case, make sure to leave footnotes for any difficult to translate words. You must translate the whole text and output only your translation and footnotes. No other comments are necessary."),
+//                 ChatMessage.CreateUserMessage("From UNKNOWN to ENGLISH.\n" + document.ToString()));
+//             return new StringDocument(document.Filename, chatCompletion.Value.Content.DefaultIfEmpty().Select((x) => x?.Text).Aggregate((x,y) => $"{x}{y}"));
+//         }
+//     }
+// }
diff --git a/Beam.Temporary.Cli/StateChangerFactory.cs b/Beam.Temporary.Cli/StateChangerFactory.cs
deleted file mode 100644
index b77f656..0000000
--- a/Beam.Temporary.Cli/StateChangerFactory.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Text.Json.Serialization;
-using System.Threading.Tasks;
-
-namespace Beam.Temporary.Cli {
-    public class StateChangerFactory {
-        [JsonIgnore]
-        public IStateChangeBehaviour Behavior => FactoryTable[StateChangerKey]();
-        
-        [JsonInclude]
-        public string StateChangerKey { get; set; }
-
-        [JsonConstructor]
-        public StateChangerFactory(string stateChangerKey) {
-            if (!Keys.Contains(stateChangerKey))
-                throw new ArgumentException($"{stateChangerKey} not in keys list", nameof(stateChangerKey));
-            StateChangerKey = stateChangerKey;
-        }
-
-        public static Dictionary<string, Func<IStateChangeBehaviour>> FactoryTable = new() {
-            { LastAsNumber, () => CommonStateChangers.LastAsNumber },
-            { LastAsNumberPrefixed, () => CommonStateChangers.NthAsNumber(^1, true) },
-            { Constant, () => CommonStateChangers.Constant },
-        };
-
-        public HashSet<string> Keys = [LastAsNumber, LastAsNumberPrefixed, Constant];
-        public const string LastAsNumber = "LastAsNumber";
-        public const string LastAsNumberPrefixed = "LastAsNumberPrefixed";
-        public const string Constant = "Constant";
-    }
-}
diff --git a/Beam.Temporary.Cli/Templates/Classic/ClassicTemplates.cs b/Beam.Temporary.Cli/Templates/Classic/ClassicTemplates.cs
index d8f8914..4b57a7a 100644
--- a/Beam.Temporary.Cli/Templates/Classic/ClassicTemplates.cs
+++ b/Beam.Temporary.Cli/Templates/Classic/ClassicTemplates.cs
@@ -1,30 +1,30 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Beam.Temporary.Cli.Templates.Classic {
-    internal class ClassicTemplates {
-        public static void Register(BeamDataDictionary sdd) {
-            sdd.Files.TryAdd(
-                new("aeqw89:files:templates:classic:content_page"),
-                new("C:\\Users\\qwsdc\\source\\repos\\Beam\\Beam.Temporary.Cli\\Templates\\Classic\\Content.template.html", "htmlpage", "templates"));
-            sdd.Files.TryAdd(
-                new("aeqw89:files:templates:classic:title_page"),
-                new("C:\\Users\\qwsdc\\source\\repos\\Beam\\Beam.Temporary.Cli\\Templates\\Classic\\Title.template.html", "htmlpage", "templates"));
-            sdd.Files.TryAdd(
-                new("aeqw89:files:templates:classic:styles_page"),
-                new("C:\\Users\\qwsdc\\source\\repos\\Beam\\Beam.Temporary.Cli\\Templates\\Classic\\Styles.template.css", "styles", "templates"));
-            sdd.Files.TryAdd(
-                new("aeqw89:files:templates:classic:no_content_page"),
-                new("C:\\Users\\qwsdc\\source\\repos\\Beam\\Beam.Temporary.Cli\\Templates\\Classic\\NoContent.template.html", "htmlpage", "templates"));
-        }
-    }
-
-    internal static class DictionaryOfFileExtensions {
-        public static string ReadToString<T>(this Dictionary<T, File> dict, T key) where T: notnull {
-            return System.IO.File.ReadAllText(dict[key].Path);
-        }
-    }
-}
+// using System;
+// using System.Collections.Generic;
+// using System.Linq;
+// using System.Text;
+// using System.Threading.Tasks;
+//
+// namespace Beam.Temporary.Cli.Templates.Classic {
+//     internal class ClassicTemplates {
+//         public static void Register(BeamDataDictionary sdd) {
+//             sdd.Files.TryAdd(
+//                 new("aeqw89:files:templates:classic:content_page"),
+//                 new("C:\\Users\\qwsdc\\source\\repos\\Beam\\Beam.Temporary.Cli\\Templates\\Classic\\Content.template.html", "htmlpage", "templates"));
+//             sdd.Files.TryAdd(
+//                 new("aeqw89:files:templates:classic:title_page"),
+//                 new("C:\\Users\\qwsdc\\source\\repos\\Beam\\Beam.Temporary.Cli\\Templates\\Classic\\Title.template.html", "htmlpage", "templates"));
+//             sdd.Files.TryAdd(
+//                 new("aeqw89:files:templates:classic:styles_page"),
+//                 new("C:\\Users\\qwsdc\\source\\repos\\Beam\\Beam.Temporary.Cli\\Templates\\Classic\\Styles.template.css", "styles", "templates"));
+//             sdd.Files.TryAdd(
+//                 new("aeqw89:files:templates:classic:no_content_page"),
+//                 new("C:\\Users\\qwsdc\\source\\repos\\Beam\\Beam.Temporary.Cli\\Templates\\Classic\\NoContent.template.html", "htmlpage", "templates"));
+//         }
+//     }
+//
+//     internal static class DictionaryOfFileExtensions {
+//         public static string ReadToString<T>(this Dictionary<T, File> dict, T key) where T: notnull {
+//             return System.IO.File.ReadAllText(dict[key].Path);
+//         }
+//     }
+// }
diff --git a/Beam.Tests/Beam.Tests.csproj b/Beam.Tests/Beam.Tests.csproj
index 5d4c268..9f1b29e 100644
--- a/Beam.Tests/Beam.Tests.csproj
+++ b/Beam.Tests/Beam.Tests.csproj
@@ -15,6 +15,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\Beam.Data\Beam.Data.csproj" />
     <ProjectReference Include="..\Beam.Dynamic\Beam.Dynamic.csproj" />
     <ProjectReference Include="..\Beam.Exports\Beam.Exports.csproj" />
     <ProjectReference Include="..\Beam\Beam.csproj" />
diff --git a/Beam.Tests/OnlineCleaner.Tests.cs b/Beam.Tests/OnlineCleaner.Tests.cs
index 344f488..1fe8901 100644
--- a/Beam.Tests/OnlineCleaner.Tests.cs
+++ b/Beam.Tests/OnlineCleaner.Tests.cs
@@ -8,12 +8,12 @@ using System.Text;
 using System.Threading.Tasks;
 
 namespace Beam.Tests {
-    public class OnlineCleanerTests {
+    public class StringCleanerTests {
         [Fact]
         public void Should_LocalizeArabic() {
             const string test = "1234";
 
-            List<int> localized = OnlineCleaner.ParseNumbers(test,  Culture.English);
+            List<int> localized = StringCleaner.ParseNumbers(test,  Culture.English);
 
             Assert.Single(localized);
             Assert.Equal(1234, localized[0]);
@@ -23,7 +23,7 @@ namespace Beam.Tests {
         public void Should_LocalizeIndian() {
             const string test = "九一五";
 
-            List<int> localized = OnlineCleaner.ParseNumbers(test, Culture.Chinese);
+            List<int> localized = StringCleaner.ParseNumbers(test, Culture.Chinese);
 
             Assert.Single(localized);
             Assert.Equal(915, localized[0]);
diff --git a/Beam.Tests/SouceLinkBuilder.Tests.cs b/Beam.Tests/SouceLinkBuilder.Tests.cs
index d5f657a..e433e79 100644
--- a/Beam.Tests/SouceLinkBuilder.Tests.cs
+++ b/Beam.Tests/SouceLinkBuilder.Tests.cs
@@ -3,35 +3,36 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Beam.Data;
 
 namespace Beam.Tests {
     public class SouceLinkBuilder {
         [Fact]
         public void ShouldConstruct_NoErrors() {
-            _ = new SourceLinkBuilder("example.com");
+            _ = new LinkBuilder("example.com");
         }
         [Fact]
         public void ShouldBuild_NoErrors() {
-            _ = new SourceLinkBuilder("example.com").Build();
+            _ = new LinkBuilder("example.com").Build();
         }
         [Fact]
         public void ShouldBuild_Correctly() {
-            var k = new SourceLinkBuilder("example.com");
+            var k = new LinkBuilder("example.com");
             Assert.NotNull(k);
             var link = k.Build();
-            Assert.Equal("https://example.com/", link.Link.ToString()); // trailing slash for RFC standardization stuff
+            Assert.Equal("https://example.com/", link); // trailing slash for RFC standardization stuff
         }
         [Fact]
         public void ShouldBuild_SegmentAddsCorrectly() {
-            var k = new SourceLinkBuilder("example.com");
+            var k = new LinkBuilder("example.com");
             Assert.NotNull(k);
             k.AddSegment("folder1");
             var link = k.Build();
-            Assert.Equal("https://example.com/folder1", link.Link.ToString());
+            Assert.Equal("https://example.com/folder1", link);
         }
         [Fact]
         public void ShouldThrow_EmptySegmentsDisallowed() {
-            var k = new SourceLinkBuilder("example.com");
+            var k = new LinkBuilder("example.com");
             Assert.NotNull(k);
             Assert.Throws<ArgumentException>(() => {
                 k.AddSegment("");
@@ -41,7 +42,7 @@ namespace Beam.Tests {
         [InlineData("folder1", "folder2", "folder3")]
         [InlineData("f1", "f5", "f6")]
         public void ShouldBuild_MultipleSegmentsCorrect(params string[] segments) {
-            var k = new SourceLinkBuilder("example.com");
+            var k = new LinkBuilder("example.com");
             Assert.NotNull(k);
             foreach (var segment in segments) {
                 k.AddSegment(segment);
@@ -58,34 +59,34 @@ namespace Beam.Tests {
 
             var link = k.Build();
 
-            Assert.Equal(builder.ToString(), link.Link.ToString());
+            Assert.Equal(builder.ToString(), link);
         }
         [Fact]
         public void ShouldBuild_SingleParameterCorrect() {
-            var k = new SourceLinkBuilder("example.com");
+            var k = new LinkBuilder("example.com");
             Assert.NotNull(k);
             k.AddSegment("f1");
             k.AddParameters(0, "?q=");
             var link = k.Build("foo");
-            Assert.Equal("https://example.com/f1?q=foo", link.Link.ToString());
+            Assert.Equal("https://example.com/f1?q=foo", link);
         }
         [Fact]
         public void ShouldBuild_MultiParameterCorrect() {
-            var k = new SourceLinkBuilder("example.com");
+            var k = new LinkBuilder("example.com");
             Assert.NotNull(k);
             k.AddSegment("f1");
             k.AddParameters(0, "?q=", "?m=");
             var link = k.Build("foo", "bar");
-            Assert.Equal("https://example.com/f1?q=foo?m=bar", link.Link.ToString());
+            Assert.Equal("https://example.com/f1?q=foo?m=bar", link);
         }
         [Fact]
         public void ShouldBuild_MultiParameterCorrectWithSuffix() {
-            var k = new SourceLinkBuilder("example.com");
+            var k = new LinkBuilder("example.com");
             Assert.NotNull(k);
             k.AddSegment("f1", "&");
             k.AddParameters(0, "?q=", "?m=");
             var link = k.Build("foo", "bar");
-            Assert.Equal("https://example.com/f1?q=foo&?m=bar", link.Link.ToString());
+            Assert.Equal("https://example.com/f1?q=foo&?m=bar", link);
         }
 
     }
diff --git a/Beam.sln b/Beam.sln
index 52d4ac6..f25e1c1 100644
--- a/Beam.sln
+++ b/Beam.sln
@@ -23,6 +23,16 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Beam.Fluent", "Beam.Fluent\
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Beam.Models", "Beam.Models\Beam.Models.csproj", "{DD98868D-D1CA-4B6F-AC0F-4ADCBCD6DAD1}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Beam.Api", "Beam.Api\Beam.Api.csproj", "{F649DA9C-FEE6-4730-A1C2-67B4FB899337}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Beam.Abstractions", "Beam.Abstractions\Beam.Abstractions.csproj", "{69E7AC2B-19DA-4D3E-B03C-0349EB7C9C0B}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Beam.Exceptions", "Beam.Exceptions\Beam.Exceptions.csproj", "{D3EF0A3E-AA2A-497E-AE77-617591CA9D1A}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Beam.Downloaders", "Beam.Downloaders\Beam.Downloaders.csproj", "{B61296C0-D816-4C33-BAF6-9B662B8EE598}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Beam.Data", "Beam.Data\Beam.Data.csproj", "{99F5026F-180D-46DC-96BF-B3CCE21C2E90}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -69,6 +79,26 @@ Global
 		{DD98868D-D1CA-4B6F-AC0F-4ADCBCD6DAD1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{DD98868D-D1CA-4B6F-AC0F-4ADCBCD6DAD1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DD98868D-D1CA-4B6F-AC0F-4ADCBCD6DAD1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F649DA9C-FEE6-4730-A1C2-67B4FB899337}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F649DA9C-FEE6-4730-A1C2-67B4FB899337}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F649DA9C-FEE6-4730-A1C2-67B4FB899337}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F649DA9C-FEE6-4730-A1C2-67B4FB899337}.Release|Any CPU.Build.0 = Release|Any CPU
+		{69E7AC2B-19DA-4D3E-B03C-0349EB7C9C0B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{69E7AC2B-19DA-4D3E-B03C-0349EB7C9C0B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{69E7AC2B-19DA-4D3E-B03C-0349EB7C9C0B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{69E7AC2B-19DA-4D3E-B03C-0349EB7C9C0B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D3EF0A3E-AA2A-497E-AE77-617591CA9D1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D3EF0A3E-AA2A-497E-AE77-617591CA9D1A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D3EF0A3E-AA2A-497E-AE77-617591CA9D1A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D3EF0A3E-AA2A-497E-AE77-617591CA9D1A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B61296C0-D816-4C33-BAF6-9B662B8EE598}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B61296C0-D816-4C33-BAF6-9B662B8EE598}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B61296C0-D816-4C33-BAF6-9B662B8EE598}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B61296C0-D816-4C33-BAF6-9B662B8EE598}.Release|Any CPU.Build.0 = Release|Any CPU
+		{99F5026F-180D-46DC-96BF-B3CCE21C2E90}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{99F5026F-180D-46DC-96BF-B3CCE21C2E90}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{99F5026F-180D-46DC-96BF-B3CCE21C2E90}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{99F5026F-180D-46DC-96BF-B3CCE21C2E90}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Beam/ArticleData.cs b/Beam/ArticleData.cs
deleted file mode 100644
index 766ee58..0000000
--- a/Beam/ArticleData.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Text.Json;
-using System.Text.Json.Serialization;
-using System.Threading.Tasks;
-
-namespace Beam {
-    public record class ArticleData : IDocumentMetaData {
-        public string? Name { get; set; }
-        public string[] Authors { get; set; } = [];
-        public string? Language { get; set; }
-        public string[] Categories { get; set; } = [];
-        public string? Version { get; set; }
-        public string? Description { get; set; }
-
-        public string AsJson(JsonSerializerOptions? options = null) {
-            return JsonSerializer.Serialize(this, options);
-        }
-    }
-}
diff --git a/Beam/Beam.csproj b/Beam/Beam.csproj
index 27c6068..8be583c 100644
--- a/Beam/Beam.csproj
+++ b/Beam/Beam.csproj
@@ -13,6 +13,7 @@
         <PackageReference Include="System.Linq.Async" Version="6.0.1" />
     </ItemGroup>
     <ItemGroup>
-
+      <ProjectReference Include="..\Beam.Dynamic\Beam.Dynamic.csproj" />
+      <ProjectReference Include="..\Beam.Models\Beam.Models.csproj" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Beam/ConstantStateChanger.cs b/Beam/ConstantStateChanger.cs
deleted file mode 100644
index 72a1480..0000000
--- a/Beam/ConstantStateChanger.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Beam {
-    public class ConstantStateChanger : IStateChangeBehaviour {
-        public void Apply(State state, object stimulus) {
-            return;
-        }
-    }
-}
diff --git a/Beam/DownloadEnumerable.cs b/Beam/DownloadEnumerable.cs
index 2855e84..053fc8a 100644
--- a/Beam/DownloadEnumerable.cs
+++ b/Beam/DownloadEnumerable.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Beam.Models;
 
 namespace Beam {
     public class DownloadEnumerable<T>(IAsyncEnumerator<Ordered<T>> download) : IAsyncEnumerable<Ordered<T>> {
diff --git a/Beam/DownloadReport.cs b/Beam/DownloadReport.cs
deleted file mode 100644
index 1dfdf51..0000000
--- a/Beam/DownloadReport.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace Beam {
-    public struct DownloadReport {
-
-    }
-
-}
diff --git a/Beam/IAsyncEnumeratorExtensions.cs b/Beam/IAsyncEnumeratorExtensions.cs
index bed95ce..23e3d10 100644
--- a/Beam/IAsyncEnumeratorExtensions.cs
+++ b/Beam/IAsyncEnumeratorExtensions.cs
@@ -1,4 +1,6 @@
-namespace Beam {
+using Beam.Models;
+
+namespace Beam {
     public static class IAsyncEnumeratorExtensions {
         public static async IAsyncEnumerator<T> UnwrapFragmented<T>(this IAsyncEnumerator<Fragment<T>> fragmented) {
             if (fragmented is null)
diff --git a/Beam/IDocument.cs b/Beam/IDocument.cs
deleted file mode 100644
index 1f2f626..0000000
--- a/Beam/IDocument.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using aeqw89.DataKeys;
-using System.Diagnostics.CodeAnalysis;
-
-namespace Beam {
-    public interface IDocument {
-        /// <summary>
-        /// The file name of the document. Must be valid in both <c>UNIX</c>, 
-        /// <c>WINDOWS</c>, <c>APPLE</c>, and <c>ANDROID</c> file systems.
-        /// </summary>
-        string Filename { get; }
-
-        /// <summary>
-        /// Additional descriptive data
-        /// </summary>
-        Dictionary<DataKey<IDocumentMetaData>, IDocumentMetaData> MetaData { get; }
-
-        /// <summary>
-        /// Retrieves the binary representation for the <see cref="IDocument"/>
-        /// </summary>
-        /// <returns>Binary representation of the <see cref="IDocument"/></returns>
-        byte[] ToBytes();
-
-        /// <summary>
-        /// Retrieves the string representation for the <see cref="IDocument"/>
-        /// </summary>
-        /// <returns>String representation of the <see cref="IDocument"/></returns>
-        string ToString();
-    }
-}
diff --git a/Beam/IDocumentExtensions.cs b/Beam/IDocumentExtensions.cs
deleted file mode 100644
index 4d4bed4..0000000
--- a/Beam/IDocumentExtensions.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-using System.Diagnostics.CodeAnalysis;
-
-namespace Beam {
-    public static class IDocumentExtensions {
-
-    }
-}
diff --git a/Beam/IDocumentMetaData.cs b/Beam/IDocumentMetaData.cs
deleted file mode 100644
index 8242348..0000000
--- a/Beam/IDocumentMetaData.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-using System.Text.Json;
-
-namespace Beam {
-    public interface IDocumentMetaData {
-        string AsJson(JsonSerializerOptions? options = null);
-    }
-}
\ No newline at end of file
diff --git a/Beam/IDocumentSourceLinkFactory.cs b/Beam/IDocumentSourceLinkFactory.cs
index feaeef9..4741103 100644
--- a/Beam/IDocumentSourceLinkFactory.cs
+++ b/Beam/IDocumentSourceLinkFactory.cs
@@ -1,8 +1,10 @@
-namespace Beam {
+using Beam.Models;
+
+namespace Beam {
     internal interface IDocumentSourceLinkFactory {
-        SourceLink GetNextLink(SourceLink current);
-        SourceLink GetPrecedingLink(SourceLink current);
-        SourceLink GetArbitraryLink(SourceLink current, int offset) => offset switch {
+        string GetNextLink(string current);
+        string GetPrecedingLink(string current);
+        string GetArbitraryLink(string current, int offset) => offset switch {
             0 => current,
             > 0 => GetArbitraryLink(GetNextLink(current), offset - 1),
             < 0 => GetArbitraryLink(GetPrecedingLink(current), offset + 1)
diff --git a/Beam/IStateChangeBehaviour.cs b/Beam/IStateChangeBehaviour.cs
deleted file mode 100644
index 8fd823d..0000000
--- a/Beam/IStateChangeBehaviour.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace Beam {
-    /// <summary>
-    /// Defines how a url template should should be updated, in what order, and by how much
-    /// </summary>
-    public interface IStateChangeBehaviour {
-        public void Apply(State state, object stimulus);
-    }
-}
diff --git a/Beam/IUnitDownloader.cs b/Beam/IUnitDownloader.cs
deleted file mode 100644
index 443b5ea..0000000
--- a/Beam/IUnitDownloader.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace Beam {
-    public interface IUnitDownloader<T> {
-        public int LinksPerDownload { get; }
-        public Task<(bool, T?)> TryDownload(Ordered<string>[] link, CancellationToken ct, int maximumRetryCount = 7, IProgress<RetryReport>? tryProgress = null);
-    }
-}
\ No newline at end of file
diff --git a/Beam/Ordered.cs b/Beam/Ordered.cs
deleted file mode 100644
index e096725..0000000
--- a/Beam/Ordered.cs
+++ /dev/null
@@ -1,3 +0,0 @@
-namespace Beam {
-    public record Ordered<T>(T Data, int Order);
-}
diff --git a/Beam/OrderedLinkGenerator.cs b/Beam/OrderedLinkGenerator.cs
new file mode 100644
index 0000000..ad80a74
--- /dev/null
+++ b/Beam/OrderedLinkGenerator.cs
@@ -0,0 +1,63 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Beam.Abstractions;
+using Beam.Dynamic;
+using Beam.Models;
+
+namespace Beam {
+    //public delegate string LinkGenerator(params object[] ps);
+    //public delegate object Incrementor(object obj, int amount);
+
+    public class OrderedLinkGenerator : IEnumerator<string?> {
+        public ILinkBuilder Builder { get; set; }
+        public NumberedStateChanger Behaviour { get; }
+        
+        private IState? EndState;
+        private IState InitialState;
+
+        public OrderedLinkGenerator(ILinkBuilder builder, NumberedStateChanger behaviour, params string[] initialState) 
+            : this(builder, behaviour, new State(initialState)) { }
+        public OrderedLinkGenerator(ILinkBuilder builder, NumberedStateChanger behaviour, IState initialState, IState? endState = null) {
+            Builder = builder;
+            Behaviour = behaviour;
+            InitialState = initialState.Copy();
+            EndState = endState?.Copy();
+            State = InitialState.Copy();
+
+            Reset();
+        }
+
+        public IState State { get; set; }
+        public string? Current { get; private set; }
+
+        object? IEnumerator.Current => Current;
+
+        public void Dispose() {
+            GC.SuppressFinalize(this);
+            return;
+        }
+
+        public bool MoveNext() {
+            if (string.IsNullOrWhiteSpace(Current) || (EndState is not null && State.GetState().SequenceEqual(EndState.GetState()))) {
+                Current = null;
+                return false;
+            }
+            
+            Behaviour.Apply(State, 1);
+            Current = Builder.Build(State);
+            
+            return !string.IsNullOrWhiteSpace(Current) && (EndState is null || !State.GetState().SequenceEqual(EndState.GetState()));
+        }
+
+        public void Reset() {
+            State = InitialState.Copy();
+            Behaviour.Apply(State, -1);
+            Current = Builder.Build(State);
+        }
+    }
+}
diff --git a/Beam/OrderedSourceLinkGenerator.cs b/Beam/OrderedSourceLinkGenerator.cs
deleted file mode 100644
index 6165860..0000000
--- a/Beam/OrderedSourceLinkGenerator.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Beam {
-    //public delegate SourceLink LinkGenerator(params object[] ps);
-    //public delegate object Incrementor(object obj, int amount);
-
-    public class OrderedSourceLinkGenerator : IEnumerator<SourceLink> {
-        public SourceLinkBuilder Builder { get; set; }
-        public NumberedStateChanger Behaviour { get; }
-        
-        private State? EndState;
-        private State InitialState;
-
-        public OrderedSourceLinkGenerator(SourceLinkBuilder builder, NumberedStateChanger behaviour, params string[] initialState) 
-            : this(builder, behaviour, new State(initialState)) { }
-        public OrderedSourceLinkGenerator(SourceLinkBuilder builder, NumberedStateChanger behaviour, State initialState, State? endState = null) {
-            Builder = builder;
-            Behaviour = behaviour;
-            InitialState = initialState.Copy();
-            EndState = endState?.Copy();
-            State = InitialState.Copy();
-
-            Reset();
-        }
-
-        public State State { get; set; }
-        public SourceLink Current { get; private set; }
-
-        object IEnumerator.Current => Current;
-
-        public void Dispose() {
-            return;
-        }
-
-        public bool MoveNext() {
-            if (!Current.HasValue || (EndState is not null && State.GetState().SequenceEqual(EndState.GetState()))) {
-                Current = SourceLink.InvalidLink;
-                return false;
-            }
-            Behaviour.Apply(State, 1);
-            Current = Builder.Build(State);
-            if (!Current.HasValue || (EndState is not null && State.GetState().SequenceEqual(EndState.GetState()))) {
-                return false;
-            }
-            return Current.HasValue;
-        }
-
-        public void Reset() {
-            State = InitialState.Copy();
-            Behaviour.Apply(State, -1);
-            Current = Builder.Build(State);
-        }
-    }
-}
diff --git a/Beam/S.cs b/Beam/S.cs
index 2705628..faf3545 100644
--- a/Beam/S.cs
+++ b/Beam/S.cs
@@ -7,28 +7,8 @@ using System.Threading.Tasks;
 namespace Beam {
     internal class S {
 
-        [Serializable]
-        public class MapException : ArgumentException {
-            public MapException() { }
-            public MapException(string message) : base(message) { }
-            public MapException(string message, Exception inner) : base(message, inner) { }
-            protected MapException(
-              System.Runtime.Serialization.SerializationInfo info,
-              System.Runtime.Serialization.StreamingContext context) : base(info, context) { }
-        }
 
-        /// <summary>
-        /// The kind of exception that should never happen
-        /// </summary>
-        [Serializable]
-        public class AssertionException : Exception {
-            public AssertionException() { }
-            public AssertionException(string message) : base(message) { }
-            public AssertionException(string message, Exception inner) : base(message, inner) { }
-            protected AssertionException(
-              System.Runtime.Serialization.SerializationInfo info,
-              System.Runtime.Serialization.StreamingContext context) : base(info, context) { }
-        }
+
 
         public class M {
             public const string MapDoesNotMatchArgs = "Error; Map contains indicies that exceed the argument list passed.";
diff --git a/Beam/SourceLink.cs b/Beam/SourceLink.cs
deleted file mode 100644
index c1a5e9d..0000000
--- a/Beam/SourceLink.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Beam {
-    public readonly struct SourceLink(string link) {
-        private readonly string Link_ { get; } = link;
-        public readonly Uri Link => new(Link_);
-
-        public bool HasValue => !string.IsNullOrWhiteSpace(Link_);
-
-        public static SourceLink InvalidLink { get; } = new("invalid://link");
-
-        public static bool operator ==(SourceLink lhs, SourceLink rhs) {
-            if (lhs.HasValue && rhs.HasValue)
-                return lhs.Link == rhs.Link;
-            else
-                return lhs.Link_ == rhs.Link_;
-        }
-        public static bool operator !=(SourceLink lhs, SourceLink rhs) {
-            if (lhs.HasValue && rhs.HasValue)
-                return lhs.Link != rhs.Link;
-            else
-                return lhs.Link_ != rhs.Link_;
-        }
-
-        public override bool Equals(object? obj) {
-            return GetHashCode() == obj?.GetHashCode();
-        }
-
-        public override int GetHashCode() {
-            return Link.GetHashCode();
-        }
-    }
-}
diff --git a/Beam/SourceLinkEnumerable.cs b/Beam/SourceLinkEnumerable.cs
deleted file mode 100644
index 4895ceb..0000000
--- a/Beam/SourceLinkEnumerable.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Beam {
-    public class SourceLinkEnumerable : IEnumerable<SourceLink> {
-        private SourceLinkEnumerable(IEnumerator<SourceLink> enumerator) {
-            Enumerator = enumerator;
-        }
-
-        public IEnumerator<SourceLink> Enumerator { get; }
-
-        public static SourceLinkEnumerable FromGenerator(IEnumerator<SourceLink> generator)
-            => new SourceLinkEnumerable(generator);
-
-        public IEnumerator<SourceLink> GetEnumerator() {
-            return Enumerator;
-        }
-
-        IEnumerator IEnumerable.GetEnumerator() {
-            return Enumerator;
-        }
-    }
-}
diff --git a/Beam/StringEnumerable.cs b/Beam/StringEnumerable.cs
new file mode 100644
index 0000000..3a06438
--- /dev/null
+++ b/Beam/StringEnumerable.cs
@@ -0,0 +1,22 @@
+using System.Collections;
+
+namespace Beam {
+    public class StringEnumerable : IEnumerable<string> {
+        private StringEnumerable(IEnumerator<string> enumerator) {
+            Enumerator = enumerator;
+        }
+
+        public IEnumerator<string> Enumerator { get; }
+
+        public static StringEnumerable FromGenerator(IEnumerator<string> generator)
+            => new StringEnumerable(generator);
+
+        public IEnumerator<string> GetEnumerator() {
+            return Enumerator;
+        }
+
+        IEnumerator IEnumerable.GetEnumerator() {
+            return Enumerator;
+        }
+    }
+}
diff --git a/aeqw89.Beam/aeqw89.Beam.csproj b/aeqw89.Beam/aeqw89.Beam.csproj
index d363d96..670e1b9 100644
--- a/aeqw89.Beam/aeqw89.Beam.csproj
+++ b/aeqw89.Beam/aeqw89.Beam.csproj
@@ -62,10 +62,22 @@
             <PackagePath>lib\$(TargetFramework)\</PackagePath>
             <Pack>true</Pack>
         </Content>
+        <Content Include="..\Beam.Fluent\bin\$(Configuration)\$(TargetFramework)\Beam.Fluent.dll">
+            <PackagePath>lib\$(TargetFramework)</PackagePath>
+            <Pack>true</Pack>
+        </Content>
+        <Content Include="..\Beam.Models\bin\$(Configuration)\$(TargetFramework)\Beam.Models.dll">
+            <PackagePath>lib\$(TargetFramework)</PackagePath>
+            <Pack>true</Pack>
+        </Content>
         <Content Include="..\Beam.Temporary.Cli\bin\$(Configuration)\$(TargetFramework)\HtmlAgilityPack.dll">
             <PackagePath>lib\$(TargetFramework)\</PackagePath>
             <Pack>true</Pack>
         </Content>
+        <Content Include="..\Beam.Api\bin\$(Configuration)\$(TargetFramework)\Beam.Api.dll">
+            <PackagePath>lib\$(TargetFramework)</PackagePath>
+            <Pack>true</Pack>
+        </Content>
         <PackageReference Include="HtmlAgilityPack" Version="1.11.72">
             <PrivateAssets />
             <Transitive>true</Transitive>
@@ -84,7 +96,7 @@
         </PackageReference>
     </ItemGroup>
     <ItemGroup>
-        <PackageReference Include="aeqw89.PersistentData" Version="1.1.0">
+        <PackageReference Include="aeqw89.PersistentData" Version="1.3.3">
             <PrivateAssets />
             <Transitive>true</Transitive>
         </PackageReference>