fix: Add json config sources before env vars and cmd line sources

So environment variables override json files (if there is a conflict),
and command line args override everything else.

.devcontainer/devcontainer.json

@@ -22,6 +22,7 @@
       "extensions": [
         "eamodio.gitlens",
         "llvm-vs-code-extensions.vscode-clangd",
+        "ms-python.python",
         "ms-vscode.cmake-tools",
         "ms-vscode.cpptools",
         "xaver.clang-format"

.editorconfig

@@ -207,17 +207,23 @@ dotnet_naming_symbols.parameters.applicable_accessibilities = public,internal,pr
 dotnet_naming_symbols.private_symbols.applicable_kinds = property,method,field,event,delegate
 dotnet_naming_symbols.private_symbols.applicable_accessibilities = protected,private
 
+# local symbols
+dotnet_naming_symbols.local_symbols.applicable_kinds = local
+
+# parameter symbols
+dotnet_naming_symbols.parameter_symbols.applicable_kinds = parameter
+
 # Naming styles
 
-dotnet_naming_style.snake_case.required_prefix =
-dotnet_naming_style.snake_case.required_suffix =
-dotnet_naming_style.snake_case.word_separator = _
-dotnet_naming_style.snake_case.capitalization = all_lower
+dotnet_naming_style.pascal_case.required_prefix =
+dotnet_naming_style.pascal_case.required_suffix =
+dotnet_naming_style.pascal_case.word_separator =
+dotnet_naming_style.pascal_case.capitalization = pascal_case
 
-dotnet_naming_style.private_snake_case.required_prefix = _
-dotnet_naming_style.private_snake_case.required_suffix =
-dotnet_naming_style.private_snake_case.word_separator = _
-dotnet_naming_style.private_snake_case.capitalization = all_lower
+dotnet_naming_style.camel_case.required_prefix =
+dotnet_naming_style.camel_case.required_suffix =
+dotnet_naming_style.camel_case.word_separator =
+dotnet_naming_style.camel_case.capitalization = camel_case
 
 dotnet_naming_style.user_types.required_prefix =
 dotnet_naming_style.user_types.required_suffix =
@@ -229,6 +235,10 @@ dotnet_naming_style.interface.required_suffix =
 dotnet_naming_style.interface.word_separator =
 dotnet_naming_style.interface.capitalization = pascal_case
 
+dotnet_naming_style.local.capitalization = camel_case
+
+dotnet_naming_style.parameter.capitalization = camel_case
+
 # rules
 dotnet_naming_rule.user_types.symbols = user_types
 dotnet_naming_rule.user_types.style = user_types
@@ -238,14 +248,18 @@ dotnet_naming_rule.interfaces.symbols = interface
 dotnet_naming_rule.interfaces.style = interface_style
 dotnet_naming_rule.interfaces.severity = suggestion
 
-dotnet_naming_rule.public_members_snake_case.symbols = public_symbols
-dotnet_naming_rule.public_members_snake_case.style = snake_case
-dotnet_naming_rule.public_members_snake_case.severity = suggestion
+dotnet_naming_rule.public_members.symbols = public_symbols
+dotnet_naming_rule.public_members.style = pascal_case
+dotnet_naming_rule.public_members.severity = suggestion
 
-dotnet_naming_rule.private_members_snake_case.symbols = private_symbols
-dotnet_naming_rule.private_members_snake_case.style = private_snake_case
-dotnet_naming_rule.private_members_snake_case.severity = suggestion
+dotnet_naming_rule.private_members.symbols = private_symbols
+dotnet_naming_rule.private_members.style = camel_case
+dotnet_naming_rule.private_members.severity = suggestion
 
-dotnet_naming_rule.parameters.symbols = parameters
-dotnet_naming_rule.parameters.style = snake_case
+dotnet_naming_rule.variables_are_camel_case.severity = suggestion
+dotnet_naming_rule.variables_are_camel_case.symbols = local_symbols
+dotnet_naming_rule.variables_are_camel_case.style = local
+
+dotnet_naming_rule.parameters.symbols = parameter_symbols
+dotnet_naming_rule.parameters.style = parameter
 dotnet_naming_rule.parameters.severity = suggestion

.env

@@ -46,4 +46,11 @@ SPARKD__SIM_FIX_PORT=8002
 SPARKD__SHM_SIZE=4gb
 SPARKD__PYTHON_REQUIREMENTS=requirements.txt
 
+### PubSubServer ###
+PUBSUB__CONFIG_DIR=src/DataStreamSuite/PubSubServer/Configurations/Development
+PUBSUB__SOURCE_DIR=build/Release/bin/net8.0/linux-x64/publish
+
+### MdPublisher ###
+MD_PUBLISHER__CONFIG_DIR=src/DataStreamSuite/DataStreamPublisher/Configurations/ReplayMarketData
+MD_PUBLISHER__SOURCE_DIR=build/Release/bin/net8.0/linux-x64/publish
 # TODO: add config for other services (pubsub, md-publisher, webapp, api-server, etc.)

.gitignore

@@ -55,6 +55,8 @@ trace_data/
 .cache/
 /src/Spark.Admin.WebApp/tsconfig.*.g.json
 /src/Spark.Admin.WebApp/src/bin/
+/src/**/*appsettings.Local.json
+/src/**/*/Configurations/Local/
 **/CMakeDeps.cmake
 **/CMakeDeps_win.cmake
 .devcontainer/

.vscode/launch.json

@@ -14,6 +14,49 @@
       "type": "coreclr",
       "request": "attach"
     },
+    {
+      "name": "Api Server",
+      "type": "coreclr",
+      "request": "launch",
+      "program": "",
+      "preLaunchTask": "Build Api Server (Debug)",
+      "windows": {
+        "program": "spark_api_server.exe",
+      },
+      "linux": {
+        "program": "spark_api_server",
+      },
+      "args": [
+        "run",
+      ],
+      "cwd": "build/Debug/bin/net8.0",
+      "env": {
+        "DOTNET_ENVIRONMENT": "${input:apiServerEnvironment}",
+      },
+      "stopAtEntry": false,
+      "console": "integratedTerminal"
+    },
+    {
+      "name": "Api Server (Skip Build)",
+      "type": "coreclr",
+      "request": "launch",
+      "program": "",
+      "windows": {
+        "program": "spark_api_server.exe",
+      },
+      "linux": {
+        "program": "spark_api_server",
+      },
+      "args": [
+        "run",
+      ],
+      "cwd": "build/Debug/bin/net8.0",
+      "env": {
+        "DOTNET_ENVIRONMENT": "${input:apiServerEnvironment}",
+      },
+      "stopAtEntry": false,
+      "console": "integratedTerminal"
+    },
     {
       "name": "DataStreamPublisher",
       "type": "coreclr",
@@ -26,11 +69,28 @@
       "windows": {
         "program": "DataStreamPublisher.exe",
       },
-      "args": [
-        "--config",
-        "${workspaceFolder}/src/DataStreamSuite/DataStreamPublisher/Configurations/${input:dataStreamPublisherConfig}.json"
-      ],
       "cwd": "build/Debug/bin/net8.0",
+      "env": {
+        "DOTNET_ENVIRONMENT": "${input:dataStreamPublisherEnvironment}",
+      },
+      "stopAtEntry": false,
+      "console": "integratedTerminal"
+    },
+    {
+      "name": "DataStreamPublisher (Skip Build)",
+      "type": "coreclr",
+      "request": "launch",
+      "program": "",
+      "linux": {
+        "program": "DataStreamPublisher",
+      },
+      "windows": {
+        "program": "DataStreamPublisher.exe",
+      },
+      "cwd": "${workspaceFolder}/build/Debug/bin/net8.0",
+      "env": {
+        "DOTNET_ENVIRONMENT": "${input:dataStreamPublisherEnvironment}",
+      },
       "stopAtEntry": false,
       "console": "integratedTerminal"
     },
@@ -118,6 +178,61 @@
       "stopAtEntry": false,
       "console": "integratedTerminal"
     },
+    {
+      "name": "PubSubServer (Skip Build)",
+      "type": "coreclr",
+      "request": "launch",
+      "program": "",
+      "linux": {
+        "program": "PubSubServer",
+      },
+      "windows": {
+        "program": "PubSubServer.exe",
+      },
+      "cwd": "build/Debug/bin/net8.0",
+      "env": {
+        "DOTNET_ENVIRONMENT": "${input:pubSubServerEnvironment}",
+      },
+      "stopAtEntry": false,
+      "console": "integratedTerminal"
+    },
+    {
+      "name": "Sdk Demo",
+      "type": "coreclr",
+      "request": "launch",
+      "program": "",
+      "preLaunchTask": "Build Api Server (Debug)",
+      "windows": {
+        "program": "Bts.Spark.Sdk.Demo.exe",
+      },
+      "linux": {
+        "program": "Bts.Spark.Sdk.Demo",
+      },
+      "cwd": "build/Debug/bin/net8.0",
+      "env": {
+        "DOTNET_ENVIRONMENT": "${input:sdkDemoEnvironment}",
+      },
+      "stopAtEntry": false,
+      "console": "integratedTerminal"
+    },
+    {
+      "name": "Sdk Demo (Skip Build)",
+      "type": "coreclr",
+      "request": "launch",
+      "program": "",
+      "windows": {
+        "program": "Bts.Spark.Sdk.Demo.exe",
+      },
+      "linux": {
+        "program": "Bts.Spark.Sdk.Demo.exe",
+      },
+      "cwd": "build/Debug/bin/net8.0",
+      "env": {
+        "DOTNET_ENVIRONMENT": "${input:sdkDemoEnvironment}",
+      },
+      "stopAtEntry": false,
+      "console": "integratedTerminal"
+    },
     {
       "name": "Spark",
       "type": "coreclr",
@@ -127,6 +242,9 @@
         "preLaunchTask": "Build Spark (Debug)",
         "program": "Spark.exe",
         "cwd": "build/Debug/bin/net8.0-windows",
+        "env": {
+          "DOTNET_ENVIRONMENT": "${input:sparkEnvironment}",
+        }
       },
       "stopAtEntry": false,
       "console": "integratedTerminal"
@@ -139,6 +257,9 @@
       "windows": {
         "program": "Spark.exe",
         "cwd": "build/Debug/bin/net8.0-windows",
+        "env": {
+          "DOTNET_ENVIRONMENT": "${input:sparkEnvironment}",
+        }
       },
       "stopAtEntry": false,
       "console": "integratedTerminal"
@@ -200,6 +321,7 @@
       "program": "",
       "linux": {
         "program": "${workspaceFolder}/build/sparkd-debug-clang/src/app_sparkd/sparkd",
+        "preLaunchTask": "Build Sparkd (Debug | Clang)",
       },
       "args": [
         "run"
@@ -251,6 +373,17 @@
     },
   ],
   "inputs": [
+    {
+      "id": "apiServerEnvironment",
+      "type": "pickString",
+      "description": "Api Server Configuration",
+      "options": [
+        "Development",
+        "Local",
+        "Staging",
+      ],
+      "default": "Development",
+    },
     {
       "id": "dataStreamPublisherConfig",
       "type": "pickString",
@@ -263,6 +396,16 @@
       ],
       "default": "MarketDataPublisher",
     },
+    {
+      "id": "dataStreamPublisherEnvironment",
+      "type": "pickString",
+      "description": "DataStreamPublisher Configuration",
+      "options": [
+        "Local",
+        "ReplayMarketData",
+      ],
+      "default": "Local",
+    },
     {
       "id": "pubSubServerConfig",
       "type": "pickString",
@@ -273,12 +416,33 @@
       ],
       "default": "PubSubServer",
     },
+    {
+      "id": "sdkDemoEnvironment",
+      "type": "pickString",
+      "description": "Sdk Demo Configuration",
+      "options": [
+        "Development",
+        "Local",
+        "Staging",
+      ],
+      "default": "Development",
+    },
     {
       "id": "sparkConfigServer",
       "type": "promptString",
       "description": "Config Server URL",
       "default": "http://localhost:8000/config",
     },
+    {
+      "id": "sparkEnvironment",
+      "type": "pickString",
+      "description": "Spark Configuration",
+      "options": [
+        "Development",
+        "Local",
+      ],
+      "default": "Development",
+    },
     {
       "id": "sparkTest",
       "type": "promptString",

.vscode/tasks.json

@@ -172,6 +172,66 @@
         "color": "terminal.ansiCyan"
       },
     },
+    {
+      "label": "Build Spark Sdk",
+      "group": "build",
+      "type": "process",
+      "command": "",
+      "linux": {
+        "command": "tools/build_spark_sdk.sh",
+      },
+      "windows": {
+        "command": "tools/build_spark_sdk.cmd",
+      },
+      "args": [
+        "--configuration",
+        "${input:buildConfiguration}",
+      ],
+      "icon": {
+        "id": "terminal",
+        "color": "terminal.ansiCyan"
+      },
+    },
+    {
+      "label": "Build Spark Sdk (Debug)",
+      "group": "build",
+      "type": "process",
+      "command": "",
+      "linux": {
+        "command": "tools/build_spark_sdk.sh",
+      },
+      "windows": {
+        "command": "tools/build_spark_sdk.cmd",
+      },
+      "args": [
+        "--configuration",
+        "Debug",
+      ],
+      "icon": {
+        "id": "terminal",
+        "color": "terminal.ansiCyan"
+      },
+    },
+    {
+      "label": "Build Spark Sdk (Release)",
+      "group": "build",
+      "type": "process",
+      "command": "",
+      "windows": {
+        "command": "tools/build_spark_sdk.cmd",
+      },
+      "linux": {
+        "command": "tools/build_spark_sdk.sh",
+      },
+      "args": [
+        "--configuration",
+        "Release",
+      ],
+      "icon": {
+        "id": "terminal",
+        "color": "terminal.ansiCyan"
+      },
+    },
     {
       "label": "Build Sparkd",
       "group": "build",
@@ -351,6 +411,129 @@
         "id": "wrench"
       },
     },
+    {
+      "label": "Run Api Server",
+      "dependsOn": "Build Api Server",
+      "type": "process",
+      "command": "",
+      "windows": {
+        "command": "spark_api_server.exe",
+      },
+      "linux": {
+        "command": "spark_api_server",
+      },
+      "args": [
+        "run",
+      ],
+      "options": {
+        "cwd": "${workspaceFolder}/build/${input:buildConfiguration}/bin/net8.0",
+        "env": {
+          "DOTNET_ENVIRONMENT": "${input:apiServerEnvironment}",
+        }
+      },
+      "icon": {
+        "id": "run",
+        "color": "terminal.ansiGreen",
+      },
+    },
+    {
+      "label": "Run Api Server (Debug)",
+      "dependsOn": "Build Api Server (Debug)",
+      "type": "process",
+      "command": "",
+      "windows": {
+        "command": "spark_api_server.exe",
+      },
+      "linux": {
+        "command": "spark_api_server",
+      },
+      "args": [
+        "run",
+      ],
+      "options": {
+        "cwd": "${workspaceFolder}/build/Debug/bin/net8.0",
+        "env": {
+          "DOTNET_ENVIRONMENT": "${input:apiServerEnvironment}",
+        }
+      },
+      "icon": {
+        "id": "run",
+        "color": "terminal.ansiGreen",
+      },
+    },
+    {
+      "label": "Run Api Server (Release)",
+      "dependsOn": "Build Api Server (Release)",
+      "type": "process",
+      "command": "",
+      "windows": {
+        "command": "spark_api_server.exe",
+      },
+      "linux": {
+        "command": "spark_api_server",
+      },
+      "args": [
+        "run",
+      ],
+      "options": {
+        "cwd": "${workspaceFolder}/build/Release/bin/net8.0",
+        "env": {
+          "DOTNET_ENVIRONMENT": "${input:apiServerEnvironment}",
+        }
+      },
+      "icon": {
+        "id": "run",
+        "color": "terminal.ansiGreen",
+      },
+    },
+    {
+      "label": "Run Api Server (Debug | Skip Build)",
+      "type": "process",
+      "command": "",
+      "windows": {
+        "command": "spark_api_server.exe",
+      },
+      "linux": {
+        "command": "spark_api_server",
+      },
+      "args": [
+        "run",
+      ],
+      "options": {
+        "cwd": "${workspaceFolder}/build/Debug/bin/net8.0",
+        "env": {
+          "DOTNET_ENVIRONMENT": "${input:apiServerEnvironment}",
+        }
+      },
+      "icon": {
+        "id": "run",
+        "color": "terminal.ansiGreen",
+      },
+    },
+    {
+      "label": "Run Api Server (Release | Skip Build)",
+      "type": "process",
+      "command": "",
+      "windows": {
+        "command": "spark_api_server.exe",
+      },
+      "linux": {
+        "command": "spark_api_server",
+      },
+      "args": [
+        "run",
+      ],
+      "options": {
+        "cwd": "${workspaceFolder}/build/Release/bin/net8.0",
+        "env": {
+          "DOTNET_ENVIRONMENT": "${input:apiServerEnvironment}",
+        }
+      },
+      "icon": {
+        "id": "run",
+        "color": "terminal.ansiGreen",
+      },
+    },
     {
       "label": "Run DataStreamQueryAnalyzer",
       "dependsOn": "Build DataStream",
@@ -422,12 +605,11 @@
       "windows": {
         "command": "DataStreamPublisher.exe",
       },
-      "args": [
-        "--config",
-        "${workspaceFolder}/src/DataStreamSuite/DataStreamPublisher/Configurations/${input:dataStreamPublisherConfig}.json",
-      ],
       "options": {
-        "cwd": "${workspaceFolder}/build/${input:buildConfiguration}/bin/net8.0"
+        "cwd": "${workspaceFolder}/build/${input:buildConfiguration}/bin/net8.0",
+        "env": {
+          "DOTNET_ENVIRONMENT": "${input:dataStreamPublisherEnvironment}",
+        },
       },
       "icon": {
         "id": "run",
@@ -445,12 +627,11 @@
       "windows": {
         "command": "DataStreamPublisher.exe",
       },
-      "args": [
-        "--config",
-        "${workspaceFolder}/src/DataStreamSuite/DataStreamPublisher/Configurations/${input:dataStreamPublisherConfig}.json",
-      ],
       "options": {
-        "cwd": "${workspaceFolder}/build/Debug/bin/net8.0"
+        "cwd": "${workspaceFolder}/build/Debug/bin/net8.0",
+        "env": {
+          "DOTNET_ENVIRONMENT": "${input:dataStreamPublisherEnvironment}",
+        },
       },
       "icon": {
         "id": "run",
@@ -468,12 +649,11 @@
       "windows": {
         "command": "DataStreamPublisher.exe",
       },
-      "args": [
-        "--config",
-        "${workspaceFolder}/src/DataStreamSuite/DataStreamPublisher/Configurations/${input:dataStreamPublisherConfig}.json",
-      ],
       "options": {
-        "cwd": "${workspaceFolder}/build/Release/bin/net8.0"
+        "cwd": "${workspaceFolder}/build/Release/bin/net8.0",
+        "env": {
+          "DOTNET_ENVIRONMENT": "${input:dataStreamPublisherEnvironment}",
+        },
       },
       "icon": {
         "id": "run",
@@ -491,12 +671,11 @@
       "windows": {
         "command": "PubSubServer.exe",
       },
-      "args": [
-        "--config",
-        "${workspaceFolder}/src/DataStreamSuite/PubSubServer/Configurations/${input:pubSubServerConfig}.json",
-      ],
       "options": {
-        "cwd": "${workspaceFolder}/build/${input:buildConfiguration}/bin/net8.0"
+        "cwd": "${workspaceFolder}/build/${input:buildConfiguration}/bin/net8.0",
+        "env": {
+          "DOTNET_ENVIRONMENT": "${input:pubSubServerEnvironment}",
+        },
       },
       "icon": {
         "id": "run",
@@ -514,12 +693,11 @@
       "windows": {
         "command": "PubSubServer.exe",
       },
-      "args": [
-        "--config",
-        "${workspaceFolder}/src/DataStreamSuite/PubSubServer/Configurations/${input:pubSubServerConfig}.json",
-      ],
       "options": {
-        "cwd": "${workspaceFolder}/build/Debug/bin/net8.0"
+        "cwd": "${workspaceFolder}/build/Debug/bin/net8.0",
+        "env": {
+          "DOTNET_ENVIRONMENT": "${input:pubSubServerEnvironment}",
+        },
       },
       "icon": {
         "id": "run",
@@ -536,12 +714,11 @@
       "windows": {
         "command": "PubSubServer.exe",
       },
-      "args": [
-        "--config",
-        "${workspaceFolder}/src/DataStreamSuite/PubSubServer/Configurations/${input:pubSubServerConfig}.json",
-      ],
       "options": {
-        "cwd": "${workspaceFolder}/build/Debug/bin/net8.0"
+        "cwd": "${workspaceFolder}/build/Debug/bin/net8.0",
+        "env": {
+          "DOTNET_ENVIRONMENT": "${input:pubSubServerEnvironment}",
+        },
       },
       "icon": {
         "id": "run",
@@ -559,12 +736,11 @@
       "windows": {
         "command": "PubSubServer.exe",
       },
-      "args": [
-        "--config",
-        "${workspaceFolder}/src/DataStreamSuite/PubSubServer/Configurations/${input:pubSubServerConfig}.json",
-      ],
       "options": {
-        "cwd": "${workspaceFolder}/build/Release/bin/net8.0"
+        "cwd": "${workspaceFolder}/build/Release/bin/net8.0",
+        "env": {
+          "DOTNET_ENVIRONMENT": "${input:pubSubServerEnvironment}",
+        },
       },
       "icon": {
         "id": "run",
@@ -581,12 +757,11 @@
       "windows": {
         "command": "PubSubServer.exe",
       },
-      "args": [
-        "--config",
-        "${workspaceFolder}/src/DataStreamSuite/PubSubServer/Configurations/${input:pubSubServerConfig}.json",
-      ],
       "options": {
-        "cwd": "${workspaceFolder}/build/Release/bin/net8.0"
+        "cwd": "${workspaceFolder}/build/Release/bin/net8.0",
+        "env": {
+          "DOTNET_ENVIRONMENT": "${input:pubSubServerEnvironment}",
+        },
       },
       "icon": {
         "id": "run",
@@ -852,6 +1027,17 @@
     },
   ],
   "inputs": [
+    {
+      "id": "apiServerEnvironment",
+      "type": "pickString",
+      "description": "Api Server Configuration",
+      "options": [
+        "Development",
+        "Local",
+        "Staging",
+      ],
+      "default": "Development",
+    },
     {
       "id": "buildConfiguration",
       "type": "pickString",
@@ -885,26 +1071,30 @@
       "default": "sparkd-debug-clang",
     },
     {
-      "id": "dataStreamPublisherConfig",
+      "id": "dataStreamPublisherEnvironment",
       "type": "pickString",
       "description": "Publisher Configuration",
       "options": [
-        "MarketDataPublisher",
-        "SimpleEchoClient",
-        "SimpleTestDataPublisher",
-        "TestDataPublisher",
+        "Development",
+        "MarketData",
+        "Production",
+        "ProductionAws",
+        "Staging",
       ],
       "default": "MarketDataPublisher",
     },
     {
-      "id": "pubSubServerConfig",
+      "id": "pubSubServerEnvironment",
       "type": "pickString",
       "description": "PubSub Configuration",
       "options": [
-        "PubSubServer",
-        "SimpleEchoClient",
+        "Development",
+        "EchoServer",
+        "Production",
+        "ProductionAws",
+        "Staging",
       ],
-      "default": "PubSubServer",
+      "default": "Development",
     },
     {
       "id": "sparkConfigQuery",

Bts.Spark.Sdk.sln

@@ -0,0 +1,105 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.0.31903.59
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{827E0CD3-B72D-47B6-A68D-7590B98EB39B}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "cs", "cs", "{C5A3B5EA-BE9F-76E5-E9B8-8A22B289B295}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bts.Spark.Core", "src\cs\Bts.Spark.Core\Bts.Spark.Core.csproj", "{E3BF9514-CB1A-4E07-A8DD-73300FD9726C}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bts.Spark.Api", "src\cs\Bts.Spark.Api\Bts.Spark.Api.csproj", "{8949AF88-F1D3-4BC4-827F-B088B555F7B9}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DataStreamSuite", "DataStreamSuite", "{60E0D592-FFB3-0D0A-C4AA-E88919B48F9D}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bts.Extensions.Hosting", "src\DataStreamSuite\Bts.Extensions.Hosting\Bts.Extensions.Hosting.csproj", "{37E4E890-D025-4729-90F9-6F95862F47BC}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bts.Spark.Sdk", "src\cs\Bts.Spark.Sdk\Bts.Spark.Sdk.csproj", "{A5FF3FAF-43CB-496B-AF4B-F61EFD645579}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bts.Spark.Sdk.Demo", "src\cs\Bts.Spark.Sdk.Demo\Bts.Spark.Sdk.Demo.csproj", "{FCFDBDBE-74B0-41C4-9011-C651B21056D4}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{E3BF9514-CB1A-4E07-A8DD-73300FD9726C}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{E3BF9514-CB1A-4E07-A8DD-73300FD9726C}.Debug|Any CPU.Build.0 = Debug|x64
+		{E3BF9514-CB1A-4E07-A8DD-73300FD9726C}.Debug|x64.ActiveCfg = Debug|x64
+		{E3BF9514-CB1A-4E07-A8DD-73300FD9726C}.Debug|x64.Build.0 = Debug|x64
+		{E3BF9514-CB1A-4E07-A8DD-73300FD9726C}.Debug|x86.ActiveCfg = Debug|x64
+		{E3BF9514-CB1A-4E07-A8DD-73300FD9726C}.Debug|x86.Build.0 = Debug|x64
+		{E3BF9514-CB1A-4E07-A8DD-73300FD9726C}.Release|Any CPU.ActiveCfg = Release|x64
+		{E3BF9514-CB1A-4E07-A8DD-73300FD9726C}.Release|Any CPU.Build.0 = Release|x64
+		{E3BF9514-CB1A-4E07-A8DD-73300FD9726C}.Release|x64.ActiveCfg = Release|x64
+		{E3BF9514-CB1A-4E07-A8DD-73300FD9726C}.Release|x64.Build.0 = Release|x64
+		{E3BF9514-CB1A-4E07-A8DD-73300FD9726C}.Release|x86.ActiveCfg = Release|x64
+		{E3BF9514-CB1A-4E07-A8DD-73300FD9726C}.Release|x86.Build.0 = Release|x64
+		{8949AF88-F1D3-4BC4-827F-B088B555F7B9}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{8949AF88-F1D3-4BC4-827F-B088B555F7B9}.Debug|Any CPU.Build.0 = Debug|x64
+		{8949AF88-F1D3-4BC4-827F-B088B555F7B9}.Debug|x64.ActiveCfg = Debug|x64
+		{8949AF88-F1D3-4BC4-827F-B088B555F7B9}.Debug|x64.Build.0 = Debug|x64
+		{8949AF88-F1D3-4BC4-827F-B088B555F7B9}.Debug|x86.ActiveCfg = Debug|x64
+		{8949AF88-F1D3-4BC4-827F-B088B555F7B9}.Debug|x86.Build.0 = Debug|x64
+		{8949AF88-F1D3-4BC4-827F-B088B555F7B9}.Release|Any CPU.ActiveCfg = Release|x64
+		{8949AF88-F1D3-4BC4-827F-B088B555F7B9}.Release|Any CPU.Build.0 = Release|x64
+		{8949AF88-F1D3-4BC4-827F-B088B555F7B9}.Release|x64.ActiveCfg = Release|x64
+		{8949AF88-F1D3-4BC4-827F-B088B555F7B9}.Release|x64.Build.0 = Release|x64
+		{8949AF88-F1D3-4BC4-827F-B088B555F7B9}.Release|x86.ActiveCfg = Release|x64
+		{8949AF88-F1D3-4BC4-827F-B088B555F7B9}.Release|x86.Build.0 = Release|x64
+		{37E4E890-D025-4729-90F9-6F95862F47BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{37E4E890-D025-4729-90F9-6F95862F47BC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{37E4E890-D025-4729-90F9-6F95862F47BC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{37E4E890-D025-4729-90F9-6F95862F47BC}.Debug|x64.Build.0 = Debug|Any CPU
+		{37E4E890-D025-4729-90F9-6F95862F47BC}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{37E4E890-D025-4729-90F9-6F95862F47BC}.Debug|x86.Build.0 = Debug|Any CPU
+		{37E4E890-D025-4729-90F9-6F95862F47BC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{37E4E890-D025-4729-90F9-6F95862F47BC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{37E4E890-D025-4729-90F9-6F95862F47BC}.Release|x64.ActiveCfg = Release|Any CPU
+		{37E4E890-D025-4729-90F9-6F95862F47BC}.Release|x64.Build.0 = Release|Any CPU
+		{37E4E890-D025-4729-90F9-6F95862F47BC}.Release|x86.ActiveCfg = Release|Any CPU
+		{37E4E890-D025-4729-90F9-6F95862F47BC}.Release|x86.Build.0 = Release|Any CPU
+		{A5FF3FAF-43CB-496B-AF4B-F61EFD645579}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A5FF3FAF-43CB-496B-AF4B-F61EFD645579}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A5FF3FAF-43CB-496B-AF4B-F61EFD645579}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A5FF3FAF-43CB-496B-AF4B-F61EFD645579}.Debug|x64.Build.0 = Debug|Any CPU
+		{A5FF3FAF-43CB-496B-AF4B-F61EFD645579}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A5FF3FAF-43CB-496B-AF4B-F61EFD645579}.Debug|x86.Build.0 = Debug|Any CPU
+		{A5FF3FAF-43CB-496B-AF4B-F61EFD645579}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A5FF3FAF-43CB-496B-AF4B-F61EFD645579}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A5FF3FAF-43CB-496B-AF4B-F61EFD645579}.Release|x64.ActiveCfg = Release|Any CPU
+		{A5FF3FAF-43CB-496B-AF4B-F61EFD645579}.Release|x64.Build.0 = Release|Any CPU
+		{A5FF3FAF-43CB-496B-AF4B-F61EFD645579}.Release|x86.ActiveCfg = Release|Any CPU
+		{A5FF3FAF-43CB-496B-AF4B-F61EFD645579}.Release|x86.Build.0 = Release|Any CPU
+		{FCFDBDBE-74B0-41C4-9011-C651B21056D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FCFDBDBE-74B0-41C4-9011-C651B21056D4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FCFDBDBE-74B0-41C4-9011-C651B21056D4}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{FCFDBDBE-74B0-41C4-9011-C651B21056D4}.Debug|x64.Build.0 = Debug|Any CPU
+		{FCFDBDBE-74B0-41C4-9011-C651B21056D4}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{FCFDBDBE-74B0-41C4-9011-C651B21056D4}.Debug|x86.Build.0 = Debug|Any CPU
+		{FCFDBDBE-74B0-41C4-9011-C651B21056D4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FCFDBDBE-74B0-41C4-9011-C651B21056D4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FCFDBDBE-74B0-41C4-9011-C651B21056D4}.Release|x64.ActiveCfg = Release|Any CPU
+		{FCFDBDBE-74B0-41C4-9011-C651B21056D4}.Release|x64.Build.0 = Release|Any CPU
+		{FCFDBDBE-74B0-41C4-9011-C651B21056D4}.Release|x86.ActiveCfg = Release|Any CPU
+		{FCFDBDBE-74B0-41C4-9011-C651B21056D4}.Release|x86.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{C5A3B5EA-BE9F-76E5-E9B8-8A22B289B295} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B}
+		{E3BF9514-CB1A-4E07-A8DD-73300FD9726C} = {C5A3B5EA-BE9F-76E5-E9B8-8A22B289B295}
+		{8949AF88-F1D3-4BC4-827F-B088B555F7B9} = {C5A3B5EA-BE9F-76E5-E9B8-8A22B289B295}
+		{60E0D592-FFB3-0D0A-C4AA-E88919B48F9D} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B}
+		{37E4E890-D025-4729-90F9-6F95862F47BC} = {60E0D592-FFB3-0D0A-C4AA-E88919B48F9D}
+		{A5FF3FAF-43CB-496B-AF4B-F61EFD645579} = {C5A3B5EA-BE9F-76E5-E9B8-8A22B289B295}
+		{FCFDBDBE-74B0-41C4-9011-C651B21056D4} = {C5A3B5EA-BE9F-76E5-E9B8-8A22B289B295}
+	EndGlobalSection
+EndGlobal

CMakeLists.txt

@@ -21,7 +21,7 @@ set(
 # SHARED_MEMORY_PREFIX serves as a kind of namespace so multiple applications
 # can run simultaneously without fighting over the same shm files (e.g., sparkd,
 # api server, etc.).
-set(SHARED_MEMORY_PREFIX "bts" CACHE STRING "Prefix to use when creating shared memory files")
+set(SHARED_MEMORY_PREFIX "\${BTS_SHARED_MEMORY_PREFIX}" CACHE STRING "Prefix to use when creating shared memory files")
 set(EXTERNALS_BIN "${EXTERNALS_ROOT}/bin")
 set(EXTERNALS_INCLUDE "${EXTERNALS_ROOT}/include")
 set(EXTERNALS_LIB "${EXTERNALS_ROOT}/lib/$<CONFIG>")
@@ -40,9 +40,8 @@ include_directories(BEFORE SYSTEM ${EXTERNALS_INCLUDE} ${EXTERNALS_ROOT}/include
 link_directories(${EXTERNALS_LIB})
 
 add_compile_definitions(SHARED_MEMORY_PREFIX="${SHARED_MEMORY_PREFIX}")
-add_compile_definitions(APP_DATA_DIR="${APP_DATA_DIR}")
-if(DEFINED APP_DATA_DIR_OVERRIDE)
-  add_compile_definitions(APP_DATA_DIR_OVERRIDE="${APP_DATA_DIR_OVERRIDE}")
+if(DEFINED APP_DATA_DIR)
+  add_compile_definitions(APP_DATA_DIR="${APP_DATA_DIR}")
 endif()
 add_compile_definitions(EXPORT_MD_CONSUMER="${EXPORT_MD_CONSUMER}")
 if(WIN32)

CMakePresets.json

@@ -8,36 +8,41 @@
 
   "configurePresets": [
     {
-      "name": "spark",
+      "name": "spark-base",
+      "hidden": true,
+      "binaryDir": "${sourceDir}/build/${presetName}",
+      "cacheVariables": {
+        "CMAKE_CXX_STANDARD": "20",
+        "CMAKE_INSTALL_PREFIX": "${sourceDir}/install/${presetName}",
+        "CMAKE_TOOLCHAIN_FILE": "${sourceDir}/vcpkg/scripts/buildsystems/vcpkg.cmake",
+        "CONFIG_DEFAULTS_PATH": "spark/config/profiles/default/*.conf",
+        "EXPORT_MD_CONSUMER": {
+          "type": "BOOL",
+          "value": "ON"
+        }
+      }
+    },
+
+    {
+      "name": "spark-windows",
+      "inherits": "spark-base",
+      "displayName": "Spark",
       "condition": {
         "type": "equals",
         "lhs": "${hostSystemName}",
         "rhs": "Windows"
       },
       "generator": "Visual Studio 17 2022",
-      "binaryDir": "${sourceDir}/build/${presetName}",
       "environment": {
         "SPARK_CMAKE_CXX_FLAGS": "/MP /WX /wd4250 /wd4251 /wd4244 /wd4267 /wd4355 /wd4275 /wd4345 /bigobj /EHsc /DCURL_STATICLIB /D_WINSOCK_DEPRECATED_NO_WARNINGS /D__TBB_NO_IMPLICIT_LINKAGE /DBOOST_ALL_NO_LIB /std:c++20 /D_SCL_SECURE_NO_WARNINGS /D_CRT_SECURE_NO_WARNINGS /D_WIN32_WINNT=0x0600"
       },
       "cacheVariables": {
-        "APP_DATA_DIR": "${dollar}{APPDATA}/bts",
-        "APP_DATA_DIR_OVERRIDE": "${dollar}{SPARK_DATA_DIR}",
         "CMAKE_CXX_FLAGS": "$env{SPARK_CMAKE_CXX_FLAGS}",
         "CMAKE_CXX_FLAGS_DEBUG": "$env{SPARK_CMAKE_CXX_FLAGS} /MTd",
         "CMAKE_CXX_FLAGS_RELEASE": "$env{SPARK_CMAKE_CXX_FLAGS} /MT",
-        "CMAKE_CXX_STANDARD": "20",
-        "CMAKE_INSTALL_PREFIX": "${sourceDir}/install/${presetName}",
         "CMAKE_SHARED_LINKER_FLAGS_DEBUG": "/DEBUG",
         "CMAKE_SHARED_LINKER_FLAGS_RELEASE": "/OPT:REF /OPT:ICF /LTCG",
-        "CMAKE_TOOLCHAIN_FILE": "${sourceDir}/vcpkg/scripts/buildsystems/vcpkg.cmake",
-        "EXTERNALS_ROOT": "${sourceDir}/externals/windows",
-        "CONFIG_DEFAULTS_PATH": "spark/config/profiles/default/*.conf",
-        "DOTNET_BINARY_DIR": "${sourceDir}/build/$<CONFIG>/bin/net8.0;${sourceDir}/build/$<CONFIG>/bin/net8.0-windows",
-        "EXPORT_MD_CONSUMER": {
-          "type": "BOOL",
-          "value": "ON"
-        },
-        "SHARED_MEMORY_PREFIX": "spark"
+        "EXTERNALS_ROOT": "${sourceDir}/externals/windows"
       }
     },
 
@@ -53,8 +58,6 @@
       "binaryDir": "${sourceDir}/build/${presetName}",
       "cacheVariables": {
         "platform": "",
-        "APP_DATA_DIR": "${dollar}{HOME}/sparkdata",
-        "APP_DATA_DIR_OVERRIDE": "${dollar}{SPARKD_DATA_DIR}",
         "CMAKE_BUILD_WITH_INSTALL_RPATH": {
           "type": "BOOL",
           "value": "OFF"
@@ -77,8 +80,7 @@
         "BUILD_ADMIN_WEB_APP": {
           "type": "BOOL",
           "value": "ON"
-        },
-        "SHARED_MEMORY_PREFIX": "sparkd"
+        }
       }
     },
 
@@ -157,22 +159,17 @@
     },
 
     {
-      "name": "spark-api-server-windows",
-      "inherits": "spark",
-      "displayName": "Spark Api Server (Windows)",
-      "cacheVariables": {
-        "APP_DATA_DIR_OVERRIDE": "${dollar}{SPARK_API_SERVER_DATA_DIR}",
-        "SHARED_MEMORY_PREFIX": "spark_api_server"
-      }
-    },
-
-    {
-      "name": "spark-api-server-linux",
-      "inherits": "sparkd",
-      "displayName": "Spark Api Server (Linux)",
+      "name": "spark-linux",
+      "inherits": "spark-base",
+      "displayName": "Spark",
+      "condition": {
+        "type": "equals",
+        "lhs": "${hostSystemName}",
+        "rhs": "Linux"
+      },
       "generator": "Ninja Multi-Config",
       "cacheVariables": {
-        "APP_DATA_DIR_OVERRIDE": "${dollar}{SPARK_API_SERVER_DATA_DIR}",
+        "platform": "linux",
         "BUILD_ADMIN_WEB_APP": {
           "type": "BOOL",
           "value": "OFF"
@@ -181,21 +178,26 @@
           "type": "BOOL",
           "value": "OFF"
         },
+        "CMAKE_BUILD_WITH_INSTALL_RPATH": {
+          "type": "BOOL",
+          "value": "OFF"
+        },
         "CMAKE_C_COMPILER": "clang",
         "CMAKE_CXX_COMPILER": "clang++",
         "CMAKE_CXX_FLAGS_DEBUG": "-g -fPIC -Wall -pedantic -Wextra -Werror -Wno-missing-braces -Wno-ignored-qualifiers --std=c++20 -fdiagnostics-color -DDEBUG",
         "CMAKE_CXX_FLAGS_RELEASE": "-fPIC -Wall -pedantic -Wextra -Werror -Wno-missing-braces -Wno-ignored-qualifiers --std=c++20 -fdiagnostics-color -fno-omit-frame-pointer -DNDEBUG -O3",
-        "CMAKE_INSTALL_PREFIX": "${sourceDir}/install/${presetName}",
+        "CMAKE_EXE_LINKER_FLAGS": "-Wno-undef",
         "CMAKE_EXPORT_COMPILE_COMMANDS": {
           "type": "BOOL",
           "value": "ON"
         },
-        "CONFIG_DEFAULTS_PATH": "spark/config/profiles/default/*.conf",
-        "DOTNET_BINARY_DIR": "${sourceDir}/build/$<CONFIG>/bin/net8.0",
-        "EXPORT_MD_CONSUMER": {
+        "CMAKE_INSTALL_RPATH": ".",
+        "CMAKE_PREFIX_PATH": "${sourceDir}/cmake/;${sourceDir}/.venv/lib/python3.10/site-packages/pybind11/share/cmake/pybind11",
+        "DATABENTO_USE_EXTERNAL_JSON": {
           "type": "BOOL",
           "value": "ON"
-        }
+        },
+        "EXTERNALS_ROOT": "${sourceDir}/externals/linux"
       }
     },
 
@@ -215,92 +217,32 @@
       "cacheVariables": {
         "CCAPI_LOG_LEVEL": "Trace"
       }
-    },
-
-    {
-      "name": "data-stream-suite-windows",
-      "condition": {
-        "type": "equals",
-        "lhs": "${hostSystemName}",
-        "rhs": "Windows"
-      },
-      "inherits": "spark",
-      "displayName": "Data Stream Suite (Windows)",
-      "description": "Data Stream utils ported over from Edge",
-      "binaryDir": "${sourceDir}/build/${presetName}",
-      "cacheVariables": {
-        "APP_DATA_DIR": "${dollar}{APPDATA}/bts/DataStream",
-        "APP_DATA_DIR_OVERRIDE": "${dollar}{DATA_STREAM_DATA_DIR}",
-        "CONFIG_DEFAULTS_PATH": "spark/config/profiles/default/*.conf;spark/config/profiles/data_stream/*.conf",
-        "SHARED_MEMORY_PREFIX": "data_stream"
-      }
-    },
-
-    {
-      "name": "data-stream-suite-linux",
-      "displayName": "Data Stream Suite (Linux)",
-      "description": "Data Stream utils ported over from Edge",
-      "condition": {
-        "type": "equals",
-        "lhs": "${hostSystemName}",
-        "rhs": "Linux"
-      },
-      "inherits": "sparkd",
-      "generator": "Ninja Multi-Config",
-      "cacheVariables": {
-        "APP_DATA_DIR": "${dollar}{HOME}/.local/share/DataStream",
-        "APP_DATA_DIR_OVERRIDE": "${dollar}{DATA_STREAM_DATA_DIR}",
-        "BUILD_ADMIN_WEB_APP": {
-          "type": "BOOL",
-          "value": "OFF"
-        },
-        "BUILD_SDK": {
-          "type": "BOOL",
-          "value": "OFF"
-        },
-        "BUILD_SPARKD": {
-          "type": "BOOL",
-          "value": "OFF"
-        },
-        "CMAKE_C_COMPILER": "clang",
-        "CMAKE_CXX_COMPILER": "clang++",
-        "CMAKE_CXX_FLAGS_DEBUG": "-g -fPIC -Wall -pedantic -Wextra -Werror -Wno-missing-braces -Wno-ignored-qualifiers --std=c++20 -fdiagnostics-color -DDEBUG",
-        "CMAKE_CXX_FLAGS_RELEASE": "-fPIC -Wall -pedantic -Wextra -Werror -Wno-missing-braces -Wno-ignored-qualifiers --std=c++20 -fdiagnostics-color -fno-omit-frame-pointer -DNDEBUG -O3",
-        "CONFIG_DEFAULTS_PATH": "spark/config/profiles/default/*.conf;spark/config/profiles/data_stream/*.conf",
-        "DOTNET_BINARY_DIR": "${sourceDir}/build/$<CONFIG>/bin/net7.0",
-        "EXPORT_MD_CONSUMER": {
-          "type": "BOOL",
-          "value": "ON"
-        },
-        "SHARED_MEMORY_PREFIX": "data_stream"
-      }
     }
   ],
 
   "buildPresets": [
     {
-      "name": "spark",
+      "name": "spark-windows",
       "condition": {
         "type": "equals",
         "lhs": "${hostSystemName}",
         "rhs": "Windows"
       },
-      "hidden": true
+      "hidden": true,
+      "configurePreset": "spark-windows"
     },
 
     {
-      "name": "spark-debug",
+      "name": "spark-windows-debug",
       "displayName": "Spark (Debug)",
-      "inherits": "spark",
-      "configurePreset": "spark",
+      "inherits": "spark-windows",
       "configuration": "Debug"
     },
 
     {
-      "name": "spark-release",
+      "name": "spark-windows-release",
       "displayName": "Spark (Release)",
-      "inherits": "spark",
-      "configurePreset": "spark",
+      "inherits": "spark-windows",
       "configuration": "Release"
     },
 
@@ -343,52 +285,27 @@
     },
 
     {
-      "name": "spark-api-server-windows",
-      "condition": {
-        "type": "equals",
-        "lhs": "${hostSystemName}",
-        "rhs": "Windows"
-      },
-      "hidden": true,
-      "configurePreset": "spark-api-server-windows"
-    },
-
-    {
-      "name": "spark-api-server-windows-debug",
-      "displayName": "Spark Api Server (Windows | Debug)",
-      "inherits": "spark-api-server-windows",
-      "configuration": "Debug"
-    },
-
-    {
-      "name": "spark-api-server-windows-release",
-      "displayName": "Spark Api Server (Windows | Release)",
-      "inherits": "spark-api-server-windows",
-      "configuration": "Release"
-    },
-
-    {
-      "name": "spark-api-server-linux",
+      "name": "spark-linux",
       "condition": {
         "type": "equals",
         "lhs": "${hostSystemName}",
         "rhs": "Linux"
       },
       "hidden": true,
-      "configurePreset": "spark-api-server-linux"
+      "configurePreset": "spark-linux"
     },
 
     {
-      "name": "spark-api-server-linux-debug",
-      "inherits": "spark-api-server-linux",
-      "displayName": "Spark Api Server (Linux | Debug)",
+      "name": "spark-linux-debug",
+      "inherits": "spark-linux",
+      "displayName": "Spark (Linux | Debug)",
       "configuration": "Debug"
     },
 
     {
-      "name": "spark-api-server-linux-release",
-      "inherits": "spark-api-server-linux",
-      "displayName": "Spark Api Server (Linux | Release)",
+      "name": "spark-linux-release",
+      "inherits": "spark-linux",
+      "displayName": "Spark (Linux | Release)",
       "configuration": "Release"
     },
 
@@ -405,34 +322,6 @@
       "configurePreset": "sparkd-ccapi-diag",
       "displayName": "Debug (ccapi diag)",
       "inherits": "sparkd"
-    },
-
-    {
-      "name": "data-stream-suite-windows-debug",
-      "displayName": "Data Stream Suite (Windows | Debug)",
-      "configurePreset": "data-stream-suite-windows",
-      "configuration": "Debug"
-    },
-
-    {
-      "name": "data-stream-suite-windows-release",
-      "displayName": "Data Stream Suite (Windows | Release)",
-      "configurePreset": "data-stream-suite-windows",
-      "configuration": "Release"
-    },
-
-    {
-      "name": "data-stream-suite-linux-debug",
-      "displayName": "Data Stream Suite (Linux | Debug)",
-      "configurePreset": "data-stream-suite-linux",
-      "configuration": "Debug"
-    },
-
-    {
-      "name": "data-stream-suite-linux-release",
-      "displayName": "Data Stream Suite (Linux | Release)",
-      "configurePreset": "data-stream-suite-linux",
-      "configuration": "Release"
     }
   ]
 }

Spark.Api.Server.sln

@@ -1,10 +1,11 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
+
+Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.3.32922.545
 MinimumVisualStudioVersion = 15.0.26124.0
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "spark_api", "src\client\spark_api\spark_api.csproj", "{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bts.Spark.Api", "src\cs\Bts.Spark.Api\Bts.Spark.Api.csproj", "{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "spark_core", "src\client\spark_core\spark_core.csproj", "{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bts.Spark.Core", "src\cs\Bts.Spark.Core\Bts.Spark.Core.csproj", "{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "spark_websocket", "src\client\spark_websocket\spark_websocket.csproj", "{3201359D-C071-4089-9EDE-B04D759F1508}"
 EndProject
@@ -42,168 +43,484 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bts.ColumnExpressions", "sr
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataStream", "src\DataStreamSuite\DataStream\DataStream.csproj", "{39AEA075-6457-46C0-8821-1158BE6EFA57}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bts.Extensions.Hosting", "src\DataStreamSuite\Bts.Extensions.Hosting\Bts.Extensions.Hosting.csproj", "{F3DC52D7-8C59-4EC0-86D9-0E5732EAFCF7}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x64 = Debug|x64
+		Debug|Any CPU = Debug|Any CPU
+		Debug|x86 = Debug|x86
 		MinSizeRel|x64 = MinSizeRel|x64
+		MinSizeRel|Any CPU = MinSizeRel|Any CPU
+		MinSizeRel|x86 = MinSizeRel|x86
 		Release|x64 = Release|x64
+		Release|Any CPU = Release|Any CPU
+		Release|x86 = Release|x86
 		RelWithDebInfo|x64 = RelWithDebInfo|x64
+		RelWithDebInfo|Any CPU = RelWithDebInfo|Any CPU
+		RelWithDebInfo|x86 = RelWithDebInfo|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Debug|x64.ActiveCfg = Debug|x64
 		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Debug|x64.Build.0 = Debug|x64
+		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Debug|x86.Build.0 = Debug|Any CPU
 		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.MinSizeRel|x64.ActiveCfg = Release|x64
 		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.MinSizeRel|x64.Build.0 = Release|x64
+		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.MinSizeRel|Any CPU.ActiveCfg = MinSizeRel|Any CPU
+		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.MinSizeRel|Any CPU.Build.0 = MinSizeRel|Any CPU
+		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.MinSizeRel|x86.ActiveCfg = MinSizeRel|Any CPU
+		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.MinSizeRel|x86.Build.0 = MinSizeRel|Any CPU
 		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Release|x64.ActiveCfg = Release|x64
 		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Release|x64.Build.0 = Release|x64
+		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Release|x86.ActiveCfg = Release|Any CPU
+		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Release|x86.Build.0 = Release|Any CPU
 		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.RelWithDebInfo|x64.ActiveCfg = Release|x64
 		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.RelWithDebInfo|x64.Build.0 = Release|x64
+		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.RelWithDebInfo|Any CPU.ActiveCfg = RelWithDebInfo|Any CPU
+		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.RelWithDebInfo|Any CPU.Build.0 = RelWithDebInfo|Any CPU
+		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|Any CPU
+		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.RelWithDebInfo|x86.Build.0 = RelWithDebInfo|Any CPU
 		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Debug|x64.ActiveCfg = Debug|x64
 		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Debug|x64.Build.0 = Debug|x64
+		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Debug|x86.Build.0 = Debug|Any CPU
 		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.MinSizeRel|x64.ActiveCfg = Release|x64
 		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.MinSizeRel|x64.Build.0 = Release|x64
+		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.MinSizeRel|Any CPU.ActiveCfg = MinSizeRel|Any CPU
+		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.MinSizeRel|Any CPU.Build.0 = MinSizeRel|Any CPU
+		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.MinSizeRel|x86.ActiveCfg = MinSizeRel|Any CPU
+		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.MinSizeRel|x86.Build.0 = MinSizeRel|Any CPU
 		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Release|x64.ActiveCfg = Release|x64
 		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Release|x64.Build.0 = Release|x64
+		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Release|x86.ActiveCfg = Release|Any CPU
+		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Release|x86.Build.0 = Release|Any CPU
 		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.RelWithDebInfo|x64.ActiveCfg = Release|x64
 		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.RelWithDebInfo|x64.Build.0 = Release|x64
+		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.RelWithDebInfo|Any CPU.ActiveCfg = RelWithDebInfo|Any CPU
+		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.RelWithDebInfo|Any CPU.Build.0 = RelWithDebInfo|Any CPU
+		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|Any CPU
+		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.RelWithDebInfo|x86.Build.0 = RelWithDebInfo|Any CPU
 		{3201359D-C071-4089-9EDE-B04D759F1508}.Debug|x64.ActiveCfg = Debug|x64
 		{3201359D-C071-4089-9EDE-B04D759F1508}.Debug|x64.Build.0 = Debug|x64
+		{3201359D-C071-4089-9EDE-B04D759F1508}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3201359D-C071-4089-9EDE-B04D759F1508}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3201359D-C071-4089-9EDE-B04D759F1508}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3201359D-C071-4089-9EDE-B04D759F1508}.Debug|x86.Build.0 = Debug|Any CPU
 		{3201359D-C071-4089-9EDE-B04D759F1508}.MinSizeRel|x64.ActiveCfg = Debug|x64
 		{3201359D-C071-4089-9EDE-B04D759F1508}.MinSizeRel|x64.Build.0 = Debug|x64
+		{3201359D-C071-4089-9EDE-B04D759F1508}.MinSizeRel|Any CPU.ActiveCfg = MinSizeRel|Any CPU
+		{3201359D-C071-4089-9EDE-B04D759F1508}.MinSizeRel|Any CPU.Build.0 = MinSizeRel|Any CPU
+		{3201359D-C071-4089-9EDE-B04D759F1508}.MinSizeRel|x86.ActiveCfg = MinSizeRel|Any CPU
+		{3201359D-C071-4089-9EDE-B04D759F1508}.MinSizeRel|x86.Build.0 = MinSizeRel|Any CPU
 		{3201359D-C071-4089-9EDE-B04D759F1508}.Release|x64.ActiveCfg = Release|x64
 		{3201359D-C071-4089-9EDE-B04D759F1508}.Release|x64.Build.0 = Release|x64
+		{3201359D-C071-4089-9EDE-B04D759F1508}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3201359D-C071-4089-9EDE-B04D759F1508}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3201359D-C071-4089-9EDE-B04D759F1508}.Release|x86.ActiveCfg = Release|Any CPU
+		{3201359D-C071-4089-9EDE-B04D759F1508}.Release|x86.Build.0 = Release|Any CPU
 		{3201359D-C071-4089-9EDE-B04D759F1508}.RelWithDebInfo|x64.ActiveCfg = Release|x64
 		{3201359D-C071-4089-9EDE-B04D759F1508}.RelWithDebInfo|x64.Build.0 = Release|x64
+		{3201359D-C071-4089-9EDE-B04D759F1508}.RelWithDebInfo|Any CPU.ActiveCfg = RelWithDebInfo|Any CPU
+		{3201359D-C071-4089-9EDE-B04D759F1508}.RelWithDebInfo|Any CPU.Build.0 = RelWithDebInfo|Any CPU
+		{3201359D-C071-4089-9EDE-B04D759F1508}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|Any CPU
+		{3201359D-C071-4089-9EDE-B04D759F1508}.RelWithDebInfo|x86.Build.0 = RelWithDebInfo|Any CPU
 		{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.Debug|x64.ActiveCfg = Debug|x64
 		{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.Debug|x64.Build.0 = Debug|x64
+		{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.Debug|x86.Build.0 = Debug|Any CPU
 		{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.MinSizeRel|x64.ActiveCfg = Debug|x64
 		{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.MinSizeRel|x64.Build.0 = Debug|x64
+		{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.MinSizeRel|Any CPU.ActiveCfg = MinSizeRel|Any CPU
+		{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.MinSizeRel|Any CPU.Build.0 = MinSizeRel|Any CPU
+		{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.MinSizeRel|x86.ActiveCfg = MinSizeRel|Any CPU
+		{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.MinSizeRel|x86.Build.0 = MinSizeRel|Any CPU
 		{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.Release|x64.ActiveCfg = Release|x64
 		{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.Release|x64.Build.0 = Release|x64
+		{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.Release|x86.ActiveCfg = Release|Any CPU
+		{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.Release|x86.Build.0 = Release|Any CPU
 		{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.RelWithDebInfo|x64.ActiveCfg = Release|x64
 		{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.RelWithDebInfo|x64.Build.0 = Release|x64
+		{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.RelWithDebInfo|Any CPU.ActiveCfg = RelWithDebInfo|Any CPU
+		{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.RelWithDebInfo|Any CPU.Build.0 = RelWithDebInfo|Any CPU
+		{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|Any CPU
+		{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.RelWithDebInfo|x86.Build.0 = RelWithDebInfo|Any CPU
 		{EFC9FC4D-E92B-4C6D-9B97-26D38EAA118D}.Debug|x64.ActiveCfg = Debug|x64
 		{EFC9FC4D-E92B-4C6D-9B97-26D38EAA118D}.Debug|x64.Build.0 = Debug|x64
+		{EFC9FC4D-E92B-4C6D-9B97-26D38EAA118D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EFC9FC4D-E92B-4C6D-9B97-26D38EAA118D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EFC9FC4D-E92B-4C6D-9B97-26D38EAA118D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{EFC9FC4D-E92B-4C6D-9B97-26D38EAA118D}.Debug|x86.Build.0 = Debug|Any CPU
 		{EFC9FC4D-E92B-4C6D-9B97-26D38EAA118D}.MinSizeRel|x64.ActiveCfg = Debug|x64
 		{EFC9FC4D-E92B-4C6D-9B97-26D38EAA118D}.MinSizeRel|x64.Build.0 = Debug|x64
+		{EFC9FC4D-E92B-4C6D-9B97-26D38EAA118D}.MinSizeRel|Any CPU.ActiveCfg = MinSizeRel|Any CPU
+		{EFC9FC4D-E92B-4C6D-9B97-26D38EAA118D}.MinSizeRel|Any CPU.Build.0 = MinSizeRel|Any CPU
+		{EFC9FC4D-E92B-4C6D-9B97-26D38EAA118D}.MinSizeRel|x86.ActiveCfg = MinSizeRel|Any CPU
+		{EFC9FC4D-E92B-4C6D-9B97-26D38EAA118D}.MinSizeRel|x86.Build.0 = MinSizeRel|Any CPU
 		{EFC9FC4D-E92B-4C6D-9B97-26D38EAA118D}.Release|x64.ActiveCfg = Release|x64
 		{EFC9FC4D-E92B-4C6D-9B97-26D38EAA118D}.Release|x64.Build.0 = Release|x64
+		{EFC9FC4D-E92B-4C6D-9B97-26D38EAA118D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EFC9FC4D-E92B-4C6D-9B97-26D38EAA118D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EFC9FC4D-E92B-4C6D-9B97-26D38EAA118D}.Release|x86.ActiveCfg = Release|Any CPU
+		{EFC9FC4D-E92B-4C6D-9B97-26D38EAA118D}.Release|x86.Build.0 = Release|Any CPU
 		{EFC9FC4D-E92B-4C6D-9B97-26D38EAA118D}.RelWithDebInfo|x64.ActiveCfg = Debug|x64
 		{EFC9FC4D-E92B-4C6D-9B97-26D38EAA118D}.RelWithDebInfo|x64.Build.0 = Debug|x64
+		{EFC9FC4D-E92B-4C6D-9B97-26D38EAA118D}.RelWithDebInfo|Any CPU.ActiveCfg = RelWithDebInfo|Any CPU
+		{EFC9FC4D-E92B-4C6D-9B97-26D38EAA118D}.RelWithDebInfo|Any CPU.Build.0 = RelWithDebInfo|Any CPU
+		{EFC9FC4D-E92B-4C6D-9B97-26D38EAA118D}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|Any CPU
+		{EFC9FC4D-E92B-4C6D-9B97-26D38EAA118D}.RelWithDebInfo|x86.Build.0 = RelWithDebInfo|Any CPU
 		{89D666E6-B500-498F-B026-4D167F68ADFC}.Debug|x64.ActiveCfg = Debug|x64
 		{89D666E6-B500-498F-B026-4D167F68ADFC}.Debug|x64.Build.0 = Debug|x64
+		{89D666E6-B500-498F-B026-4D167F68ADFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{89D666E6-B500-498F-B026-4D167F68ADFC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{89D666E6-B500-498F-B026-4D167F68ADFC}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{89D666E6-B500-498F-B026-4D167F68ADFC}.Debug|x86.Build.0 = Debug|Any CPU
 		{89D666E6-B500-498F-B026-4D167F68ADFC}.MinSizeRel|x64.ActiveCfg = Debug|x64
 		{89D666E6-B500-498F-B026-4D167F68ADFC}.MinSizeRel|x64.Build.0 = Debug|x64
+		{89D666E6-B500-498F-B026-4D167F68ADFC}.MinSizeRel|Any CPU.ActiveCfg = MinSizeRel|Any CPU
+		{89D666E6-B500-498F-B026-4D167F68ADFC}.MinSizeRel|Any CPU.Build.0 = MinSizeRel|Any CPU
+		{89D666E6-B500-498F-B026-4D167F68ADFC}.MinSizeRel|x86.ActiveCfg = MinSizeRel|Any CPU
+		{89D666E6-B500-498F-B026-4D167F68ADFC}.MinSizeRel|x86.Build.0 = MinSizeRel|Any CPU
 		{89D666E6-B500-498F-B026-4D167F68ADFC}.Release|x64.ActiveCfg = Release|x64
 		{89D666E6-B500-498F-B026-4D167F68ADFC}.Release|x64.Build.0 = Release|x64
+		{89D666E6-B500-498F-B026-4D167F68ADFC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{89D666E6-B500-498F-B026-4D167F68ADFC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{89D666E6-B500-498F-B026-4D167F68ADFC}.Release|x86.ActiveCfg = Release|Any CPU
+		{89D666E6-B500-498F-B026-4D167F68ADFC}.Release|x86.Build.0 = Release|Any CPU
 		{89D666E6-B500-498F-B026-4D167F68ADFC}.RelWithDebInfo|x64.ActiveCfg = Debug|x64
 		{89D666E6-B500-498F-B026-4D167F68ADFC}.RelWithDebInfo|x64.Build.0 = Debug|x64
+		{89D666E6-B500-498F-B026-4D167F68ADFC}.RelWithDebInfo|Any CPU.ActiveCfg = RelWithDebInfo|Any CPU
+		{89D666E6-B500-498F-B026-4D167F68ADFC}.RelWithDebInfo|Any CPU.Build.0 = RelWithDebInfo|Any CPU
+		{89D666E6-B500-498F-B026-4D167F68ADFC}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|Any CPU
+		{89D666E6-B500-498F-B026-4D167F68ADFC}.RelWithDebInfo|x86.Build.0 = RelWithDebInfo|Any CPU
 		{EF26A475-6101-4C9C-A717-D60BB92A2302}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{EF26A475-6101-4C9C-A717-D60BB92A2302}.Debug|x64.Build.0 = Debug|Any CPU
+		{EF26A475-6101-4C9C-A717-D60BB92A2302}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EF26A475-6101-4C9C-A717-D60BB92A2302}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EF26A475-6101-4C9C-A717-D60BB92A2302}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{EF26A475-6101-4C9C-A717-D60BB92A2302}.Debug|x86.Build.0 = Debug|Any CPU
 		{EF26A475-6101-4C9C-A717-D60BB92A2302}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
 		{EF26A475-6101-4C9C-A717-D60BB92A2302}.MinSizeRel|x64.Build.0 = Debug|Any CPU
+		{EF26A475-6101-4C9C-A717-D60BB92A2302}.MinSizeRel|Any CPU.ActiveCfg = MinSizeRel|Any CPU
+		{EF26A475-6101-4C9C-A717-D60BB92A2302}.MinSizeRel|Any CPU.Build.0 = MinSizeRel|Any CPU
+		{EF26A475-6101-4C9C-A717-D60BB92A2302}.MinSizeRel|x86.ActiveCfg = MinSizeRel|Any CPU
+		{EF26A475-6101-4C9C-A717-D60BB92A2302}.MinSizeRel|x86.Build.0 = MinSizeRel|Any CPU
 		{EF26A475-6101-4C9C-A717-D60BB92A2302}.Release|x64.ActiveCfg = Release|Any CPU
 		{EF26A475-6101-4C9C-A717-D60BB92A2302}.Release|x64.Build.0 = Release|Any CPU
+		{EF26A475-6101-4C9C-A717-D60BB92A2302}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EF26A475-6101-4C9C-A717-D60BB92A2302}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EF26A475-6101-4C9C-A717-D60BB92A2302}.Release|x86.ActiveCfg = Release|Any CPU
+		{EF26A475-6101-4C9C-A717-D60BB92A2302}.Release|x86.Build.0 = Release|Any CPU
 		{EF26A475-6101-4C9C-A717-D60BB92A2302}.RelWithDebInfo|x64.ActiveCfg = Debug|Any CPU
 		{EF26A475-6101-4C9C-A717-D60BB92A2302}.RelWithDebInfo|x64.Build.0 = Debug|Any CPU
+		{EF26A475-6101-4C9C-A717-D60BB92A2302}.RelWithDebInfo|Any CPU.ActiveCfg = RelWithDebInfo|Any CPU
+		{EF26A475-6101-4C9C-A717-D60BB92A2302}.RelWithDebInfo|Any CPU.Build.0 = RelWithDebInfo|Any CPU
+		{EF26A475-6101-4C9C-A717-D60BB92A2302}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|Any CPU
+		{EF26A475-6101-4C9C-A717-D60BB92A2302}.RelWithDebInfo|x86.Build.0 = RelWithDebInfo|Any CPU
 		{911B08A3-515A-441D-84C8-8A43740B5FC1}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{911B08A3-515A-441D-84C8-8A43740B5FC1}.Debug|x64.Build.0 = Debug|Any CPU
+		{911B08A3-515A-441D-84C8-8A43740B5FC1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{911B08A3-515A-441D-84C8-8A43740B5FC1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{911B08A3-515A-441D-84C8-8A43740B5FC1}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{911B08A3-515A-441D-84C8-8A43740B5FC1}.Debug|x86.Build.0 = Debug|Any CPU
 		{911B08A3-515A-441D-84C8-8A43740B5FC1}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
 		{911B08A3-515A-441D-84C8-8A43740B5FC1}.MinSizeRel|x64.Build.0 = Debug|Any CPU
+		{911B08A3-515A-441D-84C8-8A43740B5FC1}.MinSizeRel|Any CPU.ActiveCfg = MinSizeRel|Any CPU
+		{911B08A3-515A-441D-84C8-8A43740B5FC1}.MinSizeRel|Any CPU.Build.0 = MinSizeRel|Any CPU
+		{911B08A3-515A-441D-84C8-8A43740B5FC1}.MinSizeRel|x86.ActiveCfg = MinSizeRel|Any CPU
+		{911B08A3-515A-441D-84C8-8A43740B5FC1}.MinSizeRel|x86.Build.0 = MinSizeRel|Any CPU
 		{911B08A3-515A-441D-84C8-8A43740B5FC1}.Release|x64.ActiveCfg = Release|Any CPU
 		{911B08A3-515A-441D-84C8-8A43740B5FC1}.Release|x64.Build.0 = Release|Any CPU
+		{911B08A3-515A-441D-84C8-8A43740B5FC1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{911B08A3-515A-441D-84C8-8A43740B5FC1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{911B08A3-515A-441D-84C8-8A43740B5FC1}.Release|x86.ActiveCfg = Release|Any CPU
+		{911B08A3-515A-441D-84C8-8A43740B5FC1}.Release|x86.Build.0 = Release|Any CPU
 		{911B08A3-515A-441D-84C8-8A43740B5FC1}.RelWithDebInfo|x64.ActiveCfg = Debug|Any CPU
 		{911B08A3-515A-441D-84C8-8A43740B5FC1}.RelWithDebInfo|x64.Build.0 = Debug|Any CPU
+		{911B08A3-515A-441D-84C8-8A43740B5FC1}.RelWithDebInfo|Any CPU.ActiveCfg = RelWithDebInfo|Any CPU
+		{911B08A3-515A-441D-84C8-8A43740B5FC1}.RelWithDebInfo|Any CPU.Build.0 = RelWithDebInfo|Any CPU
+		{911B08A3-515A-441D-84C8-8A43740B5FC1}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|Any CPU
+		{911B08A3-515A-441D-84C8-8A43740B5FC1}.RelWithDebInfo|x86.Build.0 = RelWithDebInfo|Any CPU
 		{14140310-2233-430A-821B-F3058A25234B}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{14140310-2233-430A-821B-F3058A25234B}.Debug|x64.Build.0 = Debug|Any CPU
+		{14140310-2233-430A-821B-F3058A25234B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{14140310-2233-430A-821B-F3058A25234B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{14140310-2233-430A-821B-F3058A25234B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{14140310-2233-430A-821B-F3058A25234B}.Debug|x86.Build.0 = Debug|Any CPU
 		{14140310-2233-430A-821B-F3058A25234B}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
 		{14140310-2233-430A-821B-F3058A25234B}.MinSizeRel|x64.Build.0 = Debug|Any CPU
+		{14140310-2233-430A-821B-F3058A25234B}.MinSizeRel|Any CPU.ActiveCfg = MinSizeRel|Any CPU
+		{14140310-2233-430A-821B-F3058A25234B}.MinSizeRel|Any CPU.Build.0 = MinSizeRel|Any CPU
+		{14140310-2233-430A-821B-F3058A25234B}.MinSizeRel|x86.ActiveCfg = MinSizeRel|Any CPU
+		{14140310-2233-430A-821B-F3058A25234B}.MinSizeRel|x86.Build.0 = MinSizeRel|Any CPU
 		{14140310-2233-430A-821B-F3058A25234B}.Release|x64.ActiveCfg = Release|Any CPU
 		{14140310-2233-430A-821B-F3058A25234B}.Release|x64.Build.0 = Release|Any CPU
+		{14140310-2233-430A-821B-F3058A25234B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{14140310-2233-430A-821B-F3058A25234B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{14140310-2233-430A-821B-F3058A25234B}.Release|x86.ActiveCfg = Release|Any CPU
+		{14140310-2233-430A-821B-F3058A25234B}.Release|x86.Build.0 = Release|Any CPU
 		{14140310-2233-430A-821B-F3058A25234B}.RelWithDebInfo|x64.ActiveCfg = Debug|Any CPU
 		{14140310-2233-430A-821B-F3058A25234B}.RelWithDebInfo|x64.Build.0 = Debug|Any CPU
+		{14140310-2233-430A-821B-F3058A25234B}.RelWithDebInfo|Any CPU.ActiveCfg = RelWithDebInfo|Any CPU
+		{14140310-2233-430A-821B-F3058A25234B}.RelWithDebInfo|Any CPU.Build.0 = RelWithDebInfo|Any CPU
+		{14140310-2233-430A-821B-F3058A25234B}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|Any CPU
+		{14140310-2233-430A-821B-F3058A25234B}.RelWithDebInfo|x86.Build.0 = RelWithDebInfo|Any CPU
 		{43146EA8-6FCC-46B8-88B0-42F9BB5E6E0A}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{43146EA8-6FCC-46B8-88B0-42F9BB5E6E0A}.Debug|x64.Build.0 = Debug|Any CPU
+		{43146EA8-6FCC-46B8-88B0-42F9BB5E6E0A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{43146EA8-6FCC-46B8-88B0-42F9BB5E6E0A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{43146EA8-6FCC-46B8-88B0-42F9BB5E6E0A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{43146EA8-6FCC-46B8-88B0-42F9BB5E6E0A}.Debug|x86.Build.0 = Debug|Any CPU
 		{43146EA8-6FCC-46B8-88B0-42F9BB5E6E0A}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
 		{43146EA8-6FCC-46B8-88B0-42F9BB5E6E0A}.MinSizeRel|x64.Build.0 = Debug|Any CPU
+		{43146EA8-6FCC-46B8-88B0-42F9BB5E6E0A}.MinSizeRel|Any CPU.ActiveCfg = MinSizeRel|Any CPU
+		{43146EA8-6FCC-46B8-88B0-42F9BB5E6E0A}.MinSizeRel|Any CPU.Build.0 = MinSizeRel|Any CPU
+		{43146EA8-6FCC-46B8-88B0-42F9BB5E6E0A}.MinSizeRel|x86.ActiveCfg = MinSizeRel|Any CPU
+		{43146EA8-6FCC-46B8-88B0-42F9BB5E6E0A}.MinSizeRel|x86.Build.0 = MinSizeRel|Any CPU
 		{43146EA8-6FCC-46B8-88B0-42F9BB5E6E0A}.Release|x64.ActiveCfg = Release|Any CPU
 		{43146EA8-6FCC-46B8-88B0-42F9BB5E6E0A}.Release|x64.Build.0 = Release|Any CPU
+		{43146EA8-6FCC-46B8-88B0-42F9BB5E6E0A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{43146EA8-6FCC-46B8-88B0-42F9BB5E6E0A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{43146EA8-6FCC-46B8-88B0-42F9BB5E6E0A}.Release|x86.ActiveCfg = Release|Any CPU
+		{43146EA8-6FCC-46B8-88B0-42F9BB5E6E0A}.Release|x86.Build.0 = Release|Any CPU
 		{43146EA8-6FCC-46B8-88B0-42F9BB5E6E0A}.RelWithDebInfo|x64.ActiveCfg = Debug|Any CPU
 		{43146EA8-6FCC-46B8-88B0-42F9BB5E6E0A}.RelWithDebInfo|x64.Build.0 = Debug|Any CPU
+		{43146EA8-6FCC-46B8-88B0-42F9BB5E6E0A}.RelWithDebInfo|Any CPU.ActiveCfg = RelWithDebInfo|Any CPU
+		{43146EA8-6FCC-46B8-88B0-42F9BB5E6E0A}.RelWithDebInfo|Any CPU.Build.0 = RelWithDebInfo|Any CPU
+		{43146EA8-6FCC-46B8-88B0-42F9BB5E6E0A}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|Any CPU
+		{43146EA8-6FCC-46B8-88B0-42F9BB5E6E0A}.RelWithDebInfo|x86.Build.0 = RelWithDebInfo|Any CPU
 		{6F22DB96-6EAB-4034-99D9-287021C36F01}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{6F22DB96-6EAB-4034-99D9-287021C36F01}.Debug|x64.Build.0 = Debug|Any CPU
+		{6F22DB96-6EAB-4034-99D9-287021C36F01}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6F22DB96-6EAB-4034-99D9-287021C36F01}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6F22DB96-6EAB-4034-99D9-287021C36F01}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6F22DB96-6EAB-4034-99D9-287021C36F01}.Debug|x86.Build.0 = Debug|Any CPU
 		{6F22DB96-6EAB-4034-99D9-287021C36F01}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
 		{6F22DB96-6EAB-4034-99D9-287021C36F01}.MinSizeRel|x64.Build.0 = Debug|Any CPU
+		{6F22DB96-6EAB-4034-99D9-287021C36F01}.MinSizeRel|Any CPU.ActiveCfg = MinSizeRel|Any CPU
+		{6F22DB96-6EAB-4034-99D9-287021C36F01}.MinSizeRel|Any CPU.Build.0 = MinSizeRel|Any CPU
+		{6F22DB96-6EAB-4034-99D9-287021C36F01}.MinSizeRel|x86.ActiveCfg = MinSizeRel|Any CPU
+		{6F22DB96-6EAB-4034-99D9-287021C36F01}.MinSizeRel|x86.Build.0 = MinSizeRel|Any CPU
 		{6F22DB96-6EAB-4034-99D9-287021C36F01}.Release|x64.ActiveCfg = Release|Any CPU
 		{6F22DB96-6EAB-4034-99D9-287021C36F01}.Release|x64.Build.0 = Release|Any CPU
+		{6F22DB96-6EAB-4034-99D9-287021C36F01}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6F22DB96-6EAB-4034-99D9-287021C36F01}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6F22DB96-6EAB-4034-99D9-287021C36F01}.Release|x86.ActiveCfg = Release|Any CPU
+		{6F22DB96-6EAB-4034-99D9-287021C36F01}.Release|x86.Build.0 = Release|Any CPU
 		{6F22DB96-6EAB-4034-99D9-287021C36F01}.RelWithDebInfo|x64.ActiveCfg = Debug|Any CPU
 		{6F22DB96-6EAB-4034-99D9-287021C36F01}.RelWithDebInfo|x64.Build.0 = Debug|Any CPU
+		{6F22DB96-6EAB-4034-99D9-287021C36F01}.RelWithDebInfo|Any CPU.ActiveCfg = RelWithDebInfo|Any CPU
+		{6F22DB96-6EAB-4034-99D9-287021C36F01}.RelWithDebInfo|Any CPU.Build.0 = RelWithDebInfo|Any CPU
+		{6F22DB96-6EAB-4034-99D9-287021C36F01}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|Any CPU
+		{6F22DB96-6EAB-4034-99D9-287021C36F01}.RelWithDebInfo|x86.Build.0 = RelWithDebInfo|Any CPU
 		{A5C33956-A41F-49B3-A41D-1082CBA59D02}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{A5C33956-A41F-49B3-A41D-1082CBA59D02}.Debug|x64.Build.0 = Debug|Any CPU
+		{A5C33956-A41F-49B3-A41D-1082CBA59D02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A5C33956-A41F-49B3-A41D-1082CBA59D02}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A5C33956-A41F-49B3-A41D-1082CBA59D02}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A5C33956-A41F-49B3-A41D-1082CBA59D02}.Debug|x86.Build.0 = Debug|Any CPU
 		{A5C33956-A41F-49B3-A41D-1082CBA59D02}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
 		{A5C33956-A41F-49B3-A41D-1082CBA59D02}.MinSizeRel|x64.Build.0 = Debug|Any CPU
+		{A5C33956-A41F-49B3-A41D-1082CBA59D02}.MinSizeRel|Any CPU.ActiveCfg = MinSizeRel|Any CPU
+		{A5C33956-A41F-49B3-A41D-1082CBA59D02}.MinSizeRel|Any CPU.Build.0 = MinSizeRel|Any CPU
+		{A5C33956-A41F-49B3-A41D-1082CBA59D02}.MinSizeRel|x86.ActiveCfg = MinSizeRel|Any CPU
+		{A5C33956-A41F-49B3-A41D-1082CBA59D02}.MinSizeRel|x86.Build.0 = MinSizeRel|Any CPU
 		{A5C33956-A41F-49B3-A41D-1082CBA59D02}.Release|x64.ActiveCfg = Release|Any CPU
 		{A5C33956-A41F-49B3-A41D-1082CBA59D02}.Release|x64.Build.0 = Release|Any CPU
+		{A5C33956-A41F-49B3-A41D-1082CBA59D02}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A5C33956-A41F-49B3-A41D-1082CBA59D02}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A5C33956-A41F-49B3-A41D-1082CBA59D02}.Release|x86.ActiveCfg = Release|Any CPU
+		{A5C33956-A41F-49B3-A41D-1082CBA59D02}.Release|x86.Build.0 = Release|Any CPU
 		{A5C33956-A41F-49B3-A41D-1082CBA59D02}.RelWithDebInfo|x64.ActiveCfg = Debug|Any CPU
 		{A5C33956-A41F-49B3-A41D-1082CBA59D02}.RelWithDebInfo|x64.Build.0 = Debug|Any CPU
+		{A5C33956-A41F-49B3-A41D-1082CBA59D02}.RelWithDebInfo|Any CPU.ActiveCfg = RelWithDebInfo|Any CPU
+		{A5C33956-A41F-49B3-A41D-1082CBA59D02}.RelWithDebInfo|Any CPU.Build.0 = RelWithDebInfo|Any CPU
+		{A5C33956-A41F-49B3-A41D-1082CBA59D02}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|Any CPU
+		{A5C33956-A41F-49B3-A41D-1082CBA59D02}.RelWithDebInfo|x86.Build.0 = RelWithDebInfo|Any CPU
 		{2FE745C3-1EDF-4421-8CD7-A63EE0C1AE43}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{2FE745C3-1EDF-4421-8CD7-A63EE0C1AE43}.Debug|x64.Build.0 = Debug|Any CPU
+		{2FE745C3-1EDF-4421-8CD7-A63EE0C1AE43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2FE745C3-1EDF-4421-8CD7-A63EE0C1AE43}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2FE745C3-1EDF-4421-8CD7-A63EE0C1AE43}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2FE745C3-1EDF-4421-8CD7-A63EE0C1AE43}.Debug|x86.Build.0 = Debug|Any CPU
 		{2FE745C3-1EDF-4421-8CD7-A63EE0C1AE43}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
 		{2FE745C3-1EDF-4421-8CD7-A63EE0C1AE43}.MinSizeRel|x64.Build.0 = Debug|Any CPU
+		{2FE745C3-1EDF-4421-8CD7-A63EE0C1AE43}.MinSizeRel|Any CPU.ActiveCfg = MinSizeRel|Any CPU
+		{2FE745C3-1EDF-4421-8CD7-A63EE0C1AE43}.MinSizeRel|Any CPU.Build.0 = MinSizeRel|Any CPU
+		{2FE745C3-1EDF-4421-8CD7-A63EE0C1AE43}.MinSizeRel|x86.ActiveCfg = MinSizeRel|Any CPU
+		{2FE745C3-1EDF-4421-8CD7-A63EE0C1AE43}.MinSizeRel|x86.Build.0 = MinSizeRel|Any CPU
 		{2FE745C3-1EDF-4421-8CD7-A63EE0C1AE43}.Release|x64.ActiveCfg = Release|Any CPU
 		{2FE745C3-1EDF-4421-8CD7-A63EE0C1AE43}.Release|x64.Build.0 = Release|Any CPU
+		{2FE745C3-1EDF-4421-8CD7-A63EE0C1AE43}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2FE745C3-1EDF-4421-8CD7-A63EE0C1AE43}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2FE745C3-1EDF-4421-8CD7-A63EE0C1AE43}.Release|x86.ActiveCfg = Release|Any CPU
+		{2FE745C3-1EDF-4421-8CD7-A63EE0C1AE43}.Release|x86.Build.0 = Release|Any CPU
 		{2FE745C3-1EDF-4421-8CD7-A63EE0C1AE43}.RelWithDebInfo|x64.ActiveCfg = Debug|Any CPU
 		{2FE745C3-1EDF-4421-8CD7-A63EE0C1AE43}.RelWithDebInfo|x64.Build.0 = Debug|Any CPU
+		{2FE745C3-1EDF-4421-8CD7-A63EE0C1AE43}.RelWithDebInfo|Any CPU.ActiveCfg = RelWithDebInfo|Any CPU
+		{2FE745C3-1EDF-4421-8CD7-A63EE0C1AE43}.RelWithDebInfo|Any CPU.Build.0 = RelWithDebInfo|Any CPU
+		{2FE745C3-1EDF-4421-8CD7-A63EE0C1AE43}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|Any CPU
+		{2FE745C3-1EDF-4421-8CD7-A63EE0C1AE43}.RelWithDebInfo|x86.Build.0 = RelWithDebInfo|Any CPU
 		{FDA791E0-2B91-4AD5-B91D-CF920A4C4E38}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{FDA791E0-2B91-4AD5-B91D-CF920A4C4E38}.Debug|x64.Build.0 = Debug|Any CPU
+		{FDA791E0-2B91-4AD5-B91D-CF920A4C4E38}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FDA791E0-2B91-4AD5-B91D-CF920A4C4E38}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FDA791E0-2B91-4AD5-B91D-CF920A4C4E38}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{FDA791E0-2B91-4AD5-B91D-CF920A4C4E38}.Debug|x86.Build.0 = Debug|Any CPU
 		{FDA791E0-2B91-4AD5-B91D-CF920A4C4E38}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
 		{FDA791E0-2B91-4AD5-B91D-CF920A4C4E38}.MinSizeRel|x64.Build.0 = Debug|Any CPU
+		{FDA791E0-2B91-4AD5-B91D-CF920A4C4E38}.MinSizeRel|Any CPU.ActiveCfg = MinSizeRel|Any CPU
+		{FDA791E0-2B91-4AD5-B91D-CF920A4C4E38}.MinSizeRel|Any CPU.Build.0 = MinSizeRel|Any CPU
+		{FDA791E0-2B91-4AD5-B91D-CF920A4C4E38}.MinSizeRel|x86.ActiveCfg = MinSizeRel|Any CPU
+		{FDA791E0-2B91-4AD5-B91D-CF920A4C4E38}.MinSizeRel|x86.Build.0 = MinSizeRel|Any CPU
 		{FDA791E0-2B91-4AD5-B91D-CF920A4C4E38}.Release|x64.ActiveCfg = Release|Any CPU
 		{FDA791E0-2B91-4AD5-B91D-CF920A4C4E38}.Release|x64.Build.0 = Release|Any CPU
+		{FDA791E0-2B91-4AD5-B91D-CF920A4C4E38}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FDA791E0-2B91-4AD5-B91D-CF920A4C4E38}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FDA791E0-2B91-4AD5-B91D-CF920A4C4E38}.Release|x86.ActiveCfg = Release|Any CPU
+		{FDA791E0-2B91-4AD5-B91D-CF920A4C4E38}.Release|x86.Build.0 = Release|Any CPU
 		{FDA791E0-2B91-4AD5-B91D-CF920A4C4E38}.RelWithDebInfo|x64.ActiveCfg = Debug|Any CPU
 		{FDA791E0-2B91-4AD5-B91D-CF920A4C4E38}.RelWithDebInfo|x64.Build.0 = Debug|Any CPU
+		{FDA791E0-2B91-4AD5-B91D-CF920A4C4E38}.RelWithDebInfo|Any CPU.ActiveCfg = RelWithDebInfo|Any CPU
+		{FDA791E0-2B91-4AD5-B91D-CF920A4C4E38}.RelWithDebInfo|Any CPU.Build.0 = RelWithDebInfo|Any CPU
+		{FDA791E0-2B91-4AD5-B91D-CF920A4C4E38}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|Any CPU
+		{FDA791E0-2B91-4AD5-B91D-CF920A4C4E38}.RelWithDebInfo|x86.Build.0 = RelWithDebInfo|Any CPU
 		{B945A183-2174-4ACB-B289-8A5C546656FE}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{B945A183-2174-4ACB-B289-8A5C546656FE}.Debug|x64.Build.0 = Debug|Any CPU
+		{B945A183-2174-4ACB-B289-8A5C546656FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B945A183-2174-4ACB-B289-8A5C546656FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B945A183-2174-4ACB-B289-8A5C546656FE}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B945A183-2174-4ACB-B289-8A5C546656FE}.Debug|x86.Build.0 = Debug|Any CPU
 		{B945A183-2174-4ACB-B289-8A5C546656FE}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
 		{B945A183-2174-4ACB-B289-8A5C546656FE}.MinSizeRel|x64.Build.0 = Debug|Any CPU
+		{B945A183-2174-4ACB-B289-8A5C546656FE}.MinSizeRel|Any CPU.ActiveCfg = MinSizeRel|Any CPU
+		{B945A183-2174-4ACB-B289-8A5C546656FE}.MinSizeRel|Any CPU.Build.0 = MinSizeRel|Any CPU
+		{B945A183-2174-4ACB-B289-8A5C546656FE}.MinSizeRel|x86.ActiveCfg = MinSizeRel|Any CPU
+		{B945A183-2174-4ACB-B289-8A5C546656FE}.MinSizeRel|x86.Build.0 = MinSizeRel|Any CPU
 		{B945A183-2174-4ACB-B289-8A5C546656FE}.Release|x64.ActiveCfg = Release|Any CPU
 		{B945A183-2174-4ACB-B289-8A5C546656FE}.Release|x64.Build.0 = Release|Any CPU
+		{B945A183-2174-4ACB-B289-8A5C546656FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B945A183-2174-4ACB-B289-8A5C546656FE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B945A183-2174-4ACB-B289-8A5C546656FE}.Release|x86.ActiveCfg = Release|Any CPU
+		{B945A183-2174-4ACB-B289-8A5C546656FE}.Release|x86.Build.0 = Release|Any CPU
 		{B945A183-2174-4ACB-B289-8A5C546656FE}.RelWithDebInfo|x64.ActiveCfg = Debug|Any CPU
 		{B945A183-2174-4ACB-B289-8A5C546656FE}.RelWithDebInfo|x64.Build.0 = Debug|Any CPU
-		{39AEA075-6457-46C0-8821-1158BE6EFA57}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{39AEA075-6457-46C0-8821-1158BE6EFA57}.Debug|x64.Build.0 = Debug|Any CPU
-		{39AEA075-6457-46C0-8821-1158BE6EFA57}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
-		{39AEA075-6457-46C0-8821-1158BE6EFA57}.MinSizeRel|x64.Build.0 = Debug|Any CPU
-		{39AEA075-6457-46C0-8821-1158BE6EFA57}.Release|x64.ActiveCfg = Release|Any CPU
-		{39AEA075-6457-46C0-8821-1158BE6EFA57}.Release|x64.Build.0 = Release|Any CPU
-		{39AEA075-6457-46C0-8821-1158BE6EFA57}.RelWithDebInfo|x64.ActiveCfg = Debug|Any CPU
-		{39AEA075-6457-46C0-8821-1158BE6EFA57}.RelWithDebInfo|x64.Build.0 = Debug|Any CPU
+		{B945A183-2174-4ACB-B289-8A5C546656FE}.RelWithDebInfo|Any CPU.ActiveCfg = RelWithDebInfo|Any CPU
+		{B945A183-2174-4ACB-B289-8A5C546656FE}.RelWithDebInfo|Any CPU.Build.0 = RelWithDebInfo|Any CPU
+		{B945A183-2174-4ACB-B289-8A5C546656FE}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|Any CPU
+		{B945A183-2174-4ACB-B289-8A5C546656FE}.RelWithDebInfo|x86.Build.0 = RelWithDebInfo|Any CPU
 		{9F6D7DE8-185B-4C1D-B809-3314D092DF28}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{9F6D7DE8-185B-4C1D-B809-3314D092DF28}.Debug|x64.Build.0 = Debug|Any CPU
+		{9F6D7DE8-185B-4C1D-B809-3314D092DF28}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9F6D7DE8-185B-4C1D-B809-3314D092DF28}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9F6D7DE8-185B-4C1D-B809-3314D092DF28}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9F6D7DE8-185B-4C1D-B809-3314D092DF28}.Debug|x86.Build.0 = Debug|Any CPU
 		{9F6D7DE8-185B-4C1D-B809-3314D092DF28}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
 		{9F6D7DE8-185B-4C1D-B809-3314D092DF28}.MinSizeRel|x64.Build.0 = Debug|Any CPU
+		{9F6D7DE8-185B-4C1D-B809-3314D092DF28}.MinSizeRel|Any CPU.ActiveCfg = MinSizeRel|Any CPU
+		{9F6D7DE8-185B-4C1D-B809-3314D092DF28}.MinSizeRel|Any CPU.Build.0 = MinSizeRel|Any CPU
+		{9F6D7DE8-185B-4C1D-B809-3314D092DF28}.MinSizeRel|x86.ActiveCfg = MinSizeRel|Any CPU
+		{9F6D7DE8-185B-4C1D-B809-3314D092DF28}.MinSizeRel|x86.Build.0 = MinSizeRel|Any CPU
 		{9F6D7DE8-185B-4C1D-B809-3314D092DF28}.Release|x64.ActiveCfg = Release|Any CPU
 		{9F6D7DE8-185B-4C1D-B809-3314D092DF28}.Release|x64.Build.0 = Release|Any CPU
+		{9F6D7DE8-185B-4C1D-B809-3314D092DF28}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9F6D7DE8-185B-4C1D-B809-3314D092DF28}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9F6D7DE8-185B-4C1D-B809-3314D092DF28}.Release|x86.ActiveCfg = Release|Any CPU
+		{9F6D7DE8-185B-4C1D-B809-3314D092DF28}.Release|x86.Build.0 = Release|Any CPU
 		{9F6D7DE8-185B-4C1D-B809-3314D092DF28}.RelWithDebInfo|x64.ActiveCfg = Debug|Any CPU
 		{9F6D7DE8-185B-4C1D-B809-3314D092DF28}.RelWithDebInfo|x64.Build.0 = Debug|Any CPU
+		{9F6D7DE8-185B-4C1D-B809-3314D092DF28}.RelWithDebInfo|Any CPU.ActiveCfg = RelWithDebInfo|Any CPU
+		{9F6D7DE8-185B-4C1D-B809-3314D092DF28}.RelWithDebInfo|Any CPU.Build.0 = RelWithDebInfo|Any CPU
+		{9F6D7DE8-185B-4C1D-B809-3314D092DF28}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|Any CPU
+		{9F6D7DE8-185B-4C1D-B809-3314D092DF28}.RelWithDebInfo|x86.Build.0 = RelWithDebInfo|Any CPU
 		{6BD3F6D8-B6FC-44E8-B8FE-06352F638B9B}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{6BD3F6D8-B6FC-44E8-B8FE-06352F638B9B}.Debug|x64.Build.0 = Debug|Any CPU
+		{6BD3F6D8-B6FC-44E8-B8FE-06352F638B9B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6BD3F6D8-B6FC-44E8-B8FE-06352F638B9B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6BD3F6D8-B6FC-44E8-B8FE-06352F638B9B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6BD3F6D8-B6FC-44E8-B8FE-06352F638B9B}.Debug|x86.Build.0 = Debug|Any CPU
 		{6BD3F6D8-B6FC-44E8-B8FE-06352F638B9B}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
 		{6BD3F6D8-B6FC-44E8-B8FE-06352F638B9B}.MinSizeRel|x64.Build.0 = Debug|Any CPU
+		{6BD3F6D8-B6FC-44E8-B8FE-06352F638B9B}.MinSizeRel|Any CPU.ActiveCfg = MinSizeRel|Any CPU
+		{6BD3F6D8-B6FC-44E8-B8FE-06352F638B9B}.MinSizeRel|Any CPU.Build.0 = MinSizeRel|Any CPU
+		{6BD3F6D8-B6FC-44E8-B8FE-06352F638B9B}.MinSizeRel|x86.ActiveCfg = MinSizeRel|Any CPU
+		{6BD3F6D8-B6FC-44E8-B8FE-06352F638B9B}.MinSizeRel|x86.Build.0 = MinSizeRel|Any CPU
 		{6BD3F6D8-B6FC-44E8-B8FE-06352F638B9B}.Release|x64.ActiveCfg = Release|Any CPU
 		{6BD3F6D8-B6FC-44E8-B8FE-06352F638B9B}.Release|x64.Build.0 = Release|Any CPU
+		{6BD3F6D8-B6FC-44E8-B8FE-06352F638B9B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6BD3F6D8-B6FC-44E8-B8FE-06352F638B9B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6BD3F6D8-B6FC-44E8-B8FE-06352F638B9B}.Release|x86.ActiveCfg = Release|Any CPU
+		{6BD3F6D8-B6FC-44E8-B8FE-06352F638B9B}.Release|x86.Build.0 = Release|Any CPU
 		{6BD3F6D8-B6FC-44E8-B8FE-06352F638B9B}.RelWithDebInfo|x64.ActiveCfg = Debug|Any CPU
 		{6BD3F6D8-B6FC-44E8-B8FE-06352F638B9B}.RelWithDebInfo|x64.Build.0 = Debug|Any CPU
+		{6BD3F6D8-B6FC-44E8-B8FE-06352F638B9B}.RelWithDebInfo|Any CPU.ActiveCfg = RelWithDebInfo|Any CPU
+		{6BD3F6D8-B6FC-44E8-B8FE-06352F638B9B}.RelWithDebInfo|Any CPU.Build.0 = RelWithDebInfo|Any CPU
+		{6BD3F6D8-B6FC-44E8-B8FE-06352F638B9B}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|Any CPU
+		{6BD3F6D8-B6FC-44E8-B8FE-06352F638B9B}.RelWithDebInfo|x86.Build.0 = RelWithDebInfo|Any CPU
+		{39AEA075-6457-46C0-8821-1158BE6EFA57}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{39AEA075-6457-46C0-8821-1158BE6EFA57}.Debug|x64.Build.0 = Debug|Any CPU
+		{39AEA075-6457-46C0-8821-1158BE6EFA57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{39AEA075-6457-46C0-8821-1158BE6EFA57}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{39AEA075-6457-46C0-8821-1158BE6EFA57}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{39AEA075-6457-46C0-8821-1158BE6EFA57}.Debug|x86.Build.0 = Debug|Any CPU
+		{39AEA075-6457-46C0-8821-1158BE6EFA57}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
+		{39AEA075-6457-46C0-8821-1158BE6EFA57}.MinSizeRel|x64.Build.0 = Debug|Any CPU
+		{39AEA075-6457-46C0-8821-1158BE6EFA57}.MinSizeRel|Any CPU.ActiveCfg = MinSizeRel|Any CPU
+		{39AEA075-6457-46C0-8821-1158BE6EFA57}.MinSizeRel|Any CPU.Build.0 = MinSizeRel|Any CPU
+		{39AEA075-6457-46C0-8821-1158BE6EFA57}.MinSizeRel|x86.ActiveCfg = MinSizeRel|Any CPU
+		{39AEA075-6457-46C0-8821-1158BE6EFA57}.MinSizeRel|x86.Build.0 = MinSizeRel|Any CPU
+		{39AEA075-6457-46C0-8821-1158BE6EFA57}.Release|x64.ActiveCfg = Release|Any CPU
+		{39AEA075-6457-46C0-8821-1158BE6EFA57}.Release|x64.Build.0 = Release|Any CPU
+		{39AEA075-6457-46C0-8821-1158BE6EFA57}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{39AEA075-6457-46C0-8821-1158BE6EFA57}.Release|Any CPU.Build.0 = Release|Any CPU
+		{39AEA075-6457-46C0-8821-1158BE6EFA57}.Release|x86.ActiveCfg = Release|Any CPU
+		{39AEA075-6457-46C0-8821-1158BE6EFA57}.Release|x86.Build.0 = Release|Any CPU
+		{39AEA075-6457-46C0-8821-1158BE6EFA57}.RelWithDebInfo|x64.ActiveCfg = Debug|Any CPU
+		{39AEA075-6457-46C0-8821-1158BE6EFA57}.RelWithDebInfo|x64.Build.0 = Debug|Any CPU
+		{39AEA075-6457-46C0-8821-1158BE6EFA57}.RelWithDebInfo|Any CPU.ActiveCfg = RelWithDebInfo|Any CPU
+		{39AEA075-6457-46C0-8821-1158BE6EFA57}.RelWithDebInfo|Any CPU.Build.0 = RelWithDebInfo|Any CPU
+		{39AEA075-6457-46C0-8821-1158BE6EFA57}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|Any CPU
+		{39AEA075-6457-46C0-8821-1158BE6EFA57}.RelWithDebInfo|x86.Build.0 = RelWithDebInfo|Any CPU
+		{F3DC52D7-8C59-4EC0-86D9-0E5732EAFCF7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F3DC52D7-8C59-4EC0-86D9-0E5732EAFCF7}.Debug|x64.Build.0 = Debug|Any CPU
+		{F3DC52D7-8C59-4EC0-86D9-0E5732EAFCF7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F3DC52D7-8C59-4EC0-86D9-0E5732EAFCF7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F3DC52D7-8C59-4EC0-86D9-0E5732EAFCF7}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F3DC52D7-8C59-4EC0-86D9-0E5732EAFCF7}.Debug|x86.Build.0 = Debug|Any CPU
+		{F3DC52D7-8C59-4EC0-86D9-0E5732EAFCF7}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
+		{F3DC52D7-8C59-4EC0-86D9-0E5732EAFCF7}.MinSizeRel|x64.Build.0 = Debug|Any CPU
+		{F3DC52D7-8C59-4EC0-86D9-0E5732EAFCF7}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU
+		{F3DC52D7-8C59-4EC0-86D9-0E5732EAFCF7}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU
+		{F3DC52D7-8C59-4EC0-86D9-0E5732EAFCF7}.MinSizeRel|x86.ActiveCfg = Debug|Any CPU
+		{F3DC52D7-8C59-4EC0-86D9-0E5732EAFCF7}.MinSizeRel|x86.Build.0 = Debug|Any CPU
+		{F3DC52D7-8C59-4EC0-86D9-0E5732EAFCF7}.Release|x64.ActiveCfg = Release|Any CPU
+		{F3DC52D7-8C59-4EC0-86D9-0E5732EAFCF7}.Release|x64.Build.0 = Release|Any CPU
+		{F3DC52D7-8C59-4EC0-86D9-0E5732EAFCF7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F3DC52D7-8C59-4EC0-86D9-0E5732EAFCF7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F3DC52D7-8C59-4EC0-86D9-0E5732EAFCF7}.Release|x86.ActiveCfg = Release|Any CPU
+		{F3DC52D7-8C59-4EC0-86D9-0E5732EAFCF7}.Release|x86.Build.0 = Release|Any CPU
+		{F3DC52D7-8C59-4EC0-86D9-0E5732EAFCF7}.RelWithDebInfo|x64.ActiveCfg = Debug|Any CPU
+		{F3DC52D7-8C59-4EC0-86D9-0E5732EAFCF7}.RelWithDebInfo|x64.Build.0 = Debug|Any CPU
+		{F3DC52D7-8C59-4EC0-86D9-0E5732EAFCF7}.RelWithDebInfo|Any CPU.ActiveCfg = Debug|Any CPU
+		{F3DC52D7-8C59-4EC0-86D9-0E5732EAFCF7}.RelWithDebInfo|Any CPU.Build.0 = Debug|Any CPU
+		{F3DC52D7-8C59-4EC0-86D9-0E5732EAFCF7}.RelWithDebInfo|x86.ActiveCfg = Debug|Any CPU
+		{F3DC52D7-8C59-4EC0-86D9-0E5732EAFCF7}.RelWithDebInfo|x86.Build.0 = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {422D1620-0166-4C26-9A81-CA8A2EB1AB58}
-	EndGlobalSection
-	GlobalSection(Performance) = preSolution
-		HasPerformanceSessions = true
-	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{C09ED521-D2DF-40BC-A76F-EB3CB870B2F6} = {267F81EF-A8AB-49FD-9F56-D7EC3C1F7C7C}
 		{EF26A475-6101-4C9C-A717-D60BB92A2302} = {C09ED521-D2DF-40BC-A76F-EB3CB870B2F6}
@@ -215,8 +532,15 @@ Global
 		{2FE745C3-1EDF-4421-8CD7-A63EE0C1AE43} = {C09ED521-D2DF-40BC-A76F-EB3CB870B2F6}
 		{FDA791E0-2B91-4AD5-B91D-CF920A4C4E38} = {C09ED521-D2DF-40BC-A76F-EB3CB870B2F6}
 		{B945A183-2174-4ACB-B289-8A5C546656FE} = {C09ED521-D2DF-40BC-A76F-EB3CB870B2F6}
-		{39AEA075-6457-46C0-8821-1158BE6EFA57} = {C09ED521-D2DF-40BC-A76F-EB3CB870B2F6}
 		{9F6D7DE8-185B-4C1D-B809-3314D092DF28} = {C09ED521-D2DF-40BC-A76F-EB3CB870B2F6}
 		{6BD3F6D8-B6FC-44E8-B8FE-06352F638B9B} = {C09ED521-D2DF-40BC-A76F-EB3CB870B2F6}
+		{39AEA075-6457-46C0-8821-1158BE6EFA57} = {C09ED521-D2DF-40BC-A76F-EB3CB870B2F6}
+		{F3DC52D7-8C59-4EC0-86D9-0E5732EAFCF7} = {C09ED521-D2DF-40BC-A76F-EB3CB870B2F6}
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {422D1620-0166-4C26-9A81-CA8A2EB1AB58}
+	EndGlobalSection
+	GlobalSection(Performance) = preSolution
+		HasPerformanceSessions = true
 	EndGlobalSection
 EndGlobal

cmake/Protobuf.cmake

@@ -1,164 +0,0 @@
-set(Protobuf_PROTOC_EXECUTABLE "${EXTERNALS_BIN}/protoc")
-set(PROTOBUF_INCLUDE_DIRS "${EXTERNALS_INCLUDE}")
-set(PROTOBUF_STATIC_LIB "libprotobuf")
-set(_protobuf_src_dir ${CMAKE_SOURCE_DIR}/src/lib_spark)
-set(_protobuf_bin_dir ${CMAKE_BINARY_DIR}/src/lib_spark)
-
-function(Protobuf_Generate_Cpp)
-  set(_options)
-  set(_one_value_args CXX_SOURCES CXX_HEADERS CXX_OUT_DIR)
-  set(_multi_value_args PROTO_INCLUDE_DIRS PROTO_SOURCES)
-  cmake_parse_arguments(_ARGS "${_options}" "${_one_value_args}" "${_multi_value_args}" ${ARGN})
-  set(${_ARGS_CXX_SOURCES})
-  set(${_ARGS_CXX_HEADERS})
-
-  set(_proto_include_cli_args)
-  foreach(_dir ${_ARGS_PROTO_INCLUDE_DIRS})
-    list(APPEND _proto_include_cli_args -I ${_dir})
-  endforeach()
-
-  foreach(FIL ${_ARGS_PROTO_SOURCES})
-    get_filename_component(ABS_FIL ${FIL} ABSOLUTE)
-    get_filename_component(FIL_WE ${FIL} NAME_WE)
-    get_filename_component(FIL_DIR ${FIL} DIRECTORY)
-    if(FIL_DIR)
-      set(FIL_WE "${FIL_DIR}/${FIL_WE}")
-    endif()
-
-    list(APPEND ${_ARGS_CXX_SOURCES} "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.pb.cc")
-    list(APPEND ${_ARGS_CXX_HEADERS} "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.pb.h")
-
-    add_custom_command(
-      OUTPUT "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.pb.cc"
-             "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.pb.h"
-      COMMAND
-        ${Protobuf_PROTOC_EXECUTABLE} ARGS --cpp_out=${_ARGS_CXX_OUT_DIR} ${_proto_include_cli_args} ${ABS_FIL}
-      DEPENDS ${ABS_FIL}
-      COMMENT "Running C++ protocol buffer compiler on ${FIL}"
-      VERBATIM)
-  endforeach()
-
-  set_source_files_properties(${${_ARGS_CXX_SOURCES}} ${${_ARGS_CXX_HEADERS}} PROPERTIES GENERATED TRUE)
-
-  # remove some warnings from protobuf generated files
-  if(WIN32)
-    set_source_files_properties(${${_ARGS_CXX_SOURCES}} PROPERTIES COMPILE_FLAGS
-                                                      "/wd4309 /wd4838")
-  else()
-    set_source_files_properties(
-      ${${_ARGS_CXX_SOURCES}}
-      PROPERTIES
-        COMPILE_FLAGS
-        "-Wno-unused-parameter -Wno-effc++ -Wno-pedantic -Wno-sign-compare -Wno-uninitialized"
-    )
-  endif()
-
-  set(${_ARGS_CXX_SOURCES}
-      ${${_ARGS_CXX_SOURCES}}
-      PARENT_SCOPE)
-  set(${_ARGS_CXX_HEADERS}
-      ${${_ARGS_CXX_HEADERS}}
-      PARENT_SCOPE)
-endfunction()
-
-function(Service_Compiler_Generate_Cpp)
-  set(_options)
-  set(_one_value_args CXX_SOURCES CXX_HEADERS CXX_OUT_DIR)
-  set(_multi_value_args PROTO_INCLUDE_DIRS PROTO_SOURCES)
-  cmake_parse_arguments(_ARGS "${_options}" "${_one_value_args}" "${_multi_value_args}" ${ARGN})
-  set(${_ARGS_CXX_SOURCES})
-  set(${_ARGS_CXX_HEADERS})
-
-  set(_proto_include_cli_args)
-  foreach(_dir ${_ARGS_PROTO_INCLUDE_DIRS})
-    list(APPEND _proto_include_cli_args -I ${_dir})
-  endforeach()
-
-  foreach(FIL ${_ARGS_PROTO_SOURCES})
-    get_filename_component(ABS_FIL ${FIL} ABSOLUTE)
-    get_filename_component(FIL_WE ${FIL} NAME_WE)
-    get_filename_component(FIL_DIR ${FIL} DIRECTORY)
-    if(FIL_DIR)
-      set(FIL_WE "${FIL_DIR}/${FIL_WE}")
-    endif()
-
-    list(APPEND ${_ARGS_CXX_SOURCES} "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.pb.cc")
-    list(APPEND ${_ARGS_CXX_HEADERS} "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.pb.h")
-
-    list(APPEND ${_ARGS_CXX_SOURCES} "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.client.pb.cc")
-    list(APPEND ${_ARGS_CXX_HEADERS} "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.client.pb.h")
-
-    list(APPEND ${_ARGS_CXX_SOURCES} "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.server.pb.cc")
-    list(APPEND ${_ARGS_CXX_HEADERS} "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.server.pb.h")
-
-    set(TEMPLATES
-        ${CMAKE_SOURCE_DIR}/src/lib_spark/spark/api/service_compiler/templates/cpp/client.pb.cc
-        ${CMAKE_SOURCE_DIR}/src/lib_spark/spark/api/service_compiler/templates/cpp/client.pb.h
-        ${CMAKE_SOURCE_DIR}/src/lib_spark/spark/api/service_compiler/templates/cpp/server.pb.cc
-        ${CMAKE_SOURCE_DIR}/src/lib_spark/spark/api/service_compiler/templates/cpp/server.pb.h
-    )
-
-    set(_plugin_py ${CMAKE_SOURCE_DIR}/src/lib_spark/spark/api/service_compiler/plugin.py)
-    if(WIN32)
-      set(_plugin_cmd ${CMAKE_SOURCE_DIR}/src/lib_spark/spark/api/service_compiler/plugin.cmd)
-      add_custom_command(
-        OUTPUT "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.pb.cc"
-               "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.pb.h"
-               "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.client.pb.cc"
-               "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.client.pb.h"
-               "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.server.pb.cc"
-               "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.server.pb.h"
-        COMMAND SET PYTHONPATH=${SPARK_PYTHON}
-        COMMAND ${CMAKE_SOURCE_DIR}/.venv/Scripts/activate.bat
-        COMMAND
-          ${Protobuf_PROTOC_EXECUTABLE} ARGS --cpp_out=${_ARGS_CXX_OUT_DIR}
-          --plugin=protoc-gen-service=${_plugin_cmd}
-          --service_out=lang=cpp:${_ARGS_CXX_OUT_DIR} -I
-          ${PROTOBUF_INCLUDE_DIRS} -I ${_protobuf_src_dir} ${ABS_FIL}
-        DEPENDS ${ABS_FIL} ${TEMPLATES} ${_plugin_cmd} ${_plugin_py}
-        COMMENT "Running C++ service compiler on ${FIL}"
-        VERBATIM)
-    else()
-      add_custom_command(
-        OUTPUT "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.pb.cc"
-               "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.pb.h"
-               "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.client.pb.cc"
-               "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.client.pb.h"
-               "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.server.pb.cc"
-               "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.server.pb.h"
-        COMMAND ${CMAKE_SOURCE_DIR}/tools/venv_exec.sh
-        ARGS
-          ${Protobuf_PROTOC_EXECUTABLE}
-          --cpp_out=${_ARGS_CXX_OUT_DIR}
-          --plugin=protoc-gen-service=${_plugin_py}
-          --service_out=lang=cpp,make_file_name=${ABS_FIL}:${_ARGS_CXX_OUT_DIR}
-          ${_proto_include_cli_args} ${ABS_FIL}
-        DEPENDS ${ABS_FIL} ${TEMPLATES} ${_plugin_py}
-        COMMENT "Running C++ service compiler on ${FIL}"
-        VERBATIM)
-    endif()
-
-  endforeach()
-
-  # remove some warnings from protobuf generated files
-  if(WIN32)
-    set_source_files_properties(${${_ARGS_CXX_SOURCES}} PROPERTIES COMPILE_FLAGS
-                                                      "/wd4309 /wd4838")
-  else()
-    set_source_files_properties(
-      ${${_ARGS_CXX_SOURCES}}
-      PROPERTIES
-        COMPILE_FLAGS
-        "-Wno-unused-parameter -Wno-effc++ -Wno-pedantic -Wno-sign-compare -Wno-uninitialized"
-    )
-  endif()
-
-  set(${_ARGS_CXX_SOURCES}
-      ${${_ARGS_CXX_SOURCES}}
-      PARENT_SCOPE)
-  set(${_ARGS_CXX_HEADERS}
-      ${${_ARGS_CXX_HEADERS}}
-      PARENT_SCOPE)
-
-endfunction()
-

compose.yaml

@@ -1,7 +1,7 @@
 services:
   sparkd:
     volumes:
-      - ${SPARKD__DATA_DIR:-sparkd_data}:/home/bts/sparkdata/data
+      - ${SPARKD__DATA_DIR:-sparkd_data}:/home/bts/.local/share/bts/sparkd/data
     build:
       dockerfile: src/app_sparkd/Dockerfile
       args:
@@ -12,19 +12,19 @@ services:
     shm_size: "${SPARKD__SHM_SIZE:-512mb}"
     command: >
       sh -c "
-        echo bts | sudo -S chown -R bts:bts /home/bts/sparkdata/data
-        if [ -e "/home/bts/sparkdata/data/logging.sparkd/log" ]; then
-          mv "/home/bts/sparkdata/data/logging.sparkd/log" "/home/bts/sparkdata/data/logging.sparkd/log_$(date '+%Y%m%d-%H%M')"
+        echo bts | sudo -S chown -R bts:bts /home/bts/.local/share/bts/sparkd/data
+        if [ -e "/home/bts/.local/share/bts/sparkd/data/logging.sparkd/log" ]; then
+          mv "/home/bts/.local/share/bts/sparkd/data/logging.sparkd/log" "/home/bts/.local/share/bts/sparkd/data/logging.sparkd/log_$(date '+%Y%m%d-%H%M')"
         fi
-        if [ -e "/home/bts/sparkdata/conf/.env.local" ]; then
-          echo 'Sourcing /home/bts/sparkdata/conf/.env.local'
+        if [ -e "/home/bts/.local/share/bts/conf/.env.local" ]; then
+          echo 'Sourcing /home/bts/.local/share/bts/conf/.env.local'
           set -a
-          . /home/bts/sparkdata/conf/.env.local
+          . /home/bts/.local/share/bts/sparkd/conf/.env.local
           set +a
         fi
-        if [ -d /home/bts/sparkdata/conf/plugins ]; then
-          echo 'Copying /home/bts/sparkdata/conf/plugins to runtime dir (/home/bts/bin)'
-          cp -r /home/bts/sparkdata/conf/plugins /home/bts/bin/
+        if [ -d /home/bts/.local/share/bts/sparkd/conf/plugins ]; then
+          echo 'Copying /home/bts/.local/share/bts/sparkd/conf/plugins to runtime dir (/home/bts/bin)'
+          cp -r /home/bts/.local/share/bts/sparkd/conf/plugins /home/bts/bin/
         fi
         ./sparkd run"
     env_file:
@@ -41,8 +41,8 @@ services:
 
   sparkd-symbols:
     volumes:
-      - ${SPARKD__DATA_DIR:-sparkd_data}:/home/bts/sparkdata/data
-      - ${SPARKD__RUNTIME_CONF_DIR:-sparkd_conf}:/home/bts/sparkdata/conf
+      - ${SPARKD__DATA_DIR:-sparkd_data}:/home/bts/.local/share/bts/sparkd/data
+      - ${SPARKD__RUNTIME_CONF_DIR:-sparkd_conf}:/home/bts/.local/share/bts/sparkd/conf
     build:
       dockerfile: src/app_sparkd/Dockerfile
       args:
@@ -53,21 +53,21 @@ services:
     shm_size: "${SPARKD__SHM_SIZE:-512mb}"
     command: >
       sh -c "
-        echo bts | sudo -S chown -R bts:bts /home/bts/sparkdata
-        if [ -e "/home/bts/sparkdata/data/logging.sparkd/log" ]; then
-          mv "/home/bts/sparkdata/data/logging.sparkd/log" "/home/bts/sparkdata/data/logging.sparkd/log_$(date '+%Y%m%d-%H%M')"
+        echo bts | sudo -S chown -R bts:bts /home/bts/.local/share/bts/sparkd
+        if [ -e "/home/bts/.local/share/bts/sparkd/data/logging.sparkd/log" ]; then
+          mv "/home/bts/.local/share/bts/sparkd/data/logging.sparkd/log" "/home/bts/.local/share/bts/sparkd/data/logging.sparkd/log_$(date '+%Y%m%d-%H%M')"
         fi
-        ls -alh /home/bts/sparkdata/conf/
-        cat /home/bts/sparkdata/conf/.env.local
-        if [ -e "/home/bts/sparkdata/conf/.env.local" ]; then
-          echo 'Sourcing /home/bts/sparkdata/conf/.env.local'
+        ls -alh /home/bts/.local/share/bts/sparkd/conf/
+        cat /home/bts/.local/share/bts/sparkd/conf/.env.local
+        if [ -e "/home/bts/.local/share/bts/sparkd/conf/.env.local" ]; then
+          echo 'Sourcing /home/bts/.local/share/bts/sparkd/conf/.env.local'
           set -a
-          . /home/bts/sparkdata/conf/.env.local
+          . /home/bts/.local/share/bts/sparkd/conf/.env.local
           set +a
         fi
-        if [ -d /home/bts/sparkdata/conf/plugins ]; then
-          echo 'Copying /home/bts/sparkdata/conf/plugins to runtime dir (/home/bts/bin)'
-          cp -r /home/bts/sparkdata/conf/plugins /home/bts/bin/
+        if [ -d /home/bts/.local/share/bts/sparkd/conf/plugins ]; then
+          echo 'Copying /home/bts/.local/share/bts/sparkd/conf/plugins to runtime dir (/home/bts/bin)'
+          cp -r /home/bts/.local/share/bts/sparkd/conf/plugins /home/bts/bin/
         fi
         ./sparkd run"
     env_file:
@@ -86,15 +86,15 @@ services:
           memory: "${SPARKD__MEMORY:-4gb}"
 
   sparkd-tail:
-    image: bluetradingsystems/linux_dotnet7
+    image: bluetradingsystems/linux_dotnet8
     volumes:
       - type: volume
         read_only: true
         source: sparkd_data
-        target: /home/bts/sparkdata/data/logging.sparkd
+        target: /home/bts/.local/share/bts/sparkd/data/logging.sparkd
         volume:
           subpath: logging.sparkd
-    command: ["tail", "-f", "/home/bts/sparkdata/data/logging.sparkd/log"]
+    command: ["tail", "-f", "/home/bts/.local/share/bts/sparkd/data/logging.sparkd/log"]
 
   sparkd-ping-test:
     depends_on:
@@ -104,11 +104,94 @@ services:
     build:
       context: .
       dockerfile_inline: |
-        FROM bluetradingsystems/linux_dotnet7
+        FROM bluetradingsystems/linux_dotnet8
         USER "root"
         RUN apt-get update && apt-get -y install iputils-ping
     command: [ "ping", "sparkd" ]
 
+  pubsub:
+    volumes:
+      - ${PUBSUB__DATA_DIR:-pubsub_data}:/home/bts/.local/share/bts/pubsub/data
+    build:
+      dockerfile: src/DataStreamSuite/PubSubServer/Dockerfile
+      args:
+        - SOURCE_DIR=${PUBSUB__SOURCE_DIR}
+        - CONFIG_DIR=${PUBSUB__CONFIG_DIR}
+    ports:
+      - 22019:22019
+    command: >
+      sh -c "
+        echo bts | sudo -S chown -R bts:bts /home/bts/.local/share/bts/pubsub/data
+        if [ -e "/home/bts/.local/share/bts/pubsub/data/logging.PubSubServer/log" ]; then
+          mv "/home/bts/.local/share/bts/pubsub/data/logging.PubSubServer/log" "/home/bts/.local/share/bts/pubsub/data/logging.PubSubServer/log_$(date '+%Y%m%d-%H%M')"
+        fi
+        if [ -e "/home/bts/.local/share/bts/pubsub/conf/.env" ]; then
+          echo 'Sourcing /home/bts/.local/share/bts/pubsub/conf/.env'
+          set -a
+          . /home/bts/.local/share/bts/pubsub/conf/.env
+          set +a
+        fi
+        if [ -e "/home/bts/.local/share/bts/pubsub/conf/.env.local" ]; then
+          echo 'Sourcing /home/bts/.local/share/bts/pubsub/conf/.env.local'
+          set -a
+          . /home/bts/.local/share/bts/pubsub/conf/.env.local
+          set +a
+        fi
+        ./PubSubServer"
+    env_file:
+      - .env
+      - ${PUBSUB__CONFIG_DIR}/.env
+
+  md-publisher:
+    volumes:
+      - ${MD_PUBLISHER__DATA_DIR:-md_publisher_data}:/home/bts/.local/share/bts/md_publisher/data
+      - historic_md:/home/bts/.local/share/bts/md_publisher/data/databento
+    build:
+      dockerfile: src/DataStreamSuite/DataStreamPublisher/Dockerfile
+      args:
+        - SOURCE_DIR=${MD_PUBLISHER__SOURCE_DIR}
+        - CONFIG_DIR=${MD_PUBLISHER__CONFIG_DIR}
+    command: >
+      sh -c "
+        echo bts | sudo -S chown -R bts:bts /home/bts/.local/share/bts/md_publisher/data
+        if [ -e "/home/bts/.local/share/bts/md_publisher/data/logging.DataStreamPublisher/log" ]; then
+          mv "/home/bts/.local/share/bts/md_publisher/data/logging.DataStreamPublisher/log" "/home/bts/.local/share/bts/md_publisher/data/logging.DataStreamPublisher/log_$(date '+%Y%m%d-%H%M')"
+        fi
+        if [ -e "/home/bts/.local/share/bts/md_publisher/conf/.env" ]; then
+          echo 'Sourcing /home/bts/.local/share/bts/md_publisher/conf/.env'
+          set -a
+          . /home/bts/.local/share/bts/md_publisher/conf/.env
+          set +a
+        fi
+        if [ -e "/home/bts/.local/share/bts/md_publisher/conf/.env.local" ]; then
+          echo 'Sourcing /home/bts/.local/share/bts/md_publisher/conf/.env.local'
+          set -a
+          . /home/bts/.local/share/bts/md_publisher/conf/.env.local
+          set +a
+        fi
+      dockerize -wait tcp://pubsub:22019 -timeout 10s ./DataStreamPublisher"
+    env_file:
+      - .env
+      - ${MD_PUBLISHER__CONFIG_DIR}/.env
+
+  api-server:
+    depends_on:
+      - sparkd
+    ports:
+      - 8008:8008
+      - 9443:9443
+    build:
+      dockerfile: src/client/spark_api_server/Dockerfile
+    command: [ "dockerize", "-wait", "tcp://sparkd:8000", "-timeout", "10s", "./spark_api_server", "run" ]
+    environment:
+      - ASPNETCORE_ENVIRONMENT=Staging
+
 volumes:
   sparkd_data:
     name: "sparkd_${SPARKD__CONFIG_PORT:-8000}"
+  pubsub_data:
+    name: "pubsub_22019"
+  md_publisher_data:
+    name: "md_publisher_22019"
+  historic_md:
+    name: "historic_md"

docker/images/bluetradingsystems/linux_dotnet8/Dockerfile

@@ -0,0 +1,38 @@
+FROM ubuntu:22.04
+
+ARG DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get update && apt-get install -y pkg-config
+RUN apt-get update && apt-get install -y locales
+RUN apt-get update && apt-get install -y ca-certificates
+RUN apt-get update && apt-get install -y libssh2-1-dev
+RUN apt-get update && apt-get install -y software-properties-common
+RUN apt-get update && apt-get install -y sudo
+
+# GCC
+ARG gcc_major=13
+RUN add-apt-repository ppa:ubuntu-toolchain-r/test \
+  && apt-get update \
+  && apt-get install -y g++-$gcc_major
+
+RUN apt-get update \
+  && apt-get install -y dotnet8
+
+RUN locale-gen en_US.UTF-8
+
+ARG docker_user="bts"
+ARG docker_uid="1000"
+ARG docker_pass="bts"
+
+RUN \
+  groupadd -g "$docker_uid" "$docker_user" \
+  && useradd \
+  -m \
+  -u "$docker_uid" \
+  -g "$docker_uid" \
+  -G sudo \
+  --password "$(openssl passwd -1 "$docker_pass")" \
+  "$docker_user"
+
+USER bts
+WORKDIR /home/bts

spark_client.sln

@@ -1,14 +1,15 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
+
+Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.3.32922.545
 MinimumVisualStudioVersion = 15.0.26124.0
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "spark_api", "src\client\spark_api\spark_api.csproj", "{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bts.Spark.Api", "src\cs\Bts.Spark.Api\Bts.Spark.Api.csproj", "{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spark", "src\client\spark\Spark.csproj", "{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spark.Console", "src\client\Spark.Console\Spark.Console.csproj", "{387566C6-C6F6-412C-A30C-9855BBCB4816}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "spark_core", "src\client\spark_core\spark_core.csproj", "{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bts.Spark.Core", "src\cs\Bts.Spark.Core\Bts.Spark.Core.csproj", "{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "spark_sdk", "src\client\spark_sdk\spark_sdk.csproj", "{6963C314-83C4-4667-B0D0-C2F7AE208C29}"
 EndProject
@@ -26,114 +27,375 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharedStreams", "src\DataSt
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PubSub", "src\DataStreamSuite\PubSub\PubSub.csproj", "{51C40BA9-F226-4A35-939D-1ED6F5FF7299}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{827E0CD3-B72D-47B6-A68D-7590B98EB39B}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DataStreamSuite", "DataStreamSuite", "{60E0D592-FFB3-0D0A-C4AA-E88919B48F9D}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bts.Net", "src\DataStreamSuite\Bts.Net\Bts.Net.csproj", "{5DE3B533-DCE6-4BF4-8F7E-08C440E177B4}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bts.Extensions.Hosting", "src\DataStreamSuite\Bts.Extensions.Hosting\Bts.Extensions.Hosting.csproj", "{90A48718-F6A7-4747-97EA-89632B451008}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x64 = Debug|x64
+		Debug|Any CPU = Debug|Any CPU
+		Debug|x86 = Debug|x86
 		MinSizeRel|x64 = MinSizeRel|x64
+		MinSizeRel|Any CPU = MinSizeRel|Any CPU
+		MinSizeRel|x86 = MinSizeRel|x86
 		Release|x64 = Release|x64
+		Release|Any CPU = Release|Any CPU
+		Release|x86 = Release|x86
 		RelWithDebInfo|x64 = RelWithDebInfo|x64
+		RelWithDebInfo|Any CPU = RelWithDebInfo|Any CPU
+		RelWithDebInfo|x86 = RelWithDebInfo|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Debug|x64.ActiveCfg = Debug|x64
 		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Debug|x64.Build.0 = Debug|x64
+		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Debug|x86.Build.0 = Debug|Any CPU
 		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.MinSizeRel|x64.ActiveCfg = Release|x64
 		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.MinSizeRel|x64.Build.0 = Release|x64
+		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.MinSizeRel|Any CPU.ActiveCfg = MinSizeRel|Any CPU
+		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.MinSizeRel|Any CPU.Build.0 = MinSizeRel|Any CPU
+		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.MinSizeRel|x86.ActiveCfg = MinSizeRel|Any CPU
+		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.MinSizeRel|x86.Build.0 = MinSizeRel|Any CPU
 		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Release|x64.ActiveCfg = Release|x64
 		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Release|x64.Build.0 = Release|x64
+		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Release|x86.ActiveCfg = Release|Any CPU
+		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Release|x86.Build.0 = Release|Any CPU
 		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.RelWithDebInfo|x64.ActiveCfg = Release|x64
 		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.RelWithDebInfo|x64.Build.0 = Release|x64
+		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.RelWithDebInfo|Any CPU.ActiveCfg = RelWithDebInfo|Any CPU
+		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.RelWithDebInfo|Any CPU.Build.0 = RelWithDebInfo|Any CPU
+		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|Any CPU
+		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.RelWithDebInfo|x86.Build.0 = RelWithDebInfo|Any CPU
 		{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.Debug|x64.ActiveCfg = Debug|x64
 		{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.Debug|x64.Build.0 = Debug|x64
+		{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.Debug|x86.Build.0 = Debug|Any CPU
 		{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.MinSizeRel|x64.ActiveCfg = Release|x64
 		{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.MinSizeRel|x64.Build.0 = Release|x64
+		{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.MinSizeRel|Any CPU.ActiveCfg = MinSizeRel|Any CPU
+		{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.MinSizeRel|Any CPU.Build.0 = MinSizeRel|Any CPU
+		{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.MinSizeRel|x86.ActiveCfg = MinSizeRel|Any CPU
+		{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.MinSizeRel|x86.Build.0 = MinSizeRel|Any CPU
 		{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.Release|x64.ActiveCfg = Release|x64
 		{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.Release|x64.Build.0 = Release|x64
+		{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.Release|x86.ActiveCfg = Release|Any CPU
+		{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.Release|x86.Build.0 = Release|Any CPU
 		{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.RelWithDebInfo|x64.ActiveCfg = Release|x64
 		{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.RelWithDebInfo|x64.Build.0 = Release|x64
+		{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.RelWithDebInfo|Any CPU.ActiveCfg = RelWithDebInfo|Any CPU
+		{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.RelWithDebInfo|Any CPU.Build.0 = RelWithDebInfo|Any CPU
+		{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|Any CPU
+		{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.RelWithDebInfo|x86.Build.0 = RelWithDebInfo|Any CPU
 		{387566C6-C6F6-412C-A30C-9855BBCB4816}.Debug|x64.ActiveCfg = Debug|x64
 		{387566C6-C6F6-412C-A30C-9855BBCB4816}.Debug|x64.Build.0 = Debug|x64
+		{387566C6-C6F6-412C-A30C-9855BBCB4816}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{387566C6-C6F6-412C-A30C-9855BBCB4816}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{387566C6-C6F6-412C-A30C-9855BBCB4816}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{387566C6-C6F6-412C-A30C-9855BBCB4816}.Debug|x86.Build.0 = Debug|Any CPU
 		{387566C6-C6F6-412C-A30C-9855BBCB4816}.MinSizeRel|x64.ActiveCfg = Debug|x64
 		{387566C6-C6F6-412C-A30C-9855BBCB4816}.MinSizeRel|x64.Build.0 = Debug|x64
+		{387566C6-C6F6-412C-A30C-9855BBCB4816}.MinSizeRel|Any CPU.ActiveCfg = MinSizeRel|Any CPU
+		{387566C6-C6F6-412C-A30C-9855BBCB4816}.MinSizeRel|Any CPU.Build.0 = MinSizeRel|Any CPU
+		{387566C6-C6F6-412C-A30C-9855BBCB4816}.MinSizeRel|x86.ActiveCfg = MinSizeRel|Any CPU
+		{387566C6-C6F6-412C-A30C-9855BBCB4816}.MinSizeRel|x86.Build.0 = MinSizeRel|Any CPU
 		{387566C6-C6F6-412C-A30C-9855BBCB4816}.Release|x64.ActiveCfg = Release|x64
 		{387566C6-C6F6-412C-A30C-9855BBCB4816}.Release|x64.Build.0 = Release|x64
+		{387566C6-C6F6-412C-A30C-9855BBCB4816}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{387566C6-C6F6-412C-A30C-9855BBCB4816}.Release|Any CPU.Build.0 = Release|Any CPU
+		{387566C6-C6F6-412C-A30C-9855BBCB4816}.Release|x86.ActiveCfg = Release|Any CPU
+		{387566C6-C6F6-412C-A30C-9855BBCB4816}.Release|x86.Build.0 = Release|Any CPU
 		{387566C6-C6F6-412C-A30C-9855BBCB4816}.RelWithDebInfo|x64.ActiveCfg = Release|x64
 		{387566C6-C6F6-412C-A30C-9855BBCB4816}.RelWithDebInfo|x64.Build.0 = Release|x64
+		{387566C6-C6F6-412C-A30C-9855BBCB4816}.RelWithDebInfo|Any CPU.ActiveCfg = RelWithDebInfo|Any CPU
+		{387566C6-C6F6-412C-A30C-9855BBCB4816}.RelWithDebInfo|Any CPU.Build.0 = RelWithDebInfo|Any CPU
+		{387566C6-C6F6-412C-A30C-9855BBCB4816}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|Any CPU
+		{387566C6-C6F6-412C-A30C-9855BBCB4816}.RelWithDebInfo|x86.Build.0 = RelWithDebInfo|Any CPU
 		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Debug|x64.ActiveCfg = Debug|x64
 		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Debug|x64.Build.0 = Debug|x64
+		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Debug|x86.Build.0 = Debug|Any CPU
 		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.MinSizeRel|x64.ActiveCfg = Release|x64
 		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.MinSizeRel|x64.Build.0 = Release|x64
+		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.MinSizeRel|Any CPU.ActiveCfg = MinSizeRel|Any CPU
+		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.MinSizeRel|Any CPU.Build.0 = MinSizeRel|Any CPU
+		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.MinSizeRel|x86.ActiveCfg = MinSizeRel|Any CPU
+		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.MinSizeRel|x86.Build.0 = MinSizeRel|Any CPU
 		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Release|x64.ActiveCfg = Release|x64
 		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Release|x64.Build.0 = Release|x64
+		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Release|x86.ActiveCfg = Release|Any CPU
+		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Release|x86.Build.0 = Release|Any CPU
 		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.RelWithDebInfo|x64.ActiveCfg = Release|x64
 		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.RelWithDebInfo|x64.Build.0 = Release|x64
+		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.RelWithDebInfo|Any CPU.ActiveCfg = RelWithDebInfo|Any CPU
+		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.RelWithDebInfo|Any CPU.Build.0 = RelWithDebInfo|Any CPU
+		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|Any CPU
+		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.RelWithDebInfo|x86.Build.0 = RelWithDebInfo|Any CPU
 		{6963C314-83C4-4667-B0D0-C2F7AE208C29}.Debug|x64.ActiveCfg = Debug|x64
 		{6963C314-83C4-4667-B0D0-C2F7AE208C29}.Debug|x64.Build.0 = Debug|x64
+		{6963C314-83C4-4667-B0D0-C2F7AE208C29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6963C314-83C4-4667-B0D0-C2F7AE208C29}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6963C314-83C4-4667-B0D0-C2F7AE208C29}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6963C314-83C4-4667-B0D0-C2F7AE208C29}.Debug|x86.Build.0 = Debug|Any CPU
 		{6963C314-83C4-4667-B0D0-C2F7AE208C29}.MinSizeRel|x64.ActiveCfg = Release|x64
 		{6963C314-83C4-4667-B0D0-C2F7AE208C29}.MinSizeRel|x64.Build.0 = Release|x64
+		{6963C314-83C4-4667-B0D0-C2F7AE208C29}.MinSizeRel|Any CPU.ActiveCfg = MinSizeRel|Any CPU
+		{6963C314-83C4-4667-B0D0-C2F7AE208C29}.MinSizeRel|Any CPU.Build.0 = MinSizeRel|Any CPU
+		{6963C314-83C4-4667-B0D0-C2F7AE208C29}.MinSizeRel|x86.ActiveCfg = MinSizeRel|Any CPU
+		{6963C314-83C4-4667-B0D0-C2F7AE208C29}.MinSizeRel|x86.Build.0 = MinSizeRel|Any CPU
 		{6963C314-83C4-4667-B0D0-C2F7AE208C29}.Release|x64.ActiveCfg = Release|x64
 		{6963C314-83C4-4667-B0D0-C2F7AE208C29}.Release|x64.Build.0 = Release|x64
+		{6963C314-83C4-4667-B0D0-C2F7AE208C29}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6963C314-83C4-4667-B0D0-C2F7AE208C29}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6963C314-83C4-4667-B0D0-C2F7AE208C29}.Release|x86.ActiveCfg = Release|Any CPU
+		{6963C314-83C4-4667-B0D0-C2F7AE208C29}.Release|x86.Build.0 = Release|Any CPU
 		{6963C314-83C4-4667-B0D0-C2F7AE208C29}.RelWithDebInfo|x64.ActiveCfg = Release|x64
 		{6963C314-83C4-4667-B0D0-C2F7AE208C29}.RelWithDebInfo|x64.Build.0 = Release|x64
+		{6963C314-83C4-4667-B0D0-C2F7AE208C29}.RelWithDebInfo|Any CPU.ActiveCfg = RelWithDebInfo|Any CPU
+		{6963C314-83C4-4667-B0D0-C2F7AE208C29}.RelWithDebInfo|Any CPU.Build.0 = RelWithDebInfo|Any CPU
+		{6963C314-83C4-4667-B0D0-C2F7AE208C29}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|Any CPU
+		{6963C314-83C4-4667-B0D0-C2F7AE208C29}.RelWithDebInfo|x86.Build.0 = RelWithDebInfo|Any CPU
 		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.Debug|x64.ActiveCfg = Debug|x64
 		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.Debug|x64.Build.0 = Debug|x64
+		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.Debug|x86.Build.0 = Debug|Any CPU
 		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.MinSizeRel|x64.ActiveCfg = Debug|x64
 		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.MinSizeRel|x64.Build.0 = Debug|x64
+		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.MinSizeRel|Any CPU.ActiveCfg = MinSizeRel|Any CPU
+		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.MinSizeRel|Any CPU.Build.0 = MinSizeRel|Any CPU
+		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.MinSizeRel|x86.ActiveCfg = MinSizeRel|Any CPU
+		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.MinSizeRel|x86.Build.0 = MinSizeRel|Any CPU
 		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.Release|x64.ActiveCfg = Release|x64
 		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.Release|x64.Build.0 = Release|x64
+		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.Release|Any CPU.Build.0 = Release|Any CPU
+		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.Release|x86.ActiveCfg = Release|Any CPU
+		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.Release|x86.Build.0 = Release|Any CPU
 		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.RelWithDebInfo|x64.ActiveCfg = Release|x64
 		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.RelWithDebInfo|x64.Build.0 = Release|x64
+		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.RelWithDebInfo|Any CPU.ActiveCfg = RelWithDebInfo|Any CPU
+		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.RelWithDebInfo|Any CPU.Build.0 = RelWithDebInfo|Any CPU
+		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|Any CPU
+		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.RelWithDebInfo|x86.Build.0 = RelWithDebInfo|Any CPU
 		{3201359D-C071-4089-9EDE-B04D759F1508}.Debug|x64.ActiveCfg = Debug|x64
 		{3201359D-C071-4089-9EDE-B04D759F1508}.Debug|x64.Build.0 = Debug|x64
+		{3201359D-C071-4089-9EDE-B04D759F1508}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3201359D-C071-4089-9EDE-B04D759F1508}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3201359D-C071-4089-9EDE-B04D759F1508}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3201359D-C071-4089-9EDE-B04D759F1508}.Debug|x86.Build.0 = Debug|Any CPU
 		{3201359D-C071-4089-9EDE-B04D759F1508}.MinSizeRel|x64.ActiveCfg = Debug|x64
 		{3201359D-C071-4089-9EDE-B04D759F1508}.MinSizeRel|x64.Build.0 = Debug|x64
+		{3201359D-C071-4089-9EDE-B04D759F1508}.MinSizeRel|Any CPU.ActiveCfg = MinSizeRel|Any CPU
+		{3201359D-C071-4089-9EDE-B04D759F1508}.MinSizeRel|Any CPU.Build.0 = MinSizeRel|Any CPU
+		{3201359D-C071-4089-9EDE-B04D759F1508}.MinSizeRel|x86.ActiveCfg = MinSizeRel|Any CPU
+		{3201359D-C071-4089-9EDE-B04D759F1508}.MinSizeRel|x86.Build.0 = MinSizeRel|Any CPU
 		{3201359D-C071-4089-9EDE-B04D759F1508}.Release|x64.ActiveCfg = Release|x64
 		{3201359D-C071-4089-9EDE-B04D759F1508}.Release|x64.Build.0 = Release|x64
+		{3201359D-C071-4089-9EDE-B04D759F1508}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3201359D-C071-4089-9EDE-B04D759F1508}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3201359D-C071-4089-9EDE-B04D759F1508}.Release|x86.ActiveCfg = Release|Any CPU
+		{3201359D-C071-4089-9EDE-B04D759F1508}.Release|x86.Build.0 = Release|Any CPU
 		{3201359D-C071-4089-9EDE-B04D759F1508}.RelWithDebInfo|x64.ActiveCfg = Release|x64
 		{3201359D-C071-4089-9EDE-B04D759F1508}.RelWithDebInfo|x64.Build.0 = Release|x64
+		{3201359D-C071-4089-9EDE-B04D759F1508}.RelWithDebInfo|Any CPU.ActiveCfg = RelWithDebInfo|Any CPU
+		{3201359D-C071-4089-9EDE-B04D759F1508}.RelWithDebInfo|Any CPU.Build.0 = RelWithDebInfo|Any CPU
+		{3201359D-C071-4089-9EDE-B04D759F1508}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|Any CPU
+		{3201359D-C071-4089-9EDE-B04D759F1508}.RelWithDebInfo|x86.Build.0 = RelWithDebInfo|Any CPU
 		{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.Debug|x64.ActiveCfg = Debug|x64
 		{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.Debug|x64.Build.0 = Debug|x64
+		{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.Debug|x86.Build.0 = Debug|Any CPU
 		{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.MinSizeRel|x64.ActiveCfg = Debug|x64
 		{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.MinSizeRel|x64.Build.0 = Debug|x64
+		{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.MinSizeRel|Any CPU.ActiveCfg = MinSizeRel|Any CPU
+		{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.MinSizeRel|Any CPU.Build.0 = MinSizeRel|Any CPU
+		{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.MinSizeRel|x86.ActiveCfg = MinSizeRel|Any CPU
+		{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.MinSizeRel|x86.Build.0 = MinSizeRel|Any CPU
 		{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.Release|x64.ActiveCfg = Release|x64
 		{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.Release|x64.Build.0 = Release|x64
+		{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.Release|x86.ActiveCfg = Release|Any CPU
+		{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.Release|x86.Build.0 = Release|Any CPU
 		{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.RelWithDebInfo|x64.ActiveCfg = Release|x64
 		{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.RelWithDebInfo|x64.Build.0 = Release|x64
+		{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.RelWithDebInfo|Any CPU.ActiveCfg = RelWithDebInfo|Any CPU
+		{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.RelWithDebInfo|Any CPU.Build.0 = RelWithDebInfo|Any CPU
+		{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|Any CPU
+		{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.RelWithDebInfo|x86.Build.0 = RelWithDebInfo|Any CPU
 		{4E4F491F-C688-43C4-88DA-AC92BC5FA1B8}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{4E4F491F-C688-43C4-88DA-AC92BC5FA1B8}.Debug|x64.Build.0 = Debug|Any CPU
+		{4E4F491F-C688-43C4-88DA-AC92BC5FA1B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4E4F491F-C688-43C4-88DA-AC92BC5FA1B8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4E4F491F-C688-43C4-88DA-AC92BC5FA1B8}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{4E4F491F-C688-43C4-88DA-AC92BC5FA1B8}.Debug|x86.Build.0 = Debug|Any CPU
 		{4E4F491F-C688-43C4-88DA-AC92BC5FA1B8}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
 		{4E4F491F-C688-43C4-88DA-AC92BC5FA1B8}.MinSizeRel|x64.Build.0 = Debug|Any CPU
+		{4E4F491F-C688-43C4-88DA-AC92BC5FA1B8}.MinSizeRel|Any CPU.ActiveCfg = MinSizeRel|Any CPU
+		{4E4F491F-C688-43C4-88DA-AC92BC5FA1B8}.MinSizeRel|Any CPU.Build.0 = MinSizeRel|Any CPU
+		{4E4F491F-C688-43C4-88DA-AC92BC5FA1B8}.MinSizeRel|x86.ActiveCfg = MinSizeRel|Any CPU
+		{4E4F491F-C688-43C4-88DA-AC92BC5FA1B8}.MinSizeRel|x86.Build.0 = MinSizeRel|Any CPU
 		{4E4F491F-C688-43C4-88DA-AC92BC5FA1B8}.Release|x64.ActiveCfg = Release|Any CPU
 		{4E4F491F-C688-43C4-88DA-AC92BC5FA1B8}.Release|x64.Build.0 = Release|Any CPU
+		{4E4F491F-C688-43C4-88DA-AC92BC5FA1B8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4E4F491F-C688-43C4-88DA-AC92BC5FA1B8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4E4F491F-C688-43C4-88DA-AC92BC5FA1B8}.Release|x86.ActiveCfg = Release|Any CPU
+		{4E4F491F-C688-43C4-88DA-AC92BC5FA1B8}.Release|x86.Build.0 = Release|Any CPU
 		{4E4F491F-C688-43C4-88DA-AC92BC5FA1B8}.RelWithDebInfo|x64.ActiveCfg = Debug|Any CPU
 		{4E4F491F-C688-43C4-88DA-AC92BC5FA1B8}.RelWithDebInfo|x64.Build.0 = Debug|Any CPU
+		{4E4F491F-C688-43C4-88DA-AC92BC5FA1B8}.RelWithDebInfo|Any CPU.ActiveCfg = RelWithDebInfo|Any CPU
+		{4E4F491F-C688-43C4-88DA-AC92BC5FA1B8}.RelWithDebInfo|Any CPU.Build.0 = RelWithDebInfo|Any CPU
+		{4E4F491F-C688-43C4-88DA-AC92BC5FA1B8}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|Any CPU
+		{4E4F491F-C688-43C4-88DA-AC92BC5FA1B8}.RelWithDebInfo|x86.Build.0 = RelWithDebInfo|Any CPU
 		{2AC54ADC-3246-427E-9CA9-FEA2DBCB9432}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{2AC54ADC-3246-427E-9CA9-FEA2DBCB9432}.Debug|x64.Build.0 = Debug|Any CPU
+		{2AC54ADC-3246-427E-9CA9-FEA2DBCB9432}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2AC54ADC-3246-427E-9CA9-FEA2DBCB9432}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2AC54ADC-3246-427E-9CA9-FEA2DBCB9432}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2AC54ADC-3246-427E-9CA9-FEA2DBCB9432}.Debug|x86.Build.0 = Debug|Any CPU
 		{2AC54ADC-3246-427E-9CA9-FEA2DBCB9432}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
 		{2AC54ADC-3246-427E-9CA9-FEA2DBCB9432}.MinSizeRel|x64.Build.0 = Debug|Any CPU
+		{2AC54ADC-3246-427E-9CA9-FEA2DBCB9432}.MinSizeRel|Any CPU.ActiveCfg = MinSizeRel|Any CPU
+		{2AC54ADC-3246-427E-9CA9-FEA2DBCB9432}.MinSizeRel|Any CPU.Build.0 = MinSizeRel|Any CPU
+		{2AC54ADC-3246-427E-9CA9-FEA2DBCB9432}.MinSizeRel|x86.ActiveCfg = MinSizeRel|Any CPU
+		{2AC54ADC-3246-427E-9CA9-FEA2DBCB9432}.MinSizeRel|x86.Build.0 = MinSizeRel|Any CPU
 		{2AC54ADC-3246-427E-9CA9-FEA2DBCB9432}.Release|x64.ActiveCfg = Release|Any CPU
 		{2AC54ADC-3246-427E-9CA9-FEA2DBCB9432}.Release|x64.Build.0 = Release|Any CPU
+		{2AC54ADC-3246-427E-9CA9-FEA2DBCB9432}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2AC54ADC-3246-427E-9CA9-FEA2DBCB9432}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2AC54ADC-3246-427E-9CA9-FEA2DBCB9432}.Release|x86.ActiveCfg = Release|Any CPU
+		{2AC54ADC-3246-427E-9CA9-FEA2DBCB9432}.Release|x86.Build.0 = Release|Any CPU
 		{2AC54ADC-3246-427E-9CA9-FEA2DBCB9432}.RelWithDebInfo|x64.ActiveCfg = Debug|Any CPU
 		{2AC54ADC-3246-427E-9CA9-FEA2DBCB9432}.RelWithDebInfo|x64.Build.0 = Debug|Any CPU
+		{2AC54ADC-3246-427E-9CA9-FEA2DBCB9432}.RelWithDebInfo|Any CPU.ActiveCfg = RelWithDebInfo|Any CPU
+		{2AC54ADC-3246-427E-9CA9-FEA2DBCB9432}.RelWithDebInfo|Any CPU.Build.0 = RelWithDebInfo|Any CPU
+		{2AC54ADC-3246-427E-9CA9-FEA2DBCB9432}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|Any CPU
+		{2AC54ADC-3246-427E-9CA9-FEA2DBCB9432}.RelWithDebInfo|x86.Build.0 = RelWithDebInfo|Any CPU
 		{4E96E5CC-7791-40B3-A8A1-C34FBB736B3B}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{4E96E5CC-7791-40B3-A8A1-C34FBB736B3B}.Debug|x64.Build.0 = Debug|Any CPU
+		{4E96E5CC-7791-40B3-A8A1-C34FBB736B3B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4E96E5CC-7791-40B3-A8A1-C34FBB736B3B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4E96E5CC-7791-40B3-A8A1-C34FBB736B3B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{4E96E5CC-7791-40B3-A8A1-C34FBB736B3B}.Debug|x86.Build.0 = Debug|Any CPU
 		{4E96E5CC-7791-40B3-A8A1-C34FBB736B3B}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
 		{4E96E5CC-7791-40B3-A8A1-C34FBB736B3B}.MinSizeRel|x64.Build.0 = Debug|Any CPU
+		{4E96E5CC-7791-40B3-A8A1-C34FBB736B3B}.MinSizeRel|Any CPU.ActiveCfg = MinSizeRel|Any CPU
+		{4E96E5CC-7791-40B3-A8A1-C34FBB736B3B}.MinSizeRel|Any CPU.Build.0 = MinSizeRel|Any CPU
+		{4E96E5CC-7791-40B3-A8A1-C34FBB736B3B}.MinSizeRel|x86.ActiveCfg = MinSizeRel|Any CPU
+		{4E96E5CC-7791-40B3-A8A1-C34FBB736B3B}.MinSizeRel|x86.Build.0 = MinSizeRel|Any CPU
 		{4E96E5CC-7791-40B3-A8A1-C34FBB736B3B}.Release|x64.ActiveCfg = Release|Any CPU
 		{4E96E5CC-7791-40B3-A8A1-C34FBB736B3B}.Release|x64.Build.0 = Release|Any CPU
+		{4E96E5CC-7791-40B3-A8A1-C34FBB736B3B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4E96E5CC-7791-40B3-A8A1-C34FBB736B3B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4E96E5CC-7791-40B3-A8A1-C34FBB736B3B}.Release|x86.ActiveCfg = Release|Any CPU
+		{4E96E5CC-7791-40B3-A8A1-C34FBB736B3B}.Release|x86.Build.0 = Release|Any CPU
 		{4E96E5CC-7791-40B3-A8A1-C34FBB736B3B}.RelWithDebInfo|x64.ActiveCfg = Debug|Any CPU
 		{4E96E5CC-7791-40B3-A8A1-C34FBB736B3B}.RelWithDebInfo|x64.Build.0 = Debug|Any CPU
+		{4E96E5CC-7791-40B3-A8A1-C34FBB736B3B}.RelWithDebInfo|Any CPU.ActiveCfg = RelWithDebInfo|Any CPU
+		{4E96E5CC-7791-40B3-A8A1-C34FBB736B3B}.RelWithDebInfo|Any CPU.Build.0 = RelWithDebInfo|Any CPU
+		{4E96E5CC-7791-40B3-A8A1-C34FBB736B3B}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|Any CPU
+		{4E96E5CC-7791-40B3-A8A1-C34FBB736B3B}.RelWithDebInfo|x86.Build.0 = RelWithDebInfo|Any CPU
 		{51C40BA9-F226-4A35-939D-1ED6F5FF7299}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{51C40BA9-F226-4A35-939D-1ED6F5FF7299}.Debug|x64.Build.0 = Debug|Any CPU
+		{51C40BA9-F226-4A35-939D-1ED6F5FF7299}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{51C40BA9-F226-4A35-939D-1ED6F5FF7299}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{51C40BA9-F226-4A35-939D-1ED6F5FF7299}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{51C40BA9-F226-4A35-939D-1ED6F5FF7299}.Debug|x86.Build.0 = Debug|Any CPU
 		{51C40BA9-F226-4A35-939D-1ED6F5FF7299}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
 		{51C40BA9-F226-4A35-939D-1ED6F5FF7299}.MinSizeRel|x64.Build.0 = Debug|Any CPU
+		{51C40BA9-F226-4A35-939D-1ED6F5FF7299}.MinSizeRel|Any CPU.ActiveCfg = MinSizeRel|Any CPU
+		{51C40BA9-F226-4A35-939D-1ED6F5FF7299}.MinSizeRel|Any CPU.Build.0 = MinSizeRel|Any CPU
+		{51C40BA9-F226-4A35-939D-1ED6F5FF7299}.MinSizeRel|x86.ActiveCfg = MinSizeRel|Any CPU
+		{51C40BA9-F226-4A35-939D-1ED6F5FF7299}.MinSizeRel|x86.Build.0 = MinSizeRel|Any CPU
 		{51C40BA9-F226-4A35-939D-1ED6F5FF7299}.Release|x64.ActiveCfg = Release|Any CPU
 		{51C40BA9-F226-4A35-939D-1ED6F5FF7299}.Release|x64.Build.0 = Release|Any CPU
+		{51C40BA9-F226-4A35-939D-1ED6F5FF7299}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{51C40BA9-F226-4A35-939D-1ED6F5FF7299}.Release|Any CPU.Build.0 = Release|Any CPU
+		{51C40BA9-F226-4A35-939D-1ED6F5FF7299}.Release|x86.ActiveCfg = Release|Any CPU
+		{51C40BA9-F226-4A35-939D-1ED6F5FF7299}.Release|x86.Build.0 = Release|Any CPU
 		{51C40BA9-F226-4A35-939D-1ED6F5FF7299}.RelWithDebInfo|x64.ActiveCfg = Debug|Any CPU
 		{51C40BA9-F226-4A35-939D-1ED6F5FF7299}.RelWithDebInfo|x64.Build.0 = Debug|Any CPU
+		{51C40BA9-F226-4A35-939D-1ED6F5FF7299}.RelWithDebInfo|Any CPU.ActiveCfg = RelWithDebInfo|Any CPU
+		{51C40BA9-F226-4A35-939D-1ED6F5FF7299}.RelWithDebInfo|Any CPU.Build.0 = RelWithDebInfo|Any CPU
+		{51C40BA9-F226-4A35-939D-1ED6F5FF7299}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|Any CPU
+		{51C40BA9-F226-4A35-939D-1ED6F5FF7299}.RelWithDebInfo|x86.Build.0 = RelWithDebInfo|Any CPU
+		{5DE3B533-DCE6-4BF4-8F7E-08C440E177B4}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5DE3B533-DCE6-4BF4-8F7E-08C440E177B4}.Debug|x64.Build.0 = Debug|Any CPU
+		{5DE3B533-DCE6-4BF4-8F7E-08C440E177B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5DE3B533-DCE6-4BF4-8F7E-08C440E177B4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5DE3B533-DCE6-4BF4-8F7E-08C440E177B4}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{5DE3B533-DCE6-4BF4-8F7E-08C440E177B4}.Debug|x86.Build.0 = Debug|Any CPU
+		{5DE3B533-DCE6-4BF4-8F7E-08C440E177B4}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
+		{5DE3B533-DCE6-4BF4-8F7E-08C440E177B4}.MinSizeRel|x64.Build.0 = Debug|Any CPU
+		{5DE3B533-DCE6-4BF4-8F7E-08C440E177B4}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU
+		{5DE3B533-DCE6-4BF4-8F7E-08C440E177B4}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU
+		{5DE3B533-DCE6-4BF4-8F7E-08C440E177B4}.MinSizeRel|x86.ActiveCfg = Debug|Any CPU
+		{5DE3B533-DCE6-4BF4-8F7E-08C440E177B4}.MinSizeRel|x86.Build.0 = Debug|Any CPU
+		{5DE3B533-DCE6-4BF4-8F7E-08C440E177B4}.Release|x64.ActiveCfg = Release|Any CPU
+		{5DE3B533-DCE6-4BF4-8F7E-08C440E177B4}.Release|x64.Build.0 = Release|Any CPU
+		{5DE3B533-DCE6-4BF4-8F7E-08C440E177B4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5DE3B533-DCE6-4BF4-8F7E-08C440E177B4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5DE3B533-DCE6-4BF4-8F7E-08C440E177B4}.Release|x86.ActiveCfg = Release|Any CPU
+		{5DE3B533-DCE6-4BF4-8F7E-08C440E177B4}.Release|x86.Build.0 = Release|Any CPU
+		{5DE3B533-DCE6-4BF4-8F7E-08C440E177B4}.RelWithDebInfo|x64.ActiveCfg = Debug|Any CPU
+		{5DE3B533-DCE6-4BF4-8F7E-08C440E177B4}.RelWithDebInfo|x64.Build.0 = Debug|Any CPU
+		{5DE3B533-DCE6-4BF4-8F7E-08C440E177B4}.RelWithDebInfo|Any CPU.ActiveCfg = Debug|Any CPU
+		{5DE3B533-DCE6-4BF4-8F7E-08C440E177B4}.RelWithDebInfo|Any CPU.Build.0 = Debug|Any CPU
+		{5DE3B533-DCE6-4BF4-8F7E-08C440E177B4}.RelWithDebInfo|x86.ActiveCfg = Debug|Any CPU
+		{5DE3B533-DCE6-4BF4-8F7E-08C440E177B4}.RelWithDebInfo|x86.Build.0 = Debug|Any CPU
+		{90A48718-F6A7-4747-97EA-89632B451008}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{90A48718-F6A7-4747-97EA-89632B451008}.Debug|x64.Build.0 = Debug|Any CPU
+		{90A48718-F6A7-4747-97EA-89632B451008}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{90A48718-F6A7-4747-97EA-89632B451008}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{90A48718-F6A7-4747-97EA-89632B451008}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{90A48718-F6A7-4747-97EA-89632B451008}.Debug|x86.Build.0 = Debug|Any CPU
+		{90A48718-F6A7-4747-97EA-89632B451008}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
+		{90A48718-F6A7-4747-97EA-89632B451008}.MinSizeRel|x64.Build.0 = Debug|Any CPU
+		{90A48718-F6A7-4747-97EA-89632B451008}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU
+		{90A48718-F6A7-4747-97EA-89632B451008}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU
+		{90A48718-F6A7-4747-97EA-89632B451008}.MinSizeRel|x86.ActiveCfg = Debug|Any CPU
+		{90A48718-F6A7-4747-97EA-89632B451008}.MinSizeRel|x86.Build.0 = Debug|Any CPU
+		{90A48718-F6A7-4747-97EA-89632B451008}.Release|x64.ActiveCfg = Release|Any CPU
+		{90A48718-F6A7-4747-97EA-89632B451008}.Release|x64.Build.0 = Release|Any CPU
+		{90A48718-F6A7-4747-97EA-89632B451008}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{90A48718-F6A7-4747-97EA-89632B451008}.Release|Any CPU.Build.0 = Release|Any CPU
+		{90A48718-F6A7-4747-97EA-89632B451008}.Release|x86.ActiveCfg = Release|Any CPU
+		{90A48718-F6A7-4747-97EA-89632B451008}.Release|x86.Build.0 = Release|Any CPU
+		{90A48718-F6A7-4747-97EA-89632B451008}.RelWithDebInfo|x64.ActiveCfg = Debug|Any CPU
+		{90A48718-F6A7-4747-97EA-89632B451008}.RelWithDebInfo|x64.Build.0 = Debug|Any CPU
+		{90A48718-F6A7-4747-97EA-89632B451008}.RelWithDebInfo|Any CPU.ActiveCfg = Debug|Any CPU
+		{90A48718-F6A7-4747-97EA-89632B451008}.RelWithDebInfo|Any CPU.Build.0 = Debug|Any CPU
+		{90A48718-F6A7-4747-97EA-89632B451008}.RelWithDebInfo|x86.ActiveCfg = Debug|Any CPU
+		{90A48718-F6A7-4747-97EA-89632B451008}.RelWithDebInfo|x86.Build.0 = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{60E0D592-FFB3-0D0A-C4AA-E88919B48F9D} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B}
+		{5DE3B533-DCE6-4BF4-8F7E-08C440E177B4} = {60E0D592-FFB3-0D0A-C4AA-E88919B48F9D}
+		{90A48718-F6A7-4747-97EA-89632B451008} = {60E0D592-FFB3-0D0A-C4AA-E88919B48F9D}
+	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {422D1620-0166-4C26-9A81-CA8A2EB1AB58}
 	EndGlobalSection

src/DataStreamSuite/ArithmeticExpressions/ArithmeticExpressionGrammar.y

@@ -8,7 +8,6 @@
    public int Integer;
    public double Real;
    public string Identifier;
-   public DateTime DateTime; 
    public ImmutableList<IArithmeticExpression> Arguments;
    public ImmutableList<Assignment> Assignments;
    public IArithmeticExpression Argument;

src/DataStreamSuite/ArithmeticExpressions/ArithmeticExpressions.csproj

@@ -4,6 +4,7 @@
     <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
+    <Version>$(SparkVersion)</Version>
   </PropertyGroup>
 
   <ItemGroup>
@@ -11,10 +12,20 @@
     <PackageReference Include="YaccLexTools" Version="1.2.2" />
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\ExpressionCore\ExpressionCore.csproj" />
-    <ProjectReference Include="..\..\client\spark_core\spark_core.csproj" />
-  </ItemGroup>
+  <Choose>
+    <When Condition="'$(UseProjectRefs)' == 'true'">
+      <ItemGroup>
+        <ProjectReference Include="..\ExpressionCore\ExpressionCore.csproj" />
+        <ProjectReference Include="..\..\cs\Bts.Spark.Core\Bts.Spark.Core.csproj" />
+      </ItemGroup>
+    </When>
+    <Otherwise>
+      <ItemGroup>
+        <PackageReference Include="ExpressionCore" Version="$(SparkVersion)" />
+        <PackageReference Include="Bts.Spark.Core" Version="$(SparkVersion)" />
+      </ItemGroup>
+    </Otherwise>
+  </Choose>
 
   <ItemGroup Label="ArithmeticExpression">
     <Scanner Include="ArithmeticExpressionTokens.lex" />

src/DataStreamSuite/BaseUtilities/BaseUtilities.csproj

@@ -4,10 +4,7 @@
     <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
+    <Version>$(SparkVersion)</Version>
   </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\client\spark_core\spark_core.csproj" />
-  </ItemGroup>
-
+  
 </Project>

src/DataStreamSuite/BlueRegistry/DoubleRegistryHandler.cs

@@ -1,4 +1,6 @@
 using System;
+using System.Runtime.Versioning;
+
 using Microsoft.Win32;
 
 namespace BCG
@@ -10,6 +12,7 @@ namespace BCG
          rk.SetValue (name, value.ToString ());
       }
 
+      [SupportedOSPlatform("windows")]
       public static double getValue (RegistryKey rk, string name)
       {
          object v = rk.GetValue (name);

src/DataStreamSuite/BooleanExpressions/Arguments/ArgumentComparer.cs

@@ -6,23 +6,80 @@ using Spark.Core.Collections;
 
 static class ArgumentComparer {
    public static int Compare(
-      IArgument value1, IArgument value2, IDictionary<string,object?> env) {
+      IArgument value1, IArgument value2, IDictionary<string, object?> env) {
       if (value1 is null) {
          throw new ArgumentNullException(nameof(value1));
       }
       if (value2 is null) {
          throw new ArgumentNullException(nameof(value2));
       }
-      var cmp1 = value1.Cast<IComparable>();
-      var cmp2 = value2.Cast<IComparable>();
+      var obj1 = value1.GetValue(env);
+      var obj2 = value2.GetValue(env);
+      if (obj1 is null) {
+         if (obj2 is null) {
+            return 0;
+         }
+         return -1;
+      }
+      if (obj2 is null) {
+         return 1;
+      }
+      return compareObjs(obj1, obj2);
+   }
+
+   static int compareObjs(object obj1, object obj2) {
       try {
-         var v1 = cmp1.GetValue(env);
-         var v2 = cmp2.GetValue(env);
-         return v1.GetType().IsNumeric() ?
-            new NumericComparer().Compare(v1, v2) : v1.CompareTo(v2);
+         var typ1 = obj1.GetType();
+         var typ2 = obj2.GetType();
+         bool areSameTypes = typ1 == typ2;
+         if (areSameTypes) {
+            return ((IComparable)obj1).CompareTo(obj2);
+         }
+         if (typ1.IsNumeric()) {
+            return tryCompareNumeric(obj1, obj2);
+         } else if (typ2.IsNumeric()) {
+            return -tryCompareNumeric(obj2, obj1);
+         } else if (typ1.IsEnum) {
+            if (typ2 == typeof(string)) {
+               return -((string)obj2).CompareTo(obj1.ToString());
+            }
+         } else if (typ1 == typeof(string)) {
+            return ((string)obj1).CompareTo(obj2.ToString());
+         } else if (typ1 == typeof(DateTime)) {
+            if (typ2 == typeof(TimeSpan)) {
+               return ((DateTime)obj1).Ticks.CompareTo(((TimeSpan)obj2).Ticks);
+            }
+         } else if (typ1 == typeof(TimeSpan)) {
+            if (typ2 == typeof(DateTime)) {
+               return ((TimeSpan)obj1).Ticks.CompareTo(((DateTime)obj2).Ticks);
+            }
+         }
       } catch (Exception ex) {
          Log.Ui.error($"Comparison failed: {ex}");
          throw;
       }
+      throw new ArgumentException("Failed to compare obj1 and obj2", nameof(obj1));
+   }
+
+   static int tryCompareNumeric(object numericObj1, object obj2) {
+      var typ2 = obj2.GetType();
+      if (typ2.IsNumeric()) {
+         return new NumericComparer().Compare(numericObj1, obj2);
+      } else if (typ2.IsEnum) {
+         var undTyp2 = typ2.GetEnumUnderlyingType();
+         if (undTyp2 == typeof(byte)) {
+            return new NumericComparer().Compare(numericObj1, (byte)obj2);
+         }
+         if (undTyp2 == typeof(short)) {
+            return new NumericComparer().Compare(numericObj1, (short)obj2);
+         }
+         if (undTyp2 == typeof(int)) {
+            return new NumericComparer().Compare(numericObj1, (int)obj2);
+         }
+         if (undTyp2 == typeof(long)) {
+            return new NumericComparer().Compare(numericObj1, (long)obj2);
+         }
+      }
+      throw new ArgumentException("Failed to compare numeric obj1 and obj2", nameof(obj2));
    }
 }

src/DataStreamSuite/BooleanExpressions/BooleanExpression.cs

@@ -1,19 +1,11 @@
 namespace Bts.BooleanExpressions;
 
-using bts;
-
 class BooleanExpression : IBooleanExpression {
    readonly Func<IDictionary<string, object?>, bool> evaluate;
 
    public BooleanExpression(Func<IDictionary<string, object?>, bool> evaluate) =>
       this.evaluate = evaluate;
 
-   public bool Evaluate(IDictionary<string, object?> env) {
-      try {
-         return evaluate(env);
-      } catch (Exception ex) {
-         Log.assert(false, $"BooleanExpression.Evaluate failed: {ex}");
-         throw;
-      }
-   }
+   public bool Evaluate(IDictionary<string, object?> env) =>
+      evaluate(env);
 }

src/DataStreamSuite/BooleanExpressions/BooleanExpressionTokens.lex

@@ -47,11 +47,6 @@ IsOfType                 '/'
 
 %%
 
-{StringConstant} {
-   yylval.String = yytext.Substring(1, yytext.Length - 2).Replace(@"\'", "'");
-   return (int)Token.STRING_CONSTANT;
-} 
-
 {BooleanConstant} {
    yylval.Boolean = yytext.ToLower() switch {
       "true" => true,
@@ -62,6 +57,11 @@ IsOfType                 '/'
    return (int)Token.BOOLEAN_CONSTANT;
 }
 
+{StringConstant} {
+   yylval.String = yytext.Substring(1, yytext.Length - 2).Replace(@"\'", "'");
+   return (int)Token.STRING_CONSTANT;
+} 
+
 {NullConstant} {
    yylval.Null = DBNull.Value;
    return (int)Token.NULL_CONSTANT;

src/DataStreamSuite/BooleanExpressions/BooleanExpressions.csproj

@@ -4,6 +4,7 @@
     <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
+    <Version>$(SparkVersion)</Version>
   </PropertyGroup>
 
   <ItemGroup>
@@ -11,10 +12,20 @@
     <PackageReference Include="YaccLexTools" Version="1.2.3" />
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\ExpressionCore\ExpressionCore.csproj" />
-    <ProjectReference Include="..\..\client\spark_core\spark_core.csproj" />
-  </ItemGroup>
+  <Choose>
+    <When Condition="'$(UseProjectRefs)' == 'true'">
+      <ItemGroup>
+        <ProjectReference Include="..\ExpressionCore\ExpressionCore.csproj" />
+        <ProjectReference Include="..\..\cs\Bts.Spark.Core\Bts.Spark.Core.csproj" />
+      </ItemGroup>
+    </When>
+    <Otherwise>
+      <ItemGroup>
+        <PackageReference Include="ExpressionCore" Version="$(SparkVersion)" />
+        <PackageReference Include="Bts.Spark.Core" Version="$(SparkVersion)" />
+      </ItemGroup>
+    </Otherwise>
+  </Choose>
   
   <ItemGroup>
     <Scanner Include="BooleanExpressionTokens.lex" />

src/DataStreamSuite/Bts.ColumnExpressions/Bts.ColumnExpressions.csproj

@@ -4,17 +4,27 @@
     <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
+    <Version>$(SparkVersion)</Version>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="YaccLexTools" Version="1.2.2" />
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\DataStreamCore\DataStreamCore.csproj" />
-    <ProjectReference Include="..\ExpressionCore\ExpressionCore.csproj" />
-    <ProjectReference Include="..\..\client\spark_core\spark_core.csproj" />
-  </ItemGroup>
+  <Choose>
+    <When Condition="'$(UseProjectRefs)' == 'true'">
+      <ItemGroup>
+        <ProjectReference Include="..\DataStreamCore\DataStreamCore.csproj" />
+        <ProjectReference Include="..\ExpressionCore\ExpressionCore.csproj" />
+      </ItemGroup>
+    </When>
+    <Otherwise>
+      <ItemGroup>
+        <PackageReference Include="DataStreamCore" Version="$(SparkVersion)" />
+        <PackageReference Include="ExpressionCore" Version="$(SparkVersion)" />
+      </ItemGroup>
+    </Otherwise>
+  </Choose>
 
   <ItemGroup Label="ColumnExpression">
     <Scanner Include="ColumnExpressionTokens.lex" />

src/DataStreamSuite/Bts.ColumnSortExpressions/Bts.ColumnSortExpressions.csproj

@@ -4,17 +4,27 @@
     <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
+    <Version>$(SparkVersion)</Version>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="YaccLexTools" Version="1.2.2" />
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\DataStreamCore\DataStreamCore.csproj" />
-    <ProjectReference Include="..\ExpressionCore\ExpressionCore.csproj" />
-    <ProjectReference Include="..\..\client\spark_core\spark_core.csproj" />
-  </ItemGroup>
+  <Choose>
+    <When Condition="'$(UseProjectRefs)' == 'true'">
+      <ItemGroup>
+        <ProjectReference Include="..\DataStreamCore\DataStreamCore.csproj" />
+        <ProjectReference Include="..\ExpressionCore\ExpressionCore.csproj" />
+      </ItemGroup>
+    </When>
+    <Otherwise>
+      <ItemGroup>
+        <PackageReference Include="DataStreamCore" Version="$(SparkVersion)" />
+        <PackageReference Include="ExpressionCore" Version="$(SparkVersion)" />
+      </ItemGroup>
+    </Otherwise>
+  </Choose>
 
   <ItemGroup Label="ColumnSortExpression">
     <Scanner Include="ColumnSortExpressionTokens.lex" />

src/DataStreamSuite/Bts.Extensions.Hosting/Bts.Extensions.Hosting.csproj

@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <Version>$(SparkVersion)</Version>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.0" />
+  </ItemGroup>
+
+</Project>

src/DataStreamSuite/Bts.Extensions.Hosting/HostBuilderExtensions.cs

@@ -0,0 +1,78 @@
+namespace Bts.Extensions.Hosting;
+
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Logging;
+
+using System.Diagnostics;
+
+public static class HostBuilderExtensions {
+   public static IHostBuilder CreateBtsBuilder(string[] args) {
+      // Obtain calling assembly name here, rather than in the lambda where it is actually needed,
+      // because want the name of the assembly that called this function, not the assembly that will
+      // eventually invoke the lambda...that will be the Microsoft.Extensions.Hosting assembly. Get
+      // the name of the assembly that called this function. That will act as the "appsettings" json
+      // file prefix.
+      var exeName = GetCallingAssemblyName();
+      return new HostBuilder()
+         .ConfigureAppConfiguration((context, configBuilder) =>
+         ConfigureApp(configBuilder, context.HostingEnvironment.EnvironmentName, exeName, args, true));
+   }
+
+   public static void ConfigureApp(IConfigurationBuilder configBuilder, string? environment = null, string? prefix = null, string[]? args = null, bool addDefaultConfigSources = false) {
+      if (addDefaultConfigSources) {
+         configBuilder.AddJsonFile("appsettings.json", optional: true, reloadOnChange: true);
+      }
+      var baseFileName = prefix is null ? "appsettings" : $"{prefix}.appsettings";
+      AddJsonFile($"{baseFileName}.json");
+      if (environment is not null) {
+         AddJsonFile($"{baseFileName}.{environment}.json");
+      }
+
+      var cfg = configBuilder.Build().GetSection("config")?.Value;
+      if (!SetBasePath(cfg)) {
+         AddJsonFile(cfg);
+      }
+      if (addDefaultConfigSources) {
+         configBuilder.AddEnvironmentVariables();
+         configBuilder.AddCommandLine(args ?? Environment.GetCommandLineArgs().Skip(1).ToArray());
+      }
+
+      bool SetBasePath(string? path) {
+         if (!Directory.Exists(path)) {
+            return false;
+         }
+         configBuilder.SetBasePath(path);
+         return true;
+      }
+
+      bool AddJsonFile(string? path) {
+         if (!File.Exists(path)) {
+            return false;
+         }
+         configBuilder.AddJsonFile(path);
+         return true;
+      }
+   }
+
+   public static void ConfigureLogging(ILoggingBuilder loggingBuilder, ILoggerProvider loggerProvider) =>
+      loggingBuilder.AddFilter("Microsoft", LogLevel.Warning)
+         .AddFilter("System", LogLevel.Warning)
+         .AddFilter("NToastNotify", LogLevel.Warning)
+         .AddProvider(loggerProvider)
+         .AddSimpleConsole(opts => {
+            opts.SingleLine = true;
+            opts.TimestampFormat = "yyyy-MM-dd HH:mm:ss.ffffff|";
+         })
+         .AddDebug();
+
+   public static string GetCallingAssemblyName() =>
+      new StackTrace()
+         .GetFrame(2)
+         ?.GetMethod()
+         ?.Module
+         ?.Assembly
+         ?.GetName()
+         ?.Name
+         ?? throw new InvalidOperationException("Failed to determine name of calling assembly (calling method is null)");
+}

src/DataStreamSuite/Bts.Net/Bts.Net.csproj

@@ -0,0 +1,10 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <Version>$(SparkVersion)</Version>
+  </PropertyGroup>
+
+</Project>

src/DataStreamSuite/Bts.Net/HostComparer.cs

@@ -0,0 +1,28 @@
+namespace Bts.Net;
+
+using System.Linq;
+using System.Net;
+
+/// <summary>
+/// Provides facilities to compare hosts for equality.
+/// <para>
+/// This class doesn't implement IEqualityComparer because a consistent hash code cannot be
+/// guarenteed for equivalent host strings. The equals impl relies on Dns.GetHostAddresses, which
+/// is non-determinstic (implementations that depends on mutable properties face a similar problem).
+/// </para>
+/// </summary>
+public class HostComparer {
+   public static bool Equals(string? x, string? y) {
+      if (x is null) {
+         return y is null;
+      }
+      if (y is null) {
+         return false;
+      }
+      return Dns.GetHostAddresses(x).Intersect(
+         Dns.GetHostAddresses(y), IpAddressComparer.Instance).Any();
+   }
+
+   public static bool Equals(IPHostEntry x, IPHostEntry y) =>
+      x.AddressList.Intersect(y.AddressList, IpAddressComparer.Instance).Any();
+}

src/DataStreamSuite/Bts.Net/IpAddressComparer.cs

@@ -0,0 +1,30 @@
+namespace Bts.Net;
+
+using System.Diagnostics.CodeAnalysis;
+using System.Net;
+
+/// <summary>
+/// Compares ip addresses. Unlike the default comparer, v4 and equivalent v6 addresses are
+/// considered equal.
+/// </summary>
+public class IpAddressComparer : IEqualityComparer<IPAddress> {
+   public static IEqualityComparer<IPAddress> Instance { get; } = new IpAddressComparer();
+
+   public bool Equals(IPAddress? x, IPAddress? y) {
+      if (x is null) {
+         return y is null;
+      }
+      if (y is null) {
+         return false;
+      }
+      return x.Equals(y) ||
+         (x.IsIPv4MappedToIPv6 && x.MapToIPv4().Equals(y)) ||
+         (y.IsIPv4MappedToIPv6 && y.MapToIPv4().Equals(x));
+   }
+
+   public int GetHashCode([DisallowNull] IPAddress address) =>
+      address.IsIPv4MappedToIPv6
+         // Return consistent hash code for v4 and equivalent v6
+         ? address.MapToIPv4().GetHashCode()
+         : address.GetHashCode();
+}

src/DataStreamSuite/Bts.Net/IpHostEntryJsonConverter.cs

@@ -0,0 +1,33 @@
+namespace Bts.Net;
+
+using System;
+using System.Net;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+public class IpHostEntryJsonConverter : JsonConverter<IPHostEntry> {
+   public override IPHostEntry? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) {
+      throw new NotImplementedException();
+   }
+
+   public override void Write(Utf8JsonWriter writer, IPHostEntry value, JsonSerializerOptions options) {
+      writer.WriteStartObject();
+      // HostName
+      writer.WriteString(nameof(value.HostName), value.HostName);
+      // Aliases
+      writer.WritePropertyName("Aliases");
+      writer.WriteStartArray();
+      foreach (var alias in value.Aliases) {
+         writer.WriteStringValue(alias);
+      }
+      writer.WriteEndArray();
+      // Addresses
+      writer.WritePropertyName("Addresses");
+      writer.WriteStartArray();
+      foreach (var address in value.AddressList) {
+         writer.WriteStringValue(address.ToString());
+      }
+      writer.WriteEndArray();
+      writer.WriteEndObject();
+   }
+}

src/DataStreamSuite/Bts.Net/IpHostEntryJsonSerializer.cs

@@ -0,0 +1,39 @@
+namespace Bts.Net;
+
+using System;
+using System.IO;
+using System.Net;
+using System.Text;
+using System.Text.Json;
+
+/// <summary>
+/// This class seriailzes IpHostEntry to json (string). A common buffer is used to reduce memory
+/// allocations on repeated calls to <see cref="Serialize"/>. For that reason, this class is NOT
+/// thread safe.
+/// </summary>
+public class IpHostEntryJsonSerializer {
+   readonly MemoryStream buffer = new();
+   readonly IpHostEntryJsonConverter converter;
+
+   public IpHostEntryJsonSerializer(IpHostEntryJsonConverter? converter = null) =>
+      this.converter = converter ?? new() { };
+
+   public string? Serialize(IPHostEntry dp, JsonSerializerOptions? opts = null) {
+      opts ??= JsonSerializerOptions.Default;
+      buffer.Position = 0;
+      buffer.SetLength(0);
+      using (var jsonWriter = new Utf8JsonWriter(buffer)) {
+         converter.Write(jsonWriter, dp, opts);
+      }
+      var bytes = buffer.GetBuffer();
+      var span = new ArraySegment<byte>(bytes, 0, (int)buffer.Length);
+      return Encoding.UTF8.GetString(span);
+   }
+
+   public void Serialize(IPHostEntry dp, Utf8JsonWriter jsonWriter, JsonSerializerOptions? opts = null) {
+      opts ??= JsonSerializerOptions.Default;
+      buffer.Position = 0;
+      buffer.SetLength(0);
+      converter.Write(jsonWriter, dp, opts);
+   }
+}

src/DataStreamSuite/Bts.Net/IpUtils.cs

@@ -0,0 +1,94 @@
+namespace Bts.Net;
+
+using System.Diagnostics.CodeAnalysis;
+using System.Net;
+using System.Text.RegularExpressions;
+
+public static partial class IpUtils {
+   static readonly Regex ipv4Regex = new(string.Join('.', @"(((0|1)\d)|(2\d)|\d)?\d"));
+
+   // public static void ParseUri(string str, out string? scheme, out string? host, out string? port, out string? path, out string? queryParams) {
+   //    if (Uri.TryCreate(str, UriKind.Absolute, out var uri)) {
+   //    }
+   // }
+
+   // public static bool AreEndpointsEqual(Uri? x, Uri? y) {
+   //    if (x is null) {
+   //       return y is null;
+   //    }
+   //    if (y is null) {
+   //       return false;
+   //    }
+   //    if (x.IsAbsoluteUri != y.IsAbsoluteUri) {
+   //       return false;
+   //    }
+   //    if (x.IsAbsoluteUri) {
+   //       if (x.Scheme != y.Scheme) {
+   //          return false;
+   //       }
+   //    }
+   //    string? xHost = null;
+   // }
+
+   // static string ResolveHostIpv4(Uri uri) {
+   //    // switch (uri.HostNameType) {
+   //    //    case UriHostNameType.IPv4:
+   //    //       return uri.Host;
+   //    //    case UriHostNameType.Dns:
+   //    //       break;
+   //    //    case UriHostNameType.IPv6:
+   //    //       var addresses = Dns.GetHostAddresses(uri.Host);
+   //    //       foreach (var address in addresses) {
+   //    //          if (address.IsIPv4MappedToIPv6) {
+   //    //             return address.MapToIPv4().Address;
+   //    //          }
+   //    //       }
+   //    //       break;
+   //    // }
+   //    var hostAddresses = Dns.GetHostAddresses(uri.Host);
+   //    foreach (IPAddress address in hostAddresses) {
+   //       if (address.Equals(remoteEndPoint.Address) ||
+   //           (address.IsIPv4MappedToIPv6 && address.MapToIPv4().Equals(remoteEndPoint.Address)) ||
+   //           (remoteEndPoint.Address.IsIPv4MappedToIPv6 && remoteEndPoint.Address.MapToIPv4().Equals(address))) {
+   //          isMatch = true;
+   //          break;
+   //       }
+   //    }
+   // }
+
+   // public static bool AreEndpointsEqual(string? x, string? y) {
+   //    if (x == y) {
+   //       return true;
+   //    }
+   //    if (x is null) {
+   //       return y is null;
+   //    }
+   //    if (y is null) {
+   //       return false;
+   //    }
+   //    var xUri = new Uri(x);
+   //    var yUri = new Uri(y);
+   //    // return xUri.Equals(yUri);
+   // }
+
+   public static bool IsIpv4(string host) {
+      host = removeSchemaFromUrl(host);
+      host = removePortFromUrl(host);
+      return ipv4Regex.IsMatch(host);
+   }
+
+   static string removeSchemaFromUrl(string url) {
+      var i = url.IndexOf("://");
+      return i < 0 ? url : url.Substring(i + 3);
+   }
+
+   static string removePortFromUrl(string url) {
+      var match = MyRegex().Match(url);
+      return match.Success
+         ? string.Concat(url.AsSpan(0, match.Index), url.AsSpan(match.Index + match.Length))
+         : url;
+   }
+
+   [GeneratedRegex(":\\d{1,4}")]
+   private static partial Regex MyRegex();
+}

src/DataStreamSuite/ColumnMapExpressions/ColumnMapExpressions.csproj

@@ -4,18 +4,25 @@
     <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
+    <Version>$(SparkVersion)</Version>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Google.Protobuf" Version="3.24.3" />
     <PackageReference Include="YaccLexTools" Version="1.2.2" />
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\DataStreamCore\DataStreamCore.csproj" />
-    <ProjectReference Include="..\ExpressionCore\ExpressionCore.csproj" />
-    <ProjectReference Include="..\..\client\spark_core\spark_core.csproj" />
-  </ItemGroup>
+  <Choose>
+    <When Condition="'$(UseProjectRefs)' == 'true'">
+      <ItemGroup>
+        <ProjectReference Include="..\ExpressionCore\ExpressionCore.csproj" />
+      </ItemGroup>
+    </When>
+    <Otherwise>
+      <ItemGroup>
+        <PackageReference Include="ExpressionCore" Version="$(SparkVersion)" />
+      </ItemGroup>
+    </Otherwise>
+  </Choose>
 
   <ItemGroup Label="ColumnMapExpression">
     <Scanner Include="ColumnMapExpressionTokens.lex" />

src/DataStreamSuite/DataStream/BlueOrb/CSVReaderStream.cs

@@ -0,0 +1,18 @@
+namespace bts.BlueOrb {
+   using System;
+
+   using BCG;
+
+   [DataStreamUserRespresentation("CSVReaderStream")]
+   public class CSVReaderStream : ViewStream {
+      public CSVReaderStream(string file_name)
+         : this(file_name, false) { }
+      public CSVReaderStream(string file_name, bool guess_schema) {
+         ViewStream rs = new BCG.CSVReaderStream(file_name);
+         if (guess_schema) {
+            rs = new SchemaGuesserStream(rs);
+         }
+         mySetRealSource(rs);
+      }
+   }
+}

src/DataStreamSuite/DataStream/BlueOrb/CSVSaverStream.cs

@@ -0,0 +1,13 @@
+namespace bts.BlueOrb {
+   using BCG;
+
+   using System;
+
+   [DataStreamUserRespresentation("CSVSaverStream")]
+   public class CSVSaverStream: ViewStream {
+      public CSVSaverStream(ViewStream parent_str, string file_name) {
+         BCG.CSVSaverStream rs = new BCG.CSVSaverStream(parent_str, file_name, true, Int32.MaxValue, false);
+         mySetRealSource(rs);
+      }
+   }
+}

src/DataStreamSuite/DataStream/BlueOrb/DateTimeExpanderStream.cs

@@ -15,6 +15,7 @@ namespace bts.BlueOrb {
             rv = rv.add_column(System.TypeCode.Int32, $"{inp_col}_hour");
             rv = rv.add_column(System.TypeCode.Int32, $"{inp_col}_minute");
             rv = rv.add_column(System.TypeCode.Int32, $"{inp_col}_seconds_of_day");
+            rv = rv.add_column(System.TypeCode.Int32, $"{inp_col}_year");
             return rv;
          };
          ViewStream rs = new MapStream(parent_stream,
@@ -30,6 +31,7 @@ namespace bts.BlueOrb {
             rv.setValue($"{inp_col}_hour", dt.Hour);
             rv.setValue($"{inp_col}_minute", dt.Minute);
             rv.setValue($"{inp_col}_seconds_of_day", (dt - dt.Date).TotalSeconds);
+            rv.setValue($"{inp_col}_year", dt.Date.Year);
             return rv;
          });
          mySetRealSource(rs);

src/DataStreamSuite/DataStream/BlueOrb/GroupByStream.cs

@@ -34,7 +34,8 @@ namespace bts.BlueOrb {
                if (out_rows != null && out_rows.Count > 0) {
                   rv = rv ?? new BlueTable(out_rows.ElementAt(0).schema);
                }
-               rv.addRows(out_rows);
+               if (rv != null)
+                  rv.addRows(out_rows);
             }
             return rv;
          }
@@ -61,20 +62,24 @@ namespace bts.BlueOrb {
                                  Func<List<IBlueRow>, List<IBlueRow>> evaluate_func)
                                  : this(main_stream, new DelNonIncGroupByEvaluator(groupby_cols_func, evaluate_func)) { }
 
-      public GroupByStream(ViewStream parent_str, string groupby_col, string standard_group_by_text)
-      : this(parent_str, groupby_col, standard_group_by_text, String.Empty) { }
+      public GroupByStream(ViewStream parent_str, string groupby_cols, string standard_group_by_text)
+      : this(parent_str, groupby_cols, standard_group_by_text, String.Empty) { }
 
       // this is the main constructor that does everything
-      public GroupByStream(ViewStream parent_str, string groupby_col, string standard_group_by_ops, string optional_sort_col) {
+      public GroupByStream(ViewStream parent_str, string groupby_cols, string standard_group_by_ops, string optional_sort_col) {
          MultiRowOpHelper std_group_by = MultiRowOpHelper.parse_ops(standard_group_by_ops);
          Func<string[]> groupby_cols_func = () => {
-            return String.IsNullOrEmpty(groupby_col) ? null : new string[] { groupby_col };
+            if (String.IsNullOrEmpty(groupby_cols))
+               return null;
+            return groupby_cols.Split(',').Select(x => x.Trim()).ToArray();
          };
          Func<List<IBlueRow>, List<IBlueRow>> evaluate_func = (group_rows) => {
             if (!String.IsNullOrEmpty(optional_sort_col))
                group_rows.Sort((r1, r2) => BlueDataUtility.compare_rows(r2, r1, optional_sort_col));
             // this si where the group by aggregation happens
             IBlueRow rv = MultiRowOpHelper.group_by_compute(group_rows, std_group_by);
+            if (rv == null)
+               return new List<IBlueRow>();
             return new IBlueRow[] { rv }.ToList();
          };
          ViewStream rs = new GroupByStream(parent_str, groupby_cols_func, evaluate_func);
@@ -105,6 +110,9 @@ namespace bts.BlueOrb {
          /// reducing
          _timer.Restart();
          IBlueRowCollection total_state = _groupby_func.evaluate(grouped_rows);
+         if (total_state == null)
+            // mayeb returna n empty table ?
+            return;
          _timer.Stop();
          var applyElapsedMs = _timer.ElapsedMilliseconds;
          _n_total_fires++;
@@ -113,9 +121,7 @@ namespace bts.BlueOrb {
             Log.DataFlow.info(
                $"Time to evaluate {grouped_rows.Count} groups {_timer.ElapsedMilliseconds}ms, ratio {_n_expensive_fires}/{_n_total_fires}");
          }
-         // TODO,
-         if (total_state != null)
-            myFireEvent(new DataPacket(total_state, total_state, myLastValue == null ? new BlueTable(total_state.schema) : (myLastValue as DataPacket).newRows));
+         myFireEvent(new DataPacket(total_state, total_state, myLastValue == null ? new BlueTable(total_state.schema) : (myLastValue as DataPacket).newRows));
       }
    }
 }

src/DataStreamSuite/DataStream/BlueOrb/Join/SimpleJoinStream.cs

@@ -20,9 +20,9 @@
          private IBlueTableSchema _schema;
          private int[] _join_cols;
          private IDictionary<RowHash, List<IBlueRow>> _hash_row_map = new Dictionary<RowHash, List<IBlueRow>>();
-         
+
          public JoinBookkeepingData(ViewStream vs, List<string> join_cols, bool is_left, BlueRowHasher row_hasher) {
-            _join_col_names = join_cols.Where (c => !String.IsNullOrEmpty(c)).ToList ();
+            _join_col_names = join_cols.Where(c => !String.IsNullOrEmpty(c)).ToList();
             _is_left = is_left;
             _hasher = row_hasher;
          }
@@ -31,23 +31,23 @@
 
          public IDictionary<RowHash, List<IBlueRow>> rows => _hash_row_map;
 
-         public List<IBlueRow> get_matching_rows (int hash) {
+         public List<IBlueRow> get_matching_rows(int hash) {
             List<IBlueRow> rv = null;
             _hash_row_map.TryGetValue(hash, out rv);
             return rv;
          }
 
          private RowHash _get_hash(IBlueRow r) {
-            if (_join_cols == null || _join_cols.Length == 0) { 
+            if (_join_cols == null || _join_cols.Length == 0) {
                return 0;
             }
             return _hasher.get_hash(r, _join_cols);
          }
 
          public void update_data(DataPacket dp) {
-            if (!ready) {               
+            if (!ready) {
                _schema = dp.newRows.schema;
-               _join_cols = _join_col_names.Count == 0 ? new int[] { }: _join_col_names.Select(n => dp.schema[n].colNo).ToArray();
+               _join_cols = _join_col_names.Count == 0 ? new int[] { } : _join_col_names.Select(n => dp.schema[n].colNo).ToArray();
             }
             _hash_row_map.Clear();
             foreach (IBlueRow r in dp.newRows) {
@@ -82,7 +82,7 @@
          _rs = rs;
          List<string> lj_col_list = ljc.Split(',').Where(x => !String.IsNullOrEmpty(x)).ToList();
          List<string> rj_col_list = rjc.Split(',').Where(x => !String.IsNullOrEmpty(x)).ToList();
-         Log.assert(lj_col_list.Count ==  rj_col_list.Count);
+         Log.assert(lj_col_list.Count == rj_col_list.Count);
          int n_cols = lj_col_list.Count;
          BlueRowHasher hasher = new BlueRowHasher(n_cols);
          _ldata = new JoinBookkeepingData(ls, lj_col_list, true, hasher);
@@ -101,7 +101,7 @@
       }
 
       private void _rs_onchange(object dp_obj) {
-         DataPacket dp = dp_obj as DataPacket ;
+         DataPacket dp = dp_obj as DataPacket;
          _rdata.update_data(dp);
          _form_and_fire();
       }
@@ -128,11 +128,11 @@
       }
 
       private void _form_and_fire() {
-         if (!_ldata.ready||!_rdata.ready)
+         if (!_ldata.ready || !_rdata.ready)
             return;
          _build_schema();
          List<object[]> res_rows = new List<object[]>();
-         
+
          Action<object[], IBlueRow, bool> copy_row = (rval, r, is_left) => {
             int offset = 1;
             JoinBookkeepingData sdata = _ldata;
@@ -148,7 +148,7 @@
             }
          };
          Func<int, IBlueRow, object[]> build_row_array = (id, l_row) => {
-            object[] rv = new object[_schema.columnNames.Length];            
+            object[] rv = new object[_schema.columnNames.Length];
             for (int i = 0; i < _schema.columnNames.Length; i++) {
                rv[i] = DBNull.Value;
             }
@@ -162,7 +162,7 @@
             List<IBlueRow> l_rows = kv.Value;
             List<IBlueRow> r_rows = _rdata.get_matching_rows(hash);
 
-            foreach (IBlueRow lr in l_rows) {                              
+            foreach (IBlueRow lr in l_rows) {
                if (r_rows != null) {
                   foreach (IBlueRow r in r_rows) {
                      object[] rowvals = build_row_array(res_rows.Count, lr);
@@ -182,6 +182,15 @@
          var dp = BlueDataUtility.build_dp(rv, myLastValue as DataPacket);
          myFireEvent(dp);
       }
-
    }
+
+   [DataStreamUserRespresentation("FullJoinStream")]
+   public class FullJoinStream : ViewStream {
+      public FullJoinStream(ViewStream l_str, string ljcs, ViewStream r_str, string rjcs) {
+         ViewStream js = new SimpleJoinStream(l_str, ljcs, r_str, rjcs);
+         ViewStream rs = new bts.BlueOrb.FilterStream(js, r => !DBNull.Value.Equals(r["right_id"]));
+         mySetRealSource(rs);
+      }
+   }
+
 }

src/DataStreamSuite/DataStream/BlueOrb/MultiRowOpHelper.cs

@@ -150,6 +150,14 @@ namespace bts.BlueOrb {
                return col_vals.Last();
             case MultiRowOp.StdDev:
                return MathNet.Numerics.Statistics.Statistics.StandardDeviation(col_vals);
+            case MultiRowOp.EdgeDiff:
+               return col_vals.First() - col_vals.Last();
+            case MultiRowOp.EdgeDiffPercentage: {
+                  double first = col_vals.First();
+                  double last = col_vals.Last();
+                  return ((first - last) / last) * 100.0;
+                  return col_vals.First() - col_vals.Last();
+               }
             default:
                // TODO
                Log.assert(false);

src/DataStreamSuite/DataStream/BlueOrb/PythonDataframeStream.cs

@@ -37,7 +37,8 @@
          // now this function should read _out_csv_filename into a dp
          // and fire it
          _compute_and_write();
-         ViewStream rs = new SchemaGuesserStream(new CSVReaderStream(_out_csv_filename));
+         //ViewStream rs = new SchemaGuesserStream(new CSVReaderStream(_out_csv_filename));
+         ViewStream rs = new CSVReaderStream(_out_csv_filename);
          IBlueRowCollection nrows = null;
          rs.onChange += (dp_obj) => {
             nrows = (dp_obj as DataPacket).newRows;

src/DataStreamSuite/DataStream/BlueOrb/TimeSeriesStream.cs

@@ -1,18 +1,25 @@
 using System;
+using System.Data.Entity.Core.Mapping;
 
 using BCG;
 
 namespace bts.BlueOrb {
    // Keeps adding changing rows to the stream, hence preserving the history
    // and creating a time series, for example this can be used to make bbo updates
-   // into a time series of prices/qty 
+   // into a time series of prices/qty
+   [DataStreamUserRespresentation("TimeSeriesStream")]
    public class TimeSeriesStream : ViewStream {
-      private BlueTable _table;
+      private CircularBufferTable _table;
       private ViewStream _stream;
       private int _id = 0;
+      private int _size = 0;
 
-      public TimeSeriesStream(ViewStream stream) {
+      public TimeSeriesStream(ViewStream stream)
+         : this(stream, Int32.MaxValue) { }
+
+      public TimeSeriesStream(ViewStream stream, int size) {
          _stream = stream;
+         _size = size;
       }
 
       protected override void myOnFirstSubscriber() {
@@ -29,17 +36,16 @@ namespace bts.BlueOrb {
          if (_table == null) {
             IBlueTableSchema schema = new BlueTableSchema(dp.newRows.schema.columnInfo, dp.newRows.schema.tableName);
             schema = schema.add_columns(Tuple.Create(typeof(DateTime), "timestamp"));
-            _table = new BlueTable(schema);
+            _table = new CircularBufferTable(schema, _size);
          }
-         BlueTable added_rows = new BlueTable(_table.schema);
          foreach (IBlueRow r in dp.addedRows) {
             MutableBlueRow ar = new MutableBlueRow(_table.schema, r);
             ar.setValue("timestamp", now);
             ar.setValue("id", _id++);
-            added_rows.addRow(ar);
+            _table.add_row(ar);
          }
-         _table.addRows(added_rows);
-         myFireEvent(new DataPacket(_table, added_rows, new BlueTable(_table.schema)));
+         var dp_out =  BlueDataUtility.build_dp(_table, myLastValue as DataPacket);
+         myFireEvent(dp_out);
       }
    }
 

src/DataStreamSuite/DataStream/BlueOrb/UnionStream.cs

@@ -5,7 +5,8 @@ namespace bts.BlueOrb {
    using mbts;
    using BCG;
 
-   [DataStreamUserRespresentation("UnionStream")]
+   // [DataStreamUserRespresentation("UnionStream")]
+   [DataStreamUserRespresentation("AppendStream")]
    public class UnionStream : ViewStream {
       public UnionStream(ViewStream left_stream, ViewStream right_stream) {
          ViewStream rs = new BCG.MutableAppendStream(left_stream, right_stream);

src/DataStreamSuite/DataStream/DataStream.csproj

@@ -3,19 +3,9 @@
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
+    <Version>$(SparkVersion)</Version>
   </PropertyGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\ArithmeticExpressions\ArithmeticExpressions.csproj" />
-    <ProjectReference Include="..\BaseUtilities\BaseUtilities.csproj" />    
-    <ProjectReference Include="..\BooleanExpressions\BooleanExpressions.csproj" />
-    <ProjectReference Include="..\Bts.ColumnExpressions\Bts.ColumnExpressions.csproj" />
-    <ProjectReference Include="..\Bts.ColumnSortExpressions\Bts.ColumnSortExpressions.csproj" />
-    <ProjectReference Include="..\DataStreamCore\DataStreamCore.csproj" />
-    <ProjectReference Include="..\DataStreamExpressions\DataStreamExpressions.csproj" />
-    <ProjectReference Include="..\..\client\spark_core\spark_core.csproj" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="HtmlAgilityPack" Version="1.11.57" />
     <PackageReference Include="IronPython" Version="3.4.2" />
@@ -27,4 +17,27 @@
     <PackageReference Include="MathNet.Numerics" Version="5.0.0" />
   </ItemGroup>
 
+  <Choose>
+    <When Condition="'$(UseProjectRefs)' == 'true'">
+      <ItemGroup>
+        <ProjectReference Include="..\ArithmeticExpressions\ArithmeticExpressions.csproj" />
+        <ProjectReference Include="..\BaseUtilities\BaseUtilities.csproj" />    
+        <ProjectReference Include="..\BooleanExpressions\BooleanExpressions.csproj" />
+        <ProjectReference Include="..\Bts.ColumnExpressions\Bts.ColumnExpressions.csproj" />
+        <ProjectReference Include="..\Bts.ColumnSortExpressions\Bts.ColumnSortExpressions.csproj" />
+        <ProjectReference Include="..\DataStreamExpressions\DataStreamExpressions.csproj" />
+      </ItemGroup>
+    </When>
+    <Otherwise>
+      <ItemGroup>
+        <PackageReference Include="ArithmeticExpressions" Version="$(SparkVersion)" />
+        <PackageReference Include="BaseUtilities" Version="$(SparkVersion)" />
+        <PackageReference Include="BooleanExpressions" Version="$(SparkVersion)" />
+        <PackageReference Include="Bts.ColumnExpressions" Version="$(SparkVersion)" />
+        <PackageReference Include="Bts.ColumnSortExpressions" Version="$(SparkVersion)" />
+        <PackageReference Include="DataStreamExpressions" Version="$(SparkVersion)" />
+      </ItemGroup>
+    </Otherwise>
+  </Choose>
+
 </Project>

src/DataStreamSuite/DataStream/DataStreamExtensions.cs

@@ -5,19 +5,19 @@ using BCG;
 using bts.api.core;
 
 using Bts.DataStreamCore;
+using Bts.PubSub;
 
 using Microsoft.Extensions.Logging;
 
 using Spark.Core.Disposables;
+using Spark.Core.Threading;
 
 using System;
-using System.Collections;
-using System.Collections.Generic;
 using System.Linq;
 using System.Reactive.Linq;
 
 public static class DataStreamExtensions {
-   public static ViewStream AsViewStream(this IObservable<DataPacket> source) =>
+   public static ViewStream AsViewStream(this IObservable<IDataPacket> source) =>
       source as ViewStream ?? new ObservableViewStream(source);
 
    public static ViewStream AsViewStream<T>(this IObservable<IDataPacket<T>> source, string? name = null, ILogger? logger = null) where T : IBlueRow =>
@@ -36,15 +36,15 @@ public static class DataStreamExtensions {
       }
    }
 
-   public static IObservable<IDataPacket<T>> SelectDataPacket<T>(this IObservable<IDataPacket> source, Func<IBlueRow, T> selector) where T : IBlueRow =>
-      source.Select(dp => {
-         dp.get_new_added_deleted(out var newRows, out var addedRows, out var deletedRows);
-         return new DataPacket<T>(CastRows(newRows), CastRows(addedRows), CastRows(deletedRows));
+   // public static IObservable<IDataPacket<T>> SelectDataPacket<T>(this IObservable<IDataPacket> source, Func<IBlueRow, T> selector) where T : IBlueRow =>
+   //    source.Select(dp => {
+   //       dp.get_new_added_deleted(out var newRows, out var addedRows, out var deletedRows);
+   //       return new DataPacket<T>(CastRows(newRows), CastRows(addedRows), CastRows(deletedRows));
 
-         IBlueRowCollection<T> CastRows(ICollection rows) =>
-            new BlueTableSelectorWrapper<T>(
-               rows as IBlueRowCollection ?? new BlueRowCollection(rows, dp.Schema), selector);
-      });
+   //       IBlueRowCollection<T> CastRows(ICollection rows) =>
+   //          new BlueTableSelectorWrapper<T>(
+   //             rows as IBlueRowCollection ?? new BlueRowCollection(rows, dp.Schema), selector);
+   //    });
 
    public static IObservable<TableUpdate<IBlueRow, int>> AsTables(this IObservable<IDataPacket> source) =>
       source.AsTables<IBlueRow, int>(r => r, r => r.Id());
@@ -59,36 +59,78 @@ public static class DataStreamExtensions {
    public static IObservable<TableUpdate<T, TKey>> AsTables<T, TKey>(
       this IObservable<IDataPacket> source, Func<IBlueRow, T> valueSelector, Func<T, TKey> keySelector, Func<IBlueRow, TKey>? rowKeySelector = null) where TKey : IEquatable<TKey> {
       rowKeySelector ??= r => keySelector(valueSelector(r));
-      return source.Scan(TableUpdate<T, TKey>.mk_empty(keySelector), (res, dp) => {
-         var bd = res.to_builder();
+      return source.Scan(TableUpdate<T, TKey>.Empty(keySelector), (res, dp) => {
+         var bd = res.ToBuilder();
          dp.get_new_added_deleted(out var newRows, out var addedRows, out var deletedRows);
          foreach (IBlueRow r in addedRows) {
-            bd.add_or_update(valueSelector(r));
+            bd.AddOrUpdate(valueSelector(r));
          }
          foreach (IBlueRow r in deletedRows) {
-            bd.remove(rowKeySelector(r));
+            bd.Remove(rowKeySelector(r));
          }
-         return bd.to_table();
+         return bd.ToImmutable();
       });
    }
 
-   public static IObservable<IDataPacket<T>> AsDataPackets<T>(this IObservable<TableUpdate<T, int>> source, IBlueTableSchema schema) where T : IBlueRow =>
+   public static IObservable<IDataPacket> AsDataPackets(this IObservable<TableUpdate<IBlueRow, int>> source) =>
       source.Scan(
-         (Table: new BlueTableImmutable<T>(schema), Dp: (IDataPacket<T>)DataPacket<T>.Empty(schema)),
+         (Table: (BlueTableImmutable?)null, Dp: (IDataPacket?)null),
          (res, table) => {
-            var bd = res.Table.ToDataPacketBuilder();
-            foreach (var r in table.removed) {
+            var resTable = res.Table;
+            if (resTable is null) {
+               if (table.Index.Count == 0) {
+                  return (null, null);
+               }
+               resTable = new(table.Index.Values.First().schema);
+            }
+            var bd = resTable.ToDataPacketBuilder();
+            foreach (var r in table.RemovedItems) {
                bd.Remove(r.Id());
             }
-            foreach (var r in table.added) {
+            foreach (var r in table.AddedItems) {
                bd.AddOrUpdate(r);
             }
-            var resDp = bd.ToDataPacketT(out var newRows, out var addedRows, out var deletedRows);
+            var resDp = bd.ToDataPacket(out var newRows);
             return (newRows, resDp);
          })
-         .Where(t => t.Dp.addedRows.Any() || t.Dp.deletedRows.Any())
+         .Where(t => t.Dp is not null && (t.Dp.addedRows.Count > 0 || t.Dp.deletedRows.Count > 0))
+         .Select(t => t.Dp!);
+
+   public static IObservable<IDataPacket> AsDataPackets<T>(this IObservable<TableUpdate<T, int>> source, IBlueTableSchema schema) where T : IBlueRow =>
+      source.Scan(
+         (Table: new BlueTableImmutable(schema), Dp: (IDataPacket)new DataPacket(schema)),
+         (res, table) => {
+            var bd = res.Table.ToDataPacketBuilder();
+            foreach (var r in table.RemovedItems) {
+               bd.Remove(r.Id());
+            }
+            foreach (var r in table.AddedItems) {
+               bd.AddOrUpdate(r);
+            }
+            var resDp = bd.ToDataPacket(out var newRows);
+            return (newRows, resDp);
+         })
+         .Where(t => t.Dp.addedRows.Count > 0 || t.Dp.deletedRows.Count > 0)
          .Select(t => t.Dp);
 
+   public static IObservable<IDataPacket> AsDataPackets<T, TKey>(this IObservable<TableUpdate<T, TKey>> source, BlueTableSchemaAdapter<T> schema) where TKey : IEquatable<TKey> {
+      return Observable.Create<IDataPacket>(Subscribe);
+
+      IDisposable Subscribe(IObserver<IDataPacket> o) {
+         var adapter = new BlueTableImmutableAdapter<T>(schema);
+         IDataPacket initDataPacket = new DataPacket(schema);
+         return source.Scan((Adapter: adapter, DataPacket: initDataPacket), OnUpdate).Select(res => res.DataPacket).Subscribe(o);
+
+         (BlueTableImmutableAdapter<T> Adapter, IDataPacket DataPacket) OnUpdate(
+            (BlueTableImmutableAdapter<T> Adapter, IDataPacket DataPacket) state, TableUpdate<T, TKey> tableUpdate) {
+            var bd = state.Adapter.ToDataPacketBuilder();
+            bd.Update(tableUpdate);
+            var newRows = bd.ToImmutable(out var dp);
+            return (newRows, dp);
+         }
+      }
+   }
+
    public static ViewStream AsViewStream<T>(this IObservable<TableUpdate<T, int>> source, IBlueTableSchema schema) where T : IBlueRow =>
       source.AsDataPackets(schema).AsViewStream();
 
@@ -131,4 +173,46 @@ public static class DataStreamExtensions {
       }
       return indices;
    }
+
+   public static IObservable<IDataPacket> OnWorkScheduler(this IObservable<IDataPacket> source, IWorkScheduler scheduler) =>
+      Observable.Create<IDataPacket>(o => {
+         var inputGate = new AtomicGate();
+         var outputGate = new AtomicGate();
+         BlueTableImmutable? lastTable = null;
+         BlueTableImmutable.DataPacketBuilder? bd = null;
+         IDataPacket? pendingDpOut = null;
+         return Disposable.Create(source.Subscribe(OnNext), scheduler.Subscribe(DoWork));
+
+         void OnNext(IDataPacket value) {
+            using (inputGate.BeginTransaction()) {
+               lastTable ??= new(value.newRows.schema);
+               bd ??= lastTable.ToDataPacketBuilder();
+               if (pendingDpOut is null) {
+                  // The last outgoing datapacket was just fired. Don't merge this update with the
+                  // previous one (otherwise its adds/removes would be fired twice).
+                  bd.Reset();
+               }
+               foreach (IBlueRow r in value.deletedRows) {
+                  bd.Remove(r.Id());
+               }
+               foreach (IBlueRow r in value.addedRows) {
+                  bd.AddOrUpdate(r);
+               }
+               pendingDpOut = bd.ToDataPacket(out lastTable);
+            }
+         }
+
+         void DoWork() {
+            IDataPacket? dpOut = null;
+            if (outputGate.TryEnter()) {
+               using var exit = Disposable.Create(outputGate.Exit);
+               (dpOut, pendingDpOut) = (pendingDpOut, dpOut);
+               if (dpOut is not null) {
+                  o.OnNext(dpOut);
+               }
+            }
+         }
+      });
+
+
 }

src/DataStreamSuite/DataStream/Misc/DSLStream.cs

@@ -1,8 +1,9 @@
-namespace bts.SilverPine {
+namespace bts.BlueOrb {
    using System;
    using BCG;
    using System.Collections.Generic;
    using Bts.DataStreamExpressions;
+   using System.Xml;
 
    // All this does is take in a dsl expression, parse it and fire the data that come out of running it.
    // So for example, if an expresison is passed 
@@ -11,9 +12,10 @@ namespace bts.SilverPine {
       private readonly string _dsl;
       public DSLStream(string dsl) {
          Log.Gen.info($"DSLStream.cons dsl: {dsl}");
+         // Remove all colons
+         string sanitizedDsl = dsl.Replace(":", "COLON");
          _dsl = dsl;
-         ViewStream rs = build_stream(dsl);
-         rs = rs ?? new LiteralStream("error", $"msg:invalid dsl \"{dsl}\"");
+         ViewStream rs = build_stream(dsl) ?? new LiteralStream("error", $"msg:invalid dsl");
          mySetRealSource(rs);
       }
 
@@ -24,9 +26,10 @@ namespace bts.SilverPine {
             return rv;
 
          } catch (Exception ex) {
+            //send to blueorb
             Log.Gen.error($"Could not build stream: {stream_expression} ex: {ex}");
             return null;
          }
       }
    }
-}
+}

src/DataStreamSuite/DataStream/ObservableViewStream.cs

@@ -8,13 +8,13 @@ using Microsoft.Extensions.Logging;
 
 using System;
 
-public class ObservableViewStream : ViewStream, IObservable<DataPacket>, IDisposable {
-   readonly IObservable<DataPacket> source;
+public class ObservableViewStream : ViewStream, IObservable<IDataPacket>, IDisposable {
+   readonly IObservable<IDataPacket> source;
    readonly string? name;
    readonly ILogger? logger;
    IDisposable? subscription;
 
-   public ObservableViewStream(IObservable<DataPacket> source, string? name = null, ILogger? logger = null) {
+   public ObservableViewStream(IObservable<IDataPacket> source, string? name = null, ILogger? logger = null) {
       this.source = source;
       this.name = name;
       this.logger = logger;
@@ -45,6 +45,6 @@ public class ObservableViewStream : ViewStream, IObservable<DataPacket>, IDispos
       subscription = null;
    }
 
-   IDisposable IObservable<DataPacket>.Subscribe(IObserver<DataPacket> observer) =>
+   IDisposable IObservable<IDataPacket>.Subscribe(IObserver<IDataPacket> observer) =>
       source.Subscribe(observer);
 }

src/DataStreamSuite/DataStream/Offloading/RemoteQueryManager.cs

@@ -1,14 +1,25 @@
+using bts;
+
+using Bts.DataStream;
+using Bts.DataStreamCore;
+using Bts.DataStreamExpressions;
+using Bts.PubSub;
+
+using Microsoft.Extensions.Hosting;
+
+using Spark.Core.Disposables;
+
 using System;
 using System.Collections.Generic;
-
-using Bts.DataStreamExpressions;
-using BCG.Utilities.General;
-using bts;
+using System.IO;
+using System.Reactive.Linq;
+using System.Threading;
+using System.Threading.Tasks;
 
 namespace BCG {
    // listens to the requests posted on "cloud_streams" request table, and 
    // if unfulfilled starts a ViewPubsliher
-   public class RemoteQueryManager : IWorker {
+   public class RemoteQueryManager : IHostedService {
       public class StreamPubUnit {
          public string name;
          public string stream_expression;
@@ -39,23 +50,46 @@ namespace BCG {
       }
       private IDictionary<string, StreamPubUnit>
          _stream_pub_map = new Dictionary<string, StreamPubUnit>();
-      private ViewStream _stream = new TableStream("cloud_streams");
-      private PubTableBroker _broker = new PubTableBroker();
-      private ManagedSubscriber _sub = ManagedSubscriber.instance;
+      readonly IPubTableBroker _broker;
+      readonly IManagedSubscriber _sub;
+      readonly object syncRoot = new();
+      IDisposable? cloudStreamsSub;
+      IDisposable? remoteRequestsSub;
+      bool isDisposed;
 
 
-      public RemoteQueryManager() {
-         _stream.onChange += _on_str;
-         _sub.subscribe("RemoteRequest", (string tag, byte[] data) => {
-            RemoteRequest req = RemoteRequest.construct_from_bytes(data);
-            _spawn_remote_stream(req.published_table_name, req.stream_expression, false);
-         });
+      public RemoteQueryManager(IManagedSubscriber managedSubscriber, IPubTableBroker pubTableBroker) {
+         _sub = managedSubscriber;
+         _broker = pubTableBroker;
       }
-      private void _on_str(object obj)
-      {
-         if (obj is not DataPacket dp) {
-            return;
+
+      public Task StartAsync(CancellationToken cancellationToken) {
+         lock (syncRoot) {
+            Log.assert(!isDisposed);
+            Log.isnull(cloudStreamsSub);
+            Log.isnull(remoteRequestsSub);
+            cloudStreamsSub = new TableStream("cloud_streams").AsObservable().Subscribe(_on_str);
+            remoteRequestsSub = _sub.Observe("RemoteRequest").Subscribe(data => {
+               RemoteRequest req = RemoteRequest.construct_from_bytes(data);
+               _spawn_remote_stream(req.published_table_name, req.stream_expression, false);
+            });
          }
+         return Task.CompletedTask;
+      }
+
+      public Task StopAsync(CancellationToken cancellationToken) {
+         lock (syncRoot) {
+            if (!isDisposed) {
+               isDisposed = true;
+               Disposable.dispose(ref cloudStreamsSub);
+               Disposable.dispose(ref remoteRequestsSub);
+            }
+         }
+         return Task.CompletedTask;
+      }
+
+      private void _on_str(DataPacket dp)
+      {
          foreach (IBlueRow r in dp.newRows)
          {
             string name = r.get<string>("name");
@@ -72,7 +106,10 @@ namespace BCG {
          ViewStream stream = build_stream(stream_expression);
          _expose_to_ws(name, stream);
          if (persist) {
-            stream = new PersistorStream(stream, name, "C:\\Temp\\", 1000000);   // 10MBs
+            string tempDir = Path.GetTempPath();
+        Directory.CreateDirectory(tempDir); // make sure it exists
+
+        stream = new PersistorStream(stream, name, tempDir, 10_000_000); // 10 MB
          }
          ViewPublisher view_pub = new ViewPublisher(name, _broker, stream);
          StreamPubUnit u = new StreamPubUnit(name, stream_expression, stream, persist, view_pub);
@@ -82,9 +119,5 @@ namespace BCG {
       private void _expose_to_ws(string name, ViewStream stream) {
          // TODO: john
       }
-
-      public void doWork() {
-
-      }
    }
 }

src/DataStreamSuite/DataStream/Primitives/Filter/FilterStream.cs

@@ -1,4 +1,7 @@
+using bts;
+
 using Bts.DataStream;
+using Bts.DataStream.Primitives.Filter;
 
 using mbts.config;
 
@@ -21,6 +24,7 @@ namespace BCG.StreamWorld.Addition {
       public FilterStream(ViewStream vs, IStreamFilter filter) {
          myBaseStream = vs;
          myFilter = filter;
+         vs.ErrorChanged += OnError;
          if (filter is IDynamicStreamFilter)
             (filter as IDynamicStreamFilter).onFilterChange += new FilterChangeDelegate(myHandleFilterChange);
       }
@@ -36,31 +40,45 @@ namespace BCG.StreamWorld.Addition {
          myStateTable.clear();
       }
 
+      bool filterRow(IBlueRow r) {
+         try {
+            return myFilter.filter(r);
+         } catch (Exception ex) {
+            Log.Gen.error($"FilterStream delegate threw exception: {ex}");
+            OnError(new StreamFilterException(StreamId, StreamName, null, ex, r));
+         }
+         return false;
+      }
+
       private void myHandleChanges(object newValue) {
-         DataPacket dp = newValue as DataPacket;
-         if (myStateTable == null) {
-            bts.Log.assert(myBaseTable == null);
-            myStateTable = new BlueTable(dp.schema);
-            myBaseTable = new BlueTable(dp.schema);
-         }
-         BlueTable dels = new BlueTable(dp.schema),
-                     adds = new BlueTable(dp.schema);
-         foreach (IBlueRow r in dp.deletedRows) {
-            myBaseTable.deleteRow(r);
-            if (myStateTable.containsID((int)r["id"])) {
-               dels.addRow(r);
-               myStateTable.deleteRow(r);
+         try {
+            DataPacket dp = newValue as DataPacket;
+            if (myStateTable == null) {
+               bts.Log.assert(myBaseTable == null);
+               myStateTable = new BlueTable(dp.schema);
+               myBaseTable = new BlueTable(dp.schema);
             }
-         }
-         foreach (IBlueRow r in dp.addedRows) {
-            myBaseTable.addRow(r);
-            if (myFilter.filter(r)) {
-               adds.addRow(r);
-               myStateTable.addRow(r);
+            BlueTable dels = new BlueTable(dp.schema),
+                        adds = new BlueTable(dp.schema);
+            foreach (IBlueRow r in dp.deletedRows) {
+               myBaseTable.deleteRow(r);
+               if (myStateTable.containsID((int)r["id"])) {
+                  dels.addRow(r);
+                  myStateTable.deleteRow(r);
+               }
             }
+            foreach (IBlueRow r in dp.addedRows) {
+               myBaseTable.addRow(r);
+               if (filterRow(r)) {
+                  adds.addRow(r);
+                  myStateTable.addRow(r);
+               }
+            }
+            if ((dels.Count > 0 || adds.Count > 0) || (myLastValue == null))
+               myFireEvent(new DataPacket(myStateTable, adds, dels));
+         } catch (Exception ex) {
+            OnError(ex);
          }
-         if ((dels.Count > 0 || adds.Count > 0) || (myLastValue == null))
-            myFireEvent(new DataPacket(myStateTable, adds, dels));
       }
 
       public IStreamFilter filter {
@@ -69,9 +87,20 @@ namespace BCG.StreamWorld.Addition {
             if (myBaseTable != null) {
                IBlueRowCollection oldState = new BlueTable(myStateTable);
                myStateTable.clear();
-               foreach (IBlueRow r in myBaseTable)
-                  if (myFilter.filter(r))
-                     myStateTable.addRow(r);
+               // If the filter throws an exception, we can rethrow it as a StreamFilterException
+               // and include the 'currentRow' (for which the filter failed) to provide context.
+               IBlueRow? currentRow = null;
+               foreach (IBlueRow r in myBaseTable) {
+                  try {
+                     currentRow = r;
+                     if (filterRow(r)) {
+                        myStateTable.addRow(r);
+                     }
+                  } catch (Exception ex) {
+                     Log.Gen.error($"FilterStream delegate threw exception: {ex}");
+                     OnError(new StreamFilterException(StreamId, StreamName, null, ex, currentRow));
+                  }
+               }
                IBlueRowCollection dels, adds;
                BlueDataUtility.computeDifferences(myStateTable, oldState, out dels, out adds);
                myFireEvent(new DataPacket(myStateTable, adds, dels));
@@ -128,7 +157,7 @@ namespace BCG
       private ViewStream myParentStream;
       private string myFilterString;
       private BCG.StreamWorld.Addition.FilterStream myFilterStream;
-      private bool myUseNewFilter = Configuration.get<DataStreamConfig>().UseNewFilter;
+      private bool myUseNewFilter = false;
 
       #region constructors
       public delegate bool OnFilter(IBlueRow r);
@@ -206,32 +235,36 @@ namespace BCG
          DataPacket retVal;
          DataPacket arrivedPacket = newValue as DataPacket;
          myLastReceivedRows = arrivedPacket.newRows;
-         if (myLastFiredRows != null)
-         {
-            retVal = new DataPacket(myLastFiredRows, new BlueTable(myLastFiredRows.schema),
-               new BlueTable(myLastFiredRows.schema));
-            foreach (IBlueRow r in arrivedPacket.deletedRows)
-               if (myLastFiredRows.containsID((int)r["id"]))
-               {
-                  myLastFiredRows.deleteRow(r);
-                  (retVal.deletedRows as BlueTable).addRow(r);
-               }
-            foreach (IBlueRow r in arrivedPacket.addedRows)
-               if (myFilter.filter(r))
-               {
-                  myLastFiredRows.addRow(r);
-                  (retVal.addedRows as BlueTable).addRow(r);
-               }
+         try {
+            if (myLastFiredRows != null)
+            {
+               retVal = new DataPacket(myLastFiredRows, new BlueTable(myLastFiredRows.schema),
+                  new BlueTable(myLastFiredRows.schema));
+               foreach (IBlueRow r in arrivedPacket.deletedRows)
+                  if (myLastFiredRows.containsID((int)r["id"]))
+                  {
+                     myLastFiredRows.deleteRow(r);
+                     (retVal.deletedRows as BlueTable).addRow(r);
+                  }
+               foreach (IBlueRow r in arrivedPacket.addedRows)
+                  if (filterRow(r))
+                  {
+                     myLastFiredRows.addRow(r);
+                     (retVal.addedRows as BlueTable).addRow(r);
+                  }
+            }
+            else
+            {
+               myLastFiredRows = new BlueTable(arrivedPacket.schema);
+               retVal = new DataPacket(myLastFiredRows, myLastFiredRows, new BlueTable(myLastFiredRows.schema));
+               foreach (IBlueRow r in arrivedPacket.newRows)
+                  if (filterRow(r))
+                     myLastFiredRows.addRow(r);
+            }
+            myFireEvent(retVal);
+         } catch (Exception ex) {
+            OnError(ex);
          }
-         else
-         {
-            myLastFiredRows = new BlueTable(arrivedPacket.schema);
-            retVal = new DataPacket(myLastFiredRows, myLastFiredRows, new BlueTable(myLastFiredRows.schema));
-            foreach (IBlueRow r in arrivedPacket.newRows)
-               if (myFilter.filter(r))
-                  myLastFiredRows.addRow(r);
-         }
-         myFireEvent(retVal);
       }
 
       public IStreamFilter filter
@@ -249,16 +282,20 @@ namespace BCG
                {
                    if (myLastReceivedRows != null)
                    {
+                     try {
                        BlueTable nRows = new BlueTable(myLastReceivedRows.schema);
                        foreach (IBlueRow r in myLastReceivedRows)
-                           if (myFilter.filter(r))
+                           if (filterRow(r))
                                nRows.addRow(r);
                        IBlueRowCollection dRows = new BlueTable(nRows.schema),
                           aRows = new BlueTable(nRows.schema);                      
                        BlueDataUtility.computeDifferences(nRows, myLastFiredRows, out dRows, out aRows);
                        myLastFiredRows = nRows;
                        myFireEvent(new DataPacket(nRows, aRows, dRows));
-                   }
+                     } catch (Exception ex) {
+                        OnError(ex);
+                     }
+                  }
                }
             }
          }
@@ -282,5 +319,15 @@ namespace BCG
       {
          filter = myFilter;
       }
+
+      bool filterRow(IBlueRow r) {
+         try {
+            return myFilter.filter(r);
+         } catch (Exception ex) {
+            Log.Gen.error($"FilterStream delegate threw exception: {ex}");
+            OnError(new StreamFilterException(StreamId, StreamName, null, ex, r));
+         }
+         return false;
+      }
    }
 }

src/DataStreamSuite/DataStream/Primitives/Filter/StreamFilterException.cs

@@ -0,0 +1,19 @@
+#nullable enable
+namespace Bts.DataStream.Primitives.Filter;
+
+using BCG;
+
+using System;
+
+public class StreamFilterException : Exception {
+   public StreamFilterException(Guid streamId, string streamName, string? message, Exception? innerException, IBlueRow? badRow = null)
+      : base(message, innerException) {
+      StreamId = streamId;
+      StreamName = streamName;
+      BadRow = badRow;
+   }
+
+   public Guid StreamId { get; }
+   public string StreamName { get; }
+   public IBlueRow? BadRow { get; }
+}

src/DataStreamSuite/DataStream/Primitives/Filter/TimeBasedFilter.cs

@@ -71,11 +71,10 @@ namespace BCG {
 
       #region IStreamFilter
       public bool filter(IBlueRow row) {
-         DateTime now = DateTime.Now;
-
-         DateTime row_time = row.get_datetime(_time_col, DateTime.Now);
-         if (now > row_time) {
-            TimeSpan span = now - row_time;
+         DateTime now_utc = DateTime.UtcNow;
+         DateTime row_time_utc = row.get_datetime(_time_col, DateTime.Now).ToUniversalTime();
+         if (now_utc > row_time_utc) {
+            TimeSpan span = now_utc - row_time_utc;
             if (span >= _ttl) {
                return (false);
             }
@@ -90,7 +89,7 @@ namespace BCG {
 
          if (now > myNextFilter) {
             // fire event
-            onFilterChange();
+            onFilterChange?.Invoke();
 
             myNextFilter = now.Add(_filter_period);
          }

src/DataStreamSuite/DataStream/Primitives/GroupBy/NonIncremental/NonIncGroupByStream.cs

@@ -96,6 +96,10 @@ namespace BCG {
          _timer.Restart();
          IBlueRowCollection total_state = _groupby_func.evaluate(grouped_rows);
          _timer.Stop();
+         if (total_state is null) {
+            Log.Gen.warn("NonIncGroupByStream _groupby_func.evaluate returned null (ignoring last update).");
+            return;
+         }
          var applyElapsedMs = _timer.ElapsedMilliseconds;
          _n_total_fires++;
          if (applyElapsedMs >= 50) {

src/DataStreamSuite/DataStream/Primitives/Join/ParallelJoinTest.cs

@@ -1,9 +1,7 @@
-using System;
+#nullable disable
+using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Text;
-using BCG.Utilities.General;
-using BCG.Utilities;
 
 namespace BCG
 {

src/DataStreamSuite/DataStream/Primitives/Map/MapStream.cs

@@ -1,6 +1,10 @@
+using bts;
+
 using Bts.DataStream;
+using Bts.DataStreamCore;
 
 using mbts.config;
+using mbts.utils;
 
 using System;
 
@@ -15,9 +19,9 @@ namespace BCG {
    /// </summary>
    [DataStreamUserRespresentation(false)]
    public class MapStream : MethodDrivenStream {
-      protected IStreamMapper myMapper;
-      protected IChangeableStreamMapper myChangeableMapper = null;
-      private bool myUseNewMap = Configuration.get<DataStreamConfig>().UseNewMap;
+      protected IStreamMapper? myMapper;
+      protected IChangeableStreamMapper? myChangeableMapper;
+      private bool myUseNewMap = false;
 
       public class FuncWrapper : IStreamMapper {
          private Func<IBlueTableSchema, IBlueTableSchema> _schema_map_func;
@@ -71,7 +75,7 @@ namespace BCG {
 
 
       protected override void myHandleFirstCall() {
-
+         ArgumentNullException.ThrowIfNull(myMapper);
          IBlueTableSchema outputSchema = myMapper.getOutputSchema(myLastArrivedPacket.newRows.schema);
          myLastFiredPacket = new DataPacket();
          myLastFiredPacket.newRows = new BlueTable(outputSchema);
@@ -82,28 +86,34 @@ namespace BCG {
       }
 
       protected override void myHandleIncrementalAdd() {
-         //t.start ();
-         myLastFiredPacket.addedRows = new BlueTable(myLastFiredPacket.newRows.schema);
-         foreach (IBlueRow row in myLastArrivedPacket.addedRows) {
-            IBlueRow newRow = myMapper.map(row);
-            (myLastFiredPacket.newRows as BlueTable).addRow(newRow);
-            (myLastFiredPacket.addedRows as BlueTable).addRow(newRow);
+         if (myLastArrivedPacket.addedRows.Count == 0) {
+            Log.Gen.warn("MapStream.myHandleIncrementalAdd called with 0 addedRows");
+            return;
          }
-         //t.stop ();
-         //System.Diagnostics.Trace.WriteLine ("adding " + myLastFiredPacket.addedRows.Count.ToString () + " : " + t.lastIntervalTime);
-         //System.Diagnostics.Trace.WriteLine (" ");
+         ArgumentNullException.ThrowIfNull(myMapper);
+         var addedRows = new BlueTable(myLastFiredPacket.newRows.schema);
+         var newRows = ExceptionAssert.Cast(myLastFiredPacket.newRows).To<BlueTable>();
+         foreach (IBlueRow row in myLastArrivedPacket.addedRows) {
+            var newRow = myMapper.map(row);
+            newRows.addRow(newRow);
+            addedRows.addRow(newRow);
+         }
+         myLastFiredPacket.addedRows = addedRows;
       }
 
       protected override void myHandleIncrementalDelete() {
-         //t.start ();
-         myLastFiredPacket.deletedRows = new BlueTable(myLastFiredPacket.newRows.schema);
-         foreach (IBlueRow row in myLastArrivedPacket.deletedRows) {
-            IBlueRow delRow = (myLastFiredPacket.newRows as BlueTable)[(int)row["id"]];
-            (myLastFiredPacket.deletedRows as BlueTable).addRow(delRow);
-            (myLastFiredPacket.newRows as BlueTable).deleteRow(row);
+         if (myLastArrivedPacket.deletedRows.Count == 0) {
+            Log.Gen.warn("MapStream.myHandleIncrementalDelete called with 0 deletedRows");
+            return;
          }
-         //t.stop ();
-         //System.Diagnostics.Trace.WriteLine ("deleting " + myLastFiredPacket.deletedRows.Count.ToString () + " : " + t.lastIntervalTime);
+         var deletedRows = new BlueTable(myLastFiredPacket.newRows.schema);
+         var newRows = ExceptionAssert.Cast(myLastFiredPacket.newRows).To<BlueTable>();
+         foreach (IBlueRow row in myLastArrivedPacket.deletedRows) {
+            var delRow = newRows[row.Id()];
+            deletedRows.addRow(delRow);
+            newRows.deleteRow(row);
+         }
+         myLastFiredPacket.deletedRows = deletedRows;
       }
 
 

src/DataStreamSuite/DataStream/Primitives/Map/SuperMapStream.cs

@@ -1,11 +1,9 @@
+using Bts.DataStreamCore;
+
+using mbts.utils;
+
 using System;
 using System.Collections.Generic;
-using System.Text;
-
-using BCG.Utilities;
-using BCG.Utilities.General;
-
-using mbts;
 
 namespace BCG {
    /// <summary>
@@ -56,15 +54,15 @@ namespace BCG {
             return rows == null ? new IBlueRow[] { } : new List<IBlueRow>(rows).ToArray();
          }
 
-         public event MapperChangeDelegate onMapperChange;
-         private void _fake() { onMapperChange(); }
+         public event MapperChangeDelegate? onMapperChange;
       }
 
       //maps the id of the underlying stream to the
       //rows of the resulting stream
       private Dictionary<int, List<IBlueRow>> myMap = new Dictionary<int, List<IBlueRow>>();
       private int myID = 0;
-      private BlueTable myRows, myBaseRows;
+      private BlueTable? myRows;
+      private BlueTable? myBaseRows;
       private ViewStream myStream;
       private ISuperStreamMapper myMapper;
       public bool generate_ids = true;
@@ -92,49 +90,40 @@ namespace BCG {
          myRows = null;
          myBaseRows = null;
          myMap.Clear();
-         //myMapper.onMapperChange -= new MapperChangeDelegate(myHandleMapChange);
       }
 
       private void myHandleData(object newValue) {
-         DataPacket idp = newValue as DataPacket;
-         //HighPerformanceTimer timer = new HighPerformanceTimer();
-         //timer.start();
-         DataPacket dp = newValue as DataPacket;
-         myRows = myRows ?? new BlueTable(myMapper.getOutputSchema(dp.schema));
-         myBaseRows = myBaseRows ?? new BlueTable(dp.schema);
+         var dp = ExceptionAssert.Cast(newValue).To<DataPacket>();
+         myRows ??= new BlueTable(myMapper.getOutputSchema(dp.schema));
+         myBaseRows ??= new BlueTable(dp.schema);
          BlueDataUtility.absorbChanges(myBaseRows, dp.deletedRows, dp.addedRows);
-         BlueTable dels = new BlueTable(myRows.schema),
-                     adds = new BlueTable(myRows.schema);
+         var dels = new BlueTable(myRows.schema);
+         var adds = new BlueTable(myRows.schema);
 
          foreach (IBlueRow r in dp.deletedRows) {
-            List<IBlueRow> mappedRows = myMap[(int)r["id"]];
+            var mappedRows = myMap[r.Id()];
             foreach (IBlueRow mr in mappedRows) {
                dels.addRow(mr);
                myRows.deleteRow(mr);
             }
-            myMap.Remove((int)r["id"]);
+            myMap.Remove(r.Id());
          }
          foreach (IBlueRow r in dp.addedRows) {
             IBlueRow[] mappedRows = myMapper.map(r);
             foreach (IBlueRow mr in mappedRows) {
                IBlueRow idChangedMapRow = generate_ids ? BlueDataUtility.getNewReplacedRow(mr, myID++, "id") : mr;
-               if (!myMap.ContainsKey((int)r["id"])) {
-                  myMap.Add((int)r["id"], new List<IBlueRow>());
-               }
-               myMap[(int)r["id"]].Add(idChangedMapRow);
+               myMap.GetOrAdd(r.Id(), _ => new()).Add(idChangedMapRow);
                myRows.addRow(idChangedMapRow);
                adds.addRow(idChangedMapRow);
             }
          }
-         //timer.stop();
-         // if (timer.lastIntervalTime > 20)
-         //    {}//mbts.Logger.log(bts.log.Level.Info, bts.log.Subsystem.gen, String.Format("SuperMapper:myHandlerData for mapper {0} took {1} msecs", myMapper.GetType().ToString(), timer.lastIntervalTime));
          myFireEvent(new DataPacket(myRows, adds, dels));
       }
 
       private void myHandleMapChange() {
-         if (myBaseRows != null)
+         if (myBaseRows is not null) {
             myHandleData(new DataPacket(myBaseRows, new BlueTable(myBaseRows), new BlueTable(myBaseRows)));
+         }
       }
    }
 }

src/DataStreamSuite/DataStream/Primitives/Misc/PubsubEchoTestStream.cs

@@ -8,6 +8,7 @@ using System.IO;
 using System.Linq;
 using System.Runtime.CompilerServices;
 using bts.api;
+using Bts.PubSub.Routing;
 
 namespace bts
 {
@@ -95,10 +96,11 @@ namespace bts
       };
       IOState _state = IOState.SEND;
 
-      public PubsubEchoTestStream(string server_url, TimeSpan publish_period, int payload_size, string tag_name, ViewStreamDatabase vsd)
-      {
-         var route = new PubSubRoute(server_url, ".*");
-         _router = new PubSubRouter(route);
+      public PubsubEchoTestStream(string server_url, TimeSpan publish_period, int payload_size, string tag_name, ViewStreamDatabase vsd) {
+         _router = new PubSubRouter(new PubSubRouterConfig() {
+            PublisherRoutes = new() { new(server_url, ".*") },
+            SubscriberRoutes = new() { new(server_url, ".*") },
+         });
          _vsd = vsd;
          _payload_sz = payload_size;
          var schema = BlueDataUtility.form_schema("PubSubTest",
@@ -220,4 +222,4 @@ namespace bts
       }
 
    }
-}
+}

src/DataStreamSuite/DataStream/Primitives/Misc/TestStream.cs

@@ -95,7 +95,7 @@ namespace BCG {
             sub_msg.serialize_into_str(str);
             str.Position = 0;
             bts.SubscribeMsg sub_msg_ = new bts.SubscribeMsg();
-            sub_msg_.consruct_deserialize(str);
+            sub_msg_.construct_deserialize(str);
             bool res = sub_msg.Equals(sub_msg_);
             return new TestResult {
                 test_name = "SubscribeMsg",
@@ -117,7 +117,7 @@ namespace BCG {
             pub_msg.serialize_into_str(str);
             str.Position = 0;
             var pub_msg_ = new bts.PublishMsg();
-            pub_msg_.consruct_deserialize(str);
+            pub_msg_.construct_deserialize(str);
             bool res = pub_msg.Equals(pub_msg_);
             return new TestResult {
                 test_name = "PublishMsg",
@@ -135,7 +135,7 @@ namespace BCG {
             msg.serialize_into_str(str);
             str.Position = 0;
             var msg_ = new bts.PubSubServerMessage();
-            msg_.consruct_deserialize(str);
+            msg_.construct_deserialize(str);
             bool res = msg.Equals(msg_);
             return new TestResult {
                 test_name = "PubSubServerMessage",
@@ -156,7 +156,7 @@ namespace BCG {
             msg.serialize_into_str(str);
             str.Position = 0;
             var msg_ = new PubSubClientMessage();
-            msg_.consruct_deserialize(str);
+            msg_.construct_deserialize(str);
             var res = msg.Equals(msg_);
             return new TestResult {
                 test_name = "PubSubClientMessage",
@@ -617,14 +617,15 @@ namespace BCG {
 
 
         private static TestResult _run_single_tag_data_test_clean() {
+            // var tagHandlerFactory
             // create message
-            var test_name = MethodBase.GetCurrentMethod().Name;
+            var test_name = MethodBase.GetCurrentMethod()?.Name;
             var schema = create_schema_with_all_types();
             var tag = "DS_" + schema.tableName;
             BlueTable table = new BlueTable(schema);
             IStreamIOMsgSerializer serializer = new StreamIOSerializationController();
             IStreamMsgDeserilizer deser = new StreamIODeserializationController();
-            bts.SingleTagData st_data = new bts.SingleTagData(tag, DSTagManager.DataStreamTagType);
+            bts.SingleTagData st_data = new bts.SingleTagData(tag, DSTagManager.DataStreamTagType, new PubsubServerStreamTagHandler());
             // create with 100 rows
             int n_rows = 100;
             bool is_succ = true;

src/DataStreamSuite/DataStream/Primitives/Misc/WebScrapingStream.cs

@@ -10,15 +10,15 @@ using HtmlAgilityPack;
 
 namespace BCG {
     class Program {
-        static void Main() {
-            string url = "http://quotes.toscrape.com";
-            List<string> quotes = ScrapeQuotes(url);
+      //   static void Main() {
+      //       string url = "http://quotes.toscrape.com";
+      //       List<string> quotes = ScrapeQuotes(url);
 
-            Console.WriteLine("Quotes from http://quotes.toscrape.com:");
-            foreach (var quote in quotes) {
-                Console.WriteLine(quote);
-            }
-        }
+      //       Console.WriteLine("Quotes from http://quotes.toscrape.com:");
+      //       foreach (var quote in quotes) {
+      //           Console.WriteLine(quote);
+      //       }
+      //   }
 
         static List<string> ScrapeQuotes(string url) {
             List<string> quotes = new List<string>();

src/DataStreamSuite/DataStream/Primitives/MongoDB/MongoSchemaAdaptor.cs

@@ -2,14 +2,16 @@ namespace Bts.DataStream;
 
 using bts;
 
+using Bts.DataStreamCore;
+
 using MongoDB.Bson;
 
 using System;
 using System.Collections.Generic;
 
 public static class MongoSchemaAdaptor {
-   public static BlueTableSchemaAdaptor<BsonDocument> InferSchema(IEnumerable<BsonDocument> docs) {
-      var schemaAdaptor = new BlueTableSchemaAdaptor<BsonDocument>("MongoCollectionStream");
+   public static BlueTableSchemaAdapter<BsonDocument> InferSchema(IEnumerable<BsonDocument> docs) {
+      var schemaAdaptor = new BlueTableSchemaAdapter<BsonDocument>("MongoCollectionStream");
       foreach (var doc in docs) {
          foreach (var el in doc) {
             if (schemaAdaptor.Contains(el.Name)) {

src/DataStreamSuite/DataStream/Primitives/Project/ProjectHelper.cs

@@ -75,16 +75,7 @@ namespace BCG
       {
          IDictionary<string, string> origToAlias = new Dictionary<string, string>();
 
-         ColumnMapExpression e;
-         if (Configuration.get<DataStreamConfig>().UseStaticParser)
-         {
-            e = ColumnMapExpression.Parse(exp);
-         }
-         else
-         {
-            // TODO (maybe): Actually use non-static parser (unclear what advantages it will have)
-            e = ColumnMapExpression.Parse(exp);
-         }
+         var e = ColumnMapExpression.Parse(exp);
          if (e.IsInclusive) {
             origToAlias = e.Columns.ToDictionary();
             origToAlias["id"] = "id";

src/DataStreamSuite/DataStream/Primitives/SQL/SQLite/SQLiteEnumerator.cs

@@ -0,0 +1,54 @@
+namespace Bts.DataStream;
+
+using BCG;
+
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SQLite;
+using System.Linq;
+using System.Threading;
+
+public class SQLiteEnumerable : IAsyncEnumerable<IBlueRowCollection> {
+   readonly string location;
+   readonly string statement;
+   readonly int pageSize;
+
+   public SQLiteEnumerable(string location, string statement, int pageSize = 65536) {
+      this.location = location;
+      this.statement = statement;
+      this.pageSize = pageSize;
+   }
+
+   public async IAsyncEnumerator<IBlueRowCollection> GetAsyncEnumerator(CancellationToken cancellationToken = default) {
+      var dataTable = new DataTable();
+      await using var conn = new SQLiteConnection($"Data Source={location};Version=3");
+      await conn.OpenAsync(cancellationToken);
+      await using var cmd = new SQLiteCommand(statement, conn);
+      await using var reader = cmd.ExecuteReader();
+      var schema = await reader.GetColumnSchemaAsync(cancellationToken);
+      var columns = schema.OrderBy(c => c.ColumnOrdinal ?? int.MaxValue)
+         .Select((c, i) => new ColumnInfo(c.ColumnName, c.ColumnOrdinal ?? i, c.DataType))
+         .Append(new ColumnInfo("id", schema.Count, typeof(int)))
+         .ToArray();
+      var blueSchema = new BlueTableSchema("anon", columns);
+      BlueTable? table = null;
+      int rowId = 1;
+      while (await reader.ReadAsync(cancellationToken)) {
+         table ??= new BlueTable(blueSchema);
+         var rowVals = new object[blueSchema.columnInfo.Length];
+         if (reader.GetValues(rowVals) != rowVals.Length - 1) {
+            throw new InvalidOperationException("Sqlite reader value count for single row not equal to column count");
+         }
+         rowVals[^1] = rowId++;
+         table.addRow(new BlueRow(blueSchema, rowVals));
+         if (table.Count == pageSize) {
+            yield return table;
+            table = null;
+         }
+      }
+      if (table is not null) {
+         yield return table;
+      }
+   }
+}

src/DataStreamSuite/DataStream/Primitives/SQL/SQLite/SQLiteHelper.cs

@@ -3,6 +3,8 @@ using System.Data;
 using System.Data.SQLite;
 using System.Diagnostics;
 using System.Collections;
+using System.IO;
+using System.Text;
 
 
 using BCG;
@@ -10,12 +12,14 @@ using System.Linq;
 using System.Data.Entity;
 using System.Collections.Generic;
 using System.Data.SQLite;
+using System.Runtime.InteropServices;
+
 
 
 namespace bts.BlueOrb{
 
    public static class SQLiteHelper {
-      public static string location = "C:\\Users\\m_tah\\development\\data\\";
+      public static string location = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? "C:\\BlueOrb_Data\\" : Path.Combine(Environment.GetEnvironmentVariable("HOME"), "BlueOrb_Data");
       public static string db_name = "stream_data.db";
 
       public static DataTable execute_select_query(string connection_string, string query) {

src/DataStreamSuite/DataStream/Primitives/SQL/SQLite/SqliteStream.cs

@@ -18,7 +18,7 @@ namespace bts.BlueOrb {
 
       public SQLiteStream(string db_name, string query)
       :
-      this($"Data Source={SQLiteHelper.location}{db_name};Version=3", query, true) { }
+      this($"Data Source={System.IO.Path.Combine(SQLiteHelper.location,db_name)};Version=3", query, true) { }
 
       public SQLiteStream(string query)
       :
@@ -30,7 +30,7 @@ namespace bts.BlueOrb {
          _stopwatch.Start();
          DataTable dt = SQLiteHelper.execute_select_query(_connection_string, _query);
          _stopwatch.Stop();
-         Log.Gen.info($"SQLiteStream.ExecuteSelectQuery time to read db: {_stopwatch.ElapsedMilliseconds} msecs");
+         Log.Gen.info($"SQLiteStream.ExecuteSelectQuery time to read db: {_stopwatch.ElapsedMilliseconds} msecs, query: {_query}, connection:{_connection_string}");
          _stopwatch.Restart();
          #region perf measures
          // SQLiteHelper.get_table(_connection_string, _query);

src/DataStreamSuite/DataStream/Primitives/SideEffectStreams/CSVSaverStream.cs

@@ -112,11 +112,12 @@ namespace BCG {
       }
 
       protected override void myOnFirstSubscriber() {
+         //_stopwatch.Start();
+         //DataFrame df = DataFrame.LoadCsv(_file_address);
+         //_stopwatch.Stop();
+         //bts.Log.Gen.info($"CSVReaderStream.myOnFirstSubscriber stream csv load col_count: {df.Columns.Count} rows, time: {_stopwatch.ElapsedMilliseconds} msecs");
          _stopwatch.Start();
-         DataFrame df = DataFrame.LoadCsv(_file_address);
-         _stopwatch.Stop();
-         bts.Log.Gen.info($"CSVReaderStream.myOnFirstSubscriber stream csv load col_count: {df.Columns.Count} rows, time: {_stopwatch.ElapsedMilliseconds} msecs");
-         _stopwatch.Start();
+         bts.Log.Gen.info($"CSVReaderStream.myOnFirstSubscriber opening address{_file_address}");
          IBlueRowCollection rows = BlueDataUtility.createRowsFromCSVFileWithoutTypes(_file_address);
          _stopwatch.Stop();
          bts.Log.Gen.info($"CSVReaderStream.myOnFirstSubscriber stream csv load count: {rows.Count} rows, time: {_stopwatch.ElapsedMilliseconds} msecs");

src/DataStreamSuite/DataStream/Primitives/Union/RowBasedAppendStream.cs

@@ -0,0 +1,63 @@
+namespace bts.BlueOrb {
+   using BCG;
+
+   using System;
+   using System.Collections;
+   using System.Collections.Generic;
+   using System.Runtime.Intrinsics.Arm;
+
+   // given a parent stream, creates a stream for each row in the parent stream and appends them all together
+   public class RowBasedAppendStream : ViewStream {
+      private Dictionary<string, ViewStream> _stream_map = new Dictionary<string, ViewStream>();
+      private MutableAppendStream _final_stream = new MutableAppendStream();
+      private ViewStream _parent_stream;
+      private string[] _key_cols;
+      private Func<IBlueRow, ViewStream> _make_stream;
+      public RowBasedAppendStream(ViewStream parent_stream,
+                                 Func<IBlueRow, ViewStream> make_stream,
+                                 params string[] key_cols) {
+         _parent_stream = parent_stream;
+         _make_stream = make_stream;
+         _key_cols = key_cols;
+      }
+
+      protected override void myOnFirstSubscriber() {
+         _parent_stream.onChange += _on_parent_stream_change;
+         _final_stream.onChange += _on_final_stream_change;
+      }
+
+      protected override void myOnLastSubscriber() {
+         _parent_stream.onChange -= _on_parent_stream_change;
+         _final_stream.onChange -= _on_final_stream_change;
+      }
+
+
+      private void _on_parent_stream_change(object dp_obj) {
+         DataPacket dp = dp_obj as DataPacket;
+         foreach (IBlueRow r in dp.deletedRows) {
+            string hash = r.get_row_cols_as_string(_key_cols);
+            ViewStream hash_str = null;
+            if (_stream_map.TryGetValue(hash, out hash_str)) {
+               _stream_map.Remove(hash);
+               _final_stream.removeStream(hash_str);
+            } else {
+               Log.assert(false);
+            }
+         }
+         foreach (IBlueRow r in dp.addedRows) {
+            string hash = r.get_row_cols_as_string(_key_cols);
+            ViewStream hash_stream = null;
+            if (!_stream_map.TryGetValue(hash, out hash_stream)) {
+               hash_stream = _make_stream(r);
+               _stream_map.Add(hash, hash_stream);
+               _final_stream.addStream(hash_stream);
+            }
+         }
+
+      }
+
+      private void _on_final_stream_change(object dp_obj) {
+         myFireEvent(dp_obj);
+      }
+   }
+}

src/DataStreamSuite/DataStream/Publish/CircularPublisher.cs

@@ -1,3 +1,5 @@
+using Bts.DataStreamCore;
+
 using System;
 
 namespace BCG {
@@ -7,14 +9,15 @@ namespace BCG {
    /// </summary>
 	public class CircularPublisher {
       private CircularRowCollection myBuffer;
-      private PubTableBroker myBroker;
+      private readonly IPubTableBroker myBroker;
       private int myBufferSize;
-      public CircularPublisher(int bufferSize) {
+      public CircularPublisher(int bufferSize, IPubTableBroker broker) {
          myBufferSize = bufferSize;
+         myBroker = broker;
       }
 
-      public CircularPublisher(int bufferSize, IBlueRowCollection rows)
-         : this(bufferSize) {
+      public CircularPublisher(int bufferSize, IPubTableBroker broker, IBlueRowCollection rows)
+         : this(bufferSize, broker) {
          publishRows(rows);
       }
 
@@ -23,7 +26,6 @@ namespace BCG {
             myBuffer = new CircularRowCollection(
                new BlueTableSchema(nr.schema.tableName, nr.schema.columnInfo),
                myBufferSize);
-            myBroker = new PubTableBroker();
             myBroker.create_table(myBuffer);
          }
          IBlueRow br = myBuffer.addRowWithReturn(nr);
@@ -38,7 +40,6 @@ namespace BCG {
                new BlueTableSchema(BlueDataUtility.extractRow(nrs, 0).schema.tableName,
                BlueDataUtility.extractRow(nrs, 0).schema.columnInfo),
                myBufferSize);
-            myBroker = new PubTableBroker();
             myBroker.create_table(myBuffer);
          }
          BlueTable deletes = new BlueTable(myBuffer.schema);

src/DataStreamSuite/DataStream/Publish/ViewPublisher.cs

@@ -4,10 +4,12 @@ using System.Data;
 
 using BCG.Utilities;
 
+using Bts.DataStreamCore;
+
 namespace BCG {
    public class ViewPublisher : IDisposable {
       protected ViewPublisher() { }
-      private readonly PubTableBroker _broker;
+      private readonly IPubTableBroker _broker;
       protected readonly ViewStream _stream;
       private int _n_updates = 0;
 
@@ -15,7 +17,7 @@ namespace BCG {
       /// in the schema (be careful with that because this
       /// could lead to double publishes if the schema name
       /// is not uniquely chosen)
-      public ViewPublisher(string name, PubTableBroker broker, ViewStream vs) {
+      public ViewPublisher(string name, IPubTableBroker broker, ViewStream vs) {
          _stream = String.IsNullOrEmpty(name) ? vs : new ChangeTableNameStream(vs, name);
          _broker = broker;
          _stream.onChange += new DataStream.ChangeDelegate(_handle_update);

src/DataStreamSuite/DataStream/Services/DataStreamServices.cs

@@ -0,0 +1,11 @@
+namespace Bts.DataStream.Services;
+
+using BCG;
+
+using Microsoft.Extensions.DependencyInjection;
+
+public static class DataStreamServices {
+   public static IServiceCollection AddRemoteQueryManager(this IServiceCollection services) =>
+      services.AddSingleton<RemoteQueryManager>()
+         .AddHostedService(sp => sp.GetRequiredService<RemoteQueryManager>());
+}

src/DataStreamSuite/DataStream/TableUpdateDataPacket.cs

@@ -1,73 +0,0 @@
-namespace Bts.DataStream;
-
-using BCG;
-
-using bts.api.core;
-
-using Bts.DataStreamCore;
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-
-
-public class TableUpdateDataPacket<T> : IDataPacket<T> where T : IBlueRow {
-   readonly TableUpdate<T, int> table;
-   readonly IBlueTableSchema schema;
-
-   public TableUpdateDataPacket(TableUpdate<T, int> table, IBlueTableSchema schema) {
-      this.table = table;
-      this.schema = schema;
-   }
-
-   public IBlueRowCollection<T> newRows {
-      get {
-         var rv = new BlueTableImmutable<T>(schema);
-         return rv;
-      }
-   }
-
-   public IBlueRowCollection<T> addedRows => throw new NotImplementedException();
-
-   public IBlueRowCollection<T> deletedRows => throw new NotImplementedException();
-
-   class MyRowCollection : IBlueRowCollection<T> {
-      readonly TableUpdate<T, int> table;
-      readonly IEnumerable<T> items;
-      Lazy<SortedList<int, T>> itemList;
-
-      public MyRowCollection(IEnumerable<T> items, IBlueTableSchema schema) {
-         this.items = items;
-         this.schema = schema;
-         itemList = new(() => {
-            var rv = new SortedList<int, T>();
-            foreach (var item in this.items) {
-               rv.Add(item.Id(), item);
-            }
-            return rv;
-         });
-      }
-
-      public int Count => itemList.Value.Count;
-      public bool IsSynchronized => false;
-      public object SyncRoot => this;
-
-      public T this[int id] => itemList.Value[id];
-
-      public IBlueTableSchema schema { get; }
-
-      public bool containsID(int id) =>
-         itemList.Value.ContainsKey(id);
-
-      public void CopyTo(Array array, int index) {
-      }
-
-      public IEnumerator<T> GetEnumerator() {
-         throw new NotImplementedException();
-      }
-
-      IEnumerator IEnumerable.GetEnumerator() {
-         throw new NotImplementedException();
-      }
-   }
-}

src/DataStreamSuite/DataStreamCore/BlueData/BlueDataUtility.cs

@@ -90,6 +90,41 @@ namespace BCG {
       public static DateTime get_datetime(this IBlueRow r, int col_no, DateTime err_value = default(DateTime)) {
          return BlueDataUtility.get_row_datetime_value(r, col_no, err_value);
       }
+
+      public static double? GetDouble(this IBlueRow r, int colNo) =>
+         GetDouble(r[colNo]);
+
+      public static double? GetDouble(this IBlueRow r, string colName) =>
+         GetDouble(r[colName]);
+
+      public static double? GetDouble(object obj) {
+         if (obj is double d) {
+            return d;
+         }
+         if (obj is int i32) {
+            return i32;
+         }
+         if (obj is long i64) {
+            return i64;
+         }
+         if (obj is string s) {
+            return double.TryParse(s, out d) ? d : null;
+         }
+         if (obj is uint u32) {
+            return u32;
+         }
+         if (obj is ulong u64) {
+            return u64;
+         }
+         if (obj is short i16) {
+            return i16;
+         }
+         if (obj is ushort u16) {
+            return u16;
+         }
+         return null;
+      }
+
       public static T get_enum<T>(this IBlueRow r, string col_name, T err_value = default(T)) where T : struct {
          return BlueDataUtility.get_row_enum_value<T>(r, col_name, err_value);
       }
@@ -114,7 +149,7 @@ namespace BCG {
             rv.Add(r.get<T>(col));
          return rv;
       }
-      public static IEnumerable<T> get_colvalues<T>(IEnumerable<IBlueRow> rows, int start_idx, int n_items,string col) {
+      public static IEnumerable<T> get_colvalues<T>(IEnumerable<IBlueRow> rows, int start_idx, int n_items, string col) {
          List<T> rv = new List<T>();
          int end_idx = Math.Min(start_idx + n_items, rows.Count());
          for (int i = start_idx; i < end_idx; i++) {
@@ -135,6 +170,16 @@ namespace BCG {
          return rv;
       }
 
+      public static string get_row_cols_as_string(this IBlueRow r, params string[] cols) {
+         string rv = String.Empty;
+         foreach (string c in cols) {
+            object o = r[c];
+            o = o ?? DBNull.Value;
+            rv += o.ToString() + "_";
+         }
+         return rv;
+      }
+
       public static IDictionary<T, IEnumerable<IBlueRow>> group_by<T>(IBlueRowCollection rows, string gp_col) {
          Dictionary<T, List<IBlueRow>> rv = new Dictionary<T, List<IBlueRow>>();
          foreach (IBlueRow r in rows) {
@@ -289,7 +334,7 @@ namespace BCG {
 
       #region json
 
-      public static void write_to_json_file(this IBlueRowCollection table, string file_path) { 
+      public static void write_to_json_file(this IBlueRowCollection table, string file_path) {
          write_dict_to_json_file(file_path, table.to_namevalue_pairs());
       }
 
@@ -380,7 +425,7 @@ namespace BCG {
          return rv;
       }
 
-      public static List<Dictionary<string,string>> to_namevalue_pairs(this IBlueRowCollection table) {
+      public static List<Dictionary<string, string>> to_namevalue_pairs(this IBlueRowCollection table) {
          List<Dictionary<string, string>> rv = new List<Dictionary<string, string>>();
          foreach (IBlueRow r in table) {
             rv.Add(r.to_dict());
@@ -2314,6 +2359,32 @@ namespace BCG {
       //    }
       // }
 
+      public static TimeSpan? GetTimeSpan(this IBlueRow r, int col_no) =>
+         GetTimeSpan(r[col_no]);
+
+      public static TimeSpan? GetTimeSpan(this IBlueRow r, string col_name) =>
+         GetTimeSpan(r[col_name]);
+
+      public static TimeSpan? GetTimeSpan(object obj) {
+         if (obj is TimeSpan ts) {
+            return ts;
+         }
+         var str = obj as string ?? obj?.ToString();
+         if (str is null) {
+            return null;
+         }
+         if (TimeSpan.TryParse(str, out ts)) {
+            return ts;
+         }
+         if (str.StartsWith("PT")) {
+            try {
+               // Parse ISO 8601 duration
+               return System.Xml.XmlConvert.ToTimeSpan(str);
+            } catch {
+            }
+         }
+         return null;
+      }
       #endregion
 
       #region CSV methods

src/DataStreamSuite/DataStreamCore/BlueData/BlueRow.cs

@@ -88,9 +88,16 @@ namespace BCG
       public BlueRow(IBlueTableSchema schema, IDictionary row)
       {
          myInit(schema);
-         foreach (DictionaryEntry de in row)
-            if (mySchema[de.Key as string] != null)
+         // Use GetEnumerator instead of a foreach loop because the latter calls
+         // '((IEnumerator)row).GetEnumerator()', which iterates over values
+         // instead of key value pairs.
+         var en = row.GetEnumerator();
+         while (en.MoveNext()) {
+            var de = en.Entry;
+            if (mySchema[de.Key as string] is not null) {
                myValues[mySchema[de.Key as string].colNo] = de.Value;
+            }
+         }
       }
 
       /// <summary>

src/DataStreamSuite/DataStreamCore/BlueData/BlueRowAdapter.cs

@@ -0,0 +1,21 @@
+#nullable enable
+namespace Bts.DataStreamCore;
+
+using BCG;
+
+public class BlueRowAdapter<T> : IBlueRow {
+   readonly BlueTableSchemaAdapter<T> adapter;
+   readonly T data;
+
+   public BlueRowAdapter(BlueTableSchemaAdapter<T> adapter, T data) {
+      this.adapter = adapter;
+      this.data = data;
+   }
+
+   public T Data => data;
+   public IBlueTableSchema<T> Schema => adapter;
+   IBlueTableSchema IBlueRow.schema => adapter.Schema;
+
+   public object? this[int columnIndex] => adapter[columnIndex][data];
+   public object? this[string columnName] => adapter[columnName][data];
+}

src/DataStreamSuite/DataStreamCore/BlueData/BlueRowEnumerator.cs

@@ -7,7 +7,7 @@ namespace BCG
    /// Used for enumerating an IEnumerable (ex ICollection). Furthermore, this is the 
    /// default Enueramtor used when enumerating asn IBlueRow
    /// </summary>
-   public class BlueRowEnumerator : IEnumerator
+   public class BlueRowEnumerator : IDictionaryEnumerator
       {
          protected int myPos = -1;
          protected int myRowSize = -1;
@@ -18,6 +18,11 @@ namespace BCG
             myRow = row;
             myRowSize = row.schema.columnNames.Length;
          }
+
+         public DictionaryEntry Entry =>
+            new(myRow.schema.columnInfo[myPos].colName, myRow[myPos]);
+         public object Key => myRow.schema.columnInfo[myPos].colName;
+         public object Value => myRow[myPos];
          
          #region IEnumerator members
          public void Reset()  {myPos = 0;}

src/DataStreamSuite/DataStreamCore/BlueData/BlueRowKeyCollection.cs

@@ -0,0 +1,30 @@
+#nullable enable
+namespace BCG;
+
+using System;
+using System.Collections;
+
+public class BlueRowKeyCollection : ICollection {
+   readonly ColumnInfo[] columns;
+
+   public BlueRowKeyCollection(ColumnInfo[] columns) =>
+      this.columns = columns;
+
+   public int Count => columns.Length;
+
+   public bool IsSynchronized => false;
+
+   public object SyncRoot => this;
+
+   public void CopyTo(Array array, int index) {
+      for (int i = 0; i < columns.Length; i++) {
+         array.SetValue(columns[i].colName, i + index);
+      }
+   }
+
+   public IEnumerator GetEnumerator() {
+      for (int i = 0; i < columns.Length; i++) {
+         yield return columns[i].colName;
+      }
+   }
+}

src/DataStreamSuite/DataStreamCore/BlueData/BlueRowReflection.cs

@@ -0,0 +1,44 @@
+#nullable enable
+namespace Bts.DataStreamCore;
+
+using BCG;
+
+using System.Linq;
+using System.Reflection;
+
+public static class BlueRowReflectionFactory {
+   public static IBlueRow Create<T>(T row, string? tableName = null) =>
+      new BlueRowReflection<T>(row);
+
+   class BlueRowReflection<T> : IBlueRow {
+      public static readonly ColumnInfo[] ColumnInfos;
+      public static readonly PropertyInfo[] ColumnProps;
+
+      readonly T row;
+      readonly string? tableName;
+
+      static BlueRowReflection() {
+         var colTups = typeof(T).GetProperties(BindingFlags.Instance)
+            .Select(p => (Prop: p, Attr: p.GetCustomAttribute<BlueTableColumnAttribute>()))
+            .Where(p => p.Attr is not null)
+            .ToList();
+         ColumnInfos = new ColumnInfo[colTups.Count];
+         ColumnProps = new PropertyInfo[colTups.Count];
+         for (int i = 0; i < colTups.Count; i++) {
+            var (prop, attr) = colTups[i];
+            ColumnInfos[i] = new(attr?.Name ?? prop.Name, i, prop.PropertyType);
+            ColumnProps[i] = prop;
+         }
+      }
+
+      public BlueRowReflection(T row, string? tableName = null) {
+         this.row = row;
+         this.tableName = tableName;
+      }
+
+      public object? this[int index] => ColumnProps[index].GetValue(row);
+
+      public IBlueTableSchema schema =>
+         new BlueTableSchema(ColumnInfos, tableName ?? typeof(T).Name);
+   }
+}

src/DataStreamSuite/DataStreamCore/BlueData/BlueRowValueCollection.cs

@@ -0,0 +1,32 @@
+#nullable enable
+namespace BCG;
+
+using System;
+using System.Collections;
+
+public class BlueRowValueCollection : ICollection {
+   readonly IBlueRow row;
+
+   public BlueRowValueCollection(IBlueRow row) =>
+      this.row = row;
+
+   public int Count => row.schema.columnInfo.Length;
+
+   public bool IsSynchronized => false;
+
+   public object SyncRoot => this;
+
+   public void CopyTo(Array array, int index) {
+      var length = row.schema.columnInfo.Length;
+      for (int i = 0; i < length; i++) {
+         array.SetValue(row[i], i + index);
+      }
+   }
+
+   public IEnumerator GetEnumerator() {
+      var length = row.schema.columnInfo.Length;
+      for (int i = 0; i < length; i++) {
+         yield return row[i];
+      }
+   }
+}

src/DataStreamSuite/DataStreamCore/BlueData/BlueTableColumnAttribute.cs

@@ -0,0 +1,17 @@
+#nullable enable
+namespace Bts.DataStreamCore;
+
+using System;
+
+[AttributeUsage(AttributeTargets.Property)]
+public class BlueTableColumnAttribute : Attribute {
+   readonly int index;
+
+   public BlueTableColumnAttribute(string? name = null, int index = -1) {
+      Name = name;
+      this.index = index;
+   }
+
+   public string? Name { get; }
+   public int? Index => index >= 0 ? index : null;
+}

src/DataStreamSuite/DataStreamCore/BlueData/BlueTableImmutable.cs

@@ -3,10 +3,15 @@ namespace Bts.DataStreamCore;
 
 using BCG;
 
+using bts.api.core;
+
+using Bts.DataStreamCore;
+
 using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.Immutable;
+using System.Linq;
 
 // I would have named this ImmutableBlueTable, but that was already taken.
 public class BlueTableImmutable : IBlueRowCollection, IImmutableRowCollection {
@@ -79,10 +84,24 @@ public class BlueTableImmutable : IBlueRowCollection, IImmutableRowCollection {
          }
       }
 
-      public DataPacket ToDataPacket(bool reset = true) {
+      public void Clear() {
+         added.Clear();
+         removed.Clear();
+         removed.AddRange(table);
+      }
+
+      public void Reset() {
+         added.Clear();
+         removed.Clear();
+      }
+
+      public DataPacket ToDataPacket(bool reset = true) =>
+         ToDataPacket(out _, reset);
+
+      public DataPacket ToDataPacket(out BlueTableImmutable newRows, bool reset = true) {
          table.RemoveRange(removed.Keys);
          table.AddRange(added);
-         var newRows = new BlueTableImmutable(schema, table.ToImmutable());
+         newRows = new BlueTableImmutable(schema, table.ToImmutable());
          var addedRows = new BlueTableImmutable(schema, added.ToImmutable());
          var removedRows = new BlueTableImmutable(schema, removed.ToImmutable());
          if (reset) {
@@ -97,58 +116,183 @@ public class BlueTableImmutable : IBlueRowCollection, IImmutableRowCollection {
    }
 }
 
-public class BlueTableImmutable<T> : IBlueRowCollection<T> where T : IBlueRow {
+// public class BlueTableImmutable<T> : IBlueRowCollection<T> where T : IBlueRow {
+//    readonly ImmutableDictionary<int, T> rows;
+
+//    public BlueTableImmutable(IBlueTableSchema schema)
+//       : this(schema, ImmutableDictionary<int, T>.Empty) { }
+
+//    public BlueTableImmutable(IBlueTableSchema schema, ImmutableDictionary<int, T> rows) {
+//       this.schema = schema;
+//       this.rows = rows;
+//    }
+
+//    public int Count => rows.Count;
+//    public bool IsSynchronized => false;
+//    public IBlueTableSchema schema { get; }
+//    public object SyncRoot => this;
+
+//    public T this[int id] => rows[id];
+
+//    public bool containsID(int id) =>
+//       rows.ContainsKey(id);
+
+//    public void CopyTo(Array array, int index) {
+//       foreach (var r in rows.Values) {
+//          array.SetValue(r, index++);
+//       }
+//    }
+
+//    public IEnumerator<T> GetEnumerator() =>
+//       rows.Values.GetEnumerator();
+
+//    IEnumerator IEnumerable.GetEnumerator() =>
+//       GetEnumerator();
+
+//    public DataPacketBuilder ToDataPacketBuilder() =>
+//       new(this);
+
+//    public class DataPacketBuilder {
+//       readonly IBlueTableSchema schema;
+//       readonly ImmutableDictionary<int, T>.Builder table;
+//       readonly ImmutableDictionary<int, T>.Builder added =
+//          ImmutableDictionary<int, T>.Empty.ToBuilder();
+//       readonly ImmutableDictionary<int, T>.Builder removed =
+//          ImmutableDictionary<int, T>.Empty.ToBuilder();
+
+//       public DataPacketBuilder(BlueTableImmutable<T> table) {
+//          schema = table.schema;
+//          this.table = table.rows.ToBuilder();
+//       }
+
+//       public void AddOrUpdate(T row, IEqualityComparer<IBlueRow>? comparer = null) {
+//          var id = row.Id();
+//          if (table.TryGetValue(id, out var orig)) {
+//             if (comparer?.Equals(row, orig) ?? false) {
+//                // No op: This row was already in the table (according to 'comparer').
+//                // Remove it from 'added' and 'removed'.
+//                added.Remove(id);
+//                removed.Remove(id);
+//                return;
+//             }
+//             // Change op: A row with this id was already in the table,
+//             // but its values have changed (according to 'comparer').
+//             removed[id] = orig;
+//          }
+//          added[id] = row;
+//       }
+
+//       public void Remove(int id) {
+//          added.Remove(id);
+//          if (table.TryGetValue(id, out var orig)) {
+//             removed[id] = orig;
+//          }
+//       }
+
+//       public DataPacket ToDataPacket(bool reset = true) {
+//          table.RemoveRange(removed.Keys);
+//          table.AddRange(added);
+//          var newRows = new BlueTableImmutable<T>(schema, table.ToImmutable());
+//          var addedRows = new BlueTableImmutable<T>(schema, added.ToImmutable());
+//          var removedRows = new BlueTableImmutable<T>(schema, removed.ToImmutable());
+//          if (reset) {
+//             added.Clear();
+//             removed.Clear();
+//          }
+//          return new(newRows, addedRows, removedRows);
+//       }
+
+//       public IDataPacket<T> ToDataPacketT(bool reset = true) {
+//          table.RemoveRange(removed.Keys);
+//          table.AddRange(added);
+//          var newRows = new BlueTableImmutable<T>(schema, table.ToImmutable());
+//          var addedRows = new BlueTableImmutable<T>(schema, added.ToImmutable());
+//          var removedRows = new BlueTableImmutable<T>(schema, removed.ToImmutable());
+//          if (reset) {
+//             added.Clear();
+//             removed.Clear();
+//          }
+//          return new DataPacket<T>(newRows, addedRows, removedRows);
+//       }
+
+//       public IDataPacket<T> ToDataPacketT(
+//          out BlueTableImmutable<T> newRows,
+//          out BlueTableImmutable<T> addedRows,
+//          out BlueTableImmutable<T> removedRows,
+//          bool reset = true
+//       ) {
+//          table.RemoveRange(removed.Keys);
+//          table.AddRange(added);
+//          newRows = new BlueTableImmutable<T>(schema, table.ToImmutable());
+//          addedRows = new BlueTableImmutable<T>(schema, added.ToImmutable());
+//          removedRows = new BlueTableImmutable<T>(schema, removed.ToImmutable());
+//          if (reset) {
+//             added.Clear();
+//             removed.Clear();
+//          }
+//          return new DataPacket<T>(newRows, addedRows, removedRows);
+//       }
+
+//       public BlueTableImmutable<T> ToImmutable() =>
+//          new(schema, table.ToImmutable());
+//    }
+// }
+
+public class BlueTableImmutableAdapter<T> : IBlueRowCollection<BlueRowAdapter<T>> {
+   readonly BlueTableSchemaAdapter<T> schemaAdapter;
    readonly ImmutableDictionary<int, T> rows;
 
-   public BlueTableImmutable(IBlueTableSchema schema)
-      : this(schema, ImmutableDictionary<int, T>.Empty) { }
+   public BlueTableImmutableAdapter(BlueTableSchemaAdapter<T> schemaAdapter)
+      : this(schemaAdapter, ImmutableDictionary<int, T>.Empty) { }
 
-   public BlueTableImmutable(IBlueTableSchema schema, ImmutableDictionary<int, T> rows) {
-      this.schema = schema;
+   public BlueTableImmutableAdapter(BlueTableSchemaAdapter<T> schemaAdapter, ImmutableDictionary<int, T> rows) {
+      this.schemaAdapter = schemaAdapter;
       this.rows = rows;
    }
 
    public int Count => rows.Count;
    public bool IsSynchronized => false;
-   public IBlueTableSchema schema { get; }
+   public IBlueTableSchema schema => schemaAdapter.Schema;
    public object SyncRoot => this;
 
-   public T this[int id] => rows[id];
+   public BlueRowAdapter<T> this[int id] => new(schemaAdapter, rows[id]);
 
    public bool containsID(int id) =>
       rows.ContainsKey(id);
 
    public void CopyTo(Array array, int index) {
       foreach (var r in rows.Values) {
-         array.SetValue(r, index++);
+         array.SetValue(new BlueRowAdapter<T>(schemaAdapter, r), index++);
       }
    }
 
-   public IEnumerator<T> GetEnumerator() =>
-      rows.Values.GetEnumerator();
-
-   IEnumerator IEnumerable.GetEnumerator() =>
-      GetEnumerator();
+   public IEnumerator<BlueRowAdapter<T>> GetEnumerator() {
+      foreach (var row in rows.Values) {
+         yield return new BlueRowAdapter<T>(schemaAdapter, row);
+      }
+   }
 
    public DataPacketBuilder ToDataPacketBuilder() =>
       new(this);
 
    public class DataPacketBuilder {
-      readonly IBlueTableSchema schema;
+      readonly BlueTableSchemaAdapter<T> schemaAdapter;
       readonly ImmutableDictionary<int, T>.Builder table;
       readonly ImmutableDictionary<int, T>.Builder added =
          ImmutableDictionary<int, T>.Empty.ToBuilder();
       readonly ImmutableDictionary<int, T>.Builder removed =
          ImmutableDictionary<int, T>.Empty.ToBuilder();
 
-      public DataPacketBuilder(BlueTableImmutable<T> table) {
-         schema = table.schema;
+      public DataPacketBuilder(BlueTableImmutableAdapter<T> table) {
+         schemaAdapter = table.schemaAdapter;
          this.table = table.rows.ToBuilder();
       }
 
-      public void AddOrUpdate(T row, IEqualityComparer<IBlueRow>? comparer = null) {
+      public void AddOrUpdate(T rowData, IEqualityComparer<IBlueRow>? comparer = null) {
+         var row = new BlueRowAdapter<T>(schemaAdapter, rowData);
          var id = row.Id();
-         if (table.TryGetValue(id, out var orig)) {
+         if (table.TryGetValue(id, out var origData)) {
+            var orig = new BlueRowAdapter<T>(schemaAdapter, origData);
             if (comparer?.Equals(row, orig) ?? false) {
                // No op: This row was already in the table (according to 'comparer').
                // Remove it from 'added' and 'removed'.
@@ -158,9 +302,9 @@ public class BlueTableImmutable<T> : IBlueRowCollection<T> where T : IBlueRow {
             }
             // Change op: A row with this id was already in the table,
             // but its values have changed (according to 'comparer').
-            removed[id] = orig;
+            removed[id] = origData;
          }
-         added[id] = row;
+         added[id] = rowData;
       }
 
       public void Remove(int id) {
@@ -170,51 +314,27 @@ public class BlueTableImmutable<T> : IBlueRowCollection<T> where T : IBlueRow {
          }
       }
 
-      public DataPacket ToDataPacket(bool reset = true) {
+      public void Update<TKey>(TableUpdate<T, TKey> tableUpdate) where TKey : IEquatable<TKey> {
+         foreach (var r in tableUpdate.RemovedItems.Concat(tableUpdate.Changes.Old())) {
+            Remove(new BlueRowAdapter<T>(schemaAdapter, r).Id());
+         }
+         foreach (var r in tableUpdate.ChangedItems.Concat(tableUpdate.AddedItems)) {
+            AddOrUpdate(r);
+         }
+      }
+
+      public BlueTableImmutableAdapter<T> ToImmutable(out IDataPacket dp, bool reset = true) {
          table.RemoveRange(removed.Keys);
          table.AddRange(added);
-         var newRows = new BlueTableImmutable<T>(schema, table.ToImmutable());
-         var addedRows = new BlueTableImmutable<T>(schema, added.ToImmutable());
-         var removedRows = new BlueTableImmutable<T>(schema, removed.ToImmutable());
+         var newRows = new BlueTableImmutableAdapter<T>(schemaAdapter, table.ToImmutable());
+         var addedRows = new BlueTableImmutableAdapter<T>(schemaAdapter, added.ToImmutable());
+         var removedRows = new BlueTableImmutableAdapter<T>(schemaAdapter, removed.ToImmutable());
          if (reset) {
             added.Clear();
             removed.Clear();
          }
-         return new(newRows, addedRows, removedRows);
+         dp = new DataPacket(newRows, addedRows, removedRows);
+         return newRows;
       }
-
-      public IDataPacket<T> ToDataPacketT(bool reset = true) {
-         table.RemoveRange(removed.Keys);
-         table.AddRange(added);
-         var newRows = new BlueTableImmutable<T>(schema, table.ToImmutable());
-         var addedRows = new BlueTableImmutable<T>(schema, added.ToImmutable());
-         var removedRows = new BlueTableImmutable<T>(schema, removed.ToImmutable());
-         if (reset) {
-            added.Clear();
-            removed.Clear();
-         }
-         return new DataPacket<T>(newRows, addedRows, removedRows);
-      }
-
-      public IDataPacket<T> ToDataPacketT(
-         out BlueTableImmutable<T> newRows,
-         out BlueTableImmutable<T> addedRows,
-         out BlueTableImmutable<T> removedRows,
-         bool reset = true
-      ) {
-         table.RemoveRange(removed.Keys);
-         table.AddRange(added);
-         newRows = new BlueTableImmutable<T>(schema, table.ToImmutable());
-         addedRows = new BlueTableImmutable<T>(schema, added.ToImmutable());
-         removedRows = new BlueTableImmutable<T>(schema, removed.ToImmutable());
-         if (reset) {
-            added.Clear();
-            removed.Clear();
-         }
-         return new DataPacket<T>(newRows, addedRows, removedRows);
-      }
-
-      public BlueTableImmutable<T> ToImmutable() =>
-         new(schema, table.ToImmutable());
    }
 }

src/DataStreamSuite/DataStreamCore/BlueData/BlueTableNameAttribute.cs

@@ -0,0 +1,12 @@
+#nullable enable
+namespace Bts.DataStreamCore;
+
+using System;
+
+[AttributeUsage(AttributeTargets.Class)]
+public class BlueTableNameAttribute : Attribute {
+   public BlueTableNameAttribute(string name) =>
+      Name = name;
+
+   public string Name { get; }
+}

src/DataStreamSuite/DataStreamCore/BlueData/BlueTableSchemaAdapter.cs

@@ -1,5 +1,5 @@
 #nullable enable
-namespace Bts.DataStream;
+namespace Bts.DataStreamCore;
 
 using BCG;
 
@@ -7,21 +7,30 @@ using bts.collections;
 
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 
-public class BlueTableSchemaAdaptor<T> : IMutableBlueRowFactory<T> {
+public class BlueTableSchemaAdapter<T> : IMutableBlueRowFactory<T>, IBlueTableSchema<T> {
    readonly string name;
-   readonly List<ColumnAdaptor> columns = new();
+   readonly List<ColumnAdapter> columns = new();
+   readonly Dictionary<string, ColumnAdapter> columnNameIndex = new();
+   ColumnInfo[]? columnInfos;
+   string[]? columnNames;
    BlueTableSchema? schema;
 
-   public BlueTableSchemaAdaptor(string name) =>
+   public BlueTableSchemaAdapter(string name) =>
       this.name = name;
 
+   public BlueTableSchemaAdapter(string name, Func<T, int> getId) {
+      this.name = name;
+      AddColumn("id", getId);
+   }
+
    public IBlueTableSchema Schema =>
       schema ??= new BlueTableSchema(columns.WrapSelectorRO(c => c.Info).ToArray(), name);
 
    public bool Contains(string name) =>
-      columns.Any(c => c.Info.colName == name);
+      columnNameIndex.ContainsKey(name);
 
    public void AddColumn(string name, Func<T, int> getValue) =>
       AddColumn(name, r => getValue(r), typeof(int));
@@ -57,9 +66,27 @@ public class BlueTableSchemaAdaptor<T> : IMutableBlueRowFactory<T> {
       }
       // Invalidate cached schema (set it to null)
       schema = null;
-      columns.Add(new ColumnAdaptor(new(name, columns.Count, dataType), r => getValue(r)));
+      var adapter = new ColumnAdapter(new(name, columns.Count, dataType), r => getValue(r));
+      columns.Add(adapter);
+      columnNameIndex[name] = adapter;
+      columnInfos = null;
+      columnNames = null;
    }
 
+   public ColumnAdapter this[int columnIndex] =>
+      columns[columnIndex];
+
+   public ColumnAdapter this[string columnName] =>
+      columnNameIndex[columnName];
+
+   public object? this[int columnIndex, T row] => columns[columnIndex][row];
+   public object? this[string columnName, T row] => columnNameIndex[columnName][row];
+   ColumnInfo IBlueTableSchema.this[int columnIndex] => columns[columnIndex].Info;
+   ColumnInfo IBlueTableSchema.this[string columnName] => columnNameIndex[columnName].Info;
+   string[] IBlueTableSchema.columnNames => columnNames ??= columns.Select(c => c.Info.colName).ToArray();
+   ColumnInfo[] IBlueTableSchema.columnInfo => columnInfos ??= columns.Select(c => c.Info).ToArray();
+   string IBlueTableSchema.tableName => name;
+
    public IBlueRow GetBlueRow(T item) =>
       GetMutableBlueRow(item);
 
@@ -71,10 +98,28 @@ public class BlueTableSchemaAdaptor<T> : IMutableBlueRowFactory<T> {
       return mbr;
    }
 
-   class ColumnAdaptor {
+   void ISerializedType.serialize(BinaryWriter bw) {
+      bw.Write(columns.Count);
+      bw.Write(name);
+      foreach (var col in columns) {
+         bw.Write(col.Info.colName);
+         bw.Write(col.Info.colType.ToString());
+         bw.Write(false);
+      }
+   }
+
+   void ISerializedType.deserialze(BinaryReader br) =>
+      // We can't reconstruct this class from serialized form. The column lambdas
+      // (i.e., to get cell values from T) are lost during serialization.
+      throw new NotSupportedException();
+
+   int ISerializedType.getSerializedSize() =>
+      throw new NotImplementedException();
+
+   public class ColumnAdapter {
       readonly Func<T, object?> getValue;
 
-      public ColumnAdaptor(ColumnInfo info, Func<T, object?> getValue) {
+      public ColumnAdapter(ColumnInfo info, Func<T, object?> getValue) {
          Info = info;
          this.getValue = getValue;
       }
@@ -83,5 +128,8 @@ public class BlueTableSchemaAdaptor<T> : IMutableBlueRowFactory<T> {
 
       public object? GetValue(T row) =>
          getValue(row);
+
+      public object? this[T row] =>
+         getValue(row);
    }
 }

src/DataStreamSuite/DataStreamCore/BlueData/BlueTableSchemaBuilder.cs

@@ -4,26 +4,45 @@ namespace Bts.DataStreamCore;
 using BCG;
 
 using System;
+using System.Collections;
 using System.Collections.Generic;
+using System.Linq;
 
-public class BlueTableSchemaBuilder {
+public class BlueTableSchemaBuilder : IEnumerable<(string, Type)> {
    readonly string? tableName;
    readonly List<(string Name, Type Type)> colDefs = new();
+   readonly bool autoAddId;
 
-   public BlueTableSchemaBuilder(string? tableName = null) =>
+   public BlueTableSchemaBuilder(string? tableName = null, bool autoAddId = true) {
       this.tableName = tableName;
+      this.autoAddId = autoAddId;
+   }
 
-   public void Add<T>(string Name) =>
-      colDefs.Add((Name, typeof(T)));
+   public void Add((string Name, Type Type) tup) =>
+      colDefs.Add(tup);
 
-   public void Add(string Name, Type Type) =>
-      colDefs.Add((Name, Type));
+   public void Add<T>(string name) =>
+      colDefs.Add((name, typeof(T)));
+
+   public void Add(string name, Type type) =>
+      colDefs.Add((name, type));
+
+   public IEnumerator<(string, Type)> GetEnumerator() =>
+      colDefs.GetEnumerator();
 
    public IBlueTableSchema ToSchema(string? tableName = null) {
-      var colInfos = new ColumnInfo[colDefs.Count];
-      for (int i = 0; i < colInfos.Length; i++) {
-         colInfos[i] = new(colDefs[i].Name, i, colDefs[i].Type);
+      bool prependIdCol = autoAddId && !colDefs.Any(c => c.Name == "id");
+      int offset = prependIdCol ? 1 : 0;
+      var colInfos = new ColumnInfo[colDefs.Count + offset];
+      if (prependIdCol) {
+         colInfos[0] = new("id", 0, typeof(int));
+      }
+      for (int i = 0; i < colDefs.Count; i++) {
+         colInfos[i + offset] = new(colDefs[i].Name, i + offset, colDefs[i].Type);
       }
       return new BlueTableSchema(colInfos, tableName ?? this.tableName);
    }
+
+   IEnumerator IEnumerable.GetEnumerator() =>
+      colDefs.GetEnumerator();
 }

src/DataStreamSuite/DataStreamCore/BlueData/IBlueRow.cs

@@ -1,6 +1,8 @@
 #nullable enable
 using System;
 using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
 
 namespace BCG
 {
@@ -23,7 +25,50 @@ namespace BCG
       /// half a million type checkings
       /// </summary>
       object? this[int index] {get;}
-      object? this[string colName] {get;}
+      object? this[string colName] {
+         get {
+            var cols = schema.columnInfo;
+            for (int i = 0; i < cols.Length; i++) {
+               if (cols[i].colName == colName) {
+                  return this[i];
+               }
+            }
+            throw new KeyNotFoundException();
+         }
+      }
+
+      object? IDictionary.this[object key] {
+         get => key is string s
+            ? this[s]
+            : throw new ArgumentException($"Key must be of type string (actually {key?.GetType()})", nameof(key));
+         set => throw new NotImplementedException();
+      }
+
+      ICollection IDictionary.Keys => new BlueRowKeyCollection(schema.columnInfo);
+      ICollection IDictionary.Values => new BlueRowValueCollection(this);
+
+      int ICollection.Count => schema.columnInfo.Length;
+      bool IDictionary.IsFixedSize => true;
+      bool IDictionary.IsReadOnly => true;
+      object ICollection.SyncRoot => this;
+      bool ICollection.IsSynchronized => false;
+      bool IDictionary.Contains(object key) {
+         if (key is string s) {
+            return schema.columnNames.Contains(s);
+         }
+         return false;
+      }
+      void ICollection.CopyTo(Array array, int index) {
+         var length = schema.columnInfo.Length;
+         for (int i = 0; i < length; i++) {
+            array.SetValue(this[i], i + index);
+         }
+      }
+      void IDictionary.Add(object key, object? value) => throw new NotImplementedException();
+      void IDictionary.Clear() => throw new NotImplementedException();
+      IDictionaryEnumerator IDictionary.GetEnumerator() => new BlueRowEnumerator(this);
+      IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
+      void IDictionary.Remove(object key) => throw new NotSupportedException();
    }
    namespace Extensions
    {

src/DataStreamSuite/DataStreamCore/BlueData/IBlueRowFactory.cs

@@ -1,5 +1,5 @@
 #nullable enable
-namespace Bts.DataStream;
+namespace Bts.DataStreamCore;
 
 using BCG;
 

src/DataStreamSuite/DataStreamCore/BlueData/IBlueTableSchema.cs

@@ -30,4 +30,9 @@ namespace BCG
       /// </summary>
       string tableName {get;}
    }
+
+   public interface IBlueTableSchema<T> : IBlueTableSchema {
+      object this[int colIndex, T row] { get; }
+      object this[string colName, T row] { get; }
+   }
 }

src/DataStreamSuite/DataStreamCore/BlueData/IMutableBlueRowFactory.cs

@@ -1,5 +1,5 @@
 #nullable enable
-namespace Bts.DataStream;
+namespace Bts.DataStreamCore;
 
 using BCG;
 

src/DataStreamSuite/DataStreamCore/BlueRowJsonConverter.cs

@@ -0,0 +1,61 @@
+#nullable enable
+using BCG;
+
+using System;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace Bts.DataStreamCore;
+
+class BlueRowJsonConverter : JsonConverter<IBlueRow> {
+   IBlueTableSchema? schema = null;
+
+   public override IBlueRow Read(
+      ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) {
+      if (schema is null) {
+         throw new InvalidOperationException("Cannot read row from json because schema is null");
+      }
+      var mbr = new MutableBlueRow(schema);
+      int colNum = 0;
+      switch (reader.TokenType) {
+         case JsonTokenType.StartArray:
+            while (reader.Read() && reader.TokenType != JsonTokenType.EndArray) {
+               mbr.setValue(colNum++, readCellValue(ref reader));
+               colNum++;
+            }
+            break;
+         case JsonTokenType.StartObject:
+            while (reader.Read() && reader.TokenType != JsonTokenType.EndObject) {
+               if (reader.TokenType != JsonTokenType.PropertyName) {
+                  throw new InvalidOperationException(
+                     "Expected 'PropertyName' immediately after 'StartObject' token in row json");
+               }
+               var colName = reader.GetString();
+               if (!reader.Read()) {
+                  throw new InvalidOperationException(
+                     "Failed to read token immediately after 'PropertyName' token in row json");
+               }
+               mbr.setValue(colName, readCellValue(ref reader));
+            }
+            break;
+      }
+      if (mbr.Count != schema.columnInfo.Length) {
+         throw new InvalidOperationException(
+            $"Row json array length '{mbr.Count}' does not match the schema's " +
+            $"column length '{schema.columnInfo.Length}'.");
+      }
+      return mbr;
+
+      static object? readCellValue(ref Utf8JsonReader reader) =>
+         reader.TokenType switch {
+            JsonTokenType.String => reader.GetString(),
+            JsonTokenType.Number => reader.GetDouble(),
+            JsonTokenType.True or JsonTokenType.False => reader.GetBoolean(),
+            _ => throw new InvalidOperationException("Failed to read cell value"),
+         };
+   }
+
+   public override void Write(Utf8JsonWriter writer, IBlueRow value, JsonSerializerOptions options) {
+      throw new NotImplementedException();
+   }
+}

src/DataStreamSuite/DataStreamCore/DataPacket.cs

@@ -1,185 +1,176 @@
+using Spark.Core.Collections;
+
 using System;
 using System.Collections;
+using System.Collections.Generic;
 using System.Data;
-using BCG.Utilities.General;
 
-using Bts.DataStreamCore;
+namespace BCG {
+   [Serializable]
+   public class DataPacket : ICloneable, IDataPacket {
+      public class BlueRowIdComparator {
+         private string[] myIdColumns = new string[] { "id" };
 
-namespace BCG
-{
-	[Serializable]
-   public class DataPacket : ICloneable, IDataPacket
-   {      
-      public class BlueRowIdComparator
-      {
-         private string[] myIdColumns = new string[]{"id"};
-
-         public BlueRowIdComparator(string[] idCols)
-         {
-            if ( idCols.Length != 0 ) 
-            {
+         public BlueRowIdComparator(string[] idCols) {
+            if (idCols.Length != 0) {
                myIdColumns = idCols;
             }
          }
-                    
-         public  bool blueRowIdEqualEvaluator(object a, object b)
-         {
-            if ( a == null || b == null )
-            {
+
+         public bool blueRowIdEqualEvaluator(object a, object b) {
+            if (a == null || b == null) {
                return false;
             }
 
-            if ( !(a is IBlueRow) || !(b is IBlueRow) )
-            {
+            if (!(a is IBlueRow) || !(b is IBlueRow)) {
                return false;
             }
 
             IBlueRow lhs = (IBlueRow)a;
             IBlueRow rhs = (IBlueRow)b;
-                    
+
             bool result = true;
-            foreach(string idColumn in myIdColumns)
-            {
+            foreach (string idColumn in myIdColumns) {
                result = result && lhs[idColumn].Equals(rhs[idColumn]);
-               if ( !result )
+               if (!result)
                   break;
             }
 
-            return result;            
+            return result;
          }
       }
 
       public IBlueRowCollection newRows, addedRows, deletedRows;
-      public DataPacket () {}
-      public DataPacket (IBlueRowCollection newRows, IBlueRowCollection addedRows, IBlueRowCollection deletedRows)
-      {
+      public IDictionary<string, object> meta_data = null;
+      public DataPacket() { }
+
+      public DataPacket(IBlueTableSchema schema)
+         : this(new BlueTable(schema), new BlueTable(schema), new BlueTable(schema)) { }
+
+      public DataPacket (IBlueRowCollection newRows, IBlueRowCollection addedRows, IBlueRowCollection deletedRows) {
          this.newRows = newRows;
          this.addedRows = addedRows;
          this.deletedRows = deletedRows;
       }
+      public DataPacket(IBlueRowCollection newRows, IBlueRowCollection addedRows, IBlueRowCollection deletedRows,
+                  IDictionary<string, object> meta_data) {
+         this.newRows = newRows;
+         this.addedRows = addedRows;
+         this.deletedRows = deletedRows;
+         this.meta_data = meta_data != null ? new Dictionary<string, object>(meta_data) : null;
+      }
 
-      public void get_new_added_deleted(out ICollection new_rows, out ICollection added_rows, out ICollection deleted_rows)
-      {
+      IBlueRowCollection IDataPacket.newRows => newRows;
+      IBlueRowCollection IDataPacket.addedRows => addedRows;
+      IBlueRowCollection IDataPacket.deletedRows => deletedRows;
+
+      public void get_new_added_deleted(out ICollection new_rows, out ICollection added_rows, out ICollection deleted_rows) {
          new_rows = newRows;
          added_rows = addedRows;
          deleted_rows = deletedRows;
       }
 
-      public IBlueRowCollection getTrulyAddedRows(params string[] idColumns)
-      {                 
+      public IBlueRowCollection getTrulyAddedRows(params string[] idColumns) {
          BlueTable truly = new BlueTable(addedRows.schema);
          BlueRowIdComparator c = new BlueRowIdComparator(idColumns);
 
-         CollectionHelpers.EqualDelegate ed = 
+         CollectionHelpers.EqualDelegate ed =
             new CollectionHelpers.EqualDelegate(c.blueRowIdEqualEvaluator);
 
          ICollection ta = CollectionHelpers.difference(addedRows, deletedRows, ed);
-           
-         foreach(IBlueRow r in ta)
-         {
+
+         foreach (IBlueRow r in ta) {
             truly.addRow(r);
          }
-           
+
          return truly;
-                
+
       }
 
-      public virtual IBlueRowCollection getTrulyAddedRows ()
-      {
-         BlueTable retVal = new BlueTable (schema);
+      public virtual IBlueRowCollection getTrulyAddedRows() {
+         BlueTable retVal = new BlueTable(schema);
          foreach (IBlueRow r in addedRows)
-            if (!deletedRows.containsID ((int)r["id"]))
-               retVal.addRow (r);
+            if (!deletedRows.containsID((int)r["id"]))
+               retVal.addRow(r);
          return retVal;
       }
 
-      public virtual IBlueRowCollection getTrulyDeletedRows ()
-      {
-         BlueTable retVal = new BlueTable (schema);
+      public virtual IBlueRowCollection getTrulyDeletedRows() {
+         BlueTable retVal = new BlueTable(schema);
          foreach (IBlueRow r in deletedRows)
-            if (!addedRows.containsID ((int)r["id"]))
-               retVal.addRow (r);
+            if (!addedRows.containsID((int)r["id"]))
+               retVal.addRow(r);
          return retVal;
       }
 
-      public virtual IBlueRowCollection getTrulyChangedRows ()
-      {
-         BlueTable retVal = new BlueTable (schema);
+      public virtual IBlueRowCollection getTrulyChangedRows() {
+         BlueTable retVal = new BlueTable(schema);
          foreach (IBlueRow r in addedRows)
-            if (deletedRows.containsID ((int)r["id"]))
-               retVal.addRow (r);
+            if (deletedRows.containsID((int)r["id"]))
+               retVal.addRow(r);
          return retVal;
       }
 
-      
-      public IBlueRowCollection getTrulyDeletedRows(params string[] idColumns)
-      {        
+
+      public IBlueRowCollection getTrulyDeletedRows(params string[] idColumns) {
          BlueTable truly = new BlueTable(deletedRows.schema);
          BlueRowIdComparator c = new BlueRowIdComparator(idColumns);
 
-         CollectionHelpers.EqualDelegate ed = 
+         CollectionHelpers.EqualDelegate ed =
             new CollectionHelpers.EqualDelegate(c.blueRowIdEqualEvaluator);
 
          ICollection td = CollectionHelpers.difference(deletedRows, addedRows, ed);
-                      
-         foreach(IBlueRow r in td)
-         {
+
+         foreach (IBlueRow r in td) {
             truly.addRow(r);
          }
 
-         return truly;      
+         return truly;
       }
-      
-      public IBlueRowCollection getTrulyChangedRows(params string[] idColumns)
-      {
-       
+
+      public IBlueRowCollection getTrulyChangedRows(params string[] idColumns) {
+
          BlueTable truly = new BlueTable(addedRows.schema);
          BlueRowIdComparator c = new BlueRowIdComparator(idColumns);
 
-         CollectionHelpers.EqualDelegate ed = 
+         CollectionHelpers.EqualDelegate ed =
             new CollectionHelpers.EqualDelegate(c.blueRowIdEqualEvaluator);
 
          ICollection ta = CollectionHelpers.difference(addedRows, deletedRows, ed);
          ICollection tc = CollectionHelpers.difference(addedRows, ta, ed);
-         
-         foreach(IBlueRow r in tc)
-         {
+
+         foreach (IBlueRow r in tc) {
             truly.addRow(r);
-         }   
-        
-         return truly;      
+         }
+
+         return truly;
       }
-      
-      public IBlueRowCollection getTrulyChangedOldRows(params string[] idColumns)
-      {        
+
+      public IBlueRowCollection getTrulyChangedOldRows(params string[] idColumns) {
          BlueTable truly = new BlueTable(deletedRows.schema);
          BlueRowIdComparator c = new BlueRowIdComparator(idColumns);
 
-         CollectionHelpers.EqualDelegate ed = 
+         CollectionHelpers.EqualDelegate ed =
             new CollectionHelpers.EqualDelegate(c.blueRowIdEqualEvaluator);
 
          ICollection td = CollectionHelpers.difference(deletedRows, addedRows, ed);
          ICollection tco = CollectionHelpers.difference(deletedRows, td, ed);
-         
-         foreach(IBlueRow r in tco)
-         {
+
+         foreach (IBlueRow r in tco) {
             truly.addRow(r);
-         }         
+         }
 
-         return truly;         
-      }
-      
-      public TablePacket toTablePacket ()
-      {
-         return new TablePacket (BlueDataUtility.toDataTable (newRows), BlueDataUtility.toDataTable (addedRows),
-                                 BlueDataUtility.toDataTable (deletedRows));
-                                 
+         return truly;
       }
 
-      public IBlueTableSchema schema 
-      {
-         get
-         {
+      public TablePacket toTablePacket() {
+         return new TablePacket(BlueDataUtility.toDataTable(newRows), BlueDataUtility.toDataTable(addedRows),
+                                 BlueDataUtility.toDataTable(deletedRows));
+
+      }
+
+      public IBlueTableSchema schema {
+         get {
             IBlueTableSchema retVal = newRows.schema != null ? newRows.schema :
                addedRows.schema != null ? addedRows.schema : deletedRows.schema;
             return retVal;
@@ -209,19 +200,17 @@ namespace BCG
          d' = dthis - (dthis intersect a) + d // keep the old delete
          a' = a - (dthis intersect a) + athis // keep the new add       
        * */
-      public static DataPacket combineWithIds(ICollection packets, string[] idColumns)
-      {       
-         if ( packets.Count == 0 )
-         {
+      public static DataPacket combineWithIds(ICollection packets, string[] idColumns) {
+         if (packets.Count == 0) {
             return new DataPacket(
                new BlueTable(new DataTable()),
                new BlueTable(new DataTable()),
-               new BlueTable(new DataTable()));                    
+               new BlueTable(new DataTable()));
          }
 
          DataPacket.BlueRowIdComparator c = new DataPacket.BlueRowIdComparator(idColumns);
-         
-         CollectionHelpers.EqualDelegate ed = 
+
+         CollectionHelpers.EqualDelegate ed =
             new CollectionHelpers.EqualDelegate(c.blueRowIdEqualEvaluator);
 
          ArrayList added = new ArrayList();
@@ -230,80 +219,80 @@ namespace BCG
          BlueTable at = null;
          IBlueRowCollection nt = null;
 
-         foreach(DataPacket dp in packets)
-         {               
+         foreach (DataPacket dp in packets) {
             ArrayList oldDeleted = deleted;
             ArrayList oldAdded = added;
 
             added = new ArrayList();
             deleted = new ArrayList();
-            if ( dt == null )
-            {
+            if (dt == null) {
                dt = new BlueTable(dp.schema);
                at = new BlueTable(dp.schema);
             }
-            
+
             deleted.AddRange(oldDeleted);
-            deleted.AddRange( CollectionHelpers.difference(
+            deleted.AddRange(CollectionHelpers.difference(
                CollectionHelpers.difference(dp.deletedRows, oldAdded, ed),
-               oldDeleted, ed) );
+               oldDeleted, ed));
 
             added.AddRange(dp.addedRows);
-            added.AddRange( CollectionHelpers.difference(
+            added.AddRange(CollectionHelpers.difference(
                CollectionHelpers.difference(oldAdded, dp.deletedRows, ed),
-               added, ed) );
+               added, ed));
             nt = dp.newRows;
-         }        
-         
-         foreach ( IBlueRow dr in added )
-         {
+         }
+
+         foreach (IBlueRow dr in added) {
             at.addRow(dr);
          }
 
-         foreach ( IBlueRow dr in deleted )
-         {
+         foreach (IBlueRow dr in deleted) {
             dt.addRow(dr);
          }
 
-         return new DataPacket(nt,at,dt);            
+         return new DataPacket(nt, at, dt);
       }
 
-      public DataPacket deepCopy ()
-      {
-         return new DataPacket (new OrderedBlueTable (newRows),
-            new OrderedBlueTable (newRows),
-            new BlueTable (deletedRows));
+      public object Clone() {
+         var copy = (DataPacket)MemberwiseClone();
+         if (meta_data != null)
+            copy.meta_data = new Dictionary<string, object>(meta_data);
+         return copy;
       }
 
-      public virtual DataPacket createImmutable ()
-      {
-         return 
+      public DataPacket deepCopy() {
+         var copy = new DataPacket(
+            new OrderedBlueTable(newRows),
+            new OrderedBlueTable(addedRows),
+            new BlueTable(deletedRows)
+         );
+         if (meta_data != null)
+            copy.meta_data = new Dictionary<string, object>(meta_data);
+         return copy;
+      }
+
+
+      public virtual DataPacket createImmutable() {
+         return
          new DataPacket(
                newRows is IImmutableRowCollection ? newRows : new ImmutableBlueTable(newRows),
-               addedRows, 
-               deletedRows);
+               addedRows,
+               deletedRows, meta_data);
       }
       #region ICloneable Members
 
-      public object Clone()
-      {
-         return MemberwiseClone();
-      }
-
+     
       #endregion
 
-      public string toIncrementalIDString()
-      {
+      public string toIncrementalIDString() {
          System.Text.StringBuilder sb = new System.Text.StringBuilder(schema.tableName);
-         sb.Append ("\ndeleted : ");
-         foreach (IBlueRow r in deletedRows)
-         {
+         sb.Append("\ndeleted : ");
+         foreach (IBlueRow r in deletedRows) {
             sb.Append(r["id"]);
             sb.Append(',');
          }
          sb.Append("\nadded : ");
-         foreach (IBlueRow r in addedRows)
-         {
+         foreach (IBlueRow r in addedRows) {
             sb.Append(r["id"]);
             sb.Append(',');
          }
@@ -311,29 +300,35 @@ namespace BCG
          return sb.ToString();
       }
 
-      public override string ToString()
-      {
+      public override string ToString() {
          return String.Format("DataPacket, schema {0} n {1} d {2} a {3}", schema.tableName, newRows.Count, deletedRows.Count, addedRows.Count);
       }
    }
 
-   public class DataPacket<T> : IDataPacket<T> where T : IBlueRow {
-      public DataPacket(IBlueRowCollection<T> newRows, IBlueRowCollection<T> addedRows, IBlueRowCollection<T> deletedRows) {
-         this.newRows = newRows;
-         this.addedRows = addedRows;
-         this.deletedRows = deletedRows;
-      }
+   // public class DataPacket<T> : IDataPacket<T> where T : IBlueRow {
+   //    public DataPacket(
+   //       IBlueRowCollection<T> newRows,
+   //       IBlueRowCollection<T> addedRows,
+   //       IBlueRowCollection<T> deletedRows,
+   //       IReadOnlyDictionary<string, object> metadata = null
+   //    ) {
+   //       this.newRows = newRows;
+   //       this.addedRows = addedRows;
+   //       this.deletedRows = deletedRows;
+   //       Metadata = metadata ?? DictionaryHelper.empty<string, object>();
+   //    }
 
-      public IBlueRowCollection<T> newRows { get; }
-      public IBlueRowCollection<T> addedRows { get; }
-      public IBlueRowCollection<T> deletedRows { get; }
+   //    public IBlueRowCollection<T> newRows { get; }
+   //    public IBlueRowCollection<T> addedRows { get; }
+   //    public IBlueRowCollection<T> deletedRows { get; }
+   //    public IReadOnlyDictionary<string, object> Metadata { get; }
 
-      public static DataPacket<T> Empty(IBlueTableSchema schema) =>
-         new(
-            new BlueTableImmutable<T>(schema),
-            new BlueTableImmutable<T>(schema),
-            new BlueTableImmutable<T>(schema));
-   }
+   //    public static DataPacket<T> Empty(IBlueTableSchema schema) =>
+   //       new(
+   //          new BlueTableImmutable<T>(schema),
+   //          new BlueTableImmutable<T>(schema),
+   //          new BlueTableImmutable<T>(schema));
+   // }
 
    public static class DataPacketExtensions {
       public static bool HasChanges(this DataPacket dataPacket) =>

src/DataStreamSuite/DataStreamCore/DataPacketIncrementalIdsJsonConverter.cs

@@ -0,0 +1,31 @@
+#nullable enable
+using BCG;
+
+using Spark.Core.Json;
+
+using System;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace Bts.DataStreamCore;
+
+public class DataPacketIncrementalIdsJsonConverter : JsonConverter<IDataPacket> {
+   public override IDataPacket? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) =>
+      throw new NotImplementedException();
+
+   public override void Write(Utf8JsonWriter writer, IDataPacket value, JsonSerializerOptions options) {
+      using var _ = writer.WriteObject();
+      writer.WriteString("table", value.Schema.tableName);
+      value.get_new_added_deleted(out var newRows, out var addedRows, out var deletedRows);
+      using (writer.WriteArray("deleted")) {
+         foreach (IBlueRow r in deletedRows) {
+            writer.WriteNumberValue(r.Id());
+         }
+      }
+      using (writer.WriteArray("added")) {
+         foreach (IBlueRow r in addedRows) {
+            writer.WriteNumberValue(r.Id());
+         }
+      }
+   }
+}

src/DataStreamSuite/DataStreamCore/DataPacketIncrementalIdsJsonSerializer.cs

@@ -0,0 +1,46 @@
+#nullable enable
+namespace Bts.DataStreamCore;
+
+using BCG;
+
+using System;
+using System.IO;
+using System.Text;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+/// <summary>
+/// This class seriailzes DataPackets to json strings. A common buffer is used to reduce memory
+/// allocations on repeated calls to <see cref="Serialize"/>. For that reason, this class is NOT
+/// thread safe.
+/// </summary>
+public class DataPacketIncrementalIdsJsonSerializer {
+   readonly MemoryStream buffer = new();
+   readonly DataPacketIncrementalIdsJsonConverter converter;
+
+   public DataPacketIncrementalIdsJsonSerializer(DataPacketIncrementalIdsJsonConverter? converter = null) =>
+      this.converter = converter ?? new();
+
+   public string? Serialize(IDataPacket dp) {
+      buffer.Position = 0;
+      buffer.SetLength(0);
+      using (var jsonWriter = new Utf8JsonWriter(buffer)) {
+         var opts = new JsonSerializerOptions() {
+            NumberHandling = JsonNumberHandling.AllowNamedFloatingPointLiterals
+         };
+         converter.Write(jsonWriter, dp, opts);
+      }
+      var bytes = buffer.GetBuffer();
+      var span = new ArraySegment<byte>(bytes, 0, (int)buffer.Length);
+      return Encoding.UTF8.GetString(span);
+   }
+
+   public void Serialize(DataPacket dp, Utf8JsonWriter jsonWriter) {
+      buffer.Position = 0;
+      buffer.SetLength(0);
+      var opts = new JsonSerializerOptions() {
+         NumberHandling = JsonNumberHandling.AllowNamedFloatingPointLiterals
+      };
+      converter.Write(jsonWriter, dp, opts);
+   }
+}

src/DataStreamSuite/DataStreamCore/DataPacketJsonConverter.cs

@@ -0,0 +1,143 @@
+#nullable enable
+using BCG;
+
+using Spark.Core.Json;
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace Bts.DataStreamCore;
+
+public class DataPacketJsonConverter : JsonConverter<DataPacket> {
+   /// <summary>
+   /// Whether or not to include a field for current rows (i.e., snapshot of current state). By
+   /// default, only incremental changes are included ('added' and 'deleted').
+   /// </summary>
+   public bool IncludeCurrent { get; set; }
+
+   /// <summary>
+   /// Whether to treat rows as objects (name/value pairs), or arrays (list of values). Arrays
+   /// result in smaller payloads, but aren't as easy to read as name/value pairs (for mere humans).
+   /// </summary>
+   public bool UseObjectRows { get; set; }
+
+   public override DataPacket? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) {
+      if (!reader.ReadObject()) {
+         return null;
+      }
+      if (!reader.ReadPropertyName(out var prop)) {
+         return null;
+      }
+      if (!reader.Read()) {
+         return null;
+      }
+      if (prop == "added") {
+         if (reader.TokenType != JsonTokenType.StartArray) {
+            return null;
+         }
+         while (true) {
+            if (!reader.Read()) {
+               break;
+            }
+            if (reader.TokenType != JsonTokenType.StartArray || !reader.Read()) {
+               return null;
+            }
+            switch (reader.TokenType) {
+               case JsonTokenType.String:
+                  // DAMNIT! Need the schema.
+                  break;
+            }
+         }
+      }
+      return null;
+   }
+
+   public override void Write(Utf8JsonWriter writer, DataPacket value, JsonSerializerOptions options) {
+      using var _ = writer.WriteObject();
+      using (writer.WriteArray("columns")) {
+         foreach (var col in value.schema.columnInfo) {
+            using (writer.WriteObject()) {
+               writer.WriteString("name", col.colName);
+               writer.WriteNumber("index", col.colNo);
+               // TODO: use language agnostic type names (e.g., 'string', 'integer', 'float', 'date' etc.)
+               writer.WriteString("type", col.type_code().ToString());
+            }
+         }
+      }
+
+      var columns = value.schema.columnInfo.Select(c => (Column: c, Write: GetCellValueWriter(c))).ToList();
+      WriteRows("added", value.addedRows);
+      WriteRows("deleted", value.deletedRows);
+      if (IncludeCurrent) {
+         WriteRows("all", value.newRows);
+      }
+
+      void WriteRows(string name, IBlueRowCollection rows) {
+         using (writer.WriteArray(name)) {
+            foreach (IBlueRow row in rows) {
+               WriteRow(row);
+            }
+         }
+      }
+
+      void WriteRow(IBlueRow row) {
+         using var rowCase = UseObjectRows ? writer.WriteObject() : writer.WriteArray();
+         for (int i = 0; i < columns.Count; i++) {
+            if (UseObjectRows) {
+               writer.WritePropertyName(columns[i].Column.colName);
+            }
+            columns[i].Write(row[i]);
+         }
+      }
+
+      Action<object?> GetCellValueWriter(ColumnInfo colInfo) {
+         var t = colInfo.colType;
+         if (t == typeof(int)) {
+            return NullCheckWrapper(v => writer.WriteNumberValue((int)v));
+         }
+         if (t == typeof(uint)) {
+            return NullCheckWrapper(v => writer.WriteNumberValue((uint)v));
+         }
+         if (t == typeof(long)) {
+            return NullCheckWrapper(v => writer.WriteNumberValue((long)v));
+         }
+         if (t == typeof(ulong)) {
+            return NullCheckWrapper(v => writer.WriteNumberValue((ulong)v));
+         }
+         if (t == typeof(short)) {
+            return NullCheckWrapper(v => writer.WriteNumberValue((short)v));
+         }
+         if (t == typeof(ushort)) {
+            return NullCheckWrapper(v => writer.WriteNumberValue((ushort)v));
+         }
+         if (t == typeof(double)) {
+            return NullCheckWrapper(v => {
+               var dbl = Equals(v, DBNull.Value) ? double.NaN : (double)v;
+               JsonSerializer.Serialize(writer, dbl, options);
+            });
+         }
+         if (t == typeof(float)) {
+            return NullCheckWrapper(v => {
+               var flt = Equals(v, DBNull.Value) ? float.NaN : (float)v;
+               writer.WriteNumberValue(flt);
+            });
+         }
+         if (t == typeof(bool)) {
+            return NullCheckWrapper(v => writer.WriteBooleanValue((bool)v));
+         }
+         return NullCheckWrapper(v => writer.WriteStringValue(v?.ToString()));
+
+         Action<object?> NullCheckWrapper(Action<object> writeNonNull) =>
+            v => {
+               if (v is null) {
+                  writer.WriteNullValue();
+               } else {
+                  writeNonNull(v);
+               }
+            };
+      }
+   }
+}

src/DataStreamSuite/DataStreamCore/DataPacketJsonSerializer.cs

@@ -0,0 +1,49 @@
+#nullable enable
+namespace Bts.DataStreamCore;
+
+using BCG;
+
+using System;
+using System.IO;
+using System.Text;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+/// <summary>
+/// This class seriailzes DataPackets to json strings. A common buffer is used to reduce memory
+/// allocations on repeated calls to <see cref="Serialize"/>. For that reason, this class is NOT
+/// thread safe.
+/// </summary>
+public class DataPacketJsonSerializer {
+   readonly MemoryStream buffer = new();
+   readonly DataPacketJsonConverter converter;
+
+   public DataPacketJsonSerializer(DataPacketJsonConverter? converter = null) =>
+      this.converter = converter ?? new() {
+         IncludeCurrent = true,
+         UseObjectRows = true,
+      };
+
+   public string? Serialize(DataPacket dp) {
+      buffer.Position = 0;
+      buffer.SetLength(0);
+      using (var jsonWriter = new Utf8JsonWriter(buffer)) {
+         var opts = new JsonSerializerOptions() {
+            NumberHandling = JsonNumberHandling.AllowNamedFloatingPointLiterals
+         };
+         converter.Write(jsonWriter, dp, opts);
+      }
+      var bytes = buffer.GetBuffer();
+      var span = new ArraySegment<byte>(bytes, 0, (int)buffer.Length);
+      return Encoding.UTF8.GetString(span);
+   }
+
+   public void Serialize(DataPacket dp, Utf8JsonWriter jsonWriter) {
+      buffer.Position = 0;
+      buffer.SetLength(0);
+      var opts = new JsonSerializerOptions() {
+         NumberHandling = JsonNumberHandling.AllowNamedFloatingPointLiterals
+      };
+      converter.Write(jsonWriter, dp, opts);
+   }
+}

src/DataStreamSuite/DataStreamCore/DataStream.cs

@@ -1,9 +1,5 @@
 using bts;
 
-using Bts.DataStream;
-
-using mbts.config;
-
 using System;
 using System.Collections;
 using System.Diagnostics;
@@ -16,7 +12,7 @@ namespace BCG
    public class DataStream
    {
       internal static event EventHandler onFireStart;
-      protected bool myTestMode = Configuration.get<DataStreamConfig>().IsTestMode;
+      protected bool myTestMode = false;
       protected bool myFirstSubImplemented = true,
                      myLastSubImplemented = true;
       protected IDictionary myDelMap = new Hashtable (); 
@@ -32,6 +28,9 @@ namespace BCG
       public DataStream (DataStream realSource)
       {
          myRealSource = realSource;
+         if (myRealSource is not null) {
+            myRealSource.ErrorChanged += OnError;
+         }
          myOnChangeDelegate = null;
          myPendingAdds = new Stack();
       }
@@ -48,6 +47,8 @@ namespace BCG
          }
       }
 
+      public event Action<Exception> ErrorChanged;
+
       public delegate void ChangeDelegate(object newValue);
       public event ChangeDelegate onChange
       {
@@ -120,8 +121,15 @@ namespace BCG
       protected virtual object myGetValueForInitialSubscription()
       {return myLastValue;}
 
-      protected void mySetRealSource (DataStream src)
-      {myRealSource = src;}
+      protected void mySetRealSource (DataStream src) {
+         if (myRealSource is not null) {
+            myRealSource.ErrorChanged -= OnError;
+         }
+         myRealSource = src;
+         if (myRealSource is not null) {
+            myRealSource.ErrorChanged += OnError;
+         }
+      }
 
       protected virtual void myOnFirstSubscriber() {myFirstSubImplemented = false;}
       protected virtual void myOnLastSubscriber () {myLastSubImplemented = false;}
@@ -143,6 +151,11 @@ namespace BCG
          }
       }
 
+      protected void OnError(Exception error) {
+         Log.Gen.error($"{GetType()} OnError: {error}");
+         ErrorChanged?.Invoke(error);
+      }
+
       public Guid ID
       {
          get

src/DataStreamSuite/DataStreamCore/DataStreamCore.csproj

@@ -4,6 +4,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <TargetFramework>net8.0</TargetFramework>
     <Nullable>disable</Nullable>
+    <Version>$(SparkVersion)</Version>
   </PropertyGroup>
 
   <ItemGroup>
@@ -13,15 +14,17 @@
     <PackageReference Include="SimMetrics.Net" Version="1.0.5" />
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\PubSub\PubSub.csproj" />
-    <ProjectReference Include="..\..\client\spark_core\spark_core.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Proto Include="../../lib_spark/spark/config/protos/data_stream_config.proto" CSName="DataStreamConfig">
-      <OutDir>$(ProtoOutputPath)/lib_spark/spark/config/protos</OutDir>
-    </Proto>
-  </ItemGroup>
+  <Choose>
+    <When Condition="'$(UseProjectRefs)' == 'true'">
+      <ItemGroup>
+        <ProjectReference Include="..\PubSub\PubSub.csproj" />
+      </ItemGroup>
+    </When>
+    <Otherwise>
+      <ItemGroup>
+        <PackageReference Include="PubSub" Version="$(SparkVersion)" />
+      </ItemGroup>
+    </Otherwise>
+  </Choose>
 
 </Project>

src/DataStreamSuite/DataStreamCore/DynamicLoading/LiveMarketDataStreamAttribute.cs

@@ -0,0 +1,5 @@
+namespace Bts.DataStreamCore;
+
+using System;
+
+public class LiveMarketDataStreamAttribute : Attribute { }

src/DataStreamSuite/DataStreamCore/DynamicLoading/MarketDataClientParamAttribute.cs

@@ -0,0 +1,5 @@
+namespace Bts.DataStreamCore;
+
+using System;
+
+public class MarketDataClientParamAttribute : Attribute { }

src/DataStreamSuite/DataStreamCore/DynamicLoading/MarketDataStreamFactory.cs

@@ -0,0 +1,51 @@
+#nullable enable
+namespace Bts.DataStreamCore;
+
+using BCG;
+
+using Bts.PubSub;
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+
+/// <summary>
+/// This class is a temp hack to pass a shared md client to stream constructors.
+/// </summary>
+public class MarketDataStreamFactory {
+   readonly object mdClient;
+
+   public MarketDataStreamFactory(object mdClient) =>
+      this.mdClient = mdClient;
+
+   public ViewStream? Create(Type type, object?[]? args) {
+      var ctrs = type.GetConstructors();
+      int nArgs = args?.Length ?? 0;
+      // Since this class is a temp hack, it isn't super robust. Find a constructor with nArgs + 1
+      // or 2 params (for mdClient and optional viewStreamDatabase), inject the special args and
+      // instantiate the stream. If no such constructor exists, just use the original args.
+      foreach (var ctr in ctrs) {
+         var ctrParams = ctr.GetParameters();
+         if (!ctrParams.TryGetFirst(p => p!.GetCustomAttribute<MarketDataClientParamAttribute>() is not null, out var mdClientParam, out int mdClientIdx)) {
+            continue;
+         }
+         var paramInjections = new List<(int Index, object Value)>(2) {
+            (mdClientIdx, mdClient)
+         };
+         if (ctrParams.TryGetFirst(p => p.ParameterType.IsAssignableTo(typeof(IWorkScheduler)), out var vsdParam, out int vsdIdx)) {
+            paramInjections.Add((vsdIdx, ViewStreamDatabase.instance));
+         }
+         if (nArgs != ctrParams.Length - paramInjections.Count) {
+            continue;
+         }
+         paramInjections.Sort(Comparer<(int, object)>.Create((a, b) => a.Item1.CompareTo(b.Item1)));
+         var argList = args?.ToList() ?? new();
+         foreach (var (idx, val) in paramInjections) {
+            argList.Insert(idx, val);
+         }
+         return Activator.CreateInstance(type, argList.ToArray()) as ViewStream;
+      }
+      return Activator.CreateInstance(type, args) as ViewStream;
+   }
+}

src/DataStreamSuite/DataStreamCore/DynamicLoading/PrimitiveManager.cs

@@ -1,15 +1,14 @@
 namespace BCG {
-   using Bts.DataStream;
    using bts;
 
-   using mbts.config;
-
    using System;
    using System.Collections;
    using System.Reflection;
    using System.IO;
+   using Bts.DataStreamCore;
 
    public class PrimitiveManager {
+      static MarketDataStreamFactory mdStreamFactory;
       private IDictionary myTypeLookupTable = new Hashtable();
       private static PrimitiveManager mySelf;
       private ArrayList myAssemblyNames = new ArrayList();
@@ -23,9 +22,7 @@ namespace BCG {
          currentDomain.AssemblyResolve += new ResolveEventHandler(myAssemblyResolver);
          loadAssembly(this.GetType().Assembly.FullName);
          var assemblies = new string[] { "DataStream.dll", "SharedStreams.dll" };
-         var config_assemblies = Configuration.get<DataStreamConfig>().Assemblies;
-         bts.Log.Gen.info($"PrimitiveManager.myLoadAllTypes config_assemblies: {config_assemblies}");
-         foreach (string assemblyName in assemblies/*config_assemblies*/) {
+         foreach (string assemblyName in assemblies) {
             bts.Log.Gen.info($"PrimitiveManager.myLoadAllTypes assemblyName: {assemblyName}");
             string resolvedAssemblyPath = assemblyName;
             if (!System.IO.Path.IsPathRooted(assemblyName)) {
@@ -99,6 +96,11 @@ namespace BCG {
          get { return mySelf = mySelf == null ? new PrimitiveManager() : mySelf; }
       }
 
+      public static void SetMarketDataClient(object value) {
+         Log.isnull(mdStreamFactory);
+         mdStreamFactory = new(value);
+      }
+
       /// <summary>
       /// Returns the Type name corresponding to the primitive name
       /// </summary>
@@ -123,12 +125,19 @@ namespace BCG {
             constructorArgs = new object[args.Count];
             args.CopyTo(constructorArgs, 0);
          }
-         if (myTypeLookupTable[friendlyName] == null)
-            throw new ApplicationException(friendlyName + " is not the friendly name of any of the loaded types");
+         var type = myTypeLookupTable[friendlyName] as Type
+            ?? throw new ApplicationException(friendlyName + " is not the friendly name of any of the loaded types");
+         if (type.HasCustomAttribute<LiveMarketDataStreamAttribute>()) {
+            if (mdStreamFactory is null) {
+               Log.Gen.error("Live md not available for streams");
+               return null;
+            }
+            return mdStreamFactory.Create(type, constructorArgs);
+         }
          return
             constructorArgs == null ?
-            Activator.CreateInstance(myTypeLookupTable[friendlyName] as Type) as ViewStream :
-            Activator.CreateInstance(myTypeLookupTable[friendlyName] as Type, constructorArgs) as ViewStream;
+            Activator.CreateInstance(type) as ViewStream :
+            Activator.CreateInstance(type, constructorArgs) as ViewStream;
       }
 
       /// <summary>

src/DataStreamSuite/DataStreamCore/IDataPacket.cs

@@ -1,24 +1,30 @@
-using System;
+using Bts.DataStreamCore;
+
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace BCG
-{
-   public interface IDataPacket
-   {
+namespace BCG {
+   public interface IDataPacket {
       IBlueTableSchema Schema { get; }
+      IBlueRowCollection newRows { get; }
+      IBlueRowCollection addedRows { get; }
+      IBlueRowCollection deletedRows { get; }
       //this is an ICollection of IDictionary
       void get_new_added_deleted(out ICollection new_rows, out ICollection added_rows, out ICollection deleted_rows);
    }
 
    public interface IDataPacket<T> : IDataPacket where T : IBlueRow {
-      IBlueRowCollection<T> newRows { get; }
-      IBlueRowCollection<T> addedRows { get; }
-      IBlueRowCollection<T> deletedRows { get; }
+      new IBlueRowCollection<T> newRows { get; }
+      new IBlueRowCollection<T> addedRows { get; }
+      new IBlueRowCollection<T> deletedRows { get; }
 
+      IBlueRowCollection IDataPacket.newRows => newRows;
+      IBlueRowCollection IDataPacket.addedRows => addedRows;
+      IBlueRowCollection IDataPacket.deletedRows => deletedRows;
       IBlueTableSchema IDataPacket.Schema => newRows.schema;
 
       void IDataPacket.get_new_added_deleted(out ICollection new_rows, out ICollection added_rows, out ICollection deleted_rows) {
@@ -27,4 +33,35 @@ namespace BCG
          deleted_rows = deletedRows;
       }
    }
+
+   public static class IDataPacketExtensions {
+      public static IDataPacket ToImmutable(this IDataPacket dataPacket) =>
+         new DataPacket(
+            dataPacket.newRows is IImmutableRowCollection ? dataPacket.newRows : new ImmutableBlueTable(dataPacket.newRows),
+            dataPacket.addedRows,
+            dataPacket.deletedRows);
+
+      public static string GetIncrementalIdString(this IDataPacket dataPacket) {
+         var incIdSerializer = new DataPacketIncrementalIdsJsonSerializer();
+         return incIdSerializer.Serialize(dataPacket);
+         // var sb = new StringBuilder(dataPacket.Schema.tableName);
+         // sb.Append("{ \"deleted\": [");
+         // AddIds(dataPacket.deletedRows);
+         // sb.Append("], \"added\": [");
+         // AddIds(dataPacket.addedRows);
+         // sb.Append("] }");
+         // return sb.ToString();
+
+         // void AddIds(IBlueRowCollection rows) {
+         //    var en = rows.GetEnumerator();
+         //    if (en.MoveNext()) {
+         //       sb.Append(((IBlueRow)en.Current).Id());
+         //       while (en.MoveNext()) {
+         //          sb.Append(',');
+         //          sb.Append(((IBlueRow)en.Current).Id());
+         //       }
+         //    }
+         // }
+      }
+   }
 }

src/DataStreamSuite/DataStreamCore/Messaging/Publish/IPubTableBroker.cs

@@ -0,0 +1,8 @@
+namespace Bts.DataStreamCore;
+
+using BCG;
+
+public interface IPubTableBroker {
+   void create_table(IBlueRowCollection table);
+   void make_batch_changes(IBlueRowCollection new_rows, IBlueRowCollection del_rows, IBlueRowCollection added_rows);
+}