min cost of a tick

need a better variance
build
2020-02-24 09:48:42 -05:00 · 2020-02-21 16:44:52 -05:00 · 2020-02-20 21:58:49 -05:00 · 2020-02-20 21:42:57 -05:00 · 2020-02-20 16:31:44 -05:00 · 2020-02-19 18:18:00 -05:00
337 changed files with 119141 additions and 516 deletions
@@ -5,7 +5,9 @@
            "includePath": [
                "/usr/include",
                "/usr/local/include",
-                "${workspaceRoot}"
+                "${workspaceRoot}",
+                "${workspaceFolder}/src",
+                "${workspaceRoot}/externals/linux/include"
            ],
            "defines": [],
            "intelliSenseMode": "clang-x64",
@@ -13,13 +15,16 @@
                "path": [
                    "/usr/include",
                    "/usr/local/include",
-                    "${workspaceRoot}"
+                    "${workspaceRoot}",
+                    "${workspaceFolder}/src",
+                    "${workspaceRoot}/externals/linux/include"
                ],
                "limitSymbolsToIncludedHeaders": true,
                "databaseFilename": ""
            },
            "cStandard": "c11",
-            "cppStandard": "c++17"
+            "cppStandard": "c++17",
+            "compileCommands": "${workspaceFolder}/build/ninja_debug/compile_commands.json"
        },
        {
            "name": "Windows",
@@ -44,7 +44,8 @@
                "debuggerPath": "/usr/bin/gdb"
            },
            "sourceFileMap": {
-                "/home/bts/spark/": "${workspaceRoot}"
+                "/home/bts/spark/": "${workspaceRoot}",
+                "/home/bts/spark_host/": "${workspaceRoot}",
            }
        },     
        {
@@ -98,11 +99,52 @@
            "externalConsole": true,
            "requireExactSource": false
        },
+            {
+         "name": "sparkcmd Launch",
+         "type": "clr",
+         "request": "launch",
+         "program": "${workspaceRoot}/build/Debug/bin/net471/sparkcmd.exe",
+         "args": [
+            "historical", 
+            "--server",
+             //"--rstart", "11/22/2019",
+             //"--rend", "11/25/2019",
+             //"--rsymbol", "ES",
+             //"--rsecuritytype", "Synthetic",
+             //"--post_process_file_type", "Trade",
+             //"--upload_to_aws", 
+         ],
+         "cwd": "${workspaceRoot}",
+         "stopAtEntry": false,
+         "externalConsole": true,
+         "requireExactSource": false
+      },  
+      {
+         "name": "sparkcmd simulation",
+         "type": "clr",
+         "request": "launch",
+         "program": "${workspaceRoot}/build/Debug/bin/net471/sparkcmd.exe",
+         "args": [
+            "historical",
+            "--rstart", "11/26/2019",
+            "--rend", "11/26/2019",
+            "--rsymbol", "ZN",
+            "--rsecuritytype", "Synthetic",
+            "--algo_security", "ZNH0;ZNZ9-ZNH0;ZNZ9",
+            "--algo_type", "RoundTrip",
+            "--algo_params", "size=10;tick_size=0.015625,0.0078125,0.015625;hedge_factors=1,1,-1",
+            "--skip_preanalysis", "true",         
+         ],
+         "cwd": "${workspaceRoot}",
+         "stopAtEntry": false,
+         "externalConsole": true,
+         "requireExactSource": false
+      },       
        {
            "name": "Excel Launch",
            "type": "clr",
            "request": "launch",
-            "program": "C:/Program Files/Microsoft Office/Office14/EXCEL.EXE",
+            "program": "C:/Program Files/Microsoft Office/Office16/EXCEL.EXE",
            "args": [
                "${workspaceRoot}/build/Debug/bin/net471/spark_excel-addin64-packed.xll"
            ],
@@ -111,6 +153,20 @@
            "externalConsole": true,
            "requireExactSource": false
        },
+        {
+           "name": "Fix Launch",
+           "type": "clr",
+           "request": "launch",
+           "program": "${workspaceRoot}/build/Debug/bin/net471/sparkcmd.exe",
+           "args": [
+              "fix",
+              "-order_session",
+           ],
+           "cwd": "${workspaceRoot}/build/Debug/bin/net471/",
+           "stopAtEntry": false,
+           "externalConsole": true,
+           "requireExactSource": false
+        },        
        {
            "name": "Client Tests",
            "type": "clr",
@@ -126,11 +182,18 @@
            "requireExactSource": false
        },
        {
-            "name": "Client Attach",
+            "name": ".NET Framework Attach",
            "type": "clr",
            "request": "attach",
            "processId": "${command:pickProcess}"
        },
+         {
+            "name": ".NET Core Attach",
+            "type": "coreclr",
+            "request": "attach",
+            "processId": "${command:pickProcess}",
+            "requireExactSource": false
+         },        
        {
            "name": "Spreader Tests",
            "type": "cppdbg",
@@ -337,17 +400,22 @@
                "quoteArgs": true
            },
            "sourceFileMap": {
-                "/home/bts/spark/": "${workspaceRoot}"
+                "/home/bts/spark_host/": "${workspaceRoot}"
            },
            "justMyCode": true
        },
        {
-            "name": ".NET Core Remote Launch",
+            "name": "sparkcmd vsdbg (c#)",
            "type": "coreclr",
            "request": "launch",
            "program": "sparkcmd",
            "args": [
-                "test",
+            "historical",
+            "--rstart", "11/20/2019",
+            "--rend", "11/20/2019",
+            "--rsymbol", "CL",
+            "--rsecuritytype", "Spread",
+            "--post_process_db", "mbo_history",
            ],
            "env": {"LD_LIBRARY_PATH" : "."},
            "stopAtEntry": false,
@@ -365,6 +433,72 @@
                "/home/bts/spark/": "${workspaceRoot}"
            },
            "justMyCode": false
-        },               
+        },                  
+         {
+            "name": "sparkcmd gdb (c++)",
+            "type": "cppdbg",
+            "request": "launch",
+            "program": "/home/bts/spark/build/ninja_debug/server/sparkcmd",
+            "args": [
+            "historical",
+            "--rstart", "10/21/2019",
+            "--rend", "10/21/2019",
+            "--rsymbol", "CL",
+            "--rsecuritytype", "Future",
+            "--algo_security", "CLX9",
+            "--algo_type", "TWAP",
+            "--algo_params", "'size=100;profit_ticks=1;tick_size=1,1,1;;hedge_factors=1,1,-1'",
+            "--skip_preanalysis", "true",
+            ],   
+            "stopAtEntry": false,
+            "cwd": "/home/bts/spark/build/ninja_debug/server/",
+            "environment": [],
+            "externalConsole": true,
+            "MIMode": "gdb",
+            "preLaunchTask": "",
+            "logging": {
+               "engineLogging": false
+            },
+            "setupCommands": [
+               {
+                  "description": "Enable pretty-printing for gdb",
+                  "text": "enable pretty-printer",
+                  "ignoreFailures": true
+               },
+               {
+                  "description": "Skip STL",
+                  "text": "skip -gfi /usr/include/c++/7/bits/*.h",
+                  "ignoreFailures": true
+               },
+               {
+                  "description": "LD LIBRARY",
+                  "text": "set env LD_LIBRARY_PATH=.",
+                  "ignoreFailures": false
+               }
+            ],
+            "pipeTransport": {
+               "pipeCwd": "${workspaceRoot}",
+               "pipeProgram": "c:\\program files\\git\\usr\\bin\\ssh.exe",
+               "pipeArgs": [
+                  "bts@sparkvm"
+               ],
+               "debuggerPath": "/usr/bin/gdb"
+            },
+            "sourceFileMap": {
+               "/home/bts/spark/": "${workspaceRoot}"
+            }
+         },
+         {
+            "name": "Jupyter notebook",
+            "type": "coreclr",
+            "request": "launch",
+            "program": "jupyter",
+            "args": ["notebook", "--notebook-dir=c:\\code\\bts\\spark\\src\\client\\spark_historical\\Notebooks"],
+            "cwd": "${workspaceFolder}",
+            "stopAtEntry": false,
+            "console": "internalConsole",
+            
+         },
+         
    ]
 }
@@ -14,24 +14,21 @@
            "focus": false,
            "panel": "shared"
         },
-         "group": {
-            "kind": "build",
-            "isDefault": true
-         }
+         "group": "build"
      },
      {
-         "label": "server_build",         
+         "label": "server_build",
         "type": "shell",
         "command": ".\\tools\\buildsparkd.cmd",
-         "problemMatcher": {                        
-            "base": "$gcc",       
+         "problemMatcher": {
+            "base": "$gcc",
            "owner": "cpp",
            "fileLocation": [
               "relative",
-               "${workspaceFolder}"               
+               "${workspaceFolder}"
            ],
            "pattern": {
-               "regexp": "(.?)(home)(.?)(bts)(.?)(spark)(.?)(.*):(\\d+):(\\d+):\\s+(warning|error):\\s+(.*)",               
+               "regexp": "(.?)(home)(.?)(bts)(.?)(spark)(.?)(.*):(\\d+):(\\d+):\\s+(warning|error):\\s+(.*)",
               "file": 8,
               "line": 9,
               "column": 10,
@@ -49,6 +46,18 @@
            "kind": "build",
            "isDefault": true
         }
-      }      
+      },
+      {
+         "label": "linux build (Debug)",
+         "type": "shell",
+         "command": "cd build/ninja_debug; time ninja",
+         "group": {
+            "kind": "build",
+            "isDefault": true
+         },
+         "problemMatcher": [
+            "$gcc"
+         ]
+      }
   ]
 } 
@@ -67,10 +67,10 @@ else ()
  
 if(${CMAKE_BUILD_TYPE} STREQUAL "Debug")
   add_custom_command(TARGET server_layout POST_BUILD
-      COMMAND ln -fs ${CMAKE_BINARY_DIR}/../${CMAKE_BUILD_TYPE}/bin/netcoreapp3.0/linux-x64/sparkcmd ${CMAKE_BINARY_DIR}/server/ ) 
+      COMMAND ln -fs ${CMAKE_BINARY_DIR}/../${CMAKE_BUILD_TYPE}/bin/netcoreapp3.1/linux-x64/sparkcmd ${CMAKE_BINARY_DIR}/server/ ) 
 else()
   add_custom_command(TARGET server_layout POST_BUILD
-      COMMAND ln -fs ${CMAKE_BINARY_DIR}/../${CMAKE_BUILD_TYPE}/bin/netcoreapp3.0/linux-x64/publish/sparkcmd ${CMAKE_BINARY_DIR}/server/ ) 
+      COMMAND ln -fs ${CMAKE_BINARY_DIR}/../${CMAKE_BUILD_TYPE}/bin/netcoreapp3.1/linux-x64/publish/sparkcmd ${CMAKE_BINARY_DIR}/server/ ) 
 endif()
      
 endif()
@@ -0,0 +1 @@
+[0108/231015.447:ERROR:file_io.cc(89)] ReadExactly: expected 36, observed 0
@@ -1,6 +1,6 @@
 +++
 title="Client API"
-template="client.html"
+redirect_to = "client/getting-started/overview/"
 sort_by="weight"
 +++

@@ -1,6 +1,5 @@
 +++
 title="Getting Started"
-template="client.html"
 sort_by="weight"
 weight = 1
 +++ 
@@ -1,9 +1,25 @@
 +++
 title = "Install Prerequisites"
-template="client.html"
-weight = 1
+weight = 10
 +++

