fix: Revert accidental change to externals

So we can actually see the build output

.gitignore

@@ -34,3 +34,7 @@ trace_data/
 /doc/user/public/*
 .ionide/*
 /.ignore
+*.rej
+/build
+.clangd/
+.venv/**

.vscode/c_cpp_properties.json

@@ -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",

.vscode/launch.json

@@ -1,13 +1,41 @@
 {
     "version": "0.2.0",
     "configurations": [
+        {
+            "name": "Spark Local",
+            "type": "cppdbg",
+            "request": "launch",
+            "program": "${workspaceRoot}/build/ninja_debug/server/sparkd",
+            "args": [
+                "run",
+                "test",
+                "-a",
+                "OutrightVanillaOrder"
+            ],
+            "stopAtEntry": false,
+            "cwd": "${workspaceRoot}/build/ninja_debug/server/",
+            "environment": [
+                { "name": "TZ", "value": "America/Chicago" }
+            ],
+            "externalConsole": false,
+            "MIMode": "gdb",
+            "setupCommands": [
+                {
+                    "description": "Enable pretty-printing for gdb",
+                    "text": "-enable-pretty-printing",
+                    "ignoreFailures": true
+                }
+            ]
+        },
         {
             "name": "SparkVM Launch",
             "type": "cppdbg",
             "request": "launch",
             "program": "/home/bts/spark/build/ninja_debug/server/sparkd",
             "args": [
-                "run"
+                "test",
+                "-a",
+                "[ilink3]"
             ],
             "stopAtEntry": false,
             "cwd": "/home/bts/spark/build/ninja_debug/server/",

.vscode/tasks.json

@@ -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,30 @@
             "kind": "build",
             "isDefault": true
          }
-      }      
+      },
+      {
+         "label": "linux_build",
+         "type": "shell",
+         "command": "docker exec -i ${USER}s_docker bash -c \"cd build/ninja_${input:build_configuration} && ninja\"",
+         "group": {
+            "kind": "build",
+            "isDefault": true
+         },
+         "problemMatcher": [
+            "$gcc"
+         ]
+      }
+   ],
+   "inputs": [
+      {
+         "id": "build_configuration",
+         "type": "pickString",
+         "default": "debug",
+         "description": "Configuration:",
+         "options": [
+            "debug",
+            "release"
+         ]
+      }
    ]
 } 

CMakeLists.txt

@@ -1,6 +1,8 @@
 cmake_minimum_required(VERSION 3.5)
 project(spark)
 
+set (USE_ONIX "TRUE")
+
 if (WIN32)
   set (platform "windows")
 else ()
@@ -40,11 +42,17 @@ else ()
                                -fPIC -Wall -pedantic -Wextra -Werror \
                                -Wno-missing-braces -Wno-ignored-qualifiers \
                                --std=c++17 -fdiagnostics-color")
+
+  if (${USE_ONIX})
+    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DUSE_ONIX")
+  endif()
+
   set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_DEBUG} -fno-omit-frame-pointer -DNDEBUG -O3")
+  set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG")
   set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wno-undef")
   add_subdirectory(src/server/sparkd)
   add_subdirectory(src/lib)
-  add_subdirectory(src/web)
+  # add_subdirectory(src/web)
   add_subdirectory(doc/user)
   add_subdirectory(src/sdk)
   add_subdirectory(src/data_files)
@@ -55,11 +63,14 @@ else ()
     COMMAND ln ARGS -sf ${CMAKE_BINARY_DIR}/web ${CMAKE_BINARY_DIR}/server
     COMMAND ln ARGS -sf ${CMAKE_BINARY_DIR}/data_files ${CMAKE_BINARY_DIR}/server
     COMMAND ln ARGS -sf ${CMAKE_BINARY_DIR}/src/lib/libspark.so ${CMAKE_BINARY_DIR}/server
-    COMMAND ln ARGS -sf ${EXTERNALS_ROOT}/lib/Release/libOnixS.IceImpactMulticastPriceFeedHandlerCpp.so.3.13.0.0 ${CMAKE_BINARY_DIR}/server
+    COMMAND ln ARGS -sf ${EXTERNALS_ROOT}/lib/Release/libOnixS.IceImpactMulticastPriceFeedHandlerCpp.so.3.16.0.0 ${CMAKE_BINARY_DIR}/server
     COMMAND ln ARGS -sf ${EXTERNALS_ROOT}/lib/Release/libACE-5.7.5.so ${CMAKE_BINARY_DIR}/server
     COMMAND mkdir ARGS -p ${CMAKE_BINARY_DIR}/server/plugins
     COMMENT "Creating server runtime layout"
     DEPENDS sparkd data_files_dir)  
 
   add_custom_target(server_layout ALL DEPENDS ${CMAKE_BINARY_DIR}/server)
+
+  install(FILES "${CMAKE_SOURCE_DIR}/externals/linux/lib/${CMAKE_BUILD_TYPE}/libACE-5.7.5.so" DESTINATION bin)
+  install(FILES "${CMAKE_SOURCE_DIR}/externals/linux/lib/${CMAKE_BUILD_TYPE}/libOnixS.IceImpactMulticastPriceFeedHandlerCpp.so.3.16.0.0" DESTINATION bin)
 endif()

doc/api/content/client/_index.md

@@ -1,6 +1,6 @@
 +++
 title="Client API"
-template="client.html"
+redirect_to = "client/getting-started/overview/"
 sort_by="weight"
 +++
 

doc/api/content/client/getting-started/_index.md

@@ -1,6 +1,5 @@
 +++
 title="Getting Started"
-template="client.html"
 sort_by="weight"
 weight = 1
 +++ 

doc/api/content/client/getting-started/install.md

@@ -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://www.nuget.org/packages/spark_sdk/) 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

doc/api/content/client/getting-started/overview.md

@@ -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.
+

doc/api/content/client/getting-started/services.md

@@ -0,0 +1,140 @@
++++
+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
+#include "lib/api/public/ServiceContext.h"
+#include "lib/api/services/OrderService.client.pb.h"
+using namespace bts::api;
+ServiceContext ctx;
+auto orders = ctx.locate<orderman::OrderService>();
+auto unsub = orders.subscribe_fills().subscribe([](const auto& update) {
+  std::cout 
+    << "Added " << update.added().size() << " items, "
+    << "Removed " << update.removed().size() << " items, "
+    << "Updated " << update.updated().size() << " items, "
+    << "Total items " << update.all().size() << std::endl;
+});
+std::this_thread::sleep_for(std::chrono::minutes(5));
+```

doc/api/content/client/samples/_index.md

@@ -0,0 +1,6 @@
++++
+title="Samples"
+sort_by="weight"
+weight = 30
++++ 
+

doc/api/content/client/services/AdminService.md

@@ -0,0 +1,3 @@
++++
+title = "AdminService"
++++

doc/api/content/client/services/OrderService.md

@@ -0,0 +1,3 @@
++++
+title = "OrderService"
++++

doc/api/content/client/services/PositionService.md

@@ -0,0 +1,3 @@
++++
+title = "PositionService"
++++

doc/api/content/client/services/SyntheticSecurityService.md

@@ -0,0 +1,3 @@
++++
+title = "SyntheticService"
++++

doc/api/content/client/services/_index.md

@@ -0,0 +1,6 @@
++++
+title="Services"
+#sort_by="weight"
+weight = 10
++++ 
+

doc/api/content/client/services/marketdata.md

@@ -0,0 +1,51 @@
++++
+title = "Market Data"
++++
+
+
+Use the MarketDataService to subscribe enumerate all available securities.
+
+```cs
+using System;
+using System.Threading;
+using bts.api;
+using bts.api.core;
+
+namespace sample {
+   class Program {
+      static void Main(string[] args) {
+         using var context = new ServiceContext();
+         var md = context.locate<MarketDataService>();
+         using var sub = md.subscribe_securities().Subscribe(update => {
+            foreach (var security in update.added) {
+               Console.WriteLine($"Added security {security.Id}: {security.Symbol}");
+            }
+         });
+
+         Thread.Sleep(TimeSpan.FromMinutes(5));
+      }
+   }
+}
+```
+
+```cpp
+#include "lib/api/public/ServiceContext.h"
+#include "spark/lib/domain_model/Security.h"
+#include "lib/api/services/MarketDataService.client.pb.h"
+#include <thread>
+
+using namespace bts::api;
+
+int main(int argc, char** argv) {
+   ServiceContext ctx;
+   auto md_service = ctx.locate<bts::api::MarketDataService>();
+   auto sub = md_service.subscribe_securities().subscribe([](const auto& update) {
+      for (const auto& s : update.added()) {
+         std::cout << "Added security: " << s->id() << ": " << s->symbol() << std::endl;
+      }
+   });
+
+   std::this_thread::sleep_for(std::chrono::minutes(5));
+   return 0;
+}
+```

doc/api/content/server/_index.md

@@ -1,6 +1,5 @@
 +++
 title="Algo API"
-template="documentation.html"
 redirect_to = "server/getting-started/overview/"
 sort_by="weight"
 +++ 

doc/api/content/server/getting-started/_index.md

@@ -1,6 +1,5 @@
 +++
 title="Getting Started"
-template="documentation.html"
 sort_by="weight"
 weight = 1
 +++ 

doc/api/content/server/getting-started/development.md

@@ -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

doc/api/content/server/getting-started/download.md

@@ -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
 
@@ -68,12 +68,21 @@ To update your Spark SDK simply download an unzip a new [spark_sdk.zip](https://
 
 To preserve the old image so you can go back to it later run `docker tag spark_sdk spark_sdk:your_custom_tag` before loading the new SDK image.
 
-<!--
-Then stop, remove and restart spark_sdk.
+### Re-build the Dev Container
+
+If you are using Visual Studio Code you also need to rebuild the dev-container so it picks up the new image.
+
+#### Inside VSCode
+To re-build from inside Visual Studio Code.  Click the 'Remote Explorer' icon on the left hand side. 
+You should see your spark_sdk project listed under the Containers section.  Right click on it and select **rebuild-container**.
+
+#### Command Line
+To re-build from the command line run `docker ps -a` and find the row with the spark_sdk image. 
 ```
-c:\bts> docker stop spark_sdk
-c:\bts> docker rm spark_sdk
-c:\bts> docker run -d -v %cd%:/sdk --name spark_sdk bluetradingsytems/spark_sdk
+CONTAINER ID        IMAGE                          COMMAND                  CREATED              STATUS                      PORTS                                NAMES
+54d96cfa3888        spark_sdk                      "/bin/sh -c 'echo Co…"   About a minute ago   Up About a minute           127.0.0.1:9000-9001->9000-9001/tcp   quizzical_lichterman
+```
+Then run `docker rm 54d96cfa3888` (use your container id instead of 54d96cfa3888)  or `docker rm quizzical_lichterman` (use your container name).
+
 
-``` -->
 

doc/api/content/server/ref/_index.md

@@ -1,6 +1,5 @@
 +++
 title="Reference"
-template="documentation.html"
 sort_by="weight"
 weight = 2
 +++ 

doc/api/content/server/ref/faq.md

@@ -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.
+
+

doc/api/content/server/samples/_index.md

@@ -1,6 +1,5 @@
 +++
 title="Samples"
-template="documentation.html"
 sort_by="weight"
 weight = 3
 +++ 

doc/api/templates/client.html

@@ -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 %}

doc/api/templates/documentation.html

@@ -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 %}

doc/api/templates/index.html

@@ -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="{{ get_url(path="@/client/_index.md") }}" 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>

doc/api/templates/page.html

@@ -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 %}

doc/user/CMakeDeps.cmake

@@ -1 +1 @@
-set(sources /home/ppinto/Dropbox/bts/spark/doc/user/build.sh;content/_index.md;content/bts_spark/Glossary/_index.md;content/bts_spark/Help/_index.md;content/bts_spark/Help/about_spark.png;content/bts_spark/Help/image39.png;content/bts_spark/Help/image58.png;content/bts_spark/Launcher/_index.md;content/bts_spark/Launcher/image38.png;content/bts_spark/Launcher/image68.png;content/bts_spark/Logging-In-to-the-System/_index.md;content/bts_spark/Logging-In-to-the-System/image3.png;content/bts_spark/Logging-In-to-the-System/image64.png;content/bts_spark/Market/_index.md;content/bts_spark/Market/change_securities.png;content/bts_spark/Market/image11.png;content/bts_spark/Market/image14.png;content/bts_spark/Market/image20.png;content/bts_spark/Market/image21.png;content/bts_spark/Market/image23.png;content/bts_spark/Market/image24.png;content/bts_spark/Market/image34.png;content/bts_spark/Market/image49.png;content/bts_spark/Market/image53.png;content/bts_spark/Market/image66.png;content/bts_spark/Market/image69.png;content/bts_spark/Market/market_view.png;content/bts_spark/Market/settings_icon.png;content/bts_spark/Market/time_and_sales.png;content/bts_spark/My-Windows/_index.md;content/bts_spark/My-Windows/image15.png;content/bts_spark/My-Windows/image16.png;content/bts_spark/My-Windows/image37.png;content/bts_spark/Settings/_index.md;content/bts_spark/Settings/image51.png;content/bts_spark/Settings/image9.png;content/bts_spark/Spreader/_index.md;content/bts_spark/Spreader/image10.png;content/bts_spark/Spreader/image13.png;content/bts_spark/Spreader/image18.png;content/bts_spark/Spreader/image19.png;content/bts_spark/Spreader/image28.png;content/bts_spark/Spreader/image29.png;content/bts_spark/Spreader/image31.png;content/bts_spark/Spreader/image35.png;content/bts_spark/Spreader/image40.png;content/bts_spark/Spreader/image43.png;content/bts_spark/Spreader/image54.png;content/bts_spark/Spreader/image55.png;content/bts_spark/Spreader/image56.png;content/bts_spark/Spreader/image6.png;content/bts_spark/Spreader/image7.png;content/bts_spark/Spreader/image70.png;content/bts_spark/Spreader/image72.png;content/bts_spark/Spreader/image8.png;content/bts_spark/Trading/OrderTypes/index.md;content/bts_spark/Trading/_index.md;content/bts_spark/Trading/algo_studio.png;content/bts_spark/Trading/collapse_all_icon.png;content/bts_spark/Trading/cover_algo_control.png;content/bts_spark/Trading/expand_all_icon.png;content/bts_spark/Trading/image1.png;content/bts_spark/Trading/image17.png;content/bts_spark/Trading/image2.png;content/bts_spark/Trading/image25.png;content/bts_spark/Trading/image27.png;content/bts_spark/Trading/image33.png;content/bts_spark/Trading/image42.png;content/bts_spark/Trading/image44.png;content/bts_spark/Trading/image47.png;content/bts_spark/Trading/image48.png;content/bts_spark/Trading/image5.png;content/bts_spark/Trading/image50.png;content/bts_spark/Trading/image52.png;content/bts_spark/Trading/image57.png;content/bts_spark/Trading/image59.png;content/bts_spark/Trading/image60.png;content/bts_spark/Trading/image61.png;content/bts_spark/Trading/image62.png;content/bts_spark/Trading/image73.png;content/bts_spark/Trading/image74.png;content/bts_spark/Trading/join_algo_control.png;content/bts_spark/Trading/ladder.png;content/bts_spark/Trading/ladder_badges.png;content/bts_spark/Trading/ladder_main_part.png;content/bts_spark/Trading/lean_algo_control.png;content/bts_spark/Trading/mini_orderbook.png;content/bts_spark/Trading/oco_algo_control.png;content/bts_spark/Trading/offset_algo_control.png;content/bts_spark/Trading/pnl_calculation.png;content/bts_spark/Trading/pnl_window.png;content/bts_spark/Trading/recreate_icon.png;content/bts_spark/Trading/settings_icon.png;content/bts_spark/Trading/spark_menu_order_book.png;content/bts_spark/Trading/top_algo_control.png;content/bts_spark/Trading/trigger_algo_control.png;content/bts_spark/_index.md;content/release_notes/_index.md;content/system_requirements/_index.md;static/book.js;static/favicon.ico;static/image.js;templates/index.html;templates/page.html;templates/section.html;templates/shortcodes/back_button.html)
+set(sources /home/pfisher/bts/DJ_ICE/doc/user/build.sh;content/_index.md;content/bts_spark/Glossary/_index.md;content/bts_spark/Help/_index.md;content/bts_spark/Help/about_spark.png;content/bts_spark/Help/image39.png;content/bts_spark/Help/image58.png;content/bts_spark/Launcher/_index.md;content/bts_spark/Launcher/image38.png;content/bts_spark/Launcher/image68.png;content/bts_spark/Logging-In-to-the-System/_index.md;content/bts_spark/Logging-In-to-the-System/image3.png;content/bts_spark/Logging-In-to-the-System/image64.png;content/bts_spark/Market/_index.md;content/bts_spark/Market/change_securities.png;content/bts_spark/Market/image11.png;content/bts_spark/Market/image14.png;content/bts_spark/Market/image20.png;content/bts_spark/Market/image21.png;content/bts_spark/Market/image23.png;content/bts_spark/Market/image24.png;content/bts_spark/Market/image34.png;content/bts_spark/Market/image49.png;content/bts_spark/Market/image53.png;content/bts_spark/Market/image66.png;content/bts_spark/Market/image69.png;content/bts_spark/Market/market_view.png;content/bts_spark/Market/settings_icon.png;content/bts_spark/Market/time_and_sales.png;content/bts_spark/My-Windows/_index.md;content/bts_spark/My-Windows/image15.png;content/bts_spark/My-Windows/image16.png;content/bts_spark/My-Windows/image37.png;content/bts_spark/Settings/_index.md;content/bts_spark/Settings/image51.png;content/bts_spark/Settings/image9.png;content/bts_spark/Spreader/_index.md;content/bts_spark/Spreader/image10.png;content/bts_spark/Spreader/image13.png;content/bts_spark/Spreader/image18.png;content/bts_spark/Spreader/image19.png;content/bts_spark/Spreader/image28.png;content/bts_spark/Spreader/image29.png;content/bts_spark/Spreader/image31.png;content/bts_spark/Spreader/image35.png;content/bts_spark/Spreader/image40.png;content/bts_spark/Spreader/image43.png;content/bts_spark/Spreader/image54.png;content/bts_spark/Spreader/image55.png;content/bts_spark/Spreader/image56.png;content/bts_spark/Spreader/image6.png;content/bts_spark/Spreader/image7.png;content/bts_spark/Spreader/image70.png;content/bts_spark/Spreader/image72.png;content/bts_spark/Spreader/image8.png;content/bts_spark/Trading/OrderTypes/index.md;content/bts_spark/Trading/_index.md;content/bts_spark/Trading/algo_studio.png;content/bts_spark/Trading/collapse_all_icon.png;content/bts_spark/Trading/cover_algo_control.png;content/bts_spark/Trading/expand_all_icon.png;content/bts_spark/Trading/image1.png;content/bts_spark/Trading/image17.png;content/bts_spark/Trading/image2.png;content/bts_spark/Trading/image25.png;content/bts_spark/Trading/image27.png;content/bts_spark/Trading/image33.png;content/bts_spark/Trading/image42.png;content/bts_spark/Trading/image44.png;content/bts_spark/Trading/image47.png;content/bts_spark/Trading/image48.png;content/bts_spark/Trading/image5.png;content/bts_spark/Trading/image50.png;content/bts_spark/Trading/image52.png;content/bts_spark/Trading/image57.png;content/bts_spark/Trading/image59.png;content/bts_spark/Trading/image60.png;content/bts_spark/Trading/image61.png;content/bts_spark/Trading/image62.png;content/bts_spark/Trading/image73.png;content/bts_spark/Trading/image74.png;content/bts_spark/Trading/join_algo_control.png;content/bts_spark/Trading/ladder.png;content/bts_spark/Trading/ladder_badges.png;content/bts_spark/Trading/ladder_main_part.png;content/bts_spark/Trading/lean_algo_control.png;content/bts_spark/Trading/mini_orderbook.png;content/bts_spark/Trading/oco_algo_control.png;content/bts_spark/Trading/offset_algo_control.png;content/bts_spark/Trading/pnl_calculation.png;content/bts_spark/Trading/pnl_window.png;content/bts_spark/Trading/recreate_icon.png;content/bts_spark/Trading/settings_icon.png;content/bts_spark/Trading/spark_menu_order_book.png;content/bts_spark/Trading/top_algo_control.png;content/bts_spark/Trading/trigger_algo_control.png;content/bts_spark/_index.md;content/release_notes/_index.md;content/system_requirements/_index.md;static/book.js;static/favicon.ico;static/image.js;templates/index.html;templates/page.html;templates/section.html;templates/shortcodes/back_button.html)

doc/user/content/release_notes/_index.md

@@ -1,9 +1,38 @@
-+++
++++
 title = "Release notes"
 weight = 3
 sort_by = "weight"
 insert_anchor_links = "right"
 +++
+## 2.16.2
+### User Visible Change
+  - Synthetic creation dialog has a "fractional" checkbox next to the tick settings.  Users may uncheck this box to enter integer tick sizes, so the synthetic security's prices will be displayed without decimals, or fractional units.
+## 2.16.1
+### Bug Fixes
+  - OrderBook's algo state parameters (in the panel on the right side) are sorted alphabetically
+## 2.16.0
+### Bug Fixes
+  - Solved an issue that could result in incorrect ladder levels
+  - Solved an issue that could lead to incorrect routing of orders in the event of certain MSGW changes
+### API Changes
+  - Add C# client side API samples for order entry, position monitoring and market data observation
+
+## 2.15.10
+### Bug Fixes
+  - Solved an issue that could cause the user interface to fail when playing some alert sounds
+### API Changes
+  - Added settlement and position information to the API
+  - Added the ability for user algos to report custom state to the user interface
+  - Added the ability for algos to discover all active securities
+## 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
@@ -699,3 +728,4 @@ insert_anchor_links = "right"
 - Start, Day and Total PnL columns are painted with a red or green background color based on if the pnl value is negative or positive respectively
 - Corrected cash per point values, used in pnl calculations, for a number of products
 - PnL report will now remember any customizations you make to filtering and/or sorting criteria
+

global.json

@@ -0,0 +1,6 @@
+{
+  "sdk": {
+    "version": "2.1.508",
+    "rollForward": "latestMajor"
+  }
+}

requirements.txt

@@ -0,0 +1,21 @@
+astroid==2.7.3
+autopep8==1.5.7
+cffi==1.14.6
+colorama==0.4.4
+isort==5.9.3
+lazy-object-proxy==1.6.0
+mccabe==0.6.1
+pkg_resources==0.0.0
+platformdirs==2.3.0
+protobuf==3.19.1
+pybars3==0.9.7
+pycodestyle==2.7.0
+pycparser==2.20
+pylint==2.10.2
+PyMeta3==0.5.1
+termcolor==1.1.0
+toml==0.10.2
+typed-ast==1.4.3
+typing_extensions==4.1.1
+wrapt==1.12.1
+yapf==0.31.0

src/client/Directory.Build.Props

@@ -22,6 +22,10 @@
     <GenDir>$(BaseOutputPath)\gen\$(MSBuildProjectName)</GenDir>
 </PropertyGroup>
 
+<PropertyGroup Condition="'$(VCTargetsPath)'==''">
+    <VCTargetsPath>C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\Common7\IDE\VC\VCTargets</VCTargetsPath>
+</PropertyGroup>
+
 <Import Project="$(ComputerSpecificConfig)" Condition="Exists($(ComputerSpecificConfig))" />
 
 <ItemGroup>

src/client/RiskUI/AssemblyInfo.cs

@@ -0,0 +1,10 @@
+using System.Windows;
+
+[assembly: ThemeInfo(
+    ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
+                                     //(used if a resource is not found in the page,
+                                     // or application resource dictionaries)
+    ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
+                                              //(used if a resource is not found in the page,
+                                              // app, or any theme specific resource dictionaries)
+)]

src/client/RiskUI/CustomControl1.cs

@@ -0,0 +1,51 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace RiskUI {
+   /// <summary>
+   /// Follow steps 1a or 1b and then 2 to use this custom control in a XAML file.
+   ///
+   /// Step 1a) Using this custom control in a XAML file that exists in the current project.
+   /// Add this XmlNamespace attribute to the root element of the markup file where it is 
+   /// to be used:
+   ///
+   ///     xmlns:MyNamespace="clr-namespace:RiskUI"
+   ///
+   ///
+   /// Step 1b) Using this custom control in a XAML file that exists in a different project.
+   /// Add this XmlNamespace attribute to the root element of the markup file where it is 
+   /// to be used:
+   ///
+   ///     xmlns:MyNamespace="clr-namespace:RiskUI;assembly=RiskUI"
+   ///
+   /// You will also need to add a project reference from the project where the XAML file lives
+   /// to this project and Rebuild to avoid compilation errors:
+   ///
+   ///     Right click on the target project in the Solution Explorer and
+   ///     "Add Reference"->"Projects"->[Select this project]
+   ///
+   ///
+   /// Step 2)
+   /// Go ahead and use your control in the XAML file.
+   ///
+   ///     <MyNamespace:CustomControl1/>
+   ///
+   /// </summary>
+   public class CustomControl1 : Control {
+      static CustomControl1() {
+         DefaultStyleKeyProperty.OverrideMetadata(typeof(CustomControl1), new FrameworkPropertyMetadata(typeof(CustomControl1)));
+      }
+   }
+}

src/client/RiskUI/RiskUI.csproj

@@ -0,0 +1,24 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net471</TargetFramework>
+    <RootNamespace>bts</RootNamespace>
+    <LangVersion>7.2</LangVersion>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <WarningsAsErrors />
+    <Version>$(major).$(minor).$(patch)</Version>
+    <Version Condition="'$(version)'=='..'">1.0.0</Version>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
+    <Reference Include="System.Xaml" />
+    <Reference Include="WindowsBase" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="../spark_api/spark_api.csproj" />
+    <ProjectReference Include="../Spark/Spark.csproj" />
+  </ItemGroup>
+
+</Project>

src/client/RiskUI/Themes/Generic.xaml

@@ -0,0 +1,17 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="clr-namespace:RiskUI">
+    <Style TargetType="{x:Type local:CustomControl1}">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type local:CustomControl1}">
+                    <Border Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}">
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+</ResourceDictionary>

src/client/spark/Admin/AdminModel.cs

@@ -1,24 +1,33 @@
 using bts;
+using bts.admin.risk;
+using bts.api;
 using bts.api.admin;
 using bts.api.core;
+using bts.spark;
 using bts.utils;
 using System;
 using System.Collections.Generic;
+using System.Collections.Immutable;
 using System.ComponentModel.Composition;
 using System.Linq;
 using System.Reactive.Linq;
+using System.Threading.Tasks;
 
 namespace mbts.spark {
    [Export]
    class AdminModel : IDisposable {
       public readonly UserTuple user;
 
+      readonly AdminService _service;
+      readonly ErrorReporter _error_reporter;
       IDisposable _dispose;
       IReadOnlyDictionary<uint, string> _account_map = DictionaryHelper.empty<uint, string>();
 
       [ImportingConstructor]
-      AdminModel(AdminService service, UserTuple user) {
+      AdminModel(AdminService service, UserTuple user, SecurityStore security_store, ErrorReporter error_reporter) {
          this.user = user;
+         _service = service;
+         _error_reporter = error_reporter;
          // accounts
          on_accounts = service.subscribei_admin_data()
             .Select(up => up.all.TryGetFirst(out var ad) && ad.Users.Where(u => u.Name == user.name).TryGetSingle(out var usr) && usr.HasUserData && usr.UserData.HasAccountPermissions ?
@@ -31,6 +40,34 @@ namespace mbts.spark {
                new Dictionary<uint, string>(0))
             .Replay(1)
             .RefCount();
+         // account risk limits
+         account_security_risk_limits = service.subscribei_admin_data().Where(ad => ad.all.Any())
+            .Select(upd => {
+               AdminDataImmutable admin_data = upd.all.First();
+               return admin_data.Accounts.SelectMany(acc =>
+                  (acc.HasProprietaryRiskLimits ? acc.ProprietaryRiskLimits.SecurityLimits : Enumerable.Empty<SecurityRiskLimitUnitImmutable>())
+                  .Select(api_limit => AccountSecurityRiskLimitsDataHelper.to_client_data(acc.Id, api_limit)))
+               .ToDictionary(AccountSecurityRiskLimitsDataHelper.key_fn);
+            })
+            .Table(AccountSecurityRiskLimitsDataHelper.key_fn);
+         // this isn't the most efficient join, but the SecurityStore join is more complex than a simple
+         // left join operation, because missing securities are retrieved asynchronously, then merged back into the output sequence.
+         // Until it is known that this inefficiency is problematic, best to leave the battle-tested SecurityStore code alone.
+         account_security_risk_limits = security_store.join<
+            TableUpdate<AccountSecurityRiskLimits, AccountSecurityKey>,
+            AccountSecurityRiskLimits,
+            AccountSecurityKey,
+            TableUpdate<AccountSecurityRiskLimits, AccountSecurityKey>>(account_security_risk_limits,
+            cli_lim => cli_lim.security_key,
+            table => (table.state.Values, table.added, table.changes, table.removed, AccountSecurityRiskLimitsDataHelper.key_fn),
+            (all, added, changes, removed, key_fn) =>
+            new TableUpdate<AccountSecurityRiskLimits, AccountSecurityKey>(
+               ImmutableDictionary.CreateRange<AccountSecurityKey, AccountSecurityRiskLimits>(
+                  all.Select(tup => new KeyValuePair<AccountSecurityKey, AccountSecurityRiskLimits>(tup.val.key, risk_lim_with_sec(tup)))),
+                  added.Select(risk_lim_with_sec),
+                  changes.Select(ch => new Change<AccountSecurityRiskLimits>(risk_lim_with_sec(ch.Old), risk_lim_with_sec(ch.New))),
+                  removed.Select(risk_lim_with_sec),
+                  AccountSecurityRiskLimitsDataHelper.key_fn));
          // users
          on_users = Observable.Return(DictionaryHelper.wrap_value(user.id, user.name));
          all_user_tuples = user.permissions == UserTuple.Permissions.Admin ?
@@ -45,12 +82,16 @@ namespace mbts.spark {
                .Cache() :
                Observable.Return(TableUpdate<UserTuple, uint>.mk_empty(UserTuple.key_fn).with_added(new[] { user }));
          _dispose = on_accounts.Subscribe(map => _account_map = map);
+         // local methods
+         AccountSecurityRiskLimits risk_lim_with_sec((SecurityImmutable? sec, AccountSecurityRiskLimits val) tup) =>
+            tup.val.with(security: tup.sec);
       }
 
       public IObservable<IReadOnlyDictionary<uint, string>> on_users { get; }
       public IObservable<IReadOnlyDictionary<uint, string>> on_accounts { get; }
       public IObservable<TableUpdate<UserTuple, uint>> all_user_tuples { get; }
       public IObservable<IReadOnlyList<AccountTuple>> on_account_tuples => on_accounts.Select(d => d.Select(kv => new AccountTuple(kv.Key, kv.Value)).ToListSorted(a => a.name));
+      public IObservable<TableUpdate<AccountSecurityRiskLimits, AccountSecurityKey>> account_security_risk_limits { get; }
 
       public IObservable<Update<T, TKey>> permission_filter<T, TKey>(IObservable<Update<T, TKey>> positions, Func<T, uint> get_account_id) where TKey : IEquatable<TKey> =>
          user.permissions == UserTuple.Permissions.Admin ?
@@ -68,7 +109,86 @@ namespace mbts.spark {
       public AccountTuple? get_default_account() =>
          _account_map.Select(kv => new AccountTuple(kv.Key, kv.Value)).TryFirst();
 
+      public async Task<Result<AdminServiceOperationResult>[]> set_risk_limits(IReadOnlyDictionary<uint, IEnumerable<(uint, RiskLimits)>> state) {
+         var results = await Task.WhenAll(state.Select(impl));
+         return results;
+         async Task<Result<AdminServiceOperationResult>> impl(KeyValuePair<uint, IEnumerable<(uint, RiskLimits)>> kv) {
+            var prlimits = new ProprietaryRiskLimits();
+            foreach (var (sec, lim) in kv.Value) {
+               var api_lim = AccountSecurityRiskLimitsDataHelper.from_client_data(sec, lim);
+               prlimits.SecurityLimits.Add(api_lim);
+            }
+            return await _service.update_proprietary_risk_limits_async(new ProprietaryRiskLimitsAPIArgument {
+               AccountId = kv.Key,
+               ProprietaryRiskLimits = prlimits
+            });
+         }
+      }
+
+      public Task<(bool success, string error_msg)> add_or_update_risk_limits(uint account_key, IEnumerable<(uint security_key, RiskLimits limits)> new_limits) {
+         return _modify_risk_limits("Updating Risk Limits", account_key, add_limits);
+         //
+         ProprietaryRiskLimits add_limits(ProprietaryRiskLimits prlimits) {
+            foreach (var (security_key, limits) in new_limits) {
+               var api_limits = AccountSecurityRiskLimitsDataHelper.from_client_data(security_key, limits);
+               if (prlimits.SecurityLimits.TryGetFirstIndex(l => l.SecurityKey == security_key, out int index)) {
+                  prlimits.SecurityLimits[index] = api_limits;
+               } else {
+                  prlimits.SecurityLimits.Add(api_limits);
+               }
+            }
+            return prlimits;
+         }
+      }
+
+      public Task<(bool success, string error_msg)> delete_risk_limits(uint account_key, IEnumerable<uint> security_keys) {
+         return _modify_risk_limits("Deleting Risk Limits", account_key, remove_secs);
+         //
+         ProprietaryRiskLimits remove_secs(ProprietaryRiskLimits prlimits) {
+            var sec_key_set = new HashSet<uint>(security_keys);
+            for (int i = 0; i < prlimits.SecurityLimits.Count;) {
+               if (sec_key_set.Contains(prlimits.SecurityLimits[i].SecurityKey)) {
+                  prlimits.SecurityLimits.RemoveAt(i);
+               } else i++;
+            }
+            return prlimits;
+         }
+      }
+
       public void Dispose() =>
          Disposable.dispose(ref _dispose);
+
+      async Task<(bool success, string error_msg)> _modify_risk_limits(string op_desc, uint account_key, Func<ProprietaryRiskLimits, ProprietaryRiskLimits> modify) {
+         var api_limits = new ProprietaryRiskLimits();
+         var snapshot = await _get_current_admin_data_async();
+         if (!snapshot.HasValue)
+            return (false, "Timed out waiting for data from server.");
+         var mutable_snap = snapshot.Value.CloneToMutable();
+         if (!snapshot.Value.Accounts.TryGetFirst(acc => acc.Id == account_key, out var target_acci)) {
+            return (false, $"Account id '{account_key}' not found.");
+         }
+         var prlimits = target_acci.HasProprietaryRiskLimits ? target_acci.ProprietaryRiskLimits.CloneToMutable() : new ProprietaryRiskLimits();
+         prlimits = modify(prlimits);
+         if (prlimits is null) {
+            return (false, "Client-side modification function returned null.");
+         }
+         var req = new ProprietaryRiskLimitsAPIArgument {
+            AccountId = account_key,
+            ProprietaryRiskLimits = prlimits
+         };
+         var reply = await _error_reporter.safe_execute<AdminServiceOperationResult>(
+            () => _service.update_proprietary_risk_limits_async(req),
+            r => r.IsSuccess,
+            r => r.ErrorText,
+            op_desc);
+         return (reply.success, reply.value.ErrorText);
+      }
+
+      async Task<AdminDataImmutable?> _get_current_admin_data_async() =>
+         await _service.subscribei_admin_data()
+            .Where(upd => upd.all.Any())
+            .Select(upd => (AdminDataImmutable?)upd.all.First())
+            .FirstOrDefaultAsync(TimeSpan.FromSeconds(5));
+      //async Task<AdminDataImmutable?>
    }
-}
+}

src/client/spark/Admin/RiskLimits.cs

@@ -0,0 +1,183 @@
+using bts.api;
+using bts.api.admin;
+using bts.utils;
+using System;
+
+namespace bts.admin.risk {
+   readonly struct AccountSecurityKey : IEquatable<AccountSecurityKey> {
+      public AccountSecurityKey(uint account, uint security) {
+         this.account = account;
+         this.security = security;
+      }
+
+      public uint account { get; }
+      public uint security { get; }
+
+      public bool Equals(AccountSecurityKey other) =>
+         security == other.security &&
+         account == other.account;
+
+      public override bool Equals(object obj) =>
+         obj is AccountSecurityKey other && Equals(other);
+
+      public override int GetHashCode() =>
+         EqualityComparer.auto_phase(security.GetHashCode(), account.GetHashCode());
+
+      public static bool operator ==(AccountSecurityKey a, AccountSecurityKey b) => a.Equals(b);
+      public static bool operator !=(AccountSecurityKey a, AccountSecurityKey b) => !a.Equals(b);
+   }
+
+   readonly struct AccountSecurityRiskLimits : IEquatable<AccountSecurityRiskLimits> {
+      readonly AccountTuple? _account;
+
+      public AccountSecurityRiskLimits(AccountSecurityKey key, RiskLimits limits, SecurityImmutable? security = null, AccountTuple? account = null) {
+         this.key = key;
+         this.limits = limits;
+         this.security = security;
+         _account = account;
+      }
+
+      public AccountSecurityKey key { get; }
+      public uint account_key => key.account;
+      public uint security_key => key.security;
+      public string account_name => _account?.name;
+      public SecurityImmutable? security { get; }
+      public RiskLimits limits { get; }
+
+      public bool Equals(AccountSecurityRiskLimits other) =>
+         key.Equals(other.key) &&
+         limits.Equals(other.limits);
+
+      public override bool Equals(object obj) =>
+         obj is AccountSecurityRiskLimits other && Equals(other);
+
+      public override int GetHashCode() =>
+         EqualityComparer.auto_phase(key.GetHashCode(), limits.GetHashCode());
+   }
+
+   readonly struct RiskLimits : IEquatable<RiskLimits> {
+      public RiskLimits(
+         bool is_position_limit_enabled,
+         uint max_long_position,
+         uint max_short_position,
+         bool is_clip_limit_enabled,
+         uint clip_limit,
+         bool is_price_limit_enabled,
+         double min_price,
+         double max_price) {
+         //
+         this.is_position_limit_enabled = is_position_limit_enabled;
+         this.max_long_position = max_long_position;
+         this.max_short_position = max_short_position;
+         this.is_clip_limit_enabled = is_clip_limit_enabled;
+         this.clip_limit = clip_limit;
+         this.is_price_limit_enabled = is_price_limit_enabled;
+         this.min_price = min_price;
+         this.max_price = max_price;
+      }
+
+      // position
+      public bool is_position_limit_enabled { get; }
+      public uint max_long_position { get; }
+      public uint max_short_position { get; }
+      // clip
+      public bool is_clip_limit_enabled { get; }
+      public uint clip_limit { get; }
+      // price
+      public bool is_price_limit_enabled { get; }
+      public double min_price { get; }
+      public double max_price { get; }
+
+      public bool Equals(RiskLimits other) =>
+         is_position_limit_enabled == other.is_position_limit_enabled &&
+         max_long_position == other.max_long_position &&
+         max_short_position == other.max_short_position &&
+         is_clip_limit_enabled == other.is_clip_limit_enabled &&
+         clip_limit == other.clip_limit &&
+         is_price_limit_enabled == other.is_price_limit_enabled &&
+         min_price == other.min_price &&
+         max_price == other.max_price;
+
+      public override bool Equals(object obj) =>
+         obj is RiskLimits other && Equals(other);
+
+      public override int GetHashCode() {
+         const int non_bin_bits = 28;
+         // Evenly split the non-binary props across the first 28 bits.
+         // The last 3 bits are used to represent each of the 'is_enabled' (binary) props.
+         var hash = EqualityComparer.auto_phase(new[] {
+               max_long_position.GetHashCode(),
+               max_short_position.GetHashCode(),
+               clip_limit.GetHashCode(),
+               min_price.GetHashCode(),
+               max_price.GetHashCode()
+            }, non_bin_bits);
+         if (is_position_limit_enabled)
+            hash |= 1 << (non_bin_bits + 1);
+         if (is_clip_limit_enabled)
+            hash |= 1 << (non_bin_bits + 2);
+         if (is_price_limit_enabled)
+            hash |= 1 << (non_bin_bits + 3);
+         return hash;
+      }
+   }
+
+   static class AccountSecurityRiskLimitsDataHelper {
+      public static readonly Func<AccountSecurityRiskLimits, AccountSecurityKey> key_fn =
+         a => a.key;
+
+      // Don't make this a constructor.  Subscribers to this data are discouraged
+      // from using the server side data (client/server coupling should be minimal).
+      public static AccountSecurityRiskLimits to_client_data(uint account_key, SecurityRiskLimitUnitImmutable api_data) =>
+         new AccountSecurityRiskLimits(
+            new AccountSecurityKey(account_key, api_data.SecurityKey),
+            new RiskLimits(
+               api_data.EnforceNetPosLimits,
+               api_data.NetLongPositionLimit,
+               api_data.NetShortPositionLimit,
+               api_data.EnforceClipLimits,
+               api_data.ClipSize,
+               api_data.EnforcePriceBands,
+               api_data.MinSellPrice,
+               api_data.MaxBuyPrice));
+
+      public static AccountSecurityRiskLimits with(this AccountSecurityRiskLimits cli_data, RiskLimits? limits = null, AccountTuple? account = null, SecurityImmutable? security = null, AccountSecurityKey? key = null) =>
+         new AccountSecurityRiskLimits(
+            key ?? cli_data.key,
+            limits ?? cli_data.limits,
+            account: account ?? new AccountTuple(cli_data.account_key, cli_data.account_name),
+            security: security ?? cli_data.security);
+
+      public static RiskLimits with(this RiskLimits limits,
+         bool? is_position_limit_enabled = null,
+         uint? max_long_position = null,
+         uint? max_short_position = null,
+         bool? is_clip_limit_enabled = null,
+         uint? clip_limit = null,
+         bool? is_price_limit_enabled = null,
+         double? min_price = null,
+         double? max_price = null) =>
+         new RiskLimits(
+            is_position_limit_enabled ?? limits.is_position_limit_enabled,
+            max_long_position ?? limits.max_long_position,
+            max_short_position ?? limits.max_short_position,
+            is_clip_limit_enabled ?? limits.is_clip_limit_enabled,
+            clip_limit ?? limits.clip_limit,
+            is_price_limit_enabled ?? limits.is_price_limit_enabled,
+            min_price ?? limits.min_price,
+            max_price ?? limits.max_price);
+
+      public static SecurityRiskLimitUnit from_client_data(uint security_key, RiskLimits limits) =>
+         new SecurityRiskLimitUnit {
+            SecurityKey = security_key,
+            NetLongPositionLimit = limits.max_long_position,
+            NetShortPositionLimit = limits.max_short_position,
+            MaxBuyPrice = limits.max_price,
+            MinSellPrice = limits.min_price,
+            ClipSize = limits.clip_limit,
+            EnforceNetPosLimits = limits.is_position_limit_enabled,
+            EnforceClipLimits = limits.is_clip_limit_enabled,
+            EnforcePriceBands = limits.is_price_limit_enabled
+         };
+   }
+}

src/client/spark/AlgoProvider/AlgoProviderFactory.cs

@@ -0,0 +1,193 @@
+using bts;
+using bts.api;
+using bts.api.core;
+using mbts.ui.utility;
+using mbts.utils;
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.ComponentModel.Composition;
+using System.Linq;
+using System.Reactive.Linq;
+using System.Text.RegularExpressions;
+using AlgoType = bts.api.orderman.CustomOrderDefinition.CustomOneofCase;
+
+namespace mbts.spark {
+   class AlgoProviderFactory {
+      [ImportingConstructor]
+      AlgoProviderFactory(IAlgoStudioModel studio_model, DynamicOrderHelper dynamic_helper, ISecurityAuxiliaryDataModel security_auxiliary_model) {
+         var from_conf = config.Configuration.get<bts.config.AlgoTypeRuleSet>();
+         if (from_conf.rules.Count == 0) {
+            // There seems to be a config race bug, where the returned config values are empty, despite having entries in spark.conf.
+            // [John]I've only noticed it happen when attached to the debugger,
+            // but best to have a contingency plan in place anyways, to prevent any chance of regression.
+            // The fallback sets below mimic the old hardcoded algo type arrays.
+            var full_algo_set = new AlgoTypeSetImmutable(
+               ImmutableHashSet.CreateRange(EnumHelper.get_values_except(
+                  // non-factory algos
+                  AlgoType.None,
+                  AlgoType.Dynamic,
+                  AlgoType.Composite,
+                  // obsolete algos
+                  AlgoType.Oco,
+                  AlgoType.TimeBox,
+                  AlgoType.Pricer,
+                  AlgoType.Tick,
+                  AlgoType.Trigger,
+                  AlgoType.QueueHolder)),
+               ImmutableHashSet.CreateRange(dynamic_helper.dynamic_types));
+            var rules = new[] {
+               // Glbx: Futures/Spreads
+               new SecurityAlgoTypeSetImmutable(
+                  new SecurityCriteriaClause(
+                     exchanges: new[] { Venue.Glbx },
+                     security_types: new[] { SecurityType.Future, SecurityType.Spread }),
+                  new AlgoTypeSetImmutable(
+                     full_algo_set.factory_types.Except(new[] { AlgoType.Spreader }),
+                     full_algo_set.dynamic_types)),
+               // Gen: Futures/Spreads
+               new SecurityAlgoTypeSetImmutable(
+                  new SecurityCriteriaClause(
+                     exchanges: EnumHelper.get_values_except(Venue.Glbx, Venue.Unset).ToArray(),
+                     security_types: new[] { SecurityType.Future, SecurityType.Spread }),
+                  new AlgoTypeSetImmutable(
+                     full_algo_set.factory_types.Except(new[] { AlgoType.Spreader, AlgoType.GlbxIceberg }),
+                     full_algo_set.dynamic_types)),
+               // Gen: Synthetics
+               new SecurityAlgoTypeSetImmutable(
+                  new SecurityCriteriaClause(
+                     security_types: new[] { SecurityType.Synthetic }),
+                  new AlgoTypeSetImmutable(
+                     ImmutableHashSet.CreateRange(new[] {
+                        AlgoType.Spreader,
+                        AlgoType.Iceberg,
+                        AlgoType.Lean,
+                        AlgoType.Join,
+                        AlgoType.Cover,
+                        AlgoType.Offset,
+                        AlgoType.Top,
+                        AlgoType.Splitter,
+                        AlgoType.Scratch,
+                        AlgoType.Prorata
+                     }),
+                  full_algo_set.dynamic_types))
+             };
+            // attachable
+            var attachable_algos =
+               ImmutableHashSet.CreateRange(new[] {
+                  AlgoType.Iceberg,
+                  AlgoType.Lean,
+                  AlgoType.Join,
+                  AlgoType.Cover,
+                  AlgoType.Top,
+                  AlgoType.Offset,
+                  AlgoType.Scratch,
+                  AlgoType.Prorata
+               });
+            var attachable_rules = Array.ConvertAll(rules,
+               satsi => new SecurityAlgoTypeSetImmutable(
+                  satsi.security_criteria,
+                  new AlgoTypeSetImmutable(
+                     satsi.algo_type_set.factory_types.Intersect(attachable_algos),
+                     satsi.algo_type_set.dynamic_types)));
+
+            Log.Config.warn($"Failed to load AlgoTypes config, falling back to the following algo set rules:" +
+               "\n\tStandard\n" +
+               rules.fmt_diagnostic("\n\t\t") +
+               "\n\n\tAttachable\n" +
+               attachable_rules.fmt_diagnostic("\n\t\t"));
+
+            security_algo_provider = new AlgoProvider(rules, studio_model, dynamic_helper, security_auxiliary_model);
+            attachable_algo_provider = new AttachableAlgoProvider(attachable_rules, studio_model, dynamic_helper, security_auxiliary_model);
+         } else {
+            var algo_type_data =
+               EnumHelper.get_values_except(AlgoType.Dynamic, AlgoType.Composite, AlgoType.None)
+              .Select(t => _get_type_data(t))
+              .Concat(dynamic_helper.dynamic_types.Select(dt => _get_type_data(AlgoType.Dynamic, dt)))
+              .ToListLazy();
+            var conf_sets = from_conf.rules.Select(r => _to_security_algo_set(r, dynamic_helper, algo_type_data)).ToList();
+            security_algo_provider = new AlgoProvider(conf_sets.Select(tup => tup.standard).ToList(), studio_model, dynamic_helper, security_auxiliary_model);
+            attachable_algo_provider = new AttachableAlgoProvider(conf_sets.Select(tup => tup.attachable).ToList(), studio_model, dynamic_helper, security_auxiliary_model);
+         }
+      }
+
+      [Export]
+      public IAlgoProvider security_algo_provider { get; }
+      [Export]
+      public IAttachableAlgoProvider attachable_algo_provider { get; }
+
+      static (string name, AlgoType factory, string dynamic) _get_type_data(AlgoType type, string dynamic_type = null) {
+         string type_name = type.ToString();
+         return (type_name, type, dynamic_type ?? type_name);
+      }
+
+      static SecurityCriteriaClause _to_clause(bts.config.AlgoTypeContext context) =>
+         context == null ?
+            new SecurityCriteriaClause() :
+            new SecurityCriteriaClause(
+               exchanges: context.exchanges?.Select(EnumHelper.parse<Venue>)?.ToArray(),
+               security_types: context.security_types?.Select(EnumHelper.parse<Security.ContractOneofCase>)?.Select(t => t.security_type())?.ToArray(),
+               symbols: context.symbols?.ToArray());
+
+      static (SecurityAlgoTypeSetImmutable standard, SecurityAlgoTypeSetImmutable attachable) _to_security_algo_set(
+         bts.config.AlgoTypeRule rule,
+         DynamicOrderHelper dynamic_helper,
+         IEnumerable<(string name, AlgoType factory, string dynamic)> algo_type_data) {
+         //
+         var factory_types = ImmutableHashSet<AlgoType>.Empty.ToBuilder();
+         var dynamic_types = ImmutableHashSet<string>.Empty.ToBuilder();
+         var attachable_factory_types = ImmutableHashSet<AlgoType>.Empty.ToBuilder();
+         var attachable_dynamic_types = ImmutableHashSet<string>.Empty.ToBuilder();
+         foreach (var a in rule.algos) {
+            if (Enum.TryParse(a.name, out AlgoType sys_algo) && sys_algo != AlgoType.Composite && sys_algo != AlgoType.Dynamic) {
+               on_sys_match(sys_algo, a.is_attachable);
+            }
+            else if (dynamic_helper.try_parse(a.name, out var dyn_type)) {
+               on_dyn_match(dyn_type, a.is_attachable);
+            } else {
+               foreach (var (name, factory, dynamic) in algo_type_data) {
+                  if (Regex.Match(name, a.name).Success) {
+                     switch (factory) {
+                        case AlgoType.None:
+                        case AlgoType.Composite:
+                           // unexpected, but no need to crash
+                           continue;
+                        case AlgoType.Dynamic:
+                           on_dyn_match(dynamic, a.is_attachable);
+                           break;
+                        default:
+                           on_sys_match(factory, a.is_attachable);
+                           break;
+                     }
+                  }
+               }
+            }
+         }
+         return (
+            // standard
+            new SecurityAlgoTypeSetImmutable(
+               _to_clause(rule.context),
+               new AlgoTypeSetImmutable(
+                  factory_types.ToImmutable(),
+                  dynamic_types.ToImmutable())),
+            // attachable
+            new SecurityAlgoTypeSetImmutable(
+               _to_clause(rule.context),
+            new AlgoTypeSetImmutable(
+               attachable_factory_types.ToImmutable(),
+               attachable_dynamic_types.ToImmutable())));
+
+         // local methods
+         void on_sys_match(AlgoType sys_algo, bool is_attachable) {
+            factory_types.Add(sys_algo);
+            if (is_attachable)
+               attachable_factory_types.Add(sys_algo);
+         }
+         void on_dyn_match(string dyn_algo, bool is_attachable) {
+            dynamic_types.Add(dyn_algo);
+            if (is_attachable)
+               attachable_dynamic_types.Add(dyn_algo);
+         }
+      }
+   }
+}

src/client/spark/AlgoProvider/AlgoTypeSet.cs

@@ -0,0 +1,132 @@
+using bts.api.core;
+using bts.api.orderman;
+using mbts.spark.utilities;
+using mbts.utils;
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Linq;
+using System.Reactive.Linq;
+using System.Text;
+using AlgoType = bts.api.orderman.CustomOrderDefinition.CustomOneofCase;
+
+namespace mbts.spark {
+   readonly struct AlgoTypeSetImmutable {
+      public static readonly AlgoTypeSetImmutable empty = new AlgoTypeSetImmutable(ImmutableHashSet<AlgoType>.Empty, ImmutableHashSet<string>.Empty);
+      public readonly ImmutableHashSet<AlgoType> factory_types;
+      public readonly ImmutableHashSet<string> dynamic_types;
+
+      public AlgoTypeSetImmutable(
+         ImmutableHashSet<AlgoType> factory_types,
+         ImmutableHashSet<string> dynamic_types) {
+         this.factory_types = factory_types;
+         this.dynamic_types = dynamic_types;
+      }
+   }
+
+   readonly struct SecurityAlgoTypeSetImmutable {
+      public readonly SecurityCriteriaClause security_criteria;
+      public readonly AlgoTypeSetImmutable algo_type_set;
+
+      public SecurityAlgoTypeSetImmutable(SecurityCriteriaClause security_criteria, AlgoTypeSetImmutable algo_type_set, CustomOrderDefinitionImmutable? default_algo = null) {
+         this.security_criteria = security_criteria;
+         this.algo_type_set = algo_type_set;
+      }
+   }
+
+   static class AlgoTypeSetExtensions {
+      public static string fmt_diagnostic(this IEnumerable<SecurityAlgoTypeSetImmutable> rules, string line_delim = "\n") {
+         var sb = new StringBuilder();
+         int rule_count = 1;
+         using (var en = rules.GetEnumerator()) {
+            if (en.MoveNext()) {
+               string line_delim_tab1 = line_delim + "\t";
+               string line_delim_tab2 = line_delim + "\t\t";
+               append_rule(en.Current);
+               while (en.MoveNext()) {
+                  sb.AppendLine();
+                  append_rule(en.Current);
+               }
+               //
+               void append_rule(SecurityAlgoTypeSetImmutable r) {
+                  sb.Append(line_delim + $"**RULE {rule_count++}**");
+                  sb.Append(line_delim_tab1);
+                  sb.Append("Security Criteria: ");
+                  sb.Append(r.security_criteria.is_defined ? string.Join("; ", r.security_criteria.fmt_diagnostic_msgs()) : "(Undefined)");
+                  sb.Append(line_delim_tab1);
+                  // Factory
+                  sb.Append("Factory Types:");
+                  sb.Append(line_delim_tab2);
+                  sb.Append(string.Join(line_delim_tab2, r.algo_type_set.factory_types));
+                  sb.Append(line_delim_tab1);
+                  // Dynamic
+                  sb.Append("Dynamic Types:");
+                  sb.Append(line_delim_tab2);
+                  sb.Append(string.Join(line_delim_tab2, r.algo_type_set.dynamic_types));
+               }
+            }
+         }
+         return sb.ToString();
+      }
+
+      public static AlgoTypeSetImmutable intersect_with(this AlgoTypeSetImmutable a, AlgoTypeSetImmutable b) =>
+         new AlgoTypeSetImmutable(a.factory_types.Intersect(b.factory_types), a.dynamic_types.Intersect(b.dynamic_types));
+
+      public static AlgoTypeSetImmutable union_with(this AlgoTypeSetImmutable a, AlgoTypeSetImmutable b) =>
+         new AlgoTypeSetImmutable(a.factory_types.Union(b.factory_types), a.dynamic_types.Union(b.dynamic_types));
+
+      public static IEnumerable<AlgoData> define_algos(
+         this AlgoTypeSetImmutable algo_set,
+         DynamicOrderHelper dynamic_helper,
+         Func<CustomOrderDefinitionImmutable, CustomOrderDefinitionImmutable> fit_to_type = null,
+         uint display_qty_divisor = 1) =>
+         //
+         algo_set.factory_types
+         .Select(algo_type => {
+            var def = OrderDataHelper.Defaults.CustomOrderDefinitionImmutable(algo_type);
+            if (fit_to_type != null)
+               def = fit_to_type(def);
+            // multiply quantity props by display qty divisor to get appropriate actual value 
+            if (display_qty_divisor > 1) {
+               switch (def.CustomCase) {
+                  case AlgoType.Iceberg:
+                     var mdef = def.CloneToMutable();
+                     mdef.Iceberg.ShowQuantity *= display_qty_divisor;
+                     def = new CustomOrderDefinitionImmutable(mdef);
+                     break;
+               }
+            }
+            return def;
+         })
+         .Concat(algo_set.dynamic_types.Select(dynamic_helper.create_custom_defi))
+         .Select(AlgoData.from_custom_def);
+
+      public static ImmutableDictionary<AlgoKey, AlgoData> match_algos(
+         this IEnumerable<SecurityAlgoTypeSetImmutable> security_algo_sets,
+         SecurityCriteriaClause clause,
+         DynamicOrderHelper dynamic_helper,
+         Func<CustomOrderDefinitionImmutable, CustomOrderDefinitionImmutable> fit_to_type = null,
+         uint display_qty_divisor = 1) {
+         //
+         ImmutableDictionary<AlgoKey, AlgoData> rv = null;
+         foreach (var set in security_algo_sets) {
+            if (!clause.is_subset_of(set.security_criteria)) {
+               continue;
+            } else if (rv == null) {
+               rv = ImmutableDictionary.CreateRange(
+                  set.algo_type_set.define_algos(dynamic_helper, fit_to_type, display_qty_divisor)
+                  .Select(a => new KeyValuePair<AlgoKey, AlgoData>(a.key, a)));
+            } else {
+               foreach (var kv in rv) {
+                  if (kv.Value.value.CustomCase == AlgoType.Dynamic) {
+                     if (!set.algo_type_set.dynamic_types.Contains(kv.Value.value.Dynamic.DynamicOrderType))
+                        rv = rv.Remove(kv.Key);
+                  } else if (!set.algo_type_set.factory_types.Contains(kv.Value.value.CustomCase))
+                     rv = rv.Remove(kv.Key);
+               }
+            }
+         }
+         return rv ?? ImmutableDictionary<AlgoKey, AlgoData>.Empty;
+      }
+   }
+}

src/client/spark/AlgoProvider/IAlgoProvider.cs

@@ -0,0 +1,234 @@
+using bts.api;
+using bts.api.core;
+using bts.api.orderman;
+using bts.utils;
+using mbts.spark.utilities;
+using mbts.ui.utility;
+using mbts.utils;
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Linq;
+using System.Reactive.Linq;
+
+namespace mbts.spark {
+   interface IAlgoProvider {
+      AlgoTypeSetImmutable get_permitted_algos(SecurityImmutable security);
+      AlgoTypeSetImmutable get_permitted_algos(SecurityCriteriaClause clause);
+      IObservable<TableUpdate<AlgoData, AlgoKey>> subscribe_algos();
+      IObservable<TableUpdate<AlgoData, AlgoKey>> subscribe_algos(SecurityImmutable security);
+      IObservable<TableUpdate<AlgoData, AlgoKey>> subscribe_algos(SecurityCriteriaClause clause);
+   }
+
+   // This interface is used to distinguish the attachable algo provider
+   // from the standard one wrt MEF export/import.
+   interface IAttachableAlgoProvider : IAlgoProvider { }
+
+   class AlgoProvider : IAlgoProvider {
+      readonly IEnumerable<SecurityAlgoTypeSetImmutable> _security_algo_types;
+      readonly IAlgoStudioModel _studio_model;
+      readonly ISecurityAuxiliaryDataModel _security_auxiliary_model;
+      readonly IObservable<TableUpdate<AlgoData, AlgoKey>> _studio_algos_source;
+      readonly DynamicOrderHelper _dynamic_helper;
+      readonly AlgoTypeSetImmutable _full_set;
+
+      public AlgoProvider(IEnumerable<SecurityAlgoTypeSetImmutable> algo_sets, IAlgoStudioModel studio_model, DynamicOrderHelper dynamic_helper, ISecurityAuxiliaryDataModel security_auxiliary_model) {
+         _security_algo_types = algo_sets;
+         _studio_model = studio_model;
+         _dynamic_helper = dynamic_helper;
+         _full_set = new AlgoTypeSetImmutable(
+            ImmutableHashSet.CreateRange(
+               EnumHelper.get_values_except(CustomOrderDefinition.CustomOneofCase.None, CustomOrderDefinition.CustomOneofCase.Dynamic, CustomOrderDefinition.CustomOneofCase.Composite)),
+            ImmutableHashSet.CreateRange(dynamic_helper.dynamic_types));
+         _security_auxiliary_model = security_auxiliary_model;
+         /// initialize <see cref="_studio_algos_source"/> with an empty table, so the
+         /// <see cref="UpdateExtensions.AppendTable{T, TKey}(IObservable{TableUpdate{T, TKey}}, IEnumerable{T})"/>
+         /// calls made by the 'subscribe_algos' methods will fire at least once, even if the underlying
+         /// studio algos stream is empty have been created (this would be the case if the user had not yet created any studio algos).
+         /// <see cref="subscribe_algos"/>,
+         /// <see cref="subscribe_algos(SecurityCriteriaClause)"/>,
+         /// <see cref="subscribe_algos(SecurityImmutable)"/>
+         _studio_algos_source = studio_model.definitions
+            .StartWith(TableUpdate<AlgoData, AlgoKey>.mk_empty(AlgoData.key_fn))
+            .Cache();
+      }
+
+      public AlgoTypeSetImmutable get_permitted_algos(SecurityImmutable security) =>
+         _security_algo_types.Where(p => p.security_criteria.includes(security))
+            .Select(sec_algos => sec_algos.algo_type_set)
+            .Aggregate(_full_set, (result, algos) => result.intersect_with(algos));
+
+      public AlgoTypeSetImmutable get_permitted_algos(SecurityCriteriaClause clause) =>
+         _security_algo_types.Where(p => p.security_criteria.is_subset_of(clause))
+            .Select(sec_algos => sec_algos.algo_type_set)
+            .Aggregate(_full_set, (result, algos) => result.intersect_with(algos));
+
+      public IObservable<TableUpdate<AlgoData, AlgoKey>> subscribe_algos() =>
+         _studio_algos_source
+         .AppendTable(_security_algo_types
+            .Select(s => s.algo_type_set)
+            .Aggregate(AlgoTypeSetImmutable.empty, (a, b) => a.union_with(b))
+            .define_algos(_dynamic_helper));
+
+      public IObservable<TableUpdate<AlgoData, AlgoKey>> subscribe_algos(SecurityCriteriaClause security_clause) {
+         var system_algos = _security_algo_types.match_algos(
+            security_clause,
+            _dynamic_helper,
+            def => _fit_to_type(def, security_clause, _security_algo_types));
+
+         return _studio_algos_source.Select(
+            a => (algo: a, fitted_def: _fit_to_type(a.value, security_clause, _security_algo_types)),
+            tup => tup.algo.key)
+         .Select(tup => AlgoData.create(tup.fitted_def, tup.algo.name, tup.algo.key), a => a.key)
+         .AppendTable(system_algos.Values);
+      }
+
+      public IObservable<TableUpdate<AlgoData, AlgoKey>> subscribe_algos(SecurityImmutable security) {
+         var clause = new SecurityCriteriaClause(
+            exchanges: new[] { security.Exchange },
+            security_types: new[] { security.security_type() });
+         // i.e., non-studio algos
+         var system_algos = _security_algo_types.match_algos(
+            clause,
+            _dynamic_helper,
+            def => _fit_to_type(def, security, _security_algo_types),
+            _security_auxiliary_model.get_display_quantity_divisor(security));
+
+         return _studio_algos_source.Select(
+            a => (algo: a, fitted_def: _fit_to_type(a.value, security, _security_algo_types)),
+            tup => tup.algo.key)
+         // filter out algos that use an unsupported root, because this would have the effect of duplicating the default algo
+         // (e.g., GlbxIceberg orders would be converted to Limit/Spreader orders for non-Glbx securities).
+         .Filter(tup => tup.fitted_def.actual().CustomCase == tup.algo.value.actual().CustomCase, tup => tup.algo.key)
+         .Select(tup => AlgoData.create(tup.fitted_def, tup.algo.name, tup.algo.key), AlgoData.key_fn)
+         .AppendTable(system_algos.Values);
+      }
+
+      protected virtual void assign_fallback_algo(CustomOrderDefinition mdef, SecurityCriteriaClause security_clause) {
+         if (security_clause.security_types.empty_if_null().Contains(Security.ContractOneofCase.Synthetic.security_type())) {
+            mdef.Spreader = new SpreaderOrderDefinition();
+         } else {
+            mdef.Limit = new LimitOrderDefinition();
+         }
+      }
+
+      protected virtual void assign_fallback_algo(CustomOrderDefinition mdef, SecurityImmutable security) {
+         if (security.ContractCase == Security.ContractOneofCase.Synthetic) {
+            mdef.Spreader = new SpreaderOrderDefinition {
+               Security = security.CloneToMutable()
+            };
+         } else {
+            mdef.Limit = new LimitOrderDefinition();
+         }
+      }
+
+      CustomOrderDefinitionImmutable _fit_to_type(CustomOrderDefinitionImmutable defi, SecurityCriteriaClause security_clause, IEnumerable<SecurityAlgoTypeSetImmutable> algo_sets) {
+         var mroot = defi.CloneToMutable();
+         if (_fit_to_type(mroot, security_clause, algo_sets)) {
+            defi = new CustomOrderDefinitionImmutable(mroot);
+         }
+         return defi;
+      }
+
+      CustomOrderDefinitionImmutable _fit_to_type(CustomOrderDefinitionImmutable defi, SecurityImmutable security, IEnumerable<SecurityAlgoTypeSetImmutable> algo_sets) {
+         var mroot = defi.CloneToMutable();
+         if (_fit_to_type(mroot, security, algo_sets)) {
+            defi = new CustomOrderDefinitionImmutable(mroot);
+         }
+         return defi;
+      }
+
+      bool _fit_to_type(CustomOrderDefinition mdef, SecurityCriteriaClause security_clause, IEnumerable<SecurityAlgoTypeSetImmutable> algo_sets) {
+         while (mdef.CustomCase == CustomOrderDefinition.CustomOneofCase.Composite)
+            mdef = mdef.Composite.Definition;
+         var sec_sets = algo_sets.Where(s => security_clause.is_subset_of(s.security_criteria));
+         if (mdef.CustomCase == CustomOrderDefinition.CustomOneofCase.Dynamic) {
+            if (!algo_sets.All(s => s.algo_type_set.dynamic_types.Contains(mdef.Dynamic.DynamicOrderType))) {
+               assign_fallback_algo(mdef, security_clause);
+               return true;
+            }
+         } else if (!sec_sets.All(s => s.algo_type_set.factory_types.Contains(mdef.CustomCase))) {
+            assign_fallback_algo(mdef, security_clause);
+            return true;
+         }
+         return OrderDataHelper.get_child_algo_data(mdef).Count(cad => _fit_to_type(cad.get_child(mdef), security_clause, algo_sets)) > 0;
+      }
+
+      bool _fit_to_type(CustomOrderDefinition mdef, SecurityImmutable security, IEnumerable<SecurityAlgoTypeSetImmutable> algo_sets) {
+         while (mdef.CustomCase == CustomOrderDefinition.CustomOneofCase.Composite)
+            mdef = mdef.Composite.Definition;
+         var sec_sets = algo_sets.Where(s => s.security_criteria.includes(security));
+         if (mdef.CustomCase == CustomOrderDefinition.CustomOneofCase.Dynamic) {
+            if (!sec_sets.All(s => s.algo_type_set.dynamic_types.Contains(mdef.Dynamic.DynamicOrderType))) {
+               assign_fallback_algo(mdef, security);
+               return true;
+            }
+         } else if (!sec_sets.All(s => s.algo_type_set.factory_types.Contains(mdef.CustomCase))) {
+            assign_fallback_algo(mdef, security);
+            return true;
+         }
+         return OrderDataHelper.get_child_algo_data(mdef).Count(cad => _fit_to_type(cad.get_child(mdef), security, algo_sets)) > 0;
+      }
+   }
+
+   class AttachableAlgoProvider : AlgoProvider, IAttachableAlgoProvider {
+      public AttachableAlgoProvider(IEnumerable<SecurityAlgoTypeSetImmutable> algo_sets, IAlgoStudioModel studio_model, DynamicOrderHelper dynamic_helper, ISecurityAuxiliaryDataModel security_auxiliary_model)
+         : base(algo_sets, studio_model, dynamic_helper, security_auxiliary_model) { }
+
+      // arbitrarily assign LimitOrderDefinition (this is just a placeholder; the real child is the attach target algo).
+      // Note: although 'None' might seem approrpriate, the server requires a valid definition (perhaps this will change in the future).
+      protected override void assign_fallback_algo(CustomOrderDefinition mdef, SecurityCriteriaClause security_clause) =>
+         mdef.Limit = new LimitOrderDefinition();
+
+      // arbitrarily assign LimitOrderDefinition (this is just a placeholder; the real child is the attach target algo).
+      // Note: although 'None' might seem approrpriate, the server requires a valid definition (perhaps this will change in the future).
+      protected override void assign_fallback_algo(CustomOrderDefinition mdef, SecurityImmutable security) =>
+         mdef.Limit = new LimitOrderDefinition();
+   }
+
+   static class AlgoProviderExtensions {
+      // This stream filters out composite algos that are not subsets of the non-composite algo types in the table
+      // (normally, such composites are 'auto-fit,' meaning the algo nodes that are not part of the set are replaced with ones that are).
+      // For example, consider a composite algo the following structure: Offset -> GlbxIceberg.
+      // If an update arrives with these noncomposite types: "Iceberg, Limit, Market," that composite algo is not a subset of the non-composite algo types,
+      // because GlbxIceberg is not in the table, so it would only be added to the table if/when GlbxIceberg arrives.
+      public static IObservable<TableUpdate<AlgoData, AlgoKey>> subscribe_complete_algos(this IAlgoProvider algo_provider, bool allow_undefined_child = false) =>
+         subscribe_complete_algos(algo_provider.subscribe_algos(), allow_undefined_child);
+
+      public static IObservable<TableUpdate<AlgoData, AlgoKey>> subscribe_complete_algos(IObservable<TableUpdate<AlgoData, AlgoKey>> source, bool allow_undefined_child = false) =>
+         Observable.Create<TableUpdate<AlgoData, AlgoKey>>(o => {
+            var last_out = TableUpdate<AlgoData, AlgoKey>.mk_empty(AlgoData.key_fn);
+            var incomplete_composites = ImmutableHashSet<AlgoData>.Empty;
+            return source.Subscribe(table => {
+               var bd = last_out.to_builder();
+               foreach (var algo in incomplete_composites.Where(a => _validate_algo_structure(a.value, table.state, allow_undefined_child))) {
+                  incomplete_composites = incomplete_composites.Remove(algo);
+                  bd.add_or_update(algo);
+               }
+               foreach (var a in table.removed.Concat(table.changes.Old()))
+                  bd.remove(a.key);
+               foreach (var a in table.added.Concat(table.changed)) {
+                  if (_validate_algo_structure(a.value, table.state, allow_undefined_child)) {
+                     bd.add_or_update(a);
+                  } else {
+                     incomplete_composites = incomplete_composites.Add(a);
+                  }
+               }
+               o.OnNext(last_out = bd.to_table());
+            });
+         });
+
+      static bool _validate_algo_structure(CustomOrderDefinitionImmutable custom_def, IReadOnlyDictionary<AlgoKey, AlgoData> allowed_algo_parts, bool allow_undefined_child) =>
+         OrderDataHelper.enumerate_algo_structure(custom_def)
+         .Select((algo_node, index) =>
+            // None is an acceptable algo type as long as it's not the root algo (i.e., index > 0)
+            (index > 0 && allow_undefined_child && algo_node.type == CustomOrderDefinition.CustomOneofCase.None) || _is_part_contained(algo_node, allowed_algo_parts))
+         .All();
+
+      static bool _is_part_contained((CustomOrderDefinition.CustomOneofCase type, string dyn, uint studio_id, uint spreader_sec) structure, IReadOnlyDictionary<AlgoKey, AlgoData> state) =>
+         structure.type == CustomOrderDefinition.CustomOneofCase.Composite ||
+         structure.type == CustomOrderDefinition.CustomOneofCase.Dynamic ?
+            state.ContainsKey(AlgoKey.from_dynamic_type(structure.dyn)) :
+            state.ContainsKey(AlgoKey.from_known_type(structure.type));
+   }
+}

src/client/spark/App.xaml.cs

@@ -115,7 +115,7 @@ namespace mbts.ui.shell
       {
          try
          {
-            var path = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\BTS\\stunnel\\";
+            string path = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\BTS\\stunnel\\";
             if (File.Exists(path + "config\\stunnel.conf"))
             {
                uint job_error = BTSUINativeMethods.setup_process_job_object();   
@@ -124,6 +124,15 @@ namespace mbts.ui.shell
                   kill_stunnel();
                start_stunnel(path, job_error);
             }
+            path = AppDomain.CurrentDomain.BaseDirectory + "\\..\\stunnel\\";
+            if (File.Exists(path + "config\\stunnel.conf"))
+            {
+               uint job_error = BTSUINativeMethods.setup_process_job_object();
+               //if we can't put this process and stunnel into a job, try to stop stunnel then restart
+               if (job_error != 0)
+                  kill_stunnel();
+               start_stunnel(path, job_error);
+            }
          }
          catch(Exception ex)
          {

src/client/spark/Daemons/OrderTicketDaemon.cs

@@ -3,11 +3,13 @@ using bts.api.core;
 using bts.api.orderman;
 using bts.spark;
 using mbts;
+using mbts.config;
 using mbts.spark;
 using mbts.ui;
 using mbts.ui.spark;
 using System;
 using System.Collections.Generic;
+using System.Collections.Immutable;
 using System.ComponentModel.Composition;
 using System.Reactive.Linq;
 using System.Windows;
@@ -19,20 +21,26 @@ namespace bts.shell {
       readonly IBus _bus;
       readonly OrdersModel _model;
       readonly ErrorReporter _error_reporter;
+      readonly bool _close_on_send;
       IReadOnlyDictionary<uint, SecurityMD> _md_map;
       TableUpdate<(SecurityImmutable? sec, OrderRecordImmutable order), uint> _orders;
       IDisposable _dispose;
 
       [ImportingConstructor]
-      public OrderTicketDaemon(IBus bus, OrdersModel model, ErrorReporter error_reporter) {
+      public OrderTicketDaemon(IBus bus, OrdersModel model, ErrorReporter error_reporter)
+         : this(bus, model, error_reporter, Configuration.get<bts.config.OrderTicketOptions>().close_on_send) { }
+
+      public OrderTicketDaemon(IBus bus, OrdersModel model, ErrorReporter error_reporter, bool close_on_send) {
          _bus = bus;
          _model = model;
          _error_reporter = error_reporter;
+         _close_on_send = close_on_send;
          _dispose = Disposable.Create(
             model.on_orders.OnDispatcher().Subscribe(o => _orders = o),
             bus.subscribe(SparkTags.SecuritiesTag).OnDispatcher().Subscribe(m =>_md_map = m),
             bus.subscribe(SparkTags.ShowOrderTicketFromSecurityTag).OnDispatcher().Subscribe(_show_order_ticket),
             bus.subscribe(SparkTags.ShowOrderTicketTag).OnDispatcher().Subscribe(_show_order_ticket),
+            bus.subscribe(SparkTags.ShowOrderTicketAutoLookupTag).Subscribe(_show_order_tickets),
             bus.subscribe(SparkTags.ShowModifyOrderTag).OnDispatcher().Subscribe(_show_modify_order)
          );
       }
@@ -54,17 +62,28 @@ namespace bts.shell {
       void _show_order_ticket(SecurityMD smd) =>
          _show_order_window(new OrderTicket {
             DataContext = new NewOrderTicketVM(_model, smd,
-               Observable.Return(LadderSettings.Default))
+               Observable.Return(LadderSettings.Default)) {
+               close_on_send = _close_on_send
+            }
          });
 
       void _show_order_ticket((OrderDefinitionImmutable def, double price, uint size) ops) {
          if (_md_map.TryGetValue(ops.def.SecurityKey, out SecurityMD smd))
             _show_order_window(new OrderTicket {
                DataContext = new NewOrderTicketVM(_model, smd, ops.def, ops.price, ops.size,
-                  Observable.Return(LadderSettings.Default.calculator_buttons))
+                  Observable.Return(LadderSettings.Default.calculator_buttons)) {
+                  close_on_send = _close_on_send
+               }
             });
       }
 
+      void _show_order_tickets(IImmutableSet<uint> securities) {
+         foreach (var id in securities.empty_if_null()) {
+            if (_md_map.TryGetValue(id, out var smd))
+               _show_order_ticket(smd);
+         }
+      }
+
       void _show_modify_order(uint order_key) {
          if (_orders.state.TryGetValue(order_key, out var ori) && ori.sec.HasValue
             && (ori.order.HasDef && ori.order.Def.HasCustomDef && !(ori.order.Def.CustomDef.HasStop || ori.order.Def.CustomDef.HasStopLimit))) {
@@ -78,4 +97,4 @@ namespace bts.shell {
          }
       }
    }
-}
+}

src/client/spark/Images/Icons.cs

@@ -26,6 +26,8 @@ namespace mbts.ui {
          AttachAlgosKey = nameof(AttachAlgosKey),
          CheckMarkGeometryKey = nameof(CheckMarkGeometryKey),
          CopyWFGeometryKey = nameof(CopyWFGeometryKey),
+         CopyBoxesGeometryKey = nameof(CopyBoxesGeometryKey),
+         CurrencyExchangeGeometryKey = nameof(CurrencyExchangeGeometryKey),
          DataEditGeometryKey = nameof(DataEditGeometryKey),
          DetachAlgosKey = nameof(DetachAlgosKey),
          DiskGeometryKey = nameof(DiskGeometryKey),
@@ -45,6 +47,7 @@ namespace mbts.ui {
          KeyGeometryKey = nameof(KeyGeometryKey),
          LetterAKey = nameof(LetterAKey),
          LetterDKey = nameof(LetterDKey),
+         MenuOrientationGeometryKey = nameof(MenuOrientationGeometryKey),
          OrdersGeometryKey = nameof(OrdersGeometryKey),
          PauseGeometryKey = nameof(PauseGeometryKey),
          PaymentGeometryKey = nameof(PaymentGeometryKey),
@@ -62,6 +65,8 @@ namespace mbts.ui {
 
       public static Geometry PlayGeometry => Geometry.Parse(get_geometric_path(PlayGeometryKey).FirstOrDefault() ?? string.Empty);
 
+      static readonly Pen _copy_boxes_pen = new Pen(Brushes.Black, HighDpiExtensions.RoundLayoutValue(5)).frozen();
+
       static readonly string base_uri = "pack://application:,,,/Images/Icons/";
       private static ResourceDictionary _resources = (ResourceDictionary)Application.LoadComponent(new Uri("/Images/Vector/Icons.xaml", UriKind.RelativeOrAbsolute));
 
@@ -156,6 +161,8 @@ namespace mbts.ui {
       public static ImageSource CheckMark => create_icon(CheckMarkGeometryKey);
       public static ImageSource Clock { get { return load_resource_and_freeze("Clock"); } }
       public static ImageSource CopyWF => create_icon(CopyWFGeometryKey);
+      public static ImageSource CopyBoxes => create_icon(CopyBoxesGeometryKey, null, _copy_boxes_pen);
+      public static ImageSource CurrencyExchange => create_icon(CurrencyExchangeGeometryKey);
       public static ImageSource DataEdit => create_icon(DataEditGeometryKey);
       public static ImageSource Defrag { get { return load_resource_and_freeze("Defrag"); } }
       public static ImageSource DetachAlgos => create_icon_and_rotate(DetachAlgosKey, Brushes.Red);
@@ -179,6 +186,7 @@ namespace mbts.ui {
       public static ImageSource Import => load_resource_and_freeze("Import");
       public static ImageSource Key => create_icon(KeyGeometryKey);
       public static ImageSource Knight { get { return load_resource_and_freeze("Knight"); } }
+      public static ImageSource MenuOrientation => create_icon(MenuOrientationGeometryKey);
       public static ImageSource Pause => create_icon(PauseGeometryKey);
       public static ImageSource Payment => create_icon(PaymentGeometryKey);
       public static ImageSource Pencil => create_icon(PencilGeometryKey);

src/client/spark/Images/Vector/Icons.xaml

@@ -46,10 +46,26 @@
     </sys:String>
   </x:Array>
 
+  <x:Array x:Key="{x:Static mbts:Icons.CopyBoxesGeometryKey}" Type="{x:Type sys:String}">
+    <sys:String>
+      M-55,5 L-55,55 L-5,55
+    </sys:String>
+    <sys:String>
+      M-40,-10 L-40,40 L10,40 L10,-10 L-40,-10
+    </sys:String>
+    <sys:String>
+      M-10,10 L40,10 L40,-40 L-10,-40 L-10,10
+    </sys:String>
+  </x:Array>
+
   <sys:String x:Key="{x:Static mbts:Icons.CopyWFGeometryKey}">
     M14.733902,12.084991L9.751783,17.388992 12.982842,17.436005C13.569886,17.462997 14.5229,17.350998 14.876848,17.005005 14.954852,16.929993 15.031879,16.824005 15.02486,16.593002 14.986895,15.457993 14.838883,13.438004 14.733902,12.084991z M22.507753,11.134453C22.480678,11.134323,22.467085,11.135494,22.469961,11.136993L20.64694,11.145004 16.291904,11.192993C16.388891,12.405991 16.596901,15.100998 16.647928,16.539001 16.668924,17.177994 16.448888,17.742004 16.007904,18.168991 15.210897,18.947998 13.893864,19.065002 13.179865,19.065002L9.2818066,19.005005 9.3258129,25.522003 9.3728109,25.528 9.3278271,25.882996 9.3317944,26.395996 9.3107983,26.397995C9.3167797,26.789993,9.3378369,27.552994,9.3958212,29.065994L9.4068075,29.393005C9.4207855,29.819992 9.5648295,29.994995 9.6707884,30.089005 9.9807898,30.365997 10.539817,30.390991 10.717799,30.369003L10.717799,30.375C10.88284,30.354996 11.280855,30.356003 12.823844,30.365997 13.867863,30.371002 15.206869,30.376999 16.594886,30.376999 20.757965,30.376999 23.270998,30.354996 23.862007,30.311005 24.454971,30.268005 24.661029,29.154999 24.690021,28.729996 24.690021,28.729996 24.677997,27.876999 24.661029,26.582993 24.612016,22.671005 24.51198,14.697998 24.472002,12.802002 24.461013,12.302994 24.316969,11.929993 24.034008,11.662003 23.547475,11.200003 22.697284,11.13536 22.507753,11.134453z M8.8867823,2.8410034L2.5417312,10.296997 6.4037791,10.356995C6.8917614,10.390991 8.3258005,10.341003 8.9567896,9.7299957 9.1738335,9.5189972 9.2667919,9.2659912 9.2558046,8.9089966 9.2067934,7.3889923 9.0258213,4.7480011 8.8867823,2.8410034z M10.424826,1.6239929C10.551842,3.302002 10.816799,6.951004 10.876797,8.8560028 10.903836,9.6750031 10.636804,10.360992 10.083818,10.897995 9.0667769,11.882004 7.3527657,11.987991 6.6627546,11.987991 6.4657918,11.987991 6.3367616,11.979004 6.3177796,11.977005L1.6477377,11.905991C1.6387044,14.278992 1.6236895,20.283997 1.6496909,22.358994 1.651705,22.569992 1.6437093,22.780991 1.6366904,22.992004 1.6117265,23.593994 1.5926833,24.112991 1.8537338,24.386002 2.0716933,24.612991 2.6497034,24.886002 4.1457549,24.886002 6.0127832,24.886002 7.0867711,24.876999 7.6967641,24.867004L7.6457993,17.259995 14.853899,9.5849915 16.681924,9.5650024 16.681924,9.5429993 19.454908,9.5289917 19.406934,2.6210022C19.323925,2.3549957,18.960945,1.6239929,17.387928,1.6239929z M9.1738335,0L17.387928,0C19.94692,0,20.874971,1.5299988,21.022983,2.4329987L21.077976,9.5209961 22.446951,9.5139923C22.43395,9.5130005 24.031017,9.4250031 25.148035,10.481995 25.753999,11.054001 26.071996,11.822998 26.092992,12.766998 26.142006,15.065994 26.281044,26.268997 26.307047,28.412003L26.311014,28.764999C26.279029,29.817993 25.750032,31.802002 23.979013,31.931 23.342958,31.977005 20.887972,32 16.683878,32 13.798893,32 11.107818,31.988998 10.808803,31.987991 10.789821,31.990997 9.5147806,32.112 8.6008288,31.309006 8.0858074,30.854996 7.8107797,30.229004 7.7838017,29.444992L7.7728153,29.126999C7.721789,27.759995 7.6978022,26.970993 7.6898061,26.490005 7.0547882,26.5 5.9867817,26.509003 4.1457549,26.509003 2.4377257,26.509003 1.3387128,26.192001 0.68367504,25.509003 -0.055286743,24.742004 -0.017322397,23.742004 0.012707477,22.938004 0.020702986,22.744003 0.028698692,22.559998 0.026684528,22.378998 -0.00029337304,20.240997 0.016674615,13.856995 0.026684528,11.212997L0.026684528,10.867004 0.14167619,10.610992 8.7147823,0.54100037 8.7088009,0.45899963 8.8018194,0.43800354z
   </sys:String>
 
+  <sys:String x:Key="{x:Static mbts:Icons.CurrencyExchangeGeometryKey}">
+    M0,24L15.324005,24C16.042007,24.785004,16.875,25.460999,17.800003,26L2,26 2,30 23.087997,30 23.087006,27.424988C23.771011,27.423004,24.439011,27.352997,25.085999,27.225983L25.085999,30C25.085999,31.10199,24.189011,32,23.085999,32L2,32C0.89700317,32,0,31.10199,0,30z M22.484015,13.026998L23.475018,13.026998 23.475018,13.856997C24.151018,13.885996,24.605021,14.016996,24.93902,14.167996L24.646021,15.233995C24.38302,15.129995 23.919018,14.912995 23.191017,14.912995 22.535015,14.912995 22.323015,15.176995 22.323015,15.440995 22.323015,15.751994 22.676016,15.950994 23.535017,16.251994 24.73702,16.647994 25.222021,17.166993 25.222021,18.015992 25.222021,18.854991 24.58502,19.571991 23.424017,19.759991L23.424017,20.72199 22.434015,20.72199 22.434015,19.825991C21.757013,19.797991,21.101011,19.627991,20.71701,19.420991L21.019012,18.317992C21.444014,18.533992 22.040014,18.731992 22.697016,18.731992 23.272017,18.731992 23.666018,18.524992 23.666018,18.147992 23.666018,17.788992 23.343018,17.562993 22.596016,17.326993 21.515013,16.987993 20.777012,16.516994 20.777012,15.601995 20.777012,14.771996 21.404013,14.119996 22.484015,13.922997z M0.065009117,12.384011L13.628021,12.384011C13.320021,13.018011,13.075021,13.687011,12.89902,14.384011L2.065011,14.384011 2.065011,18.384011 12.68002,18.384011C12.77602,19.075011,12.93702,19.743011,13.16102,20.384011L0.065009117,20.384011z M23.060013,10.460008C19.480015,10.460008 16.568016,13.368006 16.568016,16.943003 16.568016,20.519001 19.480015,23.426999 23.060013,23.427 26.640011,23.426999 29.55201,20.519001 29.55201,16.943003 29.55201,13.368006 26.640011,10.460008 23.060013,10.460008z M23.060013,8.4600086C27.74201,8.4600086 31.552008,12.266006 31.552008,16.943003 31.552008,21.621 27.74201,25.426998 23.060013,25.426998 18.378014,25.426998 14.568016,21.621 14.568016,16.943003 14.568016,12.266006 18.378014,8.4600086 23.060013,8.4600086z M2.0000181,2L2.0000181,6 23.08602,6 23.08602,2z M2.0000181,0L23.08602,0C24.18902,0,25.08602,0.89699936,25.08602,2L25.08602,6.6599998C24.430019,6.5310001 23.753019,6.4599991 23.060019,6.4599991 21.06402,6.4599991 19.20402,7.0300007 17.614019,8L1.8119812E-05,8 1.8119812E-05,2C1.8066406E-05,0.89699936,0.89701813,0,2.0000181,0z
+  </sys:String>
+
   <sys:String x:Key="{x:Static mbts:Icons.DocumentAddGeometryKey}">
     M10.830011,12.05L13.334007,12.05 13.334007,16.535997 17.819998,16.535997 17.819998,19.03902 13.334007,19.03902 13.334007,23.525016 10.830988,23.525016 10.830988,19.03902 6.3460046,19.03902 6.3449975,16.53499 10.830988,16.535997z M2.2799975,2.4149805L2.2799975,29.580015 22.121998,29.580015 22.121998,8.500008 15.83599,8.500008 15.83599,2.4149805z M0,0L15.83599,0 17.125998,0 22.681996,5.439977 24.407,7.125007 24.407,32.000001 0,32.000001z
   </sys:String>
@@ -264,6 +280,7 @@
       m464.867188 0c-25.988282 0-47.132813 21.144531-47.132813 47.132812v313.75c0 49.324219 11.660156 98.710938 33.71875 142.824219 2.539063 5.082031 7.734375 8.292969 13.414063 8.292969 5.683593 0 10.875-3.210938 13.417968-8.292969 22.054688-44.113281 33.714844-93.503906 33.714844-142.824219v-313.75c0-25.988281-21.144531-47.132812-47.132812-47.132812zm0 30c9.445312 0 17.132812 7.6875 17.132812 17.132812v33.199219h-34.265625v-33.199219c0-9.445312 7.683594-17.132812 17.132813-17.132812zm17.132812 323.46875h-34.265625v-243.136719h34.265625zm-17.132812 105.4375c-8.71875-24.277344-14.1875-49.734375-16.222657-75.4375h32.445313c-2.035156 25.707031-7.507813 51.160156-16.222656 75.4375zm0 0
     </sys:String>
   </x:Array>
+
   <sys:String x:Key="{x:Static mbts:Icons.CheckMarkGeometryKey}">
     F1M9.97498,1.22334L4.6983,9.09834 4.52164,9.09834 0,5.19331 1.27664,3.52165 4.255,6.08833 8.33331,1.52588E-05 9.97498,1.22334z
   </sys:String>
@@ -280,6 +297,10 @@
     M22.399981,2.4000006C22.099982,2.4000006 21.899982,2.5 21.599982,2.6999998 21.199983,3.1000004 21.199983,3.8000002 21.599982,4.2000003L26.199979,8.9000001C26.599978,9.3000002 27.299977,9.3000002 27.699977,8.9000001 28.099977,8.5000002 28.099977,7.8000002 27.699977,7.4000006L23.099981,2.6999998C22.899981,2.5,22.699981,2.4000006,22.399981,2.4000006z M21.499982,0C22.299982,0,23.199981,0.30000019,23.79998,0.90000057L29.299976,6.4000001C30.599975,7.7000003,30.599975,9.7000003,29.299976,11L22.599981,17.7C21.299983,19,19.299984,19,17.999985,17.7L17.299985,17 12.699989,21.6 10.399991,20.900001 10.899991,23.400001 8.4999928,22.8 8.9999924,25.5 6.2999945,25.1 6.7999945,27.6 4.2999964,27 4.7999954,29.6 2.4999971,32 0,26.6 13.499989,13.1 16.999986,16.6 12.699989,12.3C11.399991,11,11.399991,9.0000002,12.699989,7.7000003L19.399984,1C19.899983,0.30000019,20.699983,0,21.499982,0z
   </sys:String>
 
+  <sys:String x:Key="{x:Static mbts:Icons.MenuOrientationGeometryKey}">
+    M14.997001,19.999038L15.000001,23.499012C15.000001,24.327005,14.327008,25,13.500016,25L9.9970522,25 9.9970522,23.000015 13.000022,23.000015 12.997022,20.001038z M9.000001,19.000006L9.000001,30.000006 30.000001,30.000006 30.000001,19.000006z M2,2L2,23 7.000001,23 7.000001,18.500006C7.000001,17.673006,7.6730013,17.000006,8.500001,17.000006L13.000001,17.000006 13.000001,2z M1.5,0L13.500001,0C14.327001,0,15.000001,0.67300034,15.000001,1.5L15.000001,17.000006 26.956518,17.000006 23.162404,13.207182C22.772376,12.816143 22.772376,12.184205 23.162404,11.793225 23.357907,11.597736 23.613928,11.499992 23.869827,11.499992 24.125725,11.499992 24.381502,11.597736 24.576517,11.793225L25.889371,13.105454 25.866285,12.914201C25.554945,10.547287 24.699391,8.7684691 23.308905,7.6089654 21.974919,6.4954615 20.356436,6.1229606 19.066825,6.0297103L19.059648,6.0292783 20.545799,7.5160289C20.936786,7.9070184 20.936786,8.5390015 20.545799,8.929991 20.350807,9.1249857 20.094815,9.2229831 19.838825,9.2229831 19.582834,9.2229831 19.326843,9.1249857 19.131849,8.929991L15.185988,4.9830971 18.981854,1.1871986C19.371841,0.79620934 20.004819,0.79620934 20.395805,1.1871986 20.785791,1.5771885 20.785791,2.2101717 20.395805,2.601161L18.976535,4.020443 18.999199,4.0214248C20.641604,4.1119318 22.785724,4.567862 24.590892,6.0739603 26.493747,7.660778 27.606404,10.054969 27.91277,13.209869L27.913735,13.221022 29.341699,11.793225C29.536714,11.597736 29.792459,11.499992 30.048328,11.499992 30.304196,11.499992 30.560187,11.597736 30.75569,11.793225 31.146694,12.184205 31.146694,12.816143 30.75569,13.207182L26.962552,17.000006 30.500001,17.000006C31.327001,17.000006,32.000001,17.673006,32.000001,18.500006L32.000001,30.500006C32.000001,31.327005,31.327001,32.000006,30.500001,32.000006L8.500001,32.000006C7.6730013,32.000006,7.000001,31.327005,7.000001,30.500006L7.000001,25 1.5,25C0.67300034,25,0,24.327001,0,23.5L0,1.5C0,0.67300034,0.67300034,0,1.5,0z
+  </sys:String>
+
   <sys:String x:Key="{x:Static mbts:Icons.OrdersGeometryKey}">
     M50.14375,33.389126C50.416863,33.394688,50.653496,33.587773,50.705998,33.864617L50.015995,45.114388C49.810295,46.291462,49.130394,45.097489,49.130394,45.097489L47.65659,42.640538C42.747776,49.635197 34.633152,54.221001 25.433924,54.221001 14.884193,54.221001 5.7437552,48.204125 1.2449617,39.419205 0.80087067,38.552021 0.21358696,37.705738 0.052086769,36.736958 -0.49735315,33.490925 3.4507786,32.901036 4.8049124,34.432404 5.3674143,35.067692 6.034036,36.16407 6.5079177,37.026051 10.106778,43.799416 17.2321,48.413819 25.433924,48.413819 32.656544,48.413819 39.026364,44.826695 42.903977,39.351506L40.229367,38.854115C40.229367,38.854115,38.677464,38.647118,39.742466,37.996033L50.024895,33.398526C50.064972,33.391365,50.104733,33.388333,50.14375,33.389126z M23.030291,9.0310004L27.889918,9.0310004 27.889918,13.028299C30.539786,13.205498,32.324932,13.958096,33.464161,14.528294L33.964176,14.775793 32.417435,20.038878 31.706417,19.68068C30.579987,19.11958 28.839241,18.244583 26.149073,18.244583 24.006916,18.244583 22.723183,19.122181 22.723183,20.590876 22.723183,21.894272 23.943314,22.804369 27.551308,24.187165 32.706444,26.124659 34.911,28.702853 34.911,32.817341 34.911,36.892929 32.090527,40.05172 27.673611,40.989117L27.673611,45.540001 22.767485,45.540001 22.767485,41.330414C20.252919,41.155815,17.695551,40.424118,16.101811,39.404721L15.683999,39.137619 17.221739,33.731438 17.969059,34.180634C19.088988,34.851235 21.402748,35.97873 24.340325,35.97873 26.734886,35.97873 28.276728,34.921635 28.276728,33.291336 28.276728,31.986641 27.547409,30.853846 23.986016,29.57255 20.083815,28.144253 16.095511,26.04406 16.095511,21.239174 16.095511,17.280985 18.737379,14.291395 23.030291,13.329098z M25.268765,0C35.819447,2.7347414E-07 44.961449,6.0155495 49.458798,14.804573 49.902695,15.669173 50.490094,16.516972 50.651287,17.48427 51.198281,20.734265 47.255726,21.318962 45.901341,19.789065 45.336346,19.153567 44.669552,18.051968 44.19566,17.19517 40.5957,10.421881 33.473275,5.8072398 25.268765,5.8072393 18.047545,5.8072398 11.678013,9.3918336 7.8003562,14.867073L10.474627,15.367072C10.474627,15.367072,12.026909,15.574172,10.962921,16.223872L0.67933281,20.826762C0.36037083,20.880062,0.057029126,20.669165,0.00099972012,20.354063L0.69093342,9.1118043C0.89552094,7.9296158,1.5738537,9.124924,1.5738539,9.124924L3.0452772,11.583379C7.9566038,4.584462,16.073666,2.7347414E-07,25.268765,0z
   </sys:String>

src/client/spark/Modules/Market/MarketShellModule.cs

@@ -17,7 +17,7 @@ namespace bts.shell {
    class MarketShellModule : IShellModule {
       [ImportingConstructor]
       public MarketShellModule(IBus bus, MDConsumer consumer, UserSettingsHub settings_hub, OrdersModel orders_model) {
-         _tsf = new TimeAndSalesWindowFactory(this, bus, consumer, settings_hub);
+         _tsf = new TimeAndSalesWindowFactory(this, bus, consumer, settings_hub, orders_model.security_auxiliary_model);
          _mvf = new MarketViewWindowFactory(this, bus, settings_hub, orders_model);
       }
 

src/client/spark/Modules/Market/MarketView/MarketViewRow.cs

@@ -1,10 +1,12 @@
 using bts.api;
 using bts.api.orderman;
 using bts.collections;
+using bts.utils;
 using mbts.co2;
 using mbts.spark.utilities;
 using mbts.ui;
 using mbts.ui.controls;
+using mbts.ui.shell;
 using mbts.ui.spark;
 using mbts.ui.utility;
 using mbts.utils;
@@ -24,7 +26,6 @@ namespace mbts.spark {
          readonly AnimationManager _animation = new AnimationManager();
          readonly ObservableCollection<OrderRecordImmutable> _orders = new ObservableCollection<OrderRecordImmutable>();
          readonly ObservableFilterCollection<OrderRecordImmutable> _working_orders, _working_bids, _working_asks;
-         readonly string _security_text, _security_key_text;
          readonly Property<double> _bid_price, _ask_price, _last_price, _day_change, _settlement, _session_high, _session_low;
          readonly Property<bool> _last_price_from_spread;
          readonly CellProperty<int> _position;
@@ -33,48 +34,51 @@ namespace mbts.spark {
          readonly CellProperty<bool> _inside_bids, _inside_asks;
          readonly CellProperty<int> _working_bid_volume, _working_ask_volume;
          readonly CellProperty<double> _working_best_bid, _working_best_ask;
-         readonly CellProperty<string> _working_bids_text, _working_asks_text;
          readonly MyOrderSummarizer _order_summarizer = new MyOrderSummarizer();
          readonly MDDisplayHelper.SizeFormatter _size_formatter = MDDisplayHelper.get_formatter(MarketSizeDisplay.get_default());
-         Property<uint> _bid_direct_size, _bid_merged_size, _ask_direct_size, _ask_merged_size;
+         PropertyAutoWrapper<uint, uint>
+            _bid_direct_size,
+            _bid_implied_size,
+            _bid_merged_size,
+            _ask_direct_size,
+            _ask_implied_size,
+            _ask_merged_size;
          double _raw_day_position;
-         string _bid_merged_size_text, _ask_merged_size_text;
          ulong _bbo_ref, _last_ref;
+         uint? _display_qty_divisor_backing;
 
          public Row(IBus bus, SecurityMD smd, OrdersModel orders_model) : base(smd) {
             _bus = bus;
             _orders_model = orders_model;
-            _security_text = smd.security.ToString();
-            _security_key_text = security_key.ToString();
             string format_price(double price) => security.ContractSpec.format(price);
-            _position = new CellProperty<int>(this, nameof(position), 0);
+            _position = new CellProperty<int>(this, nameof(position), fmt_display_qty_int);
             _bid_price = backing(nameof(bid_price), double.NaN);
             _ask_price = backing(nameof(ask_price), double.NaN);
             _last_price = backing(nameof(last_price), double.NaN);
-            _last_size = new CellProperty<uint>(this, nameof(last_size), 0);
+            _last_size = new CellProperty<uint>(this, nameof(last_size), fmt_display_qty_uint);
             _day_change = backing(nameof(day_change), double.NaN);
             _session_low = backing(nameof(session_low), double.NaN);
             _session_high = backing(nameof(session_high), double.NaN);
             _last_price_from_spread = backing(nameof(last_price_from_spread), false);
             _settlement = backing(nameof(settlement), double.NaN);
-            _volume = new CellProperty<ulong>(this, nameof(volume), 0);
+            _volume = new CellProperty<ulong>(this, nameof(volume), fmt_display_qty_ulong, 0);
             _inside_bids = new CellProperty<bool>(this, nameof(inside_bids));
             _inside_asks = new CellProperty<bool>(this, nameof(inside_asks));
             _working_bid_volume = new CellProperty<int>(this, nameof(working_bid_volume));
             _working_ask_volume = new CellProperty<int>(this, nameof(working_ask_volume));
             //
-            _bid_direct_size = backing(nameof(bid_direct_size), default(uint));
-            _bid_merged_size = backing(nameof(bid_merged_size), default(uint));
-            _ask_direct_size = backing(nameof(ask_direct_size), default(uint));
-            _ask_merged_size = backing(nameof(ask_merged_size), default(uint));
+            _bid_direct_size = backing(nameof(bid_direct_size), 0u, convert_display_qty_uint);
+            _bid_implied_size = backing(nameof(bid_implied_size), 0u, convert_display_qty_uint);
+            _bid_merged_size = backing(nameof(bid_merged_size), 0u, convert_display_qty_uint);
+            _ask_direct_size = backing(nameof(ask_direct_size), 0u, convert_display_qty_uint);
+            _ask_implied_size = backing(nameof(ask_implied_size), 0u, convert_display_qty_uint);
+            _ask_merged_size = backing(nameof(ask_merged_size), 0u, convert_display_qty_uint);
             //
             _working_orders = new ObservableFilterCollection<OrderRecordImmutable>(_orders, o => o.is_active());
             _working_bids = new ObservableFilterCollection<OrderRecordImmutable>(_working_orders, o => o.Def.Side == Side.Buy);
             _working_asks = new ObservableFilterCollection<OrderRecordImmutable>(_working_orders, o => o.Def.Side == Side.Sell);
             _working_best_bid = new CellProperty<double>(this, nameof(working_best_bid), format_price, double.NaN);
             _working_best_ask = new CellProperty<double>(this, nameof(working_best_ask), format_price, double.NaN);
-            _working_bids_text = new CellProperty<string>(this, nameof(working_bids_text), string.Empty);
-            _working_asks_text = new CellProperty<string>(this, nameof(working_asks_text), string.Empty);
             //
             default_command = new DelegateCommand(_show_ladder);
             bid_price_click = new DelegateCommand(() => _show_order_ticket(MarketViewView.Columns.Bid));
@@ -90,17 +94,45 @@ namespace mbts.spark {
             _animation.AnimationsChanged += on_animations_changed;
             void on_animations_changed() => RaisePropertyChanged(nameof(animations));
             _dispose = Disposable.Create(
+               attach_prop_changed_cb(_bid_direct_size, mk_echo_prop_changed_cb<(uint,uint)>(nameof(bid_direct_size_text))),
+               attach_prop_changed_cb(_bid_implied_size, mk_echo_prop_changed_cb<(uint,uint)>(nameof(bid_implied_size_text))),
+               attach_prop_changed_cb(_bid_merged_size, mk_echo_prop_changed_cb<(uint,uint)>(nameof(bid_merged_size_text))),
+               attach_prop_changed_cb(_ask_direct_size, mk_echo_prop_changed_cb<(uint,uint)>(nameof(ask_direct_size_text))),
+               attach_prop_changed_cb(_ask_implied_size, mk_echo_prop_changed_cb<(uint,uint)>(nameof(ask_implied_size_text))),
+               attach_prop_changed_cb(_ask_merged_size, mk_echo_prop_changed_cb<(uint,uint)>(nameof(ask_merged_size_text))),
                _orders_model.on_security_root_orders(security.Id).OnDispatcher().Subscribe(_on_orders),
                _position.OnDispatcher().Subscribe(v => _animation.animate_position(v.newval > v.oldval)),
                _orders_model.on_security_positions(security.Id).OnDispatcher().Subscribe(t => {
-                  if (Set(ref _raw_day_position, t.state.Values.Sum(p => p.Item2.raw_day_pos()), nameof(raw_day_position)))
+                  if (Set(ref _raw_day_position, t.state.Values.Sum(p => p.Item2.raw_day_pos()), nameof(raw_day_position))) {
+                     RaisePropertyChanged(nameof(raw_day_position_text));
                      raise_invalidated();
+                  }
                }),
                _inside_bids.OnDispatcher().Subscribe(v => _animation.animate_working_bids_inside(v.newval)),
                _inside_asks.OnDispatcher().Subscribe(v => _animation.animate_working_asks_inside(v.newval)),
                _day_change.OnDispatcher().Subscribe(v => _animation.animate_day_change(v.newval > v.oldval)),
                Disposable.Create(() => _animation.AnimationsChanged -= on_animations_changed)
             );
+
+            uint convert_display_qty_uint(uint value) =>
+               value.safe_divide(_display_qty_divisor);
+
+            string fmt_display_qty_int(int value) =>
+               value.safe_divide(_display_qty_divisor).ToString();
+
+            string fmt_display_qty_uint(uint value) =>
+               value.safe_divide(_display_qty_divisor).ToString();
+
+            string fmt_display_qty_ulong(ulong value) =>
+               value.safe_divide(_display_qty_divisor).ToString();
+
+            PropertyChange<T> mk_echo_prop_changed_cb<T>(params string[] props) =>
+               (oldval, newval) => RaisePropertyChanged(props);
+
+            IDisposable attach_prop_changed_cb<TView, TModel>(PropertyAutoWrapper<TModel, TView> prop, PropertyChange<(TModel, TView)> callback) {
+               prop.changed += callback;
+               return Disposable.Create(() => prop.changed -= callback);
+            }
          }
 
          public event Action invalidated;
@@ -109,32 +141,63 @@ namespace mbts.spark {
          public bool inside_bids => _inside_bids.value;
          public bool inside_asks => _inside_asks.value;
          public int position => _position.value;
+         public string position_text => _position.text;
          public double raw_day_position => _raw_day_position;
+         public string raw_day_position_text => SparkUtils.fmt_position(_raw_day_position.safe_divide(_display_qty_divisor));
          public double last_price => _last_price.Value;
          public bool last_price_from_spread => _last_price_from_spread.Value;
          public uint last_size => _last_size.value;
+         public string last_size_text => _last_size.text;
+         // bid price/size
          public double bid_price => _bid_price.Value;
-         public uint bid_direct_size => _bid_direct_size.Value;
-         public uint bid_implied_size => _bid_merged_size.Value - _bid_direct_size.Value;
-         public uint bid_merged_size => _bid_merged_size.Value;
-         public string bid_merged_size_text => _bid_merged_size_text ?? (_bid_merged_size_text = _size_formatter(_bid_merged_size.Value, bid_implied_size));
+         public uint bid_direct_size => _bid_direct_size.model;
+         public uint bid_implied_size => _bid_merged_size.model - _bid_direct_size.model;
+         public uint bid_merged_size => _bid_merged_size.model;
+         // bid size text
+         public string bid_direct_size_text => _bid_direct_size.view.ToString();
+         public string bid_implied_size_text => _bid_implied_size.view.ToString();
+         public string bid_merged_size_text => _bid_merged_size.view.ToString();
+         // ask price/size
          public double ask_price => _ask_price.Value;
-         public uint ask_direct_size => _ask_direct_size.Value;
-         public uint ask_implied_size => _ask_merged_size.Value - _ask_direct_size.Value;
-         public uint ask_merged_size => _ask_merged_size.Value;
-         public string ask_merged_size_text => _ask_merged_size_text ?? (_ask_merged_size_text = _size_formatter(_ask_merged_size.Value, ask_implied_size));
+         public uint ask_direct_size => _ask_direct_size.model;
+         public uint ask_implied_size => _ask_implied_size.model;
+         public uint ask_merged_size => _ask_merged_size.model;
+         // ask size text
+         public string ask_direct_size_text => _ask_direct_size.view.ToString();
+         public string ask_implied_size_text => _ask_implied_size.view.ToString();
+         public string ask_merged_size_text => _ask_merged_size.view.ToString();
+         //
          public ulong volume => _volume.value;
+         public string volume_text => _volume.text;
          public double settlement => _settlement.Value;
          public double day_change => _day_change.Value;
          public double session_low => _session_low.Value;
          public double session_high => _session_high.Value;
          public int working_bid_volume => _working_bid_volume.value;
          public int working_ask_volume => _working_ask_volume.value;
-         public string working_bids_text => OrderUtils.order_collection_summary(_order_summarizer.best_working_bid, _order_summarizer.best_working_bid_qty, _order_summarizer.working_bid_qty, security.ContractSpec);
-         public string working_asks_text => OrderUtils.order_collection_summary(_order_summarizer.best_working_ask, _order_summarizer.best_working_ask_qty, _order_summarizer.working_ask_qty, security.ContractSpec);
+         public string working_bids_text => OrderUtils.order_collection_summary(
+            _order_summarizer.best_working_bid,
+            _order_summarizer.best_working_bid_qty.safe_divide(_display_qty_divisor),
+            _order_summarizer.working_bid_qty.safe_divide(_display_qty_divisor),
+            security.ContractSpec);
+         public string working_asks_text => OrderUtils.order_collection_summary(
+            _order_summarizer.best_working_ask,
+            _order_summarizer.best_working_ask_qty.safe_divide(_display_qty_divisor),
+            _order_summarizer.working_ask_qty.safe_divide(_display_qty_divisor),
+            security.ContractSpec);
          public double working_best_bid => _working_best_bid.value;
          public double working_best_ask => _working_best_ask.value;
+         // ice props
+         public string market_description => security.market_description();
+         public string cleared_alias => security.cleared_alias();
+         public string product_description => security.product_name();
+         public string hub_alias => security.hub_alias();
+         public string strip_name => security.strip_name();
+         public string mic_code => security.mic_code();
+         // animations
          public IList<ui.spark.CellAnimation> animations => _animation.get_animations().ToList();
+         public ObservableCollection<RowAnimation> row_animations { get; } = new ObservableCollection<RowAnimation>();
+         // commands
          public ICommand bid_price_click { get; }
          public ICommand bid_merged_size_click { get; }
          public ICommand bid_direct_size_click { get; }
@@ -146,27 +209,30 @@ namespace mbts.spark {
          public ICommand ask_implied_size_click { get; }
          public ICommand working_asks_click { get; }
          public ICommand default_command { get; }
-         public string market_description {get;}
-         public string cleared_alias { get; }
-         public string product_description { get; }
-         public string hub_alias { get; }
-         public string strip_name{ get; }
-         public string mic_code { get; }
-
-         public ObservableCollection<RowAnimation> row_animations { get; } = new ObservableCollection<RowAnimation>();
 
          public IReadOnlyList<DIYGrid.IGridCellStore> cell_stores => new DIYGrid.IGridCellStore[0];
          #endregion
 
+         uint _display_qty_divisor => _display_qty_divisor_backing ??
+            (_display_qty_divisor_backing = _orders_model.security_auxiliary_model.get_display_quantity_divisor(security)).Value;
+
          public void raise_invalidated() => invalidated?.Invoke();
 
          public void refresh() {
             bool dirty = false;
             if (md.md.get_bbo(ref _bbo_ref, out NativePriceSize b, out NativePriceSize a)) {
                _bid_price.set(b.price);
-               refresh_size(ref b, _bid_direct_size, _bid_merged_size, ref _bid_merged_size_text, nameof(bid_merged_size_text));
+               // don't use the '||' operator - every 'set_new' call must be made
+               // (the operation mustn't terminate the first time a set_new call returns true).
+               dirty |= (
+                  _bid_direct_size.set_new(b.direct_size) |
+                  _bid_implied_size.set_new(b.implied_size) |
+                  _bid_merged_size.set_new(b.size) |
+                  _ask_direct_size.set_new(a.direct_size) |
+                  _ask_implied_size.set_new(a.implied_size) |
+                  _ask_merged_size.set_new(a.size));
+
                _ask_price.set(a.price);
-               refresh_size(ref a, _ask_direct_size, _ask_merged_size, ref _ask_merged_size_text, nameof(ask_merged_size_text));
                _inside_bids.on_next_distinct(_bid_price.Value >= _working_best_bid.value, ref dirty);
                _inside_asks.on_next_distinct(_ask_price.Value <= _working_best_ask.value, ref dirty);
             }
@@ -183,16 +249,6 @@ namespace mbts.spark {
             _volume.on_next_distinct(md.md.total_volume, ref dirty);
             if (dirty)
                invalidated?.Invoke();
-
-            void refresh_size(ref NativePriceSize nps, Property<uint> direct, Property<uint> merged, ref string text, string text_prop) {
-               if (nps.size != merged.Value || nps.direct_size != direct.Value) {
-                  merged.set(nps.size);
-                  direct.set(nps.direct_size);
-                  text = null;
-                  dirty = true;
-                  RaisePropertyChanged(text_prop);
-               }
-            }
          }
 
          public bool Equals(Row other) =>
@@ -220,7 +276,7 @@ namespace mbts.spark {
             ob_settings.filters = new bts.shell.orderbook.FilterStates {
                statuses = new[] { OrderStatus.Working },
                sides = new[] { side },
-               security_criteria = new SecurityCriteria(security)
+               security_criteria = SecurityCriteria.from_securities(security)
             };
             _bus.post(SparkTags.ShowOrderBookTag, ob_settings);
          }

src/client/spark/Modules/Market/MarketView/MarketViewVM.cs

@@ -9,6 +9,7 @@ using mbts.ui.utility;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.Linq;
 using System.Reactive.Linq;
 using System.Windows.Data;
 using System.Windows.Media;
@@ -18,6 +19,9 @@ using static mbts.ui.spark.MarketViewView;
 
 namespace mbts.spark {
    partial class MarketViewVM : SecurityMDGrid<MarketViewVM.Row, SecurityMD> {
+      static IReadOnlyList<Func<MarketViewVM, IDataGridColumnFilter<Row>>> _filter_getters =
+         ObjectSnapshot.property_delegates_of_type<MarketViewVM, IDataGridColumnFilter<Row>>();
+
       readonly IBus _bus;
       readonly OrdersModel _orders_model;
       IWindowSettingsManager<GridSettings> _settings_manager;
@@ -37,21 +41,21 @@ namespace mbts.spark {
          const double working_orders_col_width = 105;
          IMultiValueConverter price_converter = new ui.spark.converters.TickDisplayConverter();
          add_col(Columns.Security, "Security", r => r.security.ToString(), nameof(Row.security), DefaultColumnWidths.Security, security_filter, DataGridFilterKnownTemplates.Regex);
-         add_col(Columns.Volume, "Volume", r => r.volume.ToString(), nameof(Row.volume), DefaultColumnWidths.Volume, volume_filter, DataGridFilterKnownTemplates.ULongMinMax);
+         add_col(Columns.Volume, "Volume", r => r.volume_text, nameof(Row.volume), DefaultColumnWidths.Volume, volume_filter, DataGridFilterKnownTemplates.ULongMinMax);
          add_col(Columns.LastSpd, "Spd", r => r.last_price_from_spread ? "S" : "", nameof(Row.last_price_from_spread), DefaultColumnWidths.Side, last_price_from_spread_filter, DataGridFilterKnownTemplates.Regex);
          add_col(Columns.Last, "Last", r => r.format_price(r.last_price), nameof(Row.last_price), DefaultColumnWidths.Price, last_price_filter, DataGridFilterKnownTemplates.DoubleMinMax);         
-         add_col(Columns.LastSize, merged_size_col_header, r => r.last_size.ToString(), nameof(Row.last_size), DefaultColumnWidths.Size, last_size_filter, DataGridFilterKnownTemplates.UIntMinMax, h_alignment: System.Windows.HorizontalAlignment.Right);
-         add_col(Columns.Position, "Pos", r => r.position.ToString(), nameof(Row.position), DefaultColumnWidths.Size, position_filter, DataGridFilterKnownTemplates.IntMinMax, true, h_alignment: System.Windows.HorizontalAlignment.Right);
-         add_col(Columns.RawDayPosition, "Raw Day Pos", r => SparkUtils.fmt_position(r.raw_day_position), nameof(Row.raw_day_position), DefaultColumnWidths.Size, raw_day_position_filter, DataGridFilterKnownTemplates.DoubleMinMax, true, h_alignment: System.Windows.HorizontalAlignment.Right);
+         add_col(Columns.LastSize, merged_size_col_header, r => r.last_size_text, nameof(Row.last_size), DefaultColumnWidths.Size, last_size_filter, DataGridFilterKnownTemplates.UIntMinMax, h_alignment: System.Windows.HorizontalAlignment.Right);
+         add_col(Columns.Position, "Pos", r => r.position_text, nameof(Row.position), DefaultColumnWidths.Size, position_filter, DataGridFilterKnownTemplates.IntMinMax, true, h_alignment: System.Windows.HorizontalAlignment.Right);
+         add_col(Columns.RawDayPosition, "Raw Day Pos", r => r.raw_day_position_text, nameof(Row.raw_day_position), DefaultColumnWidths.Size, raw_day_position_filter, DataGridFilterKnownTemplates.DoubleMinMax, true, h_alignment: System.Windows.HorizontalAlignment.Right);
          add_hl_working_orders_col(Columns.WorkingBids, working_col_header, nameof(Row.working_bids_text), nameof(Row.working_best_bid), nameof(Row.working_bids_click), working_bid_volume_filter, BTSColors.MarketData.bid, System.Windows.HorizontalAlignment.Right);
-         add_col(Columns.BidImpliedSize, implied_size_col_header, r => r.bid_implied_size.ToString(), nameof(Row.bid_implied_size), DefaultColumnWidths.ImpliedDirectMergedSize, bid_implied_size_filter, DataGridFilterKnownTemplates.UIntMinMax, font_color: BTSColors.MarketData.bid, h_alignment: System.Windows.HorizontalAlignment.Right);
-         add_col(Columns.BidDirectSize, direct_size_col_header, r => r.bid_direct_size.ToString(), nameof(Row.bid_direct_size), DefaultColumnWidths.ImpliedDirectMergedSize, bid_direct_size_filter, DataGridFilterKnownTemplates.UIntMinMax, font_color: BTSColors.MarketData.bid, h_alignment: System.Windows.HorizontalAlignment.Right);
+         add_col(Columns.BidImpliedSize, implied_size_col_header, r => r.bid_implied_size_text, nameof(Row.bid_implied_size), DefaultColumnWidths.ImpliedDirectMergedSize, bid_implied_size_filter, DataGridFilterKnownTemplates.UIntMinMax, font_color: BTSColors.MarketData.bid, h_alignment: System.Windows.HorizontalAlignment.Right);
+         add_col(Columns.BidDirectSize, direct_size_col_header, r => r.bid_direct_size_text, nameof(Row.bid_direct_size), DefaultColumnWidths.ImpliedDirectMergedSize, bid_direct_size_filter, DataGridFilterKnownTemplates.UIntMinMax, font_color: BTSColors.MarketData.bid, h_alignment: System.Windows.HorizontalAlignment.Right);
          add_hl_merged_size_col(Columns.BidMergedSize, merged_size_col_header, nameof(Row.bid_merged_size), nameof(Row.bid_merged_size_text), nameof(Row.bid_merged_size_click), bid_merged_size_filter, BTSColors.MarketData.bid, h_alignment: System.Windows.HorizontalAlignment.Right);
          add_hl_price_col(Columns.Bid, "Bid", nameof(Row.bid_price), nameof(Row.bid_price_click), bid_price_filter, BTSColors.header_text, BTSColors.MarketData.bid, h_alignment: System.Windows.HorizontalAlignment.Right);
          add_hl_price_col(Columns.Ask, "Ask", nameof(Row.ask_price), nameof(Row.ask_price_click), ask_price_filter, BTSColors.header_text, BTSColors.MarketData.ask, h_alignment: System.Windows.HorizontalAlignment.Right);
          add_hl_merged_size_col(Columns.AskMergedSize, merged_size_col_header, nameof(Row.ask_merged_size), nameof(Row.ask_merged_size_text), nameof(Row.ask_merged_size_click), ask_merged_size_filter, BTSColors.MarketData.ask, h_alignment: System.Windows.HorizontalAlignment.Right);
-         add_col(Columns.AskDirectSize, direct_size_col_header, r => r.ask_direct_size.ToString(), nameof(Row.ask_direct_size), DefaultColumnWidths.ImpliedDirectMergedSize, ask_direct_size_filter, DataGridFilterKnownTemplates.UIntMinMax, font_color: BTSColors.MarketData.ask, h_alignment: System.Windows.HorizontalAlignment.Right);
-         add_col(Columns.AskImpliedSize, implied_size_col_header, r => r.ask_implied_size.ToString(), nameof(Row.ask_implied_size), DefaultColumnWidths.ImpliedDirectMergedSize, ask_implied_size_filter, DataGridFilterKnownTemplates.UIntMinMax, font_color: BTSColors.MarketData.ask, h_alignment: System.Windows.HorizontalAlignment.Right);
+         add_col(Columns.AskDirectSize, direct_size_col_header, r => r.ask_direct_size_text, nameof(Row.ask_direct_size), DefaultColumnWidths.ImpliedDirectMergedSize, ask_direct_size_filter, DataGridFilterKnownTemplates.UIntMinMax, font_color: BTSColors.MarketData.ask, h_alignment: System.Windows.HorizontalAlignment.Right);
+         add_col(Columns.AskImpliedSize, implied_size_col_header, r => r.ask_implied_size_text, nameof(Row.ask_implied_size), DefaultColumnWidths.ImpliedDirectMergedSize, ask_implied_size_filter, DataGridFilterKnownTemplates.UIntMinMax, font_color: BTSColors.MarketData.ask, h_alignment: System.Windows.HorizontalAlignment.Right);
          add_hl_working_orders_col(Columns.WorkingAsks, working_col_header, nameof(Row.working_asks_text), nameof(Row.working_best_ask), nameof(Row.working_asks_click), working_ask_volume_filter, BTSColors.MarketData.ask, System.Windows.HorizontalAlignment.Right);
          add_col(Columns.Settlement, "Settlement", r => r.format_price(r.settlement), nameof(Row.settlement), DefaultColumnWidths.Settlement, settlement_filter, DataGridFilterKnownTemplates.DoubleMinMax, h_alignment: System.Windows.HorizontalAlignment.Right);
          add_col(Columns.DayChange, "Change", r => r.format_price(r.day_change), nameof(Row.day_change), DefaultColumnWidths.Price, day_change_filter, DataGridFilterKnownTemplates.DoubleMinMax, true, h_alignment: System.Windows.HorizontalAlignment.Right);
@@ -151,14 +155,16 @@ namespace mbts.spark {
                      working_ask_volume_filter.load_state(filters.working_ask_volume);
                      volume_filter.load_state(filters.volume);
                      security_key_filter.load_state(filters.security_key);
+                     market_description_filter.load_state(filters.market_description);
+                     cleared_alias_filter.load_state(filters.cleared_alias);
+                     product_description_filter.load_state(filters.product_description);
+                     hub_alias_filter.load_state(filters.hub_alias);
+                     strip_name_filter.load_state(filters.strip_name);
+                     mic_code_filter.load_state(filters.mic_code);
                   }
                   rows_view.set_sort_descriptions(s.sorting_criterion, columns);
                }
-            }), DataGridFilterHelper.hook_filters(rows_view, security_filter,
-            bid_price_filter, bid_merged_size_filter, bid_direct_size_filter, bid_implied_size_filter,
-            ask_price_filter, ask_merged_size_filter, ask_direct_size_filter, ask_implied_size_filter,
-            last_price_filter, last_price_from_spread_filter, last_size_filter, day_change_filter, settlement_filter,
-            session_low_filter, session_high_filter, position_filter, raw_day_position_filter, working_bid_volume_filter, working_ask_volume_filter, volume_filter, security_key_filter),
+            }), DataGridFilterHelper.hook_filters(rows_view, _filters),
             settings_manager.subscribe_current().OnDispatcher().Subscribe(grid_settings_manager),
             WorkLoop.Start("MarketView", _refresh)
          );
@@ -233,13 +239,15 @@ namespace mbts.spark {
       public IDataGridColumnPersistentFilter<Row, ULongMinMaxState> volume_filter { get; } = new ULongMinMax<Row>(r => r.volume, nameof(Row.volume));
       public IDataGridColumnPersistentFilter<Row, string> security_key_filter { get; } = new RegexFilterVM<Row>(r => r.security_key.ToString(), nameof(Row.security_key));
       
-      public IDataGridColumnPersistentFilter<Row, string> market_description_filter { get; } = new RegexFilterVM<Row>(r => r.security.HasIce ? r.security.Ice.MarketDescription : "", nameof(Row.market_description));
-      public IDataGridColumnPersistentFilter<Row, string> cleared_alias_filter { get; } = new RegexFilterVM<Row>(r => r.security.HasIce ? r.security.Ice.ClearedAlias : "", nameof(Row.cleared_alias));
-      public IDataGridColumnPersistentFilter<Row, string> product_description_filter { get; } = new RegexFilterVM<Row>(r => r.security.HasIce ? r.security.Ice.ProductName : "", nameof(Row.product_description));
-      public IDataGridColumnPersistentFilter<Row, string> hub_alias_filter { get; } = new RegexFilterVM<Row>(r => r.security.HasIce ? r.security.Ice.HubAlias : "", nameof(Row.hub_alias));
-      public IDataGridColumnPersistentFilter<Row, string> strip_name_filter { get; } = new RegexFilterVM<Row>(r => r.security.HasIce ? r.security.Ice.StripName : "", nameof(Row.strip_name));
-      public IDataGridColumnPersistentFilter<Row, string> mic_code_filter { get; } = new RegexFilterVM<Row>(r => r.security.HasIce ? r.security.Ice.MicCode : "", nameof(Row.mic_code));
-      
+      public IDataGridColumnPersistentFilter<Row, string> market_description_filter { get; } = new RegexFilterVM<Row>(r => r.market_description, nameof(Row.market_description));
+      public IDataGridColumnPersistentFilter<Row, string> cleared_alias_filter { get; } = new RegexFilterVM<Row>(r => r.cleared_alias, nameof(Row.cleared_alias));
+      public IDataGridColumnPersistentFilter<Row, string> product_description_filter { get; } = new RegexFilterVM<Row>(r => r.product_description, nameof(Row.product_description));
+      public IDataGridColumnPersistentFilter<Row, string> hub_alias_filter { get; } = new RegexFilterVM<Row>(r => r.hub_alias, nameof(Row.hub_alias));
+      public IDataGridColumnPersistentFilter<Row, string> strip_name_filter { get; } = new RegexFilterVM<Row>(r => r.strip_name, nameof(Row.strip_name));
+      public IDataGridColumnPersistentFilter<Row, string> mic_code_filter { get; } = new RegexFilterVM<Row>(r => r.mic_code, nameof(Row.mic_code));
+
+      IEnumerable<IDataGridColumnFilter<Row>> _filters =>
+         _filter_getters.Select(fn => fn(this));
 
       public FilterStates get_filter_states() {
          return new FilterStates {

src/client/spark/Modules/Market/MarketView/MarketViewView.xaml.cs

@@ -48,5 +48,5 @@ namespace mbts.ui.spark {
       }
    }
 
-   class MarketViewRowView : DIYGrid.HighPerformanceRow<MarketViewVM.Row, MarketViewView.Columns> { }
+   class MarketViewRowView : DIYGrid.HighPerformanceRow<MarketViewVM.Row> { }
 }

src/client/spark/Modules/Market/MarketView/MarketViewWindow.cs

@@ -4,10 +4,10 @@ using bts.shell;
 using bts.shell.fills;
 using bts.spark;
 using bts.utils;
+using bts.view;
 using mbts.persist;
 using mbts.ui;
 using mbts.ui.settings;
-using mbts.ui.shell;
 using mbts.ui.spark;
 using mbts.ui.utility;
 using mbts.utils;
@@ -32,6 +32,7 @@ namespace mbts.spark {
       SecurityCriteria
          _selected_security_criteria_backing,
          _sorted_selected_security_criteria_backing;
+      SparkMenuDisplayVM _menu_display_vm;
 
       public MarketViewWindow(MarketViewWindowFactory factory, IBus bus, OrdersModel orders_model, MarketViewWindowFactory.StartupData state, IWindowSettingsManager<GridSettings> settings_manager)
          : base("Market View", bus, factory, SparkCommands.ShowMarketView.icon) {
@@ -48,7 +49,9 @@ namespace mbts.spark {
       public override UIElement Content => _view;
       public override IEnumerable<SparkCommand> Commands => _commands;
       public override MarketViewWindowFactory.StartupData SaveState =>
-         _state = new MarketViewWindowFactory.StartupData(_state.security_criteria, _vm.get_filter_states(), _vm.get_grid_save_state(), _vm.rows_view.get_sorting_criteria(_vm.columns));
+         _state = new MarketViewWindowFactory.StartupData(_state.security_criteria, _vm.get_filter_states(), _vm.get_grid_save_state(), _vm.rows_view.get_sorting_criteria(_vm.columns)) {
+            menu_display = _menu_display_vm.safe_create()
+         };
 
       public override double MinWidth => MarketViewWindowFactory.StartupData.DefaultGridSettings.columns.Where(c => c.is_visible).Sum(gcs => gcs.width)
          + SPARK_MENU_COLLAPSED_WIDTH
@@ -63,7 +66,7 @@ namespace mbts.spark {
                if (_sorted_selected_security_criteria_backing != null) {
                   _selected_security_criteria_backing = _sorted_selected_security_criteria_backing;
                } else if (_vm != null)
-                  _selected_security_criteria_backing = new SecurityCriteria(_vm.selected_rows.Select(r => r.security));
+                  _selected_security_criteria_backing = SecurityCriteria.from_securities(_vm.selected_rows.Select(r => r.security));
             }
             return _selected_security_criteria_backing;
          }
@@ -89,7 +92,7 @@ namespace mbts.spark {
                      }
                   }
                   var comp = comp_builder.to_comparer();
-                  _sorted_selected_security_criteria_backing = new SecurityCriteria(_vm.selected_rows.Ordered(comp).Select(r => r.security));
+                  _sorted_selected_security_criteria_backing = SecurityCriteria.from_securities(_vm.selected_rows.Ordered(comp).Select(r => r.security));
                }
             }
             return _sorted_selected_security_criteria_backing;
@@ -101,6 +104,8 @@ namespace mbts.spark {
       public void thread_init() {
          _init_guard.check_access();
          Log.notnull(_state);
+         _menu_display_vm = new SparkMenuDisplayVM();
+         _menu_display_vm.load_from(_state.menu_display);
          var state_src = Observable.FromEvent<Action<MarketViewWindowFactory.StartupData>, MarketViewWindowFactory.StartupData>(cb => _state_changed += cb, cb => _state_changed -= cb).StartWith(_state);
          _vm = new MarketViewVM(_bus, _orders_model, state_src, _settings_manager);
          _view = new MarketViewView { DataContext = _vm };
@@ -160,7 +165,8 @@ namespace mbts.spark {
                var dialog = new ShellSettingsDialog { DataContext = vm };
                vm.RequestClose += (s, e) => WindowUtilities.force_close(dialog);
                return dialog;
-            }))
+            })),
+            _menu_display_vm.spark_cmd
          };
          //
          _vm.selection_changed += on_selection_changed;
@@ -190,5 +196,8 @@ namespace mbts.spark {
          _vm.Dispose();
          Commands.OfType<IDisposable>().DisposeAll();
       }
+
+      protected override void OnParentViewCreated(SparkWindowView parent_view) =>
+         _menu_display_vm.safe_bind_to_view(parent_view);
    }
 }

src/client/spark/Modules/Market/MarketView/MarketViewWindowFactory.cs

@@ -1,6 +1,7 @@
 using bts.api;
 using bts.proto;
 using bts.settings;
+using bts.view;
 using mbts.persist;
 using mbts.spark;
 using mbts.spark.filters;
@@ -53,6 +54,8 @@ namespace bts.shell {
          public readonly FilterStates filters;
          [ProtoMember(4)]
          public GridSettings grid;
+         [ProtoMember(5)]
+         public SparkMenuDisplaySettings menu_display;
 
          public StartupData() { }
 

src/client/spark/Modules/Market/TimeAndSales/Settings/TimeAndSalesFilterStates.cs

@@ -0,0 +1,36 @@
+using mbts.spark.filters;
+using mbts.ui;
+using ProtoBuf;
+using System;
+
+namespace bts.shell.time_and_sales {
+   [ProtoContract]
+   class FilterStates {
+      [ProtoMember(1)]
+      public TimeFilterTuple time;
+      [ProtoMember(2)]
+      public string security;
+      [ProtoMember(3)]
+      public DoubleMinMaxState price;
+      [ProtoMember(4)]
+      public UIntMinMaxState size;
+      // [ProtoMember(5)]
+      // ProtoMember 5 cannot be used further
+      [ProtoMember(6)]
+      public string security_key;
+      [ProtoMember(7)]
+      public co2.AggressorSide[] aggressor_sides;
+   }
+
+   static class TimeAndSalesFilterStatesExtensions {
+      public static Func<TimeAndSalesRowVM, bool> build_predicate(this FilterStates fs) {
+         var pb = new ColumnPredicateBuilder<TimeAndSalesRowVM>();
+         pb.add_regex(fs.security, r => r.security.ToString());
+         pb.add_time_filter(fs.time, r => r.time);
+         pb.add_price(fs.price, r => r.price, r => r.security);
+         pb.add_numeric(fs.size, r => r.size);
+         pb.add_discrete_values(fs.aggressor_sides, r => r.aggressor_side);
+         return pb.to_predicate();
+      }
+   }
+}

src/client/spark/Modules/Market/TimeAndSales/Settings/TimeAndSalesSettings.cs

@@ -0,0 +1,74 @@
+using mbts.spark;
+using mbts.ui;
+using mbts.ui.settings;
+using ProtoBuf;
+using System.Collections.Generic;
+using System.Linq;
+using static mbts.ui.controls.DIYGrid;
+using Columns = bts.shell.time_and_sales.TimeAndSalesView.Columns;
+
+namespace bts.shell.time_and_sales {
+   [ProtoContract]
+   class TimeAndSalesSettings {
+      [ProtoMember(1)]
+      public readonly SecurityCriteria security_criteria;
+      [ProtoMember(2)]
+      List<SortingCriteria> _sorting_criterion;
+      [ProtoMember(3)]
+      public FilterStates filters;
+      [ProtoMember(4)]
+      public GridSettings grid;
+      [ProtoMember(5)]
+      public SparkMenuDisplaySettings menu_display;
+      [ProtoMember(6)]
+      public bool use_defaults;
+
+      public TimeAndSalesSettings() { }
+
+      public TimeAndSalesSettings(SecurityCriteria security_criteria) :
+         this(security_criteria, new FilterStates(), null, null) { }
+
+      public TimeAndSalesSettings(SecurityCriteria security_criteria, FilterStates filters, GridSettings grid = default, List<SortingCriteria> sorting_criterion = null) {
+         this.security_criteria = security_criteria;
+         this.filters = filters;
+         this.grid = grid;
+         _sorting_criterion = sorting_criterion;
+      }
+
+      public static GridSettings DefaultGridSettings => GridSettings.Default.with(DefaultColumns.all, DefaultColumns.default_sorting_criterion);
+
+      public List<SortingCriteria> sorting_criterion => _sorting_criterion ?? (_sorting_criterion = DefaultColumns.default_sorting_criterion.ToList());
+
+      public static TimeAndSalesSettings Default(SecurityCriteria security_criteria) =>
+        new TimeAndSalesSettings(security_criteria, new FilterStates(), null, DefaultColumns.default_sorting_criterion.ToList());
+
+      public TimeAndSalesSettings with(SecurityCriteria security_criteria) =>
+         new TimeAndSalesSettings(security_criteria, filters, grid);
+
+      public static class DefaultColumns {
+         public static GridColumnSettings security => new GridColumnSettings(Columns.Security.col_id(), DefaultColumnHeaders.Security, width: DefaultColumnWidths.Security);
+         public static GridColumnSettings time => new GridColumnSettings(Columns.Time.col_id(), DefaultColumnHeaders.Time, width: DefaultColumnWidths.TimeOfDay);
+         public static GridColumnSettings price => new GridColumnSettings(Columns.Price.col_id(), DefaultColumnHeaders.Price, width: DefaultColumnWidths.Price, horizontal_alignment: System.Windows.HorizontalAlignment.Right);
+         public static GridColumnSettings size => new GridColumnSettings(Columns.Size.col_id(), DefaultColumnHeaders.Size, width: DefaultColumnWidths.Size, horizontal_alignment: System.Windows.HorizontalAlignment.Right);
+         public static GridColumnSettings aggressor => new GridColumnSettings(Columns.Aggressor.col_id(), DefaultColumnHeaders.Aggressor, width: DefaultColumnWidths.Aggressor);
+         public static GridColumnSettings security_key => new GridColumnSettings(Columns.SecurityKey.col_id(), DefaultColumnHeaders.SecurityKey, is_visible: false, width: DefaultColumnWidths.SecurityKey);
+
+         public static IEnumerable<SortingCriteria> default_sorting_criterion {
+            get {
+               yield return new SortingCriteria(time.id, false);
+            }
+         }
+
+         public static IEnumerable<GridColumnSettings> all {
+            get {
+               yield return security;
+               yield return time;
+               yield return price;
+               yield return size;
+               yield return aggressor;
+               yield return security_key;
+            }
+         }
+      }
+   }
+}

src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesModel.cs

@@ -1,27 +1,26 @@
 using bts.api;
 using bts.co2;
+using mbts;
 using mbts.co2;
+using mbts.spark;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reactive.Linq;
 
-namespace mbts.spark {
+namespace bts.shell.time_and_sales {
    class TimeAndSalesModel : IDisposable {
-      internal readonly SecurityCriteria security_criteria;
-
       static readonly TimeSpan _poll_interval = TimeSpan.FromSeconds(0.4);
       Lazy<IObservable<IReadOnlyList<TradeInfo>>> _trades;
       IDisposable _dispose;
 
-      public TimeAndSalesModel(IBus bus, MDConsumer consumer, SecurityCriteria security_criteria) {
-         this.security_criteria = security_criteria;
-         var curr_channels = new Dictionary<ChannelKey, ChannelConsumer>(); 
+      public TimeAndSalesModel(IBus bus, MDConsumer consumer, IObservable<SecurityCriteria> security_criteria) {
+         var curr_channels = new Dictionary<ChannelKey, ChannelConsumer>();
          _trades = new Lazy<IObservable<IReadOnlyList<TradeInfo>>>(() => Observable.Interval(_poll_interval).Select(_ => {
             var copy = curr_channels;
             return copy.Values.SelectMany(c => c.read_trades()).ToList();
          }));
-         _dispose = security_criteria.subscribe_md_map(bus).Subscribe(
+         _dispose = security_criteria.SelectManyInSeries(sc =>sc.subscribe_md_map(bus)).Subscribe(
             md_map => {
                var copy = new Dictionary<ChannelKey, ChannelConsumer>(curr_channels);
                copy.sync_with_demux(md_map, get_channel_key, get_channel_consumer, update_channel_consumer);
@@ -95,4 +94,4 @@ namespace mbts.spark {
          }
       }
    }
-}
+}

src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesRowVM.cs

@@ -0,0 +1,75 @@
+using bts.api;
+using bts.co2;
+using bts.utils;
+using bts.utils.csv;
+using mbts;
+using mbts.spark;
+using mbts.ui.controls;
+using mbts.ui.shell;
+using mbts.utils;
+using System;
+using System.Collections.Generic;
+
+namespace bts.shell.time_and_sales {
+   class TimeAndSalesRowVM : ViewModelBase, DIYGrid.IRowVM, ISecurityRow, IEquatable<TimeAndSalesRowVM> {
+      // key comparer guarentees deterministic sorting
+      // if the rows in the collection have unique row_keys.
+      public static readonly IComparer<TimeAndSalesRowVM> key_comparer =
+         new ComparerBuilder<TimeAndSalesRowVM>(new[] {
+            Comparer<DateTime>.Default.wrap<DateTime, TimeAndSalesRowVM>(r => r.time),
+            Comparer<int>.Default.wrap<int, TimeAndSalesRowVM>(r => r.row_key)
+         })
+         .to_comparer()
+         .to_safe();
+
+      readonly TradeMessageImmutable _trade;
+      readonly Func<SecurityImmutable?, uint> _get_display_qty_divisor;
+      uint? _display_size;
+
+      public TimeAndSalesRowVM(int row_key, SecurityImmutable security, TradeMessageImmutable trade, Func<SecurityImmutable?, uint> get_display_qty_divisor) {
+         this.row_key = row_key;
+         this.security = security;
+         _trade = trade;
+         trade_key = trade.Key;
+         _get_display_qty_divisor = get_display_qty_divisor ?? new Func<SecurityImmutable?, uint>(sec => 1);
+      }
+
+      public event Action invalidated;
+
+      public int row_key { get; }
+      public uint trade_key { get; }
+      public uint security_key => security.Id;
+      public SecurityImmutable security { get; }
+      public DateTime time => ((ulong)_trade.Time).lldatetime().ToLocalTime();
+      public double price => _trade.price();
+      public uint size => _trade.Size;
+      public uint display_size => _display_size ??
+         (_display_size = size.safe_divide(_get_display_qty_divisor(security))).Value;
+      public AggressorSide aggressor_side => _trade.AggressorSide;
+
+      public void raise_invalidated() =>
+         invalidated?.Invoke();
+
+      public static System.Collections.Specialized.OrderedDictionary csv_ordered_properties =>
+            CsvHelper.create_ordering_maintainer(
+               typeof(TimeAndSalesRowVM),
+               new string[] {
+                  nameof(security),
+                  nameof(time),
+                  nameof(price),
+                  nameof(size),
+                  nameof(aggressor_side),
+                  nameof(security_key),
+               });
+
+      public bool Equals(TimeAndSalesRowVM other) =>
+         other != null &&
+         row_key == other.row_key;
+
+      public override bool Equals(object obj) =>
+         Equals(obj as TimeAndSalesRowVM);
+
+      public override int GetHashCode() =>
+         row_key;
+   }
+}

src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesVM.cs

@@ -1,86 +1,365 @@
 using bts.api;
 using bts.co2;
 using bts.collections;
+using bts.utils;
+using mbts;
 using mbts.persist;
+using mbts.spark;
 using mbts.spark.filters;
 using mbts.ui;
 using mbts.ui.controls;
 using mbts.ui.settings;
-using mbts.ui.spark;
+using mbts.ui.shell;
 using mbts.ui.utility;
+using mbts.utils;
 using System;
 using System.Collections.Generic;
+using System.Collections.Immutable;
 using System.Collections.ObjectModel;
+using System.Diagnostics;
 using System.Linq;
 using System.Reactive.Linq;
-using System.Threading.Tasks;
+using System.Threading;
+using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Media;
-using static bts.shell.TimeAndSalesWindowFactory;
 using static mbts.ui.controls.DIYGrid;
 
-namespace mbts.spark {
-   class TimeAndSalesVM : SecurityGrid<TimeAndSalesVM.Row, TradeInfo> {
-      readonly IBus _bus;
-      readonly TimeAndSalesModel _model;
-      IWindowSettingsManager<GridSettings> _settings_manager;
+namespace bts.shell.time_and_sales {
+   class TimeAndSalesVM : DisposableViewModelBase, IHandleGridSorting, IHandleRowSelection {
+      const int _max_row_count = 1000;
+      static int _id_counter;
+      static IReadOnlyList<Func<TimeAndSalesVM, IDataGridColumnFilter<TimeAndSalesRowVM>>> _filter_getters =
+         ObjectSnapshot.property_delegates_of_type<TimeAndSalesVM, IDataGridColumnFilter<TimeAndSalesRowVM>>();
 
+      readonly ColumnSortManager _sort_manager;
+      readonly RowFactory _row_factory = new RowFactory();
+      readonly LoggerContext _log;
+      readonly IWindowSettingsManager<GridSettings> _settings_manager;
+      readonly DeferrableActionWrapper
+         _refresh_filter,
+         _refresh_sort,
+         _refresh_selected_rows;
+      readonly Func<SecurityImmutable?, uint> _get_display_qty_divisor;
+      IComparer<TimeAndSalesRowVM> _comparer_backing;
+      Func<TimeAndSalesRowVM, bool> _filter_backing;
+      ImmutableHashSet<TimeAndSalesRowVM> _selected_rows = ImmutableHashSet<TimeAndSalesRowVM>.Empty;
+      ImmutableList<TimeAndSalesRowVM> _all_rows = ImmutableList<TimeAndSalesRowVM>.Empty;
+      ImmutableList<TradeInfo> _buffered_trades;
+      /// Although the sorting criteria can be obtained from the <see cref="_sort_manager"/> (<see cref="ColumnSortManager.SortingCriteria"/>),
+      /// a local copy is kept because the settings collector may call <see cref="create"/> from a thread
+      /// other than the dispatcher thread associated with this instance as a viewmodel,
+      /// and the <see cref="ColumnSortManager.SortingCriteria"/> property is not thread-safe.
+      /// Therefore, <see cref="create"/> returns this local copy, and thus avoids accessing the non-thread-safe property.
+      ImmutableList<SortingCriteria> _sorting_criteria = ImmutableList<SortingCriteria>.Empty;
+      TimeAndSalesRowVM _current_row;
+      bool _is_paused;
+      int
+         _load_settings_count,
+         _filter_change_count,
+         _sort_change_count;
 
-      public TimeAndSalesVM(IBus bus, IWindowSettingsManager<GridSettings> settings_manager, TimeAndSalesModel model, StartupData startup_data)
-         : base(RXCollection.CreateBuffer(model.trades, 1000), Enumerable.Empty<SortingCriteria>()) {
-         _bus = bus;
-         _model = model;
+      public TimeAndSalesVM(IWindowSettingsManager<GridSettings> settings_manager, Func<SecurityImmutable?, uint> get_display_qty_divisor) {
+         _sort_manager = new ColumnSortManager(columns.WrapSelector(c => c as ISortableDIYGridColumn, null), TimeAndSalesView.Columns.RowKey.ToString());
+         _get_display_qty_divisor = get_display_qty_divisor ?? new Func<SecurityImmutable?, uint>(sec => 1);
+         _comparer_backing = _sort_manager.BuildComparer(_get_column_comparer);
+         _log = new LoggerContext(Log.Ui, $"Time And Sales VM ({Interlocked.Increment(ref _id_counter)})", null);
          _settings_manager = settings_manager;
-         show_ladder = DelegateCommandParamObserver.Create(current_row_observable, r => _show_ladder_async(r).ignore(), r => r != null);
-         security_filter = new RegexFilterVM<Row>(r => r.security.ToString(), nameof(Row.security));
-         if (startup_data.filters is FilterStates filters) {
+         // deferrable filter/sort refresh
+         _refresh_filter = new DeferrableActionWrapper(_refresh_filter_impl);
+         _refresh_sort = new DeferrableActionWrapper(_refresh_sort_impl);
+         _refresh_selected_rows = new DeferrableActionWrapper(() => selected_rows_changed?.Invoke(_selected_rows));
+         // grid settings
+         grid_settings_manager = new SimpleGridSettingsManager<TimeAndSalesRowVM>(columns, new Dictionary<string, GridColumnSettingsFeatureFlags> { }, rows);
+         grid_settings_manager.load_from(settings_manager.current_settings());
+         // Columns
+         add_column(
+            TimeAndSalesView.Columns.Security,
+            r => r.security.ToString(),
+            DefaultColumnHeaders.Security,
+            DefaultColumnWidths.Security,
+            security_filter,
+            DataGridFilterKnownTemplates.Regex);
+         add_column(
+            TimeAndSalesView.Columns.Time,
+            r => r.time.ToString("h:mm:ss tt"),
+            DefaultColumnHeaders.Time,
+            DefaultColumnWidths.Time,
+            time_filter,
+            DataGridFilterKnownTemplates.TimeFilter);
+         add_column(
+            TimeAndSalesView.Columns.Price,
+            r => r.security.spec_or_default().format(r.price),
+            DefaultColumnHeaders.Price,
+            DefaultColumnWidths.Price,
+            price_filter,
+            DataGridFilterKnownTemplates.DoubleMinMax,
+            System.Windows.HorizontalAlignment.Right);
+         add_column(
+            TimeAndSalesView.Columns.Size,
+            r => r.display_size.ToString(),
+            DefaultColumnHeaders.Size,
+            DefaultColumnWidths.Size,
+            size_filter,
+            DataGridFilterKnownTemplates.UIntMinMax,
+            System.Windows.HorizontalAlignment.Right);
+         add_column(
+            TimeAndSalesView.Columns.Aggressor,
+            r => r.aggressor_side.ToString(),
+            DefaultColumnHeaders.Aggressor,
+            DefaultColumnWidths.Aggressor,
+            aggressor_filter,
+            DataGridFilterKnownTemplates.EnumValues);
+         add_column(
+            TimeAndSalesView.Columns.SecurityKey,
+            r => r.security_key.ToString(),
+            DefaultColumnHeaders.SecurityKey,
+            DefaultColumnWidths.SecurityKey,
+            security_key_filter,
+            DataGridFilterKnownTemplates.Regex);
+
+         settings_manager.subscribe_current().OnDispatcher().Subscribe(grid_settings_manager);
+         // commands
+         show_ladder_cmd = new DelegateCommand(() => {
+            if (current_row != null)
+               request_show_ladder?.Invoke(current_row);
+         });
+         // init IDisposable resources
+         var resources = new List<IDisposable>();
+         resources.AddRange(_filters.Select(f => {
+            f.filter_changed += _refresh_filter.execute;
+            return Disposable.Create(() => f.filter_changed -= _refresh_filter.execute);
+         }));
+         _sort_manager.active_sorting_changed += _refresh_sort.execute;
+         resources.Add(Disposable.Create(() => _sort_manager.active_sorting_changed -= _refresh_sort.execute));
+         _dispose = Disposable.Create(resources.ToArray());
+         // local methods
+         void add_column(
+            TimeAndSalesView.Columns col_key,
+            Func<TimeAndSalesRowVM, string> get_cell_text,
+            string header,
+            double width,
+            IDataGridColumnFilter filter,
+            string filter_template,
+            System.Windows.HorizontalAlignment h_alignment = System.Windows.HorizontalAlignment.Left) =>
+            columns.Add(new RenderTextColumn<TimeAndSalesRowVM, TimeAndSalesView.Columns>(
+               col_key, get_cell_text, filter, filter_template, _get_aggressor_brush) {
+               id = col_key.col_id(), Header = header, Width = width, horizontal_alignment = h_alignment
+            }
+         );
+      }
+
+      public event Action<ImmutableHashSet<TimeAndSalesRowVM>> selected_rows_changed;
+      public event Action<TimeAndSalesRowVM> current_row_changed, request_show_ladder;
+
+      public ObservableCollection<ColumnBase> columns { get; } = new ObservableCollection<ColumnBase>();
+      public TimeAndSalesRowVM current_row {
+         get => _current_row;
+         set {
+            if (Set(ref _current_row, value))
+               current_row_changed?.Invoke(value);
+         }
+      }
+      public ObservableCollection<TimeAndSalesRowVM> rows { get; } = new ObservableCollection<TimeAndSalesRowVM>();
+      public ImmutableHashSet<TimeAndSalesRowVM> selected_rows => _selected_rows;
+      public int total_row_count => _all_rows.Count;
+      public SimpleGridSettingsManager<TimeAndSalesRowVM> grid_settings_manager { get; }
+      public bool is_paused {
+         get => _is_paused;
+         set {
+            if (_is_paused != value) {
+               _is_paused = value;
+               if (value) {
+                  _buffered_trades = ImmutableList<TradeInfo>.Empty;
+               } else {
+                  var resume = _buffered_trades;
+                  _buffered_trades = null;
+                  on_new_trades(resume);
+               }
+            }
+         }
+      }
+      // filters
+      public IDataGridColumnPersistentFilter<TimeAndSalesRowVM, TimeFilterTuple> time_filter { get; } = new TimeFilterVM<TimeAndSalesRowVM>(r => r.time);
+      public IDataGridColumnPersistentFilter<TimeAndSalesRowVM, string> security_filter { get; } = new RegexFilterVM<TimeAndSalesRowVM>(r => r.security.ToString(), nameof(TimeAndSalesRowVM.security));
+      public IDataGridColumnPersistentFilter<TimeAndSalesRowVM, DoubleMinMaxState> price_filter { get; } = new DoubleMinMax<TimeAndSalesRowVM>(r => r.price);
+      public IDataGridColumnPersistentFilter<TimeAndSalesRowVM, UIntMinMaxState> size_filter { get; } = new UIntMinMax<TimeAndSalesRowVM>(r => r.size, nameof(TimeAndSalesRowVM.size));
+      public IDataGridColumnPersistentFilter<TimeAndSalesRowVM, AggressorSide[]> aggressor_filter { get; } = DiscreteValuesFilterVM.Create<TimeAndSalesRowVM, AggressorSide>(EnumHelper.get_values<AggressorSide>().ToArray(), r => r.aggressor_side);
+      public IDataGridColumnPersistentFilter<TimeAndSalesRowVM, string> security_key_filter { get; } = new RegexFilterVM<TimeAndSalesRowVM>(r => r.security_key.ToString());
+      // commands
+      public ICommand show_ladder_cmd { get; }
+
+      IComparer<TimeAndSalesRowVM> _comparer {
+         get => _comparer_backing;
+         set {
+            if (value == null) {
+               _log.warn("Comparer should not be set to null, will use the default comparer instead (based on trade time, then row key).");
+               _comparer_backing = new ComparerBuilder<TimeAndSalesRowVM>(new[] {
+                  Comparer<DateTime>.Default.wrap<DateTime, TimeAndSalesRowVM>(r => r.time),
+                  Comparer<int>.Default.wrap<int, TimeAndSalesRowVM>(r => r.row_key)
+               })
+               .to_comparer()
+               .to_safe();
+            } else {
+               _comparer_backing = value;
+            }
+            var sorted_rows = rows.ToArray();
+            var snapshot = _selected_rows;
+            Array.Sort(sorted_rows, _comparer_backing);
+            using (_refresh_selected_rows.defer_execution()) {
+               for (int i = 0; i < sorted_rows.Length; i++) {
+                  if (rows[i].row_key != sorted_rows[i].row_key)
+                     rows[i] = sorted_rows[i];
+               }
+            }
+         }
+      }
+
+      Func<TimeAndSalesRowVM, bool> _filter {
+         get => _filter_backing;
+         set {
+            var old_filter = _filter_backing;
+            var new_filter = value;
+            _filter_backing = new_filter;
+            if (new_filter != null) {
+               for (int i = 0; i < rows.Count; i++) {
+                  if (!new_filter(rows[i]))
+                     rows.RemoveAt(i);
+               }
+               rows.RemoveWhere(r => !new_filter(r));
+               if (old_filter != null) {
+                  foreach (var r in _all_rows) {
+                     if (!old_filter(r) && new_filter(r))
+                        rows.InsertSorted(r, _comparer);
+                  }
+               }
+            } else if (old_filter != null) {
+               foreach (var r in _all_rows) {
+                  if (!old_filter(r))
+                     rows.InsertSorted(r, _comparer);
+               }
+            }
+         }
+      }
+
+      IEnumerable<IDataGridColumnFilter<TimeAndSalesRowVM>> _filters =>
+         _filter_getters.Select(fn => fn(this));
+
+      public (FilterStates filters, IReadOnlyList<SortingCriteria> sorting_criteria, GridSettings grid_settings) create() =>
+         (_get_filter_states(), _sorting_criteria, grid_settings_manager.create());
+
+      public void load(FilterStates filters, IEnumerable<SortingCriteria> sorting_criteria, GridSettings grid_settings) {
+         using (_refresh_filter.defer_execution())
+         using (_refresh_sort.defer_execution()) {
+            _log.info($"begin load settings ({++_load_settings_count})...");
+            var timer = new Stopwatch();
+            timer.Start();
+            grid_settings_manager.load_from(grid_settings);
+            _sort_manager.SortingCriteria = sorting_criteria;
+            // load filters
             time_filter.load_state(filters.time);
             security_filter.load_state(filters.security);
             price_filter.load_state(filters.price);
             size_filter.load_state(filters.size);
             aggressor_filter.load_state(filters.aggressor_sides);
             security_key_filter.load_state(filters.security_key);
+            //
+            timer.Stop();
+            _log.info($"load settings ({_load_settings_count}) took {timer.ElapsedMilliseconds:0.00}ms.");
          }
-         // Columns
-         add_column(TimeAndSalesView.Columns.Security, DefaultColumnHeaders.Security, DefaultColumnWidths.Security, nameof(Row.security), security_filter, DataGridFilterKnownTemplates.Regex);
-         add_column(TimeAndSalesView.Columns.Time, DefaultColumnHeaders.Time, DefaultColumnWidths.Time, nameof(Row.time), time_filter, DataGridFilterKnownTemplates.TimeFilter);
-         add_column(TimeAndSalesView.Columns.Price, DefaultColumnHeaders.Price, DefaultColumnWidths.Price, nameof(Row.price), price_filter, DataGridFilterKnownTemplates.DoubleMinMax, System.Windows.HorizontalAlignment.Right);
-         add_column(TimeAndSalesView.Columns.Size, DefaultColumnHeaders.Size, DefaultColumnWidths.Size, nameof(Row.size), size_filter, DataGridFilterKnownTemplates.UIntMinMax, System.Windows.HorizontalAlignment.Right);
-         add_column(TimeAndSalesView.Columns.Aggressor, DefaultColumnHeaders.Aggressor, DefaultColumnWidths.Aggressor, nameof(Row.aggressor_side), aggressor_filter, DataGridFilterKnownTemplates.EnumValues);
-         add_column(TimeAndSalesView.Columns.SecurityKey, DefaultColumnHeaders.SecurityKey, DefaultColumnWidths.SecurityKey, nameof(Row.security_key), security_key_filter, DataGridFilterKnownTemplates.Regex);
-         void add_column(TimeAndSalesView.Columns col_key, string header, double width, string sort_member_path, IDataGridColumnFilter filter, string filter_template, System.Windows.HorizontalAlignment h_alignment = System.Windows.HorizontalAlignment.Left) =>
-            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);
-         grid_settings_manager.load_from(settings_manager.current_settings());
-         _resources.AddRange(
-            show_ladder,
-            DataGridFilterHelper.hook_filters(
-               rows_view, time_filter, security_filter, price_filter, size_filter, aggressor_filter, security_key_filter),
-            settings_manager.subscribe_current().OnDispatcher().Subscribe(grid_settings_manager)
-          );
-         rows_view.set_sort_descriptions(startup_data.sorting_criterion, columns);
       }
 
-      public ObservableCollection<DIYGrid.ColumnBase> columns { get; } = new ObservableCollection<DIYGrid.ColumnBase>();
-      public DelegateCommandParamObserver<Row> show_ladder { get; }
-      public SimpleGridSettingsManager<Row> grid_settings_manager { get; }
-
-      public GridSettings get_grid_save_state() {
-         if (_settings_manager.instance_settings == null)
-            return null;
-         else
-            return grid_settings_manager.create();
+      public void on_new_trades(IReadOnlyList<TradeInfo> trades) {
+         /// The total row count is limited by <see cref="_max_row_count"/>;
+         /// trades are kept in a circular buffer (FIFO).
+         /// If paused, just need to add trades to <see cref="_buffered_trades"/>.
+         if (is_paused) {
+            if (_buffered_trades == null)
+               _buffered_trades = ImmutableList<TradeInfo>.Empty;
+            if (trades.Count >= _max_row_count) {
+               _buffered_trades = _buffered_trades
+                  .Clear()
+                  .AddRange(ReadOnlyListSubRangeWrapper.Create(trades, trades.Count - _max_row_count, _max_row_count));
+            } else {
+               int overflow_count = _buffered_trades.Count + trades.Count - _max_row_count;
+               if (overflow_count > 0) {
+                  var rows_to_remove = _buffered_trades.WrapSubRange(0, overflow_count);
+                  _buffered_trades = _buffered_trades.RemoveRange(0, overflow_count);
+               }
+               _buffered_trades = _buffered_trades.AddRange(trades);
+            }
+            return;
+         }
+         /// If not paused, update in the normal fasion:
+         /// add to <see cref="_all_rows"/> and <see cref="rows"/>
+         if (trades.Count >= _max_row_count) {
+            trades = ReadOnlyListSubRangeWrapper.Create(trades, trades.Count - _max_row_count, _max_row_count);
+            _all_rows = _all_rows.Clear();
+            rows.Clear();
+         } else {
+            int overflow_count = _all_rows.Count + trades.Count - _max_row_count;
+            if (overflow_count > 0) {
+               var rows_to_remove = _all_rows.WrapSubRange(0, overflow_count);
+               _all_rows = _all_rows.RemoveRange(0, overflow_count);
+               rows.RemoveSorted(rows_to_remove, _comparer);
+            }
+         }
+         var all_rows_bd = _all_rows.ToBuilder();
+         foreach (var t in trades) {
+            var r = _row_factory.create(t.security, t.trade, _get_display_qty_divisor);
+            all_rows_bd.Add(r);
+            if (_filter_backing == null || _filter_backing(r))
+               rows.InsertSorted(r, _comparer);
+         }
+         _all_rows = all_rows_bd.ToImmutable();
+         RaisePropertyChanged(nameof(total_row_count));
       }
 
-      public StartupData create() =>
-         new StartupData(_model.security_criteria, _get_filter_states(), get_grid_save_state(), rows_view.get_sorting_criteria(columns));
+      public void on_sorting(object sender, DIYGridSortingEventArgs e) {
+         try {
+            if (e.Column is ISortableDIYGridColumn sc) {
+               _log.info($"handling sort event for column {sc.id}.");
+               _sort_manager.OnColumnClick(sc, KeyboardExtensions.IsShiftDown());
+               var sorted_rows = rows.ToArray();
+               var snapshot = _selected_rows;
+               _refresh_sort_impl();
+            } else {
+               _log.warn($"ignoring sort event because column '{e.Column?.id}' does not implement {nameof(ISortableDIYGridColumn)}.");
+            }
+         } catch (Exception ex) {
+            _log.error($"error handling sort event: {ex}.");
+         }
+      }
 
-      private Brush _get_aggressor_brush(Row r) {
+      public void row_selection_changed(SelectionChangedEventArgs e) {
+         var bd = _selected_rows.ToBuilder();
+         if (e.AddedItems != null)
+            bd.AddRange(e.AddedItems.OfType<TimeAndSalesRowVM>());
+         if (e.RemovedItems != null)
+            bd.removeRange(e.RemovedItems.OfType<TimeAndSalesRowVM>());
+         _selected_rows = bd.ToImmutable();
+         _refresh_selected_rows.execute();
+      }
+
+      static IComparer<TimeAndSalesRowVM> _get_column_comparer(string column_name) =>
+         _get_column_comparer(EnumHelper.parse<TimeAndSalesView.Columns>(column_name));
+
+      static IComparer<TimeAndSalesRowVM> _get_column_comparer(TimeAndSalesView.Columns column) {
+         switch (column) {
+            case TimeAndSalesView.Columns.Aggressor: return wrap(r => r.aggressor_side);
+            case TimeAndSalesView.Columns.Time: return wrap(r => r.time);
+            case TimeAndSalesView.Columns.Security: return wrap(r => r.security);
+            case TimeAndSalesView.Columns.Price: return wrap(r => r.price);
+            case TimeAndSalesView.Columns.Size: return wrap(r => r.size);
+            case TimeAndSalesView.Columns.SecurityKey: return wrap(r => r.security_key);
+            case TimeAndSalesView.Columns.RowKey: return wrap(r => r.row_key);
+            default: throw ExceptionBuilder.Argument.unexpected_case(column, nameof(column));
+         }
+         IComparer<TimeAndSalesRowVM> wrap<T>(Func<TimeAndSalesRowVM, T> selector) =>
+            Comparer<T>.Default.wrap(selector);
+      }
+
+      Brush _get_aggressor_brush(TimeAndSalesRowVM r) {
          BTSColor c;
          Brush b;
          if (r.aggressor_side == AggressorSide.Buy) c = BTSColors.MarketData.bid;
@@ -90,14 +369,6 @@ namespace mbts.spark {
          return b;
       }
 
-      #region Filters
-      public IDataGridColumnPersistentFilter<Row, TimeFilterTuple> time_filter { get; } = new TimeFilterVM<Row>(r => r.time, nameof(Row.time));
-      public IDataGridColumnPersistentFilter<Row, string> security_filter { get; }
-      public IDataGridColumnPersistentFilter<Row, DoubleMinMaxState> price_filter { get; } = new DoubleMinMax<Row>(r => r.price, nameof(Row.price));
-      public IDataGridColumnPersistentFilter<Row, UIntMinMaxState> size_filter { get; } = new UIntMinMax<Row>(r => r.size, nameof(Row.size));
-      public IDataGridColumnPersistentFilter<Row, AggressorSide[]> aggressor_filter { get; } = DiscreteValuesFilterVM.Create<Row, AggressorSide>(EnumHelper.get_values<AggressorSide>().ToArray(), r => r.aggressor_side, nameof(Row.aggressor_side));
-      public IDataGridColumnPersistentFilter<Row, string> security_key_filter { get; } = new RegexFilterVM<Row>(r => r.security_key.ToString(), nameof(Row.security_key));
-
       FilterStates _get_filter_states() =>
          new FilterStates {
             time = time_filter.get_state(),
@@ -107,73 +378,35 @@ namespace mbts.spark {
             security_key = security_key_filter.get_state(),
             aggressor_sides = aggressor_filter.get_state()
          };
-      #endregion
 
-      protected override IEnumerable<SortingCriteria> get_default_sorting() {
-         yield return new SortingCriteria(nameof(Row.time), false);
+      void _refresh_sort_impl() {
+         _log.info($"begin change sort ({++_sort_change_count})...");
+         var timer = new Stopwatch();
+         timer.Start();
+         _comparer = _sort_manager.BuildComparer(_get_column_comparer, TimeAndSalesRowVM.key_comparer);
+         _sorting_criteria = ImmutableList.CreateRange(_sort_manager.SortingCriteria);
+         timer.Stop();
+         _log.info($"sort change ({_sort_change_count}) took {timer.ElapsedMilliseconds:0.00}ms.");
       }
 
-      protected override Row row_factory(TradeInfo row_model) =>
-         new Row(this, row_model.security, row_model.trade);
-
-
-      async Task _show_ladder_async(Row row) {
-         var smd_lookup = await SparkUtils.get_security_md_async(_bus, row.security.Id);
-         if (smd_lookup.success) _bus.post(SparkTags.ShowLadderTag, smd_lookup.result);
+      void _refresh_filter_impl() {
+         _log.info($"begin change filter ({++_filter_change_count})...");
+         var timer = new Stopwatch();
+         timer.Start();
+         _filter = _get_filter_states().build_predicate();
+         timer.Stop();
+         _log.info($"filter change ({_filter_change_count}) took {timer.ElapsedMilliseconds:0.00}ms.");
       }
 
-      public class Row : SecurityRow, DIYGrid.IRowVM {
-         readonly uint _trade_key;
+      class RowFactory {
+         // the row key must be unique to each row in the collection
+         int _row_id_counter;
 
-         readonly string
-            _security_text,
-            _time_text,
-            _price_text,
-            _size_text,
-            _aggressor_text,
-            _trade_key_text,
-            _security_key_text;
+         public TimeAndSalesRowVM create(TradeInfo trade_info, Func<SecurityImmutable?, uint> get_display_qty_divisor) =>
+            new TimeAndSalesRowVM(_row_id_counter++, trade_info.security, trade_info.trade, get_display_qty_divisor);
 
-         public Row(TimeAndSalesVM parent, SecurityImmutable security, TradeMessageImmutable trade) : base(security) {
-            _trade_key = trade.Key;
-            time = ((ulong)trade.Time).lldatetime().ToLocalTime();
-            price = trade.price();
-            size = trade.Size;
-            aggressor_side = trade.AggressorSide;
-            show_ladder = new DelegateCommand(() => parent._show_ladder_async(this).ignore());
-            _security_text = security.ToString();
-            _time_text = time.ToString("M/d h:mm:ss tt");
-            _price_text = security.ContractSpec.format(price);
-            _size_text = size.ToString();
-            _aggressor_text = aggressor_side.ToString();
-            _trade_key_text = _trade_key.ToString();
-            _security_key_text = security_key.ToString();
-         }
-
-         public event Action invalidated;
-
-         public uint trade_key => _trade_key;
-         public DateTime time { get; }
-         public double price { get; }
-         public uint size { get; }
-         public AggressorSide aggressor_side { get; }
-         public ICommand show_ladder { get; }
-
-         public string this[TimeAndSalesView.Columns col] {
-            get {
-               switch (col) {
-                  case TimeAndSalesView.Columns.Security: return _security_text;
-                  case TimeAndSalesView.Columns.Time: return _time_text;
-                  case TimeAndSalesView.Columns.Price: return _price_text;
-                  case TimeAndSalesView.Columns.Size: return _size_text;
-                  case TimeAndSalesView.Columns.Aggressor: return _aggressor_text;
-                  case TimeAndSalesView.Columns.SecurityKey: return _security_key_text;
-                  default: return null;
-               }
-            }
-         }
-
-         public void raise_invalidated() => invalidated?.Invoke();
+         public TimeAndSalesRowVM create(SecurityImmutable security, TradeMessageImmutable trade, Func<SecurityImmutable?, uint> get_display_qty_divisor) =>
+            new TimeAndSalesRowVM(_row_id_counter++, security, trade, get_display_qty_divisor);
       }
    }
-}
+}

src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesView.xaml

@@ -1,10 +1,10 @@
 <UserControl
-  x:Class="mbts.ui.spark.TimeAndSalesView"
+  x:Class="bts.shell.time_and_sales.TimeAndSalesView"
   x:ClassModifier="internal"
   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
   xmlns:c="clr-namespace:mbts.ui.controls"
-  xmlns:usp="clr-namespace:mbts.ui.spark"
+  xmlns:tas="clr-namespace:bts.shell.time_and_sales"
   FocusManager.IsFocusScope="True"
   Background="{StaticResource CommonBackground}"
 >
@@ -26,13 +26,14 @@
         x:Name="_grid"
         Grid.Row="0"
         Columns="{Binding columns}" 
-        Rows="{Binding rows_view}"
+        Rows="{Binding rows}"
         CurrentRow="{Binding current_row}"
         SelectionHighlight="{Binding grid_settings_manager.selection_highlight, Mode=OneWay}"
-        >
+      >
         <c:DIYGrid.InputBindings>
-          <MouseBinding MouseAction="LeftDoubleClick" Command="{x:Static c:DIYGrid.DefaultRowCommand}"/>
-          <KeyBinding Key="Return" Command="{x:Static c:DIYGrid.DefaultRowCommand}"/>
+          <MouseBinding MouseAction="LeftDoubleClick" Command="{Binding show_ladder_cmd}"/>
+          <KeyBinding Key="Return" Command="{Binding show_ladder_cmd}"/>
+          <KeyBinding Key="A" Modifiers="Ctrl" Command="{Binding select_all_cmd}"/>
         </c:DIYGrid.InputBindings>
         <c:DIYGrid.CommandBindings>
           <CommandBinding
@@ -43,13 +44,18 @@
         </c:DIYGrid.CommandBindings>
         <c:DIYGrid.RowTemplate>
           <DataTemplate>
-            <usp:TimeAndSalesRowView/>
+            <tas:TimeAndSalesRowView/>
           </DataTemplate>
         </c:DIYGrid.RowTemplate>
       </c:DIYGrid>
       <StatusBar Grid.Row="1" DockPanel.Dock="Bottom">
         <StatusBarItem HorizontalAlignment="Right">
-          <TextBlock Text=" "/>
+          <TextBlock>
+            <Run Text="Trades:"/>
+            <Run Text="{Binding rows.Count, Mode=OneWay}" />
+            <Run Text="of"/>
+            <Run Text="{Binding total_row_count, Mode=OneWay}" />
+          </TextBlock>
         </StatusBarItem>
       </StatusBar>      
     </Grid>

src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesView.xaml.cs

@@ -1,17 +1,21 @@
-using mbts.spark;
-using mbts.ui.controls;
+using mbts.ui.controls;
 using System.Windows.Controls;
 
-namespace mbts.ui.spark {
+namespace bts.shell.time_and_sales {
    /// <summary>
    /// Interaction logic for TimeAndSalesView.xaml
    /// </summary>
    partial class TimeAndSalesView : UserControl {
-      public enum Columns { Time, Security, Price, Size, OrderType, SecurityKey, Aggressor }
+      public enum Columns { Time, Security, Price, Size, SecurityKey, Aggressor, RowKey }
 
       public TimeAndSalesView() =>
          InitializeComponent();
    }
 
-   class TimeAndSalesRowView : DIYGrid.HighPerformanceRow<TimeAndSalesVM.Row, TimeAndSalesView.Columns> { }
-}
+   class TimeAndSalesRowView : DIYGrid.HighPerformanceRow<TimeAndSalesRowVM> { }
+
+   static class TimeAndSalesViewColumnsExtensions {
+      public static string col_id(this TimeAndSalesView.Columns column) =>
+         column.ToString();
+   }
+}

src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesWindow.cs

@@ -1,125 +1,228 @@
-using bts;
-using bts.api;
-using bts.shell;
+using bts.api;
 using bts.shell.fills;
 using bts.spark;
+using bts.view;
+using bts.utils.csv;
+using mbts;
 using mbts.co2;
 using mbts.persist;
+using mbts.spark;
 using mbts.ui;
 using mbts.ui.settings;
-using mbts.ui.shell;
 using mbts.ui.spark;
 using mbts.ui.utility;
 using mbts.utils;
 using System;
 using System.Collections.Generic;
+using System.Collections.Immutable;
 using System.Linq;
 using System.Reactive.Linq;
 using System.Windows;
 using System.Windows.Media;
-using static bts.shell.TimeAndSalesWindowFactory;
 
-namespace mbts.spark {
-   class TimeAndSalesWindow : SparkWindow<StartupData>, ISharedWindow {
+namespace bts.shell.time_and_sales {
+   class TimeAndSalesWindow : SparkWindow<TimeAndSalesSettings>, ISharedWindow {
       const string _window_type = "TimeAndSales", _window_type_display_name = "Time And Sales";
       readonly MDConsumer _consumer;
       readonly TimeAndSalesWindowFactory _factory;
       readonly IWindowSettingsManager<GridSettings> _settings_manager;
-      SingleValuePump<TimeAndSalesVM> _vm;
+      readonly bool _can_pause_updates;
+      readonly Func<SecurityImmutable?, uint> _get_display_qty_divisor;
+      TimeAndSalesVM _vm;
       TimeAndSalesModel _model;
-      StartupData _state;
+      SecurityCriteria _security_criteria_backing;
+      TimeAndSalesSettings _state;
       TimeAndSalesView _view;
       SparkCommand[] _commands;
+      SparkMenuDisplayVM _menu_display_vm;
       IDisposable _subscriptions;
 
-      public TimeAndSalesWindow(TimeAndSalesWindowFactory factory, IBus bus, MDConsumer consumer, StartupData state, ImageSource icon, IWindowSettingsManager<GridSettings> settings_manager)
+      public TimeAndSalesWindow(
+         TimeAndSalesWindowFactory factory,
+         IBus bus,
+         MDConsumer consumer,
+         TimeAndSalesSettings state,
+         ImageSource icon,
+         IWindowSettingsManager<GridSettings> settings_manager,
+         bool can_pause_updates,
+         Func<SecurityImmutable?, uint> get_display_qty_divisor)
          : base("Time And Sales", bus, factory, SparkCommands.ShowTimeAndSales.icon) {
          Log.assert(state != null);
          _consumer = consumer;
          _factory = factory;
-         _state = state;
+         _state = state ?? TimeAndSalesSettings.Default(new SecurityCriteria());
+         _get_display_qty_divisor = get_display_qty_divisor ?? new Func<SecurityImmutable?, uint>(sec => 1);
+         if (_state.security_criteria == null)
+            _state = _state.with(new SecurityCriteria());
+         _security_criteria_backing = _state.security_criteria;
          _settings_manager = settings_manager;
+         _can_pause_updates = can_pause_updates;
+         thread_id = mbts.config.Configuration.get<bts.config.MultiThreadedWindows>().time_and_sales ? _window_type : null;
          Icon.Freeze();
       }
 
+      event Action<SecurityCriteria> _security_criteria_changed;
+
       public override string window_type => _window_type;
       public override IEnumerable<SparkCommand> Commands => _commands;
       public override UIElement Content => _view;
-      public override double MinWidth => StartupData.DefaultGridSettings.columns.Sum(gcs => gcs.width)
+      public override double MinWidth => TimeAndSalesSettings.DefaultGridSettings.columns.Sum(gcs => gcs.width)
          + SPARK_MENU_COLLAPSED_WIDTH
          + LAUNCHER_BUTTON_BORDER_WIDTH
          + EXTRA_FOR_NO_HORIZONTAL_SCROLLBAR_WIDTH;
       public string thread_id { get; }
-      public override StartupData SaveState => _state = _vm.value.create();
+      public override TimeAndSalesSettings SaveState {
+         get {
+            _ensure_state(true);
+            return _state;
+         }
+      }
+
+      SecurityCriteria _security_criteria {
+         get => _security_criteria_backing;
+         set {
+            _security_criteria_backing = value;
+            _state = null;
+            _security_criteria_changed?.Invoke(value);
+         }
+      }
 
       public override void Dispose() =>
          _dispose_resources();
 
       public void thread_init() {
          _dispose_resources();
-         _vm = new SingleValuePump<TimeAndSalesVM>();
-         var connectable_builder = new ConnectableSeriesBuilder<TimeAndSalesVM>(_vm.observable);
+         _ensure_state();
+         if (!_state.use_defaults)
+            _settings_manager.instance_settings = _state.grid;
+         _menu_display_vm = new SparkMenuDisplayVM();
+         _menu_display_vm.load_from(_state.menu_display);
+         _vm = new TimeAndSalesVM(_settings_manager, _get_display_qty_divisor);
+         var selected_rows_src = Observable.Create<ImmutableHashSet<TimeAndSalesRowVM>>(o => {
+            _vm.selected_rows_changed += o.OnNext;
+            return Disposable.Create(() => _vm.selected_rows_changed -= o.OnNext);
+         });
+         var current_row_src = Observable.Create<TimeAndSalesRowVM>(o => {
+            if (_vm.current_row != null)
+               o.OnNext(_vm.current_row);
+            _vm.current_row_changed += o.OnNext;
+            return Disposable.Create(() => _vm.current_row_changed -= o.OnNext);
+         });
+         var current_sec_key_src = current_row_src.Select(r => {
+            var result = ImmutableHashSet<uint>.Empty;
+            if (r != null)
+               result = result.Add(r.security_key);
+            return result;
+         });
          var update_securities_cmd = SparkCommands.change_securities_callback(_window_type_display_name);
-         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();
+         var security_criteria_changed = new Action<SecurityCriteria>(sc => { });
+         SparkCommand toggle_is_paused_cmd = null;
+         toggle_is_paused_cmd = new SparkCommandCommand(get_is_paused_cmd_title(), Icons.Pause, new DelegateCommand(() => {
+            _vm.is_paused = !_vm.is_paused;
+            toggle_is_paused_cmd.title = get_is_paused_cmd_title();
+         })) {
+            show_in_toolbar = _can_pause_updates,
+            show_in_context_menu = _can_pause_updates
+         };
          _commands = new SparkCommand[] {
-            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),
-            SparkCommands.ShowMarketView.complete(selected_secs_source, always_true, secs => secs.Count > 0 ? new SecurityCriteria(secs) : _state.security_criteria),
-            SparkCommands.change_securities_command(() => (update_securities_cmd, _state.security_criteria)),
+            // csv export
+            new SparkCommandCommand("Export to csv", Icons.Export, FileDialogCommand.export_csv(() => _vm.rows.ToCsv(TimeAndSalesRowVM.csv_ordered_properties), "TaS")),
+            // ladder
+            SparkCommands.ShowLadderAutoLookup(SparkCommands.KeyGestures.ShowLadder)
+               .complete(current_sec_key_src, sec_keys => sec_keys.Count > 0),
+            // ticket
+            SparkCommands.ShowOrderTicketAutoLookup(SparkCommands.KeyGestures.ShowOrderTicket)
+               .complete(current_sec_key_src, sec_keys => sec_keys.Count > 0),
+            // fills
+            SparkCommands.ShowFills(SparkCommands.KeyGestures.ShowFills)
+               .complete(selected_rows_src, always_true, get_fills_startup_data),
+            // mview
+            SparkCommands.ShowMarketView
+               .complete(selected_rows_src, always_true, rows => rows.Count > 0 ? SecurityCriteria.from_securities(rows.Select(r => r.security)) : _security_criteria),
+            // pause
+            toggle_is_paused_cmd,
+            // change securities
+            SparkCommands.change_securities_command(() => (update_securities_cmd, _security_criteria)),
             // 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>(
                   _settings_manager,
                   s => s.time_and_sales_grid,
                   UserSettings.FileExtensions.GRID,
-                  s => _vm.value.grid_settings_manager.create_vm(
+                  s => _vm.grid_settings_manager.create_vm(
                      // we need to get the most up to date GridSettings when launching b/c users may
                      // have changed some settings on the grid directly, like column widths.
-                     s.with(_vm.value.columns.Select(c => c.create()))
+                     s.with(_vm.columns.Select(c => c.create()))
                   )
                );
                vm.SubscribeDisposed(literal_title_source.OnDispatcher().Subscribe(t => vm.title = t));
                var dialog = new ShellSettingsDialog { DataContext = vm };
                vm.RequestClose += (s, e) => WindowUtilities.force_close(dialog);
                return dialog;
-            }))
+            })),
+            _menu_display_vm.spark_cmd
          };
-         _subscriptions = Disposable.Create(
-            _bus.subscribe(update_securities_cmd.tag).OnDispatcher().Subscribe(update_criteria),
-            connectable_builder.connect_all());
-         _initialize();
-
+         _vm.load(_state.filters, _state.sorting_criterion, _state.grid);
+         _vm.request_show_ladder += show_ladder;
+         var security_criteria_src = _bus.subscribe(update_securities_cmd.tag);
+         var subs = new List<IDisposable> {
+            security_criteria_src.Subscribe(sc => _security_criteria = sc),
+            Disposable.Create(() => _vm.request_show_ladder -= show_ladder)
+         };
+         _model = new TimeAndSalesModel(_bus, _consumer, Observable.Create<SecurityCriteria>(o => {
+            o.OnNext(_security_criteria);
+            return security_criteria_src.Subscribe(o);
+         }));
+         subs.Add(_model.trades.OnDispatcher().Subscribe(_vm.on_new_trades));
+         _subscriptions = Disposable.Create(subs.ToArray());
+         if (_view == null)
+            _view = new TimeAndSalesView();
+         _view.DataContext = _vm;
+         // local methods
          bool always_true<T>(T _) => true;
-         FillsSettings get_fills_startup_data(IReadOnlyList<SecurityImmutable> secs) =>
+
+         FillsSettings get_fills_startup_data(ImmutableHashSet<TimeAndSalesRowVM> rows) =>
             new FillsSettings(new FillsFilterStates {
-               security = secs.Count > 0 ? new SecurityCriteria(secs) : _state.security_criteria
+               security = rows.Count > 0 ? SecurityCriteria.from_securities(rows.Select(r => r.security)) : _security_criteria
             });
-         void update_criteria(SecurityCriteria c) {
-            _state = _vm.value.create().with(c);
-            _initialize();
+
+         string get_is_paused_cmd_title() =>
+            $"{(_vm.is_paused ? "Resume" : "Pause")} Updates";
+
+         void show_ladder(TimeAndSalesRowVM row) {
+            if (row != null)
+               _bus.post(SparkTags.ShowLadderAutoLookupTag, ImmutableHashSet.Create(new[] { row.security_key }));
          }
       }
 
+      protected override void OnParentViewCreated(SparkWindowView parent_view) =>
+         _menu_display_vm.safe_bind_to_view(parent_view);
+
       void _dispose_resources() {
          Disposable.dispose(ref _subscriptions);
-         Disposable.dispose(ref _vm);
-         Disposable.dispose(ref _model);
          if (_commands != null) {
             _commands.OfType<IDisposable>().DisposeAll();
             _commands = null;
          }
+         Disposable.dispose(ref _model);
+         Disposable.dispose(ref _vm);
       }
 
-      void _initialize() {
-         Disposable.dispose(ref _model);
-         _model = new TimeAndSalesModel(_bus, _consumer, _state.security_criteria);
-         // the previous _vm.value is automatically disposed when _vm.value is set - no need to dispose it here
-         _vm.value = new TimeAndSalesVM(_bus, _settings_manager, _model, _state);
-         if (_view == null)
-            _view = new TimeAndSalesView();
-         _view.DataContext = _vm.value;
+      void _ensure_state(bool force_recreate = false) {
+         if (_state == null || force_recreate) {
+            if (_vm == null) {
+               _state = TimeAndSalesSettings.Default(_security_criteria);
+            } else {
+               var (filters, sorting, grid) = _vm.create();
+               _state = new TimeAndSalesSettings(_security_criteria, filters, grid, sorting.ToList()) {
+                  use_defaults = _settings_manager.instance_settings == null
+               };
+            }
+            // should be safe to assume _menu_display_vm and _vm will either both be null, or both be non null,
+            // but redundant null checks don't hurt, and just may prevent a crash.
+            if (_menu_display_vm != null)
+               _state.menu_display = _menu_display_vm.safe_create();
+         }
       }
    }
-}
+}

src/client/spark/Modules/Market/TimeAndSalesWindowFactory.cs

@@ -1,33 +1,35 @@
 using bts.api;
 using bts.spark;
+using bts.shell.time_and_sales;
 using mbts;
 using mbts.co2;
 using mbts.persist;
 using mbts.spark;
-using mbts.spark.filters;
 using mbts.ui;
 using mbts.ui.settings;
-using ProtoBuf;
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Reactive.Linq;
 using System.Threading.Tasks;
-using static mbts.ui.controls.DIYGrid;
-using static mbts.ui.spark.TimeAndSalesView;
+using Columns = bts.shell.time_and_sales.TimeAndSalesView.Columns;
+using mbts.config;
 
 namespace bts.shell {
-   class TimeAndSalesWindowFactory : ShellWindowFactory<TimeAndSalesWindowFactory.StartupData> {
+   class TimeAndSalesWindowFactory : ShellWindowFactory<TimeAndSalesSettings> {
       readonly IBus _bus;
       readonly MDConsumer _consumer;
       readonly UserSettingsHub _settings_hub;
+      readonly TimeAndSalesConfig _time_and_sales_conf;
+      readonly ISecurityAuxiliaryDataModel _security_auxiliary_model;
       IReadOnlyDictionary<uint, SecurityMD> _securities = new Dictionary<uint, SecurityMD>();
 
-      public TimeAndSalesWindowFactory(IShellModule module, IBus bus, MDConsumer consumer, UserSettingsHub settings_hub) : base(module, "TimeAndSales") {
+      public TimeAndSalesWindowFactory(IShellModule module, IBus bus, MDConsumer consumer, UserSettingsHub settings_hub, ISecurityAuxiliaryDataModel security_auxiliary_model)
+         : base(module, "TimeAndSales") {
          _bus = bus;
          _consumer = consumer;
          _settings_hub = settings_hub;
-
+         _security_auxiliary_model = security_auxiliary_model;
+         _time_and_sales_conf = new TimeAndSalesConfig(Configuration.get<bts.config.TimeAndSalesOptions>());
          _dispose = Disposable.Create(
             bus.subscribe(SparkTags.SecuritiesTag).Subscribe(s => _securities = s),
             bus.subscribe(SparkTags.ShowTimeAndSalesTag).OnDispatcher().Subscribe(show)
@@ -36,91 +38,22 @@ namespace bts.shell {
 
       public static string col_id(Columns col) => col.ToString();
 
-      public override Task<IShellWindow> load(StartupData state) =>
+      public override Task<IShellWindow> load(TimeAndSalesSettings state) =>
          Task.FromResult<IShellWindow>(new TimeAndSalesWindow(this, _bus, _consumer, state, SparkCommands.PickTimeAndSales.icon,
-            new WindowSettingsManager<GridSettings>(_settings_hub, state.grid, s => s.time_and_sales_grid, (s, g) => s.with(time_and_sales:g))));
+            new WindowSettingsManager<GridSettings>(_settings_hub, state.grid, s => s.time_and_sales_grid, (s, g) => s.with(time_and_sales:g)),
+            _time_and_sales_conf.can_pause_updates,
+            _security_auxiliary_model.get_display_quantity_divisor));
 
       public async void show(SecurityCriteria criteria) {
-         var w = await load(new StartupData(criteria));
+         var w = await load(new TimeAndSalesSettings(criteria));
          _bus.post(SparkTags.ShowWindow, w);
       }
 
-      [ProtoContract]
-      public class StartupData {
-         [ProtoMember(1)]
-         public readonly SecurityCriteria security_criteria;
-         [ProtoMember(2)]
-         List<SortingCriteria> _sorting_criterion;
-         [ProtoMember(3)]
-         public FilterStates filters;
-         [ProtoMember(4)]
-         public GridSettings grid;
+      readonly struct TimeAndSalesConfig {
+         public readonly bool can_pause_updates;
 
-         public StartupData() { }
-
-         public StartupData(SecurityCriteria security_criteria) :
-            this(security_criteria, new FilterStates(), null, null) { }
-
-         public StartupData(SecurityCriteria security_criteria, FilterStates filters, GridSettings grid = default, List<SortingCriteria> sorting_criterion = null) {
-            this.security_criteria = security_criteria;
-            this.filters = filters;
-            this.grid = grid;
-            _sorting_criterion = sorting_criterion;
-         }
-
-         public static GridSettings DefaultGridSettings => GridSettings.Default.with(DefaultColumns.all, DefaultColumns.default_sorting_criterion);
-
-         public List<SortingCriteria> sorting_criterion => _sorting_criterion ?? (_sorting_criterion = DefaultColumns.default_sorting_criterion.ToList());
-
-         public static StartupData Default(SecurityCriteria security_criteria) =>
-           new StartupData(security_criteria, new FilterStates(), null, DefaultColumns.default_sorting_criterion.ToList());
-
-         public StartupData with(SecurityCriteria security_criteria) =>
-            new StartupData(security_criteria, filters, grid);
-
-         public static class DefaultColumns {
-            public static GridColumnSettings security => new GridColumnSettings(col_id(Columns.Security), DefaultColumnHeaders.Security, width: DefaultColumnWidths.Security);
-            public static GridColumnSettings time => new GridColumnSettings(col_id(Columns.Time), DefaultColumnHeaders.Time, width: DefaultColumnWidths.Time);
-            public static GridColumnSettings price => new GridColumnSettings(col_id(Columns.Price), DefaultColumnHeaders.Price, width: DefaultColumnWidths.Price, horizontal_alignment: System.Windows.HorizontalAlignment.Right);
-            public static GridColumnSettings size => new GridColumnSettings(col_id(Columns.Size), DefaultColumnHeaders.Size, width: DefaultColumnWidths.Size, horizontal_alignment: System.Windows.HorizontalAlignment.Right);
-            public static GridColumnSettings aggressor => new GridColumnSettings(col_id(Columns.Aggressor), DefaultColumnHeaders.Aggressor, width: DefaultColumnWidths.Aggressor);
-            public static GridColumnSettings security_key => new GridColumnSettings(col_id(Columns.SecurityKey), DefaultColumnHeaders.SecurityKey, is_visible:false, width: DefaultColumnWidths.SecurityKey);
-
-            public static IEnumerable<SortingCriteria> default_sorting_criterion {
-               get {
-                  yield return new SortingCriteria(time.id, false);
-               }
-            }
-
-            public static IEnumerable<GridColumnSettings> all {
-               get {
-                  yield return security;
-                  yield return time;
-                  yield return price;
-                  yield return size;
-                  yield return aggressor;
-                  yield return security_key;
-               }
-            }
-         }
-      }
-
-      [ProtoContract]
-      public class FilterStates {
-         [ProtoMember(1)]
-         public TimeFilterTuple time;
-         [ProtoMember(2)]
-         public string security;
-         [ProtoMember(3)]
-         public DoubleMinMaxState price;
-         [ProtoMember(4)]
-         public UIntMinMaxState size;
-         // [ProtoMember(5)]
-         // ProtoMember 5 cannot be used further
-         [ProtoMember(6)]
-         public string security_key;
-         [ProtoMember(7)]
-         public co2.AggressorSide[] aggressor_sides;
+         public TimeAndSalesConfig(bts.config.TimeAndSalesOptions options) =>
+            can_pause_updates = options.can_pause_updates;
       }
    }
-}
+}

src/client/spark/Modules/Spreader/ExecutionStrategyEditor.xaml

@@ -549,24 +549,48 @@
               </u:BindingUpdateGroupCollection>
             </u:Behavior.BindingUpdateGroups>
           </TextBox>
-          <TextBlock
+          <StackPanel
             x:Name="PART_TickFactors_Label"
             Grid.Column="2"
-            VerticalAlignment="Center"
-            Margin="{StaticResource Margin.LHeaderPanelItem}"
-            Text="Ticks"
             IsEnabled="True"
+            Orientation="Horizontal"
             Visibility="{Binding LegTuples.Count, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource IntNotZeroVisibilityConverter}}"
-          />
-          <c:TickFactorsPicker
+           >
+            <TextBlock
+              VerticalAlignment="Center"
+              Margin="{StaticResource Margin.LHeaderPanelItem}"
+              Text="Ticks ("
+            />
+            <CheckBox
+              Margin="1,0,0,0"
+              IsChecked="{Binding UseFractionalTicks, RelativeSource={RelativeSource TemplatedParent}}"
+              VerticalAlignment="Center"
+              VerticalContentAlignment="Center"
+              Padding="0"
+            >
+              fractional
+            </CheckBox>
+            <TextBlock VerticalAlignment="Center" Margin="1,0,0,0">)</TextBlock>
+          </StackPanel>
+          <Grid
             x:Name="PART_TickFactors_Picker"
             Grid.Column="3"
-            Margin="{StaticResource Margin.LHeaderPanelItem}"
-            HorizontalAlignment="Stretch"
             IsEnabled="True"
-            SelectedTickFactors="{Binding TickFactors, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
+            Margin="{StaticResource Margin.LHeaderPanelItem}"
             Visibility="{Binding LegTuples.Count, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource IntNotZeroVisibilityConverter}}"
-          />
+          >
+            <c:TickFactorsPicker
+              HorizontalAlignment="Stretch"
+              SelectedTickFactors="{Binding TickFactors, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
+              Visibility="{Binding UseFractionalTicks, RelativeSource={RelativeSource TemplatedParent}, Converter={x:Static cv:BooleanToVisibilityConverter.HiddenInstance}}"
+            />
+            <c:TickUpDownInt
+              HorizontalAlignment="Stretch"
+              Minimum="1"
+              Value="{Binding IntegerTickSize, RelativeSource={RelativeSource TemplatedParent}}"
+              Visibility="{Binding UseFractionalTicks, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource FalseVisibilityConverter}}"
+            />
+          </Grid>
           <TextBlock
             x:Name="PART_Pricing_Label"
             Grid.Column="4"

src/client/spark/Modules/Spreader/ExecutionStrategyEditor.xaml.cs

@@ -52,6 +52,26 @@ namespace mbts.ui.spark {
       public TickFactors TickFactors { get => GetValue(TickFactorsProperty) as TickFactors; set => SetValue(TickFactorsProperty, value); }
       #endregion
 
+      #region UseFractionalTicks
+      public static readonly DependencyProperty UseFractionalTicksProperty = WPFHelper.create_dp<bool, ExecutionStrategyEditor>(
+         nameof(UseFractionalTicks), FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, true);
+
+      public bool UseFractionalTicks {
+         get => (bool)GetValue(UseFractionalTicksProperty);
+         set => SetValue(UseFractionalTicksProperty, value);
+      }
+      #endregion
+
+      #region IntegerTickSize
+      public static readonly DependencyProperty IntegerTickSizeProperty = WPFHelper.create_dp<int, ExecutionStrategyEditor>(
+         nameof(IntegerTickSize), FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, 1);
+
+      public int IntegerTickSize {
+         get => (int)GetValue(IntegerTickSizeProperty);
+         set => SetValue(IntegerTickSizeProperty, value);
+      }
+      #endregion
+
       #region IsNew
       public static readonly DependencyProperty IsNewProperty =
          DependencyProperty.Register(

src/client/spark/Modules/Spreader/ShowSyntheticEditorHandler.cs

@@ -46,7 +46,7 @@ namespace bts.shell {
 
       async void _show_synthetic_create(SecurityCriteria security_criteria) {
          var found_securities = await security_criteria.securities(_bus);
-         var respect_clause_security_ordering_is_possible = security_criteria.clauses.Any(clause => clause.security_keys != null && clause.security_keys.Count > 0);
+         var respect_clause_security_ordering_is_possible = security_criteria.clauses.Any(clause => clause.security_keys != null && clause.security_keys.Length > 0);
          if (!respect_clause_security_ordering_is_possible) {
             _show_synthetic_create(found_securities.Values.ToList());
          } else {

src/client/spark/Modules/Spreader/SyntheticDataHelper.cs

@@ -114,6 +114,8 @@ namespace bts.shell {
          public static QuoteInsideMarketDistanceWithTravel QuoteInsideMarketDistanceWithTravel => new QuoteInsideMarketDistanceWithTravel { Priority = RulePriority };
          public static QuoteInsideMarketDistance QuoteInsideMarketDistance => new QuoteInsideMarketDistance { Priority = RulePriority };
          public static QuoteInsideMarketDistanceThrottle QuoteInsideMarketDistanceThrottle => new QuoteInsideMarketDistanceThrottle();
+
+         public static QuoteTimeBasedThrottle QuoteTimeBasedThrottle => new QuoteTimeBasedThrottle { DelayToImprove = 0, DelayToRun = 0 };
          #endregion
 
          #region PreHedge

src/client/spark/Modules/Spreader/SyntheticEditorView.xaml

@@ -36,6 +36,8 @@
       ContractPickerModel="{Binding contract_picker_model}"
       HedgePricing="{Binding hedge_pricing}"
       HedgePricingItemsSource="{Binding hedge_pricing_options}"
+      UseFractionalTicks="{Binding use_fractional_ticks}"
+      IntegerTickSize="{Binding integer_tick_size}"
     />
     <c:DialogSkirtOKCancel Grid.Row="1" OKCommand="{Binding commit}" CloseOnOK="False"/>
   </Grid>

src/client/spark/Modules/Spreader/SyntheticManagementView.xaml.cs

@@ -20,5 +20,5 @@ namespace mbts.ui.spark {
          InitializeComponent();
    }
 
-   class SyntheticManagementRowView : DIYGrid.HighPerformanceRow<SyntheticManagementDialogVM.Row, SyntheticManagementView.Columns> { }
+   class SyntheticManagementRowView : DIYGrid.HighPerformanceRow<SyntheticManagementDialogVM.Row> { }
 }

src/client/spark/Modules/Spreader/SyntheticManagementWindow.cs

@@ -3,6 +3,7 @@ using bts.api;
 using bts.shell;
 using bts.shell.spreader;
 using bts.spark;
+using bts.view;
 using mbts.persist;
 using mbts.ui;
 using mbts.ui.settings;
@@ -27,6 +28,7 @@ namespace mbts.spark {
       StartupData _state;
       OrdersModel _orders_model;
       SyntheticManagementView _view;
+      SparkMenuDisplayVM _menu_display_vm;
       IDisposable _subscriptions;
       IReadOnlyList<SparkCommand> _commands;
       readonly IWindowSettingsManager<GridSettings> _settings_manager;
@@ -43,7 +45,7 @@ namespace mbts.spark {
       public override string window_type => _window_type;
       public override UIElement Content => _view;
       public override IEnumerable<SparkCommand> Commands => _commands;
-      public override StartupData SaveState => _state = _vm.value.create();
+      public override StartupData SaveState => _state = _vm.value.create().with(menu_display: _menu_display_vm.safe_create());
       public override double MinWidth => 
          StartupData.DefaultGridSettings.columns.Sum(gcs => gcs.width)
          + SPARK_MENU_COLLAPSED_WIDTH
@@ -53,6 +55,8 @@ namespace mbts.spark {
 
       public void thread_init() {
          Log.notnull(_state);
+         _menu_display_vm = new SparkMenuDisplayVM();
+         _menu_display_vm.load_from(_state.menu_display);
 
          var vm_connectable_builder = new ConnectableSeriesBuilder<SyntheticManagementDialogVM>(_vm.observable);
          var current_row_source = vm_connectable_builder.create(vm => vm.current_row_observable);
@@ -75,7 +79,7 @@ namespace mbts.spark {
             ), SparkCommands.ShowOrders.complete(() => {
                var ob_settings = bts.shell.orderbook.OrderBookStartupData.Default;
                ob_settings.filters = new bts.shell.orderbook.FilterStates {
-                  security_criteria = new SecurityCriteria(_vm.value.row_vms.Select(r => r.security))
+                  security_criteria = SecurityCriteria.from_securities(_vm.value.row_vms.Select(r => r.security))
                };
                return ob_settings;
             }), SparkCommands.window_settings_command(new DialogCommand(() => {
@@ -97,7 +101,8 @@ namespace mbts.spark {
             new SparkCommandCommand(
                "Import Synthetics...", Icons.Import, FileDialogCommand.open_file(import, extensions: SyntheticSecurityParser.file_extension)) {
                show_in_toolbar = false
-            }
+            },
+            _menu_display_vm.spark_cmd
          };
 
          _subscriptions = Disposable.Create(
@@ -129,6 +134,9 @@ namespace mbts.spark {
          Commands.OfType<IDisposable>().DisposeAll();
       }
 
+      protected override void OnParentViewCreated(SparkWindowView parent_view) =>
+         _menu_display_vm.safe_bind_to_view(parent_view);
+
       struct RowModificationParams {
          public readonly SecurityImmutable security;
          public readonly bool has_working_orders;

src/client/spark/Modules/Spreader/SyntheticManagementWindowFactory.cs

@@ -48,14 +48,28 @@ namespace bts.shell {
          public readonly FilterStates filters;
          [ProtoMember(3)]
          public readonly GridSettings grid;
+         [ProtoMember(4)]
+         public readonly SparkMenuDisplaySettings menu_display;
 
          public StartupData() : this(new List<SortingCriteria>(), null, null) { }
-         public StartupData(List<SortingCriteria> sorting_criteria, FilterStates filters, GridSettings grid = default) {
+
+         public StartupData(List<SortingCriteria> sorting_criteria, FilterStates filters, GridSettings grid = default)
+            : this(sorting_criteria, filters, grid, SparkMenuDisplaySettings.Default) { }
+
+         public StartupData(List<SortingCriteria> sorting_criteria, FilterStates filters, GridSettings grid, SparkMenuDisplaySettings menu_display) {
             this.sorting_criteria = sorting_criteria;
             this.filters = filters;
             this.grid = grid;
+            this.menu_display = menu_display;
          }
 
+         public StartupData with(List<SortingCriteria> sorting_criteria = null, FilterStates filters = null, GridSettings grid = null, SparkMenuDisplaySettings? menu_display = null) =>
+            new StartupData(
+               sorting_criteria ?? this.sorting_criteria,
+               filters ?? this.filters,
+               grid ?? this.grid,
+               menu_display ?? this.menu_display);
+
          public static GridSettings DefaultGridSettings => GridSettings.Default.with(DefaultColumns.all, DefaultColumns.default_sorting_criterion);
 
          static class DefaultColumns {

src/client/spark/Modules/Spreader/VM/ParameterRows/Leg/EnableHedgeModel.cs

@@ -10,13 +10,13 @@ namespace mbts.spark {
          public override string man_page { get; } = string.Empty;
 
          public override bool get_value(LegSpreaderParamsTuple leg_tup) =>
-            leg_tup.leg_params.EnableHedging;
+            leg_tup.leg_params.SendHedge is null || leg_tup.leg_params.SendHedge.Val;
 
-         public override void set_value(LegSpreaderParamsTuple leg_tup, bool value) =>
-            leg_tup.leg_params.EnableHedging = value;
-
-         public override bool has_errors(IReadOnlyCollection<LegSpreaderParamsTuple> leg_tups) =>
-            !leg_tups.Any(lt => lt.leg_params.EnableHedging);
+         public override void set_value(LegSpreaderParamsTuple leg_tup, bool value) {
+            if (leg_tup.leg_params.SendHedge is null)
+               leg_tup.leg_params.SendHedge = new bts.spark.NullableBoolean();
+            leg_tup.leg_params.SendHedge.Val = value;
+         }
       }
    }
-}
+}

src/client/spark/Modules/Spreader/VM/ParameterRows/Leg/LeanOffsetTicksModel.cs

@@ -0,0 +1,21 @@
+using mbts.ui.spark;
+using System;
+
+namespace mbts.spark {
+   partial class SyntheticEditorVM {
+      class LeanOffsetTicksModel : RowModelBase<int> {
+         public override string display_name { get; } = "Lean Offset Ticks";
+         public override string help_text { get; } = "Improvement (in ticks) to the lean market";
+         public override string man_page { get; } = string.Empty;
+
+         public override int get_value(LegSpreaderParamsTuple leg_tup) =>
+            leg_tup.leg_params.QuoteParams?.LeanOffsetTicks ?? 0;
+
+         public override void set_value(LegSpreaderParamsTuple leg_tup, int value) {
+            if (leg_tup.leg_params.QuoteParams is null)
+               leg_tup.leg_params.QuoteParams = new bts.spark.QuoteParams();
+            leg_tup.leg_params.QuoteParams.LeanOffsetTicks = value;
+         }
+      }
+   }
+}

src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/TimeThrottle/QuoteTimeThrottleDelayToImproveModel.cs

@@ -0,0 +1,40 @@
+using bts.shell;
+using bts.spark;
+using mbts.ui.spark;
+using System.Collections.Generic;
+
+namespace mbts.spark {
+   partial class SyntheticEditorVM {
+      class QuoteTimeThrottleDelayToImproveModel : RowModelBase<uint> {
+         readonly IDictionary<int, uint> _value_store = new Dictionary<int, uint>();
+
+         public override string display_name { get; } = "Delay to Improve (ms)";
+         public override string help_text { get; } = string.Empty;
+         public override string man_page { get; } = string.Empty;
+         public override ParameterSection[] section_path { get; } = new[] { Sections.Quote, Subsections.TimeThrottle };
+
+         public void apply_value(LegSpreaderParamsTuple leg_tup) =>
+            _get_throttle(leg_tup).DelayToImprove = _value_from_store(leg_tup);
+
+         public override uint get_value(LegSpreaderParamsTuple leg_tup) =>
+            _get_throttle(leg_tup) is QuoteTimeBasedThrottle throttle ?
+               throttle.DelayToImprove :
+               _value_from_store(leg_tup);
+
+         public override void set_value(LegSpreaderParamsTuple leg_tup, uint value) {
+            _value_store[leg_tup.id] = value;
+            if (_get_throttle(leg_tup) is QuoteTimeBasedThrottle throttle)
+               throttle.DelayToImprove = value;
+         }
+
+         protected override bool _get_enabled(LegSpreaderParamsTuple leg_tup) =>
+            _get_throttle(leg_tup) != null;
+
+         QuoteTimeBasedThrottle _get_throttle(LegSpreaderParamsTuple leg_tup) =>
+            leg_tup.leg_params.QuoteParams.TimeBasedThrottle;
+
+         uint _value_from_store(LegSpreaderParamsTuple leg_tup) =>
+            _value_store.GetValueOrDefault(leg_tup.id, _ => SyntheticDataHelper.Defaults.QuoteTimeBasedThrottle.DelayToImprove);
+      }
+   }
+}

src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/TimeThrottle/QuoteTimeThrottleDelayToRunModel.cs

@@ -0,0 +1,40 @@
+using bts.shell;
+using bts.spark;
+using mbts.ui.spark;
+using System.Collections.Generic;
+
+namespace mbts.spark {
+   partial class SyntheticEditorVM {
+      class QuoteTimeThrottleDelayToRunModel : RowModelBase<uint> {
+         readonly IDictionary<int, uint> _value_store = new Dictionary<int, uint>();
+
+         public override string display_name { get; } = "Delay To Run (ms)";
+         public override string help_text { get; } = string.Empty;
+         public override string man_page { get; } = string.Empty;
+         public override ParameterSection[] section_path { get; } = new[] { Sections.Quote, Subsections.TimeThrottle };
+
+         public void apply_value(LegSpreaderParamsTuple leg_tup) =>
+            _get_throttle(leg_tup).DelayToRun = _value_from_store(leg_tup);
+
+         public override uint get_value(LegSpreaderParamsTuple leg_tup) =>
+            _get_throttle(leg_tup) is QuoteTimeBasedThrottle throttle ?
+               throttle.DelayToRun :
+               _value_from_store(leg_tup);
+
+         public override void set_value(LegSpreaderParamsTuple leg_tup, uint value) {
+            _value_store[leg_tup.id] = value;
+            if (_get_throttle(leg_tup) is QuoteTimeBasedThrottle throttle)
+               throttle.DelayToRun = value;
+         }
+
+         protected override bool _get_enabled(LegSpreaderParamsTuple leg_tup) =>
+            _get_throttle(leg_tup) != null;
+
+         QuoteTimeBasedThrottle _get_throttle(LegSpreaderParamsTuple leg_tup) =>
+            leg_tup.leg_params.QuoteParams.TimeBasedThrottle;
+
+         uint _value_from_store(LegSpreaderParamsTuple leg_tup) =>
+            _value_store.GetValueOrDefault(leg_tup.id, _ => SyntheticDataHelper.Defaults.QuoteTimeBasedThrottle.DelayToRun);
+      }
+   }
+}

src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/TimeThrottle/QuoteTimeThrottleEnabledModel.cs

@@ -0,0 +1,38 @@
+using bts.shell;
+using mbts.ui.spark;
+
+namespace mbts.spark {
+   partial class SyntheticEditorVM {
+      class QuoteTimeThrottleEnabledModel : RowModelBase<bool> {
+         readonly QuoteTimeThrottleDelayToRunModel _delay_to_run;
+         readonly QuoteTimeThrottleDelayToImproveModel _delay_to_improve;
+
+         public QuoteTimeThrottleEnabledModel(QuoteTimeThrottleDelayToRunModel delay_to_run, QuoteTimeThrottleDelayToImproveModel delay_to_improve) {
+            _delay_to_run = delay_to_run;
+            _delay_to_improve = delay_to_improve;
+         }
+
+         public override string display_name { get; } = string.Empty;
+         public override string help_text { get; } = string.Empty;
+         public override string man_page { get; } = string.Empty;
+         public override ParameterSection[] section_path { get; } = new[] { Sections.Quote, Subsections.TimeThrottle };
+
+         public override bool get_value(LegSpreaderParamsTuple leg_tup) =>
+            leg_tup.leg_params.QuoteParams.TimeBasedThrottle != null;
+
+         public override void set_value(LegSpreaderParamsTuple leg_tup, bool value) {
+            if (value) {
+               if (leg_tup.leg_params.QuoteParams.TimeBasedThrottle == null) {
+                  leg_tup.leg_params.QuoteParams.TimeBasedThrottle = SyntheticDataHelper.Defaults.QuoteTimeBasedThrottle;
+                  _delay_to_run.apply_value(leg_tup);
+                  _delay_to_improve.apply_value(leg_tup);
+               }
+            } else {
+               leg_tup.leg_params.QuoteParams.TimeBasedThrottle = null;
+            }
+            _delay_to_run.set_enabled(leg_tup, value);
+            _delay_to_improve.set_enabled(leg_tup, value);
+         }
+      }
+   }
+}

src/client/spark/Modules/Spreader/VM/ParameterRows/RowModel.cs

@@ -108,6 +108,10 @@ namespace mbts.spark {
                "Reduces re-quoting updates by defining a region on either side " +
                "of the working quoting order, inside which quote updates will not be sent.");
 
+         public static ParameterSection TimeThrottle =>
+            new ParameterSection("Time Throttle", true,
+               "Reduces re-quoting updates by requiring a minimum amount of time to elapse between quotes.");
+
          public static ParameterSection Conditional =>
             new ParameterSection("Conditional", true,
                "Reduces re-quoting updates by only quoting if N ticks away from the opposite " + 

src/client/spark/Modules/Spreader/VM/SyntheticEditorVM.cs

@@ -2,7 +2,6 @@
 using bts.collections;
 using bts.shell;
 using bts.spark;
-using bts.utils;
 using mbts.ui;
 using mbts.ui.shell;
 using mbts.ui.spark;
@@ -30,8 +29,16 @@ namespace mbts.spark {
       readonly Property<bool> _has_working_orders, _can_add_leg;
 
       Security _synthetic;
-      bool _set_name_automatically, _set_ticks_automatically, _set_quantities_automatically, _set_price_mults_automatically, _is_setting_quantities, _is_setting_price_mults;
+      bool
+         _set_name_automatically,
+         _set_ticks_automatically,
+         _set_quantities_automatically,
+         _set_price_mults_automatically,
+         _is_setting_quantities,
+         _is_setting_price_mults,
+         _use_fractional_ticks = true;
       TickFactors _tick_factors;
+      int _integer_tick_size = 1;
       ExecutionStrategyImmutable _strategy;
       HedgePricing _hedge_pricing;
 
@@ -44,6 +51,10 @@ namespace mbts.spark {
          : this(synthetic, strategy, false) {
          ExceptionAssert.InvalidOperation.That(synthetic.Id != 0, "This constructor may only be used for already-existing synthetic securities (id must be non-zero).");
          _tick_factors = TickUtils.get_regional_ticks(synthetic.ContractSpec).low_tick;
+         if (TickUtils.is_integer_tick(synthetic.ContractSpec)) {
+            _use_fractional_ticks = false;
+            _integer_tick_size = DoubleHelper.to_optional_int32(synthetic.ContractSpec.LowTick) ?? 0;
+         }
          title = $"Edit '{synthetic.Synthetic.Name}'";
          icon = Icons.ModifySynthetic;
          _has_working_orders = backing(nameof(has_working_orders), security_has_working_orders.OnDispatcher());
@@ -74,9 +85,7 @@ namespace mbts.spark {
          icon = Icons.Synthetics;
          _has_working_orders = backing(nameof(has_working_orders), false);
          contract_picker_model = new ContractPickerModel(bus, false, null, new SecurityCriteria(new[] {
-            new SecurityCriteriaClause() {
-               exchanges = EnumHelper.get_values_except(Venue.Bts).ToArray()
-            }
+            new SecurityCriteriaClause(exchanges: EnumHelper.get_values_except(Venue.Bts).ToArray())
          }));
          contract_picker_model.cancel_action += _close_new_leg_popup;
          contract_picker_model.ok_action += () => {
@@ -131,14 +140,14 @@ namespace mbts.spark {
                flash_error_msg("Name already taken", SparkUtils.UI.MessageFlashDuration, nameof(name)).ignore();
                valid = false;
             }
-            if (_tick_factors == null || !_tick_factors.is_valid()) {
-               flash_error_msg("Please select ticks", SparkUtils.UI.MessageFlashDuration, nameof(tick_factors)).ignore();
+            if (use_fractional_ticks ? (_tick_factors == null || !_tick_factors.is_valid()) : integer_tick_size == 0) {
+               flash_error_msg("Please select ticks", SparkUtils.UI.MessageFlashDuration, use_fractional_ticks ? nameof(tick_factors) : nameof(integer_tick_size)).ignore();
                valid = false;
             }
             if (valid) {
                _synthetic.Synthetic.Legs.SetItems(leg_tuples.Select(l => l.leg));
                _synthetic.Symbol = _deduce_symbol(_synthetic);
-               _synthetic.ContractSpec = _tick_factors.to_spec();
+               _synthetic.ContractSpec = use_fractional_ticks ? _tick_factors.to_spec() : TickUtils.create_integer_tick_spec(integer_tick_size);
                uint? id = await model.create_synthetic(new SecurityImmutable(_synthetic));
                if (id.HasValue && id != 0) {
                   if (await model.save_strategy(id.Value, get_strategy())) {
@@ -187,6 +196,9 @@ namespace mbts.spark {
          var quote_throttle_outside_ticks = new QuoteThrottleOutsideTicksModel();
          var quote_throttle_inside_ticks = new QuoteThrottleInsideTicksModel();
 
+         var quote_time_throttle_delay_to_run = new QuoteTimeThrottleDelayToRunModel();
+         var quote_time_throttle_delay_to_improve = new QuoteTimeThrottleDelayToImproveModel();
+
          var conditional_quoting_ticks = new ConditionalQuotingTicksModel();
          var conditional_quoting_price_type = new ConditionalQuotingPriceTypeModel();
 
@@ -214,17 +226,24 @@ namespace mbts.spark {
             _quantity_model,
             _price_mult_model,
             is_quote_model,
-            //new EnableHedgeModel(), //TAHA_SPREADER
+            new EnableHedgeModel(), //TAHA_SPREADER
             new HedgeRatioModel(),
             //new MinLeanQtyModel(), //TAHA_SPREADER
+            new LeanOffsetTicksModel(),
             //new QuoteHiddenModel(),
             new QuoteQueueHolderModel(),
             new MarketDataTypeModel(),
             new ShowQuantityEnabledModel(show_quantity_quantity),
             show_quantity_quantity,
+            // Throttle
             new QuoteThrottleEnabledModel(quote_throttle_inside_ticks, quote_throttle_outside_ticks),
             quote_throttle_inside_ticks,
             quote_throttle_outside_ticks,
+            // Time Throttle
+            new QuoteTimeThrottleEnabledModel(quote_time_throttle_delay_to_run, quote_time_throttle_delay_to_improve),
+            quote_time_throttle_delay_to_run,
+            quote_time_throttle_delay_to_improve,
+
             new ConditionalQuoteEnabledModel(conditional_quoting_ticks, conditional_quoting_price_type),
             conditional_quoting_ticks,
             //conditional_quoting_price_type,
@@ -295,6 +314,20 @@ namespace mbts.spark {
       public bool has_working_orders => _has_working_orders.Value;
       public bool is_new { get; }
       public bool is_new_leg_popup_open { get; set; }
+      public bool use_fractional_ticks {
+         get => _use_fractional_ticks;
+         set {
+            if (Set(ref _use_fractional_ticks, value))
+               _set_ticks_automatically = false;
+         }
+      }
+      public int integer_tick_size {
+         get => _integer_tick_size;
+         set {
+            if (Set(ref _integer_tick_size, value))
+               _set_ticks_automatically = false;
+         }
+      }
       public bool can_add_leg => _can_add_leg.Value;
       public SyntheticContract.Types.PriceCalc price_calc { get => _synthetic.Synthetic.PriceCalc; set => _synthetic.Synthetic.PriceCalc = value; }
       public ObservableCollection<LegSpreaderParamsTuple> leg_tuples { get; } = new ObservableCollection<LegSpreaderParamsTuple>();
@@ -323,6 +356,16 @@ namespace mbts.spark {
          _strategy = strategy;
          hedge_pricing = strategy.HedgePricing;
          leg_tuples.SetItems(_get_legs(_synthetic, strategy));
+         if (synthetic.HasContractSpec) {
+            /// assign the fields <see cref="_use_fractional_ticks"/> and <see cref="_integer_tick_size"/>,
+            /// rather than the properties <see cref="use_fractional_ticks"/> and <see cref="integer_tick_size"/>
+            /// because the setters of the former flip <see cref="_set_ticks_automatically"/> to false if the value changes.
+            /// This behavior causes the ticks to be automatically deduced as legs are added/removed,
+            /// until the user explicitly enters a different value (as the properties are bound to tick input controls in the view).
+            Set(ref _use_fractional_ticks, !TickUtils.is_integer_tick(synthetic.ContractSpec), nameof(use_fractional_ticks));
+            if (!use_fractional_ticks)
+               Set(ref _integer_tick_size, DoubleHelper.to_optional_int32(synthetic.ContractSpec.LowTick) ?? 0, nameof(integer_tick_size));
+         }
          RaisePropertyChanged(nameof(name), nameof(tick_factors));
       }
 

src/client/spark/Modules/Spreader/VM/SyntheticManagementDialogVM.cs

@@ -169,7 +169,7 @@ namespace mbts.spark {
          void _show_order_book() {
             var ob_settings = bts.shell.orderbook.OrderBookStartupData.Default;
             ob_settings.filters = new bts.shell.orderbook.FilterStates {
-               security_criteria = new SecurityCriteria(security)
+               security_criteria = SecurityCriteria.from_securities(security)
             };
             _bus.post(SparkTags.ShowOrderBookTag, ob_settings);
          }

src/client/spark/Modules/Trading/AlgoStudio/AlgoStudioView.xaml

@@ -25,6 +25,7 @@
       <sys:Double x:Key="VerticalPush2">8</sys:Double>
       <sys:Double x:Key="VerticalPush3">12</sys:Double>
       <Thickness x:Key="Margin.LP1" Left="{StaticResource HorizontalPush1}"/>
+      <Thickness x:Key="Margin.LP1_RP1" Left="{StaticResource HorizontalPush1}" Right="{StaticResource HorizontalPush1}"/>
       <Thickness x:Key="Margin.LP2" Left="{StaticResource HorizontalPush2}"/>
       <Thickness x:Key="Margin.LP3" Left="{StaticResource HorizontalPush3}"/>
       <Thickness x:Key="Margin.TP1" Top="{StaticResource VerticalPush1}"/>
@@ -130,22 +131,6 @@
     </ResourceDictionary>
   </UserControl.Resources>
   <VisualStateManager.VisualStateGroups>
-    <VisualStateGroup Name="{x:Static GroupName, MemberType={u:Nested usp:AlgoStudioView.VisualStateNames.EditPane}}">
-      <VisualState Name="{x:Static u:VisualStates.Active}">
-        <Storyboard>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="edit_pane" Storyboard.TargetProperty="(UIElement.Visibility)">
-            <DiscreteObjectKeyFrame KeyTime="00:00:00" Value="{x:Static Visibility.Visible}" />
-          </ObjectAnimationUsingKeyFrames>
-        </Storyboard>
-      </VisualState>
-      <VisualState Name="{x:Static u:VisualStates.Inactive}">
-        <Storyboard>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="edit_pane" Storyboard.TargetProperty="(UIElement.Visibility)">
-            <DiscreteObjectKeyFrame KeyTime="00:00:00" Value="{x:Static Visibility.Hidden}" />
-          </ObjectAnimationUsingKeyFrames>
-        </Storyboard>
-      </VisualState>
-    </VisualStateGroup>
   </VisualStateManager.VisualStateGroups>
   <AdornerDecorator>
     <Grid>
@@ -153,13 +138,19 @@
         <ColumnDefinition Width="Auto"/>
         <ColumnDefinition Width="*"/>
       </Grid.ColumnDefinitions>
+      <Grid.RowDefinitions>
+        <RowDefinition Height="*"/>
+        <RowDefinition Height="Auto"/>
+      </Grid.RowDefinitions>
       <ListBox
         x:Name="_tree_view"
+        Grid.RowSpan="2"
         ItemsSource="{Binding definitions_view}"
         HorizontalAlignment="Stretch"
         VerticalAlignment="Stretch"
         MinWidth="180"
         Background="Transparent"
+        BorderThickness="0,0,1,0"
         SelectedItem="{Binding selected_definition}"
       >
         <ListBox.ItemTemplate>
@@ -173,275 +164,176 @@
           </DataTemplate>
         </ListBox.ItemTemplate>
       </ListBox>
-      <ScrollViewer Grid.Column="1" Grid.IsSharedSizeScope="True" Margin="8,4">
-        <Grid x:Name="edit_pane">
-          <Grid.RowDefinitions>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="*"/>
-            <RowDefinition Height="Auto"/>
-          </Grid.RowDefinitions>
-          <Grid u:StateManager.VisualStateCollection="{Binding content_visual_states}" Margin="{StaticResource Margin.TP1}" >
-            <VisualStateManager.VisualStateGroups>
-              <!--Name-->
-              <VisualStateGroup Name="{x:Static GroupName, MemberType={u:Nested usp:AlgoStudioView.VisualStateNames.Name}}">
-                <VisualState Name="{x:Static Active, MemberType={u:Nested usp:AlgoStudioView.VisualStateNames.Name}}"/>
-                <VisualState Name="{x:Static Inactive, MemberType={u:Nested usp:AlgoStudioView.VisualStateNames.Name}}">
-                  <Storyboard>
-                    <BooleanAnimationUsingKeyFrames Storyboard.TargetName="name_text_box" Storyboard.TargetProperty="(UIElement.IsEnabled)">
-                      <DiscreteBooleanKeyFrame KeyTime="0" Value="False"/>
-                    </BooleanAnimationUsingKeyFrames>
-                  </Storyboard>
-                </VisualState>
-                <VisualState Name="{x:Static CannotRenameDefinition, MemberType={u:Nested usp:AlgoStudioView.VisualStateNames.Name}}">
-                  <Storyboard>
-                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="name_text_box" Storyboard.TargetProperty="(TextBox.ToolTip)">
-                      <DiscreteObjectKeyFrame KeyTime="0" Value="Cannot rename definitions."/>
-                    </ObjectAnimationUsingKeyFrames>
-                    <BooleanAnimationUsingKeyFrames Storyboard.TargetName="name_text_box" Storyboard.TargetProperty="(UIElement.IsEnabled)">
-                      <DiscreteBooleanKeyFrame KeyTime="0" Value="False"/>
-                    </BooleanAnimationUsingKeyFrames>
-                  </Storyboard>
-                </VisualState>
-                <VisualState Name="{x:Static CannotRenameDefinitionWhileTemplatesPresent, MemberType={u:Nested usp:AlgoStudioView.VisualStateNames.Name}}">
-                  <Storyboard>
-                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="name_text_box" Storyboard.TargetProperty="(TextBox.ToolTip)">
-                      <DiscreteObjectKeyFrame KeyTime="0" Value="Cannot rename definition while templates present."/>
-                    </ObjectAnimationUsingKeyFrames>
-                    <BooleanAnimationUsingKeyFrames Storyboard.TargetName="name_text_box" Storyboard.TargetProperty="(UIElement.IsEnabled)">
-                      <DiscreteBooleanKeyFrame KeyTime="0" Value="False"/>
-                    </BooleanAnimationUsingKeyFrames>
-                  </Storyboard>
-                </VisualState>
-                <VisualState Name="{x:Static CannotRenameTemplate, MemberType={u:Nested usp:AlgoStudioView.VisualStateNames.Name}}">
-                  <Storyboard>
-                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="name_text_box" Storyboard.TargetProperty="(TextBox.ToolTip)">
-                      <DiscreteObjectKeyFrame KeyTime="0" Value="Cannot rename templates."/>
-                    </ObjectAnimationUsingKeyFrames>
-                    <BooleanAnimationUsingKeyFrames Storyboard.TargetName="name_text_box" Storyboard.TargetProperty="(UIElement.IsEnabled)">
-                      <DiscreteBooleanKeyFrame KeyTime="0" Value="False"/>
-                    </BooleanAnimationUsingKeyFrames>
-                  </Storyboard>
-                </VisualState>
-              </VisualStateGroup>
-              <!--Abbreviation-->
-              <VisualStateGroup Name="{x:Static GroupName, MemberType={u:Nested usp:AlgoStudioView.VisualStateNames.Abbreviation}}">
-                <VisualState Name="{x:Static Populated, MemberType={u:Nested usp:AlgoStudioView.VisualStateNames.Abbreviation}}">
-                  <Storyboard>
-                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="abbreviation_active_tooltip" Storyboard.TargetProperty="(FrameworkElement.Visibility)">
-                      <DiscreteObjectKeyFrame KeyTime="0" Value="{x:Static Visibility.Visible}"/>
-                    </ObjectAnimationUsingKeyFrames>
-                  </Storyboard>
-                </VisualState>
-                <VisualState Name="{x:Static Unpopulated, MemberType={u:Nested usp:AlgoStudioView.VisualStateNames.Abbreviation}}">
-                  <Storyboard>
-                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="abbreviation_active_tooltip" Storyboard.TargetProperty="(FrameworkElement.Visibility)">
-                      <DiscreteObjectKeyFrame KeyTime="0" Value="{x:Static Visibility.Visible}"/>
-                    </ObjectAnimationUsingKeyFrames>
-                    <ColorAnimationUsingKeyFrames Storyboard.TargetName="abbreviation_label" Storyboard.TargetProperty="(TextElement.Foreground).(SolidColorBrush.Color)">
-                      <DiscreteColorKeyFrame KeyTime="0" Value="Gray"/>
-                    </ColorAnimationUsingKeyFrames>
-                  </Storyboard>
-                </VisualState>
-                <VisualState Name="{x:Static NotSupportedForTemplates, MemberType={u:Nested usp:AlgoStudioView.VisualStateNames.Abbreviation}}">
-                  <Storyboard>
-                    <BooleanAnimationUsingKeyFrames Storyboard.TargetName="abbreviation_root" Storyboard.TargetProperty="(ToolTipService.ShowOnDisabled)">
-                      <DiscreteBooleanKeyFrame KeyTime="0" Value="True"/>
-                    </BooleanAnimationUsingKeyFrames>
-                    <BooleanAnimationUsingKeyFrames Storyboard.TargetName="abbreviation_root" Storyboard.TargetProperty="(UIElement.IsEnabled)">
-                      <DiscreteBooleanKeyFrame KeyTime="0" Value="False"/>
-                    </BooleanAnimationUsingKeyFrames>
-                    <ColorAnimationUsingKeyFrames Storyboard.TargetName="abbreviation_label" Storyboard.TargetProperty="(TextElement.Foreground).(SolidColorBrush.Color)">
-                      <DiscreteColorKeyFrame KeyTime="0" Value="Gray"/>
-                    </ColorAnimationUsingKeyFrames>
-                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="abbreviation_not_supported_for_templates_tooltip" Storyboard.TargetProperty="(FrameworkElement.Visibility)">
-                      <DiscreteObjectKeyFrame KeyTime="0" Value="{x:Static Visibility.Visible}"/>
-                    </ObjectAnimationUsingKeyFrames>
-                  </Storyboard>
-                </VisualState>
-              </VisualStateGroup>
-              <!--Badge Selector-->
-              <VisualStateGroup Name="{x:Static GroupName, MemberType={u:Nested usp:AlgoStudioView.VisualStateNames.BadgeSelector}}">
-                <VisualState Name="{x:Static Active, MemberType={u:Nested usp:AlgoStudioView.VisualStateNames.BadgeSelector}}">
-                  <Storyboard>
-                    <DoubleAnimationUsingKeyFrames Storyboard.TargetName="default_badge" Storyboard.TargetProperty="(UIElement.Opacity)">
-                      <DiscreteDoubleKeyFrame KeyTime="0" Value="0.5"/>
-                    </DoubleAnimationUsingKeyFrames>
-                  </Storyboard>
-                </VisualState>
-                <VisualState Name="{x:Static Inactive, MemberType={u:Nested usp:AlgoStudioView.VisualStateNames.BadgeSelector}}">
-                  <Storyboard>
-                    <BooleanAnimationUsingKeyFrames Storyboard.TargetName="custom_badge_color_picker_button" Storyboard.TargetProperty="(UIElement.IsEnabled)">
-                      <DiscreteBooleanKeyFrame KeyTime="0" Value="False"/>
-                    </BooleanAnimationUsingKeyFrames>
-                    <BooleanAnimationUsingKeyFrames Storyboard.TargetName="default_badge_radio_button" Storyboard.TargetProperty="(ToggleButton.IsChecked)">
-                      <DiscreteBooleanKeyFrame KeyTime="0" Value="True"/>
-                    </BooleanAnimationUsingKeyFrames>
-                  </Storyboard>
-                </VisualState>
-              </VisualStateGroup>
-            </VisualStateManager.VisualStateGroups>
-            <Grid.ColumnDefinitions>
-              <ColumnDefinition Width="Auto" SharedSizeGroup="param_name_col"/>
-              <ColumnDefinition Width="3*"/>
-              <ColumnDefinition Width="2*"/>
-            </Grid.ColumnDefinitions>
-            <TextBlock VerticalAlignment="Center">Name:</TextBlock>
-            <TextBox
-            x:Name="name_text_box"
-            Grid.Column="1"
-            ToolTipService.ShowOnDisabled="True"
-            Margin="{StaticResource Margin.LP1}"
-            HorizontalAlignment="Stretch"
-            VerticalAlignment="Center"
-            Text="{Binding selected_definition.name, UpdateSourceTrigger=PropertyChanged, Delay=25}"
-          />
-            <Grid x:Name="abbreviation_root" Grid.Column="2">
-              <Grid.ToolTip>
-                <Grid>
-                  <TextBlock x:Name="abbreviation_active_tooltip" Visibility="Collapsed">
-                    <TextBlock.Inlines>
-                      <Run>Specify an abbreviation for this algo to use in ladder algo 'favorite' buttons.</Run>
-                      <LineBreak/>
-                      <Run FontStyle="Italic">Hint: To add/remove algos from 'favorites', open the ladder settings dialog and select the 'Algo Favorites' tab.</Run>
-                    </TextBlock.Inlines>
+      <Grid x:Name="edit_pane" Grid.Column="1">
+        <u:StateManager.VisualState>
+          <Binding Path="selected_definition">
+            <Binding.Converter>
+              <cv:ValueMap Default="{x:Static u:VisualStates.Active}">
+                <cv:KeyValue Key="{x:Null}" Value="{x:Static u:VisualStates.Inactive}"/>
+              </cv:ValueMap>
+            </Binding.Converter>
+          </Binding>
+        </u:StateManager.VisualState>
+        <VisualStateManager.VisualStateGroups>
+          <VisualStateGroup>
+            <VisualState Name="{x:Static u:VisualStates.Active}"/>
+            <VisualState Name="{x:Static u:VisualStates.Inactive}">
+              <Storyboard>
+                <BooleanAnimationUsingKeyFrames Storyboard.TargetName="custom_badge_color_picker_button" Storyboard.TargetProperty="(UIElement.IsEnabled)">
+                  <DiscreteBooleanKeyFrame KeyTime="0" Value="False"/>
+                </BooleanAnimationUsingKeyFrames>
+                <BooleanAnimationUsingKeyFrames Storyboard.TargetName="name_text_box" Storyboard.TargetProperty="(UIElement.IsEnabled)">
+                  <DiscreteBooleanKeyFrame KeyTime="0" Value="False"/>
+                </BooleanAnimationUsingKeyFrames>
+                <BooleanAnimationUsingKeyFrames Storyboard.TargetName="abbreviation_text_box" Storyboard.TargetProperty="(UIElement.IsEnabled)">
+                  <DiscreteBooleanKeyFrame KeyTime="0" Value="False"/>
+                </BooleanAnimationUsingKeyFrames>
+                <BooleanAnimationUsingKeyFrames Storyboard.TargetName="algo_editor_scroll_viewer" Storyboard.TargetProperty="(UIElement.IsEnabled)">
+                  <DiscreteBooleanKeyFrame KeyTime="0" Value="False"/>
+                </BooleanAnimationUsingKeyFrames>
+                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="edit_pane" Storyboard.TargetProperty="(FrameworkElement.ToolTip).(UIElement.Visibility)">
+                  <DiscreteObjectKeyFrame KeyTime="0" Value="{x:Static Visibility.Visible}"/>
+                </ObjectAnimationUsingKeyFrames>
+              </Storyboard>
+            </VisualState>
+          </VisualStateGroup>
+        </VisualStateManager.VisualStateGroups>
+        <Grid.ToolTip>
+          <ToolTip Visibility="Collapsed">
+            <StackPanel Orientation="Vertical">
+              <TextBlock FontStyle="Italic">Select an existing algo to edit from the list to the left.</TextBlock>
+              <StackPanel Orientation="Horizontal">
+                <TextBlock FontStyle="Italic">Or click the</TextBlock>
+                <Image Source="{x:Static u:Icons.AddBoxes}" Height="20" Margin="2,0"/>
+                <TextBlock FontStyle="Italic"> button to create a new one.</TextBlock>
+              </StackPanel>
+            </StackPanel>
+          </ToolTip>
+        </Grid.ToolTip>
+        <Grid.RowDefinitions>
+          <RowDefinition Height="27"/>
+          <RowDefinition Height="*"/>
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+          <ColumnDefinition Width="Auto"/>
+          <ColumnDefinition Width="*"/>
+          <ColumnDefinition Width="Auto"/>
+        </Grid.ColumnDefinitions>
+        <Rectangle Grid.ColumnSpan="3" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Fill="{x:Static u:BTSColors.dialog_skirt_brush}" UseLayoutRounding="True"/>
+        <Button
+          x:Name="custom_badge_color_picker_button"
+          Background="{Binding selected_definition.badge_fill}"
+          Margin="{StaticResource Margin.LP1}"
+          ToolTip="Change the icon color used for this algo."
+          IsEnabled="True"
+          Style="{StaticResource CustomBadgeColorPickerButtonStyle}"
+        />
+        <Popup x:Name="custom_badge_color_picker_popup" StaysOpen="False" PlacementTarget="{Binding ElementName=custom_badge_color_picker_button}" Placement="Right">
+          <Border Style="{StaticResource CustomBadgeColorPickerPopupRootStyle}">
+            <Grid>
+              <Grid.RowDefinitions>
+                <RowDefinition Height="Auto"/>
+                <RowDefinition Height="*"/>
+              </Grid.RowDefinitions>
+              <CheckBox
+                x:Name="default_badge_color_checkbox"
+                VerticalAlignment="Center"
+                VerticalContentAlignment="Center"
+                Margin="6,4,0,4"
+                IsChecked="{Binding selected_definition.custom_badge_color.enabled, Converter={StaticResource NotConverter}}"
+              >
+                <CheckBox.ToolTip>
+                  <TextBlock>
+                    <Run>Use the default icon color for this algo.</Run>
+                    <LineBreak/>
+                    <Run FontStyle="Italic">Hint: the default color is that of the algo-root.</Run>
                   </TextBlock>
-                  <TextBlock x:Name="abbreviation_not_supported_for_templates_tooltip" Visibility="Collapsed">
-                  Not supported for templates.
-                  </TextBlock>
-                </Grid>
-              </Grid.ToolTip>
-              <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="Auto"/>
-                <ColumnDefinition Width="*"/>
-              </Grid.ColumnDefinitions>
-              <TextBlock x:Name="abbreviation_label" FontStyle="Italic" Margin="{StaticResource Margin.LP1}" VerticalAlignment="Center">Abbrev.</TextBlock>
-              <TextBox Grid.Column="1" Margin="{StaticResource Margin.LP1}" Text="{Binding selected_definition.abbreviation, UpdateSourceTrigger=PropertyChanged, Delay=25}"/>
-            </Grid>
-          </Grid>
-          <Grid x:Name="badge_selector_radio_button_root" Grid.Row="1" Margin="{StaticResource Margin.TP2}">
-            <Grid.ColumnDefinitions>
-              <ColumnDefinition Width="Auto" SharedSizeGroup="param_name_col"/>
-              <ColumnDefinition Width="Auto"/>
-              <ColumnDefinition Width="*"/>
-            </Grid.ColumnDefinitions>
-            <TextBlock>Icon:</TextBlock>
-            <RadioButton
-              x:Name="default_badge_radio_button"
-              Grid.Column="1"
-              VerticalAlignment="Center"
-              VerticalContentAlignment="Center"
-              Margin="{StaticResource Margin.LP1}"
-              GroupName="Badge"
-            >
-              <RadioButton.ToolTip>
-                <ToolTip DataContext="{Binding PlacementTarget.DataContext, RelativeSource={RelativeSource Self}}">
-                  <StackPanel Orientation="Vertical">
-                    <TextBlock>Use the default icon color for this algo.</TextBlock>
-                    <StackPanel TextElement.FontStyle="Italic" Orientation="Horizontal">
-                      <TextBlock>Hint: the default color is that of the algo-root (</TextBlock>
-                      <usp:OrderTypeItem
-                        Margin="2,0"
-                        BadgeFill="{Binding selected_definition.algo_root.meta.Color, Converter={StaticResource ColorToBrushConverter}}"
-                        DisplayName="{Binding selected_definition.algo_root.display_name}"
-                      />
-                      <TextBlock>).</TextBlock>
-                    </StackPanel>
-                  </StackPanel>
-                </ToolTip>
-              </RadioButton.ToolTip>
-              <Grid x:Name="default_badge_content_root">
-                <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="Auto"/>
-                  <ColumnDefinition Width="*"/>
-                </Grid.ColumnDefinitions>
-                <TextBlock>Default</TextBlock>
-                <Rectangle
-                  x:Name="default_badge"
-                  Grid.Column="1"
-                  Margin="{StaticResource Margin.LP1}"
-                  Fill="{Binding selected_definition.algo_root.meta.Color, Converter={StaticResource ColorToBrushConverter}}"
-                  Style="{StaticResource RectangleBadgeStyle}"
-                />
-              </Grid>
-            </RadioButton>
-            <RadioButton
-              Grid.Column="2"
-              VerticalAlignment="Center"
-              VerticalContentAlignment="Center"
-              Margin="{StaticResource Margin.LP2}"
-              IsChecked="{Binding selected_definition.custom_badge_color.enabled}"
-              GroupName="Badge"
-            >
-              <RadioButton.ToolTip>
-                <Grid>
-                  <Grid.RowDefinitions>
-                    <RowDefinition Height="Auto"/>
-                    <RowDefinition Height="Auto"/>
-                  </Grid.RowDefinitions>
+                </CheckBox.ToolTip>
+                <Grid x:Name="default_badge_content_root">
                   <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="Auto"/>
                     <ColumnDefinition Width="Auto"/>
                     <ColumnDefinition Width="*"/>
                   </Grid.ColumnDefinitions>
-                  <TextBlock Grid.ColumnSpan="3">Specify a custom icon color for this algo.</TextBlock>
-                  <TextBlock Grid.Row="1" FontStyle="Italic">Hint: Click</TextBlock>
+                  <TextBlock>Use Default Icon</TextBlock>
                   <Rectangle
-                    Grid.Row="1"
+                    x:Name="default_badge"
                     Grid.Column="1"
-                    Margin="3,0"
-                    Fill="{Binding selected_definition.custom_badge_color.value, Converter={StaticResource ColorToBrushConverter}}"
+                    Margin="{StaticResource Margin.LP1}"
+                    Fill="{Binding selected_definition.algo_root.meta.Color, Converter={StaticResource ColorToBrushConverter}}"
                     Style="{StaticResource RectangleBadgeStyle}"
                   />
-                  <TextBlock Grid.Row="1" Grid.Column="2" FontStyle="Italic">to open the color picker popup.</TextBlock>
                 </Grid>
-              </RadioButton.ToolTip>
-              <Grid>
-                <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="Auto"/>
-                  <ColumnDefinition Width="*"/>
-                </Grid.ColumnDefinitions>
-                <TextBlock>Custom</TextBlock>
-                <Button
-                  x:Name="custom_badge_color_picker_button"
-                  Grid.Column="1"
-                  Background="{Binding selected_definition.custom_badge_color.value, Converter={StaticResource ColorToBrushConverter}}"
-                  Margin="{StaticResource Margin.LP1}"
-                  Style="{StaticResource CustomBadgeColorPickerButtonStyle}"
-                />
-                <Popup x:Name="custom_badge_color_picker_popup" StaysOpen="False" PlacementTarget="{Binding ElementName=custom_badge_color_picker_button}" Placement="Right">
-                  <Border Style="{StaticResource CustomBadgeColorPickerPopupRootStyle}">
-                    <cp:ColorPickerControl
-                      Background="Transparent"
-                      Palettes="{Binding DataContext.selected_definition.custom_badge_color_palettes, RelativeSource={RelativeSource AncestorType=Popup}}"
-                      SelectedColor="{Binding DataContext.selected_definition.custom_badge_color.value, RelativeSource={RelativeSource AncestorType=Popup}, Mode=TwoWay}"
-                    />
-                  </Border>
-                </Popup>
-              </Grid>
-            </RadioButton>
-          </Grid>
+              </CheckBox>
+              <cp:ColorPickerControl
+                Grid.Row="1"
+                ToolTipService.ShowOnDisabled="True"
+                Margin="{StaticResource Margin.TP1}"
+                Background="Transparent"
+                Palettes="{Binding DataContext.selected_definition.custom_badge_color_palettes, RelativeSource={RelativeSource AncestorType=Popup}}"
+                SelectedColor="{Binding DataContext.selected_definition.custom_badge_color.value, RelativeSource={RelativeSource AncestorType=Popup}, Mode=TwoWay}"
+                PreviewMouseDown="_on_badge_color_picker_activated"
+                PreviewGotKeyboardFocus="_on_badge_color_picker_activated"
+              />
+            </Grid>
+          </Border>
+        </Popup>
+        <TextBox
+          x:Name="name_text_box"
+          Grid.Column="1"
+          u:TextBoxBehavior.TextPrompt="Name"
+          Margin="{StaticResource Margin.LP1}"
+          HorizontalAlignment="Stretch"
+          VerticalAlignment="Center"
+          MinWidth="50"
+          IsEnabled="True"
+          Text="{Binding selected_definition.name, UpdateSourceTrigger=PropertyChanged, Delay=25}"
+          ToolTip="This algo's full name."
+        />
+        <TextBox
+          x:Name="abbreviation_text_box"
+          Grid.Column="2"
+          u:TextBoxBehavior.TextPrompt="Abbrev."
+          VerticalAlignment="Center"
+          Margin="{StaticResource Margin.LP1_RP1}"
+          MinWidth="50"
+          IsEnabled="True"
+          Text="{Binding selected_definition.abbreviation, UpdateSourceTrigger=PropertyChanged, Delay=25}"
+        >
+          <TextBox.ToolTip>
+            <TextBlock>
+              <TextBlock.Inlines>
+                <Run>Specify an abbreviation for this algo to use in ladder algo 'favorite' buttons.</Run>
+                <LineBreak/>
+                <Run FontStyle="Italic">Hint: To add/remove algos from 'favorites', open the ladder settings dialog and select the 'Algo Favorites' tab.</Run>
+              </TextBlock.Inlines>
+            </TextBlock>
+          </TextBox.ToolTip>
+        </TextBox>
+        <ScrollViewer x:Name="algo_editor_scroll_viewer" Grid.Row="1" Grid.ColumnSpan="3" VerticalScrollBarVisibility="Auto">
           <usp:AlgoEditorView
-            Grid.Row="2"
             DataContext="{Binding selected_definition}"
             Background="Transparent"
             BorderBrush="{Binding algo_root, Converter={StaticResource OrderTypeBrushConverter}}"
-            Margin="0,6,0,0"
             Padding="12,8"
           />
-          <StackPanel Grid.Row="3" HorizontalAlignment="Right" Orientation="Horizontal">
-            <StackPanel.Margin>
-              <Thickness Left="{StaticResource DialogSkirtPadding.Left}" Top="{StaticResource VerticalPush2}" Right="{StaticResource DialogSkirtButtonPadding.Right}" Bottom="{StaticResource DialogSkirtPadding.Bottom}"/>
-            </StackPanel.Margin>
-            <Button ToolTipService.ShowOnDisabled="True" Margin="{StaticResource DialogSkirtButtonMargin}" Command="{Binding save_cmd}" CommandParameter="{Binding selected_definition}" Width="100" ToolTip="{Binding save_cmd_tooltip}" IsDefault="True">
-              <TextBlock Text="{Binding selected_definition.name, StringFormat='{}Save {0}'}"/>
+        </ScrollViewer>
+      </Grid>
+      <c:DialogSkirt
+        Grid.Row="2"
+        Grid.Column="1"
+        BorderThickness="0"
+      >
+        <c:DialogSkirt.RightItems>
+          <x:Array Type="{x:Type Button}">
+            <Button ToolTipService.ShowOnDisabled="True" Margin="{StaticResource DialogSkirtButtonMargin}" Command="{Binding save_cmd}" CommandParameter="{Binding selected_definition}" Width="90" ToolTip="{Binding save_cmd_tooltip}" IsDefault="True">
+              Save Algo
             </Button>
-            <Button ToolTipService.ShowOnDisabled="True" Margin="{StaticResource DialogSkirtButtonMargin}" Command="{Binding revert_cmd}" CommandParameter="{Binding selected_definition}" Width="100" ToolTip="{Binding revert_cmd_tooltip}">
-              <TextBlock Text="{Binding selected_definition.name, StringFormat='{}Revert {0}'}"/>
+            <Button ToolTipService.ShowOnDisabled="True" Margin="{StaticResource DialogSkirtButtonMargin}" Command="{Binding revert_cmd}" CommandParameter="{Binding selected_definition}" Width="90" ToolTip="{Binding revert_cmd_tooltip}">
+              Revert Algo
             </Button>
-          </StackPanel>
-        </Grid>
-      </ScrollViewer>
+          </x:Array>
+        </c:DialogSkirt.RightItems>
+      </c:DialogSkirt>
     </Grid>
   </AdornerDecorator>
 </UserControl>

src/client/spark/Modules/Trading/AlgoStudio/AlgoStudioView.xaml.cs

@@ -19,6 +19,17 @@ namespace mbts.ui.spark {
             Dispatcher.InvokeAsync(() => Keyboard.Focus(name_text_box));
       }
 
+      void _on_badge_color_picker_activated(object sender, MouseButtonEventArgs e) =>
+         _on_badge_color_picker_activated();
+
+      void _on_badge_color_picker_activated(object sender, KeyboardFocusChangedEventArgs e) =>
+         _on_badge_color_picker_activated();
+
+      void _on_badge_color_picker_activated() {
+         if (DataContext is AlgoStudioVM vm && vm.selected_definition != null)
+            vm.selected_definition.custom_badge_color.enabled = true;
+      }
+
       public static class VisualStateNames {
          public static class EditPane {
             public const string GroupName = nameof(EditPane);
@@ -44,8 +55,7 @@ namespace mbts.ui.spark {
 
             public static readonly string
                Populated = $"{GroupName}{nameof(Populated)}",
-               Unpopulated = $"{GroupName}{nameof(Unpopulated)}",
-               NotSupportedForTemplates = $"{GroupName}{nameof(NotSupportedForTemplates)}";
+               Unpopulated = $"{GroupName}{nameof(Unpopulated)}";
          }
 
          public static class BadgeSelector {

src/client/spark/Modules/Trading/AlgoStudio/AlgoStudioWindow.cs

@@ -9,6 +9,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Reactive.Disposables;
 using System.Reactive.Linq;
+using System.Threading.Tasks;
 using System.Windows;
 using StartupData = bts.shell.AlgoStudioWindowFactory.StartupData;
 
@@ -68,23 +69,12 @@ namespace mbts.spark {
             .Subscribe(sec_map => _view.Resources[ResourceKeys.Securities] = sec_map));
          // add definition
          _commands.Add(new SparkCommandCommand("Add Algo", Icons.AddBoxes, _vm.add_definition_cmd));
-         // clone definition
-         var clone_selected_definition_spark_cmd = new SparkCommandCommand(string.Empty, Icons.DocumentCopy, _vm.clone_selected_definition_cmd);
-         _commands.Add(clone_selected_definition_spark_cmd);
-         _resources.Add(_vm.subscribe_definition().OnDispatcher().Subscribe(
-            def => clone_selected_definition_spark_cmd.title = def == null ? $"Clone (None Selected)" : $"Clone '{def.name}'"));
-         // save
-         if (_ui_configuration.can_save_specific) {
-            var content_is_dirty_src = _vm.subscribe_definition().SelectManyInSeries(def => def?.subscribe_is_definition_dirty() ?? Observable.Return(false));
-            _commands.Add(new ReactiveSparkCommand(_vm.subscribe_definition().OnDispatcher().Select(c => $"Save '{c?.name}'"), Icons.DiskFile, () => {
-               if (_vm.selected_definition is AlgoDefinitionVM d)
-                  _vm.save_definition(d).ignore();
-            }, content_is_dirty_src));
-         }
-         // save all
-         var save_all_cmd = new ObservantAsyncCommand(_vm.save_all);
-         _commands.Add(new SparkCommandCommand("Save All", Icons.Disk, save_all_cmd));
-         _resources.Add(_vm.subscribe_dirty().OnDispatcher().Subscribe(save_all_cmd));
+         _commands.Add(new SparkCommandCommand("Clone Algo", Icons.CopyBoxes, _vm.clone_selected_definition_cmd));
+         _commands.Add(new SparkCommandCommand("Save Algo", Icons.DiskFile, _vm.save_cmd) {
+            show_in_toolbar = _ui_configuration.can_save_specific
+         });
+         _commands.Add(new SparkCommandCommand("Save All", Icons.Disk, ObservantAsyncCommand.create(_vm.save_all, out var save_all_observer)));
+         _resources.Add(_vm.subscribe_dirty().OnDispatcher().Subscribe(save_all_observer));
          // undo/redo
          if (_ui_configuration.can_undo_redo) {
             // undo
@@ -117,30 +107,11 @@ namespace mbts.spark {
             _resources.Add(can_redo_source.Subscribe(redo_cmd));
          }
          // remove
-         var remove_spark_cmd = new ObservantSparkCommandCommand<IAlgoStudioContentVM>(Icons.Trash, v => $"Remove '{v?.name}'", v => v != null, value => {
-            if (value is AlgoDefinitionVM d) {
-               string prompt; MessageBoxImage icon;
-               if (d.key.mode == AlgoKey.Mode.Persisted) {
-                  prompt = $"Are you sure you want to delete '{d.name}?'";
-                  icon = MessageBoxImage.Question;
-               } else {
-                  // algo hasn't even been created yet (just an unsaved placeholder item), no need to get user confirmation in this case.
-                  prompt = null;
-                  icon = default;
-               }
-               if (prompt != null) {
-                  var resp = BTSMessageBox.Show(prompt, "Algo Studio", BTSMessageBoxButtons.Yes | BTSMessageBoxButtons.No, icon);
-                  switch (resp) {
-                     case BTSMessageBoxButtons.Yes: break;
-                     case BTSMessageBoxButtons.No:
-                     default: return;
-                  }
-               }
-               _vm.remove_definition(d).ignore();
-            }
-         });
-         _commands.Add(remove_spark_cmd);
-         _resources.Add(_vm.subscribe_definition().OnDispatcher().Subscribe(remove_spark_cmd));
+         _commands.Add(new SparkCommandCommand("Remove Algo", Icons.Trash, ObservantAsyncCommand.create<AlgoDefinitionVM>(
+            vm => BTSMessageBox.Confirm($"Are you sure you want to delete '{vm.name}?'", Title) ? _vm.remove_definition(vm) : Task.CompletedTask,
+            vm => vm != null,
+            out var remove_cmd_observer)));
+         _resources.Add(_vm.subscribe_definition().OnDispatcher().Subscribe(remove_cmd_observer));
       }
 
       void _dispose_core() {
@@ -149,4 +120,4 @@ namespace mbts.spark {
          Disposable.dispose(ref _vm);
       }
    }
-}
+}

src/client/spark/Modules/Trading/AlgoStudio/Model/AlgoData.cs

@@ -9,6 +9,8 @@ namespace mbts.spark {
    // This is a core data type on the front end, so data validation is strict, as bad values may yield weird/difficult to track bugs.
    // Descriptive factory methods are favored over public constructors, as they are less likely to be misused.
    struct AlgoData : IEquatable<AlgoData> {
+      public static readonly Func<AlgoData, AlgoKey> key_fn = a => a.key;
+
       public readonly CustomOrderDefinitionImmutable value;
       public readonly string name;
       public readonly AlgoKey key;

src/client/spark/Modules/Trading/AlgoStudio/Model/AlgoKey.cs

@@ -128,6 +128,7 @@ namespace mbts.spark {
       }
 
       public bool is_persisted => mode == Mode.Persisted;
+      public bool is_composite => _composite_key.HasValue || _unpersisted.HasValue;
 
       public uint persisted => _composite_key.Value;
       public Guid unpersisted => _unpersisted.Value;
@@ -199,6 +200,15 @@ namespace mbts.spark {
          }
          return EqualityComparer.phase_hash(hash, phase_mult);
       }
+      public override string ToString() {
+         switch (mode) {
+            case Mode.Dynamic: return $"Dynamic: {dynamic_type}";
+            case Mode.Factory: return $"Factory: {factory}";
+            case Mode.Persisted: return $"Composite: {persisted}";
+            case Mode.Unpersisted: return $"(Composite): {unpersisted}";
+            default: return mode.ToString();
+         }
+      }
 
       public static bool operator ==(AlgoKey a, AlgoKey b) => a.Equals(b);
       public static bool operator !=(AlgoKey a, AlgoKey b) => !a.Equals(b);

src/client/spark/Modules/Trading/AlgoStudio/Model/AlgoStudioFlatDefinitionModel.cs

@@ -6,45 +6,39 @@ using mbts.utils;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.Composition;
-using System.Reactive.Linq;
 using System.Threading.Tasks;
 
 namespace mbts.spark {
    [Export(typeof(IAlgoStudioModel))]
    class AlgoStudioFlatDefinitionModel : IAlgoStudioModel, IDisposable {
       readonly AlgoDefinitionService _service;
-      readonly AdminModel _admin_model;
+      readonly UserTuple _user;
       readonly ErrorReporter _error_reporter;
       IReadOnlyDictionary<AlgoKey, AlgoData> _algos = DictionaryHelper.empty<AlgoKey, AlgoData>();
-      IReadOnlyDictionary<AlgoKey, AlgoTemplateData> _algo_templates = DictionaryHelper.empty<AlgoKey, AlgoTemplateData>();
       IDisposable _dispose;
 
       [ImportingConstructor]
-      public AlgoStudioFlatDefinitionModel(AlgoDefinitionService service, IAlgoDefinitionMetadataService metadata_service, AdminModel admin_model, ErrorReporter error_reporter) {
+      public AlgoStudioFlatDefinitionModel(AlgoDefinitionService service, IAlgoDefinitionMetadataService metadata_service, UserTuple user, ErrorReporter error_reporter) {
          _service = service;
          this.metadata_service = metadata_service;
-         _admin_model = admin_model;
+         _user = user;
          _error_reporter = error_reporter;
          definitions =
             service.subscribei_algo_definitions()
-            .Filter(r => r.Metadata.IsActive && _admin_model.user.can_access_user_data(r.Metadata.CreatorUserId))
+            .Filter(r => r.Metadata.IsActive && _user.can_access_user_data(r.Metadata.CreatorUserId))
             .SelectKeyValue(_definition_data, d => d.key)
             .Table()
             .Cache();
       }
 
       public IObservable<TableUpdate<AlgoData, AlgoKey>> definitions { get; }
-      public IObservable<TableUpdate<AlgoTemplateData, AlgoKey>> templates => Observable.Empty<TableUpdate<AlgoTemplateData, AlgoKey>>();
       public IAlgoDefinitionMetadataService metadata_service { get; }
       public bts.config.AlgoStudioOptions ui_configuration { get; } = config.Configuration.get<bts.config.AlgoStudioOptions>();
 
-      public IObservable<TableUpdate<AlgoTemplateData, AlgoKey>> subscribe_definition_templates(AlgoKey definition_key) =>
-         Observable.Return(TableUpdate<AlgoTemplateData, AlgoKey>.mk_empty(t => t.key));
-
       public async Task<AlgoData?> save_definition(AlgoData definition_data) {
          var (value, success) = await _error_reporter.safe_execute(() => _service.save_algo_definition_async(
-            _with_key(new AlgoDefinitionUpdateRequest { UserId = _admin_model.user.id, Algo = _template(definition_data) }, definition_data.key)),
-            r => r.Success, r => r.ErrorMessage, "saving template");
+            _with_key(new AlgoDefinitionUpdateRequest { UserId = _user.id, Algo = _api_definition(definition_data) }, definition_data.key)),
+            r => r.Success, r => r.ErrorMessage, "saving definition");
          if (success)
             return _definition_data(new AlgoDefinitionRecordImmutable(value.Record));
          return null;
@@ -53,23 +47,22 @@ namespace mbts.spark {
       public async Task<bool> remove_definition(AlgoKey definition_key) {
          var req = new AlgoDefinitionRemoveRequest();
          _set_key(ref req, definition_key);
-         (AlgoDefinitionRemoveResponse resp, bool success) = await _error_reporter.safe_execute(() => _service.remove_algo_definition_async(req), r => r.Success, r => r.ErrorMessage, "remove template");
+         (AlgoDefinitionRemoveResponse resp, bool success) = await _error_reporter.safe_execute(
+            () => _service.remove_algo_definition_async(req),
+            r => r.Success,
+            r => r.ErrorMessage,
+            "remove definition");
          return success;
       }
 
-      public Task<AlgoTemplateData?> save_template(AlgoTemplateData template_data) => Task.FromResult((AlgoTemplateData?)null);
-
-      public Task<bool> remove_template(AlgoKey key) =>
-         Task.FromResult(false);
-
       public void Dispose() =>
          Disposable.dispose(ref _dispose);
 
-      static AlgoDefinition _template(AlgoData definition_data) =>
+      static AlgoDefinition _api_definition(AlgoData definition_data) =>
          new AlgoDefinition { Name = definition_data.name, Definition = definition_data.value.CloneToMutable() };
 
-      static AlgoDefinitionImmutable _templatei(AlgoData definition_data) =>
-         new AlgoDefinitionImmutable(_template(definition_data));
+      static AlgoDefinitionImmutable _api_definitioni(AlgoData definition_data) =>
+         new AlgoDefinitionImmutable(_api_definition(definition_data));
 
       static AlgoData _definition_data(AlgoDefinitionRecordImmutable recordi) =>
          AlgoData.from_record(recordi);
@@ -99,11 +92,5 @@ namespace mbts.spark {
             default: throw ExceptionBuilder.Argument.unexpected_case(key.mode, nameof(key));
          }
       }
-
-      void _report_error(string present_progressive_desc, string msg) =>
-      _error_reporter.report_error($"Error {present_progressive_desc}: {msg}", AlgoStudioWindow.NAME, System.Windows.MessageBoxImage.Warning);
-
-      void _report_no_user_id(string desc) =>
-         _error_reporter.report_error($"{desc} failed: did not find current user id");
    }
-}
+}

src/client/spark/Modules/Trading/AlgoStudio/Model/IAlgoStudioModel.cs

@@ -7,13 +7,9 @@ using System.Threading.Tasks;
 namespace mbts.spark {
    interface IAlgoStudioModel {
       IObservable<TableUpdate<AlgoData, AlgoKey>> definitions { get; }
-      IObservable<TableUpdate<AlgoTemplateData, AlgoKey>> templates { get; }
-      IObservable<TableUpdate<AlgoTemplateData, AlgoKey>> subscribe_definition_templates(AlgoKey definition_key);
       IAlgoDefinitionMetadataService metadata_service { get; }
       Task<AlgoData?> save_definition(AlgoData definition_data);
-      Task<AlgoTemplateData?> save_template(AlgoTemplateData template_data);
       Task<bool> remove_definition(AlgoKey definition_key);
-      Task<bool> remove_template(AlgoKey template_key);
       bts.config.AlgoStudioOptions ui_configuration { get; }
    }
 

src/client/spark/Modules/Trading/AlgoStudio/Model/Metadata/AlgoDefinitionMetadata.cs

@@ -11,6 +11,8 @@ namespace mbts.spark {
    /// decouple the client-side key type from the server-side one, so both key types may evolve independently moving forward.
    /// </summary>
    struct AlgoDefinitionMetadata : IEquatable<AlgoDefinitionMetadata> {
+      public static readonly Func<AlgoDefinitionMetadata, AlgoKey> key_fn = m => m.id;
+
       public readonly AlgoKey id, default_template;
       readonly AlgoKey[] _favorite_templates;
       public readonly bool is_favorite, is_hidden;

src/client/spark/Modules/Trading/AlgoStudio/Utils/AlgoCollectionHelper.cs

@@ -35,34 +35,21 @@ namespace mbts.spark {
                Comparer<IAlgoVM>.Create(_CompareUtils.compare_names)
             }).to_comparer().to_safe();
 
-      public static void update_persisted_definitions(ObservableKeyedCollection<AlgoDefinitionVM, AlgoKey> target, TableUpdate<AlgoData, AlgoKey> update, Func<AlgoData, AlgoDefinitionVM> factory) {
-         foreach (var d in update.removed)
-            target.Remove(d.key);
-         foreach (var d in update.changed)
+      public static void update_persisted_definitions(ObservableKeyedCollection<AlgoDefinitionVM, AlgoKey> target, TableUpdate<AlgoData, AlgoKey> update, Func<AlgoData, AlgoDefinitionVM> factory) =>
+         update_persisted_definitions(target, update.added, update.changed, update.removed.Select(AlgoData.key_fn), factory);
+
+      public static void update_persisted_definitions(ObservableKeyedCollection<AlgoDefinitionVM, AlgoKey> target, IEnumerable<AlgoData> added, IEnumerable<AlgoData> changed, IEnumerable<AlgoKey> removed, Func<AlgoData, AlgoDefinitionVM> factory) {
+         foreach (var k in removed)
+            target.Remove(k);
+         foreach (var d in changed)
             target[d.key].load(d);
-         foreach (var d in update.added) {
+         foreach (var d in added) {
             if (target.TryGetValue(d.key, out AlgoDefinitionVM def)) {
                def.load(d);
             } else target.Add(factory(d));
          }
       }
 
-      public static void update_persisted_definition_wrappers(IDictionary<AlgoKey, IAlgoVM> target, TableUpdate<AlgoData, AlgoKey> update, Func<AlgoData, AlgoDefinitionVM> factory) {
-         foreach (var d in update.removed)
-            target.Remove(d.key);
-         foreach (var d in update.changed) {
-            var vm = target[d.key];
-            if (vm is AlgoVMWrapper wrapper) {
-               wrapper.value.load(d);
-            } else vm.load_from(d.value);
-         }
-         foreach (var d in update.added) {
-            if (target.TryGetValue(d.key, out IAlgoVM def)) {
-               def.load_from(d.value);
-            } else target.Add(d.key, new AlgoVMWrapper(factory(d)));
-         }
-      }
-
       public static void commit_all(this IEnumerable<AlgoParamRowVM> algo_param_rows) =>
          algo_param_rows.Select(r => r.param).commit_all();
 

src/client/spark/Modules/Trading/AlgoStudio/VM/AlgoDefinitionVM.cs

@@ -42,21 +42,21 @@ namespace mbts.spark {
       readonly Property<string> _name, _abbreviation;
       readonly ObservableKeyedCollection<IAlgoVM, AlgoKey> _algo_roots = new ObservableKeyedCollection<IAlgoVM, AlgoKey>(vm => vm.id);
       readonly DeferrableActionWrapper _refresh_on_local_changes;
-      readonly Property<AlgoFormats> _selected_format;
       readonly EnumMaskInt32<AlgoEditingPermissions> _permissions_mask = new EnumMaskInt32<AlgoEditingPermissions>();
 
       int? _favorite_index;
       Brush _badge_fill;
       Snapshot? _committed;
       AlgoDefinitionMetadata _metadata;
+      IDisposable _loaded_data_hook;
 
-      public static AlgoDefinitionVM create(OrdersModel model, AlgoData data, AlgoFormats init_format = AlgoFormats.Exchange, AlgoEditingPermissions editing_permissions = (AlgoEditingPermissions)int.MaxValue) =>
-         new AlgoDefinitionVM(model, data, init_format, editing_permissions);
+      public static AlgoDefinitionVM create(OrdersModel model, AlgoData data, AlgoEditingPermissions editing_permissions = (AlgoEditingPermissions)int.MaxValue) =>
+         new AlgoDefinitionVM(model, data, editing_permissions);
 
-      public static AlgoDefinitionVM create_placeholder(OrdersModel model, CustomOrderDefinitionImmutable def, string name, AlgoFormats init_format) =>
-         new AlgoDefinitionVM(model, AlgoData.create_unpersisted(def, name), init_format, (AlgoEditingPermissions)int.MaxValue);
+      public static AlgoDefinitionVM create_placeholder(OrdersModel model, CustomOrderDefinitionImmutable def, string name) =>
+         new AlgoDefinitionVM(model, AlgoData.create_unpersisted(def, name), (AlgoEditingPermissions)int.MaxValue);
 
-      AlgoDefinitionVM(OrdersModel model, AlgoData def_data, AlgoFormats init_format, AlgoEditingPermissions init_permissions) {
+      AlgoDefinitionVM(OrdersModel model, AlgoData def_data, AlgoEditingPermissions init_permissions) {
          // init core data
          _model = model;
          _permissions_mask.mask = init_permissions;
@@ -68,13 +68,18 @@ namespace mbts.spark {
             editing_permissions_mask ^= (AlgoEditingPermissions.AllowEditStructure | AlgoEditingPermissions.AllowSaveStructure);
          key = def_data.key;
          algos_view = ObservableAutoWrapper.create_sorted_wrapper(_algo_roots, AlgoCollectionHelper.algo_vm_comparer);
-         custom_badge_color_palettes.AddRange(ColorPalette.all_presets(model.factory).Select(p => new ColorPaletteVM(p)));
+         // badge color picker palettes
+         custom_badge_color_palettes.AddRange(ColorPalette.all_presets().Select(p => new ColorPaletteVM(p)));
+         var root_algo_color_item = new NamedColorVM(new NamedColor { name = "(Root Algo Type)" }, false);
+         var algo_type_color_palette = new ColorPaletteVM(ColorPalette.factory_order_colors_palette(model.factory));
+         algo_type_color_palette.named_colors.Insert(0, root_algo_color_item);
+         custom_badge_color_palettes.Insert(0, algo_type_color_palette);
+         //
          _version = new VersionContainer<Snapshot>(_snapshot);
          var conf = _model.algo_model.ui_configuration;
          // init backing props
          _name = backing(nameof(name), def_data.name);
          _abbreviation = backing(nameof(abbreviation), string.Empty);
-         _selected_format = backing(nameof(selected_format), init_format);
          _is_favorite = backing(nameof(is_favorite), () => _favorite_index.HasValue);
          _is_expanded = backing(nameof(is_expanded), true);
          _is_selected = backing(nameof(is_selected), true);
@@ -91,6 +96,7 @@ namespace mbts.spark {
          _can_undo = backing(nameof(can_undo), () => _edit_stack.get_can_undo(_version.value));
          _can_redo.Changed += on_can_redo_changed;
          _can_undo.Changed += on_can_undo_changed;
+         custom_badge_color.enabled_changed += on_use_custom_badge_color_changed;
          _refresh_on_local_changes = new DeferrableActionWrapper(on_local_changed);
          // load initial state
          // visible_algo_root is selected_template.algo_root if user can add templates, otherwise algo_root
@@ -103,16 +109,13 @@ namespace mbts.spark {
                as_demuxer().subscribe_many(_refresh_on_local_changes.execute, nameof(this.name), nameof(abbreviation), nameof(badge_fill)),
                _edit_pane_vs_model.add_source(VisualStateNames.BadgeSelector.GroupName, custom_badge_color.observe_nullable(true).Select(t => t.HasValue ? VisualStateNames.BadgeSelector.Active : VisualStateNames.BadgeSelector.Inactive)),
                _edit_pane_vs_model.add_source(VisualStateNames.Abbreviation.GroupName, _abbreviation.observe_current(true).Select(a => string.IsNullOrEmpty(a) ? VisualStateNames.Abbreviation.Unpopulated : VisualStateNames.Abbreviation.Populated)),
-               _algo_root.observe_current(true).SubscribeEach(vm =>
-                  vm == null ? null :
-                     Disposable.Create(
-                        vm.subscribe_is_dirty().Subscribe(v => {
-                           if (!v) {
-                              _version.increment_version();
-                              _on_committed_changed();
-                           }
-                        }),
-                        vm.subscribe_definition().Subscribe(_ => _refresh_on_local_changes.execute()))),
+               _algo_root.observe_current(true).SubscribeEach(vm => {
+                  if (vm != null) {
+                     root_algo_color_item.assign_color(vm.meta.Color.argb_color());
+                     return vm.subscribe_definition().Subscribe(_ => _refresh_on_local_changes.execute());
+                  }
+                  return null;
+               }),
                ObservableAutoWrapper.connect_item_hooks(algo_roots, a => a as IDisposable ?? Disposable.empty, true),
                Disposable.Create(() => {
                   _can_redo.Changed -= on_can_redo_changed;
@@ -129,17 +132,6 @@ namespace mbts.spark {
                   break;
             }
             var permission_src = _permissions_mask.observe_result();
-            resources.Add(_selected_format.observe_current(true).CombineLatest(permission_src, (fmt, perms) => (fmt, perms))
-               .SubscribeEach(t => {
-                  if ((t.perms & AlgoEditingPermissions.AllowEditStructure) != 0) {
-                     using (_refresh_on_local_changes.defer_execution()) {
-                        var algo_data = model.factory.default_algos(t.fmt);
-                        var default_algo = AlgoKey.from_known_type(OrderDataHelper.get_default_algo(t.fmt));
-                        return this.load_algo_data_recursive(algo_data, default_algo);
-                     }
-                  }
-                  return Disposable.empty;
-               }));
             resources.Add(permission_src.Subscribe(_ => RaisePropertyChanged(nameof(editing_permissions))));
             resources.Add(this.connect_data(permission_src));
             resources.Add(this.connect_data(Observable.Return(model)));
@@ -153,6 +145,10 @@ namespace mbts.spark {
          // local methods
          void on_can_redo_changed(bool oldval, bool newval) => can_redo_changed?.Invoke();
          void on_can_undo_changed(bool oldval, bool newval) => can_undo_changed?.Invoke();
+         void on_use_custom_badge_color_changed() {
+            if (!custom_badge_color.enabled && algo_root != null)
+               custom_badge_color.value = algo_root.meta.Color.argb_color();
+         }
          void on_local_changed() {
             _version.increment_version();
             if (algo_root != null)
@@ -190,12 +186,10 @@ namespace mbts.spark {
       public AlgoDisplayGroup group => key.display_group();
       public bool can_redo => _can_redo.Value;
       public bool can_undo => _can_undo.Value;
+      //public bool use_custom_badge_color
       public EnabledValueVM<Color> custom_badge_color { get; } = new EnabledValueVM<Color>();
       public ObservableCollection<ColorPaletteVM> custom_badge_color_palettes { get; } = new ObservableCollection<ColorPaletteVM>();
       public Brush badge_fill => _badge_fill;
-      // format
-      public AlgoFormats selected_format { get => _selected_format.Value; set => _selected_format.set(value); }
-      public ObservableCollection<AlgoFormats> formats { get; } = new ObservableCollection<AlgoFormats> { AlgoFormats.Exchange, AlgoFormats.Spreader, AlgoFormats.Exchange | AlgoFormats.Spreader };
       // visual states
       public ObservableCollection<string> edit_pane_visual_states => _edit_pane_vs_model.states;
       public ObservableCollection<string> tree_view_visual_states => _tree_view_vs_model.states;
@@ -227,12 +221,20 @@ namespace mbts.spark {
          get => algo_root;
          set => algo_root = value;
       }
+      IAlgoVM IAlgoParamVM<IAlgoVM>.display_value {
+         get => algo_root;
+         set => algo_root = value;
+      }
       bool IAlgoParamVM.has_value => _algo_root != null;
       bool IAlgoParamVM.is_enabled { get; set; } = true;
       object IAlgoParamVM.value {
          get => algo_root;
          set => algo_root = (IAlgoVM)value;
       }
+      object IAlgoParamVM.display_value {
+         get => algo_root;
+         set => algo_root = (IAlgoVM)value;
+      }
       AlgoParamPermissions _permissions = AlgoParamPermissions.ReadWrite;
       AlgoParamPermissions IAlgoParamVM.permissions { get => _permissions; set => _permissions = value; }
 
@@ -253,17 +255,14 @@ namespace mbts.spark {
       void IObserver<(IReadOnlyDictionary<AlgoKey, AlgoData> algo_data, AlgoKey? default_algo)>.OnError(Exception error) { }
       #endregion
 
-      void _load_algo_data(IReadOnlyDictionary<AlgoKey, AlgoData> algo_data, AlgoKey? default_algo) {
-         var orig_algo = algo_root?.id;
-         _algo_roots.SyncWithDictionary(algo_data, d => OrderTypeVMFactory.create(d, is_expanded: true));
-         if (!try_select(orig_algo) && !try_select(default_algo))
-            algo_root = algo_roots.FirstOrDefault();
-         //
-         bool try_select(AlgoKey? algo_key) {
-            if (algo_key.HasValue && _algo_roots.TryGetValue(algo_key.Value, out IAlgoVM match)) {
+      void _load_algo_data(IReadOnlyDictionary<AlgoKey, AlgoData> data, AlgoKey? default_algo) {
+         Disposable.dispose(ref _loaded_data_hook);
+         _algo_roots.SyncWithDictionary(data, d => OrderTypeVMFactory.create(d, is_expanded: true));
+         _loaded_data_hook = ObservableAutoWrapper.connect_item_hooks(algo_roots, vm =>
+            ObservableAutoWrapper.connect_item_actions(vm.child_algo_selectors, s => s.load_algo_data(data, null)));
+         if (algo_root == null || !_algo_roots.ContainsKey(algo_root.id)) {
+            if (default_algo.HasValue && _algo_roots.TryGetValue(default_algo.Value, out IAlgoVM match))
                algo_root = match;
-               return true;
-            } else return false;
          }
       }
 
@@ -329,7 +328,7 @@ namespace mbts.spark {
 
       // pass a copy of the persisted state - rather than use local values - because if something goes wrong, it is better to be in sync with data fresh from the server/api.
       public AlgoDefinitionVM to_persisted(AlgoData def) =>
-         new AlgoDefinitionVM(_model, def, selected_format, editing_permissions_mask);
+         new AlgoDefinitionVM(_model, def, editing_permissions_mask);
 
       public AlgoData create_algo_def() =>
          AlgoData.create(algo_root == null ? new CustomOrderDefinitionImmutable(new CustomOrderDefinition()) : algo_root.definition, name, key);
@@ -351,7 +350,6 @@ namespace mbts.spark {
 
       void _assign_from_data(Snapshot state) {
          _assign_from_data(state.data);
-         _selected_format.set(state.format);
          _abbreviation.set(state.abbreviation);
          custom_badge_color.set_nullable(state.custom_badge_color);
       }
@@ -412,41 +410,36 @@ namespace mbts.spark {
       }
 
       Snapshot _snapshot() =>
-         new Snapshot(create_algo_def(), abbreviation, custom_badge_color.get_nullable(), selected_format);
+         new Snapshot(create_algo_def(), abbreviation, custom_badge_color.get_nullable());
 
       public struct Snapshot : IEquatable<Snapshot> {
          public readonly AlgoData data;
          public readonly string abbreviation;
          public readonly Color? custom_badge_color;
-         public readonly AlgoFormats format;
 
-         public Snapshot(AlgoData data, string abbreviation, Color? custom_badge_color, AlgoFormats format) {
+         public Snapshot(AlgoData data, string abbreviation, Color? custom_badge_color) {
             this.data = data;
             this.abbreviation = abbreviation;
             this.custom_badge_color = custom_badge_color;
-            this.format = format;
          }
 
          public bool Equals(Snapshot other) =>
             data == other.data &&
             abbreviation == other.abbreviation &&
-            custom_badge_color == other.custom_badge_color &&
-            format == other.format;
+            custom_badge_color == other.custom_badge_color;
 
          public override bool Equals(object obj) => EqualityComparer.equals_obj(this, obj);
          public override int GetHashCode() =>
             EqualityComparer.aggregate_hash(
                data.GetHashCode(),
                abbreviation?.GetHashCode() ?? 0,
-               custom_badge_color?.GetHashCode() ?? 0,
-               (int)format);
+               custom_badge_color?.GetHashCode() ?? 0);
 #if DEBUG
          public override string ToString() {
             var sb = new System.Text.StringBuilder();
             sb.Append($"name: {data.name}; ");
             sb.Append($"abbrev.: {abbreviation}; ");
             sb.Append($"badge: {custom_badge_color} ");
-            sb.Append($"fmt: {format} ");
             sb.Append($"def: {data.value}");
             return sb.ToString();
          }
@@ -460,7 +453,6 @@ namespace mbts.spark {
          public bool Equals(Snapshot x, Snapshot y) =>
             x.abbreviation == y.abbreviation &&
             x.custom_badge_color == y.custom_badge_color &&
-            x.format == y.format &&
             x.data.key == y.data.key &&
             x.data.name == y.data.name &&
             x.data.value.Equals(y.data.value);

src/client/spark/Modules/Trading/AlgoStudio/VM/AlgoStudioVM.cs

@@ -1,7 +1,11 @@
 using bts;
+using bts.api;
+using bts.api.core;
 using bts.api.orderman;
+using bts.collections;
 using bts.utils;
 using mbts.collections;
+using mbts.spark.utilities;
 using mbts.ui;
 using mbts.ui.shell;
 using mbts.ui.utility;
@@ -13,7 +17,6 @@ using System.Linq;
 using System.Reactive.Disposables;
 using System.Reactive.Linq;
 using System.Threading.Tasks;
-using System.Windows;
 using System.Windows.Input;
 using StartupData = bts.shell.AlgoStudioWindowFactory.StartupData;
 
@@ -38,7 +41,6 @@ namespace mbts.spark {
    }
 
    class AlgoStudioVM : DisposableViewModelBase {
-      static readonly AlgoFormats _studio_formats = AlgoFormats.Exchange;
       readonly OrdersModel _model;
       readonly Property<AlgoDefinitionVM> _selected_definition;
       readonly Property<IAlgoVM> _editable_content;
@@ -71,29 +73,42 @@ namespace mbts.spark {
          _revert_cmd_tooltip = backing(nameof(revert_cmd_tooltip), get_revert_tooltip);
          //
          _dispose = new CompositeDisposable(
-            _model.algo_model.definitions.Subscribe(_definitions_update_buffer),
-            _definitions_update_buffer.OnDispatcher().Subscribe(u => {
-               var orig_selected_def = selected_definition;
-               AlgoCollectionHelper.update_persisted_definitions(_definitions, u, d => AlgoDefinitionVM.create(model, d, _studio_formats));
+            _model.subscribe_complete_algos(allow_undefined_child: true).OnDispatcher().Subscribe(_definitions_update_buffer),
+            _definitions_update_buffer.OnDispatcher()
+            .SubscribeEach(u => {
+               u.FilterIncremental(a => a.key.is_composite, out var added, out var changes, out var removed);
+               AlgoCollectionHelper.update_persisted_definitions(
+                  _definitions, added, changes.New(), removed.Select(AlgoData.key_fn), algo => AlgoDefinitionVM.create(_model, algo));
                if (selected_definition == null)
                   selected_definition = definitions.FirstOrDefault();
+               // Load the algo building blocks (i.e., factory and dynamic algos):
+               //    - Composite algos cannot reference other composite algos - that would create awkward dependency issues as composite algos can be modified/deleted.
+               //    - Spreader algos are filtered out as well, because that don't actually mean anything to the algo structure.
+               //      Synthetic securities in our system are defined by a set of contract legs, and a [single]strategy.
+               //      Note: synthetic strategy templates, however, could be introduced at a later date (no reason why 1 synthetic security couldn't have several ExecutionStrategies).
+               var algo_building_blocks = new FilteredDictionary<AlgoKey, AlgoData>(
+                  u.state,
+                  a => a.key.mode == AlgoKey.Mode.Dynamic || (a.key.mode == AlgoKey.Mode.Factory && a.key.factory != CustomOrderDefinition.CustomOneofCase.Spreader));
+               return ObservableAutoWrapper.connect_item_actions(_definitions.AsCollection(),
+                  d => ((IAlgoSelector)d).load_algo_data(algo_building_blocks, null));
             }),
             _model.algo_model.metadata_service.subscribe_metadata().OnDispatcher().Subscribe(meta => {
                _persisted_meta = meta;
                definitions_view.Refresh();
             }),
-            ObservableAutoWrapper.connect(subscribe_definition().Select(def => def?.edit_pane_visual_states ?? new ObservableCollection<string>()), content_visual_states),
             subscribe_definition().SelectManyInSeries(def => def?.subscribe_is_definition_dirty() ?? Observable.Return(false)).OnDispatcher()
-            .Subscribe(new CompositeObserver<bool>(save_cmd, revert_cmd) { val => {
-               _save_cmd_tooltip.refresh();
-               _revert_cmd_tooltip.refresh();
-            } }),
+            .Subscribe(new CompositeObserver<bool>(save_cmd, revert_cmd) {
+               val => {
+                  _save_cmd_tooltip.refresh();
+                  _revert_cmd_tooltip.refresh();
+               }
+            }),
             ObservableAutoWrapper.connect_item_hooks(definitions, d => new CompositeDisposable(_any_dirty_monitor.join(d), d), true));
          // local methods
          string get_revert_tooltip() {
             var def = selected_definition;
             return def != null && def.key.mode == AlgoKey.Mode.Persisted ?
-               (def.is_dirty ? $"Revert changes to '{def.name}' templates" : "No changes to revert") :
+               (def.is_dirty ? $"Revert changes to '{def.name}'" : "No changes to revert") :
                null;
          }
          async Task save_async(IAlgoStudioContentVM content) {
@@ -105,7 +120,7 @@ namespace mbts.spark {
             if (def != null) {
                switch (def.key.mode) {
                   case AlgoKey.Mode.Unpersisted: return def.is_dirty ? $"Save '{def.name}'" : $"Cannot Save '{def.name}'";
-                  case AlgoKey.Mode.Persisted: return def.is_dirty ? $"Save changes to '{def.name}' templates" : "No changes to save";
+                  case AlgoKey.Mode.Persisted: return def.is_dirty ? $"Save changes to '{def.name}'" : "No changes to save";
                }
             }
             return null;
@@ -125,7 +140,7 @@ namespace mbts.spark {
          }
 
          void add_definition_common(CustomOrderDefinitionImmutable def, string name) {
-            var new_def = AlgoDefinitionVM.create_placeholder(_model, def, name, _studio_formats);
+            var new_def = AlgoDefinitionVM.create_placeholder(_model, def, name);
             _definitions.Add(new_def);
             selected_definition = new_def;
             request_view_focus_name?.Invoke(new_def);

src/client/spark/Modules/Trading/AlgoStudio/VM/AlgoVMWrapper.cs

@@ -1,214 +0,0 @@
-using bts.api;
-using bts.api.orderman;
-using bts.collections;
-using bts.spark;
-using mbts.spark.utilities;
-using mbts.ui;
-using mbts.ui.controls;
-using mbts.ui.shell;
-using mbts.utils;
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Collections.Specialized;
-using System.ComponentModel;
-using System.Reactive.Disposables;
-using System.Reactive.Linq;
-using System.Threading.Tasks;
-using System.Windows.Input;
-
-namespace mbts.spark {
-   class AlgoVMWrapper : DisposableViewModelBase, IAlgoVM,
-      IObserver<SecurityMD?>,
-      IObserver<SecurityImmutable?>,
-      IObserver<OrdersModel>,
-      IObserver<AlgoEditingPermissions> {
-      static readonly HashSet<string>
-         _algo_root_echo_props = new HashSet<string> {
-            nameof(is_expanded),
-            nameof(editing_permissions),
-            nameof(definition),
-            nameof(display_name)
-         };
-      static readonly IReadOnlyDictionary<string, string>
-         _value_echo_props = new Dictionary<string, string> {
-            { nameof(AlgoDefinitionVM.name), nameof(display_name) },
-            { nameof(AlgoDefinitionVM.abbreviation), nameof(abbreviation) },
-            { nameof(AlgoDefinitionVM.badge_fill), nameof(meta) }
-         };
-      readonly ObservableAggregateCollection<IAlgoSelector> _child_algo_selectors = new ObservableAggregateCollection<IAlgoSelector>();
-      readonly ObservableAggregateCollection<IAlgoParamVM> _algo_params = new ObservableAggregateCollection<IAlgoParamVM>();
-      readonly DisposableContainer _value_hooks = new DisposableContainer();
-      Action _definition_changed = () => { };
-      _ObservedData? _data_cache;
-      AlgoDefinitionVM _value;
-
-      public AlgoVMWrapper(AlgoDefinitionVM algo_definition_vm) {
-         value = algo_definition_vm;
-         _dispose = new CompositeDisposable(_value_hooks) {
-            _child_algo_selectors.clear_collections,
-            _algo_params.clear_collections,
-            () => _value?.Dispose()
-         };
-      }
-
-      public event Action definition_changed { add => _definition_changed += value; remove => _definition_changed -= value; }
-
-      public AlgoDefinitionVM value {
-         get => _value;
-         set {
-            if (_value != value) {
-               _value?.Dispose();
-               _value = value;
-               _value_hooks.replace(_set_hooks(value));
-               RaisePropertyChanged(nameof(value));
-            }
-         }
-      }
-      public AlgoKey id => _value.key;
-      public CustomOrderDefinition.CustomOneofCase order_type => _algo_root?.order_type ?? CustomOrderDefinition.CustomOneofCase.None;
-      public OrderMetadata meta {
-         get {
-            if (_value != null) {
-               if (_value.custom_badge_color.enabled)
-                  return new OrderMetadata { Color = value.custom_badge_color.value.rgb_color(), KeyBinding = value.abbreviation.if_null_or_empty(value.name) };
-               else if (_value.algo_root != null)
-                  return _value.algo_root.meta;
-            }
-            return OrderDataHelper.get_metadata(order_type);
-         }
-      }
-      public AlgoEditingPermissions editing_permissions => _value?.editing_permissions ?? AlgoEditingPermissions.None;
-      public bool can_expand => _algo_root?.can_expand ?? false;
-      public bool is_expanded {
-         get => _value.algo_root?.is_expanded ?? false;
-         set {
-            if (_value != null)
-               _value.is_expanded = value;
-         }
-      }
-      public string display_name => _value?.name ?? string.Empty;
-      public string abbreviation => _value?.abbreviation;
-      public AlgoDisplayGroup group => _value?.group ?? AlgoDisplayGroup.BTS;
-      public CustomOrderDefinitionImmutable definition => _algo_root?.definition ?? new CustomOrderDefinitionImmutable(new CustomOrderDefinition());
-      public ObservableCollection<IAlgoSelector> child_algo_selectors => _child_algo_selectors;
-      [EditorBrowsable(EditorBrowsableState.Never)]
-      public ObservableCollection<IAlgoSelector> child_algo_selectors_view {
-         get {
-            _value?.algo_root?.ensure_init();
-            return _child_algo_selectors;
-         }
-      }
-      public IReadOnlyObservableCollection<IAlgoParamVM> algo_params => _algo_params;
-      [EditorBrowsable(EditorBrowsableState.Never)]
-      public dynamic children_vm => _algo_root?.children_vm;
-
-      IAlgoVM _algo_root => _value?.algo_root;
-
-      public void assign_to(CustomOrderDefinition value) => _algo_root?.assign_to(value);
-      public bool key_match(KeyEventArgs e) => _algo_root?.key_match(e) ?? false;
-      public void load_from(CustomOrderDefinitionImmutable value) => _algo_root?.load_from(value);
-      public void load_many(IEnumerable<CustomOrderDefinitionImmutable> values) => _algo_root?.load_many(values);
-      void IAlgoVM.ensure_init() => _value?.algo_root?.ensure_init();
-
-      IDisposable _set_hooks(AlgoDefinitionVM vm) {
-         var algo_root_subs = new DisposableContainer();
-         vm.PropertyChanged += on_value_prop_changed;
-         return new CompositeDisposable(
-            vm.observe_algo_root().Subscribe(r => {
-               algo_root_subs.replace(null);
-               _child_algo_selectors.clear_collections();
-               _algo_params.clear_collections();
-               if (r != null) {
-                  if (_data_cache.HasValue) {
-                     _data_cache.Value.forward_to(r);
-                  }
-                  _child_algo_selectors.add_collection(r.child_algo_selectors);
-                  _algo_params.add_collection(r.algo_params);
-                  ((INotifyPropertyChanged)r).PropertyChanged += on_algo_root_prop_changed;
-                  algo_root_subs.replace(new CompositeDisposable(
-                     r.subscribe_definition().Subscribe(_ => _definition_changed?.Invoke())) {
-                     () => ((INotifyPropertyChanged)r).PropertyChanged -= on_algo_root_prop_changed
-                  });
-               }
-               RaisePropertyChanged(nameof(group));
-            }),
-            algo_root_subs) {
-            () => vm.PropertyChanged -= on_value_prop_changed
-         };
-         void on_algo_root_prop_changed(object sender, PropertyChangedEventArgs e) {
-            if (_algo_root_echo_props.Contains(e.PropertyName))
-               RaisePropertyChanged(e.PropertyName);
-         }
-         void on_value_prop_changed(object sender, PropertyChangedEventArgs e) {
-            if (_value_echo_props.TryGetValue(e.PropertyName, out string wrapper_prop))
-               RaisePropertyChanged(wrapper_prop);
-         }
-      }
-
-      // permissions
-      void IObserver<AlgoEditingPermissions>.OnNext(AlgoEditingPermissions value) {
-         _data_cache = _data_cache?.with(value) ?? new _ObservedData(value, default, default, default);
-         (_algo_root as IObserver<AlgoEditingPermissions>)?.OnNext(value);
-      }
-      void IObserver<AlgoEditingPermissions>.OnError(Exception error) { }
-      void IObserver<AlgoEditingPermissions>.OnCompleted() { }
-      // model
-      void IObserver<OrdersModel>.OnNext(OrdersModel value) {
-         _data_cache = _data_cache?.with(value) ?? new _ObservedData(default, value, default, default);
-         (_algo_root as IObserver<OrdersModel>)?.OnNext(value);
-      }
-      void IObserver<OrdersModel>.OnError(Exception error) { }
-      void IObserver<OrdersModel>.OnCompleted() { }
-      // security
-      void IObserver<SecurityImmutable?>.OnNext(SecurityImmutable? value) {
-         _data_cache = _data_cache?.with(value) ?? new _ObservedData(default, default, value, default);
-         (_algo_root as IObserver<SecurityImmutable?>)?.OnNext(value);
-      }
-      void IObserver<SecurityImmutable?>.OnError(Exception error) { }
-      void IObserver<SecurityImmutable?>.OnCompleted() { }
-      // security md
-      void IObserver<SecurityMD?>.OnNext(SecurityMD? value) {
-         _data_cache = _data_cache?.with(value) ?? new _ObservedData(default, default, default, value);
-         (_algo_root as IObserver<SecurityMD?>)?.OnNext(value);
-      }
-      void IObserver<SecurityMD?>.OnError(Exception error) { }
-      void IObserver<SecurityMD?>.OnCompleted() { }
-
-      struct _ObservedData {
-         public readonly AlgoEditingPermissions permissions;
-         public readonly OrdersModel model;
-         public readonly SecurityImmutable? security;
-         public readonly SecurityMD? security_md;
-
-         public _ObservedData(AlgoEditingPermissions permissions, OrdersModel model, SecurityImmutable? security, SecurityMD? security_md) {
-            this.permissions = permissions;
-            this.model = model;
-            this.security = security;
-            this.security_md = security_md;
-         }
-
-         public void forward_to(IAlgoVM recipient) {
-            (recipient as IObserver<AlgoEditingPermissions>)?.OnNext(permissions);
-            if (model != null)
-               (recipient as IObserver<OrdersModel>)?.OnNext(model);
-            if (security_md.HasValue)
-               (recipient as IObserver<SecurityMD?>)?.OnNext(security_md);
-            if (security.HasValue)
-               (recipient as IObserver<SecurityImmutable?>)?.OnNext(security);
-         }
-
-         public _ObservedData with(AlgoEditingPermissions? permissions) =>
-            new _ObservedData(permissions ?? this.permissions, model, security, security_md);
-
-         public _ObservedData with(OrdersModel model) =>
-            new _ObservedData(permissions, model, security, security_md);
-
-         public _ObservedData with(SecurityImmutable? security) =>
-            new _ObservedData(permissions, model, security, security_md);
-
-         public _ObservedData with(SecurityMD? security_md) =>
-            new _ObservedData(permissions, model, security, security_md);
-      }
-   }
-}

src/client/spark/Modules/Trading/AlgoStudio/View/AlgoEditorGridView/AlgoEditorGridView.xaml

@@ -199,18 +199,30 @@
                 Grid.Column="1"
                 HorizontalAlignment="Center"
                 Foreground="{u:BTSColor MarketData.bid}"
-                Text="{Binding DataContext.bbo.bid_size, RelativeSource={RelativeSource AncestorType=usp:AlgoEditorGridView}}"
                 ToolTip="Best Bid Size"
-              />
+              >
+                <TextBlock.Text>
+                  <MultiBinding Converter="{x:Static cv:DynamicDoubleDivisorConverter.Instance}">
+                    <Binding Path="DataContext.bbo.bid_size" RelativeSource="{RelativeSource AncestorType=usp:AlgoEditorGridView}" Mode="OneWay"/>
+                    <Binding Path="DataContext.display_quantity_divisor" RelativeSource="{RelativeSource AncestorType=usp:AlgoEditorGridView}" Mode="OneWay"/>
+                  </MultiBinding> 
+                </TextBlock.Text>
+              </TextBlock>
               <TextBlock
                 x:Name="ask_text"
                 Grid.Column="2"
                 HorizontalAlignment="Center"
                 Margin="4,0"
                 Foreground="{u:BTSColor MarketData.ask}"
-                Text="{Binding DataContext.bbo.ask_size, RelativeSource={RelativeSource AncestorType=usp:AlgoEditorGridView}}"
                 ToolTip="Best Ask Size"
-              />
+              >
+                <TextBlock.Text>
+                  <MultiBinding Converter="{x:Static cv:DynamicDoubleDivisorConverter.Instance}">
+                    <Binding Path="DataContext.bbo.ask_size" RelativeSource="{RelativeSource AncestorType=usp:AlgoEditorGridView}" Mode="OneWay"/>
+                    <Binding Path="DataContext.display_quantity_divisor" RelativeSource="{RelativeSource AncestorType=usp:AlgoEditorGridView}" Mode="OneWay"/>
+                  </MultiBinding> 
+                </TextBlock.Text>
+              </TextBlock>
             </Grid>
             <DataTemplate.Triggers>
               <DataTrigger Binding="{Binding path_disambiguation}" Value="{x:Static sys:String.Empty}">
@@ -272,6 +284,14 @@
               </Grid>
             </DataTemplate>
           </u:TemplateSelectorKeyValue>
+          <!--TODO: replace all the param.value bindings with param.display_value.
+              The reason this has not already been done is that the display_value property is new,
+              and only necessary for the size param as of 6/8/2020 (slightly more uniform code doesn't warrant rocking the boat).-->
+          <u:TemplateSelectorKeyValue Key="{x:Static usp:AlgoParamTemplateKeys.Size}">
+            <DataTemplate>
+              <TextBlock Text="{Binding param.display_value}"/>
+            </DataTemplate>
+          </u:TemplateSelectorKeyValue>
         </usp:AlgoParamTemplateSelector.KeyedTemplates>
         <!--Bool-->
         <usp:AlgoParamTemplateSelector.BoolTemplate>
@@ -282,7 +302,7 @@
         <!--Double-->
         <usp:AlgoParamTemplateSelector.DoubleTemplate>
           <DataTemplate>
-            <TextBlock Text="{Binding param.value, Converter={StaticResource DoubleTextConverter}}"/>
+            <TextBlock Text="{Binding param.display_value, Converter={StaticResource DoubleTextConverter}}"/>
           </DataTemplate>
         </usp:AlgoParamTemplateSelector.DoubleTemplate>
         <!--Enum-->
@@ -360,6 +380,22 @@
               />
             </DataTemplate>
           </u:TemplateSelectorKeyValue>
+          <!--TODO: replace all the param.value bindings with param.display_value.
+              The reason this has not already been done is that the display_value property is new,
+              and only necessary for the size param as of 6/8/2020 (slightly more uniform code doesn't warrant rocking the boat).-->
+          <u:TemplateSelectorKeyValue Key="{x:Static usp:AlgoParamTemplateKeys.Size}">
+            <DataTemplate>
+              <c:TickUpDownNullableInt Focusable="False" HorizontalAlignment="Stretch" Value="{Binding param.display_value, UpdateSourceTrigger=PropertyChanged}" ArrowKeyTickModifiers="Ctrl">
+                <c:TickUpDownNullableInt.CommandBindings>
+                  <CommandBinding Command="{x:Static u:NavigationHelper.MoveFocusCommand}" Executed="{x:Static u:NavigationHelper.KeyboardMoveFocusExecuted}"/>
+                </c:TickUpDownNullableInt.CommandBindings>
+                <c:TickUpDownNullableInt.InputBindings>
+                  <KeyBinding Key="Up" Command="{x:Static u:NavigationHelper.MoveFocusCommand}" CommandParameter="{x:Static FocusNavigationDirection.Up}"/>
+                  <KeyBinding Key="Down" Command="{x:Static u:NavigationHelper.MoveFocusCommand}" CommandParameter="{x:Static FocusNavigationDirection.Down}"/>
+                </c:TickUpDownNullableInt.InputBindings>
+              </c:TickUpDownNullableInt>
+            </DataTemplate>
+          </u:TemplateSelectorKeyValue>
         </usp:AlgoParamTemplateSelector.KeyedTemplates>
         <!--Bool-->
         <usp:AlgoParamTemplateSelector.BoolTemplate>
@@ -370,7 +406,7 @@
         <!--Double-->
         <usp:AlgoParamTemplateSelector.DoubleTemplate>
           <DataTemplate>
-            <c:TickUpDownDouble x:Name="tick_up_down" Focusable="False" HorizontalAlignment="Stretch" Value="{Binding param.value, UpdateSourceTrigger=PropertyChanged}" ArrowKeyTickModifiers="Ctrl">
+            <c:TickUpDownDouble x:Name="tick_up_down" Focusable="False" HorizontalAlignment="Stretch" Value="{Binding param.display_value, UpdateSourceTrigger=PropertyChanged}" ArrowKeyTickModifiers="Ctrl">
               <c:TickUpDownDouble.CommandBindings>
                 <CommandBinding Command="{x:Static u:NavigationHelper.MoveFocusCommand}" Executed="{x:Static u:NavigationHelper.KeyboardMoveFocusExecuted}"/>
               </c:TickUpDownDouble.CommandBindings>

src/client/spark/Modules/Trading/AlgoStudio/View/AlgoEditorGridView/AlgoParamRowsHelper.cs

@@ -39,31 +39,6 @@ namespace mbts.spark {
          }
       }
 
-      static IDisposable _wrap_rows(AlgoDefinitionVM algo_def, ObservableAggregateCollection<AlgoParamRowVM> rows, bool include_algo_type_rows) {
-         AlgoParamRowVM root = null;
-         ObservableAggregateCollection<AlgoParamRowVM> algo_params;
-         if (include_algo_type_rows) {
-            // while normal params live and die with the selected algo-type (when the algo-type changes, they are removed, and replaced with params for the new algo type),
-            // the algo-type row is constant (it is the row with the algo-type dropdown, which the user may use to select different algos).
-            algo_params = new ObservableAggregateCollection<AlgoParamRowVM>();
-            rows.add_collection(new ObservableAppendCollection<AlgoParamRowVM>(algo_params, root = new AlgoSelectorParamRowVM(new AlgoVMWrapper(algo_def), algo_def, null)).AsReadOnly());
-         } else {
-            algo_params = rows;
-         }
-         return algo_def.observe_algo_root().SubscribeEach(a => {
-            algo_params.clear_collections();
-            if (a == null)
-               return Disposable.empty;
-            var child_rows = new ObservableAggregateCollection<AlgoParamRowVM>();
-            /// Note: the order of operations here matters
-            ///   <see cref="_wrap_rows(IAlgoVM, AlgoParamRowVM, ObservableAggregateCollection{AlgoParamRowVM}, bool)" /> has the potential to trigger a lot of CollectionChanged events (depending on how deep the algo-tree is).
-            ///   There is no need to burden the aggregate 'rows' with echoing all of these events, if the child-row collection is finished changing when it is added to the aggregate.
-            var hook = _wrap_rows(a, root, child_rows, include_algo_type_rows);
-            algo_params.add_collection(child_rows.AsReadOnly());
-            return hook;
-         });
-      }
-
       static IDisposable _wrap_rows(IAlgoVM algo_root, AlgoParamRowVM parent, ObservableAggregateCollection<AlgoParamRowVM> all_rows, bool include_algo_type_rows) {
          var wrapped_params = new ObservableAutoWrapper<AlgoParamRowVM, IAlgoParamVM>(algo_root.algo_params, pvm => new AlgoParamRowVM(algo_root, pvm, parent));
          var selector_params = new ObservableCollection<AlgoParamRowVM>();
@@ -85,4 +60,4 @@ namespace mbts.spark {
          }
       }
    }
-}
+}

src/client/spark/Modules/Trading/AlgoStudio/View/AlgoEditorView.xaml

@@ -106,7 +106,7 @@
     </GroupBox.Header>
     <ContentControl
       Grid.IsSharedSizeScope="True"
-      Content="{Binding algo_root, Converter={x:Static usp:AlgoContentTemplateSelector.DataContextConverter}}"
+      Content="{Binding algo_root}"
       ContentTemplateSelector="{StaticResource AlgoTemplateSelector}"
       Margin="{StaticResource Margin.TP1}"
       Visibility="{Binding algo_root.can_expand, Converter={StaticResource BooleanToVisibilityConverter}}"

src/client/spark/Modules/Trading/Fills/FillsVM.cs

@@ -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;
@@ -122,7 +123,7 @@ namespace mbts.spark {
          add_col(Columns.Account, DefaultColumnHeaders.Account, r => r.account, dv_filter_rx(_model.factory.subscribe_accounts().Select(d => d.Values.Ordered()), r => r.account), DataGridFilterKnownTemplates.DiscreteValues, DefaultColumnWidths.Account);
          add_col(Columns.Exchange, DefaultColumnHeaders.Exchange, r => r.exchange.ToString(), dv_filter(EnumHelper.get_values<Venue>().ToArray(), r => r.security.exchange_or_default()), DataGridFilterKnownTemplates.DiscreteValues, DefaultColumnWidths.Exchange);
          add_col(Columns.TimeInForce, DefaultColumnHeaders.TimeInForce, r => r.time_in_force.ToString(), dv_filter(EnumHelper.get_values<TimeInForce>().ToArray(), r => r.order?.time_in_force() ?? TimeInForce.Undefined), DataGridFilterKnownTemplates.DiscreteValues, DefaultColumnWidths.TimeInForce);
-         add_col(Columns.Size, DefaultColumnHeaders.Size, r => r.size.ToString(), new DoubleMinMax<FillTuple>(r => r.fill.LastShares), DataGridFilterKnownTemplates.UIntMinMax, DefaultColumnWidths.Size);
+         add_col(Columns.Size, DefaultColumnHeaders.Size, r => r.display_size.ToString(), new DoubleMinMax<FillTuple>(r => r.fill.LastShares), DataGridFilterKnownTemplates.UIntMinMax, DefaultColumnWidths.Size);
          add_col(Columns.Price, DefaultColumnHeaders.Price, r => r.format_price(r.price), new DoubleMinMax<FillTuple>(r => r.fill.LastPrice), DataGridFilterKnownTemplates.DoubleMinMax, DefaultColumnWidths.Price);
          add_col(Columns.FillKind, DefaultColumnHeaders.FillKind, r => r.fill_kind.ToString(), dv_filter(EnumHelper.get_values<FillKind>().ToArray(), r => r.fill.FillKind), DataGridFilterKnownTemplates.DiscreteValues, DefaultColumnWidths.FillKind);
          add_col(Columns.FillStatus, DefaultColumnHeaders.FillStatus, r => r.fill_status.ToString(), dv_filter(EnumHelper.get_values<FillStatus>().ToArray(), r => r.fill.FillStatus), DataGridFilterKnownTemplates.DiscreteValues, DefaultColumnWidths.FillKind);
@@ -286,6 +287,7 @@ namespace mbts.spark {
          Color? _root_algo_badge_color;
          OrderMetadata _order_metadata;
          bool _is_selected;
+         double? _display_size;
 
          public Row(FillTuple fill_tuple, OrdersModel model) : 
             base(fill_tuple.security ?? SecurityDataHelper.Defaults.SecurityImmutable) {
@@ -306,6 +308,8 @@ namespace mbts.spark {
          public Side side => _fill.Side;
          public double price => _fill.LastPrice;
          public double size => _fill.LastShares;
+         public double display_size => _display_size ??
+            (_display_size = size.safe_divide(_model.security_auxiliary_model.get_display_quantity_divisor(security))).Value;
          public FillKind fill_kind => _fill.FillKind;
          public FillStatus fill_status => _fill.FillStatus;
          public string fill_key => _fill.FillKey;
@@ -330,6 +334,27 @@ 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(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();
       }

src/client/spark/Modules/Trading/Fills/FillsView.xaml.cs

@@ -31,5 +31,5 @@ namespace mbts.ui.spark {
          InitializeComponent();
    }
 
-   class FillsRowView : DIYGrid.HighPerformanceRow<FillsVM.Row, FillsView.Columns> { }
+   class FillsRowView : DIYGrid.HighPerformanceRow<FillsVM.Row> { }
 }

src/client/spark/Modules/Trading/Fills/FillsWindow.cs

@@ -3,6 +3,8 @@ using bts.api;
 using bts.shell;
 using bts.shell.fills;
 using bts.spark;
+using bts.view;
+using bts.utils.csv;
 using mbts.persist;
 using mbts.ui;
 using mbts.ui.settings;
@@ -24,6 +26,7 @@ namespace mbts.spark {
       FillsVM _vm;
       FillsView _view;
       FillsSettings _state;
+      SparkMenuDisplayVM _menu_display_vm;
       IReadOnlyList<SparkCommand> _commands;
 
       public FillsWindow(FillsWindowFactory factory, IBus bus, OrdersModel orders_model, FillsSettings state, WindowSettingsManager<GridSettings> settings_manager)
@@ -38,7 +41,10 @@ namespace mbts.spark {
       public override UIElement Content => _view;
       public override IEnumerable<SparkCommand> Commands => _commands;
 
-      public override FillsSettings SaveState => _state = new FillsSettings(_state.orders, _vm.get_sorting_criterion().ToList(), _vm.get_filters(), _vm.get_grid_save_state());
+      public override FillsSettings SaveState => _state = new FillsSettings(_state.orders, _vm.get_sorting_criterion().ToList(), _vm.get_filters(), _vm.get_grid_save_state()) {
+         menu_display = _menu_display_vm.safe_create()
+      };
+
       public override double MinWidth =>
          FillsSettings.DefaultGridSettings.columns.Sum(gcs => gcs.width)
          + SPARK_MENU_COLLAPSED_WIDTH
@@ -50,10 +56,13 @@ namespace mbts.spark {
       public void thread_init() {
          _init_guard.check_access();
          Log.notnull(_state);
+         _menu_display_vm = new SparkMenuDisplayVM();
+         _menu_display_vm.load_from(_state.menu_display);
          _vm = new FillsVM(_bus, _orders_model, _state, _settings_manager);
          _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>(
@@ -70,7 +79,8 @@ namespace mbts.spark {
                var dialog = new ShellSettingsDialog { DataContext = vm };
                vm.RequestClose += (s, e) => WindowUtilities.force_close(dialog);
                return dialog;
-            }))
+            })),
+            _menu_display_vm.spark_cmd
          };
       }
 
@@ -78,5 +88,8 @@ namespace mbts.spark {
          Disposable.dispose(ref _vm);
          Commands.OfType<IDisposable>().DisposeAll();
       }
+
+      protected override void OnParentViewCreated(SparkWindowView parent_view) =>
+         _menu_display_vm.safe_bind_to_view(parent_view);
    }
 }

src/client/spark/Modules/Trading/Fills/Settings/FillsSettings.cs

@@ -21,6 +21,8 @@ namespace bts.shell.fills {
       public FillsFilterStates filters;
       [ProtoMember(4)]
       public GridSettings grid;
+      [ProtoMember(5)]
+      public SparkMenuDisplaySettings menu_display;
 
       public FillsSettings() { }
       public FillsSettings(uint[] orders) : this(orders, null, null) { }

src/client/spark/Modules/Trading/Ladder/LadderSettings.cs

@@ -1,15 +1,20 @@
 using bts.api.orderman;
-using mbts.ui;
+using bts.collections;
+using bts.persist.algo;
+using bts.proto;
 using bts.utils;
+using mbts.ui;
+using mbts.ui.settings;
+using mbts.ui.spark;
+using mbts.ui.utility.text;
 using ProtoBuf;
 using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.ComponentModel;
 using System.Linq;
 using System.Windows;
-using bts.proto;
-using mbts.ui.spark;
-using System.Collections.Generic;
-using System.ComponentModel;
-using mbts.ui.settings;
+using System.Windows.Media;
 
 namespace mbts.spark {
    // IMPORTANT: BE SURE TO ADD ANY NEW PROPERTIES TO THE EQUALS FUNCTION!
@@ -84,6 +89,15 @@ namespace mbts.spark {
       public static bool operator !=(LadderColumnSettings x, LadderColumnSettings y) => !(x == y);
    }
 
+   [ProtoContract]
+   class LadderOrderLimits : IEquatable<LadderOrderLimits> {
+      [ProtoMember(1)]
+      public ToggleInt32Proto max_settlement_cross_ticks { get; set; }
+
+      public bool Equals(LadderOrderLimits other) =>
+         other != null && max_settlement_cross_ticks == other.max_settlement_cross_ticks;
+   }
+
    [ProtoContract]
    class HistogramBarAnimation : IEquatable<HistogramBarAnimation> {
       // this class is 100% mutable (there are literally 0 readonly members),
@@ -154,6 +168,10 @@ namespace mbts.spark {
 
    [ProtoContract]
    class LadderMarketBreakLine : IEquatable<LadderMarketBreakLine> {
+      public enum RefreshMode {
+         Auto,
+         Manual
+      }
       // this class is 100% mutable (there are literally 0 readonly members),
       // so GetHashCode must return the same hash for every instance.
       static readonly int _type_hash = typeof(LadderMarketBreakLine).GetHashCode();
@@ -161,6 +179,8 @@ namespace mbts.spark {
       public bool show { get; set; }
       [ProtoMember(2)]
       public uint color { get; set; }
+      [ProtoMember(3)]
+      public RefreshMode refresh_mode { get; set; }
 
       public uint? color_nullable {
          get {
@@ -173,7 +193,8 @@ namespace mbts.spark {
       public bool Equals(LadderMarketBreakLine other) =>
          other != null &&
          other.show == show &&
-         other.color == color;
+         other.color == color &&
+         other.refresh_mode == refresh_mode;
 
       public override bool Equals(object obj) =>
          Equals(obj as LadderMarketBreakLine);
@@ -182,33 +203,128 @@ namespace mbts.spark {
          _type_hash;
    }
 
+   [ProtoContract]
+   class FairValueLine : IEquatable<FairValueLine> {
+      public enum PriceType {
+         Bid,
+         Ask,
+         Mid
+      }
+
+      [ProtoMember(1)]
+      public uint security_key { get; set; }
+      [ProtoMember(2)]
+      public PriceType price_type { get; set; }
+      [ProtoMember(3)]
+      public LadderMarketBreakLine display { get; set; }      
+      
+      public bool Equals(FairValueLine other) {
+         return other != null &&
+         security_key == other.security_key &&
+         price_type == other.price_type &&
+         display.safe_equals(other.display);
+      }
+
+      public override bool Equals(object obj) {
+         return Equals(obj as FairValueLine);
+      }
+
+      public override int GetHashCode() {
+         return (int)security_key;
+      }
+   }
+
+   [Flags]
+   enum LadderFavoriteAlgoFlags {
+      Sticky = 1,
+      AutoRevert = 2,
+   }
+
+   /// <summary>
+   /// This struct contains properties for a single algo favorite item.
+   /// The various <see cref="AlgoPersistedKey"/> arrays in <see cref="LadderFavoriteAlgosSettings"/>,
+   /// can be used to create a collection of <see cref="LadderFavoriteAlgoItem"/>s.
+   /// In fact, the method <see cref="LadderFavoriteAlgosSettings.to_algo_items"/> does just that.
+   /// </summary>
+   readonly struct LadderFavoriteAlgoItem : IEquatable<LadderFavoriteAlgoItem> {
+      public readonly AlgoKey key;
+      public readonly int sort_index;
+      public readonly LadderFavoriteAlgoFlags flags;
+
+      public LadderFavoriteAlgoItem(AlgoKey key, int sort_index, LadderFavoriteAlgoFlags flags) {
+         this.key = key;
+         this.sort_index = sort_index;
+         this.flags = flags;
+      }
+
+      public bool Equals(LadderFavoriteAlgoItem other) =>
+         key == other.key &&
+         flags == other.flags;
+
+      public override bool Equals(object obj) =>
+         obj is LadderFavoriteAlgoItem other && Equals(other);
+
+      public override int GetHashCode() =>
+         key.GetHashCode();
+   }
+
    [ProtoContract]
    struct LadderFavoriteAlgosSettings : IEquatable<LadderFavoriteAlgosSettings> {
       [ProtoMember(1)]
-      readonly bts.persist.algo.AlgoPersistedKey[] _favorite_algos;
+      readonly AlgoPersistedKey[] _favorite_algos;
       [ProtoMember(2)]
       public readonly int column_count;
       [ProtoMember(3)]
-      readonly bts.persist.algo.AlgoPersistedKey[] _stickied_algos;
+      readonly AlgoPersistedKey[] _stickied_algos;
+      [ProtoMember(4)]
+      readonly AlgoPersistedKey[] _auto_revert_algos;
 
-      public LadderFavoriteAlgosSettings(AlgoKey[] favorite_algos, int column_count, AlgoKey[] stickied_algos)
-         : this(ArrayHelper.safe_convert(favorite_algos, k => new bts.persist.algo.AlgoPersistedKey(k.persisted)),
-              column_count,
-              ArrayHelper.safe_convert(stickied_algos, k => new bts.persist.algo.AlgoPersistedKey(k.persisted))) { }
+      public LadderFavoriteAlgosSettings(AlgoKey[] favorite_algos, int column_count, AlgoKey[] stickied_algos, AlgoKey[] auto_revert_algos)
+         : this(ArrayHelper.safe_convert(favorite_algos, k => new AlgoPersistedKey(k.persisted)),
+              ArrayHelper.safe_convert(stickied_algos, k => new AlgoPersistedKey(k.persisted)),
+              ArrayHelper.safe_convert(auto_revert_algos, k => new AlgoPersistedKey(k.persisted)),
+              column_count) { }
 
-      LadderFavoriteAlgosSettings(bts.persist.algo.AlgoPersistedKey[] favorite_algos, int column_count, bts.persist.algo.AlgoPersistedKey[] stickied_algos) {
+      LadderFavoriteAlgosSettings(AlgoPersistedKey[] favorite_algos, AlgoPersistedKey[] stickied_algos, AlgoPersistedKey[] auto_revert_algos, int column_count) {
          _favorite_algos = favorite_algos;
-         this.column_count = column_count;
          _stickied_algos = stickied_algos;
+         _auto_revert_algos = auto_revert_algos;
+         this.column_count = column_count;
       }
 
-      public IReadOnlyList<AlgoKey> favorite_algos => ArrayHelper.safe_convert(_favorite_algos, k => k.to_algo_key());
-      public IReadOnlyList<AlgoKey> stickied_algos => ArrayHelper.safe_convert(_stickied_algos, k => k.to_algo_key());
+      public IReadOnlyList<AlgoKey> favorite_algos => _favorite_algos?.WrapSelectorRO(pk => pk.to_algo_key()) ?? Array.Empty<AlgoKey>();
+      public IReadOnlyList<AlgoKey> stickied_algos => _stickied_algos?.WrapSelectorRO(pk => pk.to_algo_key()) ?? Array.Empty<AlgoKey>();
+      public IReadOnlyList<AlgoKey> auto_revert_algos => _auto_revert_algos?.WrapSelectorRO(pk => pk.to_algo_key()) ?? Array.Empty<AlgoKey>();
+
+      /// <summary>
+      /// A more sane representation of the data contained in this proto,
+      /// so callers don't need to join the various key lists together to determine which algos are sticky, auto revert, etc.
+      /// </summary>
+      /// <returns>An immutable dictionary of favorite algo data.</returns>
+      public ImmutableDictionary<AlgoKey, LadderFavoriteAlgoItem> build_map() {
+         var map = ImmutableDictionary.CreateBuilder<AlgoKey, LadderFavoriteAlgoItem>();
+         if (_favorite_algos != null) {
+            var stickied_algo_set = new HashSet<AlgoKey>(stickied_algos);
+            var auto_revert_algo_set = new HashSet<AlgoKey>(auto_revert_algos);
+            for (int i = 0; i < _favorite_algos.Length; i++) {
+               var pk = _favorite_algos[i];
+               var k = pk.to_algo_key();
+               var flags = (LadderFavoriteAlgoFlags)0;
+               if (stickied_algo_set.Contains(k))
+                  flags |= LadderFavoriteAlgoFlags.Sticky;
+               if (auto_revert_algo_set.Contains(k))
+                  flags |= LadderFavoriteAlgoFlags.AutoRevert;
+               map[k] = new LadderFavoriteAlgoItem(k, i, flags);
+            }
+         }
+         return map.ToImmutable();
+      }
 
       public bool Equals(LadderFavoriteAlgosSettings other) =>
          column_count == other.column_count &&
          favorite_algos.SequenceEqual(other.favorite_algos) &&
-         stickied_algos.SequenceEqual(other.stickied_algos);
+         stickied_algos.SequenceEqual(other.stickied_algos) &&
+         auto_revert_algos.SequenceEqual(other.auto_revert_algos);
 
       public override bool Equals(object obj) =>
          EqualityComparer.equals_obj(this, obj);
@@ -217,7 +333,8 @@ namespace mbts.spark {
          EqualityComparer.aggregate_hash(
             column_count,
             EqualityComparer.aggregate_hash_limited(favorite_algos),
-            EqualityComparer.aggregate_hash_limited(stickied_algos));
+            EqualityComparer.aggregate_hash_limited(stickied_algos),
+            EqualityComparer.aggregate_hash_limited(auto_revert_algos));
 
       public static bool operator ==(LadderFavoriteAlgosSettings a, LadderFavoriteAlgosSettings b) => a.Equals(b);
       public static bool operator !=(LadderFavoriteAlgosSettings a, LadderFavoriteAlgosSettings b) => !a.Equals(b);
@@ -240,12 +357,147 @@ namespace mbts.spark {
       public static bool operator !=(LadderMiniOrderBookSettings a, LadderMiniOrderBookSettings b) => !a.Equals(b);
    }
 
+   [ProtoContract]
+   class LadderPanelPricePointSettings : IEquatable<LadderPanelPricePointSettings> {
+      public static LadderPanelPricePointSettings historic_default =>
+         new LadderPanelPricePointSettings {
+            day_change = new DaySettings {
+               // (neutral)
+               font = _default_font,
+               background_color = Colors.Transparent.rgb_color(),
+               // negative
+               negative_font_color = Colors.White.rgb_color(),
+               negative_background_color = Colors.Red.rgb_color(),
+               // positive
+               positive_font_color = Colors.White.rgb_color(),
+               positive_background_color = Colors.Green.rgb_color()
+            },
+            session_low = _default_item,
+            session_high = _default_item,
+            open = _default_item,
+            settlement = _default_item,
+            volume = _default_item
+         };
+
+      public static LadderPanelPricePointSettings tt_default {
+         get {
+            var rv = historic_default;
+            rv.day_change.background_color = Color.FromRgb(113, 201, 69).rgb_color();
+            rv.day_change.font.font_color = Colors.Black.rgb_color();
+            return rv;
+         }
+      }
+
+      public static LadderPanelPricePointSettings Default => LadderSettings.mimic_tt ?
+         tt_default : historic_default;
+         
+      [ProtoMember(1)]
+      public DaySettings day_change { get; set; }
+      [ProtoMember(2)]
+      public ItemSettings session_low { get; set; }
+      [ProtoMember(3)]
+      public ItemSettings session_high { get; set; }
+      [ProtoMember(4)]
+      public ItemSettings open { get; set; }
+      [ProtoMember(5)]
+      public ItemSettings settlement { get; set; }
+      [ProtoMember(6)]
+      public ItemSettings volume { get; set; }
+
+      public bool Equals(LadderPanelPricePointSettings other) =>
+         other != null &&
+         day_change.safe_equals(other.day_change) &&
+         session_high.safe_equals(other.session_high) &&
+         session_high.safe_equals(other.session_high) &&
+         open.safe_equals(other.open) &&
+         settlement.safe_equals(other.settlement) &&
+         volume.safe_equals(other.volume);
+
+      static FontParamsProto _default_font =>
+         new FontParamsProto {
+            font_color = Colors.Black.rgb_color(),
+            font_size = FontSizes.Regular,
+            typeface = new TypefaceProto(TextUtils.StandardFontFamilyName, FontWeights.Bold.ToOpenTypeWeight())
+         };
+
+      static ItemSettings _default_item =>
+         new ItemSettings {
+            font = _default_font,
+            background_color = Colors.Transparent.rgb_color()
+         };
+
+      [ProtoContract]
+      readonly struct SignedColorPair : IEquatable<SignedColorPair> {
+         [ProtoMember(1)]
+         public uint positive_color { get; }
+         [ProtoMember(2)]
+         public uint negative_color { get; }
+
+         public bool Equals(SignedColorPair other) =>
+            positive_color == other.positive_color &&
+            negative_color == other.negative_color;
+      }
+
+      [ProtoContract]
+      public class ItemSettings : IEquatable<ItemSettings> {
+         [ProtoMember(1)]
+         public FontParamsProto font { get; set; }
+         [ProtoMember(2)]
+         public uint background_color { get; set; }
+         [ProtoMember(3)]
+         public bool show_label { get; set; }
+
+         public bool Equals(ItemSettings other) =>
+            other != null &&
+            font.safe_equals(other.font) &&
+            background_color == other.background_color &&
+            show_label == other.show_label;
+      }
+
+      [ProtoContract]
+      public class DaySettings : IEquatable<DaySettings> {
+         [ProtoMember(1)]
+         public FontParamsProto font { get; set; }
+         // [neutral] background
+         [ProtoMember(2)]
+         public uint background_color { get; set; }
+         [ProtoMember(3)]
+         public bool show_label { get; set; }
+
+         // negative
+         [ProtoMember(4)]
+         public uint negative_font_color { get; set; }
+         [ProtoMember(5)]
+         public uint negative_background_color { get; set; }
+
+         // positive
+         [ProtoMember(6)]
+         public uint positive_font_color { get; set; }
+         [ProtoMember(7)]
+         public uint positive_background_color { get; set; }
+
+         public uint neutral_foreground => font?.font_color ?? 0;
+
+         public bool Equals(DaySettings other) =>
+            other != null &&
+            font.safe_equals(other.font) &&
+            background_color == other.background_color &&
+            show_label == other.show_label &&
+            negative_font_color == other.negative_font_color &&
+            negative_background_color == other.negative_background_color &&
+            positive_font_color == other.positive_font_color &&
+            positive_background_color == other.positive_background_color;
+      }
+   }
+
    // IMPORTANT: BE SURE TO ADD ANY NEW PROPERTIES TO THE EQUALS FUNCTION!
    // 1 important reason at this time:
    // From the settings dialog, default settings will only be persisted when they are NOT EQUAL to the current default settings.
    // Settings are liable to change in the near future, so an internal IEqualityComparer simply won't do as it risks becoming out of date.
    [ProtoContract]
    class LadderSettings : IEquatable<LadderSettings> {
+      // RESERVED ProtoMember indices
+      //    900-999: dj settings
       const double _default_order_entry_panel_width = 110.0;
       const double _default_zoom_factor = 1.0;
       const bool _default_show_warn_on_cross = true;
@@ -255,6 +507,13 @@ namespace mbts.spark {
       // this class is 100% mutable (there are literally 0 readonly members),
       // so GetHashCode must return the same hash for every instance.
       static readonly int _type_hash = typeof(LadderSettings).GetHashCode();
+      uint _ticks_per_row;
+      List<FairValueLine> _fair_value_lines;
+
+      static LadderSettings() {
+         var knobs = config.Configuration.get<bts.config.LadderKnobs>();
+         mimic_tt = knobs.mimic_tt;
+      }
 
       // Default proto constructor
       // Added this so that when clients upgrade to a version with new settings,
@@ -281,13 +540,15 @@ namespace mbts.spark {
          order_entry_panel_initial_width = _default_order_entry_panel_width;
          zoom_factor = _default_zoom_factor;
          use_defaults = true;
-         favorite_algos = new LadderFavoriteAlgosSettings(null, 2, null);
+         favorite_algos = new LadderFavoriteAlgosSettings(null, 2, null, null);
          show_warn_on_cross = _default_show_warn_on_cross;
          enforce_max_clip = _default_enforce_max_clip;
          status_message_visible = true;
       }
+      
+      public static bool mimic_tt { get; }
 
-      public static LadderSettings Default {
+      public static LadderSettings historic_default {
          get {
             LadderColumnSettings
                orders_column = LadderColumnSettings.DefaultOrderColumnSettings,
@@ -297,12 +558,12 @@ namespace mbts.spark {
                last_column = LadderColumnSettings.Default,
                piq_column = LadderColumnSettings.DefaultPiqColumnSettings;
             orders_column.background = BTSColors.LadderSpecial.default_column_background;
-            bid_column.foreground = 0xFFFFFF;
+            bid_column.foreground = 0xFFFFFFFF;
             bid_column.background = BTSColors.MarketData.bid;
-            ask_column.foreground = 0xFFFFFF;
+            ask_column.foreground = 0xFFFFFFFF;
             ask_column.background = BTSColors.MarketData.ask;
             price_column.background = BTSColors.LadderSpecial.default_column_background;
-            last_column.background = 0xFFFFFF;
+            last_column.background = 0xFFFFFFFF;
             piq_column.background = BTSColors.LadderSpecial.default_column_background;
             var rv = new LadderSettings {
                row_height = 22,
@@ -346,6 +607,7 @@ namespace mbts.spark {
                auto_clear_visible = true,
                clear_visible = true,
                order_entry_panel_initial_width = _default_order_entry_panel_width,
+               panel_price_point_settings = LadderPanelPricePointSettings.Default,
                zoom_slider_visible = false,
                zoom_factor = _default_zoom_factor,
                net_change = NetChangeTerms.None,
@@ -358,6 +620,28 @@ namespace mbts.spark {
             return rv;
          }
       }
+      
+      public static LadderSettings tt_default {
+         get {
+            var rv = historic_default;
+            rv.orders_column.background = Color.FromRgb(223, 223, 223).rgb_color();
+            // Since the price column sits atop the session range fill in tt
+            // mode (normally it is the other way around), the former is made
+            // partially translucent while the latter is fully opaque (obv the
+            // top layer cannot be opaque, since it would completely hide the
+            // layer beneath it).
+            rv.session_range_fill.color = rv.session_range_fill.color.rgb_color().with(255).rgb_color();
+            rv.price_column.background = Color.FromArgb(226, 166, 166, 166).rgb_color();
+            rv.price_column.foreground = Colors.White.rgb_color();
+            rv.bid_column.background = Color.FromRgb(0, 30, 160).rgb_color();
+            rv.ask_column.background = Color.FromRgb(160, 0, 0).rgb_color();
+            rv.ask_column.foreground = Colors.Black.rgb_color();
+            return rv;
+         }
+      }
+   
+      public static LadderSettings Default => mimic_tt ?
+         tt_default : historic_default;
 
       public enum BadgeStyle { Normal, Alternate }
 
@@ -524,6 +808,22 @@ namespace mbts.spark {
       [ProtoMember(61), DefaultValue(true)]
       public bool status_message_visible { get; set; }
 
+      [ProtoMember(62)]
+      public uint ticks_per_row {
+         get => Math.Max(_ticks_per_row, 1);
+         set => _ticks_per_row = value;
+      }
+
+      [ProtoMember(900)]
+      public LadderOrderLimits ladder_order_limits { get; set; }
+      [ProtoMember(901)]
+      public LadderPanelPricePointSettings panel_price_point_settings { get; set; }
+      [ProtoMember(902)]
+      public List<FairValueLine> fair_value_lines {
+         get => _fair_value_lines ?? (_fair_value_lines = new List<FairValueLine>());
+         set => _fair_value_lines = value;
+      }
+
       public void sanitize() =>
          sanitize(this);
 
@@ -557,6 +857,11 @@ namespace mbts.spark {
             s.mini_ob = new LadderMiniOrderBookSettings(s.mini_ob.value.with(sorting_criterion: bts.shell.orderbook.OrderBookStartupData.default_mini_grid.general.sorting_criterion));
 #pragma warning restore CS0612 // Type or member is obsolete
          s.row_height = LadderRender.measure_row_height(s);
+         if (s.panel_price_point_settings is null)
+            s.panel_price_point_settings = LadderPanelPricePointSettings.Default; 
+         if (s.fair_value_lines is null) {
+            s.fair_value_lines = new List<FairValueLine>(0);
+         }
          return s;
       }
 
@@ -629,7 +934,11 @@ namespace mbts.spark {
          a.enforce_max_clip == b.enforce_max_clip &&
          a.max_clip == b.max_clip &&
          a.price_display_format == b.price_display_format &&
-         a.status_message_visible == b.status_message_visible;
+         a.status_message_visible == b.status_message_visible &&
+         a.ladder_order_limits.safe_equals(b.ladder_order_limits) &&
+         a.panel_price_point_settings.safe_equals(b.panel_price_point_settings) &&
+         a._ticks_per_row == b._ticks_per_row &&
+         EqualityComparer.safe_sequence_equals(a.fair_value_lines, b.fair_value_lines);
 
       public bool Equals(LadderSettings other) =>
          profile_equals(this, other) &&