-## Coming Soon
+# C#/.NET
+
+We target [.NET Standard 2.0](https://docs.microsoft.com/en-us/dotnet/standard/net-standard) so you can use .NET Framework 4.6.1+ or .NET Core 2.0+.  Simply add a reference to the [Spark Nuget package](https://nuget.org) to get started.
+
+```
+dotnet new console -lang c#
+dotnet add package spark_sdk
+dotnet build
+```
+
+# C++
+
+The easiest way to get started with C++ is to use the Spark Server SDK to develop your application.  Follow the instructions to [download and install the Spark Server SDK](/server/getting-started/install) and open the client_sdk sample project. If you want to run your C++ Client SDK application on Windows [contact us](mailto://api@bluetradesys.com) to get the required headers and binaries.
+
+# JavaScript
+
+We use JavaScript internally with the Spark Client API over a websocket connection but the documentation and packaging isn't ready yet.  If this is something you're interested in get in touch with us at [api@bluetradesys.com](mailto:api@bluetradesys.com).
+
+

-* Install .net core
@@ -0,0 +1,31 @@
+++
+title = "Overview"
+weight = 1
+++
+
+The Spark Client SDK is a high level command and control API which can be used to build scripts or integrate Spark into your existing ecosystem.  The API is divided into several independent **"services"** responsible for different aspects of the system.  A Service can define both [remote procedure call (RPC)](/client/getting-started/services#rpc) and incremental [streaming](/client/getting-started/services#streams) data.
+
+The [Spark Desktop](https://www.bluetradingsystems.com/bts-spark/) is built on top of this API so you can be assured that it is complete and well tested.
+
+Spark uses [Google Protocol Buffers](https://developers.google.com/protocol-buffers/) as an interface definition language similar to [GRPC](https://grpc.io) but backed by our custom high-performance TCP protocol.  We currently support C#/.NET and C++ <!--and Javascript--> but the architecture is designed for easy extension so contact us about your specific business needs.
+
+## Orders
+
+Use the [OrderService](/client/services/orderservice) to send and manage orders including native exchange orders, spreader orders, and custom Algo orders created using the [Spark Server SDK](https://api.bluetradesys.com/server/).
+
+## Spreader
+
+Use the [SyntheticSecurityService](/client/services/syntheticsecurityservice) to create and manage synthetic spreads.  Once created these spreads show up in the security and market data feeds just like exchange listed spreads.
+
+## Position
+
+Use the [PositionService](/client/services/positionservice) to get your position and P&L reports or add fills manually to keep the Spark system up to date with an external system.
+
+## Administration
+
+Use the [AdminService](/client/services/adminservice) to manage users and control limits.
+
+## Market Data
+
+For .NET subscribe to market data though the high level MarketDataClient interface.  From C++ or JavaScript use the MarketDataRelay service directly.
+
@@ -0,0 +1,127 @@
+++
+title = "Services"
+weight = 20
+++
+
+The Spark Client SDK uses [Google Protocol Buffers](https://developers.google.com/protocol-buffers/) to define the interface for each service in a language independent manner.  Services have both functions which return a single result and streams of data which return values continuously while subscribed.  This page describes the mapping from the Protocol Buffer definition to the concrete definition in each supported language.
+
+# ServiceContext
+
+To connect your client to the Spark Server you need to get or create a `ServiceContext` instance.  A `ServiceContext` represents a connection to the Spark Server and a background thread for handling messages on that connection.  Generally there should be a single `ServiceContext` per process.  All of the methods on the `ServiceContext` are safe thread safe.
+
+Construct a ServiceContext by calling the default constructor.  The ServiceContext will find the Spark Server by loading the server configuration over an HTTP connection.  To determine the URL it will search the following locations and use the first one that is present.  
+
+* A command line argument `-configserver <url>`
+* An environment variable `BTSCONFIG`
+* `%APPDATA%/bts/conf/spark.conf` (Windows)
+* /sparkdata/conf/spark.conf (Linux)
+* $HOME/sparkdata/conf/spark.conf (Linux)
+
+If your application is running on a system with the BTS Client installed this will probably work without any further configuration.  If you plan to run your client application on a separate machine we recommend setting the `BTSCONFIG` environment variable.
+
+<div class="info">
+<i class="fa fa-lightbulb-o fa-fw" aria-hidden="true"></i>
+If you are using the Spark Server SDK to run a local copy of the Spark server set <p><strong>BTSCONFIG = http://localhost:9000/config/</strong></p>
+</div>
+
+To get a proxy for a given service call ServiceContext.locate&lt;T>("qualifier") where T is the type of the service and "qualifier" is an optional qualifier used to disambiguate between 2 instances of the same service.  The locate call cannot fail but it may return a disconnected proxy.  When you make a call on the proxy you should check the call result to see if the method call succeeded.
+
+# RPC
+
+Here is the OrderService reduced to a single method definition. A RPC method always takes exactly 1 argument and returns 1 value.  In this example the `create_order` call takes a `Create` instance and returns a `Response`.  
+
+```C
+service OrderService { 
+  rpc create_order(Create) returns (Response);
+  ...
+}
+```
+
+The `Create` and `Response` types are also defined as protocol buffer messages.  Each field can either be a primitive type another message or a list or map.
+
+```C
+message Create {
+  OrderDefinition new_order = 1;
+  double price = 2;
+  uint32 quantity = 3;
+}
+
+message Response {
+    uint32 order_key = 1; 
+    OrderError error_code = 2; 
+    string msg = 3;
+}
+```
+
+Each RPC call generates both synchronous (blocking) and asynchronous variants. In C# the asynchronous calls have the `_async` suffix and return a `Task`.  In C++ the call is overloaded to either return a value synchronously or accept a callback function to be called on the ServiceContext thread when the call completes. <!-- In Javascript only async methods returning a Promise are generated because it never makes sense to make a blocking call in the browser. -->
+
+To call the resulting service locate a proxy using the [ServiceContext](#servicecontext) and then call `cancel_order` or `cancel_order_async`.  If you are calling the Spark API from a GUI application you should always prefer the `_async` version of the calls.
+
+
+### C# example
+```c#
+var ctx = new ServiceContext();
+var orders = ctx.locate<OrderService>();
+var response = 
+  await orders.create_order_async(
+    new Create { price = 2.25, quantity = 42 });
+if (response.success) {
+  Console.WriteLine($"success: {response.value}");
+}
+else {
+  Console.WriteLine($"Error: {response.error_message}");
+}
+```
+### C++ example
+```cpp
+auto ctx = ServiceContext{};
+auto orders = ctx.locate<OrderService>();
+Create c;
+c.set_price(2.25);
+c.set_quantity(42);
+// Instead of providing an _async method C++ uses overloading.
+// To make a syncronous call simply omit the callback
+orders.create_order(c, [=](const Result<Response>& response) {
+  if(response.success()) {
+    std::cout << "success.";
+  }
+  else {
+    std::cout << "error: " << response.error_message();
+  }
+});
+```
+
+# Streams
+
+Streams allow you to subscribe to live updating data. Each stream represents a changing collection of protocol buffer objects.  Similar to a database row each item has an `id` which uniquely identifies it within the collection.  Updates from the Spark server can add, remove or replace entries in the collection.  Since only the changed items are sent over the wire the stream can remain responsive even when it represents a large collection.
+
+Streams are implemented using the language bindings for [ReativeX](http://reactivex.io/) which provide utility functions to drill down to the specific data your application needs. In C# we provide both mutable and immutable versions of the generated data types (C++ users can rely on `const`).
+
+When defined in a proto file streams use the `stream` keyword on the result type.
+```C
+service OrderService { 
+  ...
+  rpc fills (FillsSub) returns (stream Fill);
+}
+```
+
+### C# example
+```c#
+  var sc = new ServiceContext();
+  var orders = sc.locate<OrderService>();
+  var fills_observable = orders.subscribei_fills();
+  var unsub = fills_observable.Subscribe(update => {
+    Console.WriteLine(
+        "Added {0} items, Removed {1} items, Updated {2} items.  Total items {3}", 
+        update.added.Count(), 
+        update.removed.Count(), 
+        update.changes.Count(), 
+        update.all.Count());
+  });
+
+  Thread.Sleep(TimeSpan.FromMinutes(5));
+  unsub.Dispose();
+```
+### C++ Example
+```cpp
+```
@@ -0,0 +1,6 @@
+++
+title="Samples"
+sort_by="weight"
+weight = 30
+++ 
+
@@ -0,0 +1,3 @@
+++
+title = "AdminService"
+++
@@ -0,0 +1,3 @@
+++
+title = "OrderService"
+++
@@ -0,0 +1,3 @@
+++
+title = "PositionService"
+++
@@ -0,0 +1,3 @@
+++
+title = "SyntheticService"
+++
@@ -0,0 +1,6 @@
+++
+title="Services"
+#sort_by="weight"
+weight = 10
+++ 
+
@@ -0,0 +1,3 @@
+++
+title = "Market Data"
+++
@@ -1,6 +1,5 @@
 +++
 title="Algo API"
-template="documentation.html"
 redirect_to = "server/getting-started/overview/"
 sort_by="weight"
 +++ 
@@ -1,6 +1,5 @@
 +++
 title="Getting Started"
-template="documentation.html"
 sort_by="weight"
 weight = 1
 +++ 
@@ -71,12 +71,12 @@ The first step is to start the spark_sdk Docker container with the examples dire

 Windows Command Prompt:
 {% clipable() %}
-docker run --rm -it -v %CD%:/examples -u bts -w /examples --shm-size 1024m --name spark_sdk -h spark_sdk --cap-add=SYS_PTRACE --security-opt seccomp=unconfined -p 9000:9000 -p 9001:9001 spark_sdk bash
+docker run --rm -it -v %CD%:/examples -u bts -w /examples --shm-size 2048m --name spark_sdk -h spark_sdk --cap-add=SYS_PTRACE --security-opt seccomp=unconfined -p 9000:9000 -p 9001:9001 spark_sdk bash
 {% end %}

 **Powershell** / Linux / Mac:
 {% clipable() %}
-docker run --rm -it -v ${PWD}:/examples -u bts -w /examples --shm-size 1024m --name spark_sdk -h spark_sdk --cap-add=SYS_PTRACE --security-opt seccomp=unconfined -p 9000:9000 -p 9001:9001 spark_sdk bash
+docker run --rm -it -v ${PWD}:/examples -u bts -w /examples --shm-size 2048m --name spark_sdk -h spark_sdk --cap-add=SYS_PTRACE --security-opt seccomp=unconfined -p 9000:9000 -p 9001:9001 spark_sdk bash
 {% end %}

 ### Attach
@@ -5,7 +5,7 @@ weight = 2

 ## Request Access 🔑

-To start using the Server SDK you will need to request access though our sales department.  Please email <a href="mailto:info@bluetradesys.com">info@bluetradesys.com</a> or call <a href="tel:919-913-0850">(919) 913-0850</a> and we will provide download credentials.
+To start using the Server SDK you will need to request access though our sales department.  Please email <a href="mailto:api@bluetradesys.com">api@bluetradesys.com</a> or call <a href="tel:919-913-0850">(919) 913-0850</a> and we will provide download credentials.

 ## Download

@@ -1,6 +1,5 @@
 +++
 title="Reference"
-template="documentation.html"
 sort_by="weight"
 weight = 2
 +++ 
@@ -6,3 +6,9 @@ weight = 40
 ## I need to make a call that might take a few seconds. What is the best way to do this?

 Create a background thread in [do_before_launch](/server/ref/initialization#before-launch) or [do_launch](/server/ref/initialization#launch-launch-attached) to do the work.  Use [on_timer](/server/ref/subscriptions#timer) to poll until the result is available.
+
+## I don't see the header files in the .zip file. Where are they?
+
+The SDK headers are baked into the docker image along with the build tools. Once you've loaded the image with `docker load < spark_sdk.img` you can run this command to copy them out to your local file system `docker run --rm -it -v $PWD:/out spark_sdk /bin/tar -cvf /out/headers.tar /sdk/include`  This will copy the headers to the current directory in headers.tar.  We still recommend doing the actual build inside the docker environment but having a copy of the headers can be useful for setting up your development environment.
+
+
@@ -1,6 +1,5 @@
 +++
 title="Samples"
-template="documentation.html"
 sort_by="weight"
 weight = 3
 +++ 
@@ -1,31 +0,0 @@
-{% extends "index.html" %}
-
-{% block extra_nav_class %}{% endblock extra_nav_class %}
-{% block extra_content_class %}content--reversed{% endblock extra_content_class %}
-
-{% block content %}
-{% set section = get_section(path="client/_index.md") %}
-<div class="documentation">
-    <aside class="documentation__sidebar">
-        <ul>
-        {% for p in section.subsections %}
-            {% set subsection = get_section(path=p) %}
-            <li>
-                <span class="documentation__sidebar__title">{{ subsection.title }}</span>
-                <ul>
-                    {% for page in subsection.pages %}
-                        <li class="{% if current_path == page.path %}active{% endif %}">
-                            <a href="{{page.permalink}}">{{page.title}}</a>
-                        </li>
-                    {% endfor %}
-                </ul>
-            </li>
-        {% endfor %}
-        </ul>
-    </aside>
-    <div class="documentation__content">
-        {% block doc_content %}
-        {% endblock doc_content %}
-    </div>
-</div>
-{% endblock content %}
@@ -1,36 +0,0 @@
-{% extends "index.html" %}
-
-{% block extra_nav_class %}{% endblock extra_nav_class %}
-{% block extra_content_class %}content--reversed{% endblock extra_content_class %}
-
-{% block content %}
-{%if page.extra.section %}
-{% set section = get_section(path="{{page.extra.section}}/_index.md") %}
-{% else %}
-{% set section = get_section(path="server/_index.md") %}
-{% endif %}
-<div class="documentation">
-    <aside class="documentation__sidebar">
-        <ul>
-        {% for p in section.subsections %}
-            {% set subsection = get_section(path=p) %}
-            <li>
-                <span class="documentation__sidebar__title">{{ subsection.title }}</span>
-                <ul>
-                    {% for page in subsection.pages %}
-                        <li class="{% if current_path == page.path %}active{% endif %}">
-                            <a href="{{page.permalink}}">{{page.title}}</a>
-                        </li>
-                    {% endfor %}
-                </ul>
-            </li>
-        {% endfor %}
-        </ul>
-    </aside>
-    <div class="documentation__content">
-        {% block doc_content %}
-        {% endblock doc_content %}
-        {% block next_link %} {% endblock next_link %}
-    </div>
-</div>
-{% endblock content %}
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en-gb">
+<html lang="en-us">
    <head>
        <meta charset="UTF-8">
        <meta http-equiv="X-UA-Compatible" content="IE=edge">
@@ -14,6 +14,7 @@
        <link rel="stylesheet" href="{{ get_url(path="site.css") }}"/>
        <link rel="icon" href="{{ get_url(path="favicon.ico") }}">
        <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css">
+        <script> dataLayer = [{ 'visitorType': 'geek' }]; </script>
    </head>
    <body>

@@ -36,13 +37,13 @@
            </nav>
        </header>

-        <div class="content {% block extra_content_class %}{% endblock extra_content_class %}">
+        <div class="content content--reversed">
            {% block content %}
                <div class="hero">
                    <h1>Spark SDK</h1>
                    <p class="hero__tagline">
                        Spark consists of a client UI 
-                        (<a class="white" href="https://www.bluetradingsystems.com/bts-spark#ladder-algo-screen">Spark Client</a>), 
+                        (<a href="https://www.bluetradingsystems.com/bts-spark#ladder-algo-screen">Spark Client</a>), 
                        a high-performance professional futures front end, connected via our proprietary protocol over TCP to our Spark Server, which in turn connects to execution venues via their native protocols.
                        Use the Spark SDK to extend Spark Server with your custom Algos, then use the Client SDK to launch and control them.
                    </p>
@@ -64,7 +65,7 @@
                            <a href="{{ get_url(path="@/server/_index.md") }}" class="button">Get started</a>
                        </div>

-                        <div class="selling-point disabled">
+                        <div class="selling-point">
                            <h2>
                                Client SDK
                                <i class="fa fa-gamepad" aria-hidden="true"></i>
@@ -72,19 +73,9 @@
                            <p>
                                The Spark client SDK allows you to integrate spark with your existing ecosystem. The Spark Client is built entirely on this simple, powerful API.
                            </p>
-                            <a href="" class="button" disabled>Get started</a>
+                            <a href="" class="button">Get started</a>
                        </div>
                        
-                        <!-- <div class="selling-point disabled">
-                            <h2>
-                                Microsoft Excel
-                                <i class="fa fa-table" aria-hidden="true"></i>
-                            </h2>
-                            <p>
-                                More of your business is built on excel than probably should be. Continue this worrying trend with the Spark Excel API.
-                            </p>
-                            <a href="" class="button" disabled>Get started</a>
-                        </div> -->
                    </div>
                </div>

@@ -94,6 +85,15 @@
            © Blue Trading Systems
        </footer>

+        <script>
+            if (location.hostname == "api.bluetradesys.com") {
+                (function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
+                new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
+                j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
+                'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
+                })(window,document,'script','dataLayer','GTM-56FHG8R');
+            }
+        </script>
        <script type="text/javascript" src="{{ get_url(path="elasticlunr.min.js") }}"></script>
        <script type="text/javascript" src="{{ get_url(path="search_index.en.js") }}"></script>
        <script type="text/javascript" src="{{ get_url(path="search.js") }}"></script>
@@ -1,13 +1,39 @@
-{% extends "documentation.html" %}
+{% extends "index.html" %}
+{# this has access to the "page" variable but documentation.html does not #}

 {% block title %}{{ page.title }} | {{ super() }} {% endblock title %}
-{% block doc_content %}
-    <h1>{{page.title}}</h1>
-    {{page.content | safe}}
-{% endblock doc_content %}

 {% block next_link %}
-<p>
+{% endblock next_link %}
+
+{% block content %}
+{% set section = get_section(path=page.ancestors[1]) %}
+{# 
+{#<div>{{ section.title }} </div>#}
+<div class="documentation">
+    <aside class="documentation__sidebar">
+        <ul>
+        {% for p in section.subsections %}
+            {% set subsection = get_section(path=p) %}
+            <li>
+                <span class="documentation__sidebar__title">{{ subsection.title }}</span>
+                <ul>
+                    {% for page in subsection.pages %}
+                        <li class="{% if current_path == page.path %}active{% endif %}">
+                            <a href="{{page.permalink}}">{{page.title}}</a>
+                        </li>
+                    {% endfor %}
+                </ul>
+            </li>
+        {% endfor %}
+        </ul>
+    </aside>
+    <div class="documentation__content">
+        <h1>{{page.title}}</h1>
+        {{page.content | safe}}
+
+    {# next/pre links #}
+    <p>
    {% if page.lighter %}
        <a href="{{ page.lighter.permalink }}">
            <i class="fa fa-chevron-left fa-fw" aria-hidden="true"></i>
@@ -21,5 +47,7 @@
            <i class="fa fa-chevron-right fa-fw" aria-hidden="true"></i>
        </a>
    {% endif %}
-</p>
-{% endblock next_link %}
+    </p>
+    </div>
+</div>
+{% endblock content %}
@@ -4,6 +4,15 @@ weight = 3
 sort_by = "weight"
 insert_anchor_links = "right"
 +++
+## 2.15.3
+### Bug Fixes
+  - Fixed a bug where some CME currency spreads exhibited incorrect tick values
+## 2.15.2
+### User Visible Changes  
+  - Excel RTD plugin can now receive ICE market data
+## 2.15.1
+### Bug Fixes
+  - Fixed a FIX log parsing issue that resulted in exchange gateway logon problems
 ## 2.15.0
 ### User Visible Changes  
  - Added ability to hide Ladder status messages via Ladder Settings -> Left Panel tab -> Show/Hide groupbox -> Status Message
@@ -23,7 +23,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "spark_test", "src\client\sp
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "spark_excel", "src\client\spark_excel\spark_excel.csproj", "{BE9F27C3-B583-47DF-95FA-1F8BBC89DCCB}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "spark_fix", "src\client\spark_fix\spark_fix.csproj", "{D8031C13-7BEA-430A-BB60-40927D15CFC3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "spark_historical", "src\client\spark_historical\spark_historical.csproj", "{5F64A360-43F4-4AD8-8B04-3C3F4424BCBC}"
+EndProject
 Global
+	GlobalSection(Performance) = preSolution
+		HasPerformanceSessions = true
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Debug|x64 = Debug|x64
@@ -219,6 +226,50 @@ Global
 		{BE9F27C3-B583-47DF-95FA-1F8BBC89DCCB}.RelWithDebInfo|x64.Build.0 = Release|x64
 		{BE9F27C3-B583-47DF-95FA-1F8BBC89DCCB}.RelWithDebInfo|x86.ActiveCfg = Release|x64
 		{BE9F27C3-B583-47DF-95FA-1F8BBC89DCCB}.RelWithDebInfo|x86.Build.0 = Release|x64
+		{D8031C13-7BEA-430A-BB60-40927D15CFC3}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{D8031C13-7BEA-430A-BB60-40927D15CFC3}.Debug|x64.ActiveCfg = Debug|x64
+		{D8031C13-7BEA-430A-BB60-40927D15CFC3}.Debug|x64.Build.0 = Debug|x64
+		{D8031C13-7BEA-430A-BB60-40927D15CFC3}.Debug|x86.ActiveCfg = Debug|x64
+		{D8031C13-7BEA-430A-BB60-40927D15CFC3}.MinSizeRel|Any CPU.ActiveCfg = Release|x64
+		{D8031C13-7BEA-430A-BB60-40927D15CFC3}.MinSizeRel|Any CPU.Build.0 = Release|x64
+		{D8031C13-7BEA-430A-BB60-40927D15CFC3}.MinSizeRel|x64.ActiveCfg = Release|x64
+		{D8031C13-7BEA-430A-BB60-40927D15CFC3}.MinSizeRel|x64.Build.0 = Release|x64
+		{D8031C13-7BEA-430A-BB60-40927D15CFC3}.MinSizeRel|x86.ActiveCfg = Release|x64
+		{D8031C13-7BEA-430A-BB60-40927D15CFC3}.MinSizeRel|x86.Build.0 = Release|x64
+		{D8031C13-7BEA-430A-BB60-40927D15CFC3}.Release|Any CPU.ActiveCfg = Release|x64
+		{D8031C13-7BEA-430A-BB60-40927D15CFC3}.Release|x64.ActiveCfg = Release|x64
+		{D8031C13-7BEA-430A-BB60-40927D15CFC3}.Release|x64.Build.0 = Release|x64
+		{D8031C13-7BEA-430A-BB60-40927D15CFC3}.Release|x86.ActiveCfg = Release|x64
+		{D8031C13-7BEA-430A-BB60-40927D15CFC3}.RelWithDebInfo|Any CPU.ActiveCfg = Release|x64
+		{D8031C13-7BEA-430A-BB60-40927D15CFC3}.RelWithDebInfo|Any CPU.Build.0 = Release|x64
+		{D8031C13-7BEA-430A-BB60-40927D15CFC3}.RelWithDebInfo|x64.ActiveCfg = Release|x64
+		{D8031C13-7BEA-430A-BB60-40927D15CFC3}.RelWithDebInfo|x64.Build.0 = Release|x64
+		{D8031C13-7BEA-430A-BB60-40927D15CFC3}.RelWithDebInfo|x86.ActiveCfg = Release|x64
+		{D8031C13-7BEA-430A-BB60-40927D15CFC3}.RelWithDebInfo|x86.Build.0 = Release|x64
+		{5F64A360-43F4-4AD8-8B04-3C3F4424BCBC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5F64A360-43F4-4AD8-8B04-3C3F4424BCBC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5F64A360-43F4-4AD8-8B04-3C3F4424BCBC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5F64A360-43F4-4AD8-8B04-3C3F4424BCBC}.Debug|x64.Build.0 = Debug|Any CPU
+		{5F64A360-43F4-4AD8-8B04-3C3F4424BCBC}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{5F64A360-43F4-4AD8-8B04-3C3F4424BCBC}.Debug|x86.Build.0 = Debug|Any CPU
+		{5F64A360-43F4-4AD8-8B04-3C3F4424BCBC}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU
+		{5F64A360-43F4-4AD8-8B04-3C3F4424BCBC}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU
+		{5F64A360-43F4-4AD8-8B04-3C3F4424BCBC}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
+		{5F64A360-43F4-4AD8-8B04-3C3F4424BCBC}.MinSizeRel|x64.Build.0 = Debug|Any CPU
+		{5F64A360-43F4-4AD8-8B04-3C3F4424BCBC}.MinSizeRel|x86.ActiveCfg = Debug|Any CPU
+		{5F64A360-43F4-4AD8-8B04-3C3F4424BCBC}.MinSizeRel|x86.Build.0 = Debug|Any CPU
+		{5F64A360-43F4-4AD8-8B04-3C3F4424BCBC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5F64A360-43F4-4AD8-8B04-3C3F4424BCBC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5F64A360-43F4-4AD8-8B04-3C3F4424BCBC}.Release|x64.ActiveCfg = Release|Any CPU
+		{5F64A360-43F4-4AD8-8B04-3C3F4424BCBC}.Release|x64.Build.0 = Release|Any CPU
+		{5F64A360-43F4-4AD8-8B04-3C3F4424BCBC}.Release|x86.ActiveCfg = Release|Any CPU
+		{5F64A360-43F4-4AD8-8B04-3C3F4424BCBC}.Release|x86.Build.0 = Release|Any CPU
+		{5F64A360-43F4-4AD8-8B04-3C3F4424BCBC}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU
+		{5F64A360-43F4-4AD8-8B04-3C3F4424BCBC}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU
+		{5F64A360-43F4-4AD8-8B04-3C3F4424BCBC}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU
+		{5F64A360-43F4-4AD8-8B04-3C3F4424BCBC}.RelWithDebInfo|x64.Build.0 = Release|Any CPU
+		{5F64A360-43F4-4AD8-8B04-3C3F4424BCBC}.RelWithDebInfo|x86.ActiveCfg = Release|Any CPU
+		{5F64A360-43F4-4AD8-8B04-3C3F4424BCBC}.RelWithDebInfo|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -97,7 +97,7 @@
    <Copy SourceFiles="%(Proto2.FullPath)" DestinationFolder="$(WorkingDirectory)" SkipUnchangedFiles="True" UseHardLinksIfPossible="True" />
    <Error Text="protogen.exe does not exist. If you forgot to clone with externals try: git submodule update --init --recursive" Condition="!Exists($(protogen))" />
    <Message Importance="High" Text="Doing Proto2 %(proto2.filename)" />
-    <Exec Command="$(Protogen) %(Proto2.filename)%(proto2.extension) --csharp_out=. -I. -I$(SourceRoot) -I$(Externals)/include"
+    <Exec Command="PYTHONPATH=$(Externals)/python $(Protogen) %(Proto2.filename)%(proto2.extension) --csharp_out=. -I. -I$(SourceRoot) -I$(Externals)/include"
          WorkingDirectory="$(WorkingDirectory)" />
    <ItemGroup>
        <Compile Include="$(WorkingDirectory)/%(Proto2.filename).cs" />
@@ -3,12 +3,12 @@
 #$1 = Debug / Release (CMAKE_BUILD_TYPE), $2 = CMAKE_BINARY_DIR
 cd "$(dirname "$0")"
 echo $PWD dotnet build -c $1 ./sparkcmd/
-dotnet build -c $1 -o $2/../$1/bin/netcoreapp3.0/linux-x64 ./sparkcmd/ 
+dotnet build -c $1 -o $2/../$1/bin/netcoreapp3.1/linux-x64 ./sparkcmd/ 

 if [ "$1" == "Release" ]
 then
-   dotnet publish -c $1 -o $2/../$1/bin/netcoreapp3.0/linux-x64 ./sparkcmd/ 
-   ln -fs $2/src/lib/libspark.so $2/../$1/bin/netcoreapp3.0/linux-x64/publish
+   dotnet publish -c $1 -o $2/../$1/bin/netcoreapp3.1/linux-x64 ./sparkcmd/ 
+   ln -fs $2/src/lib/libspark.so $2/../$1/bin/netcoreapp3.1/linux-x64/publish
 fi

-ln -fs $2/src/lib/libspark.so $2/../$1/bin/netcoreapp3.0/linux-x64
+ln -fs $2/src/lib/libspark.so $2/../$1/bin/netcoreapp3.1/linux-x64
@@ -1,6 +1,7 @@
 using bts.api;
 using bts.co2;
 using bts.collections;
+using bts.utils.csv;
 using mbts.persist;
 using mbts.spark.filters;
 using mbts.ui;
@@ -52,7 +53,7 @@ namespace mbts.spark {
            columns.Add(new RenderTextColumn<Row, TimeAndSalesView.Columns>(col_key, r => r[col_key], filter, filter_template, r => _get_aggressor_brush(r))
            { id = col_id(col_key), Header = header, Width = width, sort_member_path = sort_member_path, horizontal_alignment = h_alignment  }
         );
-         
+
         // be sure to load GridSettings AFTER the columns collection has been populated, the grid settings manager looks columns by id to apply the appropriate settings,
         // if the collection is not populated, the column settings will not be applied
         grid_settings_manager = new SimpleGridSettingsManager<Row>(columns, new Dictionary<string, GridColumnSettingsFeatureFlags> { }, row_vms);
@@ -173,6 +174,19 @@ namespace mbts.spark {
            }
         }

+         public static System.Collections.Specialized.OrderedDictionary csv_ordered_properties =>
+            CsvHelper.create_ordering_maintainer(
+               typeof(TimeAndSalesVM.Row),
+               new string[] {
+                  nameof(security),
+                  nameof(time),
+                  nameof(price),
+                  nameof(size),
+                  nameof(aggressor_side),
+                  nameof(security_key),
+               });
+
+
         public void raise_invalidated() => invalidated?.Invoke();
      }
   }
@@ -3,6 +3,7 @@ using bts.api;
 using bts.shell;
 using bts.shell.fills;
 using bts.spark;
+using bts.utils.csv;
 using mbts.co2;
 using mbts.persist;
 using mbts.ui;
@@ -63,6 +64,7 @@ namespace mbts.spark {
         var current_smd_source = connectable_builder.create(vm => vm.current_security_md_observable(_bus)).OnDispatcher();
         var selected_secs_source = connectable_builder.create(vm => vm.selected_securities_observable()).OnDispatcher();
         _commands = new SparkCommand[] {
+            new SparkCommandCommand("Export to csv", Icons.Export, FileDialogCommand.export_csv(() => _vm.value.row_vms.ToCsv(TimeAndSalesVM.Row.csv_ordered_properties), "TaS")),
            SparkCommands.ShowLadder(SparkCommands.KeyGestures.ShowLadder).complete(current_smd_source, md => md.HasValue, ConvertUtils.ValueOrDefault),
            SparkCommands.ShowOrderTicketFromSecurity(SparkCommands.KeyGestures.ShowOrderTicket).complete(current_smd_source, md => md.HasValue, ConvertUtils.ValueOrDefault),
            SparkCommands.ShowFills(SparkCommands.KeyGestures.ShowFills).complete(selected_secs_source, always_true, get_fills_startup_data),
@@ -5,6 +5,7 @@ using bts.collections;
 using bts.shell.fills;
 using bts.spark;
 using bts.utils;
+using bts.utils.csv;
 using mbts.collections;
 using mbts.persist;
 using mbts.spark.filters;
@@ -23,6 +24,7 @@ using System.Linq;
 using System.Reactive.Disposables;
 using System.Reactive.Linq;
 using System.Windows.Data;
+using System.Windows.Input;
 using System.Windows.Media;
 using static bts.api.orderman.Fill.Types;
 using static bts.shell.FillsWindowFactory;
@@ -310,6 +312,7 @@ namespace mbts.spark {
         public FillStatus fill_status => _fill.FillStatus;
         public string fill_key => _fill.FillKey;
         public string order_key => _order.Key.ToString();
+         public string symbol => fill_tuple.security?.Symbol;
         public bool is_selected {
            get => _is_selected;
            set => Set(ref _is_selected, value);
@@ -330,6 +333,28 @@ namespace mbts.spark {
         public override bool Equals(object obj) => Equals(obj as Row);
         public override int GetHashCode() => _fill.FillKey.GetHashCode() ^ _order.Key.GetHashCode();

+         public static System.Collections.Specialized.OrderedDictionary csv_ordered_properties =>
+            CsvHelper.create_ordering_maintainer(typeof(Row),
+               new string[] {
+                  nameof(security),
+                  nameof(symbol),
+                  nameof(order_type),
+                  nameof(root_algo_display_name),
+                  nameof(side),
+                  nameof(fill_time),
+                  nameof(user),
+                  nameof(account),
+                  nameof(exchange),
+                  nameof(time_in_force),
+                  nameof(size),
+                  nameof(price),
+                  nameof(fill_kind),
+                  nameof(fill_status),
+                  nameof(fill_key),
+                  nameof(order_key),
+                  nameof(security_key)
+               });
+
         public event Action invalidated;
         void IRowVM.raise_invalidated() => invalidated?.Invoke();
      }
@@ -3,6 +3,7 @@ using bts.api;
 using bts.shell;
 using bts.shell.fills;
 using bts.spark;
+using bts.utils.csv;
 using mbts.persist;
 using mbts.ui;
 using mbts.ui.settings;
@@ -54,6 +55,7 @@ namespace mbts.spark {
         _view = new FillsView { DataContext = _vm };

         _commands = new List<SparkCommand> {
+            new SparkCommandCommand("Export to csv", Icons.Export, FileDialogCommand.export_csv(() => _vm.rows.ToCsv(FillsVM.Row.csv_ordered_properties), "Fills")),
            // wrap the grid settings view factory in a dialogCommand here since the vm is destroyed/recreated when the security criteria changes
            SparkCommands.window_settings_command(new DialogCommand(() => {
               var vm = new ShellSettingsDialogVM<GridSettings, SimpleGridSettingsVM>(
@@ -4,6 +4,7 @@ using bts.api.orderman;
 using bts.collections;
 using bts.spark;
 using bts.utils;
+using bts.utils.csv;
 using mbts.ui;
 using mbts.ui.controls;
 using System;
@@ -11,6 +12,7 @@ using System.Collections.Generic;
 using System.ComponentModel;
 using System.Reactive.Linq;
 using System.Runtime.CompilerServices;
+using System.Linq;
 using System.Windows.Input;
 using System.Windows.Media;
 using Columns = mbts.spark.OrderBookGridView.ColumnKeys;
@@ -60,6 +62,35 @@ namespace mbts.spark {
      public event Action<(OrderSecurityRootPair oldval, OrderSecurityRootPair newval)> updated;
      public event PropertyChangedEventHandler PropertyChanged;

+      public static System.Collections.Specialized.OrderedDictionary csv_ordered_properties =>
+            CsvHelper.create_ordering_maintainer(
+               typeof(OrderBookRowVM), 
+               new string[] {
+                  nameof(security_text),
+                  nameof(symbol),
+                  nameof(time_created),
+                  nameof(last_change),
+                  nameof(user),
+                  nameof(account),
+                  nameof(exchange),
+                  nameof(time_in_force),
+                  nameof(order_type),
+                  nameof(root_algo_display_name),
+                  nameof(order_sub_type),
+                  nameof(side),
+                  nameof(quantity),
+                  nameof(filled_quantity),
+                  nameof(price),
+                  nameof(avg_price),
+                  nameof(last_price),
+                  nameof(piq),
+                  nameof(status),
+                  // last message (could contains commas, so skipping)
+                  nameof(security_key),
+                  nameof(order_key),
+                  nameof(parent_order_key),
+               });
+
      // Core
      public OrderSecurityRootPair order_tuple { get; private set; }
      public OrderRecordImmutable order => order_tuple.order.order;
@@ -4,6 +4,7 @@ using bts.shell;
 using bts.shell.fills;
 using bts.shell.orderbook;
 using bts.spark;
+using bts.utils.csv;
 using bts.view;
 using mbts.persist;
 using mbts.ui;
@@ -184,6 +185,7 @@ namespace mbts.spark {
         show_grid_settings_command.group = CommandGroups.Auxiliary;

         _commands = new SparkCommand[] {
+            new SparkCommandCommand("Export to csv", Icons.Export, FileDialogCommand.export_csv(() => _vm.rows.ToCsv(OrderBookRowVM.csv_ordered_properties), "OrderBook")),
            toggle_show_right_panel_command,
            attach_selected_orders_command,
            detach_selected_orders_command,
@@ -653,54 +653,25 @@ namespace mbts.spark.utilities {
            return def;
         }
      }
+      
+      static CustomOrderDefinition.CustomOneofCase[] algo_config(
+         Func<bts.config.AlgoPermissions, List<string>> selector)
+      {
+         var conf = mbts.config.Configuration.get<bts.config.AlgoPermissions>();
+         return selector(conf).Select(x => 
+         {
+            return (CustomOrderDefinition.CustomOneofCase)System.Enum.Parse(typeof(CustomOrderDefinition.CustomOneofCase), x, true);
+         }).ToArray();
+      }

      public static readonly CustomOrderDefinition.CustomOneofCase[]

         // exchange_order_types are the types which can be submitted on an exchange security
-         exchange_order_types = new[] {
-            CustomOrderDefinition.CustomOneofCase.Market,
-            CustomOrderDefinition.CustomOneofCase.Limit,
-            CustomOrderDefinition.CustomOneofCase.Stop,
-            CustomOrderDefinition.CustomOneofCase.StopLimit,
-            CustomOrderDefinition.CustomOneofCase.GlbxIceberg,
-            CustomOrderDefinition.CustomOneofCase.Iceberg,
-            CustomOrderDefinition.CustomOneofCase.Lean,
-            CustomOrderDefinition.CustomOneofCase.Join,
-            CustomOrderDefinition.CustomOneofCase.Cover,
-            CustomOrderDefinition.CustomOneofCase.Top,
-            CustomOrderDefinition.CustomOneofCase.Offset,
-            CustomOrderDefinition.CustomOneofCase.Splitter,
-            CustomOrderDefinition.CustomOneofCase.Scratch,
-            CustomOrderDefinition.CustomOneofCase.Prorata,
-         },
-         spreader_order_types = new[] {
-            CustomOrderDefinition.CustomOneofCase.Spreader,
-            CustomOrderDefinition.CustomOneofCase.Iceberg,
-            CustomOrderDefinition.CustomOneofCase.Lean,
-            CustomOrderDefinition.CustomOneofCase.Join,
-            CustomOrderDefinition.CustomOneofCase.Cover, 
-            CustomOrderDefinition.CustomOneofCase.Top,
-            CustomOrderDefinition.CustomOneofCase.Splitter,
-            CustomOrderDefinition.CustomOneofCase.Scratch,
-            CustomOrderDefinition.CustomOneofCase.Prorata,
-         },
-         attachable_order_types = new[] {
-            CustomOrderDefinition.CustomOneofCase.Iceberg,
-            CustomOrderDefinition.CustomOneofCase.Lean,
-            CustomOrderDefinition.CustomOneofCase.Join,
-            CustomOrderDefinition.CustomOneofCase.Cover,
-            CustomOrderDefinition.CustomOneofCase.Top,
-            CustomOrderDefinition.CustomOneofCase.Offset,
-            CustomOrderDefinition.CustomOneofCase.Scratch,
-            CustomOrderDefinition.CustomOneofCase.Prorata,
-         },
-         outright_order_types = new[] {
-            CustomOrderDefinition.CustomOneofCase.Market,
-            CustomOrderDefinition.CustomOneofCase.Limit,
-            CustomOrderDefinition.CustomOneofCase.Stop,
-            CustomOrderDefinition.CustomOneofCase.StopLimit,
-            CustomOrderDefinition.CustomOneofCase.GlbxIceberg,
-         };
+         exchange_order_types = algo_config(x => x.exchange_order_types),
+         spreader_order_types = algo_config(x => x.spreader_order_types),
+         attachable_order_types = algo_config(x => x.attachable_order_types),
+         outright_order_types = algo_config(x => x.outright_order_types);
+         
      public static readonly CustomOrderDefinition.CustomOneofCase[] all_order_types = exchange_order_types.Union(spreader_order_types).ToArray();

      public static void copy_values(CustomOrderDefinitionImmutable source, ref CustomOrderDefinition target) =>
@@ -28,15 +28,17 @@ namespace mbts.spark
      where TMutable : class, IMessage, new() 
   {
      TMutable _message;
+      readonly protected Func<IMessage, IMessage> _message_override;

-      protected GenericOrderParamVM(FieldDescriptor descriptor)
+      protected GenericOrderParamVM(FieldDescriptor descriptor, Func<IMessage, IMessage> message_override = null)
      {
         _message = new TMutable();
+         _message_override = message_override;
         this.descriptor = descriptor;
      }

      public FieldDescriptor descriptor { get; set; }
-      public Google.Protobuf.IMessage message 
+      public virtual Google.Protobuf.IMessage message 
      {
         get => _message;
         set 
@@ -53,11 +55,12 @@ namespace mbts.spark
      where TMutable : class, IMessage, new()
   {
      readonly Func<TModel, TView> _convert;
-      readonly Func<TView, TModel> _convert_back;
+      readonly Func<TView, TModel> _convert_back;      
      TView _value;

-      public GenericOrderParamVM(FieldDescriptor field_descriptor, Func<TModel, TView> convert, Func<TView, TModel> convert_back) : 
-         base(field_descriptor) 
+      public GenericOrderParamVM(FieldDescriptor field_descriptor, Func<TModel, TView> convert, 
+                                 Func<TView, TModel> convert_back, Func<IMessage, IMessage> message_override = null) : 
+         base(field_descriptor, message_override) 
      {
         _convert = convert;
         _convert_back = convert_back;
@@ -68,7 +71,8 @@ namespace mbts.spark
         get => _value;
         set 
         {
-            this.descriptor.Accessor.SetValue(this.message, _convert_back(_value = value));
+            this.descriptor.Accessor.SetValue( _message_override == null ? this.message : _message_override(this.message), 
+                                              _convert_back(_value = value));
            RaisePropertyChanged();
         }
      }
@@ -84,7 +88,7 @@ namespace mbts.spark

      protected override void on_param_changed() 
      {
-         _value = _convert(ConvertUtils.try_convert<TModel>(this.descriptor.Accessor.GetValue(this.message)));
+         _value = _convert(ConvertUtils.try_convert<TModel>(this.descriptor.Accessor.GetValue(_message_override == null ? this.message : _message_override(this.message))));
         RaisePropertyChanged(nameof(value));
      }
   }
@@ -92,8 +96,8 @@ namespace mbts.spark
   class GenericOrderEnumeratedVM<TMutable> : GenericOrderParamVM<TMutable>, IGenericOrderParamVM<string>
      where TMutable : class, IMessage, new()   
   {
-      public GenericOrderEnumeratedVM(FieldDescriptor descriptor)
-         : base(descriptor)
+      public GenericOrderEnumeratedVM(FieldDescriptor descriptor, Func<IMessage, IMessage> message_override = null)
+         : base(descriptor, message_override)
      {
         elements = new ObservableCollection<string>(_get_elements(descriptor));
      }
@@ -102,11 +106,13 @@ namespace mbts.spark

      public string selected_element 
      {
-         get => GenericOrderHelper.get_enumerated_value(message, descriptor);
+         get => GenericOrderHelper.get_enumerated_value(_message_override == null ? this.message : _message_override(this.message),
+                                                        descriptor);
         set 
         {
            var orig = selected_element;
-            GenericOrderHelper.set_enumerated_value(message, descriptor, value);
+            GenericOrderHelper.set_enumerated_value(_message_override == null ? this.message : _message_override(this.message), 
+                                                    descriptor, value);
            if (selected_element != orig)
               RaisePropertyChanged();
         }
@@ -148,22 +154,23 @@ namespace mbts.spark
   class GenericOrderQuantityVM<TMutable> : GenericOrderParamVM<TMutable>, IGenericOrderParamVM<QuantityMeasureImmutable?>
      where TMutable : class, IMessage, new()
   {
-      public GenericOrderQuantityVM(FieldDescriptor descriptor)
-         : base(descriptor) { }
+      public GenericOrderQuantityVM(FieldDescriptor descriptor, Func<IMessage, IMessage> message_override = null)
+         : base(descriptor, message_override) { }

      QuantityMeasureImmutable? IGenericOrderParamVM<QuantityMeasureImmutable?>.value { get => quantity; set => quantity= value; }
      public QuantityMeasureImmutable? quantity 
      {
-         get => GenericOrderHelper.get_quantity_value(message, descriptor);
+         get => GenericOrderHelper.get_quantity_value(_message_override == null ? this.message : _message_override(this.message), 
+                                                      descriptor);
         set 
         {
            var orig = quantity;
-            GenericOrderHelper.set_quantity_value(message, descriptor, value);
+            GenericOrderHelper.set_quantity_value(_message_override == null ? this.message : _message_override(this.message), 
+                                                  descriptor, value);
            if (quantity != orig)
               RaisePropertyChanged();
         }
      }      
-
      public IObservable<QuantityMeasureImmutable?> subscribe_value() 
      {
         return Observable.Create<QuantityMeasureImmutable?>(o =>
@@ -174,10 +181,9 @@ namespace mbts.spark
               o.OnNext(quantity);
         });
      }
-
      protected override void on_param_changed()
      {
         RaisePropertyChanged(nameof(quantity));
      }
-   }   
+   }
 }
@@ -96,9 +96,41 @@ namespace mbts.spark {
            {               
               Google.Protobuf.Reflection.MessageDescriptor desc = new TMutable().Descriptor;               
               _parameters.SyncWithDictionary(
-                  desc.Fields.InDeclarationOrder().Where(_is_value_param_desc).ToDictionary(p => p.Name), _mk_param_vm);
+                  desc.Fields.InDeclarationOrder().Where(_is_value_param_desc).ToDictionary(p => p.Name), x => _mk_param_vm(x));
+               add_message_params(desc);
            }
         }
+         void add_message_params(Google.Protobuf.Reflection.MessageDescriptor desc)
+         {
+            var msgs = desc.Fields.InDeclarationOrder().Where(x => !_is_value_param_desc(x) && 
+                                                              x.MessageType.ClrType != typeof(CustomOrderDefinition) );
+            foreach(var message_field in msgs)
+            {
+               foreach (var fd in message_field.MessageType.Fields.InDeclarationOrder())
+               {
+                  if(_is_value_param_desc(fd)) //one level deep
+                  {
+                     var mk = _mk_param_vm(fd, 
+                     outside_object => 
+                     {                        
+                        var msgfield = message_field.Accessor.GetValue(outside_object);
+                        if(msgfield == null)
+                        {
+                           message_field.Accessor.SetValue(outside_object, Activator.CreateInstance(message_field.MessageType.ClrType));
+                           msgfield = message_field.Accessor.GetValue(outside_object);
+                        }
+                        return (IMessage)msgfield;
+                     });
+                     if(mk == null) 
+                        continue;
+                        
+                     if(!_parameters.Add(mk))
+                        _parameters.Add(message_field.Name + "_" + mk.descriptor.Name, mk);                     
+                  }
+               }
+            }            
+         }
+         
         static bool _is_value_param_desc(FieldDescriptor desc)
         {
            return (desc.FieldType != Google.Protobuf.Reflection.FieldType.Message || 
@@ -117,50 +149,53 @@ namespace mbts.spark {
            return v;
         }

-         GenericOrderParamVM<TMutable> _mk_param_vm(FieldDescriptor descriptor) 
+         GenericOrderParamVM<TMutable> _mk_param_vm(FieldDescriptor descriptor, Func<IMessage, IMessage> message_override = null) 
         {
            ExceptionAssert.Argument.NotNull(descriptor, nameof(descriptor));

            if (descriptor.FieldType == FieldType.Message && 
                descriptor.MessageType.FullName == typeof(bts.spark.QuantityMeasure).FullName)
            {
-               var qm = new GenericOrderQuantityVM<TMutable>(descriptor);
-               return attached(qm, GenericOrderHelper.get_quantity_value, GenericOrderHelper.set_quantity_value);
+               var qm = new GenericOrderQuantityVM<TMutable>(descriptor, message_override);
+               return attached(qm, GenericOrderHelper.get_quantity_value, GenericOrderHelper.set_quantity_value, message_override);
            }
            else if(descriptor.FieldType == FieldType.Enum)
            {
-               var pvm = new GenericOrderEnumeratedVM<TMutable>(descriptor);
-               attached(pvm, GenericOrderHelper.get_enumerated_value, GenericOrderHelper.set_enumerated_value);
+               var pvm = new GenericOrderEnumeratedVM<TMutable>(descriptor, message_override);
+               attached(pvm, GenericOrderHelper.get_enumerated_value, GenericOrderHelper.set_enumerated_value, message_override);
               return pvm;
            }
            else if (descriptor.FieldType == FieldType.Bool)
-               return mk<bool?, bool>(descriptor, v => v, v => v.GetValueOrDefault());
+               return mk<bool?, bool>(descriptor, v => v, v => v.GetValueOrDefault(), message_override);
            else if (descriptor.FieldType == FieldType.Double || descriptor.FieldType == FieldType.Float)
-               return mk<double, double>(descriptor, v => v, v => v, double.NaN);
+               return mk<double, double>(descriptor, v => v, v => v, message_override, double.NaN);
            else if (descriptor.FieldType == FieldType.Int32)
-               return mk<int?, int>(descriptor, v => v, v => v.GetValueOrDefault());
+               return mk<int?, int>(descriptor, v => v, v => v.GetValueOrDefault(), message_override);
            else if (descriptor.FieldType == FieldType.UInt32)
-               return mk<uint?, uint>(descriptor, v => v, v => v.GetValueOrDefault());
+               return mk<uint?, uint>(descriptor, v => v, v => v.GetValueOrDefault(), message_override);
            else if (descriptor.FieldType == FieldType.String)
-               return mk<string, string>(descriptor, v => v, v => v);
+               return mk<string, string>(descriptor, v => v, v => v, message_override);
            else
               return null;
         }
-         GenericOrderParamVM<TMutable, TView, TModel> mk<TView, TModel>(FieldDescriptor fdesc, Func<TModel, TView> convert, Func<TView, TModel> convert_back, TView default_value = default)
+         GenericOrderParamVM<TMutable, TView, TModel> mk<TView, TModel>(FieldDescriptor fdesc, Func<TModel, TView> convert, Func<TView, TModel> convert_back, 
+                                                                        Func<IMessage, IMessage> message_override = null, TView default_value = default)
         {
-            var pvm = new GenericOrderParamVM<TMutable, TView, TModel>(fdesc, convert, convert_back);
-            return attached<TView, GenericOrderParamVM<TMutable, TView, TModel>>(pvm, get_from_param, assign_to_param, default_value);
+            var pvm = new GenericOrderParamVM<TMutable, TView, TModel>(fdesc, convert, convert_back, message_override);
+            return attached<TView, GenericOrderParamVM<TMutable, TView, TModel>>(pvm, get_from_param, assign_to_param,
+                                                                                 message_override, default_value);

            TView get_from_param(IMessage param, FieldDescriptor fd) => convert(ConvertUtils.try_convert<TModel>(fdesc.Accessor.GetValue(param)));
            void assign_to_param(IMessage param, FieldDescriptor fd, TView value) => fdesc.Accessor.SetValue(param, convert_back(value));
         }

-         TParam attached<T, TParam>(TParam pvm, Func<IMessage, FieldDescriptor, T> selector, Action<IMessage, FieldDescriptor, T> assign_to_param, T default_value = default) where TParam : GenericOrderParamVM<TMutable>, IGenericOrderParamVM<T>
+         TParam attached<T, TParam>(TParam pvm, Func<IMessage, FieldDescriptor, T> selector, Action<IMessage, FieldDescriptor, T> assign_to_param, 
+                                    Func<IMessage, IMessage> message_override = null, T default_value = default) where TParam : GenericOrderParamVM<TMutable>, IGenericOrderParamVM<T>
         {
            add_property<T>(
               pvm.descriptor.Name,
-               mdef => mdef != null ? selector(mdef, pvm.descriptor) : default_value,
-               (mdef, v) => assign_to_param(mdef, pvm.descriptor, v),
+               mdef => mdef != null ? selector( message_override == null ?  mdef : message_override(mdef), pvm.descriptor) : default_value,
+               (mdef, v) => assign_to_param(message_override == null ? mdef : message_override(mdef), pvm.descriptor, v),
               () => pvm.value,
               v => pvm.value = v,
               pvm.subscribe_value(),
@@ -4,14 +4,14 @@ using OffsetDefi = bts.api.orderman.OffsetOrderDefinitionImmutable;
 namespace mbts.spark {
   static partial class OrderTypeVMFactory {
      class OffsetOrderVM : OrderTypeVMBase<OffsetDef, OffsetDefi> {
-         readonly Property<uint?> _tick_offset_on_deploy;
+         readonly Property<int?> _tick_offset_on_deploy;

         public OffsetOrderVM(AlgoKey key, string display_name, AlgoEditingPermissions editing_permissions)
            : base(key, display_name, editing_permissions) {
-            _tick_offset_on_deploy = add_nullable_property(nameof(tick_offset_on_deploy), OffsetDef.TickOffsetOnDeployFieldNumber, 0u);
+            _tick_offset_on_deploy = add_nullable_property(nameof(tick_offset_on_deploy), OffsetDef.TickOffsetOnDeployFieldNumber, 0);
         }

-         public uint? tick_offset_on_deploy { get => _tick_offset_on_deploy.Value; set => _tick_offset_on_deploy.set(value); }
+         public int? tick_offset_on_deploy { get => _tick_offset_on_deploy.Value; set => _tick_offset_on_deploy.set(value); }
      }
   }
 }
@@ -9,7 +9,6 @@
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
    <Configurations>Debug;Release</Configurations>
    <Platforms>x64</Platforms>
-    <RuntimeIdentifiers>win7-x64</RuntimeIdentifiers>
    <PlatformTarget>AnyCPU</PlatformTarget>
    <LanguageTargets>$(MSBuildExtensionsPath)\$(VisualStudioVersion)\Bin\Microsoft.CSharp.targets</LanguageTargets>
    <ApplicationIcon>logo.ico</ApplicationIcon>
@@ -19,7 +18,8 @@
    <LangVersion>7.2</LangVersion>
    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
    <WarningsAsErrors />
-    <Version>1.0.0</Version>
+    <Version>$(major).$(minor).$(patch)</Version>
+    <Version Condition="'$(version)'=='..'">1.0.0</Version>
  </PropertyGroup>
  <ItemGroup>
    <ProjectReference Include="../spark_api/spark_api.csproj" />
@@ -35,7 +35,7 @@
    <PackageReference Include="Google.Protobuf" Version="3.6.1" />
    <PackageReference Include="IronPython" Version="2.7.7" />
    <PackageReference Include="NAudio" Version="1.8.4" />
-    <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
    <PackageReference Include="NUnit" Version="3.10.1" />
    <PackageReference Include="NUnit3TestAdapter" Version="3.8.0" />
@@ -691,7 +691,7 @@
            <TextBlock VerticalAlignment="Center" >Tick Offset</TextBlock>
            <c:HelpButton Margin="{StaticResource Margin.LP1}" ToolTip="How many ticks off the inside market to deploy the order, this guards against crossing the market inadventently" />
          </StackPanel>
-          <c:TickUpDownUInt x:Name="PART_TickOffsetOnDeploy_TickUpDownUInt" Grid.Column="2" Value="{Binding tick_offset_on_deploy}"/>
+          <c:TickUpDownInt x:Name="PART_TickOffsetOnDeploy_TickUpDownUInt" Grid.Column="2" Value="{Binding tick_offset_on_deploy}"/>
          <uag:AlgoPickerNodeView
            x:Name="PART_Child_AlgoPickerNodeView"
            Grid.Row="2"
@@ -64,6 +64,25 @@ namespace mbts.ui {
            }
         }, can_execute == null ? null : new Func<object, bool>(_ => can_execute()));

+      public static IDialogCommand export_csv(
+         Func<string> get_file_content,
+         string source_window_name) =>
+         new AnonymousFileDialogCommand<object>(_ =>
+            _create_save_file_dialog(
+               Environment.GetFolderPath(Environment.SpecialFolder.Desktop),
+               $"BTS_Spark_{source_window_name}_{DateTime.Now.ToString("yyyyMMdd_HHmm")}.csv",
+               new[] { ("CSV (comma delimited)", new string[] { "csv" }) }
+            ),
+            (_, file) => {
+               try {
+                  File.WriteAllText(file, get_file_content.Invoke());
+               } catch (Exception ex) {
+                  BTSMessageBox.Show($"Error exporting data to csv: {ex}.", "CSV Export Error", BTSMessageBoxButtons.OK, System.Windows.MessageBoxImage.Error, true, false, true);
+               }
+            },
+            // we are always able to perform an export, even when no rows (it will just be a header)
+            (_) => true);
+
      static TDialog _create_file_dialog<TDialog>(string initial_dir = null, IReadOnlyList<(string name, string[] extensions)> filter_items = null) where TDialog : FileDialog, new() {
         var rv = new TDialog();
         if (!string.IsNullOrEmpty(initial_dir))
@@ -292,7 +292,9 @@ namespace mbts.spark {
            int count = 0;
            double factored_base = log10_diff > 0 ? reduced_target_base * Math.Pow(10, Math.Ceiling(log10_diff)) : reduced_target_base;
            do {
-               if (factored_base % raw_base == 0)
+               // Note that the modulus operator is not used here due to rounding errors.
+               // Such a rounding errror was the cause of the bug https://bluetradesys.atlassian.net/browse/SP-283.
+               if (MathUtils.is_int(factored_base / raw_base))
                  return new TickFactors(factored_base, factored_base / raw_base);
               factored_base *= 10;
            } while (++count < 10);
@@ -4,6 +4,8 @@ using System.Runtime.InteropServices;
 using System.Security;
 using Google.Protobuf;
 using security_key = System.UInt32;
+using bts.co2;
+using System.Linq;

 namespace mbts.co2
 {
@@ -85,6 +87,7 @@ namespace mbts.co2

      [DllImport("libspark")]
      internal unsafe static extern void post_on_scan_security_thread(Action callback);
+      
   }

   internal static class Co2NativeTestMethods
@@ -133,5 +136,59 @@ namespace mbts.co2
      [DllImport("libspark")]
      internal static extern void co2_test_get_constants(out ulong max_depth, out ulong max_implied_depth, out sbyte nan_exponent);

+      internal unsafe delegate void raw_receive_pb_or_string(byte* buffer, int buffer_size);
+      [DllImport("libspark")]
+      private static unsafe extern void raw_co2_compute_synthetic_book(
+         byte[] security_buffer,
+         int security_length,
+         IntPtr[] leg_books,
+         int[] leg_lengths,
+         int leg_books_length,
+         raw_receive_pb_or_string callback);
+
+      internal static unsafe BookMessageImmutable co2_compute_synthetic_book(SecurityImmutable synthetic, params BookMessageImmutable[] books) {
+         BookMessage result = null;
+         string error = null;
+
+         var security_buffer = synthetic.ToByteArray();
+         // var h = GCHandle.Alloc(null, GCHandleType.Pinned).
+         var book_buffers = 
+            books
+            .Select(b => b.ToByteArray())
+            .ToArray();
+         GCHandle[] book_buffer_handles = 
+            book_buffers
+            .Select(b => GCHandle.Alloc(b,GCHandleType.Pinned))
+            .ToArray();
+         IntPtr[] book_buffer_pointers = 
+            book_buffer_handles
+            .Select(h => h.AddrOfPinnedObject())
+            .ToArray();
+         var lengths = 
+            book_buffers
+            .Select(b => b.Length)
+            .ToArray();
+
+         raw_co2_compute_synthetic_book(
+            security_buffer,
+            security_buffer.Length,
+            book_buffer_pointers,
+            lengths,
+            book_buffers.Length,
+            (byte* buffer, int length) => {
+               if (length < 0) {
+                  error =  new string((char*)buffer,0,-1 * length);
+               }
+               else {
+                  result = Co2NativeMethods.deserialize<BookMessage>(buffer, (ulong)length);
+               }
+            });
+
+         if(error != null) {
+            // C# style multiple return values
+            throw new Exception(error);
+         }
+         return new BookMessageImmutable(result);
+      }
   }
 }
@@ -52,7 +52,49 @@ namespace mbts.co2 {
         return _mantissa.GetHashCode();
      }

+      public static IntPrice from_double(double price, sbyte precision) {
+         if (double.IsNaN(price)) return NaN;
+         if (Math.Abs(price%1) != 0) {
+            double rounding = 0.5 * Math.Pow(10,-precision);
+            price += (price > 0) ? rounding : -rounding;
+            price *= Math.Pow(10,precision);
+            return new IntPrice((long)price, (sbyte)-precision);
+         }
+         return new IntPrice((long)price, 0);
+      }
+
      public static IntPrice NaN = new IntPrice(0,127);
+
+      static double[] powers_10 = {
+  1E-20, 1E-19, 1E-18, 1E-17, 1E-16, 1E-15, 1E-14, 1E-13, 1E-12, 1E-11, 1E-10, 1E-9, 1E-8, 1E-7, 1E-6, 1E-5, 1E-4, 1E-3, 1E-2, 1E-1,
+  1E0,
+  1E1, 1E2, 1E3, 1E4, 1E5, 1E6, 1E7, 1E8, 1E9, 1E10, 1E11, 1E12, 1E13, 1E14, 1E15, 1E16, 1E17, 1E18, 1E19, 1E20};
+      static int max_abs_power_10 = powers_10.Length / 2;
+      static double pow10(int power)
+      {
+         int offset = power + max_abs_power_10;
+         int powers_10_sz = powers_10.Length;
+         bts.Log.assert(offset >= 0 && offset < powers_10_sz);
+         if (offset >= 0 && offset < powers_10_sz)
+         {
+            return powers_10[offset];
+         }
+         return double.NaN;
+      }      
+      
+      public static IntPrice from_double(double price, int precision = 9)
+      {
+         if (Double.IsNaN(price)) 
+            return NaN;
+         if (Math.Abs(price - Math.Truncate(price)) != 0.0)
+         {
+            double rounding = 0.5 * pow10(-precision);
+            price += (price > 0.0) ? rounding : -rounding;
+            price *= pow10(precision);
+            return new IntPrice((long)price, Convert.ToSByte(-precision));
+         }
+         return new IntPrice((long)price, 0);
+      }
   }
   
 }
@@ -1,4 +1,6 @@
 using bts;
+using System.Collections.Generic;
+using System.Linq;

 namespace mbts.co2 {
   public static class NativePriceHelpers {
@@ -38,6 +40,60 @@ namespace mbts.co2 {
      public const uint COCONUT_MAX_DEPTH = 10;
      public const uint COCONUT_MAX_IMPLIED_DEPTH = 2;
      internal const sbyte COCONUT_NAN_EXPONENT = 127;
+
+      public static double side_at(this bts.co2.BookMessage book, bts.api.Side side, int level)
+      {
+         if(side == bts.api.Side.Buy)
+            return bid_at(book, level);
+         else
+            return ask_at(book, level);
+      }
+      public static uint sidesize_at(this bts.co2.BookMessage book, bts.api.Side side, int level)
+      {
+         if (side == bts.api.Side.Buy)
+            return bidsize_at(book, level);
+         else
+            return asksize_at(book, level);
+      }
+      public static double bid_at(this bts.co2.BookMessage book, int level)
+      {
+         var lev = book.Bids[level];
+         return NativePriceHelpers.to_double(lev.Mantissa, (sbyte)lev.Exponent);
+      }
+      public static double ask_at(this bts.co2.BookMessage book, int level)
+      {
+         var lev = book.Asks[level];
+         return NativePriceHelpers.to_double(lev.Mantissa, (sbyte)lev.Exponent);
+      }
+      public static uint bidsize_at(this bts.co2.BookMessage book, int level)
+      {
+         var lev = book.Bids[level];
+         return lev.Size;
+      }
+      public static uint asksize_at(this bts.co2.BookMessage book, int level)
+      {
+         var lev = book.Asks[level];
+         return lev.Size;
+      }
+      public static double price(this bts.co2.PriceSizeMessage p)
+      {
+         return NativePriceHelpers.to_double(p.Mantissa, (sbyte)p.Exponent);
+      }
+      public static double price(this bts.co2.TradeMessage p)
+      {
+         return NativePriceHelpers.to_double(p.Mantissa, (sbyte)p.Exponent);
+      }      
+
+      public static IList<double> all_bids(this bts.co2.BookMessage book)
+      {
+         var lev = book.Bids.Select(x => NativePriceHelpers.to_double(x.Mantissa, (sbyte)x.Exponent)).ToList();
+         return lev;
+      }
+      public static IList<double> all_asks(this bts.co2.BookMessage book)
+      {
+         var lev = book.Asks.Select(x => NativePriceHelpers.to_double(x.Mantissa, (sbyte)x.Exponent)).ToList();
+         return lev;
+      }      
   }
   
 }
@@ -3,4 +3,6 @@ using System.Runtime.CompilerServices;
 [assembly: InternalsVisibleTo("spark_core")]
 [assembly: InternalsVisibleTo("sparkcmd")]
 [assembly: InternalsVisibleTo("spark_test")]
+[assembly: InternalsVisibleTo("spark_fix")]
+[assembly: InternalsVisibleTo("spark_historical")]

@@ -0,0 +1,20 @@
+namespace bts.api
+{
+   //keep in sync with apioptions.proto
+   public static partial class ApioptionsReflection
+   {
+      public enum MessageOptions
+      {
+         fix_algostrategy_tagbase = 8506,
+      }
+      public enum FieldOptions
+      {
+         fix_tag = 8507,
+         fix_tag_is_header = 8509,
+      }
+      public enum EnumValueOptions
+      {
+         fix_value = 8508,
+      }
+   }
+}
@@ -0,0 +1,147 @@
+using System;
+using System.Collections.Generic;
+using Google.Protobuf;
+using Google.Protobuf.Collections;
+using Google.Protobuf.WellKnownTypes;
+using mbts.co2;
+
+namespace bts.history
+{
+   public interface IHasMsgSeqNum 
+   {
+      uint MsgSeqNum { get; }
+   }
+   
+   public interface IHasDateTimeStamp 
+   {
+      DateTime trade_date { get; set;}
+      DateTime sending_time { get; set;}
+      DateTime transact_time { get; set; }      
+   }
+
+   public interface IHasTimestamp 
+   {
+      Timestamp SendingTime { get; set; }
+      Timestamp TransactTime { get; set; }
+   }
+
+   public interface IHasMdPacket
+   {
+      MarketDataIncrementalRefresh Md{ get; }
+   }
+
+   public interface IHasMdEntry
+   {
+      MDEntry MdEntry { get; }
+      int EntryIndex { get; }
+   }
+   
+   public interface IHasTopBook : IHasMdEntry, IHasMdPacket
+   {
+      co2.TopBookMessage TopBook { get; set; }
+   }
+
+   public interface IHasBook : IHasMdEntry, IHasMdPacket
+   {
+      co2.BookMessage Book { get; set; }
+   }
+
+   public interface IHasTrade : IHasMdEntry, IHasMdPacket
+   {
+      co2.TradeMessage Trade { get; set; }      
+   }   
+
+   public interface IHasMBO : IHasMdPacket
+   {
+      RepeatedField<OrderIDEntry> Orders { get;  }
+   }
+   
+   public sealed partial class HistoryRow : IHasTopBook, IHasMBO, IHasTrade, IHasBook, IHasDateTimeStamp, IHasTimestamp, IHasMsgSeqNum
+   {
+      public DateTime trade_date { get { return DateTime.SpecifyKind(this.TradeDate.ToDateTime(), DateTimeKind.Utc); } 
+                                   set { this.TradeDate = Timestamp.FromDateTime(value); } }
+      public DateTime sending_time { get { return DateTime.SpecifyKind(this.SendingTime.ToDateTime(), DateTimeKind.Utc); } 
+                                     set { this.SendingTime = Timestamp.FromDateTime(value); } }
+      public DateTime transact_time { get { return DateTime.SpecifyKind(this.TransactTime.ToDateTime(), DateTimeKind.Utc); } 
+                                      set { this.TransactTime = Timestamp.FromDateTime(value); } }
+      
+      public HistoryRow add_orders(IEnumerable<OrderIDEntry> orderentries)
+      {
+         this.Orders.AddRange(orderentries);
+         return this;
+      }                                         
+   }
+   
+   public interface IMBOMessage
+   {
+      MDUpdateAction OrderUpdateAction {get;}
+      ulong OrderId {get;}
+      uint SecurityId {get;}
+      string SecurityDesc {get;}
+      ulong MdOrderPriority {get;}
+      double MdEntryPx {get;}
+      uint MdPriceLevel {get;}
+      ulong MdDisplayQty {get;}
+      uint LastQty {get;}
+      MDEntryType MdEntryType {get;}
+      uint ReferenceId {get;}      
+   }
+   
+   public sealed partial class MBOMessage : IMBOMessage
+   {
+      public MDUpdateAction OrderUpdateAction => OrderEntry != null ? OrderEntry.OrderUpdateAction : MdEntry.MdUpdateAction;
+      public ulong OrderId  => OrderEntry != null ? OrderEntry.OrderId : MdEntry.OrderId;
+      public uint SecurityId => MdEntry.SecurityId;
+      public string SecurityDesc => MdEntry.Symbol;
+      public ulong MdOrderPriority => OrderEntry != null ? OrderEntry.MdOrderPriority : MdEntry.MdOrderPriority;
+      public double MdEntryPx => MdEntry.MdEntryPx;
+      public uint MdPriceLevel => MdEntry.MdPriceLevel;
+      public ulong MdDisplayQty => OrderEntry != null ? OrderEntry.MdDisplayQty : MdEntry.MdDisplayQty;
+      public uint LastQty => OrderEntry != null ? OrderEntry.LastQty : MdEntry.LastQty;
+      public MDEntryType MdEntryType => MdEntry.MdEntryType;
+      public uint ReferenceId => OrderEntry != null ? OrderEntry.ReferenceId : MdEntry.ReferenceId;
+      public uint NumberOfOrders => MdEntry.NumberOfOrders;
+   }
+
+   public sealed partial class MarketDataIncrementalRefresh
+   {
+      public MarketDataIncrementalRefresh add_entries(IEnumerable<MDEntry> mdentries, IEnumerable<OrderIDEntry> orderentries)
+      {
+         this.MdEntries.AddRange(mdentries);
+         this.OrderIdEntries.AddRange(orderentries);
+         return this;
+      }
+   }
+   public interface ITradeDetail
+   {
+      ulong OrderId { get; set; }
+      uint LastQty { get; set; }
+      ITradeDetail clone();
+   }
+
+   public sealed partial class OrderIDEntry : ITradeDetail
+   {
+      ITradeDetail ITradeDetail.clone()
+      {
+         return this.Clone();
+      }
+   }
+}
+
+namespace bts.co2
+{
+   public sealed partial class BookMessage
+   {
+      public BookMessage add_bids_and_asks(IEnumerable<PriceSizeMessage> bids, IEnumerable<PriceSizeMessage> asks)
+      {
+         this.Bids.AddRange(bids);
+         this.Asks.AddRange(asks);
+         return this;
+      }
+   }
+   
+   public sealed partial class TradeMessage 
+   {
+      public double price => NativePriceHelpers.to_double(this.Mantissa, (sbyte)this.Exponent);
+   }     
+}
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using static bts.api.Security;

 namespace bts.api {
-   struct FutureLeg {
+   public struct FutureLeg {
      public readonly Venue exchange;
      public readonly string symbol, exchange_desc;
      public readonly FutureContractImmutable future;
@@ -4,7 +4,7 @@ using System.Linq;
 using static bts.api.Security;

 namespace bts.api {
-   internal static class SecurityHelper {
+   public static class SecurityHelper {
      public static IEnumerable<FutureLeg> get_flat_future_legs(SecurityImmutable sec) {
         switch (sec.ContractCase) {
            case ContractOneofCase.Spread: return _get_flat_future_legs(sec.Spread.Legs, 1);
@@ -63,6 +63,8 @@ namespace bts.api {
            return security.Glbx.SecurityDesc;
         else if(security.HasIce)
            return security.Ice.SecurityDesc;
+         else if(security.HasSynthetic)
+            return security.Synthetic.Name;
         else
         {
            Log.assert(false, "security_desc not implemented for exchange");
@@ -3,17 +3,19 @@
    <TargetFrameworks>netstandard2.0</TargetFrameworks>
    <Authors>Blue Trading Systems</Authors>
    <Company>Blue Trading Systems</Company>
-    <Product>Spark</Product>
    <Description />
+    <PackageId>Spark_API</PackageId>
+    <Product>Spark</Product>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
    <Platforms>x64</Platforms>
    <PlatformTarget>AnyCPU</PlatformTarget>
    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
    <WarningsAsErrors />
-    <Version>1.0.0</Version>
+    <Version>$(major).$(minor).$(patch)</Version>
+    <Version Condition="'$(version)'=='..'">0.0.0</Version>
    <LangVersion>7.2</LangVersion>
  </PropertyGroup>
-  
+
  <ItemGroup>
    <PackageReference Include="Google.Protobuf" Version="3.6.1" />
    <PackageReference Include="System.Collections.Immutable" Version="1.5.0" />
@@ -24,12 +26,10 @@
    <Proto3 Include="**/*.proto" />
    <Proto3 Include="../../lib/api/*.proto" />
    <Proto3 Include="../../lib/api/services/*.proto" />
-    <!--Proto3 Remove="../../lib/api/services/MarketDataRelay.proto" /-->
    <Proto3 Include="../../lib/md/protos/Co2.proto" />
    <Proto3 Include="../../lib/domain_model/Security.proto" />
    <Proto3 Include="../../lib/sparkproto/SparkProtos.proto" />
    <Proto3 Update="../../lib/api/services/OutOfProcessURLListener.proto">
-      <!-- <CompileOptions>internal_access:</CompileOptions> -->
    </Proto3>
  </ItemGroup>
 </Project>
@@ -36,6 +36,7 @@ namespace bts {
      Plugin,
      Sdk,
      Http,
+      Fix
      // Please keep this list in sync with logging.h/logging.cpp
   }
   
@@ -102,9 +103,10 @@ namespace bts {
      internal static Logger Assert => new Logger(Subsystem.Assert);
      internal static Logger Ui => new Logger(Subsystem.Ui);
      internal static Logger Testing => new Logger(Subsystem.Testing);
-      internal static Logger DataFlow => new Logger(Subsystem.DataFlow);
+      internal static Logger DataFlow => new Logger(Subsystem.DataFlow);      
      public static Logger Sdk => new Logger(Subsystem.Sdk);
      public static Logger Http => new Logger(Subsystem.Http);
+      internal static Logger FIX => new Logger(Subsystem.Fix);

      internal static void log_at(this Logger logger, Level level, string message) {
         switch (level) {
@@ -0,0 +1,10 @@
+using Google.Protobuf;
+namespace bts.api {
+
+   public sealed partial class Product : ICustomDiagnosticMessage {
+      public string ToDiagnosticString() {
+         return $"{this.Symbol}:{this.Type}:{this.Exchange}";
+      }
+   }
+
+}
@@ -0,0 +1,70 @@
+using System;
+using System.Collections.Generic;
+using Google.Protobuf.WellKnownTypes;
+
+namespace bts.api
+{
+   public static class TimestampExtensions
+   {
+      public static Timestamp add_nanos(this Timestamp lhs, int nanos)
+      {
+         var c = new Timestamp(lhs);
+         c.Nanos += nanos;
+         return c;
+      }
+      public static bool less(this Timestamp lhs, Timestamp rhs)
+      {
+         return lhs.compare(rhs) < 0;
+      }
+      public static bool less_or_equal(this Timestamp lhs, Timestamp rhs)
+      {
+         return lhs.compare(rhs) <= 0;
+      }
+      public static bool greater(this Timestamp lhs, Timestamp rhs)
+      {
+         return lhs.compare(rhs) > 0;
+      }
+      public static bool greater_or_equal(this Timestamp lhs, Timestamp rhs)
+      {
+         return lhs.compare(rhs) >= 0;
+      }
+      public static int compare(this Timestamp lhs, Timestamp rhs)
+      {
+         int secdiff = lhs.Seconds.CompareTo(rhs.Seconds);
+         return (secdiff != 0) ? secdiff : (lhs.Nanos.CompareTo(rhs.Nanos));
+      }
+      public static Comparer<Timestamp> timestamp_comparer => Comparer<Timestamp>.Create((x, y) => x.compare(y));
+
+      public static Timestamp parse_timestamp(string data)
+      {
+         DateTime dt = new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc);
+         try
+         {
+            if (data.Length <= 8)
+            {
+               dt = DateTime.ParseExact(data, "yyyyMMdd", System.Globalization.CultureInfo.InvariantCulture);
+            }
+            else
+            {
+               int sep = 14;
+               var yyMMddhhmmss = data.Substring(0, sep);
+               dt = DateTime.ParseExact(yyMMddhhmmss, "yyyyMMddHHmmss", System.Globalization.CultureInfo.InvariantCulture);
+               var nnanos = data.Substring(sep, data.Length - sep);
+               long nano = long.Parse(nnanos);
+               dt = dt.AddTicks(nano / 100);
+            }
+         }
+         catch (Exception _)
+         {
+            System.Diagnostics.Debug.Assert(_ != null); //UNUSED(_)
+         }
+         dt = DateTime.SpecifyKind(dt, DateTimeKind.Utc);
+         var ts = Google.Protobuf.WellKnownTypes.Timestamp.FromDateTime(dt);
+         return ts;
+      }
+      public static string to_fix_string(this Timestamp ts)
+      {
+         return ts.ToDateTime().ToString("yyyyMMdd-HH:mm:ss.fff");
+      }
+   }
+}
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using System.Text.RegularExpressions;
+
+namespace bts.api
+{
+   public class TypeUtils
+   {
+      static public List<Type> find_all_types_in_all_assemblies(string type, string assembly_regex = null)
+      {
+         List<Type> res = new List<Type>();
+         var asses = AppDomain.CurrentDomain.GetAssemblies();
+         foreach (Assembly a in asses)
+         {
+            if (!string.IsNullOrEmpty(assembly_regex))
+            {
+               if (!Regex.Match(a.GetName().Name, assembly_regex).Success)
+                  continue;
+            }
+            Type t = a.GetType(type, false, true);
+            if (t != null)
+               res.Add(t);
+         }
+         return res;
+      }
+   }   
+}
@@ -2,4 +2,5 @@ using System.Runtime.CompilerServices;
 [assembly: InternalsVisibleTo("spark")]
 [assembly: InternalsVisibleTo("sparkcmd")]
 [assembly: InternalsVisibleTo("spark_test")]
+[assembly: InternalsVisibleTo("spark_historical")]

@@ -0,0 +1,64 @@
+using bts;
+using bts.api.admin;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace bts.api.core
+{
+   public class AdminModelWrapper
+   {
+      readonly AdminDataImmutable? _admin_data;
+      public AdminDataImmutable? admin_data => _admin_data;
+      readonly string _user_name;
+      readonly List<BTSAccountImmutable> _allowed_accounts;
+      readonly Dictionary<string, string> _allowed_account_dict = new Dictionary<string, string>();
+      public AdminModelWrapper(AdminDataImmutable? admin_data = null, string user_name = null)
+      {
+         _admin_data = admin_data;
+         _user_name = user_name ?? string.Empty;
+         _allowed_accounts = search_admin(u => u.Name == _user_name).Where(x =>
+         {
+              return (x.Item2 != null && x.Item2.HasPermissions) || (x.Item3 != null && x.Item3.HasPermissions);
+         }).Select(xx => xx.Item1).ToList();
+         foreach (var val in _allowed_accounts)
+            _allowed_account_dict[val.Name] = val.Name;
+      }
+      public IEnumerable<BTSAccountImmutable> viewable_accounts()
+      {
+         return _allowed_accounts;
+      }
+      public bool can_view_account(string account)
+      {
+         return _allowed_account_dict.ContainsKey(account) || _user_name.ToLower().Equals("bts");
+      }
+
+      IEnumerable<Tuple<BTSAccountImmutable, TradingPermissionUnit, AdminPermissionUnit>> 
+         search_admin(Func<BTSUserImmutable, bool> predicate)
+      {
+         var rv = new List<Tuple<BTSAccountImmutable, TradingPermissionUnit, AdminPermissionUnit>>();
+         if (_admin_data.HasValue)
+         {
+            var users = _admin_data.Value.Users.Where(predicate);
+            if (users != null && users.Count() == 1)
+            {
+               var user = users.ElementAt(0);
+               if (user.HasUserData && user.UserData.HasAccountPermissions)
+               {
+                  foreach (var kv in user.UserData.AccountPermissions.AccountPermissions)
+                  {
+                     var account_id = kv.Key;
+                     var accounts = _admin_data.Value.Accounts.Where(a => a.Id == account_id);
+                     if (accounts != null && accounts.Count() == 1)
+                     {
+                        var account = accounts.ElementAt(0);
+                        rv.Add(Tuple.Create(account, kv.Value.TradingPermission, kv.Value.AdminPermission));
+                     }
+                  }
+               }
+            }
+         }
+         return rv;
+      }
+   }
+}
@@ -0,0 +1,64 @@
+using bts;
+using bts.api;
+using bts.api.core;
+using bts.api.orderman;
+using bts.api.position;
+using bts.spark;
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Collections.Specialized;
+using System.Linq;
+using System.Reactive.Concurrency;
+using System.Reactive.Linq;
+
+namespace bts.api.core
+{
+   public static class PermissionFilters
+   {
+      public static IObservable<Update<PositionUnitImmutable, int>> 
+         PermissionFilter(this IObservable<Update<PositionUnitImmutable, int>> source, IObservable<AdminModelWrapper> am)
+      {
+         var pred = Observable.Create<Func<PositionUnitImmutable, bool>>(observer =>
+         {
+            return am.Subscribe(x =>
+            {
+               Func<PositionUnitImmutable, bool> filter = (z => x.can_view_account(z.Account));
+               observer.OnNext(filter);
+            });
+         });
+
+         return source.Filter(pred);
+      }
+
+      public static IObservable<Update<OrderRecordImmutable, uint>> 
+         PermissionFilter(this IObservable<Update<OrderRecordImmutable, uint>> source, IObservable<AdminModelWrapper> am)
+      {
+         var pred = Observable.Create<Func<OrderRecordImmutable, bool>>(observer =>
+        {
+           return am.Subscribe(x =>
+           {
+               Func<OrderRecordImmutable, bool> filter = (z => x.can_view_account(z.Def.Account ?? string.Empty));
+               observer.OnNext(filter);
+           });
+        });
+
+         return source.Filter(pred);
+      }
+
+      public static IObservable<Update<FillImmutable, string>> 
+         PermissionFilter(this IObservable<Update<FillImmutable, string>> source, IObservable<AdminModelWrapper> am)
+      {
+         var pred = Observable.Create<Func<FillImmutable, bool>>(observer =>
+        {
+           return am.Subscribe(x =>
+           {
+               Func<FillImmutable, bool> filter = (z => x.can_view_account(z.Account));
+               observer.OnNext(filter);
+           });
+        });
+
+         return source.Filter(pred);
+      }
+   }
+}
@@ -7,7 +7,8 @@
    <PlatformTarget>AnyCPU</PlatformTarget>
    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
    <WarningsAsErrors />
-    <Version>1.0.0</Version>
+    <Version>$(major).$(minor).$(patch)</Version>
+    <Version Condition="'$(version)'=='..'">0.0.0</Version>
    <LangVersion>7.2</LangVersion>
  </PropertyGroup>

@@ -0,0 +1,52 @@
+using System;
+using System.IO;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.Linq;
+using System.Reflection;
+
+namespace bts.utils.csv {
+   public static class CsvHelper {
+
+      public static string ToCsv<T>(this IEnumerable<T> items, OrderedDictionary properties = null) where T : class {
+         var output = "";
+         var delimiter = ",";
+         if (properties == null) {
+            properties = new OrderedDictionary();
+            foreach (var pi in typeof(T).GetProperties()) {
+               properties.Add(pi.Name, pi);
+            }
+         }
+
+         using (var sw = new StringWriter()) {
+            var dict_values = properties.Values.OfType<PropertyInfo>();
+            var header = dict_values.Select(n => n.Name).Aggregate((first, second) => first + delimiter + second);
+            sw.WriteLine(header);
+            foreach (var i in items) {
+               var row = dict_values.Select(x => x.GetValue(i, null))
+                  .Select(x => x == null ? "null" : x.ToString())
+                  .Aggregate((first, second) => first + delimiter + second);
+               sw.WriteLine(row);
+            }
+            output = sw.ToString();
+         }
+         return output;
+      }
+
+      public static OrderedDictionary create_ordering_maintainer(Type t, string[] property_names_in_order) {
+         OrderedDictionary od = new OrderedDictionary();
+         var props = t.GetProperties();
+         foreach (var n in property_names_in_order) {
+            var query = props.Where(pi => pi.Name == n);
+            if (query.Any()) {
+               var property_info = query.First();
+               if (!od.Contains(property_info)) {
+                  od.Add(n, property_info);
+               }
+            }
+         }
+         return od;
+      }
+
+   }
+}
@@ -66,7 +66,6 @@ namespace mbts {
            }
         }
      }
-
      public static void sync_with_models<T, TModel>(this IList<T> target, IEnumerable<TModel> models, Func<TModel, T> add_factory, Func<T, TModel, T> update_factory) {
         var model_list = models as IList<TModel> ?? models.ToList();
         if (model_list.Count == 0) {
@@ -66,9 +66,23 @@ namespace bts.excel.rtd
         if (string.IsNullOrEmpty(contract))
            return Observable.Return(new []{"Can't Parse Contract: " + contract ?? string.Empty});

-         Func<SecurityImmutable, bool> where = (x => x.Exchange == ven && x.Symbol == symbol && x.security_type() == sectype &&
-                                                x.Glbx.SecurityDesc == contract);
+         Func<SecurityImmutable, bool> desc = null;
+         switch(ven)
+         {
+            case Venue.Sim:
+            case Venue.Glbx:
+               desc = (x=> x.Glbx.SecurityDesc == contract);
+            break;
+            case Venue.Ice:
+               desc = (x=> x.Ice.SecurityDesc == contract);
+               break;
+            default:
+               desc = (x => true);
+            break;
+         }

+         Func<SecurityImmutable, bool> where = (x => x.Exchange == ven && x.Symbol == symbol && x.security_type() == sectype && desc(x) );
+                                                
         var stream = market_data(ven).subscribe_combined(where);
         return stream;
      }      
@@ -17,7 +17,8 @@
    <PlatformTarget>AnyCPU</PlatformTarget>
    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
    <WarningsAsErrors />
-    <Version>1.0.0</Version>
+    <Version>$(major).$(minor).$(patch)</Version>
+    <Version Condition="'$(version)'=='..'">1.0.0</Version>
  </PropertyGroup>
  
  <ItemGroup>
@@ -25,7 +26,7 @@
    <PackageReference Include="System.Reactive" Version="3.1.1" />
    <PackageReference Include="System.Reactive.PlatformServices" Version="3.1.1" />
 	 <PackageReference Include="NUnit" Version="3.10.1" />  
-    <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
    <PackageReference Include="System.Linq.Dynamic" Version="1.0.7" />
    
    <PackageReference Include="ExcelDna.AddIn" Version="0.34.6" />  
@@ -90,7 +90,14 @@ namespace bts.excel
            {
               if(string.IsNullOrEmpty(json))
                  json = "{}";
-               request = JsonParser.Default.Parse(json, desc);
+               try
+               {
+                  request = JsonParser.Default.Parse(json, desc);
+               }
+               catch(InvalidProtocolBufferException)
+               {
+                  request = (IMessage) Newtonsoft.Json.JsonConvert.DeserializeObject(json, desc.ClrType);
+               }
            }
         }
         return request;
@@ -25,7 +25,68 @@ namespace bts.excel
         else if (!string.IsNullOrEmpty(key1))
            val = jo[key1];
         return val.ToString();
-      }      
+      }
+      
+      static Google.Protobuf.JsonFormatter _formatter = 
+         new Google.Protobuf.JsonFormatter(new Google.Protobuf.JsonFormatter.Settings(true));
+      [ExcelFunction]
+      public static object bts_json_create(string type)
+      {         
+         System.Type t = find_full_type_in_all_assemblies(type);
+         object obj = Activator.CreateInstance(t);
+         foreach(var pr in t.GetProperties())
+         {
+            object val = null;
+            try
+            {
+               val = Activator.CreateInstance(pr.PropertyType);
+            }
+            catch {}
+            try
+            {
+               pr.SetValue(obj, val);
+            }
+            catch {}
+         }
+         string s = "{}";         
+         if(obj is Google.Protobuf.IMessage imsg)
+            s = _formatter.Format(imsg);
+         else
+            s = JsonConvert.SerializeObject(obj, Formatting.Indented);
+         return s;
+      }
+      [ExcelFunction]
+      public static object bts_json_fill(string root, string key, string value)
+      {
+         var jo = JObject.Parse(root);
+         jo[key] = value;
+         var s = jo.ToString();
+         return s;
+      }
+
+      [ExcelFunction]
+      public static object bts_date_to_json(object dt, bool is_duration = false)
+      {
+         string s = "{}";
+         if(is_duration)
+         {
+            var span = TimeSpan.FromDays((double)dt);
+            var ts = Google.Protobuf.WellKnownTypes.Duration.FromTimeSpan(span);
+            s = JsonConvert.SerializeObject(ts, Formatting.None);
+            s = _formatter.Format(ts);
+            s = s.Replace(@"""", "");
+         }
+         else
+         {
+            var dd = DateTime.FromOADate((double)dt);
+            var utc = DateTime.SpecifyKind(dd, DateTimeKind.Utc);
+            var ts = Google.Protobuf.WellKnownTypes.Timestamp.FromDateTime(utc);
+            s = JsonConvert.SerializeObject(ts, Formatting.None);
+            s = _formatter.Format(ts);
+            s = s.Replace(@"""", "");
+         }
+         return s;
+      }

      public static bool parse_venue(string exch, out Venue ven)
      {
@@ -0,0 +1,61 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+using QuickFix;
+using QuickFix.Fields;
+
+namespace bts.fix
+{
+   public class FixInit
+   {
+      static FixInit()
+      {
+         AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;
+      }
+
+      static void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e)
+      {
+         var exception = e.ExceptionObject as Exception;
+         Log.FIX.error($"Unhandled Exception: {e.ExceptionObject} {exception?.StackTrace}");
+         if (e.IsTerminating)
+         {
+            Log.system_is_crashing("Unhandled exception", e.ExceptionObject);
+         }
+      }
+      
+      public static int start_acceptor(string settings_file, bool orders_allowed, string http_address = null)
+      {
+         SessionSettings settings = new SessionSettings(settings_file);
+         IApplication app = new FixRouter( (th, sess) =>
+         {
+            if(orders_allowed)
+               return new OrderSession(th, sess);
+            else
+               return new DropCopySession(th, sess);
+         });
+         IMessageStoreFactory storeFactory = new FileStoreFactory(settings);
+         ILogFactory logFactory = new FileLogFactory(settings);
+         IAcceptor acceptor = new ThreadedSocketAcceptor(app, storeFactory, settings, logFactory);
+
+         acceptor.Start();
+         HttpServer srv = null;
+         if (!string.IsNullOrEmpty(http_address))
+         {
+            if(!http_address.StartsWith("http"))
+               http_address = "http://127.0.0.1:5080/";
+            srv = new HttpServer(http_address, settings);
+            srv.Start();
+         }
+         Console.WriteLine("press <q> to quit");
+         while (Console.Read() != 'q') { }
+         acceptor.Stop();
+         if(srv != null)
+            srv.Stop();
+         return 0;
+
+      }
+   }
+}
+
@@ -0,0 +1,252 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.Concurrent;
+using System.Linq;
+using System.Reactive.Linq;
+using System.Reactive.Concurrency;
+using System.Text;
+
+using QuickFix;
+using QuickFix.Fields;
+
+using bts.api;
+using bts.api.core;
+using bts.api.orderman;
+using bts.api.user;
+using bts.md;
+using bts.api.admin;
+
+using security_key = System.UInt32;
+using QuickFix.FIX42;
+using Message = QuickFix.Message;
+
+namespace bts.fix
+{
+   interface IFixRouter
+   {
+      IEnumerable<SecurityImmutable> get_securities();
+      SecurityImmutable? lookup(security_key key);
+      SecurityImmutable? lookup(string desc);
+
+      void send(Message mess, SessionID sess);
+      void send_session_reject(SessionID sess, string text, Message refmessage = null);
+      void send_biz_reject(SessionID sess, string text, Message refmessage, int reason_code = 0);
+   }
+
+   class FixRouter : QuickFix.MessageCracker, IFIXSession, IFixRouter
+   {
+      readonly ConcurrentDictionary<SessionID, QuickFix.IApplication> _sessions = new ConcurrentDictionary<SessionID, IApplication>();
+      readonly Func<IFixRouter, SessionID, IApplication> _factory;      
+      readonly object _lock = new object();
+      readonly MarketDataService _md;
+      private readonly IDisposable _security_sub;
+      readonly ConcurrentDictionary<security_key, SecurityImmutable> _id_to_security = new ConcurrentDictionary<security_key, SecurityImmutable>();
+      readonly ConcurrentDictionary<string, SecurityImmutable> _desc_to_security = new ConcurrentDictionary<string, SecurityImmutable>();
+
+      public FixRouter(Func<IFixRouter, SessionID, IApplication> factory)
+      {
+         _factory = factory;
+         using(var service_context = new ServiceContext())
+         {
+            _md = service_context.locate<MarketDataService>();
+            _security_sub = _md.subscribe_securities().Subscribe( x => 
+            {
+               foreach( var sec in x.all)
+               {
+                  var imm = sec.immutable();
+                  _id_to_security[sec.Id] = imm;                  
+                  _desc_to_security[imm.security_desc()] = imm;
+               }
+            });         
+         }
+      }
+
+      IApplication session(SessionID sessionID)
+      {
+         IApplication app;
+         if (!_sessions.TryGetValue(sessionID, out app))
+         {
+            app = _factory(this, sessionID);
+            _sessions[sessionID] = app;
+         }
+         return app;
+      }
+
+      public void send(Message mess, SessionID sess)
+      {
+         lock (_lock)
+         {
+            try
+            {
+               Session.SendToTarget(mess, sess);
+            }
+            catch (SessionNotFound)
+            {
+               Log.assert(false, "session not found " + sess);
+            }
+            catch (Exception ex)
+            {
+               Log.FIX.error(sess.ToString() + " " + ex.Message + " " + sess);
+            }
+         }
+      }
+
+      public void send_session_reject(SessionID sess, string text, Message refmessage = null)
+      {
+         Reject rej = null;
+         if (refmessage != null && refmessage.Header.IsSetField(Tags.MsgSeqNum))
+            rej = new Reject(new QuickFix.Fields.RefSeqNum(refmessage.Header.GetInt(Tags.MsgSeqNum)));
+         else
+            rej = new Reject();
+         rej.Text = new Text(text);
+         send(rej, sess);
+      }
+
+      public void send_biz_reject(SessionID sess, string text, Message refmessage, int reason_code = 0)
+      {
+         BusinessMessageReject rej = new BusinessMessageReject();
+
+         rej.RefMsgType = new QuickFix.Fields.RefMsgType(refmessage.Header.GetString(Tags.MsgType));
+         rej.RefSeqNum = new QuickFix.Fields.RefSeqNum(refmessage.Header.GetInt(Tags.MsgSeqNum));
+         rej.BusinessRejectReason = new QuickFix.Fields.BusinessRejectReason(reason_code);
+         rej.Text = new Text(text);
+         send(rej, sess);
+      }      
+
+      void handle_session_exception(Exception ex, SessionID sessionID, Message message = null)
+      {
+         string msg = "==ERROR in session " + sessionID.ToString() + "== ";
+         msg += message?.GetType().Name ?? string.Empty;
+         msg += ex?.ToString() ?? string.Empty;
+         if(!string.IsNullOrEmpty(ex.StackTrace))
+            msg += Environment.NewLine + ex.StackTrace;
+
+         bts.Log.FIX.error(msg);
+         Console.WriteLine(msg);
+         //now shut this fucker down
+         try
+         {
+            var sess = Session.LookupSession(sessionID);
+            if(sess != null)
+               sess.Disconnect(msg);
+         }
+         catch { }
+      }
+
+      void handle_field_not_found(FieldNotFoundException ex, SessionID sess, Message message)
+      {
+         if(ex.Field > 0)
+            send_biz_reject(sess, $"Field {ex.Field} was expected but not found", message, 5 );
+         //QF does not include the tag number....
+         //throw new FieldNotFoundException($"Field {ex.Field} was expected but not found", ex);
+         else
+            throw ex;
+      }
+
+      public void FromAdmin(Message message, SessionID sessionID)
+      {
+         try
+         {
+            session(sessionID).FromAdmin(message, sessionID);
+         }
+         catch (FieldNotFoundException ex) { handle_field_not_found(ex, sessionID, message); }
+         catch (UnsupportedMessageType) { throw; }
+         catch (IncorrectTagValue) { throw; }
+         catch (Exception ex) { handle_session_exception(ex, sessionID, message); }
+      }
+
+      public void FromApp(Message message, SessionID sessionID)
+      {
+         try
+         {
+            session(sessionID).FromApp(message, sessionID);
+         }
+         catch (FieldNotFoundException ex) { handle_field_not_found(ex, sessionID, message); }
+         catch (UnsupportedMessageType) { throw; }
+         catch (IncorrectTagValue) { throw; }
+         catch (Exception ex) { handle_session_exception(ex, sessionID, message); }
+      }
+
+      public void OnCreate(SessionID sessionID)
+      {
+         try
+         {
+            session(sessionID).OnCreate(sessionID);    
+         }
+         catch (Exception ex)
+         {
+            handle_session_exception(ex, sessionID);
+         }      
+      }
+
+      public void OnLogon(SessionID sessionID)
+      {
+         try
+         {
+            session(sessionID).OnLogon(sessionID);
+         }
+         catch (Exception ex)
+         {
+            handle_session_exception(ex, sessionID);
+         }
+      }
+
+      public void OnLogout(SessionID sessionID)
+      {
+         try
+         {
+            //TODO stackoverflow?
+            session(sessionID).OnLogout(sessionID);
+         }
+         catch (Exception ex)
+         {
+            handle_session_exception(ex, sessionID);
+         }
+      }
+
+      public void ToAdmin(Message message, SessionID sessionID)
+      {
+         try
+         {
+            session(sessionID).ToAdmin(message, sessionID);
+         }
+         catch (FieldNotFoundException ex) { handle_field_not_found(ex, sessionID, message); }
+         catch (UnsupportedMessageType) {  throw; }
+         catch (IncorrectTagValue) { throw; }
+         catch (Exception ex) { handle_session_exception(ex, sessionID, message); }
+      }
+
+      public void ToApp(Message message, SessionID sessionID)
+      {
+         try
+         {
+            session(sessionID).ToApp(message, sessionID);
+         }
+         catch (FieldNotFoundException ex) { handle_field_not_found(ex, sessionID, message); }
+         catch (UnsupportedMessageType) { throw; }
+         catch (IncorrectTagValue) { throw; }
+         catch (Exception ex) { handle_session_exception(ex, sessionID, message); }
+      }
+
+      IEnumerable<SecurityImmutable> IFixRouter.get_securities()
+      {
+         return _id_to_security.Values;
+      }
+
+      SecurityImmutable? IFixRouter.lookup(uint key)
+      {
+         if(_id_to_security.TryGetValue(key, out SecurityImmutable sec))
+            return sec;
+         else
+            return null;
+      }
+
+      SecurityImmutable? IFixRouter.lookup(string desc)
+      {
+         if (_desc_to_security.TryGetValue(desc, out SecurityImmutable sec))
+            return sec;
+         else
+            return null;
+      }
+   }
+}
@@ -0,0 +1,585 @@
+using System;
+using System.IO;
+using System.Net;
+using System.Text;
+using System.Threading;
+using System.Web;
+using QuickFix;
+
+namespace bts.fix
+{
+   public class HttpServer : IDisposable
+   {
+      private readonly HttpListener _httpListener;
+      private Thread _connectionThread;
+      private Boolean _running, _disposed;
+      private readonly SessionSettings _sessionSettings;
+      private StringBuilder _sbHtmlHeader;
+
+
+      public HttpServer(string prefix, SessionSettings settings)
+      {
+         if (!HttpListener.IsSupported)
+         {
+            // Requires at least a Windows XP with Service Pack 2
+            throw new NotSupportedException(
+                "The Http Server cannot run on this operating system.");
+         }
+
+         _httpListener = new HttpListener();
+         _httpListener.Prefixes.Add(prefix);
+         _sessionSettings = settings;
+      }
+
+      public void Start()
+      {
+         if (!_httpListener.IsListening)
+         {
+            _httpListener.Start();
+            _running = true;
+            // Use a thread to listen to the Http requests
+            _connectionThread = new Thread(ConnectionThreadStart);
+            _connectionThread.Start();
+         }
+      }
+
+      public void Stop()
+      {
+         if (_httpListener.IsListening)
+         {
+            _running = false;
+            _httpListener.Stop();
+         }
+      }
+
+      private void ConnectionThreadStart()
+      {
+         try
+         {
+            while (_running)
+            {
+               // Grab the context and pass it to the processor methods to handle it
+               HttpListenerContext context = _httpListener.GetContext();
+               HttpListenerRequest request = context.Request;
+               HttpListenerResponse response = context.Response;
+               string responseString;
+
+               _sbHtmlHeader = new StringBuilder(@"<HEAD><CENTER><TITLE>QuickFIX Engine Web Interface</TITLE><H1>QuickFIX Engine Web Interface</H1></CENTER>");
+               _sbHtmlHeader.AppendFormat(@"<CENTER>[<A HREF='/'>HOME</A>]&nbsp;[<A HREF='{0}'>RELOAD</A>]</CENTER><HR/></HEADER><BODY>", request.Url.OriginalString);
+
+               switch (request.Url.AbsolutePath)
+               {
+                  case "/":
+                     responseString = ProcessRoot(request);
+                     break;
+                  case "/session":
+                     responseString = SessionDetails(request);
+                     break;
+                  case "/resetSession":
+                     responseString = ResetSession(request);
+                     break;
+                  case "/resetSessions":
+                     responseString = ResetSessions(request);
+                     break;
+                  // case "/refreshSession":
+                  //    responseString = RefreshSession(request);
+                  //    break;
+                  // case "/refreshSessions":
+                  //    responseString = RefreshSessions(request);
+                  //    break;
+                  case "/enableSessions":
+                     responseString = EnableSessions(request);
+                     break;
+                  case "/disableSessions":
+                     responseString = DisableSessions(request);
+                     break;
+                  default:
+                     responseString = ProcessRoot(request);
+                     break;
+               }
+
+               byte[] buffer = Encoding.UTF8.GetBytes(responseString);
+               response.ContentLength64 = buffer.Length;
+               Stream output = response.OutputStream;
+               output.Write(buffer, 0, buffer.Length);
+               output.Close();
+            }
+         }
+         catch (HttpListenerException)
+         {
+            Console.WriteLine("HTTP server was shut down.");
+         }
+      }
+
+      private string DisableSessions(HttpListenerRequest request)
+      {
+         bool confirm = false;
+         StringBuilder sbHtmlPageBody = _sbHtmlHeader;
+
+         if (request.QueryString["confirm"] != null)
+         {
+            if (Convert.ToInt16(request.QueryString["confirm"]) != 0)
+            {
+               confirm = true;
+               foreach (SessionID session in _sessionSettings.GetSessions())
+               {
+                  Session sessionDetails = Session.LookupSession(session);
+                  sessionDetails.Logout();
+               }
+            }
+         }
+
+         if (confirm)
+         {
+            sbHtmlPageBody = new StringBuilder();
+            sbHtmlPageBody.AppendFormat(@"<HEAD><META http-equiv='refresh' content=2;URL={0} /><CENTER><TITLE>QuickFIX Engine Web Interface</TITLE><H1>QuickFIX Engine Web Interface</H1></CENTER>", "/");
+            sbHtmlPageBody.AppendFormat("<CENTER><h2><A HREF='{0}'>Sessions</A> have been disabled</h2></CENTER>", "/");
+         }
+         else
+         {
+            sbHtmlPageBody.Append("<CENTER><h2>Are you sure you want to disable all sessions ?</h2></CENTER>");
+            sbHtmlPageBody.AppendFormat("<CENTER>[<A HREF='{0}?confirm=1'>YES, disable sessions</A>]&nbsp;[<A HREF='/'>NO, do not disable sessions</A>]</CENTER>", request.Url.OriginalString);
+         }
+         return sbHtmlPageBody.ToString();
+      }
+
+      private string EnableSessions(HttpListenerRequest request)
+      {
+         bool confirm = false;
+         string urlOriginalString = request.Url.OriginalString;
+         StringBuilder sbHtmlPageBody = _sbHtmlHeader;
+
+         if (request.QueryString["confirm"] != null)
+         {
+            if (Convert.ToInt16(request.QueryString["confirm"]) != 0)
+            {
+               confirm = true;
+               foreach (SessionID session in _sessionSettings.GetSessions())
+               {
+                  Session sessionDetails = Session.LookupSession(session);
+                  sessionDetails.Logon();
+               }
+            }
+         }
+
+         if (confirm)
+         {
+            sbHtmlPageBody = new StringBuilder();
+            sbHtmlPageBody.AppendFormat(@"<HEAD><META http-equiv='refresh' content=2;URL={0} /><CENTER><TITLE>QuickFIX Engine Web Interface</TITLE><H1>QuickFIX Engine Web Interface</H1></CENTER>", "/");
+            sbHtmlPageBody.AppendFormat("<CENTER><h2><A HREF='{0}'>Sessions</A> have been enabled</h2></CENTER>", "/");
+         }
+         else
+         {
+            sbHtmlPageBody.Append("<CENTER><h2>Are you sure you want to enable all sessions ?</h2></CENTER>");
+            sbHtmlPageBody.AppendFormat("<CENTER>[<A HREF='{0}?confirm=1'>YES, enable sessions</A>]&nbsp;[<A HREF='/'>NO, do not enable sessions</A>]</CENTER>", urlOriginalString);
+         }
+         return sbHtmlPageBody.ToString();
+      }
+
+      private string RefreshSession(HttpListenerRequest request)
+      {
+         SessionID sessionId = new SessionID(request.QueryString["beginstring"], request.QueryString["sendercompid"], request.QueryString["targetcompid"]);
+         Session sessionDetails = Session.LookupSession(sessionId);
+         if (sessionDetails == null) throw new Exception("Session not found");
+         StringBuilder sbHtmlPageBody = _sbHtmlHeader;
+         bool confirm = false;
+         string urlOriginalString = request.Url.OriginalString;
+
+         string url = "/session?" + GetParameterList(urlOriginalString);
+
+         if (request.QueryString["confirm"] != null)
+         {
+            if (Convert.ToInt16(request.QueryString["confirm"]) != 0)
+            {
+               confirm = true;
+               sessionDetails.Refresh();
+               url = RemoveQueryStringByKey(urlOriginalString, "confirm");
+            }
+         }
+
+         if (confirm)
+         {
+            sbHtmlPageBody = new StringBuilder();
+            sbHtmlPageBody.AppendFormat(@"<HEAD><META http-equiv='refresh' content=2;URL=/session?{0} /><CENTER><TITLE>QuickFIX Engine Web Interface</TITLE><H1>QuickFIX Engine Web Interface</H1></CENTER>", GetParameterList(urlOriginalString));
+            sbHtmlPageBody.AppendFormat(@"<CENTER>[<A HREF='/'>HOME</A>]&nbsp;[<A HREF='{0}'>RELOAD</A>]</CENTER><HR/></HEAD><BODY>", urlOriginalString);
+            sbHtmlPageBody.AppendFormat("<CENTER><h2><A HREF='/session?{0}'>{1}</A> has been refreshed</h2></CENTER>", GetParameterList(url), sessionId);
+         }
+         else
+         {
+            sbHtmlPageBody.AppendFormat("<CENTER><h2>Are you sure you want to refresh session <A HREF='{0}'>{1}</A>?</h2></CENTER>", url, sessionId);
+            sbHtmlPageBody.AppendFormat("<CENTER>[<A HREF='{0}&confirm=1'>YES, refresh session</A>]&nbsp;[<A HREF='{0}'>NO, do not refresh session</A>]</CENTER>", url);
+         }
+         return sbHtmlPageBody.ToString();
+      }
+
+      private string RefreshSessions(HttpListenerRequest request)
+      {
+         bool confirm = false;
+         string urlOriginalString = request.Url.OriginalString;
+         StringBuilder sbHtmlPageBody = _sbHtmlHeader;
+
+         if (request.QueryString["confirm"] != null)
+         {
+            if (Convert.ToInt16(request.QueryString["confirm"]) != 0)
+            {
+               confirm = true;
+               foreach (SessionID session in _sessionSettings.GetSessions())
+               {
+                  Session sessionDetails = Session.LookupSession(session);
+                  sessionDetails.Refresh();
+               }
+            }
+         }
+
+         if (confirm)
+         {
+            sbHtmlPageBody = new StringBuilder();
+            sbHtmlPageBody.AppendFormat(@"<HEAD><META http-equiv='refresh' content=2;URL={0} /><CENTER><TITLE>QuickFIX Engine Web Interface</TITLE><H1>QuickFIX Engine Web Interface</H1></CENTER>", "/");
+            sbHtmlPageBody.AppendFormat("<CENTER><h2><A HREF='{0}'>Sessions</A> have been refreshed</h2></CENTER>", "/");
+         }
+         else
+         {
+            sbHtmlPageBody.Append("<CENTER><h2>Are you sure you want to refresh all sessions ?</h2></CENTER>");
+            sbHtmlPageBody.AppendFormat("<CENTER>[<A HREF='{0}?confirm=1'>YES, refresh sessions</A>]&nbsp;[<A HREF='/'>NO, do not refresh sessions</A>]</CENTER>", urlOriginalString);
+         }
+         return sbHtmlPageBody.ToString();
+      }
+
+      private string ResetSessions(HttpListenerRequest request)
+      {
+         bool confirm = false;
+         string urlOriginalString = request.Url.OriginalString;
+         StringBuilder sbHtmlPageBody = _sbHtmlHeader;
+
+         if (request.QueryString["confirm"] != null)
+         {
+            if (Convert.ToInt16(request.QueryString["confirm"]) != 0)
+            {
+               confirm = true;
+               foreach (SessionID session in _sessionSettings.GetSessions())
+               {
+                  Session sessionDetails = Session.LookupSession(session);
+                  sessionDetails.Reset("Reset from WebInterface");
+               }
+            }
+         }
+
+         if (confirm)
+         {
+            sbHtmlPageBody = new StringBuilder();
+            sbHtmlPageBody.AppendFormat(@"<HEAD><META http-equiv='refresh' content=2;URL={0} /><CENTER><TITLE>QuickFIX Engine Web Interface</TITLE><H1>QuickFIX Engine Web Interface</H1></CENTER>", "/");
+            sbHtmlPageBody.AppendFormat("<CENTER><h2><A HREF='{0}'>Sessions</A> have been reset</h2></CENTER>", "/");
+         }
+         else
+         {
+            sbHtmlPageBody.Append("<CENTER><h2>Are you sure you want to reset all sessions ?</h2></CENTER>");
+            sbHtmlPageBody.AppendFormat("<CENTER>[<A HREF='{0}?confirm=1'>YES, reset sessions</A>]&nbsp;[<A HREF='/'>NO, do not reset sessions</A>]</CENTER>", urlOriginalString);
+         }
+         return sbHtmlPageBody.ToString();
+      }
+
+      private string ResetSession(HttpListenerRequest request)
+      {
+         SessionID sessionId = new SessionID(request.QueryString["beginstring"], request.QueryString["sendercompid"], request.QueryString["targetcompid"]);
+         Session sessionDetails = Session.LookupSession(sessionId);
+         if (sessionDetails == null) throw new Exception("Session not found");
+         StringBuilder sbHtmlPageBody = _sbHtmlHeader;
+
+         bool confirm = false;
+         string urlOriginalString = request.Url.OriginalString;
+
+         string url = "/session?" + GetParameterList(urlOriginalString);
+
+         if (request.QueryString["confirm"] != null)
+         {
+            if (Convert.ToInt16(request.QueryString["confirm"]) != 0)
+            {
+               confirm = true;
+               sessionDetails.Reset("Reset from WebInterface");
+               url = RemoveQueryStringByKey(urlOriginalString, "confirm");
+            }
+         }
+
+         if (confirm)
+         {
+            sbHtmlPageBody = new StringBuilder();
+            sbHtmlPageBody.AppendFormat(@"<HEAD><META http-equiv='refresh' content=2;URL=/session?{0} /><CENTER><TITLE>QuickFIX Engine Web Interface</TITLE><H1>QuickFIX Engine Web Interface</H1></CENTER>", GetParameterList(urlOriginalString));
+            sbHtmlPageBody.AppendFormat(@"<CENTER>[<A HREF='/'>HOME</A>]&nbsp;[<A HREF='{0}'>RELOAD</A>]</CENTER><HR/></HEAD><BODY>", urlOriginalString);
+            sbHtmlPageBody.AppendFormat("<CENTER><h2><A HREF='/session?{0}'>{1}</A> has been reset</h2></CENTER>", GetParameterList(url), sessionId);
+         }
+         else
+         {
+            sbHtmlPageBody.AppendFormat("<CENTER><h2>Are you sure you want to reset session <A HREF='{0}'>{1}</A>?</h2></CENTER>", url, sessionId);
+            sbHtmlPageBody.AppendFormat("<CENTER>[<A HREF='{0}&confirm=1'>YES, reset session</A>]&nbsp;[<A HREF='{0}'>NO, do not reset session</A>]</CENTER>", url);
+         }
+         return sbHtmlPageBody.ToString();
+      }
+
+
+      private string ProcessRoot(HttpListenerRequest request)
+      {
+         StringBuilder sbHtmlPageBody = _sbHtmlHeader;
+
+         //Session count
+         sbHtmlPageBody.AppendFormat("<CENTER><b><i>{0} Sessions managed by QuickFIX</b></i></CENTER><HR/>", _sessionSettings.GetSessions().Count);
+
+         //session management links
+         sbHtmlPageBody.AppendFormat(@"<CENTER><A HREF='/resetSessions{0}'>RESET</A>&nbsp;<A HREF='/refreshSessions'>REFRESH</A>&nbsp;<A HREF='/enableSessions'>ENABLE</A>&nbsp;<A HREF='/disableSessions'>DISABLE</A></CENTER><HR/></HEADER><BODY>", GetParameterList(request.Url.OriginalString));
+
+         //Start the table generation
+         sbHtmlPageBody.Append("<table id=\"sessionlist\" style=\"border-width:1; padding:2; width:100%\">");
+
+         sbHtmlPageBody.Append("<tr>");
+         sbHtmlPageBody.Append(AddCell("Session", true));
+         sbHtmlPageBody.Append(AddCell("Type", true));
+         sbHtmlPageBody.Append(AddCell("Enabled", true));
+         sbHtmlPageBody.Append(AddCell("Session Time", true));
+         sbHtmlPageBody.Append(AddCell("Logged On", true));
+         sbHtmlPageBody.Append(AddCell("Next Incoming", true));
+         sbHtmlPageBody.Append(AddCell("Next Outgoing", true));
+         sbHtmlPageBody.Append("</tr>");
+
+         foreach (SessionID session in _sessionSettings.GetSessions())
+         {
+            Session sessionDetails = Session.LookupSession(session);
+            sbHtmlPageBody.Append("<tr>");
+            sbHtmlPageBody.Append(AddCell(String.Format(
+                "<a href=\"session?BeginString={0}&SenderCompID={1}&TargetCompID={2}\">{0}:{1}->{2}</a>",
+                session.BeginString, session.SenderCompID, session.TargetCompID)));
+            sbHtmlPageBody.Append(AddCell(sessionDetails.IsInitiator ? "initiator" : "acceptor"));
+            sbHtmlPageBody.Append(AddCell(sessionDetails.IsEnabled ? "yes" : "no"));
+            sbHtmlPageBody.Append(AddCell(sessionDetails.IsSessionTime ? "yes" : "no"));
+            sbHtmlPageBody.Append(AddCell(sessionDetails.IsLoggedOn ? "yes" : "no"));
+            sbHtmlPageBody.Append(AddCell(sessionDetails.NextTargetMsgSeqNum.ToString()));
+            sbHtmlPageBody.Append(AddCell(sessionDetails.NextSenderMsgSeqNum.ToString()));
+            sbHtmlPageBody.Append("</tr>");
+         }
+
+         sbHtmlPageBody.Append("</table>");
+         return sbHtmlPageBody.ToString();
+      }
+
+      public string SessionDetails(HttpListenerRequest request)
+      {
+         SessionID sessionId = new SessionID(request.QueryString["beginstring"], request.QueryString["sendercompid"], request.QueryString["targetcompid"]);
+         Session sessionDetails = Session.LookupSession(sessionId);
+         if (sessionDetails == null) throw new Exception("Session not found");
+         StringBuilder sbHtmlPageBody = _sbHtmlHeader;
+
+         string url = request.Url.OriginalString;
+         string urlOriginalString = request.Url.OriginalString;
+
+         if (request.QueryString["enabled"] != null)
+         {
+            if (!Convert.ToBoolean(request.QueryString["enabled"]))
+               sessionDetails.Logout();
+            else
+               sessionDetails.Logon();
+
+            url = RemoveQueryStringByKey(urlOriginalString, "Enabled");
+         }
+
+         if (request.QueryString["next incoming"] != null)
+         {
+            int value = Convert.ToInt16(request.QueryString["next incoming"]);
+            sessionDetails.NextTargetMsgSeqNum = value <= 0 ? 1 : value;
+            url = RemoveQueryStringByKey(urlOriginalString, "next incoming");
+         }
+
+         if (request.QueryString["Next Outgoing"] != null)
+         {
+            int value = Convert.ToInt16(request.QueryString["Next Outgoing"]);
+            sessionDetails.NextSenderMsgSeqNum = value <= 0 ? 1 : value;
+            url = RemoveQueryStringByKey(urlOriginalString, "Next Outgoing");
+         }
+
+         if (request.QueryString["SendRedundantResendRequests"] != null)
+         {
+            sessionDetails.SendRedundantResendRequests = Convert.ToBoolean(request.QueryString["SendRedundantResendRequests"]);
+            url = RemoveQueryStringByKey(urlOriginalString, "SendRedundantResendRequests");
+         }
+
+         if (request.QueryString["CheckCompId"] != null)
+         {
+            sessionDetails.CheckCompID = Convert.ToBoolean(request.QueryString["CheckCompId"]);
+            url = RemoveQueryStringByKey(urlOriginalString, "CheckCompId");
+         }
+
+         if (request.QueryString["CheckLatency"] != null)
+         {
+            sessionDetails.CheckLatency = Convert.ToBoolean(request.QueryString["CheckLatency"]);
+            url = RemoveQueryStringByKey(urlOriginalString, "CheckLatency");
+         }
+
+         if (request.QueryString["MaxLatency"] != null)
+         {
+            int value = Convert.ToInt16(request.QueryString["MaxLatency"]);
+            sessionDetails.MaxLatency = value <= 0 ? 1 : value;
+            url = RemoveQueryStringByKey(urlOriginalString, "MaxLatency");
+         }
+
+         if (request.QueryString["LogonTimeout"] != null)
+         {
+            int value = Convert.ToInt16(request.QueryString["LogonTimeout"]);
+            sessionDetails.LogonTimeout = value <= 0 ? 1 : value;
+            url = RemoveQueryStringByKey(urlOriginalString, "LogonTimeout");
+         }
+
+         if (request.QueryString["LogoutTimeout"] != null)
+         {
+            int value = Convert.ToInt16(request.QueryString["LogoutTimeout"]);
+            sessionDetails.LogoutTimeout = value <= 0 ? 1 : value;
+            url = RemoveQueryStringByKey(urlOriginalString, "LogoutTimeout");
+         }
+
+         if (request.QueryString["ResetOnLogon"] != null)
+         {
+            sessionDetails.ResetOnLogon = Convert.ToBoolean(request.QueryString["ResetOnLogon"]);
+            url = RemoveQueryStringByKey(urlOriginalString, "ResetOnLogon");
+         }
+
+         if (request.QueryString["ResetOnLogout"] != null)
+         {
+            sessionDetails.ResetOnLogout = Convert.ToBoolean(request.QueryString["ResetOnLogout"]);
+            url = RemoveQueryStringByKey(urlOriginalString, "ResetOnLogout");
+         }
+
+         if (request.QueryString["ResetOnDisconnect"] != null)
+         {
+            sessionDetails.ResetOnDisconnect = Convert.ToBoolean(request.QueryString["ResetOnDisconnect"]);
+            url = RemoveQueryStringByKey(urlOriginalString, "ResetOnDisconnect");
+         }
+
+         if (request.QueryString["RefreshOnLogon"] != null)
+         {
+            sessionDetails.RefreshOnLogon = Convert.ToBoolean(request.QueryString["RefreshOnLogon"]);
+            url = RemoveQueryStringByKey(urlOriginalString, "RefreshOnLogon");
+         }
+
+         if (request.QueryString["MillisecondsInTimestamp"] != null)
+         {
+            sessionDetails.MillisecondsInTimeStamp = Convert.ToBoolean(request.QueryString["MillisecondsInTimestamp"]);
+            url = RemoveQueryStringByKey(urlOriginalString, "MillisecondsInTimestamp");
+         }
+
+         if (request.QueryString["PersistMessages"] != null)
+         {
+            sessionDetails.PersistMessages = Convert.ToBoolean(request.QueryString["PersistMessages"]);
+            url = RemoveQueryStringByKey(urlOriginalString, "PersistMessages");
+         }
+
+
+         sbHtmlPageBody.AppendFormat(@"<CENTER>{0}</CENTER><HR/>", sessionId);
+         sbHtmlPageBody.AppendFormat(@"<CENTER>[<A HREF='/resetSession?{0}'>RESET</A>]&nbsp;[<A HREF='/refreshSession?{0}'>REFRESH</A>]</CENTER><HR/></HEADER><BODY>", GetParameterList(urlOriginalString));
+
+         sbHtmlPageBody.Append("<table id=\"session_details\" style=\"border-width:1; padding:2; width:100%\">");
+
+         sbHtmlPageBody.Append(AddRow("Enabled", sessionDetails.IsEnabled, url));
+         sbHtmlPageBody.Append(AddRow("ConnectionType", sessionDetails.IsInitiator ? "initiator" : "acceptor"));
+         sbHtmlPageBody.Append(AddRow("SessionTime", sessionDetails.IsSessionTime));
+         sbHtmlPageBody.Append(AddRow("LoggedOn", sessionDetails.IsLoggedOn));
+         sbHtmlPageBody.Append(AddRow("Next Incoming", sessionDetails.NextTargetMsgSeqNum, url));
+         sbHtmlPageBody.Append(AddRow("Next Outgoing", sessionDetails.NextSenderMsgSeqNum, url));
+         sbHtmlPageBody.Append(AddRow("SendRedundantResendRequests", sessionDetails.SendRedundantResendRequests, url));
+         sbHtmlPageBody.Append(AddRow("CheckCompId", sessionDetails.CheckCompID, url));
+         sbHtmlPageBody.Append(AddRow("CheckLatency", sessionDetails.CheckLatency, url));
+         sbHtmlPageBody.Append(AddRow("MaxLatency", sessionDetails.MaxLatency, url));
+         sbHtmlPageBody.Append(AddRow("LogonTimeout", sessionDetails.LogonTimeout, url));
+         sbHtmlPageBody.Append(AddRow("LogoutTimeout", sessionDetails.LogoutTimeout, url));
+         sbHtmlPageBody.Append(AddRow("ResetOnLogon", sessionDetails.ResetOnLogon, url));
+         sbHtmlPageBody.Append(AddRow("ResetOnLogout", sessionDetails.ResetOnLogout, url));
+         sbHtmlPageBody.Append(AddRow("ResetOnDisconnect", sessionDetails.ResetOnDisconnect, url));
+         sbHtmlPageBody.Append(AddRow("RefreshOnLogon", sessionDetails.RefreshOnLogon, url));
+         sbHtmlPageBody.Append(AddRow("MillisecondsInTimestamp", sessionDetails.MillisecondsInTimeStamp, url));
+         sbHtmlPageBody.Append(AddRow("PersistMessages", sessionDetails.PersistMessages, url));
+
+         sbHtmlPageBody.Append("</table>");
+         return sbHtmlPageBody.ToString();
+      }
+
+      public static string RemoveQueryStringByKey(string url, string key)
+      {
+         var uri = new Uri(url);
+
+         // this gets all the query string key value pairs as a collection
+         var newQueryString = HttpUtility.ParseQueryString(uri.Query);
+
+         // this removes the key if exists
+         newQueryString.Remove(key);
+
+         // this gets the page path from root without QueryString
+         string pagePathWithoutQueryString = uri.GetLeftPart(UriPartial.Path);
+
+         return newQueryString.Count > 0
+             ? $"{pagePathWithoutQueryString}?{newQueryString}"
+             : pagePathWithoutQueryString;
+      }
+
+      public static string GetParameterList(string url)
+      {
+         return HttpUtility.ParseQueryString((new Uri(url).Query)).ToString();
+      }
+
+      private static string AddRow(string colName, bool value, string url = "")
+      {
+         string valueAsStr = value ? "yes" : "no";
+         string innerHtml = url.Length > 0
+             ? $"<a href=\" {url}&{colName}={!value} \">toggle</a>"
+             : "";
+         return AddRow(colName, valueAsStr, innerHtml);
+      }
+
+      private static string AddRow(string colName, int value, string url = "")
+      {
+         string innerHtml = $"<a href=\" {url}&{colName}={value - 10} \"> << </a>" +
+                            $"<a href=\" {url}&{colName}={value - 1} \"> < </a>" +
+                            " | " +
+                            $"<a href=\" {url}&{colName}={value + 1} \"> > </a>" +
+                            $"<a href=\" {url}&{colName}={value + 10} \"> >> </a>";
+         return AddRow(colName, value.ToString(), innerHtml);
+      }
+      private static string AddRow(string colName, string value, string innerHtml = "")
+      {
+         StringBuilder row = new StringBuilder();
+         row.Append("<tr>");
+         row.Append(AddCell(colName));
+         row.Append(AddCell(value));
+         row.Append(AddCell(innerHtml));
+         row.Append("</tr>");
+         return row.ToString();
+      }
+
+      private static string AddCell(string cellContent, bool header = false)
+      {
+         string entryType = header ? "th" : "td";
+         return "<" + entryType + " align=\"left\">" + cellContent + "</" + entryType + ">";
+      }
+
+      public virtual void Dispose()
+      {
+         Dispose(true);
+         GC.SuppressFinalize(this);
+      }
+
+      private void Dispose(bool disposing)
+      {
+         if (_disposed)
+         {
+            return;
+         }
+         if (disposing)
+         {
+            if (_running)
+            {
+               Stop();
+            }
+            if (_connectionThread != null)
+            {
+               _connectionThread.Abort();
+               _connectionThread = null;
+            }
+         }
+         _disposed = true;
+      }
+   }
+}
@@ -0,0 +1,2 @@
+using System.Runtime.CompilerServices;
+
@@ -0,0 +1,293 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using Google.Protobuf;
+using Google.Protobuf.Reflection;
+using System.Linq;
+using Google.Protobuf.WellKnownTypes;
+using bts.api;
+
+
+namespace bts.fix
+{
+   public static class ProtoFix
+   {
+      static readonly QuickFix.IMessageFactory _factory = new QuickFix.DefaultMessageFactory();
+      public static T parse_fix<T>(string fixstring) where T : IMessage, new()
+      {
+         return (T) parse_fix(new T().Descriptor, fixstring);
+      }
+
+      public static IMessage parse_fix(MessageDescriptor desc, string fixstring)
+      {
+         QuickFix.Message fix = new QuickFix.Message(fixstring, false);
+         var msg = create_message(desc, fix);
+         return msg;
+      }
+
+      static string get_between(string source, string start, string end)
+      {
+         int spos = source.IndexOf(start, 0);
+         if(spos < 0)
+            return string.Empty;
+         spos += start.Length;
+         int epos = source.IndexOf(end, spos);
+         if(epos < 0)
+            return string.Empty;
+         return source.Substring(spos, epos - spos);
+      }      
+
+      public static Timestamp peek_timestamp(string fixstring, int field = 60) 
+      {
+         string ts = get_between(fixstring, field.ToString() + "=", "\u0001");
+         if(!string.IsNullOrEmpty(ts))
+         {
+            var stamp = TimestampExtensions.parse_timestamp(ts);
+            return stamp;
+         }
+         return null;
+      }
+
+      public static string peek_field(string fixstring, int field)
+      {
+         string ts = get_between(fixstring, field.ToString() + "=", "\u0001");
+         return ts;
+      }
+
+      public static string peek_symbol(string fixstring)
+      {
+         return peek_field(fixstring, 55);
+      }
+
+      public static IMessage create_message(MessageDescriptor desc, QuickFix.FieldMap fix)
+      {
+         object obj = Activator.CreateInstance(desc.ClrType);
+         IMessage msg = (IMessage)obj;
+         return setup_message(msg, fix);
+      }
+
+      public static IMessage setup_message(IMessage msg, QuickFix.FieldMap fix)
+      {
+         foreach (var fd in msg.Descriptor.Fields.InDeclarationOrder())
+         {
+            try
+            {
+               set_field(msg, fd, fix);
+            }
+            catch(QuickFix.FieldNotFoundException) {}
+         }
+         return msg;
+      }
+
+      static int get_tag(IMessage msg, FieldDescriptor fd, out bool is_header)
+      {
+         is_header = false;
+         int fieldnum = 0;
+         if(fd.CustomOptions?.TryGetInt32((int)ApioptionsReflection.FieldOptions.fix_tag, out fieldnum) ?? false)
+         {
+            fd.CustomOptions.TryGetBool((int)ApioptionsReflection.FieldOptions.fix_tag_is_header, out is_header);
+            return fieldnum;
+         }
+         else
+         {
+            int tagbase = 0;
+            if(msg.Descriptor.CustomOptions?.TryGetInt32((int)ApioptionsReflection.MessageOptions.fix_algostrategy_tagbase, out tagbase) ?? false)
+               return fd.FieldNumber + tagbase;
+         }
+         throw new QuickFix.FieldNotFoundException(fd.FieldNumber);
+      }
+
+      static void set_field(IMessage msg, FieldDescriptor fd, QuickFix.FieldMap fix)
+      {         
+         switch (fd.FieldType)
+         {
+            case FieldType.Bool:
+               {
+                  int tag = get_tag(msg, fd, out bool is_header);
+                  var data = is_header ? ((QuickFix.Message)fix).Header.GetBoolean(tag) : fix.GetBoolean(tag);
+                  fd.Accessor.SetValue(msg, data);
+               }
+               break;
+            case FieldType.Float:
+               {
+                  int tag = get_tag(msg, fd, out bool is_header);
+                  var data = is_header ? ((QuickFix.Message)fix).Header.GetDecimal(tag) : fix.GetDecimal(tag);
+                  object conv = Convert.ChangeType(data, fd.Accessor.GetValue(msg).GetType());
+                  fd.Accessor.SetValue(msg, conv);
+               }
+               break;
+            case FieldType.Double:
+               {
+                  int tag = get_tag(msg, fd, out bool is_header);
+                  var data = is_header ? ((QuickFix.Message)fix).Header.GetDecimal(tag) : fix.GetDecimal(tag);
+                  double d = decimal.ToDouble(data);
+                  fd.Accessor.SetValue(msg, d);
+               }
+               break;
+            case FieldType.Int32:
+            case FieldType.SInt32:
+            case FieldType.UInt32:
+               {
+                  int tag = get_tag(msg, fd, out bool is_header);
+                  var data = is_header ? ((QuickFix.Message)fix).Header.GetInt(tag) : fix.GetInt(tag);
+                  object conv = Convert.ChangeType(data, fd.Accessor.GetValue(msg).GetType());
+                  fd.Accessor.SetValue(msg, conv);
+               }
+               break;
+            case FieldType.Int64:
+            case FieldType.SInt64:
+            case FieldType.UInt64:
+               {
+                  int tag = get_tag(msg, fd, out bool is_header);
+                  try
+                  {                     
+                     var data = is_header ? ((QuickFix.Message)fix).Header.GetDecimal(tag) : fix.GetDecimal(tag);
+                     object conv = Convert.ChangeType(data, fd.Accessor.GetValue(msg).GetType());
+                     fd.Accessor.SetValue(msg, conv);
+                  }
+                  catch(Exception ex) when (ex is QuickFix.FieldConvertError || ex is FormatException)
+                  {
+                     try
+                     {
+                        var snot = fix.GetString(tag); //scientific notation apparently appears in the files
+                        var data = Double.Parse(snot, System.Globalization.NumberStyles.Float);
+                        object conv = Convert.ChangeType(data, fd.Accessor.GetValue(msg).GetType());
+                        fd.Accessor.SetValue(msg, conv);
+                     }
+                     catch {}
+                  }
+               }
+               break;
+            case FieldType.Enum:
+               {                                    
+                  EnumValueDescriptor val = find_enum_by_attribute(msg, fd, fix);                  
+                  if(val == null) 
+                  {
+                     int tag = get_tag(msg, fd, out bool is_header);
+                     char data = is_header ? ((QuickFix.Message)fix).Header.GetChar(tag) : fix.GetChar(tag);
+                     val = fd.EnumType.FindValueByNumber((int)data);
+                     val = val ?? fd.EnumType.FindValueByNumber(0);
+                  }
+                  fd.Accessor.SetValue(msg, val.Number);
+               }
+               break;
+            case FieldType.String:
+               {
+                  int tag = get_tag(msg, fd, out bool is_header);
+                  var data = is_header ? ((QuickFix.Message)fix).Header.GetString(tag) : fix.GetString(tag);
+                  fd.Accessor.SetValue(msg, data);
+               }
+               break;
+            case FieldType.Message:
+               {
+                  handle_message(msg, fd, fix);
+               }
+               break;
+            default:
+               throw new NotSupportedException("unsupported field type " + fd.FieldType.ToString());
+         }
+      }
+
+      private static EnumValueDescriptor find_enum_by_attribute(IMessage msg, FieldDescriptor fd, QuickFix.FieldMap fix)
+      {
+         int tag = get_tag(msg, fd, out bool is_header);
+         var fval = is_header ? ((QuickFix.Message)fix).Header.GetString(tag) : fix.GetString(tag);
+         foreach(var val in fd.EnumType.Values)
+         {
+            string eval = null;
+            if(val.CustomOptions?.TryGetString((int)ApioptionsReflection.EnumValueOptions.fix_value, out eval) ?? false)
+            {
+               if(eval != null && eval == fval)
+                  return val;
+            }
+         }
+         return null;
+      }
+
+      static void handle_timestamp(IMessage msg, FieldDescriptor fd, QuickFix.FieldMap fix)
+      {
+         int tag = get_tag(msg, fd, out bool is_header);
+         var data = is_header ? ((QuickFix.Message)fix).Header.GetString(tag) : fix.GetString(tag);
+         Timestamp ts = TimestampExtensions.parse_timestamp(data);         
+         fd.Accessor.SetValue(msg, ts);         
+      }
+      static void handle_quantitymeasure(IMessage msg, FieldDescriptor fd, QuickFix.FieldMap fix)
+      {
+         int tag = get_tag(msg, fd, out bool is_header);
+         var data = is_header ? ((QuickFix.Message)fix).Header.GetInt(tag) : fix.GetInt(tag);
+         var qm = new bts.spark.QuantityMeasure { Absolute = (uint) Math.Abs(data) };
+         fd.Accessor.SetValue(msg, qm);
+      }
+
+      static void handle_message(IMessage msg, FieldDescriptor fd, QuickFix.FieldMap fix)
+      {
+         if (fd.MessageType.ClrType == typeof(Google.Protobuf.WellKnownTypes.Timestamp))
+         {
+            handle_timestamp(msg, fd, fix);
+         }
+         else if(fd.MessageType.ClrType == typeof(bts.spark.QuantityMeasure))
+         {
+            handle_quantitymeasure(msg, fd, fix);
+         }
+         else if(fd.MessageType.ClrType == typeof(bts.api.orderman.CustomOrderDefinition))
+         {
+            return;
+         }
+         else
+         {
+            if (!fd.IsRepeated)
+            {
+               var submsg = create_message(fd.MessageType, fix);
+               fd.Accessor.SetValue(msg, submsg);
+            }
+            else //for repeating groups we assume that the fd.FieldNumber corresponds to the "no" (number) tag in the fix
+            {
+               int tag = get_tag(msg, fd, out bool is_header);
+               int group = tag;//fd.FieldNumber;
+               int nvals = fix.GetInt(group);
+               IList list = (IList)fd.Accessor.GetValue(msg);
+               if (nvals == 1)
+               {
+                  var submsg = create_message(fd.MessageType, fix);
+                  list.Add(submsg);
+               }
+               else
+               {
+                  var delimproto = fd.MessageType.Fields.InDeclarationOrder()[0];
+                  var delim = delimproto.FieldNumber;
+
+                  List<QuickFix.Fields.IField> repeated = new List<QuickFix.Fields.IField>();
+                  var forder = fix.RepeatedTags.Select(x => x.Tag).Distinct();
+                  var dict = fix.ToDictionary();
+                  foreach(int fo in forder)
+                  {
+                     if(dict.TryGetValue(fo, out QuickFix.Fields.IField field))
+                        repeated.Add(field);
+                  }
+                  repeated.AddRange(fix.RepeatedTags);
+                  QuickFix.FieldMap fm = null;
+                  foreach (var rep in repeated)
+                  {
+                     if (rep.Tag == delim)
+                     {
+                        if (fm != null)
+                        {
+                           var submsg = create_message(fd.MessageType, fm);
+                           list.Add(submsg);
+                        }
+                        fm = new QuickFix.FieldMap();
+                     }
+                     if (fm != null)
+                        fm.SetField(rep);
+                  } //the last one
+                  if (fm != null && fm.Count() > 0)
+                  {
+                     var submsg = create_message(fd.MessageType, fm);
+                     list.Add(submsg);
+                  }
+               }
+            }
+         }         
+      }
+   }
+}
@@ -0,0 +1,2 @@
+# BTS Spark FIX Adapter
+
@@ -0,0 +1,84 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using bts.api.orderman;
+
+namespace bts.fix
+{
+   public class ATDL
+   {
+      readonly Dictionary<string, FIXAlgoDefinition> _atdl = new Dictionary<string, FIXAlgoDefinition>();
+      public IReadOnlyDictionary<string, FIXAlgoDefinition> algo_definitions => _atdl;
+      public ATDL(string path = "./spark_algos.json")
+      {
+         using(var fs = new StreamReader(path))
+         {
+            var algos = Google.Protobuf.JsonParser.Default.Parse<FIXAlgoDefinitions>(fs);
+            foreach(var algo in algos.AlgoStrategy)
+            {
+               _atdl[algo.Name] = algo;
+            }
+         }
+      }
+      
+      public static void write_json(FIXAlgoDefinitions defs, string path)
+      {
+         using (var fs = new StreamWriter(path))
+         {
+            var s = Google.Protobuf.JsonFormatter.Settings.Default;
+
+            var raw = Google.Protobuf.JsonFormatter.Default.Format(defs);
+            object parsed = Newtonsoft.Json.JsonConvert.DeserializeObject(raw);
+
+            string indented = Newtonsoft.Json.JsonConvert.SerializeObject(parsed, Newtonsoft.Json.Formatting.Indented);
+            fs.Write(indented);
+         }         
+      }
+      
+      public static void write_sample_json(string path = "./spark_algos.json")
+      {
+         FIXAlgoDefinition tc = new FIXAlgoDefinition() 
+         {
+            Name = "TickAndCover", 
+            Definition = new CustomOrderDefinition
+            {
+               Cover = new CoverOrderDefinition
+               {
+                  Child = new CustomOrderDefinition
+                  {
+                     Top = new TopOrderDefinition { Child = new CustomOrderDefinition { Limit = new LimitOrderDefinition() } }
+                  },
+                  Hedge = new CustomOrderDefinition
+                  {
+                     Lean = new LeanOrderDefinition { Child = new CustomOrderDefinition { Limit = new LimitOrderDefinition() } }
+                  }                  
+               }
+            }
+         };
+
+         FIXAlgoDefinition sc = new FIXAlgoDefinition()
+         {
+            Name = "SmashAndCover",
+            Definition = new CustomOrderDefinition
+            {
+               Cover = new CoverOrderDefinition
+               {
+                  Child = new CustomOrderDefinition
+                  {
+                     Lean = new LeanOrderDefinition{ Child = new CustomOrderDefinition { Limit = new LimitOrderDefinition() } }
+                  },
+                  Hedge = new CustomOrderDefinition
+                  {
+                     Lean = new LeanOrderDefinition { Child = new CustomOrderDefinition { Limit = new LimitOrderDefinition() } }
+                  }
+               }
+            }
+         };         
+         
+         FIXAlgoDefinitions defs = new FIXAlgoDefinitions();
+         defs.AlgoStrategy.Add(tc);
+         defs.AlgoStrategy.Add(sc);
+         write_json(defs, path);
+      }
+   }
+}
@@ -0,0 +1,288 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reactive.Linq;
+using System.Reactive.Concurrency;
+using System.Text;
+
+using QuickFix;
+using QuickFix.Fields;
+
+using bts.api;
+using bts.api.core;
+using bts.api.orderman;
+using bts.api.user;
+using bts.api.admin;
+using System.Collections.Concurrent;
+using System.Runtime.CompilerServices;
+
+using QuickFix.FIX42;
+using Message = QuickFix.Message;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace bts.fix
+{
+   class DropCopySession : SessionBase
+   {
+      protected IDisposable _fillsdisp;
+      protected IDisposable _ordersdisp;
+      protected static Lazy<OrderService> _orderservice = new Lazy<OrderService>(() => bts.api.Locator.locate<OrderService>(), true);
+
+      protected readonly ConcurrentDictionary<uint, OrderRecordImmutable> _order_cache = new ConcurrentDictionary<uint, OrderRecordImmutable>();
+      protected readonly ConcurrentDictionary<uint, string> _fix_clorderids = new ConcurrentDictionary<uint, string>();
+      protected readonly ConcurrentDictionary<string, uint> _external_id_vs_bts_key = new ConcurrentDictionary<string, uint>();
+      public DropCopySession(IFixRouter router, SessionID sess) : base(router, sess)
+      {
+      }
+
+      override public void OnLogon(SessionID sessionID)
+      {
+         Log.assert_d(sessionID.Equals(_sess));
+         var msg = sessionID.ToString() + " Logged on";
+         log_info(msg);
+
+         subscribe_fills_and_orders(sessionID);
+      }
+      override public void OnLogout(SessionID sessionID)
+      {
+         Log.assert_d(sessionID.Equals(_sess));
+         var msg = sessionID.ToString() + " Logged out";
+         log_info(msg);
+
+         if (_ordersdisp != null)
+            _ordersdisp.Dispose();
+         if (_fillsdisp != null)
+            _fillsdisp.Dispose();
+      }      
+
+      override public void FromApp(Message message, SessionID sessionID)
+      {
+         Log.assert_d(sessionID.Equals(_sess));
+         MsgType type = Message.IdentifyType(message.ToString());
+         switch (type.getValue())
+         {
+            case MsgType.ORDER_STATUS_REQUEST:
+            case MsgType.SECURITYDEFINITIONREQUEST:
+               log_info("IN: " + message);
+               Crack(message, sessionID);
+               break;
+            default:
+               log_info("UNSUPPORTED MESSAGE IN: " + type.getValue());
+               throw new UnsupportedMessageType();
+         }
+      }
+
+      virtual public void OnMessage(OrderStatusRequest req, SessionID s)
+      {
+         uint oid = uint.Parse(req.OrderID.getValue());
+         if (_order_cache.TryGetValue(oid, out OrderRecordImmutable order))
+         {
+            var ostat = build_order_status(s, order);
+            //ostat.OrdStatusReqID = new OrdStatusReqID(req.OrdStatusReqID.getValue());
+            //TODO
+            _router.send(ostat, s);
+         }
+      }
+
+      virtual public void OnMessage(SecurityDefinitionRequest req, SessionID s)
+      {
+         if (req.SecurityRequestType.getValue() == SecurityRequestType.REQUEST_LIST_SECURITIES)
+         {
+            var secs = _router.get_securities();
+            if (req.IsSetSymbol())
+               secs = secs.Where(x => x.Symbol.ToLower() == req.Symbol.getValue().ToLower());
+            if (req.IsSetSecurityType())
+               secs = secs.Where(x => security_types_equal(x.security_type(), req.SecurityType));
+            if (req.IsSetSecurityExchange())
+               secs = secs.Where(x => exchanges_equal(x.Exchange, req.SecurityExchange));
+
+            var def = new SecurityDefinition(req.SecurityReqID,
+                                                            new SecurityResponseID(Guid.NewGuid().ToString()),
+                                                            new TotalNumSecurities(secs.Count()));
+            _router.send(def, s);
+         }
+         else
+            throw new IncorrectTagValue(QuickFix.Fields.Tags.SecurityRequestType);
+      }
+
+      void _add_order_info_to_caches(OrderRecordImmutable o) {
+         _order_cache[o.Key] = o;
+         if (o.HasDef && !string.IsNullOrEmpty(o.Def.ExternalOrderId)) {
+            _external_id_vs_bts_key[o.Def.ExternalOrderId] = o.Key;
+         }
+      }
+
+      virtual async protected void subscribe_fills_and_orders(SessionID sessionID)
+      {
+         var scheduler = TaskPoolScheduler.Default;
+         var interval = TimeSpan.FromMilliseconds(500);
+         var on_orders = _orderservice.Value.subscribei_orders().Naggle(interval, scheduler).PermissionFilter(_adminobservable).Table().Cache();
+         var on_fills = _orderservice.Value.subscribei_fills().Naggle(interval, scheduler).PermissionFilter(_adminobservable).Table().Cache();
+
+         var odone = new TaskCompletionSource<int>();
+         _ordersdisp = on_orders.Subscribe(o =>
+         {
+            foreach (var order in o.added)
+            {
+               var ostat = build_order_status(sessionID, order);
+               _add_order_info_to_caches(order);
+               _router.send(ostat, sessionID);
+            }
+            foreach (var order in o.changed)
+            {
+               var ostat = build_order_status(sessionID, order, true);
+               _router.send(ostat, sessionID);
+            }
+            odone.TrySetResult(0);
+         });
+         
+         await odone.Task;
+         _fillsdisp = on_fills.Subscribe(f =>
+         {
+            foreach (var fill in f.added)
+            {
+               var fi = build_fill(sessionID, fill);
+               _router.send(fi, sessionID);
+            }
+            foreach (var fill in f.changed)
+            {
+               var fi = build_fill(sessionID, fill, true);
+               _router.send(fi, sessionID);
+            }
+         });
+      }
+
+
+      virtual protected void process_order_state(in OrderStateImmutable state, ref uint filled, ref uint leaves, ref double avgprx,
+                                                 ref QuickFix.Fields.OrdStatus fstatus, ref NativeOrderStateImmutable? native, FillImmutable? fill = null)
+      {
+         filled = state.FilledQuantity;
+         leaves = state.Quantity - state.FilledQuantity;
+         avgprx = state.AvgPrice;
+         fstatus = translate_status(state, ref native);         
+      }
+
+      protected bts.api.SecurityImmutable? resolve_execution_report_security(bts.api.SecurityImmutable? sec, ExecutionReport report)
+      {
+         report.SecurityExchange = convert_exchange(sec.Value.Exchange);
+         var sectype = sec.Value.security_type();
+         report.SecurityType = convert_security_type(sectype);
+         if (sec.Value.HasGlbx)
+            report.SecurityDesc = new SecurityDesc(sec.Value.Glbx.SecurityDesc);
+
+         switch (sectype)
+         {
+            case bts.api.SecurityType.Future:
+               report.MaturityMonthYear = new MaturityMonthYear(sec.Value.EarliestExpiration().ToString("yyyyMMdd"));
+               break;
+            case bts.api.SecurityType.Spread: //TODO this is not quite right for spreads of spreads            
+               var leg = sec.Value.Spread.Legs.OrderBy(x => x.Security.EarliestExpiration()).First();
+               report.MaturityMonthYear = new MaturityMonthYear(leg.Security.EarliestExpiration().ToString("yyyyMMdd"));
+               break;
+            default:
+               throw new UnsupportedMessageType();               
+         }
+         return sec;
+      }
+
+      virtual protected ExecutionReport build_fill(SessionID sess, in FillImmutable fill, bool change = false)
+      {
+         var exec = new QuickFix.Fields.ExecType(QuickFix.Fields.ExecType.PARTIAL_FILL);
+         QuickFix.Fields.OrdStatus status = new QuickFix.Fields.OrdStatus();
+         uint filled = 0; uint leaves = 0; double prx = 0.0; uint orig_qty = 0;
+         OrderRecordImmutable order;  NativeOrderStateImmutable? native = null;
+         if (_order_cache.TryGetValue(fill.OrderKey, out order))
+         {
+            orig_qty = order.State.Quantity;
+            process_order_state(order.State, ref filled, ref leaves, ref prx, ref status, ref native);
+            if(Convert.ToDouble(order.State.Quantity) == fill.LastShares)
+               exec = new QuickFix.Fields.ExecType(QuickFix.Fields.ExecType.FILL);
+         }
+         if (change)
+            exec = new QuickFix.Fields.ExecType(QuickFix.Fields.ExecType.TRADE_CORRECT);
+
+         var sec = _router.lookup(fill.SecurityKey);
+         ExecutionReport report = new ExecutionReport(
+             new OrderID(fill.OrderKey.ToString()),
+             new ExecID(fill.FillKey.ToString()),
+             new QuickFix.Fields.ExecTransType( ExecTransType.NEW ),
+             exec,
+             status,
+             new Symbol(sec?.Symbol ?? string.Empty),
+             new QuickFix.Fields.Side(fill.Side == bts.api.Side.Buy ? QuickFix.Fields.Side.BUY : QuickFix.Fields.Side.SELL),
+             new LeavesQty(leaves),
+             new CumQty(filled),
+             new AvgPx(Convert.ToDecimal(prx)));
+             
+         report.Account = new Account(fill.Account);
+         report.OrderQty = new OrderQty(orig_qty);
+         report.LastShares = new LastShares(Convert.ToDecimal(fill.LastShares));
+         report.LastPx = new LastPx(Convert.ToDecimal(fill.LastPrice));
+         var ts = fill.HasTimestamp ? fill.Timestamp.ToDateTime() : DateTime.MinValue;
+         report.TransactTime = new TransactTime(ts, true);
+         report.TradeDate = new TradeDate(ts.ToString("yyyyMMdd"));
+         sec = resolve_execution_report_security(sec, report);
+         if (native.HasValue && !string.IsNullOrEmpty(native.Value.ExchangeOrderId))
+            report.SecondaryOrderID = new SecondaryOrderID(native.Value.ExchangeOrderId);
+
+         if (sec.HasValue && sec.Value.security_type() == bts.api.SecurityType.Spread || 
+             sec.Value.security_type() == bts.api.SecurityType.Synthetic)
+         {
+            if (fill.FillKind == bts.api.orderman.Fill.Types.FillKind.Leg)
+               report.MultiLegReportingType = new MultiLegReportingType('2');
+            else
+               report.MultiLegReportingType = new MultiLegReportingType('3');
+         }
+         return report;
+      }
+
+      virtual protected ExecutionReport build_order_status(SessionID sess, in OrderRecordImmutable order, bool change = false)
+      {
+         var exec = new QuickFix.Fields.ExecType(QuickFix.Fields.ExecType.NEW);
+         if (_order_cache.TryGetValue(order.Key, out OrderRecordImmutable _))
+            exec = new QuickFix.Fields.ExecType(QuickFix.Fields.ExecType.ORDER_STATUS);
+            
+         QuickFix.Fields.OrdStatus status = new QuickFix.Fields.OrdStatus();         
+         uint filled = 0; uint leaves = 0; double prx = 0.0;  NativeOrderStateImmutable? native = null;
+         process_order_state(order.State, ref filled, ref leaves, ref prx, ref status, ref native);
+
+         var sec = _router.lookup(order.Def.SecurityKey);
+         ExecutionReport report = new ExecutionReport(
+             new OrderID(order.Key.ToString()),
+             new ExecID("0"),
+             new QuickFix.Fields.ExecTransType(ExecTransType.STATUS),
+             exec,
+             status,
+             new Symbol(sec?.Symbol ?? string.Empty),
+             new QuickFix.Fields.Side(order.Def.Side == bts.api.Side.Buy ? QuickFix.Fields.Side.BUY : QuickFix.Fields.Side.SELL),
+             new LeavesQty(leaves),
+             new CumQty(filled),
+             new AvgPx(Convert.ToDecimal(prx)));
+
+         report.Account = new Account(order.Def.Account);
+         report.OrderQty = new OrderQty(order.State.Quantity);
+         report.Price = new Price(Convert.ToDecimal(order.State.Price));
+         report.TimeInForce = new QuickFix.Fields.TimeInForce((char)order.Def.TimeInForce);
+         var ts = order.State.LastChange.ToDateTime();
+         report.TransactTime = new TransactTime(ts, true);
+         if(!string.IsNullOrEmpty(order.State.LastMsg))
+            report.Text = new Text(order.State.LastMsg);
+
+         sec = resolve_execution_report_security(sec, report);
+         if (native.HasValue)
+         {
+            report.OrdType = new OrdType((char)native.Value.NativeType);        
+            if(!string.IsNullOrEmpty(native.Value.ExchangeOrderId))
+               report.SecondaryOrderID = new SecondaryOrderID(native.Value.ExchangeOrderId);            
+         }
+         //TODO Big race here, we need a correlation id of some sort
+         if (_fix_clorderids.TryGetValue(order.Key, out string clorderid))
+         {
+            report.ClOrdID = new ClOrdID(clorderid);
+         }
+         return report;         
+      }      
+
+   }
+}
@@ -0,0 +1,8 @@
+using System;
+
+namespace bts.fix
+{
+   interface IFIXSession : QuickFix.IApplication
+   {
+   }
+}
@@ -0,0 +1,204 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+using QuickFix;
+using QuickFix.Fields;
+
+using bts.api;
+using bts.api.orderman;
+
+using QuickFix.FIX42;
+using Message = QuickFix.Message;
+
+namespace bts.fix
+{
+   /*
+create limit
+8=FIX.4.29=15635=D49=CQG56=SPARK34=150=3073797=N52=20200109-20:20:5011=900010081=ACC A21=255=SIM:ESH0207=SIM54=160=20200809-18:20:3238=1040=244=320059=010=129
+
+update limit
+8=FIX.4.29=11035=G49=CQG56=SPARK37=1341=9000100811=9000200821=155= ESH054=160=20200113-19:45:2938=1040=244=320110=017
+
+delete limit
+8=FIX.4.29=9335=F49=CQG56=SPARK41= 9000100837=1311=9000300855=ESH054=160=20200113-19:45:2738=1010=247
+
+create algo
+8=FIX.4.29=15635=D49=CQG56=SPARK34=150=3073797=N52=20200109-20:20:5011=900010081=ACC A21=255=SIM:ESH0207=SIM54=160=20200809-18:20:3238=1040=244=320059=06401=Lean8401=118402=28405=010=128
+
+      jake:
+      new
+      8=FIX.4.29=15635=D49=CQG56=SPARK34=150=3073797=N52=20200109-20:20:5011=86753091=ACC A21=255=SIM:ESH0207=SIM54=160=20200809-18:20:3238=1040=244=320059=010=128
+      cancel-replace
+      8=FIX.4.29=11035=G49=CQG56=SPARK37=1341=867530911=867531021=155=ESH054=160=20200113-19:45:2938=1040=244=320110=017
+      cancel
+      8=FIX.4.29=8935=F49=CQG56=SPARK41=867530937=1311=867531155=ESH054=160=20200113-19:45:2738=1010=123
+
+   */
+   class OrderSession : DropCopySession
+   {
+      readonly ATDL _atdl = new ATDL();
+      public OrderSession(IFixRouter router, SessionID sess) : base(router, sess)
+      {
+      }
+
+      override public void FromApp(Message message, SessionID sessionID)
+      {
+         Log.assert_d(sessionID.Equals(_sess));
+         MsgType type = Message.IdentifyType(message.ToString());
+         switch (type.getValue())
+         {
+            case MsgType.ORDER_STATUS_REQUEST: //handled in DropCopySession
+            case MsgType.SECURITYDEFINITIONREQUEST: //handled in DropCopySession
+
+            case MsgType.NEWORDERSINGLE:
+            case MsgType.ORDERCANCELREPLACEREQUEST:
+            case MsgType.ORDERCANCELREQUEST:
+               log_info("IN: " + message);
+               Crack(message, sessionID);
+               break;
+            default:
+               log_info("UNSUPPORTED MESSAGE IN: " + type.getValue());
+               throw new UnsupportedMessageType();
+         }
+      }
+
+      virtual public void OnMessage(OrderCancelRequest cancel, SessionID s)
+      {
+         var original_client_id = cancel.OrigClOrdID.getValue();
+         if (!base._external_id_vs_bts_key.ContainsKey(original_client_id))
+            throw new IncorrectTagValue(QuickFix.Fields.Tags.OrigClOrdID);
+         var key = base._external_id_vs_bts_key[original_client_id];
+         var resp = _orderservice.Value.cancel_order(new Cancel { OrderKey = key });
+         if (resp.ErrorCode != OrderError.Ok)
+         {
+            send_cancel_reject(s, resp.ErrorCode, "Cancel Rejected: " + resp.ErrorCode.ToString() + " - " + resp.Msg, cancel);
+         }
+      }
+
+      virtual public void OnMessage(OrderCancelReplaceRequest replace, SessionID s)
+      {
+         var original_client_id = replace.OrigClOrdID.getValue();
+         if (!base._external_id_vs_bts_key.ContainsKey(original_client_id))
+            throw new IncorrectTagValue(QuickFix.Fields.Tags.OrigClOrdID);
+         var key = base._external_id_vs_bts_key[original_client_id];
+         double price = Convert.ToDouble(replace.Price.getValue());
+         uint sz = Convert.ToUInt32(Math.Abs(replace.OrderQty.getValue()));
+         var upd = new Update
+         {
+            OrderKey = key,
+            Price = price,
+            Quantity = sz,
+            Custom = get_custom(replace),
+         };
+         var resp = _orderservice.Value.update_order(upd);
+         if (resp.ErrorCode != OrderError.Ok)
+         {
+            send_cancel_reject(s, resp.ErrorCode, "Cancel Rejected: " + resp.ErrorCode.ToString() + " - " + resp.Msg, replace);
+         }
+      }
+
+      virtual public void OnMessage(NewOrderSingle create, SessionID s)
+      {
+         Venue ven = Venue.Glbx;
+         if(create.IsSetSecurityExchange())
+            ven = convert_exchange(create.SecurityExchange);
+         if(create.IsSetExDestination())
+            ven = convert_exchange(create.ExDestination);
+         if (ven == bts.api.Venue.Unset)
+            throw new IncorrectTagValue(QuickFix.Fields.Tags.SecurityExchange);
+
+         var sec = _router.lookup(create.Symbol.getValue());
+         if (!sec.HasValue)
+            sec = _router.lookup(create.SecurityDesc.getValue());
+            
+         if (!sec.HasValue)
+            throw new IncorrectTagValue(QuickFix.Fields.Tags.Symbol);
+
+         OrderDefinition def = (OrderDefinition)ProtoFix.create_message(OrderDefinition.Descriptor, create);
+         def.SecurityKey = sec.Value.Id;
+         def.User = _login_name;
+         def.UserId = lookup_user(_login_name);
+         def.AccountId = lookup_account(def.Account);
+
+         Create cr = new Create();
+         def.CustomDef = get_custom(create);
+         cr.NewOrder = def;         
+         try
+         {
+            if (create.IsSetPrice())
+               cr.Price = Convert.ToDouble(create.Price.getValue());
+         }
+         catch { throw new IncorrectTagValue(QuickFix.Fields.Tags.Price); }
+         try
+         {
+            if(!create.IsSetOrderQty() || create.OrderQty.getValue() < 0)
+               throw new IncorrectTagValue(QuickFix.Fields.Tags.OrderQty);
+            cr.Quantity = Convert.ToUInt32(Math.Abs(create.OrderQty.getValue()));
+         }
+         catch { throw new IncorrectTagValue(QuickFix.Fields.Tags.OrderQty); }
+         if (!create.IsSetClOrdID())
+            throw new IncorrectTagValue(QuickFix.Fields.Tags.ClOrdID);
+         else
+            def.ExternalOrderId = create.ClOrdID.ToString();
+            
+         var resp = _orderservice.Value.create_order(cr);
+         _fix_clorderids[resp.OrderKey] = create.ClOrdID.getValue();         
+         if (resp.ErrorCode != OrderError.Ok)
+         {
+            _router.send_biz_reject(s, "Order Rejected: " + resp.ErrorCode.ToString() + " - " + resp.Msg, create);
+         }
+      }
+      
+      CustomOrderDefinition get_custom(Message fix)
+      {
+         FIXAlgoDefinition.Descriptor.FindFieldByNumber(FIXAlgoDefinition.NameFieldNumber).
+            CustomOptions.TryGetInt32((int)ApioptionsReflection.FieldOptions.fix_tag, out int algotag);      
+         if(fix.IsSetField(algotag))
+         {
+            string algotype = fix.GetString(algotag);
+            if(!_atdl.algo_definitions.TryGetValue(algotype, out FIXAlgoDefinition algodef))
+               throw new IncorrectTagValue(algotag);
+            else
+            {
+               var custom = algodef.Definition.Clone();
+               foreach (var fd in CustomOrderDefinition.Descriptor.Fields.InDeclarationOrder())
+               {
+                  var val = fd.Accessor.GetValue(custom);
+                  if(val != null && val is Google.Protobuf.IMessage valmsg)
+                  {
+                     ProtoFix.setup_message(valmsg, fix);
+                     break;
+                  }
+               }
+               return custom;
+            }
+         }
+         else
+         {
+            if(!fix.IsSetField(QuickFix.Fields.Tags.OrdType))
+               throw new IncorrectTagValue(QuickFix.Fields.Tags.OrdType);
+            switch (fix.GetChar(QuickFix.Fields.Tags.OrdType))
+            {
+               case '1':
+                  return new CustomOrderDefinition { Market = new MarketOrderDefinition() };
+               case '2':
+                  return new CustomOrderDefinition { Limit = new LimitOrderDefinition() };
+               case '3':
+                  return new CustomOrderDefinition { Stop = new StopOrderDefinition() 
+                  { 
+                     StopPrice = Convert.ToDouble(fix.GetDecimal(QuickFix.Fields.Tags.StopPx)) } 
+                  };
+               case '4':
+                  return new CustomOrderDefinition { StopLimit = new StopLimitOrderDefinition() 
+                  {
+                     StopPrice = Convert.ToDouble(fix.GetDecimal(QuickFix.Fields.Tags.StopPx)) }
+                  };
+               default:
+                  throw new IncorrectTagValue(QuickFix.Fields.Tags.OrdType);
+            }            
+         }
+      }
+   }
+}
@@ -0,0 +1,383 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reactive.Linq;
+using System.Reactive.Concurrency;
+using System.Text;
+using System.Collections.Concurrent;
+using System.Runtime.CompilerServices;
+
+using QuickFix;
+using QuickFix.Fields;
+
+using mbts;
+using bts.api;
+using bts.api.core;
+using bts.api.orderman;
+using bts.api.user;
+using bts.api.admin;
+
+using QuickFix.FIX42;
+using Message = QuickFix.Message;
+
+namespace bts.fix
+{
+   abstract class SessionBase : QuickFix.MessageCracker, IFIXSession
+   {      
+      protected static AuthService _authservice = bts.api.Locator.locate<AuthService>();      
+      protected static Lazy<AdminService> _adminservice = new Lazy<AdminService>(() => bts.api.Locator.locate<AdminService>(), true);
+      protected static Lazy<bts.metrics.ShellLatencyService> _latencyservice = 
+         new Lazy<bts.metrics.ShellLatencyService>(() => bts.api.Locator.locate<bts.metrics.ShellLatencyService>(), true);
+
+      protected string _login_name;
+      protected AuthToken _token;
+
+      protected IDisposable _admindisp;
+      protected IObservable<AdminModelWrapper> _adminobservable;
+      protected AdminDataImmutable? _admin_data;      
+
+      protected readonly IFixRouter _router;
+      protected readonly SessionID _sess;
+      
+      public SessionBase(IFixRouter router, SessionID sess)
+      {
+         _router = router;
+         _sess = sess;
+
+         _clockdisp = _latencyservice.Value.subscribe_clock().Subscribe(x =>
+         {
+            var t = x.all.FirstOrDefault();
+            if(t != null)
+               _clock = t.Timestamp;
+         });
+
+         _adminobservable = _adminservice.Value.subscribei_admin_data().Select(x =>
+         {
+            return new AdminModelWrapper(x.all.TryFirst(), _login_name);
+         });
+         _admindisp = _adminobservable.Subscribe(x => _admin_data = x.admin_data);         
+      }
+
+      abstract public void FromApp(Message message, SessionID sessionID);
+      abstract public void OnLogon(SessionID sessionID); //subscribe to your stuff 
+      abstract public void OnLogout(SessionID sessionID); //unsub
+      
+      virtual public void ToApp(Message message, SessionID sessionID)
+      {
+         Log.assert_d(sessionID.Equals(_sess));
+         log_info("OUT: " + message);
+      }
+
+      readonly IDisposable _clockdisp; ulong _clock = 0;
+      virtual public void FromAdmin(Message message, SessionID sessionID)
+      {
+         Log.assert_d(sessionID.Equals(_sess));
+
+         MsgType type = Message.IdentifyType(message.ToString());
+         switch (type.getValue())
+         {
+            case MsgType.LOGON:
+               {
+                  try
+                  {
+                     Logon msg = (Logon)message;
+
+                     var fixlogin = new QuickFix.Fields.SenderCompID();
+                     string login = msg.Header.GetString(fixlogin.Tag).ToLower();
+                     // var fixuser = new QuickFix.Fields.TargetSubID();
+                     // string user = msg.Header.GetString(fixuser.Tag);
+                     _login_name = login;
+                     string pass = string.Empty;                     
+                     if(msg.IsSetRawData())
+                        pass = msg.RawData.getValue();
+                     var resp = _authservice.authenticate_login(new AuthenticateLoginRequest { 
+                                                                Login = login, Password = pass});
+                     if (resp != null && resp.IsValid)
+                        _token = resp.Token;
+                     else
+                        throw new RejectLogon("Logon rejected " + resp?.Reason ?? string.Empty);
+                  }
+                  catch (RejectLogon)
+                  {
+                     throw;
+                  }
+                  catch (Exception ex)
+                  {
+                     throw new RejectLogon("Logon rejected " + ex.ToString());
+                  }
+               }
+               break;
+            case MsgType.HEARTBEAT:
+               {
+                  Heartbeat hb = (Heartbeat)message;
+                  handle_heartbeat(hb, sessionID);
+               }
+               break;               
+            default:
+               log_info("ADMININ: " + message);
+               break;
+         }
+      }
+
+      async protected void handle_heartbeat(Heartbeat hb, SessionID sessionID)
+      {
+         var resp = await _latencyservice.Value.report_async(new bts.metrics.Report { HostName = "BTSFIX_" + sessionID.ToString(), 
+                                                                                      Timestamp = _clock, User = _login_name });
+         if (resp.success)
+            _router.send(hb, sessionID);         
+      }
+
+      virtual public void ToAdmin(Message message, SessionID sessionID)
+      {
+         Log.assert_d(sessionID.Equals(_sess));
+         log_info("ADMINOUT: " + message);
+      }
+
+      virtual public void OnCreate(SessionID sessionID)
+      {
+         log_info("CREATE");
+      }
+
+      virtual public void OnMessage(BusinessMessageReject n, SessionID s)
+      {
+         //Log.assert(false, "biz reject wtf " + n.EncodedText.getValue());
+         Log.FIX.warn(_sess.ToString() + " Business Reject " + n.BusinessRejectReason.getValue() + " " + n.Text.getValue());
+      }
+      virtual public void OnMessage(News n, SessionID s)
+      {
+         log_info("news " + n.EncodedHeadline.getValue());
+      }      
+
+
+      protected void log_info(string message, [CallerFilePath] string file = "", [CallerLineNumber] int line = 0)
+      {
+         Log.FIX.info(_sess.ToString() + " " + message, file, line);
+      }
+
+      protected void log_error(string message, [CallerFilePath] string file = "", [CallerLineNumber] int line = 0)
+      {
+         Log.FIX.error(_sess.ToString() + " " + message, file, line);
+      }
+
+      protected void send_cancel_reject(SessionID sess, OrderError reject_reason, string text, Message refmessage)
+      {
+         OrderCancelReject rej = new OrderCancelReject();
+         if (reject_reason == OrderError.UnknownOrder) {
+            rej.CxlRejReason = new CxlRejReason(CxlRejReason.UNKNOWN_ORDER);
+            rej.OrdStatus = new OrdStatus(OrdStatus.REJECTED);
+            rej.OrderID = new OrderID("NONE");
+         }
+
+         if (refmessage is QuickFix.FIX42.OrderCancelRequest cancel)
+         {
+            if (cancel.IsSetClOrdID())
+               rej.SetField(cancel.ClOrdID);
+            if (cancel.IsSetOrigClOrdID())
+               rej.SetField(cancel.OrigClOrdID);
+            if (cancel.IsSetOrderID() && reject_reason != OrderError.UnknownOrder)
+               rej.SetField(cancel.OrderID);
+            rej.CxlRejResponseTo = new CxlRejResponseTo(CxlRejResponseTo.ORDER_CANCEL_REQUEST);
+            rej.Text = new Text(text);
+            _router.send(rej, sess);
+         }
+         else if (refmessage is OrderCancelReplaceRequest replace)
+         {
+            if (replace.IsSetClOrdID())
+               rej.SetField(replace.ClOrdID);
+            if (replace.IsSetOrigClOrdID())
+               rej.SetField(replace.OrigClOrdID);
+            if (replace.IsSetOrderID() && reject_reason != OrderError.UnknownOrder)
+               rej.SetField(replace.OrderID);
+            rej.CxlRejResponseTo = new CxlRejResponseTo(CxlRejResponseTo.ORDER_CANCEL_REPLACE_REQUEST);
+            rej.Text = new Text(text);
+            _router.send(rej, sess);
+         }
+         else 
+            throw new UnsupportedMessageType();
+      }      
+
+      protected bool security_types_equal(bts.api.SecurityType btstype, QuickFix.Fields.SecurityType fixtype)
+      {
+         return btstype == convert_security_type(fixtype);
+      }
+
+      protected QuickFix.Fields.SecurityType convert_security_type(bts.api.SecurityType btstype)
+      {
+         switch (btstype)
+         {
+            case bts.api.SecurityType.Future:
+               return new QuickFix.Fields.SecurityType("FUT");
+            case bts.api.SecurityType.Option:
+               return new QuickFix.Fields.SecurityType("OPT");
+            case bts.api.SecurityType.Spread:
+               return new QuickFix.Fields.SecurityType("MLEG");
+            case bts.api.SecurityType.Stock:
+               return new QuickFix.Fields.SecurityType("CS");
+            case bts.api.SecurityType.Synthetic:
+               return new QuickFix.Fields.SecurityType("SYNTH");
+            default:
+               return new QuickFix.Fields.SecurityType();
+         }
+      }
+
+      protected bts.api.SecurityType convert_security_type(QuickFix.Fields.SecurityType fixtype)
+      {
+         switch (fixtype.getValue())
+         {
+            case "FUT":
+               return bts.api.SecurityType.Future;
+            case "OPT":
+               return bts.api.SecurityType.Option;
+            case "MLEG":
+               return bts.api.SecurityType.Spread;
+            case "CS":
+               return bts.api.SecurityType.Stock;
+            case "SYNTH":
+               return bts.api.SecurityType.Synthetic;
+            default:
+               return bts.api.SecurityType.Unset;
+         }
+      }
+
+      protected bool exchanges_equal(bts.api.Venue btstype, QuickFix.Fields.SecurityExchange fixtype)
+      {
+         return btstype == convert_exchange(fixtype);
+      }
+
+      protected QuickFix.Fields.SecurityExchange convert_exchange(bts.api.Venue btstype)
+      {
+         switch (btstype)
+         {
+            case bts.api.Venue.Bts:
+               return new QuickFix.Fields.SecurityExchange("BTS");
+            case bts.api.Venue.Cboe:
+               return new QuickFix.Fields.SecurityExchange("XCBO");
+            case bts.api.Venue.Cboecfe:
+               return new QuickFix.Fields.SecurityExchange("XCBF");
+            case bts.api.Venue.Glbx:
+               return new QuickFix.Fields.SecurityExchange("XCME");
+            case bts.api.Venue.Ice:
+               return new QuickFix.Fields.SecurityExchange("IEPA");
+            case bts.api.Venue.Sim:
+               return new QuickFix.Fields.SecurityExchange("SIM");
+            default:
+               return new QuickFix.Fields.SecurityExchange();
+         }
+      }
+
+      protected bts.api.Venue convert_exchange(QuickFix.Fields.SecurityExchange fixtype)
+      {
+         return convert_exchange(fixtype.getValue());
+      }
+
+      protected bts.api.Venue convert_exchange(QuickFix.Fields.ExDestination fixtype)
+      {
+         return convert_exchange(fixtype.getValue());
+      }      
+
+      protected bts.api.Venue convert_exchange(string venue)
+      {
+         switch (venue)
+         {
+            case "BTS":
+               return bts.api.Venue.Bts;
+            case "XCBO":
+               return bts.api.Venue.Cboe;
+            case "XCBF":
+               return bts.api.Venue.Cboecfe;
+            case "GLBX":
+            case "XCME":
+            case "XCBT":
+            case "XCEC":
+            case "XNYM":
+               return bts.api.Venue.Glbx;
+            case "IEPA":
+            case "IFUS":
+            case "IFEU":
+            case "IFLL":
+               return bts.api.Venue.Ice;
+            case "SIM":
+               return bts.api.Venue.Sim;
+            default:
+               return bts.api.Venue.Unset;
+         }
+      }      
+
+      protected QuickFix.Fields.OrdStatus translate_status(in bts.api.orderman.OrderStateImmutable state, 
+                                                           ref bts.api.orderman.NativeOrderStateImmutable? native)
+      {
+         native = null;
+         if (state.HasMarket && state.Market.HasNativeState && state.Market.NativeState.NativeStatus != NativeOrderStatus.Unacknowledged)
+         {
+            native = state.Market.NativeState;
+            return new OrdStatus((char)native?.NativeStatus);
+         }
+         else if (state.HasLimit && state.Limit.HasNativeState && state.Limit.NativeState.NativeStatus != NativeOrderStatus.Unacknowledged)
+         {
+            native = state.Limit.NativeState;
+            return new OrdStatus((char)native?.NativeStatus);
+         }
+         else if (state.HasStop && state.Stop.HasNativeState && state.Stop.NativeState.NativeStatus != NativeOrderStatus.Unacknowledged)
+         {
+            native = state.Stop.NativeState;
+            return new OrdStatus((char)native?.NativeStatus);
+         }
+         else if (state.HasStopLimit && state.StopLimit.HasNativeState && state.StopLimit.NativeState.NativeStatus != NativeOrderStatus.Unacknowledged)
+         {
+            native = state.StopLimit.NativeState;
+            return new OrdStatus((char)native?.NativeStatus);
+         }
+         else
+         {
+            switch (state.Status)
+            {
+               case OrderStatus.Canceled:
+                  return new OrdStatus(OrdStatus.CANCELED);
+               case OrderStatus.Completed:
+                  return new OrdStatus(OrdStatus.FILLED);
+               case OrderStatus.Disconnected:
+                  return new OrdStatus(OrdStatus.STOPPED);
+               case OrderStatus.Error:
+                  return new OrdStatus(OrdStatus.REJECTED);
+               case OrderStatus.Inactive:
+                  return new OrdStatus(OrdStatus.PENDING_NEW);
+               case OrderStatus.PendingWorking:
+                  return new OrdStatus(OrdStatus.PENDING_NEW);
+               case OrderStatus.RejectedBySpark:
+                  return new OrdStatus(OrdStatus.REJECTED);
+               case OrderStatus.Working:
+                  {
+                     if (state.FilledQuantity < state.Quantity)
+                        return new OrdStatus(OrdStatus.PARTIALLY_FILLED);
+                     else
+                        return new OrdStatus(OrdStatus.NEW);
+                  }
+               default:
+                  return new OrdStatus();
+            }
+         }
+      }
+
+      protected uint lookup_account(string acct)
+      {
+         if (_admin_data.HasValue)
+         {
+            var ac = _admin_data.Value.Accounts.Where(x => x.Name == acct).TryFirst();
+            if(ac.HasValue)
+               return ac.Value.Id;
+         }
+         throw new IncorrectTagValue(new Account().Tag);
+      }
+      
+      protected uint lookup_user(string user)
+      {
+         if (_admin_data.HasValue)
+         {
+            var ac = _admin_data.Value.Users.Where(x => x.Name == user).TryFirst();
+            if (ac.HasValue)
+               return ac.Value.Id;
+         }
+         throw new IncorrectTagValue(new Username().Tag);
+      }
+   }
+}
@@ -0,0 +1,90 @@
+{
+  "algoStrategy": [
+    {
+      "name": "TickAndCover",
+      "definition": 
+      {
+        "cover": 
+        {
+          "child": 
+          {
+            "top": { "child": { "limit": {} } }
+          },
+          "hedge": 
+          {
+            "lean": { "child": { "limit": {} } }
+          }
+        }
+      }
+    },
+    {
+      "name": "SmashAndCover",
+      "definition": 
+      {
+        "cover": 
+        {
+          "child": 
+          {
+            "lean": { "child": { "limit": {} } }
+          },
+          "hedge": 
+          {
+            "lean": { "child": { "limit": {} } }
+          }
+        }
+      }
+    },
+    {
+      "name": "JoinAndCover",
+      "definition": 
+      {
+        "cover": 
+        {
+          "child": 
+          {
+            "join": { "child": { "limit": {} } }
+          },
+          "hedge": 
+          {
+            "lean": { "child": { "limit": {} } }
+          }
+        }
+      }
+    },    
+    {
+      "name": "Prorata",
+      "definition": 
+      {
+        "prorata": 
+        {
+          "child":  { "limit": {} },
+          "hedge": 
+          {
+            "scratch": { "child": { "limit": {} } }
+          },
+          "overfill_hedge": 
+          {
+            "lean": { "child": { "limit": {} } }
+          }          
+        }
+      }
+    },    
+    { "name": "Top", "definition":  { "top": { "child": { "limit": {} } } } },
+    { "name": "Cover", 
+      "definition":  
+      { 
+         "cover": 
+         { 
+            "child" : { "limit": {} }, 
+            "hedge" : { "limit": {} }
+         }
+      }
+    }, 
+    { "name": "Lean", "definition":  { "lean": { "child": { "limit": {} } } } },
+    { "name": "Join", "definition":  { "join": { "child": { "limit": {} } } } }, 
+    { "name": "Iceberg", "definition":  { "iceberg": { "child": { "limit": {} } } } }, 
+    { "name": "Scratch", "definition":  { "scratch": { "child": { "limit": {} } } } }, 
+    { "name": "Spreader", "definition":  { "spreader": {  } } },
+    { "name": "ISpreader", "definition":  { "iceberg": { "child": { "spreader": {} } } } }
+  ]
+}
@@ -0,0 +1,42 @@
+#http://www.quickfixengine.org/quickfix/doc/html/configuration.html
+#https://www.onixs.biz/fix-dictionary.html
+
+[DEFAULT]
+ConnectionType=acceptor
+SocketAcceptPort=5001
+SocketReuseAddress=Y
+StartTime=00:00:00
+EndTime=00:00:00
+FileLogPath=log
+UseDataDictionary=N
+ResetOnLogon=Y
+ResetOnLogout=Y
+ResetOnDisconnect=Y
+
+HeartBtInt=30
+LogonTimeout=30
+
+SSLEnable=N
+# SSLEnable=Y
+# # It is recommended to install the certificate and refer to it by name instead of using filename + password
+# SSLCertificate=QuickFixn-TestServer.pfx
+# SSLCertificatePassword=QuickFixn-TestServer
+# # For production refer to certificate by name instead: SSLCertificate=CN=QuickFixn-TestServer
+# SSLCACertificate=QuickFixn-TestCA.cer
+# SSLCheckCertificateRevocation=N
+
+
+[SESSION]
+BeginString=FIX.4.2
+SenderCompID=SPARK
+TargetCompID=CQG
+FileStorePath=store
+DataDictionary=./spec/fix/FIX42.xml
+
+[SESSION]
+BeginString=FIX.4.2
+SenderCompID=SPARK
+TargetCompID=CLIENT2
+FileStorePath=store
+DataDictionary=./spec/fix/FIX42.xml
+
@@ -0,0 +1,46 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>  
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
+    
+    <Authors>Blue Trading Systems</Authors>
+    <Company>Blue Trading Systems</Company>
+    <Product>Spark</Product>
+    <Description />
+    <Platforms>x64</Platforms>
+    <PlatformTarget>x64</PlatformTarget>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <WarningsAsErrors />
+    <LangVersion>7.2</LangVersion>
+    <Version>1.0.0</Version>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <PackageReference Include="Google.Protobuf" Version="3.6.1" />
+    <PackageReference Include="System.Reactive" Version="3.1.1" />
+    <PackageReference Include="System.Reactive.PlatformServices" Version="3.1.1" />
+	 <PackageReference Include="NUnit" Version="3.10.1" />  
+    
+    <PackageReference Include="QuickFix.Net.NETCore" Version="1.8.1" />     
+    <PackageReference Include="QuickFix.Net.NETCore.FIX42" Version="1.8.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />         
+  </ItemGroup>
+
+  <ItemGroup> 
+    <ProjectReference Include="../spark_api/spark_api.csproj"/>
+    <ProjectReference Include="../spark_core/spark_core.csproj"/>
+  </ItemGroup>
+  
+  <Target Name="copy_fix" AfterTargets="PostBuildEvent"  >
+    <Copy SourceFiles="./spark_fix.cfg" DestinationFolder="$(OutputPath)/" SkipUnchangedFiles="true" />
+    <Copy SourceFiles="./spark_algos.json" DestinationFolder="$(OutputPath)/" SkipUnchangedFiles="true" />
+    <Copy SourceFiles="./spec/fix/FIX42.xml" DestinationFolder="$(OutputPath)/spec/fix/" SkipUnchangedFiles="true" />
+    <Copy SourceFiles="./spec/fix/FIX44.xml" DestinationFolder="$(OutputPath)/spec/fix/" SkipUnchangedFiles="true" />
+  </Target>  
+  
+  <Target Name="copy_fix471" AfterTargets="PostBuildEvent"  >
+    <Copy SourceFiles="./spark_fix.cfg" DestinationFolder="$(OutputPath)/../net471" SkipUnchangedFiles="true" />
+    <Copy SourceFiles="./spark_algos.json" DestinationFolder="$(OutputPath)/../net471" SkipUnchangedFiles="true" />
+    <Copy SourceFiles="./spec/fix/FIX42.xml" DestinationFolder="$(OutputPath)/../net471/spec/fix/" SkipUnchangedFiles="true" />
+    <Copy SourceFiles="./spec/fix/FIX44.xml" DestinationFolder="$(OutputPath)/../net471/spec/fix/" SkipUnchangedFiles="true" />
+  </Target>  
+</Project>
@@ -0,0 +1,828 @@
+<fix major="4" minor="0">
+  <header>
+    <field name="BeginString" required="Y"/>
+    <field name="BodyLength" required="Y"/>
+    <field name="MsgType" required="Y"/>
+    <field name="SenderCompID" required="Y"/>
+    <field name="TargetCompID" required="Y"/>
+    <field name="OnBehalfOfCompID" required="N"/>
+    <field name="DeliverToCompID" required="N"/>
+    <field name="SecureDataLen" required="N"/>
+    <field name="SecureData" required="N"/>
+    <field name="MsgSeqNum" required="Y"/>
+    <field name="SenderSubID" required="N"/>
+    <field name="TargetSubID" required="N"/>
+    <field name="OnBehalfOfSubID" required="N"/>
+    <field name="DeliverToSubID" required="N"/>
+    <field name="PossDupFlag" required="N"/>
+    <field name="PossResend" required="N"/>
+    <field name="SendingTime" required="Y"/>
+    <field name="OrigSendingTime" required="N"/>
+  </header>
+  <trailer>
+    <field name="SignatureLength" required="N"/>
+    <field name="Signature" required="N"/>
+    <field name="CheckSum" required="Y"/>
+  </trailer>
+  <messages>
+    <message name="Heartbeat" msgtype="0" msgcat="admin">
+      <field name="TestReqID" required="N"/>
+    </message>
+    <message name="Logon" msgtype="A" msgcat="admin">
+      <field name="EncryptMethod" required="Y"/>
+      <field name="HeartBtInt" required="Y"/>
+      <field name="RawDataLength" required="N"/>
+      <field name="RawData" required="N"/>
+    </message>
+    <message name="TestRequest" msgtype="1" msgcat="admin">
+      <field name="TestReqID" required="Y"/>
+    </message>
+    <message name="ResendRequest" msgtype="2" msgcat="admin">
+      <field name="BeginSeqNo" required="Y"/>
+      <field name="EndSeqNo" required="Y"/>
+    </message>
+    <message name="Reject" msgtype="3" msgcat="admin">
+      <field name="RefSeqNum" required="Y"/>
+      <field name="Text" required="N"/>
+    </message>
+    <message name="SequenceReset" msgtype="4" msgcat="admin">
+      <field name="GapFillFlag" required="N"/>
+      <field name="NewSeqNo" required="Y"/>
+    </message>
+    <message name="Logout" msgtype="5" msgcat="admin">
+      <field name="Text" required="N"/>
+    </message>
+    <message name="Advertisement" msgtype="7" msgcat="app">
+      <field name="AdvId" required="Y"/>
+      <field name="AdvTransType" required="Y"/>
+      <field name="AdvRefID" required="N"/>
+      <field name="Symbol" required="Y"/>
+      <field name="SymbolSfx" required="N"/>
+      <field name="SecurityID" required="N"/>
+      <field name="IDSource" required="N"/>
+      <field name="Issuer" required="N"/>
+      <field name="SecurityDesc" required="N"/>
+      <field name="AdvSide" required="Y"/>
+      <field name="Shares" required="Y"/>
+      <field name="Price" required="N"/>
+      <field name="Currency" required="N"/>
+      <field name="TransactTime" required="N"/>
+      <field name="Text" required="N"/>
+    </message>
+    <message name="IndicationofInterest" msgtype="6" msgcat="app">
+      <field name="IOIid" required="Y"/>
+      <field name="IOITransType" required="Y"/>
+      <field name="IOIRefID" required="N"/>
+      <field name="Symbol" required="Y"/>
+      <field name="SymbolSfx" required="N"/>
+      <field name="SecurityID" required="N"/>
+      <field name="IDSource" required="N"/>
+      <field name="Issuer" required="N"/>
+      <field name="SecurityDesc" required="N"/>
+      <field name="Side" required="Y"/>
+      <field name="IOIShares" required="Y"/>
+      <field name="Price" required="N"/>
+      <field name="Currency" required="N"/>
+      <field name="ValidUntilTime" required="N"/>
+      <field name="IOIQltyInd" required="N"/>
+      <field name="IOIOthSvc" required="N"/>
+      <field name="IOINaturalFlag" required="N"/>
+      <field name="IOIQualifier" required="N"/>
+      <field name="Text" required="N"/>
+    </message>
+    <message name="News" msgtype="B" msgcat="app">
+      <field name="OrigTime" required="N"/>
+      <field name="Urgency" required="N"/>
+      <field name="RelatdSym" required="N" repeating="Y"/>
+      <group name="LinesOfText" required="Y">
+        <field name="Text" required="Y"/>
+      </group>
+      <field name="RawDataLength" required="N"/>
+      <field name="RawData" required="N"/>
+    </message>
+    <message name="Email" msgtype="C" msgcat="app">
+      <field name="EmailType" required="Y"/>
+      <field name="OrigTime" required="N"/>
+      <field name="RelatdSym" required="N" repeating="Y"/>
+      <field name="OrderID" required="N"/>
+      <field name="ClOrdID" required="N"/>
+      <group name="LinesOfText" required="Y">
+        <field name="Text" required="Y"/>
+      </group>
+      <field name="RawDataLength" required="N"/>
+      <field name="RawData" required="N"/>
+    </message>
+    <message name="QuoteRequest" msgtype="R" msgcat="app">
+      <field name="QuoteReqID" required="Y"/>
+      <field name="Symbol" required="Y"/>
+      <field name="SymbolSfx" required="N"/>
+      <field name="SecurityID" required="N"/>
+      <field name="IDSource" required="N"/>
+      <field name="Issuer" required="N"/>
+      <field name="SecurityDesc" required="N"/>
+      <field name="PrevClosePx" required="N"/>
+      <field name="Side" required="N"/>
+      <field name="OrderQty" required="N"/>
+    </message>
+    <message name="Quote" msgtype="S" msgcat="app">
+      <field name="QuoteReqID" required="N"/>
+      <field name="QuoteID" required="Y"/>
+      <field name="Symbol" required="Y"/>
+      <field name="SymbolSfx" required="N"/>
+      <field name="SecurityID" required="N"/>
+      <field name="IDSource" required="N"/>
+      <field name="Issuer" required="N"/>
+      <field name="SecurityDesc" required="N"/>
+      <field name="BidPx" required="Y"/>
+      <field name="OfferPx" required="N"/>
+      <field name="BidSize" required="N"/>
+      <field name="OfferSize" required="N"/>
+      <field name="ValidUntilTime" required="N"/>
+    </message>
+    <message name="NewOrderSingle" msgtype="D" msgcat="app">
+      <field name="ClOrdID" required="Y"/>
+      <field name="ClientID" required="N"/>
+      <field name="ExecBroker" required="N"/>
+      <field name="Account" required="N"/>
+      <field name="SettlmntTyp" required="N"/>
+      <field name="FutSettDate" required="N"/>
+      <field name="HandlInst" required="Y"/>
+      <field name="ExecInst" required="N"/>
+      <field name="MinQty" required="N"/>
+      <field name="MaxFloor" required="N"/>
+      <field name="ExDestination" required="N"/>
+      <field name="ProcessCode" required="N"/>
+      <field name="Symbol" required="Y"/>
+      <field name="SymbolSfx" required="N"/>
+      <field name="SecurityID" required="N"/>
+      <field name="IDSource" required="N"/>
+      <field name="Issuer" required="N"/>
+      <field name="SecurityDesc" required="N"/>
+      <field name="PrevClosePx" required="N"/>
+      <field name="Side" required="Y"/>
+      <field name="LocateReqd" required="N"/>
+      <field name="OrderQty" required="Y"/>
+      <field name="OrdType" required="Y"/>
+      <field name="Price" required="N"/>
+      <field name="StopPx" required="N"/>
+      <field name="Currency" required="N"/>
+      <field name="IOIid" required="N"/>
+      <field name="QuoteID" required="N"/>
+      <field name="TimeInForce" required="N"/>
+      <field name="ExpireTime" required="N"/>
+      <field name="Commission" required="N"/>
+      <field name="CommType" required="N"/>
+      <field name="Rule80A" required="N"/>
+      <field name="ForexReq" required="N"/>
+      <field name="SettlCurrency" required="N"/>
+      <field name="Text" required="N"/>
+    </message>
+    <message name="ExecutionReport" msgtype="8" msgcat="app">
+      <field name="OrderID" required="Y"/>
+      <field name="ClOrdID" required="N"/>
+      <field name="ClientID" required="N"/>
+      <field name="ExecBroker" required="N"/>
+      <field name="ListID" required="N"/>
+      <field name="ExecID" required="Y"/>
+      <field name="ExecTransType" required="Y"/>
+      <field name="ExecRefID" required="N"/>
+      <field name="OrdStatus" required="Y"/>
+      <field name="OrdRejReason" required="N"/>
+      <field name="Account" required="N"/>
+      <field name="SettlmntTyp" required="N"/>
+      <field name="FutSettDate" required="N"/>
+      <field name="Symbol" required="Y"/>
+      <field name="SymbolSfx" required="N"/>
+      <field name="SecurityID" required="N"/>
+      <field name="IDSource" required="N"/>
+      <field name="Issuer" required="N"/>
+      <field name="SecurityDesc" required="N"/>
+      <field name="Side" required="Y"/>
+      <field name="OrderQty" required="Y"/>
+      <field name="OrdType" required="N"/>
+      <field name="Price" required="N"/>
+      <field name="StopPx" required="N"/>
+      <field name="Currency" required="N"/>
+      <field name="TimeInForce" required="N"/>
+      <field name="ExpireTime" required="N"/>
+      <field name="ExecInst" required="N"/>
+      <field name="Rule80A" required="N"/>
+      <field name="LastShares" required="Y"/>
+      <field name="LastPx" required="Y"/>
+      <field name="LastMkt" required="N"/>
+      <field name="LastCapacity" required="N"/>
+      <field name="CumQty" required="Y"/>
+      <field name="AvgPx" required="Y"/>
+      <field name="TradeDate" required="N"/>
+      <field name="TransactTime" required="N"/>
+      <field name="ReportToExch" required="N"/>
+      <field name="Commission" required="N"/>
+      <field name="CommType" required="N"/>
+      <group name="NoMiscFees" required="N">
+        <field name="MiscFeeAmt" required="N"/>
+        <field name="MiscFeeCurr" required="N"/>
+        <field name="MiscFeeType" required="N"/>
+      </group>
+      <field name="NetMoney" required="N"/>
+      <field name="SettlCurrAmt" required="N"/>
+      <field name="SettlCurrency" required="N"/>
+      <field name="Text" required="N"/>
+    </message>
+    <message name="DontKnowTrade" msgtype="Q" msgcat="app">
+      <field name="OrderID" required="N"/>
+      <field name="ExecID" required="N"/>
+      <field name="DKReason" required="Y"/>
+      <field name="Symbol" required="Y"/>
+      <field name="Side" required="Y"/>
+      <field name="OrderQty" required="Y"/>
+      <field name="LastShares" required="Y"/>
+      <field name="LastPx" required="Y"/>
+      <field name="Text" required="N"/>
+    </message>
+    <message name="OrderCancelReplaceRequest" msgtype="G" msgcat="app">
+      <field name="OrderID" required="N"/>
+      <field name="ClientID" required="N"/>
+      <field name="ExecBroker" required="N"/>
+      <field name="OrigClOrdID" required="Y"/>
+      <field name="ClOrdID" required="Y"/>
+      <field name="ListID" required="N"/>
+      <field name="Account" required="N"/>
+      <field name="SettlmntTyp" required="N"/>
+      <field name="FutSettDate" required="N"/>
+      <field name="HandlInst" required="Y"/>
+      <field name="ExecInst" required="N"/>
+      <field name="MinQty" required="N"/>
+      <field name="MaxFloor" required="N"/>
+      <field name="ExDestination" required="N"/>
+      <field name="Symbol" required="Y"/>
+      <field name="SymbolSfx" required="N"/>
+      <field name="SecurityID" required="N"/>
+      <field name="IDSource" required="N"/>
+      <field name="Issuer" required="N"/>
+      <field name="SecurityDesc" required="N"/>
+      <field name="Side" required="Y"/>
+      <field name="OrderQty" required="Y"/>
+      <field name="OrdType" required="Y"/>
+      <field name="Price" required="N"/>
+      <field name="StopPx" required="N"/>
+      <field name="Currency" required="N"/>
+      <field name="TimeInForce" required="N"/>
+      <field name="ExpireTime" required="N"/>
+      <field name="Commission" required="N"/>
+      <field name="CommType" required="N"/>
+      <field name="Rule80A" required="N"/>
+      <field name="ForexReq" required="N"/>
+      <field name="SettlCurrency" required="N"/>
+      <field name="Text" required="N"/>
+    </message>
+    <message name="OrderCancelRequest" msgtype="F" msgcat="app">
+      <field name="OrigClOrdID" required="Y"/>
+      <field name="OrderID" required="N"/>
+      <field name="ClOrdID" required="Y"/>
+      <field name="ListID" required="N"/>
+      <field name="CxlType" required="Y"/>
+      <field name="ClientID" required="N"/>
+      <field name="ExecBroker" required="N"/>
+      <field name="Symbol" required="Y"/>
+      <field name="SymbolSfx" required="N"/>
+      <field name="SecurityID" required="N"/>
+      <field name="IDSource" required="N"/>
+      <field name="Issuer" required="N"/>
+      <field name="SecurityDesc" required="N"/>
+      <field name="Side" required="Y"/>
+      <field name="OrderQty" required="Y"/>
+      <field name="Text" required="N"/>
+    </message>
+    <message name="OrderCancelReject" msgtype="9" msgcat="app">
+      <field name="OrderID" required="Y"/>
+      <field name="ClOrdID" required="Y"/>
+      <field name="ClientID" required="N"/>
+      <field name="ExecBroker" required="N"/>
+      <field name="ListID" required="N"/>
+      <field name="CxlRejReason" required="N"/>
+      <field name="Text" required="N"/>
+    </message>
+    <message name="OrderStatusRequest" msgtype="H" msgcat="app">
+      <field name="OrderID" required="N"/>
+      <field name="ClOrdID" required="Y"/>
+      <field name="ClientID" required="N"/>
+      <field name="ExecBroker" required="N"/>
+      <field name="Symbol" required="Y"/>
+      <field name="SymbolSfx" required="N"/>
+      <field name="Issuer" required="N"/>
+      <field name="SecurityDesc" required="N"/>
+      <field name="Side" required="Y"/>
+    </message>
+    <message name="Allocation" msgtype="J" msgcat="app">
+      <field name="AllocID" required="Y"/>
+      <field name="AllocTransType" required="Y"/>
+      <field name="RefAllocID" required="N"/>
+      <group name="NoOrders" required="Y">
+        <field name="ClOrdID" required="Y"/>
+        <field name="OrderID" required="N"/>
+        <field name="ListID" required="N"/>
+        <field name="WaveNo" required="N"/>
+      </group>
+      <group name="NoExecs" required="N">
+        <field name="ExecID" required="N"/>
+        <field name="LastShares" required="N"/>
+        <field name="LastPx" required="N"/>
+        <field name="LastMkt" required="N"/>
+      </group>
+      <field name="Side" required="Y"/>
+      <field name="Symbol" required="Y"/>
+      <field name="SymbolSfx" required="N"/>
+      <field name="SecurityID" required="N"/>
+      <field name="IDSource" required="N"/>
+      <field name="Issuer" required="N"/>
+      <field name="SecurityDesc" required="N"/>
+      <field name="Shares" required="Y"/>
+      <field name="AvgPx" required="Y"/>
+      <field name="Currency" required="N"/>
+      <field name="AvgPrxPrecision" required="N"/>
+      <field name="TradeDate" required="Y"/>
+      <field name="TransactTime" required="N"/>
+      <field name="SettlmntTyp" required="N"/>
+      <field name="FutSettDate" required="N"/>
+      <field name="NetMoney" required="N"/>
+      <group name="NoMiscFees" required="N">
+        <field name="MiscFeeAmt" required="N"/>
+        <field name="MiscFeeCurr" required="N"/>
+        <field name="MiscFeeType" required="N"/>
+      </group>
+      <field name="SettlCurrAmt" required="N"/>
+      <field name="SettlCurrency" required="N"/>
+      <field name="OpenClose" required="N"/>
+      <field name="Text" required="N"/>
+      <group name="NoAllocs" required="Y">
+        <field name="AllocAccount" required="Y"/>
+        <field name="AllocShares" required="Y"/>
+        <field name="ProcessCode" required="N"/>
+        <field name="ExecBroker" required="N"/>
+        <field name="ClientID" required="N"/>
+        <field name="Commission" required="N"/>
+        <field name="CommType" required="N"/>
+        <group name="NoDlvyInst" required="N">
+          <field name="BrokerOfCredit" required="N"/>
+          <field name="DlvyInst" required="N"/>
+        </group>
+      </group>
+    </message>
+    <message name="AllocationACK" msgtype="P" msgcat="app">
+      <field name="ClientID" required="N"/>
+      <field name="ExecBroker" required="N"/>
+      <field name="AllocID" required="Y"/>
+      <field name="TradeDate" required="Y"/>
+      <field name="TransactTime" required="N"/>
+      <field name="AllocStatus" required="Y"/>
+      <field name="AllocRejCode" required="N"/>
+      <field name="Text" required="N"/>
+    </message>
+    <message name="NewOrderList" msgtype="E" msgcat="app">
+      <field name="ListID" required="Y"/>
+      <field name="WaveNo" required="N"/>
+      <field name="ListSeqNo" required="Y"/>
+      <field name="ListNoOrds" required="Y"/>
+      <field name="ListExecInst" required="N"/>
+      <field name="ClOrdID" required="Y"/>
+      <field name="ClientID" required="N"/>
+      <field name="ExecBroker" required="N"/>
+      <field name="Account" required="N"/>
+      <field name="SettlmntTyp" required="N"/>
+      <field name="FutSettDate" required="N"/>
+      <field name="HandlInst" required="Y"/>
+      <field name="ExecInst" required="N"/>
+      <field name="MinQty" required="N"/>
+      <field name="MaxFloor" required="N"/>
+      <field name="ExDestination" required="N"/>
+      <field name="ProcessCode" required="N"/>
+      <field name="Symbol" required="Y"/>
+      <field name="SymbolSfx" required="N"/>
+      <field name="SecurityID" required="N"/>
+      <field name="IDSource" required="N"/>
+      <field name="Issuer" required="N"/>
+      <field name="SecurityDesc" required="N"/>
+      <field name="PrevClosePx" required="N"/>
+      <field name="Side" required="Y"/>
+      <field name="LocateReqd" required="N"/>
+      <field name="OrderQty" required="Y"/>
+      <field name="OrdType" required="Y"/>
+      <field name="Price" required="N"/>
+      <field name="StopPx" required="N"/>
+      <field name="Currency" required="N"/>
+      <field name="TimeInForce" required="N"/>
+      <field name="ExpireTime" required="N"/>
+      <field name="Commission" required="N"/>
+      <field name="CommType" required="N"/>
+      <field name="Rule80A" required="N"/>
+      <field name="ForexReq" required="N"/>
+      <field name="SettlCurrency" required="N"/>
+      <field name="Text" required="N"/>
+    </message>
+    <message name="ListStatus" msgtype="N" msgcat="app">
+      <field name="ListID" required="Y"/>
+      <field name="WaveNo" required="N"/>
+      <field name="NoRpts" required="Y"/>
+      <field name="RptSeq" required="Y"/>
+      <group name="NoOrders" required="Y">
+        <field name="ClOrdID" required="Y"/>
+        <field name="CumQty" required="Y"/>
+        <field name="CxlQty" required="Y"/>
+        <field name="AvgPx" required="Y"/>
+      </group>
+    </message>
+    <message name="ListExecute" msgtype="L" msgcat="app">
+      <field name="ListID" required="Y"/>
+      <field name="WaveNo" required="N"/>
+      <field name="Text" required="N"/>
+    </message>
+    <message name="ListCancelRequest" msgtype="K" msgcat="app">
+      <field name="ListID" required="Y"/>
+      <field name="WaveNo" required="N"/>
+      <field name="Text" required="N"/>
+    </message>
+    <message name="ListStatusRequest" msgtype="M" msgcat="app">
+      <field name="ListID" required="Y"/>
+      <field name="WaveNo" required="N"/>
+      <field name="Text" required="N"/>
+    </message>
+  </messages>
+  <fields>
+    <field number="1" name="Account" type="STRING"/>
+    <field number="2" name="AdvId" type="INT"/>
+    <field number="3" name="AdvRefID" type="INT"/>
+    <field number="4" name="AdvSide" type="STRING">
+      <value enum="B" description="BUY"/>
+      <value enum="S" description="SELL"/>
+      <value enum="X" description="CROSS"/>
+      <value enum="T" description="TRADE"/>
+    </field>
+    <field number="5" name="AdvTransType" type="STRING">
+      <value enum="N" description="NEW"/>
+      <value enum="C" description="CANCEL"/>
+      <value enum="R" description="REPLACE"/>
+    </field>
+    <field number="6" name="AvgPx" type="FLOAT"/>
+    <field number="7" name="BeginSeqNo" type="INT"/>
+    <field number="8" name="BeginString" type="STRING"/>
+    <field number="9" name="BodyLength" type="INT"/>
+    <field number="10" name="CheckSum" type="STRING"/>
+    <field number="11" name="ClOrdID" type="STRING"/>
+    <field number="12" name="Commission" type="FLOAT"/>
+    <field number="13" name="CommType" type="STRING">
+      <value enum="1" description="PER_SHARE"/>
+      <value enum="2" description="PERCENTAGE"/>
+      <value enum="3" description="ABSOLUTE"/>
+    </field>
+    <field number="14" name="CumQty" type="INT"/>
+    <field number="15" name="Currency" type="STRING"/>
+    <field number="16" name="EndSeqNo" type="INT"/>
+    <field number="17" name="ExecID" type="INT"/>
+    <field number="18" name="ExecInst" type="MULTIPLEVALUESTRING">
+      <value enum="1" description="NOT_HELD"/>
+      <value enum="2" description="WORK"/>
+      <value enum="3" description="GO_ALONG"/>
+      <value enum="4" description="OVER_THE_DAY"/>
+      <value enum="5" description="HELD"/>
+      <value enum="6" description="PARTICIPATE_DONT_INITIATE"/>
+      <value enum="7" description="STRICT_SCALE"/>
+      <value enum="8" description="TRY_TO_SCALE"/>
+      <value enum="9" description="STAY_ON_BIDSIDE"/>
+      <value enum="0" description="STAY_ON_OFFERSIDE"/>
+      <value enum="A" description="NO_CROSS"/>
+      <value enum="B" description="OK_TO_CROSS"/>
+      <value enum="C" description="CALL_FIRST"/>
+      <value enum="D" description="PERCENT_OF_VOLUME"/>
+      <value enum="E" description="DO_NOT_INCREASE_DNI"/>
+      <value enum="F" description="DO_NOT_REDUCE_DNR"/>
+      <value enum="G" description="ALL_OR_NONE_AON"/>
+      <value enum="I" description="INSTITUTIONS_ONLY"/>
+      <value enum="L" description="LAST_PEG"/>
+      <value enum="M" description="MIDPRICE_PEG"/>
+      <value enum="N" description="NONNEGOTIABLE"/>
+      <value enum="O" description="OPENING_PEG"/>
+      <value enum="P" description="MARKET_PEG"/>
+      <value enum="R" description="PRIMARY_PEG"/>
+      <value enum="S" description="SUSPEND"/>
+    </field>
+    <field number="19" name="ExecRefID" type="INT"/>
+    <field number="20" name="ExecTransType" type="STRING">
+      <value enum="0" description="NEW"/>
+      <value enum="1" description="CANCEL"/>
+      <value enum="2" description="CORRECT"/>
+      <value enum="3" description="STATUS"/>
+    </field>
+    <field number="21" name="HandlInst" type="STRING">
+      <value enum="1" description="AUTOMATED_EXECUTION_ORDER_PRIVATE_NO_BROKER_INTERVENTION"/>
+      <value enum="2" description="AUTOMATED_EXECUTION_ORDER_PUBLIC_BROKER_INTERVENTION_OK"/>
+      <value enum="3" description="MANUAL_ORDER_BEST_EXECUTION"/>
+    </field>
+    <field number="22" name="IDSource" type="STRING">
+      <value enum="1" description="CUSIP"/>
+      <value enum="2" description="SEDOL"/>
+      <value enum="3" description="QUIK"/>
+      <value enum="4" description="ISIN_NUMBER"/>
+      <value enum="5" description="RIC_CODE"/>
+    </field>
+    <field number="23" name="IOIid" type="INT"/>
+    <field number="24" name="IOIOthSvc" type="STRING"/>
+    <field number="25" name="IOIQltyInd" type="STRING">
+      <value enum="L" description="LOW"/>
+      <value enum="M" description="MEDIUM"/>
+      <value enum="H" description="HIGH"/>
+    </field>
+    <field number="26" name="IOIRefID" type="INT"/>
+    <field number="27" name="IOIShares" type="STRING"/>
+    <field number="28" name="IOITransType" type="STRING">
+      <value enum="N" description="NEW"/>
+      <value enum="C" description="CANCEL"/>
+      <value enum="R" description="REPLACE"/>
+    </field>
+    <field number="29" name="LastCapacity" type="STRING">
+      <value enum="1" description="AGENT"/>
+      <value enum="2" description="CROSS_AS_AGENT"/>
+      <value enum="3" description="CROSS_AS_PRINCIPAL"/>
+      <value enum="4" description="PRINCIPAL"/>
+    </field>
+    <field number="30" name="LastMkt" type="STRING"/>
+    <field number="31" name="LastPx" type="FLOAT"/>
+    <field number="32" name="LastShares" type="INT"/>
+    <field number="33" name="LinesOfText" type="INT"/>
+    <field number="34" name="MsgSeqNum" type="INT"/>
+    <field number="35" name="MsgType" type="STRING"/>
+    <field number="36" name="NewSeqNo" type="INT"/>
+    <field number="37" name="OrderID" type="STRING"/>
+    <field number="38" name="OrderQty" type="INT"/>
+    <field number="39" name="OrdStatus" type="STRING">
+      <value enum="0" description="NEW"/>
+      <value enum="1" description="PARTIALLY_FILLED"/>
+      <value enum="2" description="FILLED"/>
+      <value enum="3" description="DONE_FOR_DAY"/>
+      <value enum="4" description="CANCELED"/>
+      <value enum="5" description="REPLACED"/>
+      <value enum="6" description="PENDING_CANCELREPLACE"/>
+      <value enum="7" description="STOPPED"/>
+      <value enum="8" description="REJECTED"/>
+      <value enum="9" description="SUSPENDED"/>
+      <value enum="A" description="PENDING_NEW"/>
+      <value enum="B" description="CALCULATED"/>
+      <value enum="C" description="EXPIRED"/>
+    </field>
+    <field number="40" name="OrdType" type="STRING">
+      <value enum="1" description="MARKET"/>
+      <value enum="2" description="LIMIT"/>
+      <value enum="3" description="STOP"/>
+      <value enum="4" description="STOP_LIMIT"/>
+      <value enum="5" description="MARKET_ON_CLOSE"/>
+      <value enum="6" description="WITH_OR_WITHOUT"/>
+      <value enum="7" description="LIMIT_OR_BETTER"/>
+      <value enum="8" description="LIMIT_WITH_OR_WITHOUT"/>
+      <value enum="9" description="ON_BASIS"/>
+      <value enum="A" description="ON_CLOSE"/>
+      <value enum="B" description="LIMIT_ON_CLOSE"/>
+      <value enum="C" description="FOREX"/>
+      <value enum="D" description="PREVIOUSLY_QUOTED"/>
+      <value enum="E" description="PREVIOUSLY_INDICATED"/>
+      <value enum="P" description="PEGGED"/>
+    </field>
+    <field number="41" name="OrigClOrdID" type="STRING"/>
+    <field number="42" name="OrigTime" type="TIME"/>
+    <field number="43" name="PossDupFlag" type="STRING">
+      <value enum="Y" description="POSSIBLE_DUPLICATE"/>
+      <value enum="N" description="ORIGINAL_TRANSMISSION"/>
+    </field>
+    <field number="44" name="Price" type="FLOAT"/>
+    <field number="45" name="RefSeqNum" type="INT"/>
+    <field number="46" name="RelatdSym" type="STRING"/>
+    <field number="47" name="Rule80A" type="STRING">
+      <value enum="A" description="AGENCY_SINGLE_ORDER"/>
+      <value enum="D" description="PROGRAM_ORDER_INDEX_ARB_FOR_MEMBER_FIRMORG"/>
+      <value enum="C" description="PROGRAM_ORDER_NONINDEX_ARB_FOR_MEMBER_FIRMORG"/>
+      <value enum="J" description="PROGRAM_ORDER_INDEX_ARB_FOR_INDIVIDUAL_CUSTOMER"/>
+      <value enum="K" description="PROGRAM_ORDER_NONINDEX_ARB_FOR_INDIVIDUAL_CUSTOMER"/>
+      <value enum="U" description="PROGRAM_ORDER_INDEX_ARB_FOR_OTHER_AGENCY"/>
+      <value enum="Y" description="PROGRAM_ORDER_NONINDEX_ARB_FOR_OTHER_AGENCY"/>
+      <value enum="M" description="PROGRAM_ORDER_INDEX_ARB_FOR_OTHER_MEMBER"/>
+      <value enum="N" description="PROGRAM_ORDER_NONINDEX_ARB_FOR_OTHER_MEMBER"/>
+      <value enum="W" description="ALL_OTHER_ORDERS_AS_AGENT_FOR_OTHER_MEMBER"/>
+    </field>
+    <field number="48" name="SecurityID" type="STRING"/>
+    <field number="49" name="SenderCompID" type="STRING"/>
+    <field number="50" name="SenderSubID" type="STRING"/>
+    <field number="52" name="SendingTime" type="TIME"/>
+    <field number="53" name="Shares" type="INT"/>
+    <field number="54" name="Side" type="STRING">
+      <value enum="1" description="BUY"/>
+      <value enum="2" description="SELL"/>
+      <value enum="3" description="BUY_MINUS"/>
+      <value enum="4" description="SELL_PLUS"/>
+      <value enum="5" description="SELL_SHORT"/>
+      <value enum="6" description="SELL_SHORT_EXEMPT"/>
+    </field>
+    <field number="55" name="Symbol" type="STRING"/>
+    <field number="56" name="TargetCompID" type="STRING"/>
+    <field number="57" name="TargetSubID" type="STRING"/>
+    <field number="58" name="Text" type="STRING"/>
+    <field number="59" name="TimeInForce" type="STRING">
+      <value enum="0" description="DAY"/>
+      <value enum="1" description="GOOD_TILL_CANCEL"/>
+      <value enum="2" description="AT_THE_OPENING"/>
+      <value enum="3" description="IMMEDIATE_OR_CANCEL"/>
+      <value enum="4" description="FILL_OR_KILL"/>
+      <value enum="5" description="GOOD_TILL_CROSSING"/>
+      <value enum="6" description="GOOD_TILL_DATE"/>
+    </field>
+    <field number="60" name="TransactTime" type="TIME"/>
+    <field number="61" name="Urgency" type="STRING">
+      <value enum="0" description="NORMAL"/>
+      <value enum="1" description="FLASH"/>
+      <value enum="2" description="BACKGROUND"/>
+    </field>
+    <field number="62" name="ValidUntilTime" type="TIME"/>
+    <field number="63" name="SettlmntTyp" type="STRING">
+      <value enum="0" description="REGULAR"/>
+      <value enum="1" description="CASH"/>
+      <value enum="2" description="NEXT_DAY"/>
+      <value enum="3" description="TPLUS2"/>
+      <value enum="4" description="TPLUS3"/>
+      <value enum="5" description="TPLUS4"/>
+      <value enum="6" description="FUTURE"/>
+      <value enum="7" description="WHEN_ISSUED"/>
+      <value enum="8" description="SELLERS_OPTION"/>
+      <value enum="9" description="TPLUS5"/>
+    </field>
+    <field number="64" name="FutSettDate" type="DATE"/>
+    <field number="65" name="SymbolSfx" type="STRING"/>
+    <field number="66" name="ListID" type="STRING"/>
+    <field number="67" name="ListSeqNo" type="INT"/>
+    <field number="68" name="ListNoOrds" type="INT"/>
+    <field number="69" name="ListExecInst" type="STRING"/>
+    <field number="70" name="AllocID" type="INT"/>
+    <field number="71" name="AllocTransType" type="STRING">
+      <value enum="0" description="NEW"/>
+      <value enum="1" description="REPLACE"/>
+      <value enum="2" description="CANCEL"/>
+    </field>
+    <field number="72" name="RefAllocID" type="INT"/>
+    <field number="73" name="NoOrders" type="INT"/>
+    <field number="74" name="AvgPrxPrecision" type="INT"/>
+    <field number="75" name="TradeDate" type="DATE"/>
+    <field number="76" name="ExecBroker" type="STRING"/>
+    <field number="77" name="OpenClose" type="STRING"/>
+    <field number="78" name="NoAllocs" type="INT"/>
+    <field number="79" name="AllocAccount" type="STRING"/>
+    <field number="80" name="AllocShares" type="INT"/>
+    <field number="81" name="ProcessCode" type="STRING">
+      <value enum="0" description="REGULAR"/>
+      <value enum="1" description="SOFT_DOLLAR"/>
+      <value enum="2" description="STEPIN"/>
+      <value enum="3" description="STEPOUT"/>
+      <value enum="4" description="SOFTDOLLAR_STEPIN"/>
+      <value enum="5" description="SOFTDOLLAR_STEPOUT"/>
+      <value enum="6" description="PLAN_SPONSOR"/>
+    </field>
+    <field number="82" name="NoRpts" type="INT"/>
+    <field number="83" name="RptSeq" type="INT"/>
+    <field number="84" name="CxlQty" type="INT"/>
+    <field number="85" name="NoDlvyInst" type="INT"/>
+    <field number="86" name="DlvyInst" type="STRING"/>
+    <field number="87" name="AllocStatus" type="INT">
+      <value enum="0" description="ACCEPTED"/>
+      <value enum="1" description="REJECTED"/>
+      <value enum="2" description="PARTIAL_ACCEPT"/>
+      <value enum="3" description="RECEIVED"/>
+    </field>
+    <field number="88" name="AllocRejCode" type="INT">
+      <value enum="0" description="UNKNOWN_ACCOUNT"/>
+      <value enum="1" description="INCORRECT_QUANTITY"/>
+      <value enum="2" description="INCORRECT_AVERAGE_PRICE"/>
+      <value enum="3" description="UNKNOWN_EXECUTING_BROKER_MNEMONIC"/>
+      <value enum="4" description="COMMISSION_DIFFERENCE"/>
+      <value enum="5" description="UNKNOWN_ORDERID"/>
+      <value enum="6" description="UNKNOWN_LISTID"/>
+      <value enum="7" description="OTHER"/>
+    </field>
+    <field number="89" name="Signature" type="DATA"/>
+    <field number="90" name="SecureDataLen" type="INT"/>
+    <field number="91" name="SecureData" type="DATA"/>
+    <field number="92" name="BrokerOfCredit" type="STRING"/>
+    <field number="93" name="SignatureLength" type="INT"/>
+    <field number="94" name="EmailType" type="STRING">
+      <value enum="0" description="NEW"/>
+      <value enum="1" description="REPLY"/>
+      <value enum="2" description="ADMIN_REPLY"/>
+    </field>
+    <field number="95" name="RawDataLength" type="INT"/>
+    <field number="96" name="RawData" type="DATA"/>
+    <field number="97" name="PossResend" type="STRING"/>
+    <field number="98" name="EncryptMethod" type="INT">
+      <value enum="0" description="NONE_OTHER"/>
+      <value enum="1" description="PKCS"/>
+      <value enum="2" description="DES"/>
+      <value enum="3" description="PKCSDES"/>
+      <value enum="4" description="PGPDES"/>
+      <value enum="5" description="PGPDESMD5"/>
+      <value enum="6" description="PEMDESMD5"/>
+    </field>
+    <field number="99" name="StopPx" type="FLOAT"/>
+    <field number="100" name="ExDestination" type="STRING">
+      <value enum="0" description="NONE"/>
+      <value enum="4" description="POSIT"/>
+    </field>
+    <field number="102" name="CxlRejReason" type="INT">
+      <value enum="0" description="TOO_LATE_TO_CANCEL"/>
+      <value enum="1" description="UNKNOWN_ORDER"/>
+    </field>
+    <field number="103" name="OrdRejReason" type="INT">
+      <value enum="0" description="BROKER_OPTION"/>
+      <value enum="1" description="UNKNOWN_SYMBOL"/>
+      <value enum="2" description="EXCHANGE_CLOSED"/>
+      <value enum="3" description="ORDER_EXCEEDS_LIMIT"/>
+      <value enum="4" description="TOO_LATE_TO_ENTER"/>
+    </field>
+    <field number="104" name="IOIQualifier" type="STRING">
+      <value enum="X" description="CROSSING_OPPORTUNITY"/>
+      <value enum="O" description="AT_THE_OPEN"/>
+      <value enum="M" description="MORE_BEHIND"/>
+      <value enum="P" description="TAKING_A_POSITION"/>
+      <value enum="V" description="VERSUS"/>
+      <value enum="Q" description="CURRENT_QUOTE"/>
+      <value enum="C" description="AT_THE_CLOSE"/>
+      <value enum="S" description="PORTFOLIO_SHOWN"/>
+      <value enum="I" description="IN_TOUCH_WITH"/>
+      <value enum="W" description="INDICATION_WORKING_AWAY"/>
+      <value enum="A" description="ALL_OR_NONE"/>
+      <value enum="L" description="LIMIT"/>
+      <value enum="T" description="THROUGH_THE_DAY"/>
+    </field>
+    <field number="105" name="WaveNo" type="STRING"/>
+    <field number="106" name="Issuer" type="STRING"/>
+    <field number="107" name="SecurityDesc" type="STRING"/>
+    <field number="108" name="HeartBtInt" type="INT"/>
+    <field number="109" name="ClientID" type="STRING"/>
+    <field number="110" name="MinQty" type="INT"/>
+    <field number="111" name="MaxFloor" type="INT"/>
+    <field number="112" name="TestReqID" type="STRING"/>
+    <field number="113" name="ReportToExch" type="STRING">
+      <value enum="Y" description="YES"/>
+      <value enum="N" description="NO"/>
+    </field>
+    <field number="114" name="LocateReqd" type="STRING">
+      <value enum="Y" description="YES"/>
+      <value enum="N" description="NO"/>
+    </field>
+    <field number="115" name="OnBehalfOfCompID" type="STRING"/>
+    <field number="116" name="OnBehalfOfSubID" type="STRING"/>
+    <field number="117" name="QuoteID" type="STRING"/>
+    <field number="118" name="NetMoney" type="FLOAT"/>
+    <field number="119" name="SettlCurrAmt" type="FLOAT"/>
+    <field number="120" name="SettlCurrency" type="STRING"/>
+    <field number="121" name="ForexReq" type="STRING">
+      <value enum="Y" description="YES"/>
+      <value enum="N" description="NO"/>
+    </field>
+    <field number="122" name="OrigSendingTime" type="TIME"/>
+    <field number="123" name="GapFillFlag" type="STRING">
+      <value enum="Y" description="GAP_FILL_MESSAGE_MSGSEQNUM_FIELD_VALID"/>
+      <value enum="N" description="SEQUENCE_RESET_IGNORE_MSGSEQNUM"/>
+    </field>
+    <field number="124" name="NoExecs" type="INT"/>
+    <field number="125" name="CxlType" type="STRING">
+      <value enum="P" description="PARTIAL_CANCEL"/>
+      <value enum="F" description="FULL_REMAINING_QUANTITY"/>
+    </field>
+    <field number="126" name="ExpireTime" type="TIME"/>
+    <field number="127" name="DKReason" type="STRING">
+      <value enum="A" description="UNKNOWN_SYMBOL"/>
+      <value enum="B" description="WRONG_SIDE"/>
+      <value enum="C" description="QUANTITY_EXCEEDS_ORDER"/>
+      <value enum="D" description="NO_MATCHING_ORDER"/>
+      <value enum="E" description="PRICE_EXCEEDS_LIMIT"/>
+      <value enum="Z" description="OTHER" />
+    </field>
+    <field number="128" name="DeliverToCompID" type="STRING"/>
+    <field number="129" name="DeliverToSubID" type="STRING"/>
+    <field number="130" name="IOINaturalFlag" type="STRING">
+      <value enum="Y" description="NATURAL"/>
+      <value enum="N" description="NOT_NATURAL"/>
+    </field>
+    <field number="131" name="QuoteReqID" type="STRING"/>
+    <field number="132" name="BidPx" type="FLOAT"/>
+    <field number="133" name="OfferPx" type="FLOAT"/>
+    <field number="134" name="BidSize" type="INT"/>
+    <field number="135" name="OfferSize" type="INT"/>
+    <field number="136" name="NoMiscFees" type="INT"/>
+    <field number="137" name="MiscFeeAmt" type="FLOAT"/>
+    <field number="138" name="MiscFeeCurr" type="STRING"/>
+    <field number="139" name="MiscFeeType" type="STRING">
+      <value enum="1" description="REGULATORY"/>
+      <value enum="2" description="TAX"/>
+      <value enum="3" description="LOCAL_COMMISSION"/>
+      <value enum="4" description="EXCHANGE_FEES"/>
+      <value enum="5" description="STAMP"/>
+      <value enum="6" description="LEVY"/>
+      <value enum="7" description="OTHER"/>
+    </field>
+    <field number="140" name="PrevClosePx" type="FLOAT"/>
+  </fields>
+</fix>
@@ -0,0 +1,313 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<fix type='FIXT' major='1' minor='1' servicepack='0'>
+  <header>
+    <field name='BeginString' required='Y'/>
+    <field name='BodyLength' required='Y'/>
+    <field name='MsgType' required='Y'/>
+    <field name='SenderCompID' required='Y'/>
+    <field name='TargetCompID' required='Y'/>
+    <field name='OnBehalfOfCompID' required='N'/>
+    <field name='DeliverToCompID' required='N'/>
+    <field name='SecureDataLen' required='N'/>
+    <field name='SecureData' required='N'/>
+    <field name='MsgSeqNum' required='Y'/>
+    <field name='SenderSubID' required='N'/>
+    <field name='SenderLocationID' required='N'/>
+    <field name='TargetSubID' required='N'/>
+    <field name='TargetLocationID' required='N'/>
+    <field name='OnBehalfOfSubID' required='N'/>
+    <field name='OnBehalfOfLocationID' required='N'/>
+    <field name='DeliverToSubID' required='N'/>
+    <field name='DeliverToLocationID' required='N'/>
+    <field name='PossDupFlag' required='N'/>
+    <field name='PossResend' required='N'/>
+    <field name='SendingTime' required='Y'/>
+    <field name='OrigSendingTime' required='N'/>
+    <field name='XmlDataLen' required='N'/>
+    <field name='XmlData' required='N'/>
+    <field name='MessageEncoding' required='N'/>
+    <field name='LastMsgSeqNumProcessed' required='N'/>
+    <component name='HopGrp' required='N'/>
+    <field name='ApplVerID' required='N'/>
+    <field name='CstmApplVerID' required='N'/>
+  </header>
+  <trailer>
+    <field name='SignatureLength' required='N'/>
+    <field name='Signature' required='N'/>
+    <field name='CheckSum' required='Y'/>
+  </trailer>
+  <messages>
+    <message msgcat='admin' msgtype='0' name='Heartbeat'>
+      <field name='TestReqID' required='N'/>
+    </message>
+    <message msgcat='admin' msgtype='1' name='TestRequest'>
+      <field name='TestReqID' required='Y'/>
+    </message>
+    <message msgcat='admin' msgtype='2' name='ResendRequest'>
+      <field name='BeginSeqNo' required='Y'/>
+      <field name='EndSeqNo' required='Y'/>
+    </message>
+    <message msgcat='admin' msgtype='3' name='Reject'>
+      <field name='RefSeqNum' required='Y'/>
+      <field name='RefTagID' required='N'/>
+      <field name='RefMsgType' required='N'/>
+      <field name='SessionRejectReason' required='N'/>
+      <field name='Text' required='N'/>
+      <field name='EncodedTextLen' required='N'/>
+      <field name='EncodedText' required='N'/>
+    </message>
+    <message msgcat='admin' msgtype='4' name='SequenceReset'>
+      <field name='GapFillFlag' required='N'/>
+      <field name='NewSeqNo' required='Y'/>
+    </message>
+    <message msgcat='admin' msgtype='5' name='Logout'>
+      <field name='Text' required='N'/>
+      <field name='EncodedTextLen' required='N'/>
+      <field name='EncodedText' required='N'/>
+    </message>
+    <message msgcat='admin' msgtype='A' name='Logon'>
+      <field name='EncryptMethod' required='Y'/>
+      <field name='HeartBtInt' required='Y'/>
+      <field name='RawDataLength' required='N'/>
+      <field name='RawData' required='N'/>
+      <field name='ResetSeqNumFlag' required='N'/>
+      <field name='NextExpectedMsgSeqNum' required='N'/>
+      <field name='MaxMessageSize' required='N'/>
+      <field name='TestMessageIndicator' required='N'/>
+      <field name='Username' required='N'/>
+      <field name='Password' required='N'/>
+      <field name='DefaultApplVerID' required='Y'/>
+      <component name='MsgTypeGrp' required='N'/>
+    </message>
+  </messages>
+  <components>
+    <component name='HopGrp'>
+      <group name='NoHops' required='N'>
+        <field name='HopCompID' required='N'/>
+        <field name='HopSendingTime' required='N'/>
+        <field name='HopRefID' required='N'/>
+      </group>
+    </component>
+    <component name='MsgTypeGrp'>
+      <group name='NoMsgTypes' required='N'>
+        <field name='RefMsgType' required='N'/>
+        <field name='MsgDirection' required='N'/>
+        <field name='RefApplVerID' required='N'/>
+        <field name='RefCstmApplVerID' required='N'/>
+      </group>
+    </component>
+  </components>
+  <fields>
+    <field name='BeginSeqNo' number='7' type='SEQNUM'/>
+    <field name='BeginString' number='8' type='STRING'/>
+    <field name='BodyLength' number='9' type='LENGTH'/>
+    <field name='CheckSum' number='10' type='STRING'/>
+    <field name='EndSeqNo' number='16' type='SEQNUM'/>
+    <field name='MsgSeqNum' number='34' type='SEQNUM'/>
+    <field number='35' name='MsgType' type='STRING'>
+      <value enum='0' description='HEARTBEAT'/>
+      <value enum='1' description='TEST_REQUEST'/>
+      <value enum='2' description='RESEND_REQUEST'/>
+      <value enum='3' description='REJECT'/>
+      <value enum='4' description='SEQUENCE_RESET'/>
+      <value enum='5' description='LOGOUT'/>
+      <value enum='6' description='INDICATION_OF_INTEREST'/>
+      <value enum='7' description='ADVERTISEMENT'/>
+      <value enum='8' description='EXECUTION_REPORT'/>
+      <value enum='9' description='ORDER_CANCEL_REJECT'/>
+      <value enum='A' description='LOGON'/>
+      <value enum='B' description='NEWS'/>
+      <value enum='C' description='EMAIL'/>
+      <value enum='D' description='ORDER_SINGLE'/>
+      <value enum='E' description='ORDER_LIST'/>
+      <value enum='F' description='ORDER_CANCEL_REQUEST'/>
+      <value enum='G' description='ORDER_CANCEL_REPLACE_REQUEST'/>
+      <value enum='H' description='ORDER_STATUS_REQUEST'/>
+      <value enum='J' description='ALLOCATION_INSTRUCTION'/>
+      <value enum='K' description='LIST_CANCEL_REQUEST'/>
+      <value enum='L' description='LIST_EXECUTE'/>
+      <value enum='M' description='LIST_STATUS_REQUEST'/>
+      <value enum='N' description='LIST_STATUS'/>
+      <value enum='P' description='ALLOCATION_INSTRUCTION_ACK'/>
+      <value enum='Q' description='DONT_KNOW_TRADE'/>
+      <value enum='R' description='QUOTE_REQUEST'/>
+      <value enum='S' description='QUOTE'/>
+      <value enum='T' description='SETTLEMENT_INSTRUCTIONS'/>
+      <value enum='V' description='MARKET_DATA_REQUEST'/>
+      <value enum='W' description='MARKET_DATA_SNAPSHOT_FULL_REFRESH'/>
+      <value enum='X' description='MARKET_DATA_INCREMENTAL_REFRESH'/>
+      <value enum='Y' description='MARKET_DATA_REQUEST_REJECT'/>
+      <value enum='Z' description='QUOTE_CANCEL'/>
+      <value enum='a' description='QUOTE_STATUS_REQUEST'/>
+      <value enum='b' description='MASS_QUOTE_ACKNOWLEDGEMENT'/>
+      <value enum='c' description='SECURITY_DEFINITION_REQUEST'/>
+      <value enum='d' description='SECURITY_DEFINITION'/>
+      <value enum='e' description='SECURITY_STATUS_REQUEST'/>
+      <value enum='f' description='SECURITY_STATUS'/>
+      <value enum='g' description='TRADING_SESSION_STATUS_REQUEST'/>
+      <value enum='h' description='TRADING_SESSION_STATUS'/>
+      <value enum='i' description='MASS_QUOTE'/>
+      <value enum='j' description='BUSINESS_MESSAGE_REJECT'/>
+      <value enum='k' description='BID_REQUEST'/>
+      <value enum='l' description='BID_RESPONSE'/>
+      <value enum='m' description='LIST_STRIKE_PRICE'/>
+      <value enum='n' description='XML_MESSAGE'/>
+      <value enum='o' description='REGISTRATION_INSTRUCTIONS'/>
+      <value enum='p' description='REGISTRATION_INSTRUCTIONS_RESPONSE'/>
+      <value enum='q' description='ORDER_MASS_CANCEL_REQUEST'/>
+      <value enum='r' description='ORDER_MASS_CANCEL_REPORT'/>
+      <value enum='s' description='NEW_ORDER_CROSS'/>
+      <value enum='t' description='CROSS_ORDER_CANCEL_REPLACE_REQUEST'/>
+      <value enum='u' description='CROSS_ORDER_CANCEL_REQUEST'/>
+      <value enum='v' description='SECURITY_TYPE_REQUEST'/>
+      <value enum='w' description='SECURITY_TYPES'/>
+      <value enum='x' description='SECURITY_LIST_REQUEST'/>
+      <value enum='y' description='SECURITY_LIST'/>
+      <value enum='z' description='DERIVATIVE_SECURITY_LIST_REQUEST'/>
+      <value enum='AA' description='DERIVATIVE_SECURITY_LIST'/>
+      <value enum='AB' description='NEW_ORDER_MULTILEG'/>
+      <value enum='AC' description='MULTILEG_ORDER_CANCEL_REPLACE'/>
+      <value enum='AD' description='TRADE_CAPTURE_REPORT_REQUEST'/>
+      <value enum='AE' description='TRADE_CAPTURE_REPORT'/>
+      <value enum='AF' description='ORDER_MASS_STATUS_REQUEST'/>
+      <value enum='AG' description='QUOTE_REQUEST_REJECT'/>
+      <value enum='AH' description='RFQ_REQUEST'/>
+      <value enum='AI' description='QUOTE_STATUS_REPORT'/>
+      <value enum='AJ' description='QUOTE_RESPONSE'/>
+      <value enum='AK' description='CONFIRMATION'/>
+      <value enum='AL' description='POSITION_MAINTENANCE_REQUEST'/>
+      <value enum='AM' description='POSITION_MAINTENANCE_REPORT'/>
+      <value enum='AN' description='REQUEST_FOR_POSITIONS'/>
+      <value enum='AO' description='REQUEST_FOR_POSITIONS_ACK'/>
+      <value enum='AP' description='POSITION_REPORT'/>
+      <value enum='AQ' description='TRADE_CAPTURE_REPORT_REQUEST_ACK'/>
+      <value enum='AR' description='TRADE_CAPTURE_REPORT_ACK'/>
+      <value enum='AS' description='ALLOCATION_REPORT'/>
+      <value enum='AT' description='ALLOCATION_REPORT_ACK'/>
+      <value enum='AU' description='CONFIRMATION_ACK'/>
+      <value enum='AV' description='SETTLEMENT_INSTRUCTION_REQUEST'/>
+      <value enum='AW' description='ASSIGNMENT_REPORT'/>
+      <value enum='AX' description='COLLATERAL_REQUEST'/>
+      <value enum='AY' description='COLLATERAL_ASSIGNMENT'/>
+      <value enum='AZ' description='COLLATERAL_RESPONSE'/>
+      <value enum='BA' description='COLLATERAL_REPORT'/>
+      <value enum='BB' description='COLLATERAL_INQUIRY'/>
+      <value enum='BC' description='NETWORK_STATUS_REQUEST'/>
+      <value enum='BD' description='NETWORK_STATUS_RESPONSE'/>
+      <value enum='BE' description='USER_REQUEST'/>
+      <value enum='BF' description='USER_RESPONSE'/>
+      <value enum='BG' description='COLLATERAL_INQUIRY_ACK'/>
+      <value enum='BH' description='CONFIRMATION_REQUEST'/>
+      <value enum='BI' description='TRADING_SESSION_LIST_REQUEST'/>
+      <value enum='BJ' description='TRADING_SESSION_LIST'/>
+      <value enum='BK' description='SECURITY_LIST_UPDATE_REPORT'/>
+      <value enum='BL' description='ADJUSTED_POSITION_REPORT'/>
+      <value enum='BM' description='ALLOCATION_INSTRUCTION_ALERT'/>
+      <value enum='BN' description='EXECUTION_ACKNOWLEDGEMENT'/>
+      <value enum='BO' description='CONTRARY_INTENTION_REPORT'/>
+      <value enum='BP' description='SECURITY_DEFINITION_UPDATE_REPORT'/>
+    </field>
+    <field name='NewSeqNo' number='36' type='SEQNUM'/>
+    <field name='PossDupFlag' number='43' type='BOOLEAN'/>
+    <field name='RefSeqNum' number='45' type='SEQNUM'/>
+    <field name='SenderCompID' number='49' type='STRING'/>
+    <field name='SenderSubID' number='50' type='STRING'/>
+    <field name='SendingTime' number='52' type='UTCTIMESTAMP'/>
+    <field name='TargetCompID' number='56' type='STRING'/>
+    <field name='TargetSubID' number='57' type='STRING'/>
+    <field name='Text' number='58' type='STRING'/>
+    <field name='Signature' number='89' type='DATA'/>
+    <field name='SecureDataLen' number='90' type='LENGTH'/>
+    <field name='SecureData' number='91' type='DATA'/>
+    <field name='SignatureLength' number='93' type='LENGTH'/>
+    <field name='RawDataLength' number='95' type='LENGTH'/>
+    <field name='RawData' number='96' type='DATA'/>
+    <field name='PossResend' number='97' type='BOOLEAN'/>
+    <field name='EncryptMethod' number='98' type='INT'>
+      <value description='NONE_OTHER' enum='0'/>
+      <value description='PKCS' enum='1'/>
+      <value description='DES' enum='2'/>
+      <value description='PKCS_DES' enum='3'/>
+      <value description='PGP_DES' enum='4'/>
+      <value description='PGP_DES_MD5' enum='5'/>
+      <value description='PEM_DES_MD5' enum='6'/>
+    </field>
+    <field name='HeartBtInt' number='108' type='INT'/>
+    <field name='TestReqID' number='112' type='STRING'/>
+    <field name='OnBehalfOfCompID' number='115' type='STRING'/>
+    <field name='OnBehalfOfSubID' number='116' type='STRING'/>
+    <field name='OrigSendingTime' number='122' type='UTCTIMESTAMP'/>
+    <field name='GapFillFlag' number='123' type='BOOLEAN'/>
+    <field name='DeliverToCompID' number='128' type='STRING'/>
+    <field name='DeliverToSubID' number='129' type='STRING'/>
+    <field name='ResetSeqNumFlag' number='141' type='BOOLEAN'/>
+    <field name='SenderLocationID' number='142' type='STRING'/>
+    <field name='TargetLocationID' number='143' type='STRING'/>
+    <field name='OnBehalfOfLocationID' number='144' type='STRING'/>
+    <field name='DeliverToLocationID' number='145' type='STRING'/>
+    <field name='XmlDataLen' number='212' type='LENGTH'/>
+    <field name='XmlData' number='213' type='DATA'/>
+    <field number='347' name='MessageEncoding' type='STRING'>
+      <value enum='ISO-2022-JP' description='ISO_2022_JP'/>
+      <value enum='EUC-JP' description='EUC_JP'/>
+      <value enum='SHIFT_JIS' description='SHIFT_JIS'/>
+      <value enum='UTF-8' description='UTF_8'/>
+    </field>
+    <field name='EncodedTextLen' number='354' type='LENGTH'/>
+    <field name='EncodedText' number='355' type='DATA'/>
+    <field name='LastMsgSeqNumProcessed' number='369' type='SEQNUM'/>
+    <field name='RefTagID' number='371' type='INT'/>
+    <field name='RefMsgType' number='372' type='STRING'/>
+    <field name='SessionRejectReason' number='373' type='INT'>
+      <value description='INVALID_TAG_NUMBER' enum='0'/>
+      <value description='REQUIRED_TAG_MISSING' enum='1'/>
+      <value description='SENDINGTIME_ACCURACY_PROBLEM' enum='10'/>
+      <value description='INVALID_MSGTYPE' enum='11'/>
+      <value description='XML_VALIDATION_ERROR' enum='12'/>
+      <value description='TAG_APPEARS_MORE_THAN_ONCE' enum='13'/>
+      <value description='TAG_SPECIFIED_OUT_OF_REQUIRED_ORDER' enum='14'/>
+      <value description='REPEATING_GROUP_FIELDS_OUT_OF_ORDER' enum='15'/>
+      <value description='INCORRECT_NUMINGROUP_COUNT_FOR_REPEATING_GROUP' enum='16'/>
+      <value description='NON_DATA_VALUE_INCLUDES_FIELD_DELIMITER' enum='17'/>
+      <value description='TAG_NOT_DEFINED_FOR_THIS_MESSAGE_TYPE' enum='2'/>
+      <value description='UNDEFINED_TAG' enum='3'/>
+      <value description='TAG_SPECIFIED_WITHOUT_A_VALUE' enum='4'/>
+      <value description='VALUE_IS_INCORRECT' enum='5'/>
+      <value description='INCORRECT_DATA_FORMAT_FOR_VALUE' enum='6'/>
+      <value description='DECRYPTION_PROBLEM' enum='7'/>
+      <value description='SIGNATURE_PROBLEM' enum='8'/>
+      <value description='COMPID_PROBLEM' enum='9'/>
+      <value description='OTHER' enum='99'/>
+    </field>
+    <field name='MaxMessageSize' number='383' type='LENGTH'/>
+    <field name='NoMsgTypes' number='384' type='NUMINGROUP'/>
+    <field name='MsgDirection' number='385' type='CHAR'>
+      <value description='RECEIVE' enum='R'/>
+      <value description='SEND' enum='S'/>
+    </field>
+    <field name='TestMessageIndicator' number='464' type='BOOLEAN'/>
+    <field name='Username' number='553' type='STRING'/>
+    <field name='Password' number='554' type='STRING'/>
+    <field name='NoHops' number='627' type='NUMINGROUP'/>
+    <field name='HopCompID' number='628' type='STRING'/>
+    <field name='HopSendingTime' number='629' type='UTCTIMESTAMP'/>
+    <field name='HopRefID' number='630' type='SEQNUM'/>
+    <field name='NextExpectedMsgSeqNum' number='789' type='SEQNUM'/>
+    <field name='ApplVerID' number='1128' type='STRING'>
+      <value description='FIX27' enum='0'/>
+      <value description='FIX30' enum='1'/>
+      <value description='FIX40' enum='2'/>
+      <value description='FIX41' enum='3'/>
+      <value description='FIX42' enum='4'/>
+      <value description='FIX43' enum='5'/>
+      <value description='FIX44' enum='6'/>
+      <value description='FIX50' enum='7'/>
+      <value description='FIX50SP1' enum='8'/>
+      <value description='FIX50SP2' enum='9'/>
+    </field>
+    <field name='CstmApplVerID' number='1129' type='STRING'/>
+    <field name='RefApplVerID' number='1130' type='STRING'/>
+    <field name='RefCstmApplVerID' number='1131' type='STRING'/>
+    <field name='DefaultApplVerID' number='1137' type='STRING'/>
+  </fields>
+</fix>
@@ -0,0 +1,148 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using bts.api;
+using MathNet.Numerics.Statistics;
+using Google.Protobuf.WellKnownTypes;
+
+using bts.co2;
+
+namespace bts.history
+{
+   public interface IAlgo 
+   {
+      bool is_completed();
+      void set_param(string name, string val);
+
+      void process_book(string security_desc, uint security_key, co2.BookMessage current_book, co2.BookMessage curr_book,
+                        MarketDataIncrementalRefresh packet);
+      void process_trades(string security_desc, uint security_key, IEnumerable<co2.TradeMessage> trades,
+                          MarketDataIncrementalRefresh packet);
+   }
+   
+   abstract public partial class AlgoBase : IAlgo
+   {
+      public readonly Guid guid = Guid.NewGuid();
+      public ulong order_key { get; private set;}
+      
+      public string[] security_list { get; private set; }
+      public Action<FillEntry> on_fill;
+      public Action<OrderStatus> on_status;
+      
+      protected IOrderSink _sink;
+      public IOrderSink sink => _sink;
+
+      readonly protected SortedDictionary< string, Func<MDEntry, OrderIDEntry, bool> > _filter = new SortedDictionary<string, Func<MDEntry, OrderIDEntry, bool>>();      
+
+      protected AlgoBase(IOrderSink sink, string[] security_list) 
+      {
+         on_fill = new Action<FillEntry>(f => {});
+         on_status = new Action<OrderStatus>(s => {});
+         this._sink = sink;
+         this.security_list = security_list;
+         foreach (var sec in security_list)
+            _filter[sec] = (MDEntry md, OrderIDEntry id) => md.Symbol == sec;
+      }            
+                  
+      readonly Dictionary<string, string> _algo_params = new Dictionary<string, string>();
+      public IReadOnlyDictionary<string, string> algo_params => _algo_params;
+      public virtual void set_param(string name, string val)
+      {
+         _algo_params[name] = val;
+         var pi = this.GetType().GetProperty(name);
+         if(pi != null)
+         {
+            if(val.Contains(','))
+            {
+               var elem = pi.PropertyType.GetElementType();
+               var ary = val.Split(',').Select(x => Convert.ChangeType(x, elem)).ToArray();
+               var tary = Array.CreateInstance(elem, ary.Length);
+               Array.Copy(ary, tary, ary.Length);
+               pi.SetValue(this, tary);
+            }
+            else
+               pi.SetValue(this, Convert.ChangeType(val, pi.PropertyType));
+         }
+      }         
+
+      public virtual void process_book(string security_desc, uint security_key, co2.BookMessage current_book, co2.BookMessage curr_book,
+                                       MarketDataIncrementalRefresh packet)
+      {
+         if(!_filter.ContainsKey(security_desc))
+            return;
+         on_book(security_desc, security_key, current_book, curr_book, packet);
+      }
+
+      public virtual void process_trades(string security_desc, uint security_key, IEnumerable<co2.TradeMessage> trades,
+                                         MarketDataIncrementalRefresh packet)      
+      {
+         if (!_filter.ContainsKey(security_desc))
+            return;
+         on_trades(security_desc, security_key, trades, packet);
+      }      
+
+      public abstract object report();
+      public abstract bool is_completed();
+
+      protected virtual void on_book(string security_desc, uint security_key, co2.BookMessage current_book, co2.BookMessage working_book,
+                                     MarketDataIncrementalRefresh packet) { }
+      protected virtual void on_trades(string security_desc, uint security_key, IEnumerable<TradeMessage> trades, 
+                                       MarketDataIncrementalRefresh packet) { }
+                                       
+      protected abstract void do_launch(string[] security_list, api.Side side, double price, uint size, Timestamp asof, ulong order_key);
+      
+      protected abstract void do_update(Timestamp asof, double price, uint size = uint.MinValue);
+      protected virtual void do_update(Timestamp asof, Dictionary<string, string> algo_params, double price, uint size = uint.MinValue)
+      {
+         foreach (var s in algo_params)
+            this.set_param(s.Key, s.Value);
+         this.do_update(asof, price, size);
+      }
+      protected abstract void do_cancel(Timestamp asof);
+      protected virtual void get_done(Timestamp asof) {}
+
+      public class Handle : IEquatable<Handle>
+      {
+         readonly AlgoBase _algo;
+         public Handle(AlgoBase algo)
+         {
+            _algo = algo;
+         }
+         
+         public AlgoBase algo => _algo;
+         public ulong order_key => _algo.order_key;
+         public void launch(string[] security_list, api.Side side, double price, uint size, Timestamp asof, ulong order_key = ulong.MinValue)
+         {
+            if(order_key == ulong.MinValue)
+               order_key = IDGenerator.next_order_id();
+            _algo.do_launch(security_list, side, price, size, asof, order_key);
+         }
+         public void update(Timestamp asof, double price, uint size = uint.MinValue)
+         {
+            _algo.do_update(asof, price, size);
+         }
+         public void update(Timestamp asof, Dictionary<string, string> algo_params, double price, uint size = uint.MinValue)
+         {
+            foreach (var s in algo_params)
+               _algo.set_param(s.Key, s.Value);
+            update(asof, price, size);
+         }
+         public void cancel(Timestamp asof)
+         {
+            _algo.do_cancel(asof);
+         }
+         public void get_done(Timestamp asof)
+         {
+            _algo.get_done(asof);
+         }
+         public override int GetHashCode()
+         {
+            return this.algo.guid.GetHashCode();
+         }
+         public bool Equals(Handle other)
+         {
+            return this.algo.guid == other.algo.guid;
+         }
+      }
+   }
+}
@@ -0,0 +1,94 @@
+using System;
+using MathNet.Numerics.Statistics;
+using Google.Protobuf.WellKnownTypes;
+using System.Collections.Generic;
+using System.Reflection;
+using bts.api;
+
+namespace bts.history
+{
+   public class AlgoFactory
+   {
+      static public AlgoBase algo_factory<AlgoType>(IOrderSink sink,string[] security_list, string algo_params = null)
+         where AlgoType : AlgoBase
+      {
+         return AlgoBase.algo_factory(typeof(AlgoType), sink, security_list, algo_params);
+      }
+      static public void set_algo_params(IAlgo inst, string algo_params)
+      {
+         AlgoBase.set_algo_params((AlgoBase) inst, algo_params);
+      }
+      static public void set_algo_params(IAlgo inst, IEnumerable<string> param)
+      {
+         AlgoBase.set_algo_params((AlgoBase)inst, param);
+      }
+      public static AlgoBase.Handle launch(AlgoBase algo, api.Side side, double price, uint size, Timestamp asof,
+                                           Action<AlgoBase.Handle, FillEntry> more_on_fill = null,
+                                           Action<AlgoBase.Handle, OrderStatus> more_on_status = null)
+      {
+         var order_key = IDGenerator.next_order_id();
+         //I am activating myself at the top\         
+         var h = new AlgoBase.Handle(algo);
+         h.launch(algo.security_list, side, price, size, asof, order_key);
+         if (more_on_fill != null)
+            algo.on_fill += f => more_on_fill(h, f);
+         if (more_on_status != null)
+            algo.on_status += s => more_on_status(h, s);
+         return h;
+      }      
+   }   
+   abstract partial class AlgoBase
+   {
+      static public AlgoBase algo_factory(System.Type t, IOrderSink sink, 
+                                          string[] security_list, string algo_params = null)
+      {
+         AlgoBase inst = inst = (AlgoBase)Activator.CreateInstance(t, sink, security_list);
+
+         if(algo_params != null)
+            set_algo_params(inst, algo_params);
+         return inst;
+      }
+      public virtual Handle create<C>(Action<Handle, FillEntry> more_on_fill = null,
+                                      Action<Handle, OrderStatus> more_on_status = null)
+         where C : AlgoBase
+      {
+         var child = AlgoBase.algo_factory(typeof(C), _sink, security_list);
+         Handle h = hookup_child(child, more_on_fill, more_on_status);
+         return h;
+      }
+
+      protected Handle hookup_child(AlgoBase child, Action<Handle, FillEntry> more_on_fill, Action<Handle, OrderStatus> more_on_status)
+      {
+         child.order_key = order_key;
+         AlgoBase.set_algo_params(child, this.algo_params);
+         child.on_fill += f => this.on_fill(f);
+         //child.on_status += s => this.on_status(s);
+         var h = new Handle(child);
+         if (more_on_fill != null)
+            child.on_fill += (f => more_on_fill(h, f));
+         if (more_on_status != null)
+            child.on_status += (s => more_on_status(h, s));
+
+         return h;
+      }      
+      static public void set_algo_params(AlgoBase inst, string algo_params)
+      {
+         string[] param = algo_params.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries);
+         set_algo_params(inst, param);
+      }
+      static public void set_algo_params(AlgoBase inst, IEnumerable<string> param)
+      {
+         foreach (var par in param)
+         {
+            string[] tup = par.Split(new[] { '=' }, StringSplitOptions.RemoveEmptyEntries);
+            Log.assert(tup.Length == 2);
+            inst.set_param(tup[0], tup[1]);
+         }
+      }
+      static public void set_algo_params(AlgoBase inst, IReadOnlyDictionary<string, string> param)
+      {
+         foreach (var par in param)
+            inst.set_param(par.Key, par.Value);
+      }
+   }
+}
@@ -0,0 +1,70 @@
+using System;
+using System.Collections.Generic;
+using mbts.co2;
+
+using bts.api;
+using Google.Protobuf.WellKnownTypes;
+using MathNet.Numerics.Statistics;
+
+namespace bts.history
+{
+   public class CompletionCoverAlgo<Child, Hedge> : CompositeHedgeAlgo<Child, Hedge>
+      where Child : AlgoBase
+      where Hedge : AlgoBase
+   {
+      public CompletionCoverAlgo(IOrderSink sink, string[] security_list) : base(sink, security_list) { }
+      
+      string[] _security_list;
+      Side _myside;
+      double _myprice;
+      uint _mysize;
+
+      //algo parameters
+      public double hedge_ticks { get; set; } = 0.0;
+      public double hedge_factor { get; set; } = 1.0;
+
+      protected override void do_launch(string[] security_list, Side side, double price, uint size, Timestamp asof, ulong order_key) 
+      {
+         _security_list = security_list;
+         _myside = side;
+         _myprice = price;
+         _mysize = size;
+         _child = this.create<Child>();
+         _child.launch(security_list, side, price, size, asof);
+      }
+
+      protected override void on_child_status(Handle child, OrderStatus stat)
+      {
+         if(_child?.Equals(child) ?? false)
+         {            
+            if(stat.state.Status == api.orderman.OrderStatus.Completed)
+            {
+               var side = Utils.opposite_side(_myside);
+               uint size = (uint)(_mysize * this.hedge_factor);
+               double price = (side == Side.Buy) ?
+                  _myprice - this.hedge_ticks :
+                  _myprice + this.hedge_ticks;
+
+               send_hedge(_security_list, side, price, size, stat.TransactTime, null,
+                  (status_handle, status_entry) => { this.on_status?.Invoke(status_entry); } 
+               );
+            }
+            this.on_status?.Invoke(stat);
+         }
+      }
+
+      protected override void do_update(Timestamp asof, double price, uint size = uint.MinValue) 
+      {
+         _child.update(asof, price, size);
+      }
+
+      protected override void do_cancel(Timestamp asof) 
+      {
+         _child.cancel(asof);
+      }
+
+      protected override void on_child_fill(Handle child, FillEntry fill)
+      {
+      }
+   }
+}
@@ -0,0 +1,261 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using MathNet.Numerics.Statistics;
+using Google.Protobuf.WellKnownTypes;
+
+namespace bts.history
+{
+   public abstract class CompositeBase<Child, Hedge> : AlgoBase
+      where Hedge : AlgoBase
+   {
+      protected List<Handle> _children = new List<Handle>();
+      protected Handle _child 
+      {
+         get 
+         {
+            Log.assert(_children.Count <= 1);
+            return _children.FirstOrDefault(); 
+         } 
+         set 
+         { 
+            Log.assert(_children.Count <= 1);
+            if(value == null)
+            {
+               if(_children.Count == 1)            
+                  _children.RemoveAt(0);
+            }
+            else
+            {
+               if(_children.Count == 0)
+                  _children.Add(value);
+               else
+                  _children[0] = value;
+            }
+         }
+      }
+      public CompositeBase(IOrderSink sink, string[] security_list) : base(sink, security_list) 
+      {
+      }
+
+      public override Handle create<C>(Action<Handle, FillEntry> more_on_fill = null, 
+                                       Action<Handle, OrderStatus> more_on_status = null)     
+      {         
+         if(typeof(C) == this.GetType())
+         {
+            Log.assert(false);
+            return null;
+            //return AlgoBase.activate_self(this, side, price, size, asof, more_on_fill, more_on_status);
+         }         
+         else
+         {
+            Action<Handle, FillEntry> of = new Action<Handle, FillEntry>((h, f) => on_child_fill(h, f));
+            if (more_on_fill != null)
+               of += more_on_fill;
+            Action<Handle, OrderStatus> os = new Action<Handle, OrderStatus>((h, s) =>
+            {
+               on_child_status(h, s);
+               if (s.is_terminal())
+                  _children.Remove(h);
+            });
+            if (more_on_status != null)
+               os += more_on_status;
+
+            var handle = base_create<C>(of, os);
+            _children.Add(handle);
+            return handle;
+         }
+      }
+
+      protected Handle base_create<C>(Action<Handle, FillEntry> of, Action<Handle, OrderStatus> os)
+         where C : AlgoBase
+      {
+         return base.create<C>(of, os);
+      }
+
+      protected override void do_update(Timestamp asof, double price, uint size = uint.MinValue)
+      {
+         foreach(var child in _children.ToArray())
+            child?.update(asof, price, size);
+      }
+
+      protected override void get_done(Timestamp asof)
+      {
+         base.get_done(asof);
+         foreach (var child in _children.ToArray())
+            child?.get_done(asof);
+      }            
+
+      protected override void do_cancel(Timestamp asof)
+      {
+         foreach (var child in _children.ToArray())
+            child?.cancel(asof);
+      }      
+      protected virtual void on_child_fill(Handle child, FillEntry fill) { }
+      
+      protected abstract void on_child_status(Handle child, OrderStatus stat);
+   }
+
+   public abstract class CompositeAlgo<Child> : CompositeBase<Child, NullAlgo>
+   {
+      public CompositeAlgo(IOrderSink sink, string[] security_list) : base(sink, security_list) { }
+
+      public override bool is_completed()
+      {
+         bool comp = true;
+         foreach (var child in _children)
+            comp &= child.algo.is_completed();
+         return comp;
+      }
+      
+      public override object report()
+      {
+         string c = "";
+         foreach (var child in _children)
+            c+= child.algo.report();
+         return $"{c}";
+      }
+
+      public override void set_param(string name, string val)
+      {
+         base.set_param(name, val);
+         foreach (var child in _children)
+            child?.algo.set_param(name, val);
+      }
+
+      public override void process_book(string security_desc, uint security_key, co2.BookMessage current_book, co2.BookMessage working_book,
+                                        MarketDataIncrementalRefresh packet)
+      {
+         base.process_book(security_desc, security_key, current_book, working_book, packet);
+         foreach (var child in _children.ToArray()) //copy because this could remove / add a child
+            child?.algo.process_book(security_desc, security_key, current_book, working_book, packet);
+      }
+   }
+
+   public abstract class CompositeHedgeAlgo<Child, Hedge> : CompositeBase<Child, Hedge>
+      where Hedge : AlgoBase
+   {
+      protected int _payupcount;
+      protected Dictionary<Handle, Hedge> _hedges = new Dictionary<Handle, Hedge>();
+      public CompositeHedgeAlgo(IOrderSink sink, string[] security_list) : base(sink, security_list) {}
+
+      public override bool is_completed() 
+      {
+         bool comp = true;
+         foreach (var child in _children)
+            comp &= child.algo.is_completed();
+         foreach (var sub in _hedges.Values)
+         {
+            var hc = sub.is_completed();
+            if(!hc)
+               Log.assert(true);
+            comp &= hc;
+         }
+         return comp;
+      }
+
+      protected override void get_done(Timestamp asof)
+      {
+         base.get_done(asof);
+         foreach (var child in _children.ToArray())
+            child?.get_done(asof);
+         foreach (var sub in _hedges.Keys.ToArray())
+            sub.get_done(asof);
+      }
+      
+      public override object report() 
+      {
+         string c = "";
+         foreach (var child in _children)
+            c+= child.algo.report();
+         
+         int ih = 0;
+         string sh = string.Empty;
+         foreach (var sub in _hedges.Values)
+         {
+            if(sub.report() is string sr)
+               sh += sr;
+            if(sub.report() is int ir)
+               ih += ir;
+         }
+         return $"{c} Hedge Payups {sh} {ih+_payupcount} Incomplete {_hedges.Values.Sum( x => x.is_completed() ? 0u : 1u) } ";
+      }
+
+      public override void set_param(string name, string val)
+      {
+         base.set_param(name, val);
+         foreach (var child in _children)
+            child?.algo.set_param(name, val);
+         foreach (var sub in _hedges.Values)
+            sub.set_param(name, val);
+      }
+
+      public override void process_book(string security_desc, uint security_key, co2.BookMessage current_book, co2.BookMessage working_book,
+                                                MarketDataIncrementalRefresh packet)
+      {
+         base.process_book(security_desc, security_key, current_book, working_book, packet);
+         foreach (var child in _children.ToArray())
+            child?.algo.process_book(security_desc, security_key, current_book, working_book, packet);
+         foreach (var sub in _hedges.Values.ToArray())
+            sub.process_book(security_desc, security_key, current_book, working_book, packet);
+      }
+
+      public override Handle create<C>(Action<Handle, FillEntry> more_on_fill = null, 
+                                       Action<Handle, OrderStatus> more_on_status = null)
+      {
+         if (typeof(Hedge) == typeof(C))
+         {
+            Action<Handle, FillEntry> of = new Action<Handle, FillEntry>((h, f) => {} );
+            if (more_on_fill != null)
+               of += more_on_fill;
+            Action<Handle, OrderStatus> os = new Action<Handle, OrderStatus>((h, s) => {} );
+            if (more_on_status != null)
+               os += more_on_status;
+
+            var handle = base_create<Hedge>(of, os);                                         
+            _hedges[handle] = (Hedge)handle.algo;
+            return handle;
+         }
+         else
+            return base.create<C>(more_on_fill, more_on_status);
+      }
+
+      protected void send_hedge(string security_desc, api.Side side, double price, uint size, Timestamp asof,
+                                Action<Handle, FillEntry> more_on_fill = null,
+                                Action<Handle, OrderStatus> more_on_status = null)
+      {
+         send_hedge(new[] { security_desc }, side, price, size, asof, more_on_fill, more_on_status);
+      }
+
+      protected void send_hedge(string[] security_list, api.Side side, double price, uint size, Timestamp asof,
+                                Action<Handle, FillEntry> more_on_fill = null,
+                                Action<Handle, OrderStatus> more_on_status = null)                                
+      {
+         Action<Handle, FillEntry> hedge_on_fill = (hand, f) =>
+         {
+            if(more_on_fill != null)
+               more_on_fill(hand, f);
+            if (f.fully_filled)
+            {
+               if (_hedges.TryGetValue(hand, out Hedge h))
+               {
+                  if (h.report() is int pay)
+                     _payupcount += pay;
+                  _hedges.Remove(hand);
+               }
+            }
+         };
+         Action<Handle, OrderStatus> hedge_on_status = (hand,s) =>
+         {
+            if(more_on_status != null)
+               more_on_status(hand, s);
+            if (s.is_terminal())
+               _hedges.Remove(hand);
+         };
+
+         var handle = this.create<Hedge>(hedge_on_fill, hedge_on_status);
+         handle.launch(security_list, side, price, size, asof);
+      }
+   }
+   
+}
				`@@ -0,0 +1 @@`
				`[0108/231015.447:ERROR:file_io.cc(89)] ReadExactly: expected 36, observed 0`