fixed tooltips for non dynamic and non generic algos

Merge branch 'master' of bitbucket.org:bluetradesys/spark into vwap
more 2.8 release notes
2019-08-08 11:58:05 -04:00 · 2019-08-08 11:07:40 -04:00 · 2019-08-08 10:54:57 -04:00 · 2019-08-08 14:48:31 +00:00 · 2019-08-08 14:33:18 +00:00 · 2019-08-08 09:59:46 -04:00
359 changed files with 14802 additions and 6058 deletions
@@ -1,34 +1,36 @@
-nohup.out
-build/
-cmake-build-debug/
-.idea/
-.dir-locals.el
-*.pyc
-.vscode/*
-!.vscode/*.json
-.vs
-obj/
-*.csproj.user
-*.vspx
-*.psess
-msbuild.log
-*.orig
-vcxproj.user
-src/client/spark/Properties/launchSettings.json
-compile_commands.json
-.cquery_cached_index/
-src/client/sparkcmd/Properties/launchSettings.json
-node_modules
-paket-files
-project.lock.json
-src/server/sparkd/orderman/perf_analysis/data
-src/server/sparkd/orderman/perf_analysis/logs/
-src/server/sparkd/orderman/perf_analysis/trace_data/
-.fake
-*.fsx.lock
-*.code-workspace
-src/lib/orderman/perf_analysis/logs/latency_data/
-trace_data/
-/src/lib/orderman/perf_analysis/last_pretty_log.csv
-/src/lib/orderman/perf_analysis/log.csv
-/doc/user/public/*
+nohup.out
+build/
+cmake-build-debug/
+.idea/
+.dir-locals.el
+*.pyc
+.vscode/*
+!.vscode/*.json
+.vs
+obj/
+*.csproj.user
+*.vspx
+*.psess
+msbuild.log
+*.orig
+vcxproj.user
+src/client/spark/Properties/launchSettings.json
+compile_commands.json
+.cquery_cached_index/
+src/client/sparkcmd/Properties/launchSettings.json
+node_modules
+paket-files
+project.lock.json
+src/server/sparkd/orderman/perf_analysis/data
+src/server/sparkd/orderman/perf_analysis/logs/
+src/server/sparkd/orderman/perf_analysis/trace_data/
+.fake
+*.fsx.lock
+*.code-workspace
+src/lib/orderman/perf_analysis/logs/latency_data/
+trace_data/
+/src/lib/orderman/perf_analysis/last_pretty_log.csv
+/src/lib/orderman/perf_analysis/log.csv
+/doc/user/public/*
+.ionide/*
+src/web/ui/.ionide/symbolCache.db
@@ -118,7 +118,7 @@
            "program": "${workspaceRoot}/build/Debug/bin/net471/sparkcmd.exe",
            "args": [
                "test",
-                "test_filter"
+                "ApiUpdateTests"
            ],
            "cwd": "${workspaceRoot}",
            "stopAtEntry": false,
@@ -135,13 +135,13 @@
            "name": "Spreader Tests",
            "type": "cppdbg",
            "request": "launch",
-            "program": "/home/bts/spark/build/ninja_debug/src/server/sparkd/sparkd",
+            "program": "/home/bts/spark/build/ninja_debug/server/sparkd",
            "args": [
                "test",
                "[spreader]"
            ],
            "stopAtEntry": false,
-            "cwd": "/home/bts/spark/build/ninja_debug/src/server/sparkd/",
+            "cwd": "/home/bts/spark/build/ninja_debug/server/",
            "environment": [],
            "externalConsole": true,
            "MIMode": "gdb",
@@ -249,7 +249,7 @@
            "program": "/home/bts/spark/build/ninja_debug/server/sparkd",
            "args": [
                "test",
-                "SingleWriterConcurrentVector"
+                "[algo]"
            ],
            "stopAtEntry": false,
            "cwd": "/home/bts/spark/build/ninja_debug/server/",
@@ -1,46 +0,0 @@
-+++
-title = "BTS Basic Algos"
-weight = 10
-sort_by = "weight"
-insert_anchor_links = "right"
-+++
-
-
-## Lean
-
-The goal of the lean order is to watch the opposite-inside market size and cross when that size goes below the threshold (this also implies a cross if that size goes to zero and the market trades away from you) If the market trades toward you, you can opt into several different behaviors
-
-##### Parameters
-  * Cross Thresh - size thresh in absolute or ratio terms
-  * Max Chase Ticks - max levels to pay up, in ticks
-
-
-## Join
-The goal of the join order is to watch the opposite-inside market and join when the market flips (that is, when the best offer becomes the best bid) and has at least threshold size.
-
-##### Parameters
-  * Join Thresh - size thresh in absolute or ratio terms
-
-
-## Top
-
-The goal of the top order is to not trade by yourself, but the intent at the time of order entry is to get filled.If the order is on the market (say current bid price) AND the quantity on that bid price is below top thresh then cancel the order else remain working.
-
-##### Parameters
-  * Top Thresh - size thresh in absolute or ratio terms
-
-
-## Cover
-A Cover order’s purpose is to fire a hedge order (of any type) in response to fills from it’s child order on the opposite side of the market N ticks away
-
-##### Parameters
-  * Profit Ticks - ticks above or below fill price to place profit / cover order
-
-
-## OCO
-An OCO order creates a relationship between a child order and a 'stop' or 'other' order such that when one of these is cancelled, both cancel, or when one is filled, the other order's size is debited in the amount of the fill.
-
-Composing this order with Cover simulates scalping functionality
-
-##### Parameters
-  * Stop Ticks - ticks below or above main order to place stop / other order
@@ -0,0 +1,77 @@
+++
+title = "Basic Algos"
+weight = 1
+sort_by = "weight"
+insert_anchor_links = "right"
+aliases = ["./bts_spark/Algos/"]
+++
+
+## Lean
+
+The goal of the lean order is to watch the opposite-inside market size and cross when that size goes below the threshold (this also implies a cross if that size goes to zero and the market trades away from you) If the market trades toward you, you can opt into several different behaviors
+
+##### Parameters
+  * Cross Thresh - size thresh in absolute or ratio terms
+  * Max Chase Ticks - max levels to pay up, in ticks
+
+
+## Join
+The goal of the join order is to watch the opposite-inside market and join when the market flips (that is, when the best offer becomes the best bid) and has at least threshold size.
+
+##### Parameters
+  * Join Thresh - size thresh in absolute or ratio terms
+
+
+## Top
+
+The goal of the top order is to not trade by yourself, but the intent at the time of order entry is to get filled.If the order is on the market (say current bid price) AND the quantity on that bid price is below top thresh then cancel the order else remain working.
+
+##### Parameters
+  * Top Thresh - size thresh in absolute or ratio terms
+
+
+## Cover
+A Cover order’s purpose is to fire a hedge order (of any type) in response to fills from it’s child order on the opposite side of the market N ticks away
+
+##### Parameters
+  * Profit Ticks - ticks above or below fill price to place profit / cover order
+
+
+## OCO
+An OCO order creates a relationship between a child order and a 'stop' or 'other' order such that when one of these is cancelled, both cancel, or when one is filled, the other order's size is debited in the amount of the fill.
+
+Composing this order with Cover simulates scalping functionality
+
+##### Parameters
+  * Stop Ticks - ticks below or above main order to place stop / other order
+
+## Splitter
+The splitter is useful for pro-rata markets where you want to vary your exposure independent of the order quantity that you want to fill.  The splitter will complete when the number of fills reaches or exceeds the order quantity but it will put exposed_qty total size on the market. Splitter favors order size over queue position.
+
+If exposed_qty is set to 0 the splitter will continue to exist in the Order Book but will cancel all of its child orders.  This makes it a useful building block for custom algos that need to implement a 'paused' state.
+
+##### Parameters
+  * exposed_qty - The total quantity to expose on the market.
+  * max_order_qty - The maximum size of a single order.
+
+
+## Scratch
+The scratch algo is similar to Lean, but instead of watching the opposite inside market, it watches the same side market and pays up when this quantity recedes below the scratch_threshold
+
+##### Parameters
+  * scratch_threshold - The quantity on the same side market below which to scratch
+  * chase_ticks - The number of ticks through the opposite market to pay up
+
+
+## ProRata
+The prorata algo is a special case hedging algo for pro-rata markets.  Users can specify two hedge types-- normal hedge and overfill hedge, the latter is spawned when you receive more fills than your fill_limit.  Further, the algo attempts to scratch when in an overfilled state AND optionally the same side size falls below stay_in_threshold
+
+##### Parameters
+  * hedge_ticks - The amount of ticks better hedges are placed on the opposite side market as the fill
+  * chase_ticks - How many ticks through the opposite market on a scratch
+  * fill_limit - The limit after which the algo considers further fills to be 'overfills'
+  * stay_in_threshold - A same side size threshold that enables the algo to 'stay in' even if overfilled
+  * enable_scratch_on_overfill - When true, overfills are immediately scratched upon the algo exiting
+  * enable_stay_in - When true, the algo will 'stay in' so long as the same side size is above stay_in_threshold, when false the algo attempts to 'get out' (and potentially scratch overfills) as soon as it reaches overfill status
+  * hedge - Child order type to send for normal hedges
+  * overfill_hedge - Child order type to send for overfill hedges
@@ -4,6 +4,99 @@ weight = 3
 sort_by = "weight"
 insert_anchor_links = "right"
 +++
+## 2.8.0
+### User Visible Changes
+  - Added ProRata and Scratch algos
+  - Ladder badge now grows/shrinks to fill the containing cell
+  - Attached algo parameters are now displayed in the update panel
+  - Fixed a bug where the update panel would show '-' values when only
+    1 order was selected
+  - Fixed a bug that cause cause a failure on startup if the user
+    loaded a workspace with a Ladder that had a dynamic order type
+    selected by default
+  - Increased width of login panel to better show login error messages
+  - Added optional 'Maker/Taker' pricing to Spreader algo
+### Internal changes
+  - Made it easier to generate simple UI's for new order types
+### API Changes
+  - Dynamic orders can now use QuantityMeasure parameter types
+  
+## 2.7.2
+### User Visible Changes
+  - Changed the login dialog to avoid leaking workspace names from other users. 
+  - Added new Splitter algo. From the manual: The splitter is useful
+    for pro-rata markets where you want to vary your exposure
+    independent of the order quantity that you want to fill.  The
+    splitter will complete when the number of fills reaches or exceeds
+    the order quantity but it will put exposed_qty total size on the
+    market. Splitter favors order size over queue position.
+### Internal Changes
+  - Made spark more resilient to lack of connectivity to the CME web site for downloading of templates. 
+  
+## 2.7.1
+### User Visible Changes
+  - Fixed some issues with the Cover algo, where in some circumstances
+    it would erroneously cancel launched hedges on completion.
+	
+## 2.7.0
+### User Visible Changes
+  - Allowed algos to process "in-flight" fills while shutting down
+  - Changed the cover algo to continue to hedge while shutting down
+### API Changes
+  - Changed the API so that algos do not fully terminate until all
+    their children are terminated. Algos that are in the process of
+    shutting down in response to a complete or cancel call will still
+    receive child updates, which they can use to calculate and report
+    an accurate fill count (during this shutdown stage algos cannot
+    create, cancel or update children). A new IAlgoServices method,
+    is_shutting_down(), can be used to determine if an algo is
+    shutting down.
+
+## 2.6.2
+### User Visible Changes
+  - Fixed an issue in the ladder where in some cases the mini order book could not be brought up from a badge
+  - Fixed a rare race condition that could lead to erroneous limit enforcement
+  - Fixed an issue with the margin limits where an error could occur if an account name with more than 12 chars was used  
+
+## 2.6.1
+### User Visible Changes
+  - Fixed an issue in the ladder where an error could occur when trying to change ladder settings for the first time
+  
+## 2.6.0
+### User Visible Changes
+  - In the ladder made last trade more distinctive when overlayed on the volumn column
+  - In the ladder, corrected display of volume tool tip 
+  - In the ladder, changed the consolidation of last trade to consider only the price ignoring aggressor changes
+  - Added an option for the Top Algo to delete itself if within N ticks from top of book
+  - Address a rare issue that could lead to an error report on UI exit
+  - Added margin risk limits
+  - Added the "Offset" algo. Offset prices a child algo at a parameterizable distance from the top of the book
+  - Avoided switching the current account and order type on open ladders when limits are changed 
+### Internal Changes
+  - Ensure that admin logins are always allowed to login, regardless of keycode status.
+  
+## 2.5.0
+### User Visible Changes
+  - Added loss limit risk check
+  - Made algos, synthetics and user names private so that multiple users can share a single system privately.
+  - Allowed the mini order book defaults for column widths to be changed from the mini order book
+  - Allowed the mini order book to shrink to the minimum size that will be needed to display the selected columns
+  - Improved accuracy of the directional arrow when displaying last trades in the volumn column
+## 2.4.0
+### User Visible Settings
+  - In the ladder, changed the last trade column to accumulate successive trades at the same price
+  - Fixed a bug in the order book where the right side ladder would display the top leve order's security rather then current row's
+  - Added OK, Cancel buttons to the security picker for ladder profiles or sounds
+  - Added ladder settings for the mini order book
+  - Added a safety check to guard against unintentional market crosses
+  - Improved the Queue Holder mode in the spreader:
+     - Added a Show Quantity, allowing the spreader to keep queue position of the trailing orders as Fills (of size Show Qty) happen
+     - Improved spreader performance when in Queue Holder mode
+### Internal changes
+  - Suppressed order callbacks for completed/canceled orders. This should eliminate some bogus error logs by spreader orders.
+  - Addressed a potential concurrency issues with service initialization.
+
+
 ## 2.3.0
 ### User Visible Changes
  - Introduced multiple settings profiles for the ladder
@@ -148,7 +241,7 @@ insert_anchor_links = "right"
  - Integrated stunnel into UI to make VPN setup unnecessary in unsecured environments.
 ## 1.5.7
 ### User Visible Changes
-  - New videos have been added to the manual describing the [Algo Studio](./bts_spark/Trading/index.md#algo-studio) and [Spreader](./bts_spark/Spreader/index.md)
+  - New videos have been added to the manual describing the [Algo Studio](./bts_spark/Trading/_index.md#algo-studio) and [Spreader](./bts_spark/Spreader/_index.md)
  - Fixed a bug that occasionally would cause windows to be position outside the visible screen on startup
  - Fixed a bug in the order book form that would occasionally cause the Recreate Order option to be unavailable
  - Added a confirmation step to Cancel All, Cancel Buys and Cancel Sells commands
@@ -272,6 +365,7 @@ insert_anchor_links = "right"
  - The zoom functionality can also be performed via hotkey and mouse wheel combinations
    - Zoom In = CTRL + Mouse wheel up
    - Zoom Out = CTRL + Mouse wheel down
+
    - Reset zoom = CTRL + Mouse wheel click or double click on the zoom slider
 ### Exchange simulator
  - Improved the exchange simulator to track real market data more closely
@@ -376,7 +470,8 @@ insert_anchor_links = "right"
  - This is configurable from a ladder's settings as well
 ### Customized settings in all windows
 - All windows now contain a settings page where grid settings (font color, size, etc) are applied
- - These settings can be saved on a per-window basis or as a Default for newly-launched windows␍
+ - These settings can be saved on a per-window basis or as a Default for newly-launched windows
+

 ## 1.3.1 Through 1.3.4

@@ -7,12 +7,12 @@ using System.Linq;
 using System.Reactive.Linq;
 using System.Reactive.Subjects;
 using bts.api.core;
+using mbts.ui.shell;

 namespace mbts.spark {
   [Export]
   class AdminModel : IDisposable {
-      readonly string _user_name;
-      public string user_name => _user_name;
+      public readonly UserTuple user;
      
      readonly BehaviorSubject<IReadOnlyDictionary<uint, string>>
         _accounts_subject = new BehaviorSubject<IReadOnlyDictionary<uint, string>>(new Dictionary<uint, string>()),
@@ -24,14 +24,14 @@ namespace mbts.spark {
      IDisposable _dispose;      

      [ImportingConstructor]
-      AdminModel(AdminService service, [Import("username")]string user_name) {
-         _user_name = user_name;
+      AdminModel(AdminService service, [Import]UserTuple user) {
+         this.user = user;
         _dispose = service.subscribei_admin_data().Select(update => {
-            _wrapper_subject.OnNext(new AdminModelWrapper(update.all.TryFirst(), _user_name));
+            _wrapper_subject.OnNext(new AdminModelWrapper(update.all.TryFirst(), user.name));
            IEnumerable<BTSUserImmutable> active_users =
               from admin_data in update.all
               from bts_user in admin_data.Users
-               where bts_user.Name == user_name && bts_user.HasUserData && bts_user.UserData.HasAccountPermissions
+               where bts_user.Name == user.name && bts_user.HasUserData && bts_user.UserData.HasAccountPermissions
               select bts_user;

            IEnumerable<BTSAccountImmutable> active_accounts =
@@ -62,14 +62,6 @@ namespace mbts.spark {
      public IObservable<IReadOnlyList<AccountTuple>> on_account_tuples => on_accounts.Select(d => d.Select(kv => new AccountTuple(kv.Key, kv.Value)).ToList());
      public IObservable<AdminModelWrapper> on_admin_data => _wrapper_subject.AsObservable();

-      public UserTuple? get_current_user() {
-         foreach (var kv in _user_map) {
-            // just for good measure, there should never be > 1 element in _user_map, and it should always match _user_name
-            if (kv.Value == _user_name)
-               return new UserTuple(kv.Key, kv.Value);
-         }
-         return null;
-      }
      public AccountTuple? get_default_account() {
         foreach (var kv in _account_map) {
            return new AccountTuple(kv.Key, kv.Value);
@@ -3,6 +3,7 @@ using mbts;
 using mbts.config;
 using mbts.spark;
 using mbts.ui;
+using mbts.ui.shell;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.Composition;
@@ -22,7 +23,7 @@ namespace bts.ui {
      IDisposable _dispose;

      [ImportingConstructor]
-      public AboutDaemon(IBus bus, [Import("username")]string username) {
+      public AboutDaemon(IBus bus, [Import(LoginContainer.Exports.UserName)]string username) {
         _user = username;
         _bus = bus;
         _dispose = bus.subscribe(SparkTags.About).OnDispatcher().Subscribe(_ => show_about());
@@ -10,6 +10,7 @@ using System.Reactive.Linq;
 using System.Windows.Threading;
 using System.Windows;
 using System.Threading.Tasks;
+using mbts.ui.shell;

 namespace bts.spark
 {
@@ -20,7 +21,7 @@ namespace bts.spark
      IDisposable _dispose;

      [ImportingConstructor]
-      public ErrorReporter(ErrorReportService svc, IBus bus, [Import("username")] string username) {
+      public ErrorReporter(ErrorReportService svc, IBus bus, [Import(LoginContainer.Exports.UserName)] string username) {
         _svc = svc;
         _username = username;
         _dispose = bus.subscribe(SparkTags.Support).OnDispatcher().Subscribe(msg => show_support_window(msg, "Report a problem"));
@@ -82,7 +83,6 @@ namespace bts.spark
         }
      }

-      //public static async Task<Result<T>>
      public static async Task<(T value, bool success)> safe_execute<T>(this ErrorReporter error_reporter, Func<Task<Result<T>>> execute, Func<T, bool> get_success, Func<T, string> get_error_msg, string desc) {
         try {
            var result = await execute();
@@ -101,5 +101,31 @@ namespace bts.spark
         void _report_error(string msg) =>
            error_reporter.report_error($"Error {desc}: {msg}", AlgoStudioWindow.NAME, MessageBoxImage.Warning);
      }
+
+      public static async Task<TResult> safe_execute<T, TResult>(
+         this ErrorReporter error_reporter,
+         Func<Task<Result<T>>> execute,
+         Func<T, bool> get_success,
+         Func<T, string> get_error_msg,
+         Func<T, bool, TResult> result_selector,
+         string desc) {
+         //
+         try {
+            var result = await execute();
+            if (!result.success) {
+               _report_error(result.error_message);
+            } else if (!get_success(result.value)) {
+               _report_error(get_error_msg(result.value));
+            } else {
+               return result_selector(result.value, true);
+            }
+         } catch (Exception ex) {
+            _report_error(ex.ToString());
+         }
+         return result_selector(default, false);
+         //
+         void _report_error(string msg) =>
+            error_reporter.report_error($"Error {desc}: {msg}", AlgoStudioWindow.NAME, MessageBoxImage.Warning);
+      }
   }
 }
@@ -15,6 +15,7 @@ using System.Collections.Concurrent;
 using System.Threading;
 using bts.api.user;
 using bts.md;
+using mbts.ui.shell;

 namespace bts {
   [Export(typeof(IInitializable))]
@@ -27,8 +28,8 @@ namespace bts {
      static uint get_naggle() => mbts.config.Configuration.get<md.RelayOptions>().naggle_ms;

      [ImportingConstructor]
-      public MDDaemon(Lazy<IBus> bus, Lazy<AuthTokenImmutable> token, Lazy<SyntheticSecurityService> ss) : 
-         base(get_naggle(), MDSourceOptions.DeferInit) {
+      public MDDaemon(Lazy<IBus> bus, Lazy<AuthTokenImmutable> token, Lazy<SyntheticSecurityService> ss, [Import(LoginContainer.Exports.UserID)]uint user_id) : 
+         base(get_naggle(), MDSourceOptions.DeferInit, user_id) {
         _bus = bus;
         _token = token;
         _ss = ss;         
@@ -69,11 +69,11 @@ namespace bts {
         cpv.Width = double.NaN;
         cpv.Height = double.NaN;

-         vm.ok_action = () => {
+         vm.ok_action += () => {
            window.Close();
            message.complete(select_result(vm)).execute(_bus);
         };
-         vm.cancel_action = () => window.Close();
+         vm.cancel_action += () => window.Close();
         window.move_to_mouse();
         window.Show();
      }
@@ -3,6 +3,7 @@ using bts.metrics;
 using mbts;
 using mbts.config;
 using mbts.ui;
+using mbts.ui.shell;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.Composition;
@@ -23,7 +24,7 @@ namespace bts.perf {
      Ping _pinger = new Ping();

      [ImportingConstructor]
-      public ShellLatencyDaemon(ShellLatencyService service, [Import("username")] string user) {
+      public ShellLatencyDaemon(ShellLatencyService service, [Import(LoginContainer.Exports.UserName)] string user) {
         _service = service;
         _version = Configuration.get<bts.config.System>().version;
         _username = user;
@@ -2,6 +2,7 @@
 using bts.api.core;
 using bts.api.md.auxiliary;
 using bts.api.orderman;
+using bts.api.orderman.algo;
 using bts.api.persistence;
 using bts.api.position;
 using bts.api.synthetic;
@@ -45,41 +46,11 @@ namespace Spark {

      [Export]
      public MarketDataRelay md_replay => context.locate<MarketDataRelay>();
-      //[Export]
-      //public AlgoService algo_service => context.locate<AlgoService>();

-      AlgoServiceWrapper _algo_service_wrapper;
      [Export]
-      public AlgoServiceWrapper algo_service_wrapper => _algo_service_wrapper ?? (_algo_service_wrapper = new AlgoServiceWrapper(context));
+      public AlgoDefinitionService algo_definition_service => context.locate<AlgoDefinitionService>();

      [Export]
      public MBOService mbo_service => context.locate<MBOService>();
   }
-
-   class AlgoServiceWrapper {
-      public enum Mode {
-         None,
-         Hierarchical,
-         Flat
-      }
-
-      public AlgoServiceWrapper(ServiceContext context) {
-         var flat_model_options = mbts.config.Configuration.get<bts.config.AlgoStudioFlatDefinitionModelOptions>();
-         if (flat_model_options.enabled) {
-            flat = context.locate<bts.api.orderman.algo.AlgoDefinitionService>();
-         } else {
-            hierarhical = context.locate<AlgoService>();
-         }
-      }
-
-      public AlgoService hierarhical { get; }
-      public bts.api.orderman.algo.AlgoDefinitionService flat { get; }
-      public Mode mode {
-         get {
-            if (hierarhical != null) return Mode.Hierarchical;
-            if (flat != null) return Mode.Flat;
-            return Mode.None;
-         }
-      }
-   }
 }
@@ -5,6 +5,7 @@ using mbts.co2;
 using mbts.persist;
 using mbts.spark;
 using mbts.ui;
+using mbts.ui.shell;
 using System.Collections.Generic;
 using System.ComponentModel.Composition;
 using System.IO;
@@ -18,7 +19,7 @@ namespace bts.shell
   class MarketShellModule : IShellModule
   {
      [ImportingConstructor]
-      public MarketShellModule(IBus bus, MDConsumer consumer, UserSettingsHub settings_hub, OrdersModel orders_model, [Import("username")]string user_name) {
+      public MarketShellModule(IBus bus, MDConsumer consumer, UserSettingsHub settings_hub, OrdersModel orders_model, [Import(LoginContainer.Exports.UserName)]string user_name) {
         _tsf = new TimeAndSalesWindowFactory(this, bus, consumer, settings_hub);
         _mvf = new MarketViewWindowFactory(this, bus, settings_hub, orders_model);
      }
@@ -27,8 +27,8 @@ namespace mbts.spark {
         : this(bus, orders_model, state, state.SelectManyInSeries(s => s.security_criteria.subscribe_md(bus)), settings_manager) { }

      // securities_connectable should NOT be connected already.
-      MarketViewVM(IBus bus, OrdersModel orders_model, IObservable<StartupData> state, IConnectableObservable<IEnumerable<SecurityMD>> securities_connectable, IWindowSettingsManager<GridSettings> settings_manager)
-         : base(RXCollection.Create(securities_connectable, SecurityDataHelper.EqualityComparer.MDComparer), null) {
+      MarketViewVM(IBus bus, OrdersModel orders_model, IObservable<StartupData> state, IObservable<IEnumerable<SecurityMD>> securities_source, IWindowSettingsManager<GridSettings> settings_manager)
+         : base(RXCollection.Create(securities_source, SecurityDataHelper.EqualityComparer.MDComparer), null) {
         _bus = bus;
         _orders_model = orders_model;
         security_filter = new RegexFilterVM<Row>(r => r.security.ToString(), nameof(Row.security));
@@ -163,7 +163,6 @@ namespace mbts.spark {
            ask_price_filter, ask_merged_size_filter, ask_direct_size_filter, ask_implied_size_filter,
            last_price_filter, last_size_filter, day_change_filter, settlement_filter,
            session_low_filter, session_high_filter, position_filter, working_bid_volume_filter, working_ask_volume_filter, volume_filter, security_key_filter),
-            securities_connectable.Connect(),
            settings_manager.subscribe_current().OnDispatcher().Subscribe(grid_settings_manager),
            WorkLoop.Start("MarketView", _refresh)
         );
@@ -7,6 +7,7 @@ using bts.utils;
 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;
@@ -135,6 +136,7 @@ namespace mbts.spark {
         var show_synth_create_cmd_wrapper = new SparkCommandCommand(show_synth_create_actual_cmd.title, show_synth_create_actual_cmd.icon, show_synth_create_cmd, SparkCommands.KeyGestures.ShowSyntheticCreate);

         var update_securities_cmd = SparkCommands.change_securities_callback(_window_type_display_name);
+         // commands
         _commands = new List<SparkCommand> {
            SparkCommands.ShowLadders(SparkCommands.KeyGestures.ShowLadder).complete(_vm.selected_security_mds_observable(), smds => smds.Count > 0),
            SparkCommands.ShowOrderTicketFromSecurity(SparkCommands.KeyGestures.ShowOrderTicket).complete(_vm.current_security_md, md => md.HasValue, ConvertUtils.ValueOrDefault),
@@ -151,12 +153,11 @@ namespace mbts.spark {
                  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.columns.Select( c => c.create())), 
-                     this.observe_title()
+                     s.with(_vm.columns.Select(c => c.create()))
                  )
               );
-               // TODO: bind to main window's Title
-               var dialog = new ShellSettingsDialog { Title = "Market View Grid Settings", DataContext = vm };
+               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;
            }))
@@ -7,6 +7,7 @@ using mbts.co2;
 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;
@@ -17,7 +18,6 @@ using System.Reactive.Linq;
 using System.Windows;
 using System.Windows.Media;
 using static bts.shell.TimeAndSalesWindowFactory;
-using static mbts.ui.controls.DIYGrid;

 namespace mbts.spark {
   class TimeAndSalesWindow : SparkWindow<StartupData>, ISharedWindow {
@@ -77,12 +77,11 @@ namespace mbts.spark {
                  s => _vm.value.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())),
-                     this.observe_title()
+                     s.with(_vm.value.columns.Select(c => c.create()))
                  )
               );
-               // TODO: bind to main window's Title
-               var dialog = new ShellSettingsDialog { Title = "Time and Sales Grid Settings", DataContext = vm };
+               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;
            }))
@@ -59,6 +59,7 @@
    MarketDataTypeTemplate="{StaticResource SimpleValueTextTemplate}"
    MarketDataCalculationTemplate="{StaticResource SimpleValueTextTemplate}"
    ConditionalPriceTypeTemplate="{StaticResource SimpleValueTextTemplate}"
+    ShowQuantityTemplate="{StaticResource SimpleValueTextTemplate}"
  >
    <usp:DataGridParameterCellTemplateConverter.BooleanTemplate>
      <DataTemplate>
@@ -115,6 +116,16 @@
        <c:TickUpDownUInt Value="{Binding value}" IsEnabled="{Binding enabled}"/>
      </DataTemplate>
    </usp:DataGridParameterCellTemplateConverter.UIntTemplate>
+    <usp:DataGridParameterCellTemplateConverter.ShowQuantityTemplate>
+      <DataTemplate>
+        <!-- Note: the motivation for this Template was to enforce a Minimum via the TickUpDownUInt -->
+        <!-- As of 2019/06/17, we believe such a Minimum/Maximum is not actually getting enforced and -->
+        <!-- furthermore is not the appropriate way to go about enforcing said value. It is near the end -->
+        <!-- of the cycle though so that is why we are leaving this Template in here for now until we -->
+        <!-- can come up with a better solution. -->
+        <c:TickUpDownUInt Value="{Binding value}" IsEnabled="{Binding enabled}" />
+      </DataTemplate>
+    </usp:DataGridParameterCellTemplateConverter.ShowQuantityTemplate>
    <usp:DataGridParameterCellTemplateConverter.MarketDataTypeTemplate>
      <DataTemplate>
        <ComboBox SelectedItem="{Binding value}" ItemsSource="{u:EnumBindingSource {u:Nested sp:LegSpreaderParams.Types.MarketDataType}}" ItemTemplate="{StaticResource EnumDescriptionTemplate}"/>
@@ -363,6 +374,72 @@
      Height="{TemplateBinding Height}"
      Padding="{TemplateBinding Padding}"
    >
+      <Border.Resources>
+        <!--Leg Count States-->
+        <sys:String x:Key="LegCountStates">LegCountStates</sys:String>
+        <sys:String x:Key="LegCountStates.TwoOrFewer">TwoOrFewerLegsState</sys:String>
+        <sys:String x:Key="LegCountStates.ThreeOrMore">ThreeOrMoreLegsState</sys:String>
+        <cv:ValueConverterPipe x:Key="LegCountStateConverter">
+          <cv:IntGreaterThanConverter Value="2"/>
+          <cv:BooleanToObjectConverter ValueForFalse="{StaticResource LegCountStates.TwoOrFewer}" ValueForTrue="{StaticResource LegCountStates.ThreeOrMore}"/>
+        </cv:ValueConverterPipe>
+        <!--Persistance States-->
+        <sys:String x:Key="PersistanceStates">PersistanceStates</sys:String>
+        <sys:String x:Key="PersistanceStates.Unpersisted">UnpersistedState</sys:String>
+        <sys:String x:Key="PersistanceStates.Persisted">PersistedState</sys:String>
+        <cv:BooleanToObjectConverter x:Key="PersistanceStateConverter" ValueForFalse="{StaticResource PersistanceStates.Persisted}" ValueForTrue="{StaticResource PersistanceStates.Unpersisted}"/>
+      </Border.Resources>
+      <u:StateManager.Groups>
+        <u:StateGroupsManager AttachToMembers="True">
+          <u:StateDefinitionCollection>
+            <u:StateDefinition State="{Binding Group.Target.TemplatedParent.LegTuples.Count, RelativeSource={RelativeSource Self}, Converter={StaticResource LegCountStateConverter}}"/>
+            <u:StateDefinition State="{Binding Group.Target.TemplatedParent.IsNew, RelativeSource={RelativeSource Self}, Converter={StaticResource PersistanceStateConverter}}"/>
+          </u:StateDefinitionCollection>
+        </u:StateGroupsManager>
+      </u:StateManager.Groups>
+      <VisualStateManager.VisualStateGroups>
+        <VisualStateGroup Name="{StaticResource LegCountStates}">
+          <VisualState Name="{StaticResource LegCountStates.TwoOrFewer}"/>
+          <VisualState Name="{StaticResource LegCountStates.ThreeOrMore}">
+            <Storyboard>
+              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_HedgePricing_Label" Storyboard.TargetProperty="(UIElement.Visibility)">
+                <DiscreteObjectKeyFrame KeyTime="0" Value="{x:Static Visibility.Visible}"/>
+              </ObjectAnimationUsingKeyFrames>
+              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_HedgePricing_DropDown" Storyboard.TargetProperty="(UIElement.Visibility)">
+                <DiscreteObjectKeyFrame KeyTime="0" Value="{x:Static Visibility.Visible}"/>
+              </ObjectAnimationUsingKeyFrames>
+            </Storyboard>
+          </VisualState>
+        </VisualStateGroup>
+        <VisualStateGroup Name="{StaticResource PersistanceStates}">
+          <VisualState Name="{StaticResource PersistanceStates.Unpersisted}"/>
+          <VisualState Name="{StaticResource PersistanceStates.Persisted}">
+            <Storyboard>
+              <!--Name-->
+              <BooleanAnimationUsingKeyFrames Storyboard.TargetName="PART_Name_Label" Storyboard.TargetProperty="(UIElement.IsEnabled)">
+                <DiscreteBooleanKeyFrame KeyTime="0" Value="False"/>
+              </BooleanAnimationUsingKeyFrames>
+              <BooleanAnimationUsingKeyFrames Storyboard.TargetName="PART_Name_TextBox" Storyboard.TargetProperty="(UIElement.IsEnabled)">
+                <DiscreteBooleanKeyFrame KeyTime="0" Value="False"/>
+              </BooleanAnimationUsingKeyFrames>
+              <!--Tick Factors-->
+              <BooleanAnimationUsingKeyFrames Storyboard.TargetName="PART_TickFactors_Label" Storyboard.TargetProperty="(UIElement.IsEnabled)">
+                <DiscreteBooleanKeyFrame KeyTime="0" Value="False"/>
+              </BooleanAnimationUsingKeyFrames>
+              <BooleanAnimationUsingKeyFrames Storyboard.TargetName="PART_TickFactors_Picker" Storyboard.TargetProperty="(UIElement.IsEnabled)">
+                <DiscreteBooleanKeyFrame KeyTime="0" Value="False"/>
+              </BooleanAnimationUsingKeyFrames>
+              <!--Pricing-->
+              <BooleanAnimationUsingKeyFrames Storyboard.TargetName="PART_Pricing_Label" Storyboard.TargetProperty="(UIElement.IsEnabled)">
+                <DiscreteBooleanKeyFrame KeyTime="0" Value="False"/>
+              </BooleanAnimationUsingKeyFrames>
+              <BooleanAnimationUsingKeyFrames Storyboard.TargetName="PART_Pricing_DropDown" Storyboard.TargetProperty="(UIElement.IsEnabled)">
+                <DiscreteBooleanKeyFrame KeyTime="0" Value="False"/>
+              </BooleanAnimationUsingKeyFrames>
+            </Storyboard>
+          </VisualState>
+        </VisualStateGroup>
+      </VisualStateManager.VisualStateGroups>
      <Grid>
        <Grid.RowDefinitions>
          <RowDefinition Height="Auto"/>
@@ -377,8 +454,9 @@
            <ColumnDefinition Width="Auto"/>
            <ColumnDefinition Width="Auto"/>
            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="Auto"/>
          </Grid.ColumnDefinitions>
-          <TextBlock VerticalAlignment="Center" IsEnabled="{TemplateBinding IsNew}">Name</TextBlock>
+          <TextBlock x:Name="PART_Name_Label" VerticalAlignment="Center" IsEnabled="{TemplateBinding IsNew}">Name</TextBlock>
          <TextBox
            x:Name="PART_Name_TextBox"
            Grid.Column="1"
@@ -397,20 +475,37 @@
            </u:Behavior.BindingUpdateGroups>
          </TextBox>
          <TextBlock
-            Grid.Column="2" VerticalAlignment="Center" Margin="{StaticResource Margin.LHeaderPanelItem}" Text="Ticks" IsEnabled="{TemplateBinding IsNew}"
+            x:Name="PART_TickFactors_Label"
+            Grid.Column="2"
+            VerticalAlignment="Center"
+            Margin="{StaticResource Margin.LHeaderPanelItem}"
+            Text="Ticks"
+            IsEnabled="True"
            Visibility="{Binding LegTuples.Count, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource IntNotZeroVisibilityConverter}}"
          />
          <c:TickFactorsPicker
-            x:Name="PART_TickFactorsPicker" Grid.Column="3" Margin="{StaticResource Margin.LHeaderPanelItem}" IsEnabled="{TemplateBinding IsNew}" HorizontalAlignment="Stretch"
+            x:Name="PART_TickFactors_Picker"
+            Grid.Column="3"
+            Margin="{StaticResource Margin.LHeaderPanelItem}"
+            HorizontalAlignment="Stretch"
+            IsEnabled="True"
            SelectedTickFactors="{Binding TickFactors, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
            Visibility="{Binding LegTuples.Count, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource IntNotZeroVisibilityConverter}}"
          />
-          <TextBlock Grid.Column="4" VerticalAlignment="Center" Margin="{StaticResource Margin.LHeaderPanelItem}" IsEnabled="{TemplateBinding IsNew}" >Pricing</TextBlock>
+          <TextBlock
+            x:Name="PART_Pricing_Label"
+            Grid.Column="4"
+            VerticalAlignment="Center"
+            Margin="{StaticResource Margin.LHeaderPanelItem}"
+            IsEnabled="True"
+            Text="Pricing"
+          />
          <ComboBox
+            x:Name="PART_Pricing_DropDown"
            Grid.Column="5"
            Margin="{StaticResource Margin.LHeaderPanelItem}"
            Width="90"
-            IsEnabled="{TemplateBinding IsNew}"
+            IsEnabled="True"
            ItemsSource="{x:Static usp:ExecutionStrategyEditor.PriceCalcItems}"
            SelectedItem="{Binding price_calc}"
          >
@@ -420,6 +515,24 @@
              </DataTemplate>
            </ComboBox.ItemTemplate>
          </ComboBox>
+          <TextBlock
+            Grid.Column="6"
+            x:Name="PART_HedgePricing_Label"
+            VerticalAlignment="Center"
+            Margin="{StaticResource Margin.LHeaderPanelItem}"
+            Text="Hedge"
+            Visibility="Collapsed"
+          />
+          <ComboBox
+            x:Name="PART_HedgePricing_DropDown"
+            Grid.Column="7"
+            HorizontalAlignment="Stretch"
+            Margin="{StaticResource Margin.LHeaderPanelItem}"
+            ItemsSource="{TemplateBinding HedgePricingItemsSource}"
+            ItemTemplate="{StaticResource EnumDescriptionTemplate}"
+            SelectedItem="{Binding HedgePricing, RelativeSource={RelativeSource TemplatedParent}}"
+            Visibility="Collapsed"
+          />
        </Grid>
        <c:DataGridEx
          x:Name="PART_DataGrid"
@@ -8,6 +8,7 @@ using mbts.ui.utility;
 using mbts.user.settings;
 using mbts.utils;
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Collections.Specialized;
@@ -183,6 +184,29 @@ namespace mbts.ui.spark {
      public mbts.spark.ContractPickerModel ContractPickerModel { get => GetValue(ContractPickerModelProperty) as mbts.spark.ContractPickerModel; set => SetValue(ContractPickerModelProperty, value); }
      #endregion

+      #region HedgePricingItemsSource
+      public static readonly DependencyProperty HedgePricingItemsSourceProperty =
+         WPFHelper.create_dp<IEnumerable, ExecutionStrategyEditor>(
+            nameof(HedgePricingItemsSource));
+
+      public IEnumerable HedgePricingItemsSource {
+         get => GetValue(HedgePricingItemsSourceProperty) as IEnumerable;
+         set => SetValue(HedgePricingItemsSourceProperty, value);
+      }
+      #endregion
+
+      #region HedgePricing
+      public static readonly DependencyProperty HedgePricingProperty =
+         WPFHelper.create_dp<object, ExecutionStrategyEditor>(
+            nameof(HedgePricing),
+            FrameworkPropertyMetadataOptions.BindsTwoWayByDefault);
+
+      public object HedgePricing {
+         get => GetValue(HedgePricingProperty);
+         set => SetValue(HedgePricingProperty, value);
+      }
+      #endregion
+
      public override void OnApplyTemplate() =>
         _connect_leg_tuples();

@@ -240,7 +264,7 @@ namespace mbts.ui.spark {
         FrameworkElement _generate_element(IValueConverter cell_template_converter) {
            var rv = new ContentControl();
            rv.SetBinding(ContentControl.ContentProperty, new Binding());
-            rv.SetBinding(ContentControl.ContentTemplateProperty, new Binding(nameof(ICell.data_type)) { Converter = cell_template_converter });
+            rv.SetBinding(ContentControl.ContentTemplateProperty, new Binding() { Converter = cell_template_converter });
            return rv;
         }
      }
@@ -251,7 +275,7 @@ namespace mbts.ui.spark {

         public ExecutionStrategyErrorAdorner(ExecutionStrategyEditor editor) : base(editor) {
            _name_text_box = child_property<TextBox>("PART_Name_TextBox");
-            _tick_factors_picker = child_property<TickFactorsPicker>("PART_TickFactorsPicker");
+            _tick_factors_picker = child_property<TickFactorsPicker>("PART_TickFactors_Picker");
         }

         protected override void OnRender(DrawingContext drawing_context) {
@@ -306,17 +330,23 @@ namespace mbts.ui.spark {
      public DataTemplate MarketDataTypeTemplate { get; set; }
      public DataTemplate MarketDataCalculationTemplate { get; set; }
      public DataTemplate ConditionalPriceTypeTemplate { get; set; }
+      public DataTemplate ShowQuantityTemplate { get; set; }

      public object Convert(object value, Type targetType, object parameter, CultureInfo culture) {
-         Type t = (Type)value;
-         if (t == typeof(double)) return DoubleTemplate;
-         else if (t == typeof(bool)) return BooleanTemplate;
-         else if (t == typeof(int)) return IntTemplate;
-         else if (t == typeof(uint)) return UIntTemplate;
-         else if (t == typeof(QuantityMeasure)) return QuantityMeasureTemplate;
-         else if (t == typeof(LegSpreaderParams.Types.MarketDataType)) return MarketDataTypeTemplate;
-         else if (t == typeof(ConditionalQuoting.Types.PriceType)) return ConditionalPriceTypeTemplate;
-         else return null;
+         if (value is ICell cell) {
+            if (cell.row is ShowQuantityQuantityModel) {
+               return ShowQuantityTemplate;
+            }
+            Type t = cell.data_type;
+            if (t == typeof(double)) return DoubleTemplate;
+            else if (t == typeof(bool)) return BooleanTemplate;
+            else if (t == typeof(int)) return IntTemplate;
+            else if (t == typeof(uint)) return UIntTemplate;
+            else if (t == typeof(QuantityMeasure)) return QuantityMeasureTemplate;
+            else if (t == typeof(LegSpreaderParams.Types.MarketDataType)) return MarketDataTypeTemplate;
+            else if (t == typeof(ConditionalQuoting.Types.PriceType)) return ConditionalPriceTypeTemplate;
+         }
+         return null;
      }

      public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) =>
@@ -1,6 +1,7 @@
 using bts.api;
 using bts.api.synthetic;
 using bts.spark;
+using mbts.ui.shell;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.Composition;
@@ -14,12 +15,14 @@ namespace mbts.spark {
      readonly IBus _bus;
      readonly SyntheticSecurityService _service;
      readonly ErrorReporter _error;
+      readonly uint _user_id;

      [ImportingConstructor]
-      public SpreaderModel(IBus bus, SyntheticSecurityService service, ErrorReporter error) {
+      public SpreaderModel(IBus bus, SyntheticSecurityService service, ErrorReporter error, [Import(LoginContainer.Exports.UserID)]uint user_id) {
         _bus = bus;
         _service = service;
         _error = error;
+         _user_id = user_id;
      }

      public IObservable<IReadOnlyDictionary<uint, ExecutionStrategyImmutable>> strategy => _bus.subscribe(SparkTags.SyntheticstrategiesTag);
@@ -39,29 +42,40 @@ namespace mbts.spark {
            return (result, success);
         });

-      public async Task<ExecutionStrategyImmutable?> lookup_strategy_async(SecurityImmutable security) =>
-         await lookup_strategy_async(security.Id);
+      public Task<ExecutionStrategyImmutable?> lookup_strategy_async(SecurityImmutable security) =>
+         lookup_strategy_async(security.Id);

-      public async Task<ExecutionStrategyImmutable?> lookup_strategy_async(uint id) {
-         var result = await _service.query_security_metadata_async(new MetadataQuery { SecurityKey = { id } });
-         if (result.success) {
-            var metadata = result.value.Data.FirstOrDefault(i => i.SecurityKey == id);
-            if (metadata != null) {
-               return metadata.Strategy;
-            }
+      public Task<ExecutionStrategyImmutable?> lookup_strategy_async(uint id) =>
+         _error.safe_execute(
+            () => _service.query_security_metadata_async(new MetadataQuery { SecurityKey = { id } }),
+            mdc => mdc.Data.Count == 1 && mdc.Data[0].SecurityKey == id,
+            mdc => $"did not find strategy for security id '{id}.'",
+            (mdc, success) => success ? mdc.Data[0].Strategy : (ExecutionStrategyImmutable?)null,
+            "lookup strategy");
+
+      public Task<uint?> create_synthetic(SecurityImmutable synthetic) {
+         if (synthetic.ContractCase != Security.ContractOneofCase.Synthetic)
+            return null;
+         if (synthetic.Synthetic.UserId != _user_id) {
+            var msynth = synthetic.CloneToMutable();
+            msynth.Synthetic.UserId = _user_id;
+            synthetic = new SecurityImmutable(msynth);
         }
-         return null;
+         return _error.safe_execute(
+            () => _service.create_synthetic_async(synthetic),
+            r => r.Error == CreateResult.Types.Error.Ok,
+            r => r.Error.ToString(),
+            (r, success) => success ? r.Key : (uint?)null,
+            "creating synthetic");
      }

-      public async Task<uint?> create_synthetic(SecurityImmutable? synthetic) {
-         var result = await _service.create_synthetic_async(synthetic.Value);
-         return _error.handle_error(result, "Error creating synthetic: {0}", r => r.Error, e => e == CreateResult.Types.Error.Ok, r => new uint?(r.Key), () => null).result;
-      }
-
-      public async Task<bool> save_strategy(uint synthetic, ExecutionStrategyImmutable strategy) {
-         var result = await _service.update_security_metadata_async(new Metadata { SecurityKey = synthetic, Strategy = strategy.CloneToMutable() });
-         return _error.handle_error(result, "Error saving execution strategy: {0}", r => r.Error, e => e == UpdateResult.Types.Error.Ok);
-      }
+      public Task<bool> save_strategy(uint synthetic, ExecutionStrategyImmutable strategy) =>
+         _error.safe_execute(
+            () => _service.update_security_metadata_async(new Metadata { SecurityKey = synthetic, Strategy = strategy.CloneToMutable() }),
+            r => r.Error == UpdateResult.Types.Error.Ok,
+            r => r.Error.ToString(),
+            (r, success) => success,
+            "saving strategy");

      public async Task<bool> verify_name_is_unique(string name) {
         var (result, success) = await strategy_tuple.FirstAsyncTask(SparkUtils.DefaultTimeOut);
@@ -108,6 +108,9 @@ namespace bts.shell {
            NTicks = 2, 
            PriceType = ConditionalQuoting.Types.PriceType.Leg
         };
+         public static NullableQuantity ShowQuantity => new NullableQuantity {
+            Quantity = 1
+         };
         public static QuoteInsideMarketDistanceWithTravel QuoteInsideMarketDistanceWithTravel => new QuoteInsideMarketDistanceWithTravel { Priority = RulePriority };
         public static QuoteInsideMarketDistance QuoteInsideMarketDistance => new QuoteInsideMarketDistance { Priority = RulePriority };
         #endregion
@@ -34,6 +34,8 @@
      LegTuples="{Binding leg_tuples}"
      RemoveLegCommand="{Binding remove_leg}"
      ContractPickerModel="{Binding contract_picker_model}"
+      HedgePricing="{Binding hedge_pricing}"
+      HedgePricingItemsSource="{Binding hedge_pricing_options}"
    />
    <c:DialogSkirtOKCancel Grid.Row="1" OKCommand="{Binding commit}" CloseOnOK="False"/>
  </Grid>
@@ -82,11 +82,10 @@ namespace mbts.spark {
                  s => _vm.value.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())),
-                     this.observe_title()
+                     s.with(_vm.value.columns.Select(c => c.create()))
                  )
               );
-               // TODO: bind to main window's Title
+               vm.SubscribeDisposed(literal_title_source.OnDispatcher().Subscribe(t => vm.title = t));
               var dialog = new ShellSettingsDialog { Title = "Synthetic Management Grid Settings", DataContext = vm };
               vm.RequestClose += (s, e) => WindowUtilities.force_close(dialog);
               return dialog;
@@ -34,6 +34,8 @@ namespace mbts.spark {

         public virtual Type data_type { get; } = typeof(T);

+         public virtual IRowModel row { get => _model; }
+
         public T value {
            get => _model.get_value(_leg_tup);
            set {
@@ -64,6 +66,8 @@ namespace mbts.spark {

         public Type data_type { get; } = typeof(QuantityMeasure);

+         public virtual IRowModel row { get => _model; }
+
         public double ratio {
            get => _get_qm().Ratio;
            set {
@@ -0,0 +1,36 @@
+using bts.shell;
+using mbts.ui.spark;
+
+namespace mbts.spark {
+   partial class SyntheticEditorVM {
+      class ShowQuantityEnabledModel : RowModelBase<bool> {
+         readonly ShowQuantityQuantityModel _quantity;
+
+         public ShowQuantityEnabledModel(ShowQuantityQuantityModel quantity) {
+            _quantity = quantity;
+         }
+
+         public override string display_name => string.Empty;
+         public override string help_text => string.Empty;
+         public override string man_page => string.Empty;
+
+         public override ParameterSection[] section_path { get; } = new[] { Sections.Quote, Subsections.ShowQuantity };
+
+         public override bool get_value(LegSpreaderParamsTuple leg_tup) =>
+            leg_tup.leg_params.QuoteParams.ShowQuantity != null;
+         
+
+         public override void set_value(LegSpreaderParamsTuple leg_tup, bool value) {
+            if (value) {
+               if (leg_tup.leg_params.QuoteParams.ShowQuantity == null) {
+                  leg_tup.leg_params.QuoteParams.ShowQuantity = SyntheticDataHelper.Defaults.ShowQuantity;
+                  _quantity.apply_value(leg_tup);
+               }
+            } else {
+               leg_tup.leg_params.QuoteParams.ShowQuantity = null;
+            }
+            _quantity.set_enabled(leg_tup, value);
+         }
+      }
+   }
+}
@@ -0,0 +1,43 @@
+using bts.shell;
+using bts.spark;
+using mbts.ui.spark;
+using System.Collections.Generic;
+
+namespace mbts.spark {
+   partial class SyntheticEditorVM {
+      internal class ShowQuantityQuantityModel : RowModelBase<uint> {
+         IDictionary<uint, uint> _value_store = new Dictionary<uint, uint>();
+
+         public override string display_name => "Quantity";
+
+         public override string help_text => string.Empty;
+
+         public override string man_page => string.Empty;
+
+         public override ParameterSection[] section_path { get; } = new[] { Sections.Quote, Subsections.ShowQuantity };
+
+         public void apply_value(LegSpreaderParamsTuple leg_tup) =>
+            _get_value(leg_tup).Quantity = _value_from_store(leg_tup);
+
+
+         public override uint get_value(LegSpreaderParamsTuple leg_tup) =>
+            _get_value(leg_tup) is NullableQuantity show_quantity ? show_quantity.Quantity : _value_from_store(leg_tup);
+
+         public override void set_value(LegSpreaderParamsTuple leg_tup, uint value) {
+            _value_store[leg_tup.SecurityKey] = value;
+            if (_get_value(leg_tup) is NullableQuantity show_quantity) {
+               show_quantity.Quantity = value;
+            }
+         }
+
+         protected override bool _get_enabled(LegSpreaderParamsTuple leg_tup) =>
+            _get_value(leg_tup) != null;
+
+         NullableQuantity _get_value(LegSpreaderParamsTuple leg_tup) =>
+            leg_tup.leg_params.QuoteParams.ShowQuantity;
+
+         uint _value_from_store(LegSpreaderParamsTuple leg_tup) =>
+            _value_store.GetValueOrDefault(leg_tup.SecurityKey, _ => SyntheticDataHelper.Defaults.ShowQuantity.Quantity);
+      }
+   }
+}
@@ -32,6 +32,7 @@ namespace mbts.spark {

      internal interface ICell {
         event Action value_changed;
+         IRowModel row { get; }
         Type data_type { get; }
         bool enabled { get; }
      }
@@ -40,7 +41,7 @@ namespace mbts.spark {
         FontWeight font_weight { get; }
      }

-      abstract class RowModelBase<T> : ViewModelBase, IRowModel {
+      internal abstract class RowModelBase<T> : ViewModelBase, IRowModel {
         readonly Dictionary<uint, ReplaySubject<bool>> _enabled_store = new Dictionary<uint, ReplaySubject<bool>>();
         readonly Dictionary<uint, Subject<T>> _override_value_store = new Dictionary<uint, Subject<T>>();

@@ -98,6 +99,10 @@ namespace mbts.spark {
      }

      private static class Subsections {
+         public static ParameterSection ShowQuantity =>
+            new ParameterSection("Show Quantity", true,
+               "The quantity shown when the order is placed.");
+
         public static ParameterSection Throttle =>
            new ParameterSection("Throttle", true,
               "Reduces re-quoting updates by defining a region on either side " +
@@ -17,6 +17,7 @@ using System.Reactive.Linq;
 using System.Threading.Tasks;
 using System.Windows.Input;
 using System.Windows.Media;
+using HedgePricing = bts.spark.ExecutionStrategy.Types.HedgePricing;

 namespace mbts.spark {
   /// <summary>
@@ -32,6 +33,7 @@ namespace mbts.spark {
      bool _set_name_automatically, _set_ticks_automatically, _set_quantities_automatically, _set_price_mults_automatically, _is_setting_quantities, _is_setting_price_mults;
      TickFactors _tick_factors;
      ExecutionStrategyImmutable _strategy;
+      HedgePricing _hedge_pricing;

      /// <summary>
      /// Inititalizes a new instance of SyntheticEditorVM class.  This constructor may only be used for already-existing synthetic securities (id must be non-zero).
@@ -76,8 +78,8 @@ namespace mbts.spark {
               exchanges = EnumHelper.get_values_except(Venue.Bts).ToArray()
            }
         }));
-         contract_picker_model.cancel_action = _close_new_leg_popup;
-         contract_picker_model.ok_action = () => {
+         contract_picker_model.cancel_action += _close_new_leg_popup;
+         contract_picker_model.ok_action += () => {
            if (!leg_tuples.Any(l => l.leg.Security.Id == contract_picker_model.result.security.Id)) {
               leg_tuples.Add(new LegSpreaderParamsTuple(
                  SyntheticDataHelper.Defaults.ContractLeg(contract_picker_model.result.security),
@@ -134,7 +136,7 @@ namespace mbts.spark {
               _synthetic.ContractSpec.PriceBreak = double.MaxValue;
               _synthetic.ContractSpec.MainFraction = (uint)MathUtils.factor_out(_tick_factors.tick_base, 10);
               _synthetic.ContractSpec.PriceDisplayFormat = (uint)_tick_factors.display_digits();
-               uint? id = await model.create_synthetic(_synthetic);
+               uint? id = await model.create_synthetic(new SecurityImmutable(_synthetic));
               if (id.HasValue && id != 0) {
                  if (await model.save_strategy(id.Value, get_strategy())) {
                     var (smd, success) = await SparkUtils.get_security_md_async(bus, id.Value);
@@ -177,6 +179,8 @@ namespace mbts.spark {
         } else {
            _can_add_leg = backing(nameof(can_add_leg), false);
         }
+         var show_quantity_quantity = new ShowQuantityQuantityModel();
+
         var quote_throttle_outside_ticks = new QuoteThrottleOutsideTicksModel();
         var quote_throttle_inside_ticks = new QuoteThrottleInsideTicksModel();

@@ -211,6 +215,8 @@ namespace mbts.spark {
            //new QuoteHiddenModel(),
            new QuoteQueueHolderModel(),
            new MarketDataTypeModel(),
+            new ShowQuantityEnabledModel(show_quantity_quantity),
+            show_quantity_quantity,
            new QuoteThrottleEnabledModel(quote_throttle_inside_ticks, quote_throttle_outside_ticks),
            quote_throttle_inside_ticks,
            quote_throttle_outside_ticks,
@@ -290,6 +296,9 @@ namespace mbts.spark {
      public IRaiseCanExecuteChangedCommand commit { get; }
      public ICommand remove_leg { get; }
      public ContractPickerModel contract_picker_model { get; }
+      // hedge pricing
+      public HedgePricing hedge_pricing { get => _hedge_pricing; set => Set(ref _hedge_pricing, value); }
+      public IEnumerable<HedgePricing> hedge_pricing_options => EnumHelper.get_values<HedgePricing>();

      public ExecutionStrategyImmutable get_strategy() {
         var mutable_strategy = _strategy.CloneToMutable();
@@ -297,6 +306,7 @@ namespace mbts.spark {
         foreach (var lt in leg_tuples) {
            mutable_strategy.LegParamsMap.Add(lt.leg.Security.Id, lt.leg_params);
         }
+         mutable_strategy.HedgePricing = hedge_pricing;
         return new ExecutionStrategyImmutable(mutable_strategy);
      }

@@ -304,6 +314,7 @@ namespace mbts.spark {
         _synthetic = synthetic.CloneToMutable();
         _synthetic.Exchange = Venue.Bts;
         _strategy = strategy;
+         hedge_pricing = strategy.HedgePricing;
         leg_tuples.SetItems(_get_legs(_synthetic, strategy));
         RaisePropertyChanged(nameof(name), nameof(tick_factors));
      }
@@ -1,14 +1,9 @@
-using bts.api;
+using mbts;
 using mbts.config;
-using mbts.spark;
 using mbts.ui;
-using ProtoBuf;
+using mbts.ui.shell;
 using System;
-using System.Collections.Generic;
-using System.ComponentModel.Composition;
-using System.Threading.Tasks;
 using System.Windows.Controls;
-using mbts;

 namespace bts.shell {
   public class BrowserWindow : IShellWindow {
@@ -75,12 +70,15 @@ namespace bts.shell {
      public string window_type => _window_type;

      public IShellModule Owner {get; set; }
+
      public ShellWindowUI GetContent() { return new ShellWindowUI(_browser); }

      public void GetState(System.IO.Stream save_here) {
         _isw.save(new BrowserWindowState() { uri = uri.ToString() }, save_here);
      }

+      public void on_shell_window_vm(ShellWindowVM shell_window_vm) { }
+
      public void Dispose() {
         if (_browser != null) {
            _browser.Dispose();
@@ -102,5 +100,4 @@ namespace bts.shell {
      }
      #endregion
   }
-   
-}
+}
@@ -1,112 +0,0 @@
-using bts.api.core;
-using bts.collections;
-using mbts.collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Threading.Tasks;
-
-namespace mbts.spark {
-   /// <summary>
-   /// This class's primary purpose is to handle async AlgoService persistence calls for the AlgoStudioVM/OrderPropertiesEditorVM.
-   /// When a new definition/template item is persisted for the first time, it's corresponding viewmodel (<see cref="AlgoDefinitionVM"/>, <see cref="AlgoDefinitionTemplateVM"/>)
-   /// must be removed and replaced with a new one that has the brand new persisted id (<see cref="AlgoKey"/>).  As part of its duty, this class makes sure that the new persisted items are inserted into the same index as their unpersisted predecessor.
-   /// </summary>
-   static class AlgoPersistenceHelper {
-      public static (int? def_index, int? tmp_index) selection_snapshot(IList<AlgoDefinitionVM> definitions, AlgoDefinitionVM selected_definition, AlgoDefinitionTemplateVM selected_template) {
-         var def = selected_definition;
-         var tmp = selected_template;
-         int? def_index = def == null ? (int?)null : definitions.IndexOf(def);
-         int? tmp_index = tmp == null ? (int?)null : tmp.owner.templates.IndexOf(tmp);
-         return (def_index, tmp_index);
-      }
-
-      public static async Task<IReadOnlyDictionary<AlgoKey, AlgoKey>> persist_definition(OrdersModel model, IList<AlgoDefinitionVM> definitions, AlgoDefinitionVM definition) {
-         int def_index = definitions.IndexOf(definition);
-         return await persist(model, definitions.WrapSubRange(def_index, 1).WrapSelector(def => (def, definition.templates.AsList()), t => t.def));
-      }
-
-      public static async Task<IReadOnlyDictionary<AlgoKey, AlgoKey>> persist_template(OrdersModel model, IList<AlgoDefinitionVM> definitions, AlgoDefinitionTemplateVM template) {
-         switch (template.owner.key.mode) {
-            case AlgoKey.Mode.Unpersisted: return await persist_definition(model, definitions, template.owner);
-            case AlgoKey.Mode.Persisted:
-               int def_index = definitions.IndexOf(template.owner);
-               int tmp_index = template.owner.templates.IndexOf(template);
-               return await persist(model, definitions.WrapSubRange(def_index, 1).WrapSelector(def => (def, def.templates.WrapSubRange(tmp_index, 1)), t => t.def));
-            default: return DictionaryHelper.empty<AlgoKey, AlgoKey>();
-         }
-      }
-
-      public static async Task<IReadOnlyDictionary<AlgoKey, AlgoKey>> persist_all(OrdersModel model, ObservableKeyedCollection<AlgoDefinitionVM, AlgoKey> definitions) =>
-         await persist(model, definitions.WrapSelector(def => (def, def.templates.AsList()), t => t.def));
-
-      /// <summary>
-      /// Persists each pair of definition/templates, then returns a map of non-persisted keys to persisted ones (<see cref="AlgoKey"/>, <see cref="AlgoDefinitionVM.key"/>, <see cref="AlgoDefinitionTemplateVM.key"/>).
-      /// The key-map gives callers the ability to replace unpersisted items with persisted ones before the next update arrives.
-      /// <para>Note: use a <see cref="mbts.utils.TableUpdateBuffer{T, TKey}"/> to suspend updates while awaiting this task; don't resume them until all unpersisted items have been replaced.
-      /// <see cref="AlgoDefinitionCollection"/> caters to this pre-emptive adding behavior, in it's <see cref="TableUpdate{T, TKey}"/> callback, it checks if added items are already present, and if so, treats them as changes instead.</para>
-      /// <para>PS: the reason for all this madness is so newly persisted items are inserted in the same index as their placeholder counterpart.  The only way to connect the non-persisted keys with their persisted counterparts
-      /// is to await each save-op individually, and build a map with the results..hence the returned key-map.</para>
-      /// </summary>
-      /// <param name="model"></param>
-      /// <param name="definition_templates"></param>
-      /// <returns>An AlgoKey->AlgoKey map of old placeholder ids to newly persisted ones.</returns>
-      public static async Task<IReadOnlyDictionary<AlgoKey, AlgoKey>> persist(OrdersModel model, IList<(AlgoDefinitionVM definition, IList<AlgoDefinitionTemplateVM> templates)> definition_templates) {
-         var placeholder_to_persisted_keys = new Dictionary<AlgoKey, AlgoKey>();
-         for (int i = 0; i < definition_templates.Count; i++) {
-            (var def, var templates) = definition_templates[i];
-            var persisted_def = def;
-            if (def.is_dirty) {
-               var def_record = await model.algo_model.save_definition(def.create_algo_def());
-               if (def_record.HasValue) {
-                  switch (def.key.mode) {
-                     case AlgoKey.Mode.Factory:
-                     case AlgoKey.Mode.Unpersisted:
-                        persisted_def = def.to_persisted(def_record.Value);
-                        foreach (var tmp in templates) {
-                           AlgoDefinitionTemplateVM persisted_tmp;
-                           var tmp_record = await model.algo_model.save_template(tmp.create(def_record.Value));
-                           if (tmp_record.HasValue) {
-                              persisted_def.templates.Add(persisted_tmp = tmp.to_persisted(persisted_def, new AlgoData(tmp_record.Value.value, tmp_record.Value.name, tmp_record.Value.key)));
-                           } else {
-                              /// If the save-op fails, the unpersisted template is cloned and added to the persisted def's template items, so the user may try to save it again without having to re-enter all the templated-values.
-                              /// Q: "why don't we just re-add the same template to the persisted def, the save-op failed, so nothing changed...why do we need a new one?"
-                              /// A: "A new template vm must be created because its owner has changed (it's a readonly prop, <see cref="AlgoDefinitionTemplateVM.owner"/>)."
-                              persisted_def.templates.Add(persisted_tmp = new AlgoDefinitionTemplateVM(persisted_def, model, tmp.create_def_data()));
-                           }
-                           placeholder_to_persisted_keys[tmp.key] = persisted_tmp.key;
-                        }
-                        persisted_def.connect();
-                        if (def.key.mode == AlgoKey.Mode.Unpersisted) {
-                           definition_templates[i] = (persisted_def, persisted_def.templates);
-                        } else {
-                           definition_templates.Add((persisted_def, persisted_def.templates));
-                        }
-                        placeholder_to_persisted_keys[def.key] = persisted_def.key;
-                        break;
-                  }
-               }
-            } else {
-               // so the def isn't dirty, but it still might have dirty templates
-               using (persisted_def.buffer_updates()) {
-                  for (int j = 0; j < templates.Count; j++) {
-                     var tmp = templates[j];
-                     if (!tmp.is_dirty)
-                        continue;
-                     var tmp_record = await model.algo_model.save_template(tmp.create());
-                     if (tmp_record.HasValue) {
-                        switch (tmp.key.mode) {
-                           case AlgoKey.Mode.Unpersisted:
-                              var persisted_tmp = tmp.to_persisted(persisted_def, new AlgoData(tmp_record.Value.value, tmp_record.Value.name, tmp_record.Value.key));
-                              templates[j] = persisted_tmp;
-                              placeholder_to_persisted_keys[tmp.key] = persisted_tmp.key;
-                              break;
-                        }
-                     }
-                  }
-               }
-            }
-         }
-         return placeholder_to_persisted_keys;
-      }
-   }
-}
@@ -12,14 +12,11 @@
  xmlns:uag="clr-namespace:mbts.ui.spark.algo"
  xmlns:uspcv="clr-namespace:mbts.ui.spark.converters"
  xmlns:sys="clr-namespace:System;assembly=mscorlib"
-  u:StateManager.VisualState="{Binding content_source.algo_root, Converter={x:Static usp:AlgoStudioView.EditPaneVisualStateConverter}}"
+  u:StateManager.VisualState="{Binding selected_definition.algo_root, Converter={x:Static usp:AlgoStudioView.EditPaneVisualStateConverter}}"
  Background="{StaticResource CommonBackground}"
 >
  <UserControl.Resources>
    <ResourceDictionary>
-      <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="/view/Controls/Order/AlgoTemplateTreeView.xaml"/>
-      </ResourceDictionary.MergedDictionaries>
      <!--Primitive Constants-->
      <sys:Double x:Key="HorizontalPush1">4</sys:Double>
      <sys:Double x:Key="HorizontalPush2">8</sys:Double>
@@ -33,9 +30,6 @@
      <Thickness x:Key="Margin.TP1" Top="{StaticResource VerticalPush1}"/>
      <Thickness x:Key="Margin.TP2" Top="{StaticResource VerticalPush2}"/>
      <!--Converters-->
-      <cv:ValueMap x:Key="AlgoTemplateFavoriteToggleButtonToolTipConverter" Default="Add to Favorites">
-        <cv:KeyValue Key="{u:True}" Value="Remove from Favorites"/>
-      </cv:ValueMap>
      <sys:String x:Key="AlgoAbbreviationActiveState">AbbreviationActive</sys:String>
      <sys:String x:Key="AlgoAbbreviationInactiveState">AbbreviationInactive</sys:String>
      <cv:ValueMap x:Key="AlgoAbbreviationVisualStateConverter" Default="{StaticResource AlgoAbbreviationActiveState}">
@@ -130,70 +124,8 @@
        </Setter>
      </Style>

-      <Style x:Key="AlgoTemplateFavoriteToggleButtonStyle" TargetType="ToggleButton">
-        <Setter Property="Background" Value="LightGray"/>
-        <Setter Property="BorderBrush" Value="Black"/>
-        <Setter Property="BorderThickness" Value="1"/>
-        <Setter Property="Foreground" Value="White"/>
-        <Setter Property="IsThreeState" Value="False"/>
-        <Setter Property="IsChecked" Value="{Binding is_favorite}"/>
-        <Setter Property="SnapsToDevicePixels" Value="True"/>
-        <Setter Property="UseLayoutRounding" Value="True"/>
-        <Setter Property="Width" Value="16"/>
-        <Setter Property="Height" Value="16"/>
-        <Setter Property="ToolTip" Value="{Binding IsChecked, RelativeSource={RelativeSource Self}, Converter={x:Static uag:AlgoTemplateToolBar.FavoriteToggleButtonToolTipConverter}}"/>
-        <Setter Property="Template">
-          <Setter.Value>
-            <ControlTemplate TargetType="ToggleButton">
-              <Grid UseLayoutRounding="{TemplateBinding UseLayoutRounding}">
-                <Ellipse x:Name="ellipse" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Fill="{TemplateBinding Background}" Width="0" Height="0"/>
-                <Image SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" UseLayoutRounding="{TemplateBinding UseLayoutRounding}" MaxHeight="13" MaxWidth="13">
-                  <Image.Source>
-                    <DrawingImage>
-                      <DrawingImage.Drawing>
-                        <GeometryDrawing Geometry="{Binding Source={StaticResource ResourceKey={x:Static u:Icons.StarGeometryKey}}}" Brush="{Binding Foreground, RelativeSource={RelativeSource TemplatedParent}}" >
-                          <GeometryDrawing.Pen>
-                            <Pen
-                              Brush="{Binding BorderBrush, RelativeSource={RelativeSource TemplatedParent}}"
-                              Thickness="{Binding BorderThickness.Left, RelativeSource={RelativeSource TemplatedParent}}"
-                            />
-                          </GeometryDrawing.Pen>
-                        </GeometryDrawing>
-                      </DrawingImage.Drawing>
-                    </DrawingImage>
-                  </Image.Source>
-                </Image>
-              </Grid>
-              <ControlTemplate.Triggers>
-                <Trigger Property="IsChecked" Value="True">
-                  <Setter Property="Foreground" Value="Gold"/>
-                </Trigger>
-                <Trigger Property="IsMouseOver" Value="True">
-                  <Trigger.EnterActions>
-                    <BeginStoryboard>
-                      <Storyboard>
-                        <DoubleAnimation Storyboard.TargetName="ellipse" Storyboard.TargetProperty="Width" To="16" Duration="0:0:0.03" />
-                        <DoubleAnimation Storyboard.TargetName="ellipse" Storyboard.TargetProperty="Height" To="16" Duration="0:0:0.03" />
-                      </Storyboard>
-                    </BeginStoryboard>
-                  </Trigger.EnterActions>
-                  <Trigger.ExitActions>
-                    <BeginStoryboard>
-                      <Storyboard>
-                        <DoubleAnimation Storyboard.TargetName="ellipse" Storyboard.TargetProperty="Width" To="0" Duration="0:0:0.0" />
-                        <DoubleAnimation Storyboard.TargetName="ellipse" Storyboard.TargetProperty="Height" To="0" Duration="0:0:0.0" />
-                      </Storyboard>
-                    </BeginStoryboard>
-                  </Trigger.ExitActions>
-                </Trigger>
-              </ControlTemplate.Triggers>
-            </ControlTemplate>
-          </Setter.Value>
-        </Setter>
-      </Style>
-
      <Style TargetType="uag:AlgoPickerNodeView" BasedOn="{StaticResource {x:Type uag:AlgoPickerNodeView}}">
-        <Setter Property="DropDownStyleKey" Value="{Binding DataContext.content_source, RelativeSource={RelativeSource AncestorType=usp:AlgoStudioView}, Converter={x:Static usp:AlgoContentTemplateSelector.AlgoDropDownStyleKeyConverter}}"/>
+        <Setter Property="DropDownStyleKey" Value="{x:Static usp:AlgoContentTemplateSelector.DefinitionDropDownStyleKey}"/>
      </Style>
    </ResourceDictionary>
  </UserControl.Resources>
@@ -221,94 +153,26 @@
        <ColumnDefinition Width="Auto"/>
        <ColumnDefinition Width="*"/>
      </Grid.ColumnDefinitions>
-      <TreeView
+      <ListBox
        x:Name="_tree_view"
-        u:TreeViewEx.SelectedItemChangedHandler="{Binding}"
        ItemsSource="{Binding definitions_view}"
        HorizontalAlignment="Stretch"
        VerticalAlignment="Stretch"
        MinWidth="180"
        Background="Transparent"
-        Style="{StaticResource AlgoTemplateTreeViewStyle}"
+        SelectedItem="{Binding selected_definition}"
      >
-        <TreeView.CommandBindings>
-          <CommandBinding Command="{x:Static u:EditableCollectionViewEx.AddNewItemCommand}" Executed="{x:Static u:EditableCollectionViewEx.AddNewItemExecuted}" CanExecute="{x:Static u:EditableCollectionViewEx.AddNewItemCanExecute}"/>
-          <CommandBinding Command="{x:Static u:EditableCollectionViewEx.CommitAnyCommand}" Executed="{x:Static u:EditableCollectionViewEx.CommitAnyExecuted}"/>
-        </TreeView.CommandBindings>
-        <TreeView.Resources>
-          <HierarchicalDataTemplate DataType="{x:Type sp:AlgoDefinitionVM}" ItemsSource="{Binding templates_view}">
-            <Grid u:StateManager.VisualStateCollection="{Binding tree_view_visual_states}">
-              <VisualStateManager.VisualStateGroups>
-                <VisualStateGroup Name="{x:Static GroupName, MemberType={u:Nested usp:AlgoStudioView.VisualStateNames.TreeViewBadge}}">
-                  <VisualState Name="{x:Static Active, MemberType={u:Nested usp:AlgoStudioView.VisualStateNames.TreeViewBadge}}"/>
-                  <VisualState Name="{x:Static Inactive, MemberType={u:Nested usp:AlgoStudioView.VisualStateNames.TreeViewBadge}}">
-                    <Storyboard>
-                      <ObjectAnimationUsingKeyFrames Storyboard.TargetName="badge" Storyboard.TargetProperty="(UIElement.Visibility)">
-                        <DiscreteObjectKeyFrame KeyTime="0" Value="{x:Static Visibility.Collapsed}"/>
-                      </ObjectAnimationUsingKeyFrames>
-                    </Storyboard>
-                  </VisualState>
-                </VisualStateGroup>
-              </VisualStateManager.VisualStateGroups>
-              <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="Auto"/>
-                <ColumnDefinition Width="*"/>
-              </Grid.ColumnDefinitions>
-              <Rectangle
-                x:Name="badge"
-                Fill="{Binding badge_fill}"
-                Style="{StaticResource RectangleBadgeStyle}"
-                Visibility="{DynamicResource ResourceKey={x:Static usp:AlgoStudioView.BadgesInTreeViewVisibilityKey}}"
-              />
-              <TextBlock x:Name="text_view" Grid.Column="1" Margin="{StaticResource Margin.LP1}" Text="{Binding name}"/>
-            </Grid>
-            <HierarchicalDataTemplate.Triggers>
-              <DataTrigger Binding="{Binding is_dirty}" Value="True">
-                <Setter TargetName="text_view" Property="Text" Value="{Binding name, StringFormat='{}{0}*'}"/>
-              </DataTrigger>
-            </HierarchicalDataTemplate.Triggers>
-          </HierarchicalDataTemplate>
-          <DataTemplate DataType="{x:Type sp:AlgoDefinitionTemplateVM}">
-            <Grid u:StateManager.VisualStateCollection="{Binding tree_view_visual_states}" Margin="-6,0,0,0">
-              <VisualStateManager.VisualStateGroups>
-                <VisualStateGroup Name="{x:Static GroupName, MemberType={u:Nested usp:AlgoStudioView.VisualStateNames.FavoriteToggleButton}}">
-                  <VisualState Name="{x:Static Active, MemberType={u:Nested usp:AlgoStudioView.VisualStateNames.FavoriteToggleButton}}"/>
-                  <VisualState Name="{x:Static Inactive, MemberType={u:Nested usp:AlgoStudioView.VisualStateNames.FavoriteToggleButton}}">
-                    <Storyboard>
-                      <ObjectAnimationUsingKeyFrames Storyboard.TargetName="favorite_toggle" Storyboard.TargetProperty="(UIElement.Visibility)">
-                        <DiscreteObjectKeyFrame KeyTime="0" Value="{x:Static Visibility.Collapsed}"/>
-                      </ObjectAnimationUsingKeyFrames>
-                    </Storyboard>
-                  </VisualState>
-                </VisualStateGroup>
-              </VisualStateManager.VisualStateGroups>
-              <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="Auto"/>
-                <ColumnDefinition Width="*"/>
-              </Grid.ColumnDefinitions>
-              <Grid>
-                <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="Auto"/>
-                  <ColumnDefinition Width="*"/>
-                </Grid.ColumnDefinitions>
-                <ToggleButton x:Name="favorite_toggle" Grid.Column="1" Margin="4,0,0,0" Style="{StaticResource AlgoTemplateFavoriteToggleButtonStyle}"/>
-              </Grid>
-              <TextBlock x:Name="text_view" Grid.Column="1" Margin="{StaticResource Margin.LP1}" Text="{Binding name}" ToolTip="Double click to set as default"/>
-            </Grid>
+        <ListBox.ItemTemplate>
+          <DataTemplate DataType="{x:Type sp:AlgoDefinitionVM}">
+            <TextBlock x:Name="text_view" Grid.Column="1" Margin="{StaticResource Margin.LP1}" Text="{Binding name}"/>
            <DataTemplate.Triggers>
-              <DataTrigger Value="{u:True}">
-                <DataTrigger.Binding>
-                  <MultiBinding Converter="{StaticResource OrConverter}">
-                    <Binding Path="is_dirty"/>
-                    <Binding Path="is_persisted" Converter="{StaticResource NotConverter}"/>
-                  </MultiBinding>
-                </DataTrigger.Binding>
+              <DataTrigger Binding="{Binding is_dirty}" Value="True">
                <Setter TargetName="text_view" Property="Text" Value="{Binding name, StringFormat='{}{0}*'}"/>
              </DataTrigger>
            </DataTemplate.Triggers>
          </DataTemplate>
-        </TreeView.Resources>
-      </TreeView>
+        </ListBox.ItemTemplate>
+      </ListBox>
      <ScrollViewer Grid.Column="1" Grid.IsSharedSizeScope="True" Margin="8,4">
        <Grid x:Name="edit_pane">
          <Grid.RowDefinitions>
@@ -430,7 +294,7 @@
            Margin="{StaticResource Margin.LP1}"
            HorizontalAlignment="Stretch"
            VerticalAlignment="Center"
-            Text="{Binding content_source.name, UpdateSourceTrigger=PropertyChanged, Delay=25}"
+            Text="{Binding selected_definition.name, UpdateSourceTrigger=PropertyChanged, Delay=25}"
          />
            <Grid x:Name="abbreviation_root" Grid.Column="2">
              <Grid.ToolTip>
@@ -452,7 +316,7 @@
                <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 content_source.abbreviation, UpdateSourceTrigger=PropertyChanged, Delay=25}"/>
+              <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}">
@@ -478,8 +342,8 @@
                      <TextBlock>Hint: the default color is that of the algo-root (</TextBlock>
                      <usp:OrderTypeItem
                        Margin="2,0"
-                        BadgeFill="{Binding content_source.algo_root.meta.Color, Converter={StaticResource ColorToBrushConverter}}"
-                        DisplayName="{Binding content_source.algo_root.display_name}"
+                        BadgeFill="{Binding selected_definition.algo_root.meta.Color, Converter={StaticResource ColorToBrushConverter}}"
+                        DisplayName="{Binding selected_definition.algo_root.display_name}"
                      />
                      <TextBlock>).</TextBlock>
                    </StackPanel>
@@ -496,7 +360,7 @@
                  x:Name="default_badge"
                  Grid.Column="1"
                  Margin="{StaticResource Margin.LP1}"
-                  Fill="{Binding content_source.algo_root.meta.Color, Converter={StaticResource ColorToBrushConverter}}"
+                  Fill="{Binding selected_definition.algo_root.meta.Color, Converter={StaticResource ColorToBrushConverter}}"
                  Style="{StaticResource RectangleBadgeStyle}"
                />
              </Grid>
@@ -506,7 +370,7 @@
              VerticalAlignment="Center"
              VerticalContentAlignment="Center"
              Margin="{StaticResource Margin.LP2}"
-              IsChecked="{Binding content_source.custom_badge_color.enabled}"
+              IsChecked="{Binding selected_definition.custom_badge_color.enabled}"
              GroupName="Badge"
            >
              <RadioButton.ToolTip>
@@ -526,7 +390,7 @@
                    Grid.Row="1"
                    Grid.Column="1"
                    Margin="3,0"
-                    Fill="{Binding content_source.custom_badge_color.value, Converter={StaticResource ColorToBrushConverter}}"
+                    Fill="{Binding selected_definition.custom_badge_color.value, Converter={StaticResource ColorToBrushConverter}}"
                    Style="{StaticResource RectangleBadgeStyle}"
                  />
                  <TextBlock Grid.Row="1" Grid.Column="2" FontStyle="Italic">to open the color picker popup.</TextBlock>
@@ -541,7 +405,7 @@
                <Button
                  x:Name="custom_badge_color_picker_button"
                  Grid.Column="1"
-                  Background="{Binding content_source.custom_badge_color.value, Converter={StaticResource ColorToBrushConverter}}"
+                  Background="{Binding selected_definition.custom_badge_color.value, Converter={StaticResource ColorToBrushConverter}}"
                  Margin="{StaticResource Margin.LP1}"
                  Style="{StaticResource CustomBadgeColorPickerButtonStyle}"
                />
@@ -549,8 +413,8 @@
                  <Border Style="{StaticResource CustomBadgeColorPickerPopupRootStyle}">
                    <cp:ColorPickerControl
                      Background="Transparent"
-                      Palettes="{Binding DataContext.content_source.custom_badge_color_palettes, RelativeSource={RelativeSource AncestorType=Popup}}"
-                      SelectedColor="{Binding DataContext.content_source.custom_badge_color.value, RelativeSource={RelativeSource AncestorType=Popup}, Mode=TwoWay}"
+                      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>
@@ -559,7 +423,7 @@
          </Grid>
          <usp:AlgoEditorView
            Grid.Row="2"
-            DataContext="{Binding content_source}"
+            DataContext="{Binding selected_definition}"
            Background="Transparent"
            BorderBrush="{Binding algo_root, Converter={StaticResource OrderTypeBrushConverter}}"
            Margin="0,6,0,0"
@@ -569,10 +433,10 @@
            <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 content_source}" Width="100" ToolTip="{Binding save_cmd_tooltip}" IsDefault="True">
+            <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}'}"/>
            </Button>
-            <Button ToolTipService.ShowOnDisabled="True" Margin="{StaticResource DialogSkirtButtonMargin}" Command="{Binding revert_cmd}" CommandParameter="{Binding content_source}" Width="100" ToolTip="{Binding revert_cmd_tooltip}">
+            <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>
          </StackPanel>
@@ -580,4 +444,4 @@
      </ScrollViewer>
    </Grid>
  </AdornerDecorator>
-</UserControl>
+</UserControl>
@@ -1,43 +1,24 @@
 using mbts.spark;
+using mbts.ui.controls;
 using mbts.ui.converters;
-using System;
+using mbts.ui.extensions;
 using System.Windows.Controls;
 using System.Windows.Data;
 using System.Windows.Input;

 namespace mbts.ui.spark {
   partial class AlgoStudioView : UserControl {
-      public const string BadgesInTreeViewVisibilityKey = nameof(BadgesInTreeViewVisibilityKey);
      public static readonly IValueConverter EditPaneVisualStateConverter =
         ValueConverter.create(obj => obj == null ? VisualStates.Inactive : VisualStates.Active);

-      IAlgoStudioViewController _controller;
-
      public AlgoStudioView() {
         InitializeComponent();
-         DataContextChanged += (s, e) => set_controller();
-         set_controller();
-         // local methods
-         void set_controller() => Disposable.replace(ref _controller, AlgoStudioViewControllerFactory.create(DataContext, _tree_view, name_text_box, custom_badge_color_picker_button, custom_badge_color_picker_popup));
+         PopupViewController.attach(custom_badge_color_picker_popup, custom_badge_color_picker_button);
+         this.ConnectDataContext<AlgoStudioVM>(vm => vm.request_view_focus_name += focus_name, vm => vm.request_view_focus_name -= focus_name);
+         void focus_name(AlgoDefinitionVM target) =>
+            Dispatcher.InvokeAsync(() => Keyboard.Focus(name_text_box));
      }

-      public new AlgoStudioVM DataContext {
-         get => base.DataContext as AlgoStudioVM;
-         set => base.DataContext = value;
-      }
-
-      public void add_definition() => _controller.add_definition();
-      public void add_definition_clone(AlgoDefinitionVM src_definition) => _controller.add_definition_clone(src_definition);
-      public void add_template(AlgoDefinitionVM definition) => _controller.add_template(definition);
-      public void rename_definition(AlgoDefinitionVM definition) => _controller.rename_definition(definition);
-      public void rename_template(AlgoDefinitionTemplateVM template) => _controller.rename_template(template);
-      public void select_definition(AlgoDefinitionVM definition) => _controller.select_definition(definition);
-      public void select_template(AlgoDefinitionTemplateVM template) => _controller.select_template(template);
-      public IDisposable preserve_selected_definition() => _controller.preserve_selected_definition();
-
-      void _end_edit_executed(object s, ExecutedRoutedEventArgs e) =>
-         _controller.end_edit(e);
-
      public static class VisualStateNames {
         public static class EditPane {
            public const string GroupName = nameof(EditPane);
@@ -75,14 +56,6 @@ namespace mbts.ui.spark {
               Inactive = $"{GroupName}{VisualStates.Inactive}";
         }

-         public static class TreeViewBadge {
-            public const string GroupName = nameof(TreeViewBadge);
-
-            public static readonly string
-               Active = $"{GroupName}{VisualStates.Active}",
-               Inactive = $"{GroupName}{VisualStates.Inactive}";
-         }
-
         public static class FavoriteToggleButton {
            public const string GroupName = nameof(FavoriteToggleButton);

@@ -1,133 +0,0 @@
-using mbts.spark;
-using mbts.ui.controls;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Input;
-
-namespace mbts.ui.spark {
-   interface IAlgoStudioViewController : IDisposable {
-      void add_definition();
-      void add_definition_clone(AlgoDefinitionVM src_definition);
-      void add_template(AlgoDefinitionVM definition);
-      void rename_definition(AlgoDefinitionVM definition);
-      void rename_template(AlgoDefinitionTemplateVM template);
-      void end_edit(ExecutedRoutedEventArgs e);
-      void select_definition(AlgoDefinitionVM definition);
-      void select_template(AlgoDefinitionTemplateVM template);
-      IDisposable preserve_selected_definition();
-   }
-
-   class AlgoStudioViewControllerFactory {
-      static readonly IAlgoStudioViewController _empty = new EmptyController();
-
-      public static IAlgoStudioViewController create(AlgoStudioVM vm, TreeView tree_view, TextBox name_text_box, Button color_picker_button, Popup color_picker_popup) =>
-         vm == null || tree_view == null || name_text_box == null || color_picker_button == null || color_picker_popup == null ?
-            _empty : new Controller(vm, tree_view, name_text_box, color_picker_button, color_picker_popup);
-
-      /// <summary>
-      /// This wrapper class is returned by <see cref="create(AlgoStudioVM, TreeView)"/> when the vm or tree_view is null.
-      /// This further separates the view from the controller-logic; it doesn't even need to check for null when accessing <see cref="IAlgoStudioViewController"/> methods.
-      /// </summary>
-      class EmptyController : IAlgoStudioViewController {
-         public void add_definition() { }
-         public void add_definition_clone(AlgoDefinitionVM src_definition) { }
-         public void add_template(AlgoDefinitionVM definition) { }
-         public void rename_definition(AlgoDefinitionVM definition) { }
-         public void rename_template(AlgoDefinitionTemplateVM template) { }
-         public void end_edit(ExecutedRoutedEventArgs e) { }
-         public void select_definition(AlgoDefinitionVM definition) { }
-         public void select_template(AlgoDefinitionTemplateVM template) { }
-         public IDisposable preserve_selected_definition() => Disposable.empty;
-         public void Dispose() { }
-      }
-
-      class Controller : IAlgoStudioViewController {
-         readonly AlgoStudioVM _vm;
-         readonly TreeView _tree_view;
-         readonly TextBox _name_text_box;
-         IDisposable _dispose;
-
-         public Controller(AlgoStudioVM vm, TreeView tree_view, TextBox name_text_box, Button color_picker_button, Popup color_picker_popup) {
-            _vm = vm;
-            _tree_view = tree_view;
-            _name_text_box = name_text_box;
-            _dispose = PopupViewController.attach(color_picker_popup, color_picker_button);
-         }
-
-         public void add_definition() {
-            _vm.add_new_definition();
-            _begin_edit();
-         }
-
-         public void add_definition_clone(AlgoDefinitionVM src_definition) {
-            _vm.add_new_definition_clone(src_definition);
-            _begin_edit();
-         }
-
-         public void add_template(AlgoDefinitionVM def) {
-            var new_tmp = def.template_factory();
-            def.templates.Add(new_tmp);
-            _begin_edit();
-         }
-
-         public void end_edit(ExecutedRoutedEventArgs e) {
-            if (e.OriginalSource is EditableTextBlock etb) {
-               etb.end_edit();
-               _get_container(etb.DataContext)?.SetCurrentValue(TreeViewItem.IsSelectedProperty, true);
-            }
-         }
-
-         public void rename_definition(AlgoDefinitionVM definition) {
-            if (_tree_view.ItemContainerGenerator.ContainerFromItem(definition) is TreeViewItem tvi) {
-               var etb = tvi.descendants_of_type<EditableTextBlock>().FirstOrDefault();
-               etb.SetCurrentValue(EditableTextBlock.IsEditingProperty, true);
-            }
-         }
-
-         public void rename_template(AlgoDefinitionTemplateVM template) {
-            if (_tree_view.ItemContainerGenerator.ContainerFromItem(template.owner) is TreeViewItem tvi) {
-               if (tvi.ItemContainerGenerator.ContainerFromItem(template) is TreeViewItem ttvi) {
-                  var etb = ttvi.descendants_of_type<EditableTextBlock>().FirstOrDefault();
-                  etb.SetCurrentValue(EditableTextBlock.IsEditingProperty, true);
-               }
-            }
-         }
-
-         public void select_definition(AlgoDefinitionVM definition) =>
-            _tree_view.ItemContainerGenerator.ContainerFromItem(definition)?.SetCurrentValue(TreeViewItem.IsSelectedProperty, true);
-
-         public void select_template(AlgoDefinitionTemplateVM template) {
-            if (_tree_view.ItemContainerGenerator.ContainerFromItem(template.owner) is TreeViewItem def_view) {
-               def_view.SetCurrentValue(TreeViewItem.IsSelectedProperty, true);
-               def_view.ItemContainerGenerator.ContainerFromItem(template)?.SetCurrentValue(TreeViewItem.IsSelectedProperty, true);
-            }
-         }
-
-         public IDisposable preserve_selected_definition() =>
-            Disposable.Create(() => {
-               var name = _vm.selected_definition.name;
-               if (_vm.definitions.TryGetFirst(d => d.name == name, out AlgoDefinitionVM def))
-                  _tree_view.ItemContainerGenerator.ContainerFromItem(def)?.SetCurrentValue(TreeViewItem.IsSelectedProperty, true);
-            });
-
-         public void Dispose() =>
-            Disposable.dispose(ref _dispose);
-
-         void _begin_edit() =>
-            WPFHelper.push_frame_until(() => Keyboard.Focus(_name_text_box) == _name_text_box);
-
-         TreeViewItem _get_container(object obj) =>
-            obj is AlgoDefinitionTemplateVM t ? _get_container(t) :
-               obj is AlgoDefinitionVM d ? _get_container(d) : null;
-
-         TreeViewItem _get_container(AlgoDefinitionVM d) =>
-            _tree_view.ItemContainerGenerator.ContainerFromItem(d) as TreeViewItem;
-
-         TreeViewItem _get_container(AlgoDefinitionTemplateVM t) =>
-            _get_container(t.owner) is TreeViewItem dview ? dview.ItemContainerGenerator.ContainerFromItem(t) as TreeViewItem : null;
-      }
-   }
-}
@@ -62,35 +62,19 @@ namespace mbts.spark {
         _vm = new AlgoStudioVM(_model);
         _vm.load_from(_state);
         _view = new AlgoStudioView { DataContext = _vm };
-         _view.Resources[AlgoStudioView.BadgesInTreeViewVisibilityKey] = _ui_configuration.show_badges_in_tree_view ? Visibility.Visible : Visibility.Collapsed;
         _resources = new CompositeDisposable();
-         // observable sources
-          var content_src = _vm.observe_selected().Select(_ => _vm.content_source);
         // add definition
-         _commands.Add(new SparkCommandCommand("Add Algo", Icons.AddBoxes, new DelegateCommand(_view.add_definition)));
-         // add definition clone
-         var add_definition_clone_spark_cmd = new ObservantSparkCommandCommand<AlgoDefinitionVM>(Icons.DocumentCopy, d => $"Clone '{d?.name}'", d => d != null, _view.add_definition_clone);
-         _commands.Add(add_definition_clone_spark_cmd);
-         // add template
-         var add_template_spark_cmd = new ObservantSparkCommandCommand<AlgoDefinitionVM>(Icons.AddFile, d => $"Add '{d?.name}' Template", d => d != null, _view.add_template) {
-            show_in_toolbar = (_ui_configuration.add_template_button & bts.config.AlgoStudioOptions.AddTemplateButton.MainToolBar) == bts.config.AlgoStudioOptions.AddTemplateButton.MainToolBar,
-            show_in_context_menu = (_ui_configuration.add_template_button & bts.config.AlgoStudioOptions.AddTemplateButton.DefinitionContextMenu) == bts.config.AlgoStudioOptions.AddTemplateButton.DefinitionContextMenu
-         };
-         _commands.Add(add_template_spark_cmd);
-         _resources.Add(_vm.subscribe_definition().OnDispatcher().Subscribe(add_definition_clone_spark_cmd, add_template_spark_cmd));
+         _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.observe_selected().SelectManyInSeries(t => {
-               if (t.template != null) {
-                  return t.template.observe_is_dirty();
-               } else if (t.definition != null) {
-                  return t.definition.subscribe_is_definition_dirty();
-               } else return Observable.Return(false);
-            }).RefCount();
-            _commands.Add(new ReactiveSparkCommand(content_src.OnDispatcher().Select(c => $"Save '{c?.name}'"), Icons.DiskFile, () => {
-               if (_vm.selected_template is AlgoDefinitionTemplateVM t)
-                  _vm.save_template(t).ignore();
-               else if (_vm.selected_definition is AlgoDefinitionVM d)
+            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));
         }
@@ -101,50 +85,39 @@ namespace mbts.spark {
         // undo/redo
         if (_ui_configuration.can_undo_redo) {
            // undo
-            var undo_cmd = new ObservantCommand(() => _vm.content_source?.try_undo());
+            var undo_cmd = new ObservantCommand(() => _vm.selected_definition?.try_undo());
            var undo_spark_cmd = new SparkCommandCommand("Undo", Icons.UndoCircular, undo_cmd);
-            var can_undo_source = _vm.observe_selected().SelectManyInSeries(tup => {
-               IAlgoStudioContentVM content = (IAlgoStudioContentVM)tup.template ?? tup.definition;
-               return content != null ?
+            var can_undo_source = _vm.subscribe_definition().SelectManyInSeries(def =>
+               def != null ?
                  Observable.Create<bool>(o => {
-                     content.can_undo_changed += notify;
+                     def.can_undo_changed += notify;
                     notify();
-                     return Disposable.Create(() => content.can_undo_changed -= notify);
-                     void notify() => o.OnNext(content.can_undo);
+                     return Disposable.Create(() => def.can_undo_changed -= notify);
+                     void notify() => o.OnNext(def.can_undo);
                  }) :
-                  Observable.Return(false);
-            });
+                  Observable.Return(false));
            _commands.Add(undo_spark_cmd);
            _resources.Add(can_undo_source.Subscribe(undo_cmd));
-            _resources.Add(can_undo_source.Connect());
            // redo
-            var redo_cmd = new ObservantCommand(() => _vm.content_source?.try_redo());
+            var redo_cmd = new ObservantCommand(() => _vm.selected_definition?.try_redo());
            var redo_spark_cmd = new SparkCommandCommand("Redo", Icons.RedoCircular, redo_cmd);
-            var can_redo_source = _vm.observe_selected().SelectManyInSeries(tup => {
-               IAlgoStudioContentVM content = (IAlgoStudioContentVM)tup.template ?? tup.definition;
-               return content != null ?
+            var can_redo_source = _vm.subscribe_definition().SelectManyInSeries(def =>
+               def != null ?
                  Observable.Create<bool>(o => {
-                     content.can_redo_changed += notify;
+                     def.can_redo_changed += notify;
                     notify();
-                     return Disposable.Create(() => content.can_redo_changed -= notify);
-                     void notify() => o.OnNext(content.can_redo);
+                     return Disposable.Create(() => def.can_redo_changed -= notify);
+                     void notify() => o.OnNext(def.can_redo);
                  }) :
-                  Observable.Return(false);
-            });
+                  Observable.Return(false));
            _commands.Add(redo_spark_cmd);
            _resources.Add(can_redo_source.Subscribe(redo_cmd));
-            _resources.Add(can_redo_source.Connect());
         }
         // remove
         var remove_spark_cmd = new ObservantSparkCommandCommand<IAlgoStudioContentVM>(Icons.Trash, v => $"Remove '{v?.name}'", v => v != null, value => {
-            if (value is AlgoDefinitionTemplateVM t) {
-               _vm.remove_template(t).ignore();
-            } else if (value is AlgoDefinitionVM d) {
+            if (value is AlgoDefinitionVM d) {
               string prompt; MessageBoxImage icon;
-               if (_model.algo_model.templates_enabled() && d.templates.Count > 0) {
-                  prompt = $"Deleting this definition ({d.name}) will also delete its templates ({d.templates.Count}).\n\nDo you wan to Continue?";
-                  icon = MessageBoxImage.Warning;
-               } else if (d.key.mode == AlgoKey.Mode.Persisted) {
+               if (d.key.mode == AlgoKey.Mode.Persisted) {
                  prompt = $"Are you sure you want to delete '{d.name}?'";
                  icon = MessageBoxImage.Question;
               } else {
@@ -164,7 +137,7 @@ namespace mbts.spark {
            }
         });
         _commands.Add(remove_spark_cmd);
-         _resources.Add(content_src.OnDispatcher().Subscribe(remove_spark_cmd));
+         _resources.Add(_vm.subscribe_definition().OnDispatcher().Subscribe(remove_spark_cmd));
      }

      void _dispose_core() {
@@ -1,31 +1,57 @@
 using bts.api.orderman;
+using bts.api.orderman.algo;
 using bts.utils;
 using mbts.spark.utilities;
 using System;
 using System.Windows.Media;

 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 readonly CustomOrderDefinitionImmutable value;
      public readonly string name;
      public readonly AlgoKey key;

-      public AlgoData(CustomOrderDefinitionImmutable value)
-         : this(value, value.display_name(), OrderDataHelper.get_shallow_factory_key(value)) { }
-
-      public AlgoData(CustomOrderDefinitionImmutable value, string name, AlgoKey key) {
+      AlgoData(CustomOrderDefinitionImmutable value, string name, AlgoKey key) {
         this.value = value;
         this.name = name;
         this.key = key;
      }

-      public AlgoData with(CustomOrderDefinitionImmutable? value = null, string name = null) =>
-         new AlgoData(value ?? this.value, name ?? this.name, key);
+      /// <summary>
+      /// This is the only <see cref="AlgoData"/> factory method that allows callers to explicitly specify a name.
+      /// It should only be used within the context of creating, or renaming, studio algos.
+      /// </summary>
+      public static AlgoData create(CustomOrderDefinitionImmutable def, string name, AlgoKey key) =>
+         new AlgoData(def, name, key);
+
+      /// <summary>
+      /// Reconstructs <see cref="AlgoData"/> from a <see cref="CustomOrderDefinitionImmutable"/>, with a special caveat in the case of <see cref="CompositeOrderDefinition"/>:
+      /// a fallback/default name is used instead of the composite algo's true name, which must be obtained from the <see cref="IAlgoStudioModel.definitions"/> stream.
+      /// </summary>
+      public static AlgoData from_custom_def(CustomOrderDefinitionImmutable def) {
+         switch (def.CustomCase) {
+            case CustomOrderDefinition.CustomOneofCase.Composite:
+               string name = $"({OrderDataHelper.abbreviate_algo_type(def.CustomCase)}){OrderDataHelper.abbreviate_algo_type(def.Composite.Definition.CustomCase)}";
+               return new AlgoData(def.Composite.Definition, name, AlgoKey.from_composite_key(def.Composite.AlgoTemplateKey));
+            case CustomOrderDefinition.CustomOneofCase.Dynamic:
+               return new AlgoData(def,def.Dynamic.DynamicOrderType, AlgoKey.from_dynamic_type(def.Dynamic.DynamicOrderType));
+            default:
+               return new AlgoData(def, def.CustomCase.display_name(), AlgoKey.from_known_type(def.CustomCase));
+         }
+      }
+
+      public static AlgoData from_record(AlgoDefinitionRecordImmutable record) =>
+         new AlgoData(record.Algo.Definition, record.Algo.Name, AlgoKey.from_composite_key(record.Key));
+
+      public static AlgoData create_unpersisted(CustomOrderDefinitionImmutable custom_def, string name) =>
+         new AlgoData(custom_def, name, AlgoKey.create_unpersisted());

      public bool Equals(AlgoData other) =>
         key == other.key &&
         name == other.name &&
-         OrderDataHelper.EqualsHelpers.custom_order_def_compareri.Equals(value, other.value);
+         OrderDataHelper.EqualsHelpers.custom_order_defi_comparer.Equals(value, other.value);

      public override bool Equals(object obj) => EqualityComparer.equals_obj(this, obj);
      public override int GetHashCode() =>
@@ -1,12 +1,13 @@
 using bts.api.orderman;
-using bts.persist.algo;
 using bts.utils;
-using mbts.ui.utility;
+using mbts.utils;
 using ProtoBuf;
 using System;
 using System.Linq;

 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.
   [ProtoContract]
   struct AlgoID : IEquatable<AlgoID> {
      [ProtoMember(1)]
@@ -47,24 +48,23 @@ namespace mbts.spark {
         }
      }

-      public static AlgoID from_algo_key(AlgoKey key, IMaskIndexInt32<string> dynamic_type_index) {
+      public static AlgoID from_algo_key(AlgoKey key) {
         switch (key.mode) {
-            case AlgoKey.Mode.Factory:
-               return AlgoStructureSerializer.to_algo_id(key.factory.structure, dynamic_type_index);
-            case AlgoKey.Mode.Persisted:
-               return new AlgoID(key.persisted.id_uint);
+            case AlgoKey.Mode.Factory: return new AlgoID(key.factory);
+            case AlgoKey.Mode.Dynamic: return new AlgoID(key.dynamic_type);
+            case AlgoKey.Mode.Persisted: return new AlgoID(key.persisted);
+            default: throw ExceptionBuilder.Argument.unexpected_case(key.mode, nameof(key));
         }
-         return new AlgoID(CustomOrderDefinition.CustomOneofCase.None);
      }

-      public static AlgoKey to_algo_key(AlgoID id, IMaskIndexInt32<string> dynamic_type_index) {
+      public static AlgoKey to_algo_key(AlgoID id) {
         if (id._factory_key.HasValue)
-            return new AlgoKey(id._factory_key.Value);
+            return AlgoKey.from_known_type(id._factory_key.Value);
         if (id._persisted_key.HasValue)
-            return new AlgoKey(new AlgoPersistedKey(id._persisted_key.Value));
+            return AlgoKey.from_composite_key(id._persisted_key.Value);
         if (id._dynamic_key != null)
-            return new AlgoKey(new AlgoNameStructureKey(id._dynamic_key, AlgoStructureSerializer.structure_key(dynamic_type_index.to_int(id._dynamic_key))));
-         return default;
+            return AlgoKey.from_dynamic_type(id._dynamic_key);
+         throw new ArgumentException("ID is empty.", nameof(id));
      }

      public bool Equals(AlgoID other) =>
@@ -73,7 +73,7 @@ namespace mbts.spark {
         _persisted_key == other._persisted_key;

      public override bool Equals(object obj) =>
-         obj is AlgoID && Equals(obj);
+         obj is AlgoID other && Equals(other);

      public override int GetHashCode() =>
         EqualityComparer.aggregate_hash(
@@ -85,55 +85,93 @@ namespace mbts.spark {
      public static bool operator !=(AlgoID a, AlgoID b) => !a.Equals(b);
   }

-   /// TODO: Remove <see cref="AlgoKey"/>, and redirect references to <see cref="AlgoID"/>.
   struct AlgoKey : IEquatable<AlgoKey> {
-      readonly AlgoPersistedKey? _persisted_key;
-      readonly AlgoNameStructureKey? _factory_key;
+      readonly uint? _composite_key;
      readonly Guid? _unpersisted;
+      readonly string _dynamic_type;
+      readonly CustomOrderDefinition.CustomOneofCase? _factory_type;

-      public AlgoKey(Guid id_guid) {
-         _persisted_key = null;
-         _factory_key = null;
+      AlgoKey(Guid id_guid) {
+         _composite_key = null;
         _unpersisted = id_guid;
+         _dynamic_type = null;
+         _factory_type = null;
      }

-      public AlgoKey(CustomOrderDefinition.CustomOneofCase factory_root_algo_type)
-         : this(new AlgoNameStructureKey(factory_root_algo_type)) { }
-
-      public AlgoKey(AlgoNameStructureKey factory_key) {
-         _persisted_key = null;
-         _factory_key = factory_key;
+      public AlgoKey(uint composite_key) {
+         _composite_key = composite_key;
         _unpersisted = null;
+         _dynamic_type = null;
+         _factory_type = null;
      }

-      public AlgoKey(AlgoPersistedKey persisted_key) {
-         _persisted_key = persisted_key;
-         _factory_key = null;
+      public AlgoKey(string dynamic_type) {
+         _composite_key = null;
         _unpersisted = null;
+         _dynamic_type = dynamic_type;
+         _factory_type = null;
+      }
+
+      public AlgoKey(CustomOrderDefinition.CustomOneofCase factory_type) {
+         _composite_key = null;
+         _unpersisted = null;
+         _dynamic_type = null;
+         _factory_type = factory_type;
      }

      public enum Mode {
         None,
         Persisted,
         Unpersisted,
+         Dynamic,
         Factory
      }

      public bool is_persisted => mode == Mode.Persisted;

-      public AlgoPersistedKey persisted => _persisted_key.Value;
-      public AlgoNameStructureKey factory => _factory_key ?? new AlgoNameStructureKey(CustomOrderDefinition.CustomOneofCase.None);
+      public uint persisted => _composite_key.Value;
      public Guid unpersisted => _unpersisted.Value;
+      public CustomOrderDefinition.CustomOneofCase factory => _factory_type.Value;
+      public string dynamic_type => _dynamic_type;

      public Mode mode {
         get {
-            if (_persisted_key.HasValue) return Mode.Persisted;
+            if (_factory_type.HasValue) return Mode.Factory;
+            if (_composite_key.HasValue) return Mode.Persisted;
+            if (_dynamic_type != null) return Mode.Dynamic;
            if (_unpersisted.HasValue) return Mode.Unpersisted;
-            if (_factory_key.HasValue) return Mode.Factory;
            return Mode.None;
         }
      }

+      public static AlgoKey create_unpersisted() =>
+         new AlgoKey(Guid.NewGuid());
+
+      public static AlgoKey from_custom_def(CustomOrderDefinitionImmutable custom_def) {
+         switch (custom_def.CustomCase) {
+            case CustomOrderDefinition.CustomOneofCase.Dynamic: return new AlgoKey(custom_def.Dynamic.DynamicOrderType);
+            case CustomOrderDefinition.CustomOneofCase.Composite: return new AlgoKey(custom_def.Composite.AlgoTemplateKey);
+            default: return new AlgoKey(custom_def.CustomCase);
+         }
+      }
+
+      public static AlgoKey from_known_type(CustomOrderDefinition.CustomOneofCase known_type) {
+         if (known_type == CustomOrderDefinition.CustomOneofCase.Dynamic)
+            throw new ArgumentException(nameof(known_type), "Potential loss of data: no dynamic type name specified.");
+         if (known_type == CustomOrderDefinition.CustomOneofCase.Composite)
+            throw new ArgumentException(nameof(known_type), "Potential loss of data: no composite id specified.");
+         return new AlgoKey(known_type);
+      }
+
+      public static AlgoKey from_dynamic_type(string dynamic_type) {
+         if (string.IsNullOrEmpty(dynamic_type))
+            throw ExceptionBuilder.Argument.null_or_empty(nameof(dynamic_type));
+         return new AlgoKey(dynamic_type);
+      }
+
+      public static AlgoKey from_composite_key(uint composite_key) =>
+         new AlgoKey(composite_key);
+
      public bool Equals(AlgoKey other) {
         Mode m = mode;
         if (m == other.mode) {
@@ -141,6 +179,7 @@ namespace mbts.spark {
               case Mode.Persisted: return persisted == other.persisted;
               case Mode.Unpersisted: return unpersisted == other.unpersisted;
               case Mode.Factory: return factory == other.factory;
+               case Mode.Dynamic: return dynamic_type == other.dynamic_type;
               case Mode.None: return true;
            }
         }
@@ -155,6 +194,7 @@ namespace mbts.spark {
            case Mode.Persisted: hash = persisted.GetHashCode(); phase_mult = 2; break;
            case Mode.Unpersisted: hash = unpersisted.GetHashCode(); phase_mult = 4; break;
            case Mode.Factory: hash = factory.GetHashCode(); phase_mult = 3; break;
+            case Mode.Dynamic: hash = dynamic_type.GetHashCode(); phase_mult = 5; break;
            default: return 0;
         }
         return EqualityComparer.phase_hash(hash, phase_mult);
@@ -165,4 +205,4 @@ namespace mbts.spark {

      InvalidOperationException _unexpected_mode_ex() => new InvalidOperationException($"Unexpected Mode '{mode}.'");
   }
-}
+}
@@ -40,7 +40,7 @@ namespace bts.persist.algo {
      public bool is_persisted => mode != Mode.None;

      public mbts.spark.AlgoKey to_algo_key() =>
-         new mbts.spark.AlgoKey(this);
+         new mbts.spark.AlgoKey(_id_uint ?? 0);

      public bool Equals(AlgoPersistedKey other) {
         Mode m = mode;
@@ -1,177 +0,0 @@
-using bts.api.orderman;
-using bts.utils;
-using mbts.spark.utilities;
-using mbts.ui.utility;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace mbts.spark {
-   struct AlgoNameStructureKey : IEquatable<AlgoNameStructureKey> {
-      public readonly string name;
-      public readonly AlgoStructureKey structure;
-
-      public AlgoNameStructureKey(CustomOrderDefinition.CustomOneofCase base_type)
-         : this(base_type.type_id(), new AlgoStructureKey(base_type)) { }
-
-      public AlgoNameStructureKey(string name, AlgoStructureKey structure) {
-         this.name = name;
-         this.structure = structure;
-      }
-
-      public bool Equals(AlgoNameStructureKey other) => name == other.name && structure == other.structure;
-      public override bool Equals(object obj) => EqualityComparer.equals_obj(this, obj);
-      public override int GetHashCode() => EqualityComparer.aggregate_hash(EqualityComparer.safe_get_hash_code(name), structure.GetHashCode());
-      public static bool operator ==(AlgoNameStructureKey a, AlgoNameStructureKey b) => a.Equals(b);
-      public static bool operator !=(AlgoNameStructureKey a, AlgoNameStructureKey b) => !a.Equals(b);
-   }
-
-   struct AlgoStructureKey : IEquatable<AlgoStructureKey> {
-      readonly int[] _structure;
-
-      public AlgoStructureKey(CustomOrderDefinition.CustomOneofCase base_type)
-         : this(new[] { (int)base_type }) { }
-
-      public AlgoStructureKey(CustomOrderDefinitionImmutable definition, IMaskIndexInt32<string> dynamic_type_index) =>
-         _structure = AlgoStructureSerializer.to_array(definition, dynamic_type_index);
-
-      public AlgoStructureKey(int[] structure) =>
-         _structure = structure;
-
-      public IReadOnlyList<int> structure => _structure ?? Array.Empty<int>();
-
-      public bool Equals(AlgoStructureKey other) {
-         if (_structure == null) {
-            return other._structure == null;
-         } else {
-            /// <see cref="Enumerable.SequenceEqual{TSource}(IEnumerable{TSource}, IEnumerable{TSource})"/> is not optimized to check Count/Length, since the args are <see cref="IEnumerable{T}"/>.
-            return other._structure != null && _structure.Length == other._structure.Length && _structure.SequenceEqual(other._structure);
-         }
-      }
-
-      public override bool Equals(object obj) =>
-         obj is AlgoStructureKey other && Equals(other);
-
-      public override int GetHashCode() =>
-         _structure == null ? 0 : EqualityComparer.aggregate_hash(_structure);
-
-      public static bool operator ==(AlgoStructureKey a, AlgoStructureKey b) => a.Equals(b);
-      public static bool operator !=(AlgoStructureKey a, AlgoStructureKey b) => !a.Equals(b);
-   }
-
-   static class AlgoStructureSerializer {
-      const int
-         _dynamic_mask = 1 << 31,
-         _child_mask_offset = 30;
-
-      public static CustomOrderDefinitionImmutable build_algoi(this AlgoStructureKey structure_key, DynamicOrderHelper dynamic_helper) =>
-         parsei(structure_key.structure, dynamic_helper);
-
-      public static CustomOrderDefinitionImmutable build_algo(this AlgoStructureKey structure_key, DynamicOrderHelper dynamic_helper) =>
-         parsei(structure_key.structure, dynamic_helper);
-
-      public static CustomOrderDefinition.CustomOneofCase order_type(this AlgoStructureKey structure_key) =>
-         structure_key.structure.Count > 0 ? (CustomOrderDefinition.CustomOneofCase)structure_key.structure[0] : CustomOrderDefinition.CustomOneofCase.None;
-
-      public static AlgoStructureKey structure_key(int dynamic_type) =>
-         new AlgoStructureKey(new[] { dynamic_type | _dynamic_mask });
-
-      public static AlgoStructureKey structure_key(CustomOrderDefinitionImmutable algo, IMaskIndexInt32<string> dynamic_type_index) =>
-         new AlgoStructureKey(to_array(algo, dynamic_type_index));
-
-      public static AlgoStructureKey structure_key(CustomOrderDefinition algo, IMaskIndexInt32<string> dynamic_type_index) =>
-         new AlgoStructureKey(to_array(algo, dynamic_type_index));
-
-      public static int[] to_array(CustomOrderDefinitionImmutable algo, IMaskIndexInt32<string> dynamic_type_index) =>
-         to_array(algo.CloneToMutable(), dynamic_type_index);
-
-      public static int[] to_array(CustomOrderDefinition algo, IMaskIndexInt32<string> dynamic_type_index) {
-         int[] s = new[] { (int)algo.CustomCase };
-         _build_structure(algo, ref s, dynamic_type_index);
-         return s;
-      }
-
-      public static CustomOrderDefinitionImmutable from_array(int[] structure, DynamicOrderHelper dynamic_helper) =>
-         parsei(structure, dynamic_helper);
-
-      public static CustomOrderDefinitionImmutable parsei(IReadOnlyList<int> structure, DynamicOrderHelper dynamic_helper) =>
-         new CustomOrderDefinitionImmutable(parse(structure, dynamic_helper));
-
-      public static CustomOrderDefinition parse(IReadOnlyList<int> structure, DynamicOrderHelper dynamic_helper) {
-         if (structure == null || structure.Count == 0)
-            return new CustomOrderDefinition();
-         int pos = 1;
-         var mdef = OrderDataHelper.create_algo((CustomOrderDefinition.CustomOneofCase)structure[0]);
-         _build_def(structure, ref pos, ref mdef, dynamic_helper);
-         return mdef;
-      }
-
-      public static AlgoID to_algo_id(AlgoStructureKey key, IMaskIndexInt32<string> dynamic_type_index) {
-         if (key.structure.Count == 0)
-            return new AlgoID(CustomOrderDefinition.CustomOneofCase.None);
-         int i = key.structure[0];
-         return BitHelper.remove_flags(ref i, _dynamic_mask) ? new AlgoID(dynamic_type_index.from_int(i)) : new AlgoID((CustomOrderDefinition.CustomOneofCase)i);
-      }
-
-      static void _build_structure(CustomOrderDefinition algo, ref int[] structure, IMaskIndexInt32<string> dynamic_type_index) {
-         if (structure == null || structure.Length == 0)
-            structure = new int[1];
-         structure[0] = (int)algo.CustomCase;
-         int p = 1;
-         _build_structure(algo, ref structure, ref p, dynamic_type_index);
-         ArrayHelper.trim(ref structure, p);
-      }
-
-      static void _build_structure(CustomOrderDefinition algo, ref int[] structure, ref int pos, IMaskIndexInt32<string> dynamic_type_index) {
-         IEnumerable<(CustomOrderDefinition child_algo, int field_pos)> children;
-         if (algo.CustomCase == CustomOrderDefinition.CustomOneofCase.Dynamic) {
-            ArrayHelper.ensure_capacity(ref structure, pos + 1);
-            structure[pos++] = dynamic_type_index.to_int(algo.Dynamic.DynamicOrderType) | _dynamic_mask;
-            children = algo.Dynamic.OrderParams.Where(kv => kv.Value.ValueCase == DynamicOrderParam.ValueOneofCase.AsOrderDef).Select((kv, i) => (kv.Value.AsOrderDef, i));
-         } else {
-            var cad = OrderDataHelper.get_child_algo_data(algo);
-            children = cad.Select((c, i) => (c.get_child(algo), i));
-            children = children.Where(c => c.child_algo != null);
-         }
-         foreach ((var child, int field_pos) in children) {
-            ArrayHelper.ensure_capacity(ref structure, pos + 1);
-            structure[pos++] = EnumMaskIndexInt32<CustomOrderDefinition.CustomOneofCase>.to_int(child.CustomCase) | _child_algo_mask(field_pos);
-            _build_structure(child, ref structure, ref pos, dynamic_type_index);
-         }
-      }
-
-      /// <summary>
-      /// Gets a mask for a particular child-algo field of a particular algo definition.
-      /// </summary>
-      /// <param name="field_pos">The index wrt the deterministic enumeration of child algos for a particular definition (e.g., Hedge = 0, Child = 1).</param>
-      static int _child_algo_mask(int field_pos) => 1 << (_child_mask_offset - field_pos);
-
-      static void _build_def(IReadOnlyList<int> structure, ref int pos, ref CustomOrderDefinition algo, DynamicOrderHelper dynamic_helper) {
-         var local_algo = algo;
-         IEnumerable<(Action<CustomOrderDefinition> assign_child, int field_pos)> children;
-         if (algo.CustomCase == CustomOrderDefinition.CustomOneofCase.Dynamic) {
-            var dyn_def = algo.Dynamic;
-            dyn_def.DynamicOrderType = dynamic_helper.dynamic_type_index.from_int(structure[pos++] ^ _dynamic_mask);
-            dynamic_helper.add_dynamic_params(ref dyn_def);
-            children = dyn_def.OrderParams
-               .Where(kv => kv.Value.ValueCase == DynamicOrderParam.ValueOneofCase.AsOrderDef)
-               .Select((kv, i) => (new Action<CustomOrderDefinition>(child_algo => kv.Value.AsOrderDef = child_algo), i));
-         } else {
-            children = OrderDataHelper.get_child_algo_data(algo)
-               .Select((c, i) => (new Action<CustomOrderDefinition>(child_algo => c.assign_child(local_algo, child_algo)), i));
-         }
-         using (var children_en = children.GetEnumerator()) {
-            while (pos < structure.Count && children_en.MoveNext()) {
-               (var assign_child, int field_pos) = children_en.Current;
-               int mask = _child_algo_mask(field_pos);
-               if ((structure[pos] & mask) == mask) {
-                  var type = EnumMaskIndexInt32<CustomOrderDefinition.CustomOneofCase>.from_int(structure[pos++] ^ mask);
-                  var child_algo = OrderDataHelper.create_algo(type);
-                  _build_def(structure, ref pos, ref child_algo, dynamic_helper);
-                  assign_child(child_algo);
-               }
-            }
-         }
-      }
-   }
-}
@@ -1,345 +0,0 @@
-using bts;
-using bts.api;
-using bts.api.core;
-using bts.api.orderman;
-using bts.persist.algo;
-using bts.spark;
-using mbts.utils;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reactive.Disposables;
-using System.Reactive.Linq;
-using System.Threading.Tasks;
-
-namespace mbts.spark {
-   class AlgoStudioDefinitionTemplateModel : IAlgoStudioModel, IDisposable {
-      readonly AlgoService _service;
-      readonly AdminModel _admin_model;
-      readonly ErrorReporter _error_reporter;
-      readonly ObservableDemuxer<AlgoKey, AlgoDefinitionMetadata> _metadata_demuxer = new ObservableDemuxer<AlgoKey, AlgoDefinitionMetadata>();
-      readonly TableUpdateDemuxer<AlgoTemplateData, AlgoKey, AlgoKey> _definition_templates_demuxer;
-      IReadOnlyDictionary<AlgoKey, AlgoData> _algos = DictionaryHelper.empty<AlgoKey, AlgoData>();
-      IReadOnlyDictionary<AlgoKey, AlgoTemplateData> _algo_templates = DictionaryHelper.empty<AlgoKey, AlgoTemplateData>();
-      IDisposable _dispose;
-
-      public AlgoStudioDefinitionTemplateModel(AlgoService service, IAlgoDefinitionMetadataService meta, AdminModel admin_model, ErrorReporter error_reporter, bts.config.AlgoStudioOptions ui_configuration) {
-         _service = service;
-         metadata_service = meta;
-         _admin_model = admin_model;
-         _error_reporter = error_reporter;
-         this.ui_configuration = ui_configuration;
-         _definition_templates_demuxer = new TableUpdateDemuxer<AlgoTemplateData, AlgoKey, AlgoKey>(t => t.key, t => t.definition_key);
-         definitions = _service.subscribei_algos()
-            .Select(u => new Update<AlgoData, AlgoKey>(
-               u.all.Select(_Utils.definition_data).ToList(),
-               u.added.Select(_Utils.definition_data).ToList(),
-               u.changes.Select(ch => new Change<AlgoData>(_Utils.definition_data(ch.Old), _Utils.definition_data(ch.New))).ToList(),
-               u.removed.Select(d => _Utils.definition_data(d)).ToList(),
-               def => def.key))
-            .Table()
-            .Cache();
-         templates = _service.subscribei_algo_templates()
-            .Select(u => new Update<AlgoTemplateData, AlgoKey>(
-               u.all.Select(_Utils.template_data).ToList(),
-               u.added.Select(_Utils.template_data).ToList(),
-               u.changes.Select(ch => new Change<AlgoTemplateData>(_Utils.template_data(ch.Old), _Utils.template_data(ch.New))).ToList(),
-               u.removed.Select(_Utils.template_data).ToList(),
-               def => def.key))
-            .Table()
-            .Cache();
-         _dispose = new CompositeDisposable(
-            definitions.OnDispatcher().Subscribe(t => _algos = t.state),
-            templates.OnDispatcher().Subscribe(t => _algo_templates = t.state),
-            templates.Subscribe(_definition_templates_demuxer),
-            metadata_service.subscribe_metadata().Subscribe(_metadata_demuxer));
-      }
-
-      public IObservable<TableUpdate<AlgoData, AlgoKey>> definitions { get; }
-      public IObservable<TableUpdate<AlgoTemplateData, AlgoKey>> templates { get; }
-      public IAlgoDefinitionMetadataService metadata_service { get; }
-      public bts.config.AlgoStudioOptions ui_configuration { get; }
-
-      public IObservable<TableUpdate<AlgoTemplateData, AlgoKey>> subscribe_definition_templates(AlgoKey definition) =>
-         _definition_templates_demuxer.subscribe(definition);
-
-      public async Task<AlgoData?> save_definition(AlgoData definition_data) {
-         if (definition_data.key.is_persisted) {
-            // TODO: implement update op when backend ready
-         } else {
-            // create op
-            return await _create_definition(new CompositeAlgoDefinitionImmutable(_Utils.to_definition(definition_data)));
-         }
-         return null;
-      }
-      public async Task<AlgoTemplateData?> save_template(AlgoTemplateData template_data) {
-         if (template_data.key.is_persisted) {
-            // update op
-            return await _update_template(_Utils.to_recordi(template_data));
-         } else {
-            // create op
-            return await _create_template(_Utils.to_templatei(template_data));
-         }
-      }
-
-      /// <summary>
-      /// The api is not used here (there are some unresolved dependency issues with definitions on the backend).
-      /// The definition is marked as hidden in the AlgoMetadata stored on the server.
-      /// <para/>
-      /// For implementation details, see: <see cref="IAlgoDefinitionMetadataService"/>, <see cref="AlgoTemplateMetadataService"/>
-      /// </summary>
-      public async Task<bool> remove_definition(AlgoKey key) {
-         if (_algos.TryGetValue(key, out AlgoData curr)) {
-            if (_definition_templates_demuxer.try_get_values(key, out IReadOnlyDictionary<AlgoKey, AlgoTemplateData> tmps)) {
-               foreach (var t in tmps.Values)
-                  await remove_template(t.key);
-            }
-            await metadata_service.hide_definition(key);
-            return true;
-         }
-         return false;
-      }
-
-      public async Task<bool> remove_template(AlgoKey template_key) {
-         var req = new AlgoServiceRemoveRequest();
-         _Utils.set_key(ref req, template_key);
-         var reply = await _safe_execute(() => _service.remove_template_async(req), ActionMetadata.remove_template);
-         return reply.success && reply.value.Success;
-      }
-
-      public void Dispose() =>
-         Disposable.dispose(ref _dispose);
-
-      async Task<AlgoData?> _create_definition(CompositeAlgoDefinitionImmutable definition) {
-         if (_try_get_user(out uint user_id)) {
-            return await _create_definition(definition, user_id);
-         } else {
-            _report_no_user_id(ActionMetadata.CreateDefinition);
-         }
-         return null;
-      }
-
-      async Task<AlgoTemplateData?> _create_template(AlgoTemplateImmutable template) {
-         if (_try_get_user(out uint user_id)) {
-            var (value, success) = await _error_reporter.safe_execute(() => _service.create_template_async(
-               new TemplateCreateRequest { UserId = user_id, NewTemplate = template.CloneToMutable() }),
-               r => r.Success, r => r.ErrMsg, ActionMetadata.CreateTemplate);
-            if (success)
-               return _Utils.template_data(value.Record);
-         } else {
-            _report_no_user_id(ActionMetadata.CreateTemplate);
-         }
-         return null;
-      }
-
-      async Task<AlgoTemplateData?> _update_template(AlgoTemplateRecordImmutable template) {
-         if (_try_get_user(out uint user_id)) {
-            var (value, success) = await _error_reporter.safe_execute(() => _service.update_template_async(
-               new TemplateUpdateRequest { Key = template.Key, UpdatedTemplate = template.AlgoTemplate.CloneToMutable() }),
-               r => r.Success, r => r.ErrMsg.ToString(), ActionMetadata.UpdateTemplate);
-            if (success)
-               return _Utils.template_data(template);
-         } else {
-            _report_no_user_id(ActionMetadata.UpdateTemplate);
-         }
-         return null;
-      }
-
-      async Task<AlgoData?> _create_definition(CompositeAlgoDefinitionImmutable definition, uint user_id) {
-         (var result, var success) = await _error_reporter.safe_execute(() => _service.create_composite_algo_async(
-            new CompositeAlgoCreateRequest {
-               NewAlgo = definition.CloneToMutable(),
-               UserId = user_id
-            }), r => r.Success, r => r.ErrMsg, "create definition");
-         return success ? _Utils.definition_data(new CompositeAlgoRecordImmutable(result.Record)) : (AlgoData?)null;
-      }
-
-      async Task<Result<T>> _safe_execute<T>(Func<Task<Result<T>>> execute, IActionMetadata<T> am) {
-         try {
-            var result = await execute();
-            if (!result.success) {
-               _report_error(am.present_progressive_desc, result.error_message);
-            } else if (!am.get_success(result.value)) {
-               _report_error(am.present_progressive_desc, am.get_error_msg(result.value));
-            }
-            return result;
-         } catch (Exception ex) {
-            _report_error(am.present_progressive_desc, ex.ToString());
-         }
-         return new Result<T>(bts.api.ApiError.UnexpectedResponse);
-      }
-
-      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");
-
-      bool _try_get_user(out uint id) {
-         var user = _admin_model.get_current_user();
-         if (user.HasValue) {
-            id = user.Value.id;
-            return true;
-         } else {
-            id = 0;
-            return false;
-         }
-      }
-
-      // used for error handling/reporting
-      interface IActionMetadata {
-         string desc { get; }
-         string present_progressive_desc { get; }
-      }
-
-      interface IActionMetadata<TReply> : IActionMetadata {
-         bool get_success(TReply reply);
-         string get_error_msg(TReply reply);
-      }
-
-      static class ActionMetadata {
-         public const string
-            CreateDefinition = "create definition",
-            UpdateDefinition = "update definition",
-            CreateTemplate = "create template",
-            UpdateTemplate = "update template";
-         public static readonly IActionMetadata<AlgoServiceReply> update_template = new Impl<AlgoServiceReply>(_update, _template, r => r.Success, r => r.ErrMsg.ToString());
-         public static readonly IActionMetadata<AlgoServiceReply> remove_template = new Impl<AlgoServiceReply>(_delete, _template, r => r.Success, r => r.ErrMsg.ToString());
-         public static readonly IActionMetadata<TemplateCreateResult> create_template = new Impl<TemplateCreateResult>(_create, _template, r => r.Success, r => r.ErrMsg);
-         public static readonly IActionMetadata<CompositeAlgoCreateResult> create_definition = new Impl<CompositeAlgoCreateResult>(_create, _definition, r => r.Success, r => r.ErrMsg);
-
-         static readonly DescTuple _create = new DescTuple("create", "creating"), _update = new DescTuple("update", "updating"), _delete = new DescTuple("delete", "deleting");
-         static readonly string _definition = "definition", _template = "template";
-
-         class Impl<T> : IActionMetadata<T> {
-            readonly DescTuple _desc;
-            readonly string _subject;
-            readonly Func<T, bool> _get_success;
-            readonly Func<T, string> _get_error_msg;
-
-            public Impl(DescTuple desc, string subject, Func<T, bool> get_success, Func<T, string> get_error_msg) {
-               _desc = desc;
-               _subject = subject;
-               _get_success = get_success;
-               _get_error_msg = get_error_msg;
-            }
-            public string desc => _desc.desc;
-            public string present_progressive_desc => _desc.present_progressive_desc;
-            public bool get_success(T reply) => _get_success(reply);
-            public string get_error_msg(T reply) => _get_error_msg(reply);
-         }
-
-         struct DescTuple {
-            public readonly string desc, present_progressive_desc;
-            public DescTuple(string desc, string present_progressive_desc) {
-               this.desc = desc;
-               this.present_progressive_desc = present_progressive_desc;
-            }
-         }
-      }
-
-      /// <summary>
-      /// The AlgoService protobuf types have been extracted out of the viewmodels (<see cref="AlgoStudioVM"/>, <see cref="OrderPropertiesEditorVM"/>, <see cref="AlgoDefinitionVM"/>, <see cref="AlgoDefinitionTemplateVM"/>).
-      /// The viewmodels instead use these types to represent the data: <see cref="AlgoData"/> is used in place of <see cref="CompositeAlgoRecordImmutable"/>, and <see cref="AlgoTemplateData"/> is used in place of <see cref="AlgoTemplateRecordImmutable"/>.
-      /// This thin abstraction isolates the server-side from the client-side, so if one day the server side types change, we won't need to change any client-side code except the methods below which handle the conversion from server type to corresponding client type.
-      /// There are a couple other methods in here as well (this is an extensions class afterall), but [John]I am going out of town soon (1/6/18) and did not get a chance to organize these methods beyond containing them in <see cref="Utils"/>.
-      /// </summary>
-      static class _Utils {
-         // AlgoTemplateImmutable custom_order_definition(i)
-         public static CustomOrderDefinitionImmutable custom_order_definitioni(AlgoTemplateImmutable templatei) {
-            switch (templatei.AlgoParamsCase) {
-               case AlgoTemplate.AlgoParamsOneofCase.CompositeAlgoParams: return templatei.CompositeAlgoParams.Algo;
-               case AlgoTemplate.AlgoParamsOneofCase.SystemAlgoParams: return templatei.SystemAlgoParams;
-               default: throw ExceptionBuilder.Argument.unexpected_case(templatei.AlgoParamsCase, nameof(templatei));
-            }
-         }
-
-         public static AlgoData definition_data(AlgoTemplateImmutable templatei) {
-            switch (templatei.AlgoParamsCase) {
-               case AlgoTemplate.AlgoParamsOneofCase.CompositeAlgoParams: return definition_data(templatei.CompositeAlgoParams);
-               case AlgoTemplate.AlgoParamsOneofCase.SystemAlgoParams:
-                  return new AlgoData(
-                     templatei.SystemAlgoParams,
-                     templatei.SystemAlgoParams.CustomCase.display_name(),
-                     get_key(templatei.SystemAlgoParams));
-               default: throw ExceptionBuilder.Argument.unexpected_case(templatei.AlgoParamsCase, nameof(templatei));
-            }
-         }
-
-         public static AlgoData definition_data(CompositeAlgoRecordImmutable recordi) => new AlgoData(recordi.AlgoDefinition.Algo, recordi.AlgoDefinition.Name, get_key(recordi));
-
-         public static AlgoData definition_data(CompositeAlgoDefinitionImmutable definitioni) =>
-            new AlgoData(definitioni.Algo, definitioni.Name, get_key(definitioni));
-
-         public static AlgoData? definition_data(Result<CompositeAlgoCreateResult> result) {
-            if (result.success && result.value.Success) {
-               var r = result.value.Record;
-               return new AlgoData(new CustomOrderDefinitionImmutable(r.AlgoDefinition.Algo), r.AlgoDefinition.Name, new AlgoKey(new AlgoPersistedKey(r.Key)));
-            } else return null;
-         }
-
-         // AlgoTemplateRecord(Immutable) template data
-         public static AlgoTemplateData template_data(AlgoTemplateRecord record) => template_data(new AlgoTemplateRecordImmutable(record));
-         public static AlgoTemplateData template_data(AlgoTemplateRecordImmutable recordi) => new AlgoTemplateData(custom_order_definitioni(recordi.AlgoTemplate), recordi.AlgoTemplate.Name, get_key(recordi), definition_data(recordi.AlgoTemplate));
-
-         public static CompositeAlgoDefinition to_definition(AlgoData definition_data) =>
-            new CompositeAlgoDefinition {
-               Name = definition_data.name,
-               Algo = definition_data.value.CloneToMutable()
-            };
-
-         // AlgoTemplateData to_record(i)
-         public static AlgoTemplateRecord to_record(AlgoTemplateData template) {
-            var record = new AlgoTemplateRecord {
-               AlgoTemplate = new AlgoTemplate {
-                  Name = template.name,
-                  CompositeAlgoParams = new CompositeAlgoDefinition {
-                     Name = template.definition.name,
-                     Algo = template.value.CloneToMutable()
-                  }
-               }
-            };
-            set_key(ref record, template.key);
-            return record;
-         }
-         public static AlgoTemplateRecordImmutable to_recordi(AlgoTemplateData template) => new AlgoTemplateRecordImmutable(to_record(template));
-
-         // AlgoTemplateData to_template(i)
-         public static AlgoTemplate to_template(AlgoTemplateData template) =>
-            new AlgoTemplate {
-               Name = template.name,
-               CompositeAlgoParams = new CompositeAlgoDefinition {
-                  Name = template.definition.name,
-                  Algo = template.value.CloneToMutable()
-               }
-            };
-         public static AlgoTemplateImmutable to_templatei(AlgoTemplateData template) => new AlgoTemplateImmutable(to_template(template));
-
-         public static AlgoKey get_key(CompositeAlgoRecordImmutable recordi) => new AlgoKey(new AlgoPersistedKey(recordi.Key));
-         public static AlgoKey get_key(AlgoTemplateRecordImmutable recordi) => new AlgoKey(new AlgoPersistedKey(recordi.Key));
-         public static AlgoKey get_key(CompositeAlgoDefinitionImmutable definitioni) => new AlgoKey(new AlgoPersistedKey(definitioni.Name));
-         public static AlgoKey get_key(CustomOrderDefinitionImmutable custom_order_definitioni) => new AlgoKey(custom_order_definitioni.CustomCase);
-
-         public static void set_key(ref AlgoTemplateRecord record, AlgoKey key) {
-            switch (key.mode) {
-               case AlgoKey.Mode.Persisted:
-                  switch (key.persisted.mode) {
-                     case AlgoPersistedKey.Mode.String:
-                        record.Key = key.persisted.id_string; break;
-                  }
-                  break;
-            }
-         }
-         public static void set_key(ref AlgoServiceRemoveRequest request, AlgoKey key) {
-            switch (key.mode) {
-               case AlgoKey.Mode.Persisted: 
-                  switch (key.persisted.mode) {
-                     case AlgoPersistedKey.Mode.String:
-                        request.Key = key.persisted.id_string; break;
-                  }
-                  break;
-            }
-         }
-      }
-   }
-}
@@ -1,18 +1,16 @@
 using bts;
-using bts.api;
 using bts.api.core;
 using bts.api.orderman.algo;
-using bts.persist.algo;
 using bts.spark;
-using mbts.spark.utilities;
 using mbts.utils;
 using System;
 using System.Collections.Generic;
-using System.Linq;
+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;
@@ -21,33 +19,34 @@ namespace mbts.spark {
      IReadOnlyDictionary<AlgoKey, AlgoTemplateData> _algo_templates = DictionaryHelper.empty<AlgoKey, AlgoTemplateData>();
      IDisposable _dispose;

-      public AlgoStudioFlatDefinitionModel(AlgoDefinitionService service, IAlgoDefinitionMetadataService metadata_service, AdminModel admin_model, ErrorReporter error_reporter, bts.config.AlgoStudioOptions ui_configuration) {
+      [ImportingConstructor]
+      public AlgoStudioFlatDefinitionModel(AlgoDefinitionService service, IAlgoDefinitionMetadataService metadata_service, AdminModel admin_model, ErrorReporter error_reporter) {
         _service = service;
         this.metadata_service = metadata_service;
         _admin_model = admin_model;
         _error_reporter = error_reporter;
-         this.ui_configuration = ui_configuration;
-         definitions = service.subscribei_algo_definitions().Filter(r => r.Metadata.IsActive).SelectKeyValue(_definition_data, d => d.key).Table().Cache();
+         definitions =
+            service.subscribei_algo_definitions()
+            .Filter(r => r.Metadata.IsActive && r.Metadata.CreatorUserId == _admin_model.user.id)
+            .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; }
+      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) {
-         if (_try_get_user(out uint user_id)) {
-            var (value, success) = await _error_reporter.safe_execute(() => _service.save_algo_definition_async(
-               _with_key(new AlgoDefinitionUpdateRequest { UserId = user_id, Algo = _template(definition_data) }, definition_data.key)),
-               r => r.Success, r => r.ErrorMessage, "saving template");
-            if (success)
-               return _definition_data(new AlgoDefinitionRecordImmutable(value.Record));
-         } else {
-            _report_no_user_id("save template");
-         }
+         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");
+         if (success)
+            return _definition_data(new AlgoDefinitionRecordImmutable(value.Record));
         return null;
      }

@@ -73,10 +72,10 @@ namespace mbts.spark {
         new AlgoDefinitionImmutable(_template(definition_data));

      static AlgoData _definition_data(AlgoDefinitionRecordImmutable recordi) =>
-         new AlgoData(recordi.Algo.Definition, recordi.Algo.Name, _key(recordi));
+         AlgoData.from_record(recordi);

      static AlgoKey _key(AlgoDefinitionRecordImmutable recordi) =>
-         new AlgoKey(new AlgoPersistedKey(recordi.Key));
+         AlgoKey.from_composite_key(recordi.Key);

      static AlgoDefinitionUpdateRequest _with_key(AlgoDefinitionUpdateRequest request, AlgoKey key) {
         _set_key(ref request, key);
@@ -85,9 +84,10 @@ namespace mbts.spark {

      static void _set_key(ref AlgoDefinitionUpdateRequest request, AlgoKey key) {
         switch (key.mode) {
-            case AlgoKey.Mode.Persisted: request.Key = key.persisted.id_uint; break;
+            case AlgoKey.Mode.Persisted: request.Key = key.persisted; break;
            case AlgoKey.Mode.Unpersisted:
            case AlgoKey.Mode.Factory:
+            case AlgoKey.Mode.Dynamic:
            case AlgoKey.Mode.None: request.Key = 0; break;
            default: throw ExceptionBuilder.Argument.unexpected_case(key.mode, nameof(key));
         }
@@ -95,7 +95,7 @@ namespace mbts.spark {

      static void _set_key(ref AlgoDefinitionRemoveRequest request, AlgoKey key) {
         switch (key.mode) {
-            case AlgoKey.Mode.Persisted: request.Key = key.persisted.id_uint; break;
+            case AlgoKey.Mode.Persisted: request.Key = key.persisted; break;
            default: throw ExceptionBuilder.Argument.unexpected_case(key.mode, nameof(key));
         }
      }
@@ -105,16 +105,5 @@ namespace mbts.spark {

      void _report_no_user_id(string desc) =>
         _error_reporter.report_error($"{desc} failed: did not find current user id");
-
-      bool _try_get_user(out uint id) {
-         var user = _admin_model.get_current_user();
-         if (user.HasValue) {
-            id = user.Value.id;
-            return true;
-         } else {
-            id = 0;
-            return false;
-         }
-      }
   }
 }
@@ -1,10 +1,7 @@
 using bts;
-using bts.api;
 using bts.api.core;
-using bts.spark;
 using System;
 using System.Collections.Generic;
-using System.ComponentModel.Composition;
 using System.Threading.Tasks;

 namespace mbts.spark {
@@ -20,34 +17,13 @@ namespace mbts.spark {
      bts.config.AlgoStudioOptions ui_configuration { get; }
   }

-   class AlgoStudioModelExporter {
-      [ImportingConstructor]
-      AlgoStudioModelExporter(Spark.AlgoServiceWrapper service_wrapper, IAlgoDefinitionMetadataService meta, AdminModel admin_model, ErrorReporter error_reporter) {
-         var ui_configuration = config.Configuration.get<bts.config.AlgoStudioOptions>();
-         switch (service_wrapper.mode) {
-            case Spark.AlgoServiceWrapper.Mode.Flat: model = new AlgoStudioFlatDefinitionModel(service_wrapper.flat, meta, admin_model, error_reporter, ui_configuration); break;
-            case Spark.AlgoServiceWrapper.Mode.Hierarchical: model = new AlgoStudioDefinitionTemplateModel(service_wrapper.hierarhical, meta, admin_model, error_reporter, ui_configuration); break;
-         }
-      }
-
-      [Export]
-      public IAlgoStudioModel model { get; }
-   }
-
   static class AlgoStudioModelUtils {
-      public static bool templates_enabled(this IAlgoStudioModel model) =>
-         get_templates_enabled(model.ui_configuration);
-
-      public static bool get_templates_enabled(bts.config.AlgoStudioOptions ui_configuration) =>
-         ui_configuration.add_template_button != bts.config.AlgoStudioOptions.AddTemplateButton.None;
-
      public static IReadOnlyDictionary<object, object> get_dynamic_resources(bts.config.AlgoStudioOptions ui_configuration) =>
         new Dictionary<object, object> {
            { AlgoStudioWindow.ShowAlgoToolBarRenameDefinitionKey, ui_configuration.can_modify_definition_name && ui_configuration.show_algo_toolbar_rename },
            { AlgoStudioWindow.ShowAlgoToolBarSaveDefinitionKey, ui_configuration.can_modify_definition_values && ui_configuration.show_algo_toolbar_save },
            { AlgoStudioWindow.ShowAlgoToolBarRevertDefinitionKey, ui_configuration.show_algo_toolbar_revert },
-            { AlgoStudioWindow.ShowAlgoToolBarUndoRedoDefinitionKey, ui_configuration.show_algo_toolbar_undo_redo },
-            { AlgoStudioWindow.TemplatesEnabledKey, get_templates_enabled(ui_configuration) }
+            { AlgoStudioWindow.ShowAlgoToolBarUndoRedoDefinitionKey, ui_configuration.show_algo_toolbar_undo_redo }
         };
   }
 }
@@ -35,9 +35,9 @@ namespace mbts.spark {
      internal AlgoDefinitionPersistedMetadata to_persisted() =>
         id.mode != AlgoKey.Mode.Persisted ?
            throw new InvalidOperationException("Metadata does not have a persisted key.") :
-            new AlgoDefinitionPersistedMetadata(id.persisted,
-               default_template.mode == AlgoKey.Mode.Persisted ? default_template.persisted : default,
-               favorite_templates.Where(t => t.mode == AlgoKey.Mode.Persisted).Select(t => t.persisted).ToArray(),
+            new AlgoDefinitionPersistedMetadata(new AlgoPersistedKey(id.persisted),
+               default_template.mode == AlgoKey.Mode.Persisted ? new AlgoPersistedKey(default_template.persisted) : default,
+               favorite_templates.Where(t => t.mode == AlgoKey.Mode.Persisted).Select(t => new AlgoPersistedKey(t.persisted)).ToArray(),
               is_favorite, is_hidden, abbreviation, new NullableColorProto(badge_color));

      public AlgoDefinitionMetadata with(AlgoKey? id = null, AlgoKey? default_template = null, IEnumerable<AlgoKey> favorite_templates = null, bool? is_favorite = null, bool? is_hidden = null, string abbreviation = null, NullableColorProto? badge_color = null) =>
@@ -83,7 +83,8 @@ namespace mbts.spark {

      public static AlgoDisplayGroup display_group(this AlgoKey key) {
         switch (key.mode) {
-            case AlgoKey.Mode.Factory: return display_group(key.factory.structure.order_type());
+            case AlgoKey.Mode.Factory: return display_group(key.factory);
+            case AlgoKey.Mode.Dynamic: return AlgoDisplayGroup.API;
            case AlgoKey.Mode.Unpersisted:
            case AlgoKey.Mode.Persisted:
               return AlgoDisplayGroup.Studio;
@@ -1,243 +0,0 @@
-using bts;
-using bts.api.orderman;
-using bts.utils;
-using mbts.spark.utilities;
-using mbts.ui;
-using mbts.ui.shell;
-using mbts.ui.utility;
-using mbts.utils;
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Reactive.Linq;
-using System.Windows.Input;
-using VisualStateNames = mbts.ui.spark.AlgoStudioView.VisualStateNames;
-
-namespace mbts.spark {
-   class AlgoDefinitionTemplateVM : DisposableViewModelBase, IAlgoStudioContentVM, IEquatable<AlgoDefinitionTemplateVM> {
-      /// <see cref="CustomType"/> is referenced by an x:Static extension in OrderDetailsPopupControl.xaml <see cref="mbts.ui.spark.algo.OrderDetailsPopupControl"/>.
-      /// In most cases, <see cref="mbts.ui.NestedExtension"/> works just like <see cref="System.Windows.Markup.TypeExtension"/>, but for nested types, such as <see cref="CustomTemplatePlaceholderVM"/>.
-      /// However, when the former is used to denote the DataType of a DataTemplate, a strange XamlReader exception is thrown at runtime.
-      /// After spending ~15 minutes investigating what was happening, [John]I decided it was more trouble than it was worth and opted for this workaround.
-      public static readonly Type CustomType = typeof(CustomTemplatePlaceholderVM);
-      readonly OrdersModel _model;
-      readonly VisualStateModel _edit_pane_vs_model = new VisualStateModel(), _tree_view_vs_model = new VisualStateModel();
-      /// Note: the difference between <see cref="EditStack{T}"/> and <see cref="VersionContainer{T}"/> is that the former implements push/pop functionality so the user may undo/redo (like ctrl+z/ctrl+y in text editors),
-      /// while the latter is a lazy delegate-based container for the most recent value (<see cref="VersionContainer{T}.increment_version"/>).
-      readonly EditStack<Snapshot> _edit_stack = new EditStack<Snapshot>();
-      readonly VersionContainer<Snapshot> _version;
-      readonly DeferrableActionWrapper _refresh_on_local_change;
-      readonly Property<IAlgoVM> _algo_root;
-      readonly DelegateProperty<bool> _can_undo, _can_redo, _is_dirty;
-      readonly Property<bool> _is_default, _is_favorite, _is_selected;
-      readonly Property<string> _name, _abbreviation;
-      // maintains the state of each algo-root, so the user may change the definition root back and forth without any loss of state amongst the templates
-      Snapshot _committed;
-
-      public AlgoDefinitionTemplateVM(AlgoDefinitionVM owner, OrdersModel model, AlgoData data, AlgoEditingPermissions editing_permissions = AlgoEditingPermissions.AllowEditValues) {
-         // init core data
-         this.owner = owner;
-         _model = model;
-         key = data.key;
-         _version = new VersionContainer<Snapshot>(_snapshot);
-         // maintain states for different algo roots, so they aren't lost when the user changes the root algo type
-         var algo_map = new Dictionary<AlgoKey, IAlgoVM> {
-            { data.key, algo_vm_factory(data.value) }
-         };
-         // init backing props
-         _name = backing(nameof(this.name), name);
-         _abbreviation = backing(nameof(abbreviation), string.Empty);
-         _is_default = backing(nameof(is_default), false);
-         _is_favorite = backing(nameof(is_favorite), false);
-         _is_selected = backing(nameof(is_selected), false);
-         _algo_root = backing(nameof(algo_root), get_algo_root(owner.algo_root));
-         _committed = _version.value;
-         _can_redo = backing(nameof(can_redo), () => _edit_stack.get_can_redo(_version.value));
-         _can_undo = backing(nameof(can_undo), () => _edit_stack.get_can_undo(_version.value));
-         _is_dirty = backing(nameof(is_dirty), () => !_committed.Equals(_version.value));
-         _can_redo.Changed += on_can_redo_changed;
-         _can_undo.Changed += on_can_undo_changed;
-         set_as_default_cmd = new DelegateCommand(() => {
-            if (!is_default && key.mode == AlgoKey.Mode.Persisted)
-               _model.algo_model.metadata_service.set_as_default(owner.key, key).ignore();
-         });
-         // init visual states
-         // TODO: implement these features in IAlgoMetadataService; until then, set the appropriate visual states.
-         _edit_pane_vs_model.set_state(VisualStateNames.Abbreviation.GroupName, VisualStateNames.Abbreviation.NotSupportedForTemplates);
-         _tree_view_vs_model.set_state(VisualStateNames.FavoriteToggleButton.GroupName, VisualStateNames.FavoriteToggleButton.Inactive);
-         switch (key.mode) {
-            case AlgoKey.Mode.Persisted:
-               _edit_stack.push(_committed);
-               _edit_pane_vs_model.set_state(VisualStateNames.Name.GroupName, VisualStateNames.Name.Active);
-               break;
-            case AlgoKey.Mode.Unpersisted: _edit_pane_vs_model.set_state(VisualStateNames.Name.GroupName, VisualStateNames.Name.Active); break;
-            case AlgoKey.Mode.Factory: _edit_pane_vs_model.set_state(VisualStateNames.Name.GroupName, VisualStateNames.Name.Inactive); break;
-         }
-         // set hooks/subscriptions
-         _refresh_on_local_change = new DeferrableActionWrapper(on_local_changed);
-         _dispose = new System.Reactive.Disposables.CompositeDisposable(
-            as_demuxer().subscribe_many(_refresh_on_local_change.execute, nameof(name), nameof(abbreviation), nameof(is_default), nameof(is_favorite)),
-            owner.observe_algo_root().Subscribe(r => _algo_root.set(get_algo_root(r))),
-            _algo_root.observe_current(true).SelectManyInSeries(r => r?.subscribe_definition()).RefCount().Subscribe(_ => _refresh_on_local_change.execute()),
-            Disposable.wrap_collection(algo_map.Values)) {
-            () => {
-               _can_redo.Changed -= on_can_redo_changed;
-               _can_undo.Changed -= on_can_undo_changed;
-            }
-         };
-         // local methods
-         IAlgoVM algo_vm_factory(CustomOrderDefinitionImmutable def) => OrderTypeVMFactory.create(new AlgoData(def, def.CustomCase.display_name(), OrderDataHelper.get_shallow_factory_key(def)), editing_permissions);
-         IAlgoVM get_algo_root(IAlgoVM owner_root) {
-            var key = new AlgoKey(owner_root.order_type);
-            if (algo_map.TryGetValue(key, out IAlgoVM vm)) {
-               vm.load_structure(owner_root.definition);
-            } else {
-               vm = algo_map.GetOrAdd(key, ot => algo_vm_factory(owner_root.definition));
-            }
-            return vm;
-         }
-         void on_can_undo_changed(bool oldval, bool newval) => can_undo_changed?.Invoke();
-         void on_can_redo_changed(bool oldval, bool newval) => can_redo_changed?.Invoke();
-         void on_local_changed() {
-            _version.increment_version();
-            _edit_stack.push_distinct(_version.value);
-            _is_dirty.refresh();
-            _refresh_undo_redo();
-         }
-      }
-
-      public event Action can_redo_changed, can_undo_changed;
-      public event PropertyChange<IAlgoVM> algo_root_changed { add => _algo_root.Changed += value; remove => _algo_root.Changed -= value; }
-
-      public AlgoDefinitionVM owner { get; }
-      public AlgoKey owner_key => owner.key;
-      public AlgoKey key { get; }
-      public string name { get => _name.Value; set => _name.set(value); }
-      public string abbreviation { get => _abbreviation.Value; set => _abbreviation.set(value); }
-      public bool is_dirty => _is_dirty.Value;
-      public bool can_redo => _can_redo.Value;
-      public bool can_undo => _can_undo.Value;
-      public bool is_default => _is_default.Value;
-      public bool is_favorite { get => _is_favorite.Value; set => _is_favorite.set(value); }
-      public IAlgoVM algo_root => _algo_root.Value;
-      public virtual bool is_custom_placeholder => false;
-      public bool is_selected { get => _is_selected.Value; set => _is_selected.set(value); }
-      public bool is_expanded => false;
-      public bool is_persisted => key.mode == AlgoKey.Mode.Persisted;
-      public ObservableCollection<string> edit_pane_visual_states => _edit_pane_vs_model.states;
-      public ObservableCollection<string> tree_view_visual_states => _tree_view_vs_model.states;
-      public ICommand set_as_default_cmd { get; }
-
-      public IObservable<bool> observe_is_dirty() => _is_dirty.observe_current(true);
-      public void undo() => _restore(_edit_stack.try_undo);
-      public void redo() => _restore(_edit_stack.try_redo);
-    
-      public void on_meta(bool is_default, bool is_favorite) {
-         _is_default.set(is_default);
-         _is_favorite.set(is_favorite);
-      }
-
-      public AlgoData create_def_data() =>
-         new AlgoData(algo_root.definition, name, key);
-
-      public AlgoTemplateData create() =>
-         create(owner.create_algo_def());
-
-      public AlgoTemplateData create(AlgoData record) {
-         if (!OrderDataHelper.EqualsHelpers.structure_equals(algo_root.definition, record.value))
-            throw new InvalidOperationException("AlgoTemplate's algo structure does not match that of its parent.");
-         return new AlgoTemplateData(algo_root.definition, name, key, record);
-      }
-
-      public AlgoDefinitionTemplateVM to_persisted(AlgoDefinitionVM persisted_owner, AlgoData template) =>
-         new AlgoDefinitionTemplateVM(persisted_owner, _model, template);
-
-      public void load_committed() => _load_from(_committed.name, _committed.definition, true);
-
-      public void load_from(AlgoTemplateData value) {
-         if (key.mode != AlgoKey.Mode.Persisted)
-            throw new InvalidOperationException("AlgoStructure has not been saved yet.");
-         else if (value.key != key)
-            throw new InvalidOperationException("Value id does not match this id.");
-         _load_from(value.name, value.value, true);
-      }
-
-      public bool Equals(AlgoDefinitionTemplateVM other) => other != null && key == other.key;
-      public override bool Equals(object obj) => Equals(obj as AlgoDefinitionTemplateVM);
-      public override int GetHashCode() => key.GetHashCode();
-
-      void _load_from(string new_name, CustomOrderDefinitionImmutable new_def, bool update_committed) {
-         using (_refresh_on_local_change.defer_execution()) {
-            name = new_name;
-            algo_root.load_from(new_def);
-         }
-         if (update_committed) {
-            _committed = _version.value;
-            _is_dirty.refresh();
-         }
-      }
-
-      void _refresh_undo_redo() {
-         _can_redo.refresh();
-         _can_undo.refresh();
-      }
-
-      void _restore(TryGetValue<Snapshot> try_get_snapshot) {
-         while (try_get_snapshot(out Snapshot next_state)) {
-            if (!_version.value.Equals(next_state)) {
-               _load_from(next_state.name, next_state.definition, false);
-               break;
-            }
-         }
-      }
-
-      Snapshot _snapshot() =>
-         new Snapshot(name, abbreviation, algo_root?.definition ?? new CustomOrderDefinitionImmutable(new CustomOrderDefinition()), is_default, is_favorite);
-
-      struct Snapshot : IEquatable<Snapshot> {
-         public readonly string name, abbreviation;
-         public readonly CustomOrderDefinitionImmutable definition;
-         public readonly bool is_default, is_favorite;
-
-         public Snapshot(string name, string abbreviation, CustomOrderDefinitionImmutable definition, bool is_default, bool is_favorite) {
-            this.name = name;
-            this.abbreviation = abbreviation;
-            this.definition = definition;
-            this.is_default = is_default;
-            this.is_favorite = is_favorite;
-         }
-
-         public bool Equals(Snapshot other) =>
-            name == other.name &&
-            abbreviation == other.abbreviation &&
-            is_default == other.is_default &&
-            is_favorite == other.is_favorite &&
-            OrderDataHelper.EqualsHelpers.equals(definition, other.definition);
-
-         public override bool Equals(object obj) =>
-            EqualityComparer.equals_obj(this, obj);
-
-         public override int GetHashCode() =>
-            EqualityComparer.aggregate_hash(
-               EqualityComparer.safe_aggregate_hash(name),
-               EqualityComparer.safe_aggregate_hash(abbreviation),
-               is_default.GetHashCode(),
-               is_favorite.GetHashCode(),
-               OrderDataHelper.EqualsHelpers.custom_order_def_compareri.GetHashCode(definition));
-
-         public static bool operator ==(Snapshot a, Snapshot b) => a.Equals(b);
-         public static bool operator !=(Snapshot a, Snapshot b) => !a.Equals(b);
-      }
-
-      public class CustomTemplatePlaceholderVM : AlgoDefinitionTemplateVM {
-         const string _custom_name = "(Custom)";
-
-         public CustomTemplatePlaceholderVM(AlgoDefinitionVM owner, OrdersModel model, CustomOrderDefinitionImmutable definition)
-            : base(owner, model, new AlgoData(definition, _custom_name, new AlgoKey(Guid.NewGuid())), AlgoEditingPermissions.AllowEditStructure | AlgoEditingPermissions.AllowEditValues) {
-            _edit_stack.reset(_snapshot());
-         }
-
-         public override bool is_custom_placeholder => true;
-      }
-   }
-}
@@ -1,4 +1,4 @@
-using bts.api.core;
+using bts;
 using bts.api.orderman;
 using bts.collections;
 using bts.proto;
@@ -6,7 +6,6 @@ using bts.utils;
 using mbts.collections;
 using mbts.spark.utilities;
 using mbts.ui;
-using mbts.ui.controls;
 using mbts.ui.controls.color_picker;
 using mbts.ui.shell;
 using mbts.ui.utility;
@@ -18,7 +17,6 @@ using System.Collections.Specialized;
 using System.Linq;
 using System.Reactive.Disposables;
 using System.Reactive.Linq;
-using System.Windows.Data;
 using System.Windows.Media;
 using VisualStateNames = mbts.ui.spark.AlgoStudioView.VisualStateNames;

@@ -36,18 +34,14 @@ namespace mbts.spark {
      public static readonly CustomOrderDefinitionImmutable new_algo_def = OrderDataHelper.Defaults.CustomOrderDefinitionImmutable(CustomOrderDefinition.CustomOneofCase.Iceberg);
      readonly OrdersModel _model;
      readonly VisualStateModel _edit_pane_vs_model = new VisualStateModel(), _tree_view_vs_model = new VisualStateModel();
-      readonly ObservableKeyedCollection<AlgoDefinitionTemplateVM, AlgoKey> _templates = new ObservableKeyedCollection<AlgoDefinitionTemplateVM, AlgoKey>(t => t.key);
      readonly EditStack<Snapshot> _edit_stack = new EditStack<Snapshot>();
      readonly VersionContainer<Snapshot> _version;
      readonly Property<bool> _is_expanded, _is_selected;
      readonly Property<IAlgoVM> _algo_root, _visible_algo_root;
-      readonly Property<AlgoDefinitionTemplateVM> _selected_template;
      readonly DelegateProperty<bool> _is_favorite, _is_dirty, _can_undo, _can_redo;
      readonly Property<string> _name, _abbreviation;
      readonly ObservableKeyedCollection<IAlgoVM, AlgoKey> _algo_roots = new ObservableKeyedCollection<IAlgoVM, AlgoKey>(vm => vm.id);
-      readonly ObservableAppendCollection<AlgoDefinitionTemplateVM> _templates_with_custom;
      readonly DeferrableActionWrapper _refresh_on_local_changes;
-      readonly ReactiveThresholdMonitor<AlgoDefinitionTemplateVM> _any_templates_dirty_monitor = new ReactiveThresholdMonitor<AlgoDefinitionTemplateVM>(t => t.observe_is_dirty());
      readonly Property<AlgoFormats> _selected_format;
      readonly EnumMaskInt32<AlgoEditingPermissions> _permissions_mask = new EnumMaskInt32<AlgoEditingPermissions>();

@@ -55,18 +49,12 @@ namespace mbts.spark {
      Brush _badge_fill;
      Snapshot? _committed;
      AlgoDefinitionMetadata _metadata;
-      TableUpdateBuffer<AlgoTemplateData, AlgoKey> _template_update_buffer;
-      bool _connected;

-      public static AlgoDefinitionVM create(OrdersModel model, AlgoData data, bool connect = false, AlgoFormats init_format = AlgoFormats.Exchange, AlgoEditingPermissions editing_permissions = (AlgoEditingPermissions)int.MaxValue) {
-         var rv = new AlgoDefinitionVM(model, data, init_format, editing_permissions);
-         if (connect)
-            rv.connect();
-         return rv;
-      }
+      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_placeholder(OrdersModel model, CustomOrderDefinitionImmutable def, string name, AlgoFormats init_format) =>
-         new AlgoDefinitionVM(model, new AlgoData(def, name, new AlgoKey(Guid.NewGuid())), init_format, (AlgoEditingPermissions)int.MaxValue);
+         new AlgoDefinitionVM(model, AlgoData.create_unpersisted(def, name), init_format, (AlgoEditingPermissions)int.MaxValue);

      AlgoDefinitionVM(OrdersModel model, AlgoData def_data, AlgoFormats init_format, AlgoEditingPermissions init_permissions) {
         // init core data
@@ -78,20 +66,8 @@ namespace mbts.spark {
            editing_permissions_mask ^= (AlgoEditingPermissions.AllowEditValues | AlgoEditingPermissions.AllowSaveValues);
         if (!model.algo_model.ui_configuration.can_modify_definition_structure)
            editing_permissions_mask ^= (AlgoEditingPermissions.AllowEditStructure | AlgoEditingPermissions.AllowSaveStructure);
-         else if (model.algo_model.templates_enabled()) {
-            resources.Add(_templates.Subscribe((s, e) => {
-               if (_templates.Count == 0) {
-                  editing_permissions_mask |= AlgoEditingPermissions.AllowEditStructure | AlgoEditingPermissions.AllowSaveStructure;
-               } else {
-                  editing_permissions_mask ^= (AlgoEditingPermissions.AllowEditStructure | AlgoEditingPermissions.AllowSaveStructure);
-               }
-            }));
-         }
         key = def_data.key;
         algos_view = ObservableAutoWrapper.create_sorted_wrapper(_algo_roots, AlgoCollectionHelper.algo_vm_comparer);
-         _template_update_buffer = new TableUpdateBuffer<AlgoTemplateData, AlgoKey>(t => t.key);
-         _templates_with_custom = new ObservableAppendCollection<AlgoDefinitionTemplateVM>(templates);
-         templates_view = (ListCollectionView)CollectionViewSource.GetDefaultView(_templates_with_custom);
         custom_badge_color_palettes.AddRange(ColorPalette.all_presets(model.factory).Select(p => new ColorPaletteVM(p)));
         _version = new VersionContainer<Snapshot>(_snapshot);
         var conf = _model.algo_model.ui_configuration;
@@ -99,87 +75,80 @@ namespace mbts.spark {
         _name = backing(nameof(name), def_data.name);
         _abbreviation = backing(nameof(abbreviation), string.Empty);
         _selected_format = backing(nameof(selected_format), init_format);
-         _selected_template = backing<AlgoDefinitionTemplateVM>(nameof(selected_template));
         _is_favorite = backing(nameof(is_favorite), () => _favorite_index.HasValue);
         _is_expanded = backing(nameof(is_expanded), true);
         _is_selected = backing(nameof(is_selected), true);
         _is_dirty = backing(nameof(is_dirty), () => key.mode == AlgoKey.Mode.Unpersisted || !_committed.HasValue || !_committed.Value.Equals(_version.value));
-         var factory_def_data = def_data.key.mode == AlgoKey.Mode.Factory ? def_data : new AlgoData(def_data.value);
+         var factory_def_data = def_data.key.mode == AlgoKey.Mode.Factory ? def_data : AlgoData.from_custom_def(def_data.value);
         _algo_root = backing(nameof(algo_root), _algo_roots.GetOrAdd(factory_def_data.key, _ => OrderTypeVMFactory.create(factory_def_data)));
         _visible_algo_root = backing<IAlgoVM>(nameof(visible_algo_root));
+         // only composite/studio algos can change root
+         if (key.mode == AlgoKey.Mode.Factory || key.mode == AlgoKey.Mode.Dynamic) {
+            _algo_root.Changing += (oldval, newval) =>
+               Log.assert(newval != null && newval.id == key);
+         }
         _can_redo = backing(nameof(can_redo), () => _edit_stack.get_can_redo(_version.value));
         _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;
         _refresh_on_local_changes = new DeferrableActionWrapper(on_local_changed);
         // load initial state
-         init_async();
-         async void init_async() {
-            // visible_algo_root is selected_template.algo_root if user can add templates, otherwise algo_root
-            // - this behavior is configurable in 'AlgoStudioOptions' in UI.proto (01/28/2018)
-            if (_model.algo_model.templates_enabled()) {
-               resources.Add(_selected_template.observe_current(true).Subscribe(t => _visible_algo_root.set(t?.algo_root)));
-            } else {
-               resources.Add(_algo_root.observe_current(true).Subscribe(_visible_algo_root.set));
+         // visible_algo_root is selected_template.algo_root if user can add templates, otherwise algo_root
+         // - this behavior is configurable in 'AlgoStudioOptions' in UI.proto (01/28/2018)
+         resources.Add(_algo_root.observe_current(true).Subscribe(_visible_algo_root.set));
+         // set hooks/subscriptions
+         using (_refresh_on_local_changes.supress_execution()) {
+            resources.AddRange(
+               custom_badge_color.observe_nullable(true).Subscribe(v => Set(ref _badge_fill, (v ?? algo_root.safe_get_badge_color()).to_brush(), nameof(badge_fill))),
+               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()))),
+               ObservableAutoWrapper.connect_item_hooks(algo_roots, a => a as IDisposable ?? Disposable.empty, true),
+               Disposable.Create(() => {
+                  _can_redo.Changed -= on_can_redo_changed;
+                  _can_undo.Changed -= on_can_undo_changed;
+               }));
+            switch (key.mode) {
+               case AlgoKey.Mode.Persisted:
+                  _metadata = new AlgoDefinitionMetadata(key);
+                  resources.Add(model.algo_model.metadata_service.subscribe_metadata(key).OnDispatcher().Subscribe(_on_metadata));
+                  _edit_pane_vs_model.set_state(VisualStateNames.Name.GroupName, conf.can_modify_definition_name ? VisualStateNames.Name.Active : VisualStateNames.Name.CannotRenameDefinition);
+                  break;
+               case AlgoKey.Mode.Factory:
+                  _edit_pane_vs_model.set_state(VisualStateNames.Name.GroupName, VisualStateNames.Name.Inactive);
+                  break;
            }
-            // init tree view item visual state
-            _tree_view_vs_model.set_state(VisualStateNames.TreeViewBadge.GroupName, conf.show_badges_in_tree_view ? VisualStateNames.TreeViewBadge.Active : VisualStateNames.TreeViewBadge.Inactive);
-            // set hooks/subscriptions
-            using (_refresh_on_local_changes.supress_execution()) {
-               resources.AddRange(
-                  custom_badge_color.observe_nullable(true).Subscribe(v => Set(ref _badge_fill, (v ?? algo_root.safe_get_badge_color()).to_brush(), nameof(badge_fill))),
-                  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()))),
-                  ObservableAutoWrapper.connect_item_hooks(algo_roots, a => a as IDisposable ?? Disposable.empty, true),
-                  ObservableAutoWrapper.connect_item_hooks(templates, t => new CompositeDisposable(_any_templates_dirty_monitor.join(t), t), true),
-                  Disposable.Create(() => {
-                     _can_redo.Changed -= on_can_redo_changed;
-                     _can_undo.Changed -= on_can_undo_changed;
-                  }));
-               switch (key.mode) {
-                  case AlgoKey.Mode.Persisted:
-                     _metadata = new AlgoDefinitionMetadata(key);
-                     resources.Add(_template_update_buffer.OnDispatcher().Subscribe(_on_templates));
-                     resources.Add(model.algo_model.metadata_service.subscribe_metadata(key).OnDispatcher().Subscribe(_on_metadata));
-                     _edit_pane_vs_model.set_state(VisualStateNames.Name.GroupName, conf.can_modify_definition_name ? VisualStateNames.Name.Active : VisualStateNames.Name.CannotRenameDefinition);
-                     break;
-                  case AlgoKey.Mode.Factory:
-                     _edit_pane_vs_model.set_state(VisualStateNames.Name.GroupName, VisualStateNames.Name.Inactive);
-                     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 = new AlgoKey(OrderDataHelper.get_default_algo(t.fmt));
-                           return this.load_algo_data_recursive(algo_data, default_algo);
-                        }
+            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)));
-               resources.Add(_algo_root.Subscribe(_ => RaisePropertyChanged(nameof(IAlgoSelector.selected_algo), nameof(IAlgoParamVM.value), nameof(group))));
-               _dispose = resources;
-               await algo_root.load_from_async(def_data.value);
-               _version.increment_version();
-               _edit_stack.reset(_version.value);
-               _on_committed_changed();
-            }
+                  }
+                  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)));
+            resources.Add(_algo_root.Subscribe(_ => RaisePropertyChanged(nameof(IAlgoSelector.selected_algo), nameof(IAlgoParamVM.value), nameof(group))));
+            _dispose = resources;
+            algo_root.load_from(def_data.value);
+            _version.increment_version();
+            _edit_stack.reset(_version.value);
+            _on_committed_changed();
         }
         // local methods
         void on_can_redo_changed(bool oldval, bool newval) => can_redo_changed?.Invoke();
@@ -206,7 +175,6 @@ namespace mbts.spark {
      public IReadOnlyObservableCollection<IAlgoVM> algos_view { get; }
      public IAlgoVM algo_root { get => _algo_root.Value; set => _algo_root.set(value); }
      public IAlgoVM visible_algo_root => _visible_algo_root.Value;
-      public AlgoDefinitionTemplateVM selected_template { get => _selected_template.Value; set => _selected_template.set(value); }
      public int? favorite_index {
         get => _favorite_index;
         set {
@@ -219,34 +187,12 @@ namespace mbts.spark {
      public bool is_selected { get => _is_selected.Value; set => _is_selected.set(value); }
      public bool is_dirty => _is_dirty.Value;
      public bool is_factory_definition => key.mode == AlgoKey.Mode.Factory;
-      public AlgoDisplayGroup group {
-         get {
-            switch (key.mode) {
-               case AlgoKey.Mode.Factory:
-                  if (algo_root != null)
-                     return algo_root.group;
-                  break;
-               case AlgoKey.Mode.Unpersisted:
-               case AlgoKey.Mode.Persisted:
-                  return AlgoDisplayGroup.Studio;
-            }
-            return AlgoDisplayGroup.BTS;
-         }
-      }
+      public AlgoDisplayGroup group => key.display_group();
      public bool can_redo => _can_redo.Value;
      public bool can_undo => _can_undo.Value;
      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;
-      public ObservableCollection<AlgoDefinitionTemplateVM> templates => _templates;
-      /// <see cref="templates_with_custom"/> has the same elements as <see cref="templates"/>, plus the custom-placeholder-item, which is always at index 0.
-      /// The custom-placeholder supports legacy behavior in the ladder/ticket algo popup by allowing the user to manipulate the algo-structure (e.g. change an iceberg-limit order to iceberg-lean-cover-offset etc.).
-      /// However, the custom-placeholder item cannot be used to create/save algo-templates.
-      /// Algo-templates are just a set of values used to populate a concrete algo-structure; the 'structures' can be created in the AlgoStudio (<see cref="AlgoStudioWindow"/>).
-      /// If we were to strictly follow this paradigm, the user would no longer be able to freely change the algo-structure in the ladder/ticket popup (they would be forced to open up a new <see cref="AlgoStudioWindow"/>, and we know how much they hate more clicks!).
-      /// Some users might consider this a regression.  The custom-placeholder-item addresses that concern.
-      public ObservableAppendCollection<AlgoDefinitionTemplateVM> templates_with_custom => _templates_with_custom;
-      public ListCollectionView templates_view { get; }
      // 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 };
@@ -321,24 +267,7 @@ namespace mbts.spark {
         }
      }

-      // idempotent
-      public void prepend_custom_template() {
-         if (_templates_with_custom.appended_front.Count == 0)
-            _templates_with_custom.insert_front(new AlgoDefinitionTemplateVM.CustomTemplatePlaceholderVM(this, _model, algo_root.definition));
-      }
-
-      public AlgoDefinitionTemplateVM template_factory() =>
-         new AlgoDefinitionTemplateVM(this, _model, algo_root.create_def_data().with(name: new_template_name)) {
-            is_selected = true
-         };
-
      public IObservable<bool> subscribe_is_definition_dirty() => _is_dirty.observe_current(true);
-      public IObservable<bool> subscribe_any_templates_dirty() => _any_templates_dirty_monitor;
-      public IObservable<bool> subscribe_is_definition_or_any_templates_dirty() =>
-         Observable.Merge(
-            subscribe_is_definition_dirty().Select(v => v || _any_templates_dirty_monitor.is_above_threshold),
-            subscribe_any_templates_dirty().Select(v => v || is_dirty))
-         .DistinctUntilChanged();

      public void undo() => _restore(_edit_stack.try_undo);
      public void redo() => _restore(_edit_stack.try_redo);
@@ -347,20 +276,9 @@ namespace mbts.spark {
            _assign_from_data(_committed.Value);
         _on_committed_changed();
      }
-      /// <summary>
-      /// Subscribes to the templates source for this definition if it has been persisted (subscription requires a persistant id); does nothing if this definition has not been persisted, or if it is already subscribed (idempotent). 
-      /// </summary>
-      public void connect() {
-         if (!_connected) {
-            _connected = true;
-            concat_disposable(_model.algo_model.subscribe_definition_templates(key).OnDispatcher().Subscribe(_template_update_buffer.OnNext));
-         }
-      }
-
-      public IDisposable buffer_updates() => _template_update_buffer.buffer_updates();

      public void load_def(CustomOrderDefinitionImmutable def) {
-         var key = OrderDataHelper.get_shallow_factory_key(def);
+         var key = AlgoKey.from_custom_def(def);
         if (algo_root?.id == key) {
            algo_root.load_from(def);
         } else if (_algo_roots.TryGetValue(key, out IAlgoVM vm)) {
@@ -384,7 +302,7 @@ namespace mbts.spark {
            case 1: load_def(def_list[0]); break;
            default:
               var def = def_list[0];
-               var key = OrderDataHelper.get_shallow_factory_key(def);
+               var key = AlgoKey.from_custom_def(def);
               if (algo_root?.id == key) {
                  algo_root.load_many(def_list);
               } else if (_algo_roots.TryGetValue(key, out IAlgoVM vm)) {
@@ -414,7 +332,7 @@ namespace mbts.spark {
         new AlgoDefinitionVM(_model, def, selected_format, editing_permissions_mask);

      public AlgoData create_algo_def() =>
-         new AlgoData(algo_root.definition, name, key);
+         AlgoData.create(algo_root == null ? new CustomOrderDefinitionImmutable(new CustomOrderDefinition()) : algo_root.definition, name, key);

      public AlgoDefinitionMetadata create_metadata() =>
         _metadata.with(abbreviation: abbreviation, badge_color: new NullableColorProto(custom_badge_color.get_nullable()));
@@ -443,7 +361,7 @@ namespace mbts.spark {

      void _assign_from_data(string name, CustomOrderDefinitionImmutable definition) {
         this.name = name;
-         algo_root = _algo_roots.GetOrAdd(OrderDataHelper.get_shallow_factory_key(definition), _ => _mk_algo_root(definition));
+         algo_root = _algo_roots.GetOrAdd(AlgoKey.from_custom_def(definition), _ => _mk_algo_root(definition));
         algo_root.load_from(definition);
      }

@@ -458,18 +376,12 @@ namespace mbts.spark {
      public Snapshot current_value => _version.value;

      IAlgoVM _mk_algo_root(CustomOrderDefinitionImmutable definition) =>
-         OrderTypeVMFactory.create(new AlgoData(definition), is_expanded: true);
+         OrderTypeVMFactory.create(AlgoData.from_custom_def(definition), is_expanded: true);

      void _on_metadata(AlgoDefinitionMetadata metadata) {
         using (_refresh_on_local_changes.supress_execution()) {
            _abbreviation.set(metadata.abbreviation);
            custom_badge_color.set_nullable(metadata.badge_color);
-            foreach (var t in templates) {
-               if (t.key.mode == AlgoKey.Mode.Persisted)
-                  t.on_meta(t.key == metadata.default_template, metadata.favorite_templates.Contains(t.key));
-               else
-                  t.on_meta(false, false);
-            }
            _version.increment_version();
            if (_edit_stack.size == 1 && _edit_stack.pos == 1) {
               // this is a hack to account for the metadata being part of the committed state,
@@ -482,22 +394,6 @@ namespace mbts.spark {
         }
      }

-      void _on_templates(TableUpdate<AlgoTemplateData, AlgoKey> table) {
-         foreach (var rec in table.removed)
-            _templates.Remove(rec.key);
-         foreach (var rec in table.changed)
-            _templates[rec.key].load_from(rec);
-         foreach (var rec in table.added) {
-            if (_templates.TryGetValue(rec.key, out AlgoDefinitionTemplateVM tmp)) {
-               tmp.load_from(rec);
-            } else {
-               tmp = new AlgoDefinitionTemplateVM(this, _model, new AlgoData(rec.value, rec.name, rec.key));
-               tmp.on_meta(tmp.key == _metadata.default_template, _metadata.favorite_templates.Contains(tmp.key));
-               _templates.Add(tmp);
-            }
-         }
-      }
-
      void _refresh_undo_redo() {
         _can_undo.refresh();
         _can_redo.refresh();
@@ -1,6 +1,5 @@
 using bts;
 using bts.api.orderman;
-using bts.collections;
 using bts.utils;
 using mbts.collections;
 using mbts.ui;
@@ -14,6 +13,7 @@ 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;

@@ -37,29 +37,30 @@ namespace mbts.spark {
         });
   }

-   class AlgoStudioVM : DisposableViewModelBase, IHandleSelectedItemChanged {
+   class AlgoStudioVM : DisposableViewModelBase {
      static readonly AlgoFormats _studio_formats = AlgoFormats.Exchange;
      readonly OrdersModel _model;
      readonly Property<AlgoDefinitionVM> _selected_definition;
-      readonly Property<AlgoDefinitionTemplateVM> _selected_template;
      readonly Property<IAlgoVM> _editable_content;
      readonly DelegateProperty<string> _save_cmd_tooltip, _revert_cmd_tooltip;
      readonly ObservableKeyedCollection<AlgoDefinitionVM, AlgoKey> _definitions = new ObservableKeyedCollection<AlgoDefinitionVM, AlgoKey>(d => d.key);
      readonly ListCollectionView<AlgoDefinitionVM> _definitions_view;
      readonly TableUpdateBuffer<AlgoData, AlgoKey> _definitions_update_buffer;
-      readonly ReactiveThresholdMonitor<AlgoDefinitionVM> _any_dirty_monitor = new ReactiveThresholdMonitor<AlgoDefinitionVM>(d => d.subscribe_is_definition_or_any_templates_dirty());
+      readonly ReactiveThresholdMonitor<AlgoDefinitionVM> _any_dirty_monitor = new ReactiveThresholdMonitor<AlgoDefinitionVM>(d => d.subscribe_is_definition_dirty());
      IReadOnlyDictionary<AlgoKey, AlgoDefinitionMetadata> _persisted_meta = new Dictionary<AlgoKey, AlgoDefinitionMetadata>();

      public AlgoStudioVM(OrdersModel model) {
         _model = model;
         _selected_definition = backing<AlgoDefinitionVM>(nameof(selected_definition));
-         _selected_template = backing<AlgoDefinitionTemplateVM>(nameof(selected_template));
-         _editable_content = backing(nameof(editable_content), observe_selected().SelectManyInSeries(tup => tup.template?.observe_algo_root() ?? tup.definition?.observe_algo_root()).RefCount().OnDispatcher());
+         _editable_content = backing(nameof(editable_content), subscribe_definition().SelectManyInSeries(def => def?.observe_algo_root()).OnDispatcher());
         _definitions_update_buffer = new TableUpdateBuffer<AlgoData, AlgoKey>(def => def.key);
         _definitions_view = new ListCollectionView<AlgoDefinitionVM>(definitions) {
            CustomSort = AlgoCollectionHelper.algo_definition_vm_comparer.to_non_generic()
         };
         definitions_view.Filter = d => !(d.key.mode == AlgoKey.Mode.Persisted && _persisted_meta.TryGetValue(d.key, out AlgoDefinitionMetadata meta) && meta.is_hidden);
+         // add/clone
+         add_definition_cmd = new DelegateCommand(add_definition);
+         clone_selected_definition_cmd = new DelegateCommand(clone_selected_definition);
         // save
         var save_cmd = new ObservantAsyncCommand<IAlgoStudioContentVM>(save_async);
         this.save_cmd = save_cmd;
@@ -71,13 +72,18 @@ namespace mbts.spark {
         //
         _dispose = new CompositeDisposable(
            _model.algo_model.definitions.Subscribe(_definitions_update_buffer),
-            _definitions_update_buffer.OnDispatcher().Subscribe(u => AlgoCollectionHelper.update_persisted_definitions(_definitions, u, d => AlgoDefinitionVM.create(model, d, true, _studio_formats))),
+            _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));
+               if (selected_definition == null)
+                  selected_definition = definitions.FirstOrDefault();
+            }),
            _model.algo_model.metadata_service.subscribe_metadata().OnDispatcher().Subscribe(meta => {
               _persisted_meta = meta;
               definitions_view.Refresh();
            }),
-            ObservableAutoWrapper.connect(observe_selected().Select(t => t.template?.edit_pane_visual_states ?? t.definition?.edit_pane_visual_states ?? new ObservableCollection<string>()), content_visual_states),
-            observe_selected().SelectManyInSeries(t => t.template?.observe_is_dirty() ?? t.definition?.subscribe_is_definition_or_any_templates_dirty() ?? Observable.Return(false)).RefCount().OnDispatcher()
+            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();
@@ -85,77 +91,64 @@ namespace mbts.spark {
            ObservableAutoWrapper.connect_item_hooks(definitions, d => new CompositeDisposable(_any_dirty_monitor.join(d), d), true));
         // local methods
         string get_revert_tooltip() {
-            if (content_source is AlgoDefinitionTemplateVM tmp) {
-               switch (tmp.key.mode) {
-                  case AlgoKey.Mode.Persisted: return tmp.is_dirty ? $"Revert changes to '{tmp.name}'" : "No changes to revert";
-               }
-            } else if (content_source is AlgoDefinitionVM def) {
-               switch (def.key.mode) {
-                  case AlgoKey.Mode.Persisted: return def.is_dirty || def.templates.Any(t => t.is_dirty) ? $"Revert changes to '{def.name}' templates" : "No changes to revert";
-               }
-            }
-            return null;
+            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") :
+               null;
         }
         async Task save_async(IAlgoStudioContentVM content) {
-            if (content is AlgoDefinitionTemplateVM tmp) {
-               await save_template(tmp);
-            } else if (content is AlgoDefinitionVM def) {
+            if (content is AlgoDefinitionVM def)
               await save_definition(def);
-            }
         }
         string get_save_tooltip() {
-            if (content_source is AlgoDefinitionTemplateVM tmp) {
-               switch (tmp.key.mode) {
-                  case AlgoKey.Mode.Unpersisted: return tmp.is_dirty ? $"Save '{tmp.name}'" : $"Cannot Save '{tmp.name}'";
-                  case AlgoKey.Mode.Persisted: return tmp.is_dirty ? $"Save changes to '{tmp.name}'" : "No changes to save";
-               }
-            } else if (content_source is AlgoDefinitionVM def) {
+            var def = selected_definition;
+            if (def != null) {
               switch (def.key.mode) {
-                  case AlgoKey.Mode.Unpersisted: return def.is_dirty || def.templates.Any(t => t.is_dirty) ? $"Save '{def.name}'" : $"Cannot Save '{def.name}'";
-                  case AlgoKey.Mode.Persisted: return def.is_dirty || def.templates.Any(t => t.is_dirty) ? $"Save changes to '{def.name}' templates" : "No changes to save";
+                  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";
               }
            }
            return null;
         }
+
+         void add_definition() =>
+            add_definition_common(AlgoDefinitionVM.new_algo_def, AlgoDefinitionVM.new_algo_name);
+
+         void clone_selected_definition() {
+            if (selected_definition == null || selected_definition.algo_root == null) {
+               add_definition();
+            } else {
+               add_definition_common(
+                  selected_definition.algo_root.definition,
+                  string.IsNullOrEmpty(selected_definition.name) ? AlgoDefinitionVM.new_algo_name : $"{selected_definition.name} - Copy");
+            }
+         }
+
+         void add_definition_common(CustomOrderDefinitionImmutable def, string name) {
+            var new_def = AlgoDefinitionVM.create_placeholder(_model, def, name, _studio_formats);
+            _definitions.Add(new_def);
+            selected_definition = new_def;
+            request_view_focus_name?.Invoke(new_def);
+         }
      }

-      event Action<(AlgoDefinitionVM definition, AlgoDefinitionTemplateVM template)> _selected_changed;
+      public event Action<AlgoDefinitionVM> request_view_focus_name;

      public ObservableCollection<AlgoDefinitionVM> definitions => _definitions;
      public ObservableCollection<string> content_visual_states { get; } = new ObservableCollection<string>();
      public AlgoDefinitionVM selected_definition { get => _selected_definition.Value; set => _selected_definition.set(value); }
-      public AlgoDefinitionTemplateVM selected_template { get => _selected_template.Value; set => _selected_template.set(value); }
-      public IAlgoStudioContentVM content_source => (IAlgoStudioContentVM)selected_template ?? selected_definition;
      public IAlgoVM editable_content => _editable_content.Value;
      public ICollectionView<AlgoDefinitionVM> definitions_view => _definitions_view;
+      public ICommand add_definition_cmd { get; }
+      public ICommand clone_selected_definition_cmd { get; }
      public ICommand save_cmd { get; }
      public ICommand revert_cmd { get; }
      public string save_cmd_tooltip => _save_cmd_tooltip.Value;
      public string revert_cmd_tooltip => _revert_cmd_tooltip.Value;

-      public void add_new_definition() =>
-         _add_new_definition(AlgoDefinitionVM.new_algo_def, AlgoDefinitionVM.new_algo_name);
-
-      public void add_new_definition_clone(AlgoDefinitionVM src_definition) {
-         if (src_definition == null || src_definition.algo_root == null) {
-            add_new_definition();
-         } else {
-            _add_new_definition(src_definition.algo_root.definition, string.IsNullOrEmpty(src_definition.name) ? AlgoDefinitionVM.new_algo_name : $"{src_definition.name} - Copy");
-         }
-      }
-
-      void _add_new_definition(CustomOrderDefinitionImmutable def, string name) =>
-         _definitions.Add(AlgoDefinitionVM.create_placeholder(_model, def, name, _studio_formats));
-
      public StartupData create() => new StartupData();
      public void load_from(StartupData state) { }
      public IObservable<AlgoDefinitionVM> subscribe_definition() => _selected_definition.observe_current(true);
-      public IObservable<AlgoDefinitionTemplateVM> subscribe_template() => _selected_template.observe_current(true);
-      public IObservable<(AlgoDefinitionVM definition, AlgoDefinitionTemplateVM template)> observe_selected() =>
-         Observable.Create<(AlgoDefinitionVM definition, AlgoDefinitionTemplateVM template)>(o => {
-            _selected_changed += o.OnNext;
-            return Disposable.Create(() => _selected_changed -= o.OnNext);
-         });
      public IObservable<bool> subscribe_dirty() => _any_dirty_monitor;

      public async Task remove_definition(AlgoDefinitionVM definition) {
@@ -163,87 +156,43 @@ namespace mbts.spark {
            await _model.algo_model.remove_definition(definition.key);
         } else {
            // This is a new definition, which hasn't been saved/persisted yet.  No need to call the server.
-            definition.templates.Clear();
            definitions.Remove(definition);
         }
      }

-      public async Task remove_template(AlgoDefinitionTemplateVM template) {
-         if (template.key.mode == AlgoKey.Mode.Persisted) {
-            await _model.algo_model.remove_template(template.key);
-         } else {
-            // This is a new template, which hasn't been saved/persisted yet.  No need to call the server.
-            template.owner.templates.Remove(template);
-         }
-      }
+      public Task save_definition(AlgoDefinitionVM definition) =>
+         _save(new[] { definition });

-      public async Task save_definition(AlgoDefinitionVM definition) {
-         using (_save_op()) {
-            var newly_persisted_keys = await AlgoPersistenceHelper.persist_definition(_model, _definitions, definition);
-            AlgoKey pkey;
-            switch (definition.key.mode) {
-               case AlgoKey.Mode.Unpersisted:
-                  if (!newly_persisted_keys.TryGetValue(definition.key, out pkey))
-                     return;
-                  break;
-               case AlgoKey.Mode.Persisted:
-                  pkey = definition.key;
-                  break;
-               default: return;
-            }
-            await _model.algo_model.metadata_service.update_metadata(pkey, _ => definition.create_metadata().with(id: pkey));
-         }
-      }
+      public Task save_all() =>
+         _save(definitions);

-      public async Task save_template(AlgoDefinitionTemplateVM template) {
-         using (_save_op())
-            await AlgoPersistenceHelper.persist_template(_model, _definitions, template);
-      }
-
-      public async Task save_all() =>
-         await _save(definitions.WrapSelector(def => (def, def.templates.AsList()), t => t.def));
-
-      async Task _save(IList<(AlgoDefinitionVM definition, IList<AlgoDefinitionTemplateVM> templates)> definition_templates) {
-         using (_save_op())
-            await AlgoPersistenceHelper.persist(_model, definition_templates);
-      }
-
-      IDisposable _save_op() {
-         int? def_index = selected_definition == null ? (int?)null : _definitions.IndexOf(selected_definition);
-         int? tmp_index = selected_template == null ? (int?)null : selected_definition.templates.IndexOf(selected_template);
-         return new CompositeDisposable(_definitions_update_buffer.buffer_updates()) {
-            () => {
-               if (def_index.HasValue) {
-                  var def = _definitions[def_index.Value];
-                  if (tmp_index.HasValue) {
-                     var tmp = def.templates[tmp_index.Value];
-                     tmp.is_selected = true;
-                  } else def.is_selected = true;
+      async Task _save(IEnumerable<AlgoDefinitionVM> definitions) {
+         var orig_selected = selected_definition;
+         var orig_selected_index = orig_selected == null ? -1 : this.definitions.IndexOf(orig_selected);
+         using (_definitions_update_buffer.buffer_updates()) {
+            var def_list = definitions as IList<AlgoDefinitionVM> ?? definitions.ToList();
+            await Task.WhenAll(definitions.Select(async d => {
+               var def = await _model.algo_model.save_definition(d.create_algo_def());
+               if (def.HasValue) {
+                  // don't forget to save metadata
+                  await _model.algo_model.metadata_service.update_metadata(def.Value.key, _ => d.create_metadata().with(def.Value.key));
               }
-            }
-         };
-      }
-
-      /// Despite the existence of these properties: <see cref="AlgoDefinitionVM.is_selected"/>, and <see cref="AlgoDefinitionTemplateVM.is_selected"/>,
-      /// <see cref="AlgoStudioVM"/> still implements <see cref="IHandleSelectedItemChanged"/> to update the properties that depend on the <see cref="System.Windows.Controls.TreeView.SelectedItem"/>.
-      /// [John]I am going to Uganda in 3 days (today is 1/3/2019), and decided against removing this legacy-dependency at the last minute.
-      /// Fwiw, <see cref="AlgoDefinitionVM.is_selected"/> and <see cref="AlgoDefinitionTemplateVM.is_selected"/> are bound to <see cref="System.Windows.Controls.TreeViewItem.IsSelected"/>.
-      /// They serve to prevent a quirky default behavior in TreeView: double clicking any TreeViewItem collapses the entire TreeView.
-      /// This behavior wasn't just quirky either, it actually conflicted with the double-click-to-set-template-as-default behavior.
-      /// (for details, <see cref="mbts.ui.spark.AlgoStudioView.EnableToggleDefaultOnDoubleClickProperty"/>)
-      void IHandleSelectedItemChanged.on_selected_item_changed(object old_value, object new_value) {
-         if (new_value is AlgoDefinitionVM def) {
-            selected_definition = def;
-            selected_template = null;
-         } else if (new_value is AlgoDefinitionTemplateVM templ) {
-            selected_definition = templ.owner;
-            selected_template = templ;
-         } else {
-            selected_definition = null;
-            selected_template = null;
+               return def;
+            })).ContinueOnDispatcher(t => {
+               if (t.Status != TaskStatus.RanToCompletion) {
+                  Log.Ui.debug_fatal($"Algo Studio error saving definitions: unexpected Task.Status '{t.Status}'.");
+                  return;
+               }
+               var persisted_data = t.Result;
+               Log.assert(persisted_data.Length == def_list.Count);
+               for (int i = 0; i < persisted_data.Length; i++) {
+                  if (!def_list[i].key.is_persisted && persisted_data[i].HasValue)
+                     _definitions.Replace(def_list[i].key, def_list[i].to_persisted(persisted_data[i].Value));
+               }
+               if (selected_definition != orig_selected && orig_selected_index >= 0 && orig_selected_index < this.definitions.Count)
+                  selected_definition = this.definitions[orig_selected_index];
+            });
         }
-         _selected_changed?.Invoke((selected_definition, selected_template));
-         RaisePropertyChanged(nameof(content_source));
      }
   }
 }
@@ -109,7 +109,6 @@ namespace mbts.spark {
      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);
-      public Task<CustomOrderDefinitionImmutable?> load_from_async(CustomOrderDefinitionImmutable definition) => _algo_root is IAlgoVM vm ? vm.load_from_async(definition) : Task.FromResult<CustomOrderDefinitionImmutable?>(null);
      void IAlgoVM.ensure_init() => _value?.algo_root?.ensure_init();

      IDisposable _set_hooks(AlgoDefinitionVM vm) {
@@ -513,6 +513,9 @@
                      LegTuples="{Binding leg_tuples}"
                      RemoveLegCommand="{Binding remove_leg}"
                      ContractPickerModel="{Binding contract_picker_model}"
+                      IsEnabled="{Binding IsReadOnly, RelativeSource={RelativeSource AncestorType=usp:AlgoEditorGridView}, Converter={StaticResource NotConverter}}"
+                      HedgePricing="{Binding hedge_pricing}"
+                      HedgePricingItemsSource="{Binding hedge_pricing_options}"
                    />
                  </AdornerDecorator>
                </DataTemplate>
@@ -22,7 +22,6 @@ using System.Collections.Specialized;
 using System.Linq;
 using System.Reactive.Disposables;
 using System.Reactive.Linq;
-using System.Reactive.Subjects;
 using System.Windows.Data;
 using System.Windows.Media;
 using static bts.api.orderman.Fill.Types;
@@ -129,8 +128,7 @@ namespace mbts.spark {
               };
               _rows_manager.on_settings(fs, s.sorting_criterion);
            }),
-            settings_manager == null ? Disposable.empty : settings_manager.subscribe_current().OnDispatcher().Subscribe(grid_settings_manager),
-            (fills_source as IConnectableObservable<TableUpdate<FillTuple, string>>)?.Connect() ?? Disposable.empty
+            settings_manager == null ? Disposable.empty : settings_manager.subscribe_current().OnDispatcher().Subscribe(grid_settings_manager)
         );
         // local methods
         void add_col<TFilter>(Columns col_key, string header, Func<Row, string> get_text, IDataGridColumnPersistentFilter<FillTuple, TFilter> filter, string filter_template, double width) =>
@@ -181,7 +179,7 @@ namespace mbts.spark {
         } else return model.on_fill_tuples;
      }

-      static IConnectableObservable<TableUpdate<FillTuple, string>> _get_observable(IBus bus, OrdersModel model, IObservable<FillsSettings> state) =>
+      static IObservable<TableUpdate<FillTuple, string>> _get_observable(IBus bus, OrdersModel model, IObservable<FillsSettings> state) =>
         state.SelectManyInSeries(s => _get_observable(bus, model, s));

      static IComparer<FillTuple> _get_column_comparer(Columns col) {
@@ -6,6 +6,7 @@ using bts.spark;
 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;
@@ -67,12 +68,11 @@ namespace mbts.spark {
                  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.columns.Select( c => c.create())),
-                     this.observe_title()
+                     s.with(_vm.columns.Select(c => c.create()))
                  )
               );
-               // TODO: bind to main window's Title
-               var dialog = new ShellSettingsDialog { Title = $"{window_type_name} Grid Settings", DataContext = vm };
+               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;
            }))
@@ -9,6 +9,7 @@ using bts.proto;
 using mbts.ui.spark;
 using System.Collections.Generic;
 using System.ComponentModel;
+using mbts.ui.settings;

 namespace mbts.spark {
   // IMPORTANT: BE SURE TO ADD ANY NEW PROPERTIES TO THE EQUALS FUNCTION!
@@ -195,7 +196,7 @@ namespace mbts.spark {
      public readonly int column_count;

      public LadderFavoriteAlgosSettings(AlgoKey[] favorite_algos, int column_count)
-         : this(ArrayHelper.safe_convert(favorite_algos, k => k.persisted), column_count) { }
+         : this(ArrayHelper.safe_convert(favorite_algos, k => new bts.persist.algo.AlgoPersistedKey(k.persisted)), column_count) { }

      LadderFavoriteAlgosSettings(bts.persist.algo.AlgoPersistedKey[] favorite_algos, int column_count) {
         _favorite_algos = favorite_algos;
@@ -220,6 +221,23 @@ namespace mbts.spark {
      public static bool operator !=(LadderFavoriteAlgosSettings a, LadderFavoriteAlgosSettings b) => !a.Equals(b);
   }

+   [ProtoContract]
+   readonly struct LadderMiniOrderBookSettings : IEquatable<LadderMiniOrderBookSettings> {
+      // this is the only member now, but more may be added later (that is why a GridSettings member wasn't added directly to LadderSettings).
+      [ProtoMember(1)]
+      public readonly GridSettings value;
+
+      public LadderMiniOrderBookSettings(GridSettings value) =>
+         this.value = value;
+
+      public bool Equals(LadderMiniOrderBookSettings other) => value == null ? other.value == null : value.Equals(other.value);
+      public override bool Equals(object obj) => obj is LadderMiniOrderBookSettings other && Equals(other);
+      public override int GetHashCode() => value.GetHashCode();
+
+      public static bool operator ==(LadderMiniOrderBookSettings a, LadderMiniOrderBookSettings b) => a.Equals(b);
+      public static bool operator !=(LadderMiniOrderBookSettings a, LadderMiniOrderBookSettings b) => !a.Equals(b);
+   }
+
   // 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.
@@ -228,6 +246,7 @@ namespace mbts.spark {
   class LadderSettings : IEquatable<LadderSettings> {
      const double _default_order_entry_panel_width = 110.0;
      const double _default_zoom_factor = 1.0;
+      const bool _default_show_warn_on_cross = true;

      // Default proto constructor
      // Added this so that when clients upgrade to a version with new settings,
@@ -255,6 +274,7 @@ namespace mbts.spark {
         zoom_factor = _default_zoom_factor;
         use_defaults = true;
         favorite_algos = new LadderFavoriteAlgosSettings(null, 2);
+         show_warn_on_cross = _default_show_warn_on_cross;
      }

      public static LadderSettings Default {
@@ -319,6 +339,7 @@ namespace mbts.spark {
               zoom_slider_visible = false,
               zoom_factor = _default_zoom_factor,
               net_change = NetChangeTerms.None,
+               mini_ob = new LadderMiniOrderBookSettings(bts.shell.orderbook.OrderBookStartupData.default_mini_grid.general),
            };
            rv.row_height = LadderRender.measure_row_height(rv);
            return rv;
@@ -460,6 +481,47 @@ namespace mbts.spark {
         get => _piq_column ?? (_piq_column = LadderSettings.Default.piq_column);
         set => _piq_column = value;
      }
+      [ProtoMember(54), DefaultValue(_default_show_warn_on_cross)]
+      public bool show_warn_on_cross { get; set; }
+
+      [ProtoMember(55)]
+      public LadderMiniOrderBookSettings mini_ob { get; set; }
+
+      public void sanitize() =>
+         sanitize(this);
+
+      // if there are new props, make sure they are not null, invalid, etc.
+      public static LadderSettings sanitize(LadderSettings s) {
+         if (s == null)
+            return null;
+         // these MarketBreakLines are new settings props, ensure they are not null
+         if (s.bid_break_line == null)
+            s.bid_break_line = Default.bid_break_line;
+         if (s.ask_break_line == null)
+            s.ask_break_line = Default.ask_break_line;
+         if (s.mid_break_line == null)
+            s.mid_break_line = Default.mid_break_line;
+         if (s.session_low_line == null)
+            s.session_low_line = Default.session_low_line;
+         if (s.session_high_line == null)
+            s.session_high_line = Default.session_high_line;
+         if (s.session_range_fill == null)
+            s.session_range_fill = Default.session_range_fill;
+         if (s.volume_column == null)
+            s.volume_column = Default.volume_column;
+         if (s.size_display == null)
+            s.size_display = MarketSizeDisplay.get_default();
+         if (s.size_display.normal == null)
+            s.size_display = s.size_display.with(MarketSizeDisplay.get_default().normal);
+         if (s.mini_ob.value == null)
+            s.mini_ob = new LadderMiniOrderBookSettings(bts.shell.orderbook.OrderBookStartupData.default_mini_grid.general);
+#pragma warning disable CS0612 // Type or member is obsolete
+         if (s.mini_ob.value.sorting_criterion.Count == 0)
+            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);
+         return s;
+      }

      public bool Equals(LadderSettings other) =>
         other != null &&
@@ -511,7 +573,9 @@ namespace mbts.spark {
         zoom_factor == other.zoom_factor &&
         use_defaults == other.use_defaults &&
         favorite_algos == other.favorite_algos &&
-         net_change == other.net_change;
+         net_change == other.net_change &&
+         show_warn_on_cross == other.show_warn_on_cross &&
+         mini_ob == other.mini_ob;

      public override bool Equals(object obj) => Equals(obj as LadderSettings);

@@ -562,7 +626,8 @@ namespace mbts.spark {
            zoom_factor.GetHashCode(),
            use_defaults.GetHashCode(),
            favorite_algos.GetHashCode(),
-            net_change.GetHashCode());
+            net_change.GetHashCode(),
+            show_warn_on_cross.GetHashCode());

      public struct WindowSpecifics {
         public readonly double order_entry_panel_width, zoom_factor;
@@ -1,11 +1,11 @@
-using bts.api;
+using bts.api;
 using bts.md;
 using mbts;
 using mbts.config;
 using mbts.persist;
 using mbts.spark;
-using mbts.spark.utilities;
 using mbts.ui;
+using mbts.ui.shell;
 using mbts.ui.spark;
 using ProtoBuf;
 using System;
@@ -67,8 +67,7 @@ namespace bts.shell {
               // profile was deleted
               id = 0;
            } else {
-               var curr_profile = _fit_to_sec(result.value, vm.security.ContractCase);
-               if (!s.Equals(curr_profile)) {
+               if (!s.Equals(result.value)) {
                  // ladder's settings diverged from the profile (this happens when the user changes settings outside of the settings dialog, such as column widths, left panel width, etc.)
                  id = 0;
               }
@@ -78,27 +77,47 @@ namespace bts.shell {
      }

      int _ladder_count = 0;
-      IShellWindow create_ladder_window(SecurityMD md, LadderSettings state_settings, uint settings_id = 0) {
+      IShellWindow create_ladder_window(SecurityMD md, LadderSettings last_value, uint settings_id = 0) {
         IDisposable active_settings_dialog = null;
         var thread_id = Interlocked.Increment(ref _ladder_count) % Environment.ProcessorCount;
+         // on_shell_window_vm should behave like an event (do not set to null)
+         Action<ShellWindowVM> on_shell_window_vm = _ => { };
+         ShellWindowVM shell_window_vm = null;
+         IShellWindow shell_window = null;
+         var title_source = new LazyObservable<string>(() => ShellWindowExtensions.literal_title_source(shell_window, shell_window_vm));
         var view = new Lazy<UIElement>(() => {
            // resources
            var model = new LadderModel(md, _orders_model, _mbo);
            var profile_service = new SettingsProfileService<LadderSettings>(_settings_hub,
               us => ImmutableDictionary<uint, SettingsProfile<LadderSettings>>.Empty.AddRange(us.ladder_profiles.ToDictionary(
                  lp => lp.id,
-                  lp => new SettingsProfile<LadderSettings>(lp.id, lp.name, sanitize_ladder_settings(lp.value), lp.security_criteria))),
+                  lp => new SettingsProfile<LadderSettings>(lp.id, lp.name, LadderSettings.sanitize(lp.value), lp.security_criteria))),
               (us, lps) => us.with(ladder_profiles: lps.Values.Select(lp => new LadderSettingsProfile(lp.id, lp.name, lp.value, lp.security_criteria)).ToArray()));
-            LadderSettings last_value = fit_to_sec(state_settings);
-            var settings_subject = new BehaviorSubject<LadderSettings>(last_value);
+            last_value?.sanitize();
+            /// When settings are adjusted outside of the settings dialog, the vm should raise the <see cref="LadderVM.settings_invalidated"/> event.
+            /// In response to that event, 'needs_resync' is set to true. This causes 'last_value' to be refreshed when the next caller requests the latest settings
+            /// (i.e., an IObserver subscribing to the settings_source, or the settings-dialog viewmodel).
+            bool initialized = false, needs_resync = false;
+            LadderVM vm = null;
+            var settings_subject = new Subject<LadderSettings>();
+            var settings_source = Observable.Create<LadderSettings>(o => {
+               ensure_synced();
+               if (last_value != null)
+                  o.OnNext(last_value);
+               return settings_subject.Subscribe(s => {
+                  if (s != null)
+                     o.OnNext(s);
+               });
+            });
            // vm
-            var vm = LadderVM.create(_bus, model, last_value ?? _settings_hub.current.ladder, settings_subject.Where(s => s != null));
+            vm = LadderVM.create(_bus, model, LadderSettings.sanitize(last_value ?? _settings_hub.current.ladder), settings_source);
+            vm.settings_invalidated += on_settings_invalidated;
            vm.order_properties_vm.open_algo_popup_on_select = _ladder_conf.open_algo_popup_on_select;
            vm.order_properties_vm.use_algo_param_grid = _ladder_conf.use_algo_param_grid;
            vm.request_settings_dialog += open_settings_dialog;
-            bool initialized = false;
            var settings_subscription = _settings_hub.subscribe_default_settings().Subscribe(on_user_settings);
            vm.OnDisposed += disposing => {
+               Disposable.dispose(ref settings_subscription);
               Disposable.dispose(ref active_settings_dialog);
               Disposable.dispose(ref settings_subject);
            };
@@ -108,11 +127,25 @@ namespace bts.shell {
               lv.Resources[kv.Key] = kv.Value;
            return lv;
            // local methods
-            LadderSettings fit_to_sec(LadderSettings s) =>
-               _fit_to_sec(s, md.security.ContractCase);
+            void on_settings_invalidated() =>
+               needs_resync = true;
+
+            void ensure_synced() {
+               if (!needs_resync)
+                  return;
+               var curr = vm.get_save_state();
+               if (settings_id == 0) {
+                  last_value = curr;
+               } else if (!curr.Equals(last_value)) {
+                  settings_id = 0;
+                  last_value = curr;
+               }
+               needs_resync = false;
+            }

            void on_user_settings(UserSettings us) {
               if (initialized) {
+                  ensure_synced();
                  if (settings_id == 0) {
                     // not on a profile, don't respond to default settings changes
                     return;
@@ -120,7 +153,7 @@ namespace bts.shell {
                     if (!last_value.Equals(vm.get_save_state())) {
                        settings_id = 0;
                     } else {
-                        settings_subject.OnNext(last_value = fit_to_sec(profile.value));
+                        settings_subject.OnNext(last_value = profile.value);
                     }
                  } else {
                     // profile was deleted; keep the current settings and switch to the 'Local' profile.
@@ -130,7 +163,7 @@ namespace bts.shell {
                  initialized = true;
                  if (settings_id != 0) {
                     if (us.ladder_profiles.TryGetFirst(p => p.id == settings_id, out var profile)) {
-                        last_value = fit_to_sec(profile.value);
+                        last_value = profile.value;
                     } else {
                        settings_id = 0;
                     }
@@ -140,13 +173,13 @@ namespace bts.shell {
                        // TODO: Use a kind of 'match priority' to resolve conflicts when the security is included in more than 1 profile's security criteria.
                        // In the meantime, simply use the first match.
                        if (lp.security_criteria.includes(md.security)) {
-                           last_value = fit_to_sec(lp.value);
+                           last_value = lp.value;
                           settings_id = lp.id;
                           break;
                        }
                     }
                     if (last_value == null)
-                        last_value = fit_to_sec(_settings_hub.current.ladder);
+                        last_value = _settings_hub.current.ladder;
                  }
                  settings_subject.OnNext(last_value);
               }
@@ -162,16 +195,14 @@ namespace bts.shell {
                     svm.load(s);
                     return svm;
                  },
-                  fit_to_sec,
+                  _ => _,
                  vm.get_save_state(),
                  UserSettings.FileExtensions.LADDER,
                  settings_id);
               dialog_vm.applied += apply;
               // dialog
-               var dialog = new ShellSettingsDialog {
-                  DataContext = dialog_vm,
-                  Title = $"Ladder Settings - '{vm.security}'"
-               };
+               var dialog = new ShellSettingsDialog { DataContext = dialog_vm };
+               dialog_vm.SubscribeDisposed(title_source.OnDispatcher().Subscribe(t => dialog_vm.title = t));
               dialog.Resources[ShellSettingsDialog.SecurityMapKey] = _securities;
               dialog_vm.RequestClose += on_request_close;
               dialog.Closed += on_closed;
@@ -221,35 +252,15 @@ namespace bts.shell {
            }
         });
         string thread = _ladder_conf.ladders_on_threads ? $"Ladder{thread_id:00}" : "";
-         return ShellWindow.create(
+         return shell_window = ShellWindow.create(
            module, md.security.ToString(), _window_type, view,
-            (v,s) => save(_get_state(((LadderView)v).vm, settings_id), s), 
-            icon: Icons.Ladder, 
-            thread_id: thread);
-         // if there are new props, make sure they are not null, invalid, etc.
-         LadderSettings sanitize_ladder_settings(LadderSettings s) {
-            // these MarketBreakLines are new settings props, ensure they are not null
-            if (s.bid_break_line == null)
-               s.bid_break_line = LadderSettings.Default.bid_break_line;
-            if (s.ask_break_line == null)
-               s.ask_break_line = LadderSettings.Default.ask_break_line;
-            if (s.mid_break_line == null)
-               s.mid_break_line = LadderSettings.Default.mid_break_line;
-            if (s.session_low_line == null)
-               s.session_low_line = LadderSettings.Default.session_low_line;
-            if (s.session_high_line == null)
-               s.session_high_line = LadderSettings.Default.session_high_line;
-            if (s.session_range_fill == null)
-               s.session_range_fill = LadderSettings.Default.session_range_fill;
-            if (s.volume_column == null)
-               s.volume_column = LadderSettings.Default.volume_column;
-            if (s.size_display == null)
-               s.size_display = MarketSizeDisplay.get_default();
-            if (s.size_display.normal == null)
-               s.size_display = s.size_display.with(MarketSizeDisplay.get_default().normal);
-            s.row_height = LadderRender.measure_row_height(s);
-            return s;
-         }
+            (v, s) => save(_get_state(((LadderView)v).vm, settings_id), s),
+            icon: Icons.Ladder,
+            thread_id: thread,
+            vm => {
+               shell_window_vm = vm;
+               title_source.connect();
+            });
      }

      void show_windows(IReadOnlyCollection<SecurityMD> securities) {
@@ -266,20 +277,6 @@ namespace bts.shell {
         }
      }

-      LadderSettings _fit_to_sec(LadderSettings s, Security.ContractOneofCase sec_type) {
-         if (s == null) return null;
-         var algo_key = AlgoID.to_algo_key(s.default_algo, _orders_model.dynamic_helper.dynamic_type_index);
-         if (algo_key.mode == AlgoKey.Mode.Factory) {
-            var fitted_algo = OrderDataHelper.fit_to_type(algo_key.factory.structure.build_algo(_orders_model.dynamic_helper), sec_type, true);
-            if (fitted_algo.HasValue) {
-               // be sure to clone ('s' may be shared)
-               s = SparkUtils.clone_proto(s);
-               s.default_algo = AlgoID.from_custom_def(fitted_algo.Value);
-            }
-         }
-         return s;
-      }
-
      readonly struct LadderConfig {
         public readonly uint max_open_ladders;
         public readonly bool ladders_on_threads, open_algo_popup_on_select, use_algo_param_grid;
@@ -304,4 +301,4 @@ namespace bts.shell {
      [ProtoMember(3)]
      public uint settings_id;
   }
-}
+}
@@ -1,6 +1,7 @@
 using bts.api;
 using bts.api.orderman;
-using mbts.spark.utilities;
+using bts.shell.orderbook;
+using mbts.persist;
 using mbts.ui;
 using mbts.ui.shell;
 using System;
@@ -34,7 +35,7 @@ namespace mbts.spark {
      readonly IBus _bus;
      readonly Property<FontFamily> _font_family;
      readonly Property<FontWeight> _font_weight;
-      readonly Property<double> _font_size;
+      readonly Property<double> _font_size, _grid_row_height;
      readonly Property<Brush> _foreground, _background, _hoverbackground, _border;
      readonly Property<bool> _has_multiple_orders_at_same_level, _is_hedge_order;
      readonly Property<CustomOrderDefinition.CustomOneofCase> _algo_type;
@@ -63,6 +64,7 @@ namespace mbts.spark {
         _font_weight = backing(nameof(font_weight), owner.settings, get_font_weight, get_font_weight(fs));
         _font_size = backing(nameof(font_size), owner.settings, get_font_size, get_font_size(fs));
         _foreground = backing(nameof(foreground), owner.settings, get_foreground, get_foreground(fs));
+         _grid_row_height = backing(nameof(grid_row_height), owner.settings, get_row_height, get_row_height(fs));
         _background = backing(nameof(background), _color_bg_brush);
         _hoverbackground = backing(nameof(hoverbackground), _color_bg_brush);
         _border = backing(nameof(border), _color_bg_brush);
@@ -74,6 +76,7 @@ namespace mbts.spark {
         FontWeight get_font_weight(LadderSettings s) => ui.utility.text.TextUtils.from_open_type_weight_safe(s.orders_column.font_weight);
         double get_font_size(LadderSettings s) => s.orders_column.font_size;
         Brush get_foreground(LadderSettings s) => s.orders_column.foreground.rgb_brush();
+         double get_row_height(LadderSettings s) => s.row_height;
         //
         add_order(op);

@@ -245,6 +248,7 @@ namespace mbts.spark {
      public FontFamily font_family => _font_family.Value;
      public FontWeight font_weight => _font_weight.Value;
      public double font_size => _font_size.Value;
+      public double grid_row_height => _grid_row_height.Value;
      public Brush foreground => _foreground.Value;
      public Brush background { get => _background.Value; private set => _background.Value = value; }
      public Brush hoverbackground { get => _hoverbackground.Value; private set => _hoverbackground.Value = value; }
@@ -293,7 +297,6 @@ namespace mbts.spark {
         price_filter.minimum.value = real_price;
         price_filter.maximum.value = real_price;

-         var obvm = new OrderBookVM(null, _owner.bus, null, _owner.model.order_gateway, null, true);
         var state = new bts.shell.orderbook.OrderBookStartupData(
            new bts.shell.orderbook.FilterStates {
               security_criteria = new SecurityCriteria(_owner.security),
@@ -301,44 +304,22 @@ namespace mbts.spark {
               statuses = new[] { OrderStatus.Working },
               order_types = AlgoID.exchange_algo_keys
            },
-            bts.shell.orderbook.OrderBookStartupData.default_mini_grid,
+            bts.shell.orderbook.OrderBookStartupData.default_mini_grid.with(_owner.current_settings.mini_ob.value),
            use_defaults: false
         );
-         // NOTE:
-         // we might need the ObservableAppend to InsertAt
-         // if these EditXXX ever support settings.
-
-         // The end result after this group of lines will be
-         //  ----------------------------------------------
-         //  | Cancel | Update | Qty | Price | Commit | Attach | Detach | ...
-         //  ----------------------------------------------
-         //
+         var settings_man = new WindowSettingsManager<OrderBookGridSettings>.DisconnectedImpl(state.orderbook_grid);
+         var obvm = new OrderBookVM(_owner.bus, null, _owner.model.order_gateway, settings_man, true);
+         _owner.settings.Subscribe(s => settings_man.instance_settings = settings_man.instance_settings.with(s.mini_ob.value));
         obvm.columns.Insert(0, new OrderBookVM.AttachDetachColumn(typeof(MiniOrderBookView)));
         obvm.columns.Insert(0, new OrderBookVM.CommitColumn());
-         var price_col = obvm.columns.FirstOrDefault(x => x.id == OrderBookGridView.ColumnKeys.Price.ToString());
-         var price_index = obvm.columns.indexOf(price_col);
-         if (price_index > -1) {
-            var existing_editprice_col = obvm.columns.FirstOrDefault(x => x.id == OrderBookGridView.ColumnKeys.EditablePrice.ToString());
-            var existing_editprice_index = obvm.columns.indexOf(existing_editprice_col);
-            if (existing_editprice_index == -1) {
-               // insert the edit price column at the beginning
-               obvm.columns.Insert(0, new OrderBookVM.EditablePriceColumn());
-            }
-         }
-         var qty_col = obvm.columns.FirstOrDefault(x => x.id == OrderBookGridView.ColumnKeys.Size.ToString());
-         var qty_index = obvm.columns.indexOf(qty_col);
-         if (qty_index > -1) {
-            var existing_editqty_col = obvm.columns.FirstOrDefault(x => x.id == OrderBookGridView.ColumnKeys.EditableQty.ToString());
-            var existing_editqty_index = obvm.columns.indexOf(existing_editqty_col);
-            if (existing_editqty_index == -1) {
-               // insert the edit quantity column at the beginning
-               obvm.columns.Insert(0, new OrderBookVM.EditableQtyColumn());
-            }
-         }
+         obvm.columns.Insert(0, new OrderBookVM.EditablePriceColumn());
+         obvm.columns.Insert(0, new OrderBookVM.EditableQtyColumn());
         obvm.columns.Insert(0, new OrderBookVM.UpdateColumn(typeof(MiniOrderBookView)));
         obvm.columns.Insert(0, new OrderBookVM.CancelColumn(nameof(OrderBookRowVM.cancel_command)));
-         obvm.columns.Insert(0, new OrderBookVM.CheckColumn(nameof(OrderBookRowVM.is_selected)));
-
+         // the CheckColumn must be inserted at the front of the ObservableAppendCollection,
+         // and not mixed with the other columns in said ObservableAppendCollection's underlying ObservableCollection (the settings dialog uses the underlying collection).
+         // The user cannot adjust this column in the settings dialog, and it should always be the left-most column.
+         obvm.columns.insert_front(new OrderBookVM.CheckColumn(nameof(OrderBookRowVM.is_selected)));
         obvm.load_from(state);
         return obvm;
      }
@@ -2,6 +2,7 @@
 using bts.api;
 using bts.api.orderman;
 using bts.collections;
+using bts.shell.orderbook;
 using bts.utils;
 using mbts.collections;
 using mbts.ui;
@@ -40,7 +41,7 @@ namespace mbts.spark {
      TimeInForce _default_time_in_force;
      LadderSettings.NetChangeTerms _price_format;
      double _order_entry_panel_width, _zoom_factor;
-      bool _auto_clear;
+      bool _auto_clear, _show_warn_on_cross;
      LadderSettings _current;
      LadderColumnSettingsVM
         _orders = new OrdersColumnSettingsVM(),
@@ -102,6 +103,7 @@ namespace mbts.spark {
         };
         // update
         _update = new DeferrableActionWrapper(() => result_changed?.Invoke());
+         mini_ob.result_changed += _update.execute;
         foreach (var c in _observable_components)
            c.PropertyChanged += on_prop_changed;
         favorite_algos_vm.items.CollectionChanged += on_favorite_algo_items_CollectionChanged;
@@ -126,13 +128,15 @@ namespace mbts.spark {
            return Disposable.Create(() => item.PropertyChanged -= on_prop_changed);
         }
         void dispose_resources() {
+            mini_ob.result_changed -= _update.execute;
+            mini_ob.Dispose();
            favorite_algos_vm.items.CollectionChanged -= on_favorite_algo_items_CollectionChanged;
            favorite_algos_vm.Dispose();
            foreach (var c in _observable_components)
               c.PropertyChanged -= on_prop_changed;
         }
         AccountTuple? account_factory(KeyValuePair<uint, string> kv) => new AccountTuple(kv.Key, kv.Value);
-         AlgoDefinitionVM algo_factory(AlgoData data) => AlgoDefinitionVM.create(_model, data, false);
+         AlgoDefinitionVM algo_factory(AlgoData data) => AlgoDefinitionVM.create(_model, data);
      }

      public event Action result_changed;
@@ -157,6 +161,7 @@ namespace mbts.spark {
      }

      public MarketSizeDisplayVM size_display { get; } = new MarketSizeDisplayVM();
+      public SimpleGridSettingsVM mini_ob { get; } = new SimpleGridSettingsVM(OrderBookGridSettingsManager.hard_column_flags);
      // price format
      public LadderSettings.NetChangeTerms price_format { get => _price_format; set => Set(ref _price_format, value); }
      public IEnumerable<LadderSettings.NetChangeTerms> price_format_options => EnumHelper.get_values<LadderSettings.NetChangeTerms>();
@@ -173,6 +178,9 @@ namespace mbts.spark {
      public bool auto_clear { get => _auto_clear; set => Set(ref _auto_clear, value); }
      public double order_entry_panel_width { get => _order_entry_panel_width; set => Set(ref _order_entry_panel_width, value); }
      public double zoom_factor { get => _zoom_factor; set => Set(ref _zoom_factor, value); }
+      // safety checks
+      public bool show_warn_on_cross { get => _show_warn_on_cross; set => Set(ref _show_warn_on_cross, value); }
+
      // favorites
      public FavoriteAlgosVM favorite_algos_vm { get; }

@@ -293,6 +301,7 @@ namespace mbts.spark {
            favorite_algos_vm.load_from(settings.favorite_algos);
            size_display.load_from(settings.size_display);
            size_presets.SetItems(settings.calculator_buttons.empty_if_null().Select(s => _create_size_preset_vm((uint)s)));
+            mini_ob.load_from(settings.mini_ob.value);
            // columns
            _orders.assign_from(_current.orders_column);
            _bid.assign_from(_current.bid_column);
@@ -340,11 +349,25 @@ namespace mbts.spark {
            _cancel_sells_visibility.show = settings.cancel_sells_visible;
            _cancel_all_visibility.show = settings.cancel_all_visible;
            price_format = settings.net_change;
+            // safety checks
+            show_warn_on_cross = settings.show_warn_on_cross;
         }
      }

      public LadderSettings get_result() {
-         var clone = SparkUtils.clone_proto(_current);
+         LadderSettings clone;
+         if (_current == null) {
+            clone = new LadderSettings {
+               mini_ob = new LadderMiniOrderBookSettings(mini_ob.create())
+            };
+         } else {
+            clone = SparkUtils.clone_proto(_current);
+#pragma warning disable CS0612 // Type or member is obsolete
+            clone.mini_ob = new LadderMiniOrderBookSettings(_current.mini_ob.value != null ? 
+               mini_ob.create().with(sorting_criterion: _current.mini_ob.value.sorting_criterion) :
+               mini_ob.create());
+#pragma warning restore CS0612 // Type or member is obsolete
+         }
         clone.badge_style = badge_style;
         clone.alternate_order_size = alternate_order_size;
         clone.favorite_algos = favorite_algos_vm.create();
@@ -373,7 +396,7 @@ namespace mbts.spark {
            clone.default_account = default_account.Value.id;
         // - algo
         clone.default_algo = default_algo != null ?
-            AlgoID.from_algo_key(default_algo.key, _model.dynamic_helper.dynamic_type_index) :
+            AlgoID.from_algo_key(default_algo.key) :
            (_desired_algo ?? LadderSettings.Default.default_algo);
         // - components
         clone.auto_clear = auto_clear;
@@ -399,6 +422,8 @@ namespace mbts.spark {
         clone.cancel_all_visible = _cancel_all_visibility.show;
         clone.zoom_slider_visible = _zoom_slider_visbility.show;
         clone.net_change = price_format;
+         // safety checks
+         clone.show_warn_on_cross = show_warn_on_cross;
         return clone;
      }

@@ -428,7 +453,7 @@ namespace mbts.spark {
      }

      void _try_select_desired_algo(bool bypass_setter = false) {
-         if (_desired_algo.HasValue && (!_default_algo.setter_called || bypass_setter) && _algo_definitions.TryGetValue(AlgoID.to_algo_key(_desired_algo.Value, _model.dynamic_helper.dynamic_type_index), out var vm)) {
+         if (_desired_algo.HasValue && (!_default_algo.setter_called || bypass_setter) && _algo_definitions.TryGetValue(AlgoID.to_algo_key(_desired_algo.Value), out var vm)) {
            _desired_algo = null;
            _default_algo.bypass_setter(vm);
         }
@@ -459,7 +484,7 @@ namespace mbts.spark {
            _foreground = backing(nameof(foreground), Colors.Black);
            _background = backing(nameof(background), Colors.White);
            _font_display_name = backing(nameof(font_display_name),
-               () => TextUtils.display_name(font_family, font_weight, font_size), nameof(font_family), nameof(font_weight), nameof(font_size));
+               () => TextUtils.display_name(font_family, font_weight, font_size), new[] { nameof(font_family), nameof(font_weight), nameof(font_size) });
            _font_size.Changed += (oldval, newval) => font_size_changed?.Invoke(oldval, newval);
            toggle_show_details_cmd = new DelegateCommand(() => {
               show_details = !show_details;
@@ -39,7 +39,6 @@ namespace mbts.spark {
      IEqualityComparer<double> _equality;
      Dictionary<double, LadderOrderVM> _slot_price_vs_orders;
      IReadOnlyDictionary<uint, OrderSecurity> _cache = DictionaryHelper.empty<uint, OrderSecurity>();
-      LadderSettings _current_settings;

      public static LadderVM create(IBus bus, LadderModel model, LadderSettings init, IObservable<LadderSettings> settings) =>
         new LadderVM(bus, model, init, settings, new OrderPropertiesEditorVM(model.order_gateway, Observable.Return(model.security_md), settings.Select(s => new InlineOrderProperties(model.order_gateway, s))));
@@ -53,7 +52,7 @@ namespace mbts.spark {
      LadderVM(IBus bus, LadderModel model, LadderSettings init, IObservable<LadderSettings> settings, OrderPropertiesEditorVM order_properties_vm = null) {
         _bus = bus;
         _model = model;
-         _current_settings = init;
+         current_settings = init;
         this.settings = settings;
         _equality = TickUtils.tick_equality_comparer(_model.security.ContractSpec);
         _slot_price_vs_orders = new Dictionary<double, LadderOrderVM>(_equality);
@@ -82,8 +81,8 @@ namespace mbts.spark {
         // All settings observers should be aggregated together, so they can all share the same subscription to the settings
         // (these subscriptions are not horribly expensive, but they're not free either - even more so with the .OnDispatcher() extension).
         var settings_observer = new CompositeObserver<LadderSettings> {
-            /// first things first: assign our <see cref="_current_settings"/>
-            (s => _current_settings = s),
+            /// first things first: assign our <see cref="current_settings"/>
+            (s => current_settings = s),
            // brush props
            (_bid_background = brush_prop(nameof(bid_background), s => s.bid_column.background)).set,
            (_bid_foreground = brush_prop(nameof(bid_foreground), s => s.bid_column.foreground)).set,
@@ -236,14 +235,13 @@ namespace mbts.spark {
                  }
                  if ((Set(ref _position, total, nameof(position)) | Set(ref _day_position, day, nameof(day_position))) && (show_day_position || show_account_position))
                     RaisePropertyChanged(nameof(position_display_text));
-               }),
-               position_src.Connect());
+               }));
         }
      }

      public IBus bus => _bus;

-      public event Action on_tick, request_settings_dialog;
+      public event Action on_tick, request_settings_dialog, settings_invalidated;

      public MDConsumerHandle md => _model.md;
      // we return only entries who have piqs and whose piqs are not uint.Max
@@ -278,6 +276,7 @@ namespace mbts.spark {
         remove => _on_disposed_impl -= value;
      }
      public SecurityImmutable security => _model.security;
+      public LadderSettings current_settings { get; private set; }
      public double high => _high.Value;
      public double low => _low.Value;
      public double change => _change.Value;
@@ -339,6 +338,8 @@ namespace mbts.spark {
      public uint last_column_width { get => _last_column_width.Value; set => _last_column_width.set(value); }
      public uint piq_column_width { get => _piq_column_width.Value; set => _piq_column_width.set(value); }
      public uint volume_column_width { get => _volume_column_width.Value; set => _volume_column_width.set(value); }
+      public uint alternate_order_size_from_settings => current_settings.alternate_order_size;
+      public bool show_warn_on_cross_from_settings => current_settings.show_warn_on_cross;
      internal LadderModel model => _model;
      internal IObservable<LadderSettings> settings { get; }
      internal OrderRecordImmutable get_root_at_price((OrderRecordImmutable order, uint? _, AlgoData? __, AlgoDefinitionMetadata? meta) op) {
@@ -359,7 +360,7 @@ namespace mbts.spark {
      }

      public LadderSettings get_save_state() {
-         var rv = _current_settings.with_window_specifics(
+         var rv = current_settings.with_window_specifics(
            new LadderSettings.WindowSpecifics(
               left_panel_width,
               orders_column_width,
@@ -376,7 +377,7 @@ namespace mbts.spark {
            if (order_properties_vm.selected_account.HasValue)
               rv.default_account = order_properties_vm.selected_account.Value.id;
            if (order_properties_vm.selected_algo_definition != null)
-               rv.default_algo = AlgoID.from_algo_key(order_properties_vm.selected_algo_definition.key, _model.order_gateway.dynamic_helper.dynamic_type_index);
+               rv.default_algo = AlgoID.from_algo_key(order_properties_vm.selected_algo_definition.key);
         }
         return rv;
      }
@@ -393,18 +394,24 @@ namespace mbts.spark {
         }
      }

+      public void on_mini_orderbook_closed(bts.shell.orderbook.OrderBookStartupData ob_state) {
+         current_settings = SparkUtils.clone_proto(current_settings);
+         current_settings.mini_ob = new LadderMiniOrderBookSettings(ob_state.orderbook_grid.general);
+         settings_invalidated?.Invoke();
+      }
+
      public void send_order((double price, Side? side, MouseButton button) args) {
         if (order_properties_vm == null || args.button == MouseButton.Middle)
            return;
         var size_from_alternate = args.button == MouseButton.Right;
-         if (DoubleHelper.IsNaNOrInfinity(args.price) || !args.side.HasValue || HasErrors || order_properties_vm.HasErrors || (size_from_alternate && _current_settings.alternate_order_size == 0)) {
+         if (DoubleHelper.IsNaNOrInfinity(args.price) || !args.side.HasValue || HasErrors || order_properties_vm.HasErrors || (size_from_alternate && current_settings.alternate_order_size == 0)) {
            return;
         }
         if (!size_from_alternate && (!size_calculator.value.HasValue || size_calculator.value.Value == 0)) {
            size_calculator.flash_error();
         }
         else {
-            uint size = size_from_alternate ? _current_settings.alternate_order_size : (uint)Math.Abs(size_calculator.value ?? 0);
+            uint size = size_from_alternate ? current_settings.alternate_order_size : (uint)Math.Abs(size_calculator.value ?? 0);
            send_order_async(args.side.Value, size, args.price).ignore();
         }
      }
@@ -0,0 +1,58 @@
+using bts.api;
+using bts.api.orderman;
+using mbts.ui.shell;
+using System;
+using System.Collections.Generic;
+using System.Reactive.Linq;
+
+namespace mbts.spark {
+   class LadderVMContainer : ViewModelBase, IDisposable {
+      readonly IBus _bus;
+      readonly OrdersModel _model;
+      LadderVM _value;
+      SecurityMD? _security_md;
+      HashSet<uint> _selected_order_tree = new HashSet<uint>();
+
+      public LadderVMContainer(IBus bus, OrdersModel model) {
+         _bus = bus;
+         _model = model;
+      }
+
+      public SecurityMD? security_md {
+         get => _security_md;
+         set {
+            if (_security_md != value) {
+               _security_md = value;
+               _reset_ladder_vm();
+               RaisePropertyChanged(nameof(security_md), nameof(LadderVMContainer.value));
+            }
+         }
+      }
+      public LadderVM value => _value;
+
+      public void Dispose() {
+         if (_value != null) {
+            _value.Dispose();
+            _value = null;
+            RaisePropertyChanged(nameof(value));
+         }
+      }
+
+      public void set_orders(IEnumerable<uint> orders) {
+         _selected_order_tree = new HashSet<uint>(orders);
+         _reset_ladder_vm();
+      }
+
+      void _reset_ladder_vm() {
+         if (_value == null && !_security_md.HasValue)
+            return;
+         Disposable.replace(ref _value,
+            _security_md.HasValue ?
+               LadderVM.create_readonly(_bus,
+                  new LadderModel(security_md.Value, _model, _model.mbo_service,
+                  new Func<OrderSecurity, bool>(osec => _selected_order_tree.Contains(osec.order.Key))),
+                  Observable.Return(LadderSettings.sanitize(LadderSettings.Default))) : null);
+         RaisePropertyChanged(nameof(value));
+      }
+   }
+}
@@ -67,7 +67,8 @@ namespace mbts.spark {
      NativePriceSize _last_trade;
      Func<NativePriceSize, string> _fmt_size = MDDisplayHelper.get_formatter_nps(MarketSizeDisplay.get_default());
      int _old_tooltip_row = int.MaxValue;
-      double _old_last_trade_price = 0.0;
+      NativePriceSize? _old_last_trade;
+      string _direction_arrow = string.Empty;
      bool _tooltips_are_hooked_up = false;
      ToolTip tooltip_view = new ToolTip();
      IDisposable _parameterized_order_popup;
@@ -339,7 +340,7 @@ namespace mbts.spark {
               _send_parameterized_order(point, bs.Value);
               return;
            } else if (column.column_type == ColumnType.Price) {
-               if (Keyboard.IsKeyDown(Key.LeftShift) || Keyboard.IsKeyDown (Key.RightShift) ||
+               if (Keyboard.IsKeyDown(Key.LeftShift) || Keyboard.IsKeyDown(Key.RightShift) ||
                   Keyboard.IsKeyDown(Key.LeftAlt) || Keyboard.IsKeyDown(Key.RightAlt)) {
                  show_mbo_popup(point).ignore();
               } else {
@@ -347,6 +348,19 @@ namespace mbts.spark {
               }
               return;
            }
+         } else if (_vm != null) {
+            uint size = e.ChangedButton == MouseButton.Right ? _vm.alternate_order_size_from_settings : _vm.size_calculator.value ?? 0;
+            // if warning enabled && (buy above opposite inside market || ask below opposite inside market)
+            // when 1-sided market, _get_top_price will return NaN, and so the price comparison is false
+            // meaning show no warning == correct
+            if (_vm.show_warn_on_cross_from_settings &&
+               (size > 0) &&
+               ((bs == Side.Buy && price >= _get_top_price(_asks)) || (bs == Side.Sell && price <= _get_top_price(_bids)))) {
+               string prompt = $"Are you sure you want to CROSS the market to {bs.ToString().ToUpper()} {size} @ {security.spec_or_default().format(price)} ?";
+               if (!BTSMessageBox.Confirm(prompt, "Cross Market Alert", MessageBoxImage.Warning)) {
+                  return;
+               }
+            }
         }
         var pbs = (price, bs, e.ChangedButton);
         if (Command is ICommand cmd && cmd.CanExecute(pbs)) {
@@ -680,12 +694,14 @@ namespace mbts.spark {
                  // At any rate, we need this part hiding the tooltip so that we don't leave random tooltips around
                  // and we have to reset to old row so that when we go back to what could be our preivous row, the tooltip gets drawn again
                  //System.Diagnostics.Debug.WriteLine("   Tooltip - Volume is 0");
+                  _old_tooltip_row = int.MaxValue;
                  _hide_tool_tip();
                  //_old_tooltip_row = Int32.MaxValue;
               }
            }
         } else {
            //System.Diagnostics.Debug.WriteLine("   Tooltip - not over Volume column");
+            _old_tooltip_row = int.MaxValue;
            _hide_tool_tip();
         }
      }
@@ -848,21 +864,43 @@ namespace mbts.spark {
      void _refresh_volume_at_price() {
         if (!_settings.volume_column.general.show)
            return;
+
+         // if the last trade has a new size then we need to explicitly
+         // mark the volume container as dirty because there is a chance
+         // we have arrived here off a size change and not a volume change
+         // or a random change, like applying new settings
+         bool last_trade_size_changed = _old_last_trade.HasValue ? _last_trade.size != _old_last_trade.Value.size : true;
+         if (last_trade_size_changed && _settings.volume_column.show_ltq) {
+            _volume_container.mark_dirty();
+         }
         var vapls = _volume_container.read_new_value();
         if (vapls != null) {
            Log.assert_d(_price_list != null);
-            var ltp = _last_trade.price;
-            var last_index = LadderRender.index_of(_price_list, ltp, _price_comparer);
-            string direction_arrow = string.Empty;
-            if (MathUtils.epsilon_equals(ltp, _old_last_trade_price)) {
-               // do nothing if in here b/c direction_arrow already string.empty
-            } else if (ltp > _old_last_trade_price) {
-               direction_arrow = "▲";
-            } else {
-               direction_arrow = "▼";
-            }
-            LadderRender.render_volumes(_volume_vis_tup.visual, _volume_vis_tup.glyph_context, _price_list, vapls, _settings.row_height, security.ContractSpec, _settings.volume_column, last_index, _last_trade, direction_arrow);
-            _old_last_trade_price = ltp;
+            var last_index = LadderRender.index_of(_price_list, _last_trade.price, _price_comparer);
+            LadderRender.render_volumes(_volume_vis_tup.visual, _volume_vis_tup.glyph_context, _price_list, vapls, _settings.row_height, security.ContractSpec, _settings.volume_column, last_index, _get_last_arrow_string());
+            _old_last_trade = _last_trade;
+         }
+
+         string _get_last_arrow_string() {
+            // if _old_last_trade doesn't have a value, this is the first time the ladder has been launched
+            // and so the direction should be drawn without an arrow since there is no basis for comparison
+            if (!_old_last_trade.HasValue) {
+               _direction_arrow = string.Empty;
+               // if the Lasts are different then we need to reformat the direction arrow in some fashion
+            } else if (_old_last_trade != _last_trade) {
+               var ltp = _last_trade.price;
+               if (MathUtils.epsilon_equals(ltp, _old_last_trade.Value.price)) {
+                  // update on the same price, so size must be different
+                  _direction_arrow = string.Empty;
+               } else if (ltp > _old_last_trade.Value.price) {
+                  _direction_arrow = "▲";
+               } else {
+                  _direction_arrow = "▼";
+               }
+            } 
+            // regardless of if we've arrived here via a new Last (and new direction arrow)
+            // or we're reusing the old one, this format bit is the same
+            return $"{_direction_arrow} {_last_trade.size} ";
         }
      }

@@ -9,9 +9,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
 using System.Windows.Input;
-using System.Windows.Interactivity;
 using System.Windows.Media;

 namespace mbts.spark {
@@ -156,7 +154,10 @@ namespace mbts.spark {
               popup.SetBinding(System.Windows.Controls.Primitives.Popup.IsOpenProperty,
                  nameof(OrderBookVM.is_row_collection_populated)
               );
-               popup.Closed += (sender, event_args) => (popup.DataContext as IDisposable)?.Dispose();
+               popup.Closed += (sender, event_args) => {
+                  (_parent.DataContext as LadderVM)?.on_mini_orderbook_closed(obvm.create());
+                  (popup.DataContext as IDisposable)?.Dispose();
+               };
               popup.MouseUp += (sender, event_args) => {
                  if (event_args.ChangedButton == MouseButton.Middle) {
                     popup.IsOpen = false;
@@ -196,8 +196,7 @@ namespace mbts.spark {
        ContractSpecificationImmutable spec,
        VolumeColumnSettings settings,
        int last_index,
-        NativePriceSize last_trade, 
-        string direction_arrow
+        string last_size_and_direction
        ) {
         if (!data.Any()) {
            _clear_visual(dv);
@@ -216,16 +215,16 @@ namespace mbts.spark {
         Brush total_brush = null;
         if (settings.total.bars.result.HasValue) {
            total_brush = new SolidColorBrush(settings.total.bars.result.Value);
-         } else if (components.Count == 0) {
+         } else if (components.Count == 0 && !settings.show_ltq) {
            _clear_visual(dv);
            return;
         }
         // inflate the max so that the graph never fills the available space
         double max = data.Max(v => v.Volume) * 1.1;
-         Brush text_brush = settings.general.foreground.rgb_brush();
         _render_cells(dv, row_height, data.Select(d => (d.Price, d)), settings.general, prices, spec, render_cell);
         /// local methods
         void render_cell(DrawingContext dc, int r, VolumeAtPriceLevelImmutable vap) {
+            Brush text_brush = settings.general.foreground.rgb_brush();
            double y = row_height * r;
            var last_trade_here = r == last_index;

@@ -259,7 +258,8 @@ namespace mbts.spark {
            }
            if (settings.show_ltq && last_trade_here) {
               numbers_text.Clear();
-               numbers_text.Add($"{direction_arrow} {last_trade.size} ");
+               numbers_text.Add(last_size_and_direction);
+               text_brush = BTSCoreColors.white;
            }
            if (numbers_text.Count > 0) {
               string str = string.Join("/", numbers_text);
@@ -30,7 +30,6 @@
    <sys:Double x:Key="LadderColumnsForegroundColumnWidth">81</sys:Double>
    <sys:Double x:Key="LadderColumnsWidthColumnWidth">50</sys:Double>
    <sys:Double x:Key="LadderColumnsFontColumnWidth">160</sys:Double>
-    <sys:Double x:Key="LadderColumnsSampleColumnWidth">153</sys:Double>
    <!--Margins-->
    <Thickness x:Key="MarginLPush" Left="{StaticResource HorizontalPush}"/>
    <Thickness x:Key="MarginLPush2" Left="{StaticResource HorizontalPush2}"/>
@@ -190,7 +189,7 @@
              <ColumnDefinition Width="{Binding Source={StaticResource LadderColumnsForegroundColumnWidth}}" SharedSizeGroup="c3"/>
              <ColumnDefinition Width="{Binding Source={StaticResource LadderColumnsWidthColumnWidth}}" SharedSizeGroup="c4"/>
              <ColumnDefinition Width="{Binding Source={StaticResource LadderColumnsFontColumnWidth}}" SharedSizeGroup="c5"/>
-              <ColumnDefinition Width="{Binding Source={StaticResource LadderColumnsSampleColumnWidth}}" SharedSizeGroup="c6"/>
+              <ColumnDefinition Width="*"/>
            </Grid.ColumnDefinitions>
            <Border Grid.Column="0" Background="{u:BTSColor header}" Padding="6,3">
              <TextBlock VerticalAlignment="Center" Text="{Binding name}" Foreground="{u:BTSColor header_text}"/>
@@ -226,7 +225,7 @@
              <ColumnDefinition Width="{Binding Source={StaticResource LadderColumnsForegroundColumnWidth}}" SharedSizeGroup="c3"/>
              <ColumnDefinition Width="{Binding Source={StaticResource LadderColumnsWidthColumnWidth}}" SharedSizeGroup="c4"/>
              <ColumnDefinition Width="{Binding Source={StaticResource LadderColumnsFontColumnWidth}}" SharedSizeGroup="c5"/>
-              <ColumnDefinition Width="{Binding Source={StaticResource LadderColumnsSampleColumnWidth}}" SharedSizeGroup="c6"/>
+              <ColumnDefinition Width="*"/>
            </Grid.ColumnDefinitions>
            <Border Grid.Column="0" Background="{u:BTSColor header}" Padding="6,3">
              <TextBlock VerticalAlignment="Center" Text="{Binding name}" Foreground="{u:BTSColor header_text}"/>
@@ -272,7 +271,7 @@
                <ColumnDefinition Width="{Binding Source={StaticResource LadderColumnsForegroundColumnWidth}}" SharedSizeGroup="c3"/>
                <ColumnDefinition Width="{Binding Source={StaticResource LadderColumnsWidthColumnWidth}}" SharedSizeGroup="c4"/>
                <ColumnDefinition Width="{Binding Source={StaticResource LadderColumnsFontColumnWidth}}" SharedSizeGroup="c5"/>
-                <ColumnDefinition Width="{Binding Source={StaticResource LadderColumnsSampleColumnWidth}}" SharedSizeGroup="c6"/>
+              <ColumnDefinition Width="*"/>
              </Grid.ColumnDefinitions>
              <Border Grid.Column="0" Background="{u:BTSColor header}" Padding="6,3">
                <Grid>
@@ -329,7 +328,7 @@
                <ColumnDefinition Width="{Binding Source={StaticResource LadderColumnsForegroundColumnWidth}}" SharedSizeGroup="c3"/>
                <ColumnDefinition Width="{Binding Source={StaticResource LadderColumnsWidthColumnWidth}}" SharedSizeGroup="c4"/>
                <ColumnDefinition Width="{Binding Source={StaticResource LadderColumnsFontColumnWidth}}" SharedSizeGroup="c5"/>
-                <ColumnDefinition Width="{Binding Source={StaticResource LadderColumnsSampleColumnWidth}}" SharedSizeGroup="c6"/>
+                <ColumnDefinition Width="*"/>
              </Grid.ColumnDefinitions>
              <Border Grid.Column="0" Background="{u:BTSColor header}" Padding="6,3">
                <Grid>
@@ -449,7 +448,7 @@
      </u:TemplateSelectorKeyValue>
    </u:KeyedTemplateSelector>
  </UserControl.Resources>
-  <TabControl Width="702" MinHeight="275">
+  <TabControl>
    <TabControl.ItemContainerStyle>
      <Style TargetType="TabItem" BasedOn="{StaticResource {x:Type TabItem}}">
        <Setter Property="VerticalAlignment" Value="Stretch"/>
@@ -458,14 +457,14 @@
    </TabControl.ItemContainerStyle>
    <!-- Ladder Columns Tab -->
    <TabItem Header="Ladder Columns" VerticalAlignment="Stretch">
-      <Grid Grid.IsSharedSizeScope="True">
+      <Grid Grid.IsSharedSizeScope="True" Margin="8,0">
        <Grid.RowDefinitions>
          <RowDefinition Height="27"/>
          <RowDefinition Height="Auto"/>
          <RowDefinition Height="{Binding Source={StaticResource VerticalPush}}"/>
          <RowDefinition Height="*"/>
        </Grid.RowDefinitions>
-        <Grid x:Name="fonts_and_colors_headers" TextElement.Foreground="{u:BTSColor header_text}" Background="{u:BTSColor header}" Margin="8,0">
+        <Grid x:Name="fonts_and_colors_headers" TextElement.Foreground="{u:BTSColor header_text}" Background="{u:BTSColor header}">
          <Grid.ColumnDefinitions>
            <ColumnDefinition SharedSizeGroup="c0"/>
            <ColumnDefinition Width="Auto" SharedSizeGroup="c1"/>
@@ -473,7 +472,7 @@
            <ColumnDefinition Width="Auto" SharedSizeGroup="c3"/>
            <ColumnDefinition Width="Auto" SharedSizeGroup="c4"/>
            <ColumnDefinition SharedSizeGroup="c5"/>
-            <ColumnDefinition SharedSizeGroup="c6"/>
+            <ColumnDefinition Width="*"/>
          </Grid.ColumnDefinitions>
          <TextBlock Grid.Column="1" HorizontalAlignment="Center" Margin="6,0" Text="Show" VerticalAlignment="Center"/>
          <TextBlock Grid.Column="2" HorizontalAlignment="Center" Margin="6,0" Text="Background" VerticalAlignment="Center"/>
@@ -482,8 +481,8 @@
          <TextBlock Grid.Column="5" HorizontalAlignment="Center" Margin="6,0" Text="Font" VerticalAlignment="Center"/>
          <TextBlock Grid.Column="6" HorizontalAlignment="Center" Margin="6,0" Text="Sample" VerticalAlignment="Center"/>
        </Grid>
-        <ItemsControl Grid.Row="1" ItemsSource="{Binding column_items}" Margin="8,0" ItemTemplateSelector="{StaticResource LadderColumnTemplateSelector}"/>
-        <WrapPanel Grid.Row="3" Margin="8,0" Width="{Binding ActualWidth, ElementName=fonts_and_colors_headers, Mode=OneWay}" VerticalAlignment="Top">
+        <ItemsControl Grid.Row="1" ItemsSource="{Binding column_items}" ItemTemplateSelector="{StaticResource LadderColumnTemplateSelector}"/>
+        <WrapPanel Grid.Row="3" Width="{Binding ActualWidth, ElementName=fonts_and_colors_headers, Mode=OneWay}" VerticalAlignment="Top">
          <TextBlock>
            <TextBlock.Style>
              <Style TargetType="TextBlock" BasedOn="{StaticResource HintText}">
@@ -725,7 +724,7 @@
      <Grid HorizontalAlignment="Left" Margin="6">
        <Grid.RowDefinitions>
          <RowDefinition Height="Auto"/>
-          <RowDefinition Height="{Binding Source={StaticResource VerticalPush1}}"/>
+          <RowDefinition Height="{Binding Source={StaticResource VerticalPush}}" MaxHeight="{Binding Source={StaticResource VerticalPush}}"/>
          <RowDefinition Height="*"/>
        </Grid.RowDefinitions>
        <Grid.ColumnDefinitions>
@@ -926,6 +925,11 @@
            </ComboBox>
            <!--Auto Clear-->
            <CheckBox Grid.Row="10" Grid.ColumnSpan="3" HorizontalAlignment="Left" VerticalAlignment="Top" VerticalContentAlignment="Top" Margin="0,2,0,0" FlowDirection="RightToLeft" IsChecked="{Binding auto_clear}">
+              <CheckBox.Resources>
+                <Style TargetType="Path">
+                  <Setter Property="FlowDirection" Value="LeftToRight"/>
+                </Style>
+              </CheckBox.Resources>
              Auto Clear
            </CheckBox>
          </Grid>
@@ -980,5 +984,29 @@
        -->
      </Grid>
    </TabItem>
+    <TabItem Header="Safety Checks" VerticalAlignment="Stretch">
+      <Grid HorizontalAlignment="Left" Margin="6">
+        <Grid.RowDefinitions>
+          <RowDefinition Height="Auto"/>
+          <RowDefinition Height="{Binding Source={StaticResource VerticalPush1}}"/>
+          <RowDefinition Height="Auto"/>
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+          <ColumnDefinition Width="Auto"/>
+          <ColumnDefinition Width="{Binding Source={StaticResource HorizontalPush3}}"/>
+          <ColumnDefinition Width="*"/>
+        </Grid.ColumnDefinitions>
+        <CheckBox Content="Warn on Market Cross" FlowDirection="RightToLeft" IsChecked="{Binding show_warn_on_cross}">
+          <CheckBox.Resources>
+            <Style TargetType="{x:Type Path}">
+              <Setter Property="FlowDirection" Value="LeftToRight"/>
+            </Style>
+          </CheckBox.Resources>
+        </CheckBox>
+      </Grid>
+    </TabItem>
+    <TabItem Header="Mini Order Book">
+      <usp:GridSettingsView Height="790" Margin="6" DataContext="{Binding mini_ob}" GridSectionContent="{Binding}" GridSectionContentTemplate="{DynamicResource GridSectionCoreContentTemplate}"/>
+    </TabItem>
  </TabControl>
 </UserControl>
@@ -152,20 +152,21 @@ namespace mbts.spark {
            // When middle click over bid or ask columns:
            //   Non-parameterizalbe order: change cursor to No indicating sending an order is not possible
            //   Parameterizable order:  if qty is null/0, flash and No cursor
-            var pos = e.GetPosition(_host);
-            var column_type = _host._column_for_point(pos).column_type;
-            var selected_algo_can_expand = _host._vm.order_properties_vm?.selected_algo_definition?.algo_root?.can_expand ?? true;
-            if (e.MiddleButton == MouseButtonState.Pressed &&
-               (column_type == LadderGridHost.ColumnType.Bid || column_type == LadderGridHost.ColumnType.Ask)) {
-               if (!selected_algo_can_expand) {
-                  _host.Cursor = Cursors.No;
-               }
-               if (selected_algo_can_expand && (_host._vm.size_calculator.value ?? 0) == 0) {
-                  _host._vm.size_calculator.flash_error();
-                  _host.Cursor = Cursors.No;
+            if (_host._vm != null) {
+               var pos = e.GetPosition(_host);
+               var column_type = _host._column_for_point(pos).column_type;
+               var selected_algo_can_expand = _host._vm.order_properties_vm?.selected_algo_definition?.algo_root?.can_expand ?? true;
+               if (e.MiddleButton == MouseButtonState.Pressed &&
+                  (column_type == LadderGridHost.ColumnType.Bid || column_type == LadderGridHost.ColumnType.Ask)) {
+                  if (!selected_algo_can_expand) {
+                     _host.Cursor = Cursors.No;
+                  }
+                  if (selected_algo_can_expand && (_host._vm.size_calculator.value ?? 0) == 0) {
+                     _host._vm.size_calculator.flash_error();
+                     _host.Cursor = Cursors.No;
+                  }
               }
            }
-
            _is_mouse_down = true;
            InvalidateVisual();
         }
@@ -39,6 +39,8 @@
      <converters:ResponsiveTextConverter x:Key="OpenTextConverter" LongText="Open:" ShortText="O:" Threshold="99" />
      <converters:ResponsiveTextConverter x:Key="SettleTextConverter" LongText="Settle:" ShortText="S:" Threshold="99" />
      <converters:ResponsiveTextConverter x:Key="VolumeTextConverter" LongText="Volume:" ShortText="V:" Threshold="99" />
+      <converters:DoubleSubtractionConverter x:Key="DoubleSubtractionConverter" Value="4" />
+      <converters:DoubleSubtractionConverter x:Key="HeightDoubleSubtractionConverter" Value="6" />
      <Style TargetType="GridViewColumnHeader">
        <Setter Property="Background" Value="{mbts:BTSColor header}"/>
        <Setter Property="Foreground" Value="{mbts:BTSColor header_text}"/>
@@ -579,7 +581,9 @@
          <Setter Property="FontSize" Value="{Binding font_size}"/>
          <Setter Property="Foreground" Value="{Binding foreground}"/>
          <Setter Property="TextLines" Value="{Binding text_lines}" />
-          <Setter Property="Width" Value="{x:Static controls:Badge.DefaultWidth}"/>
+          <!--<Setter Property="Width" Value="{x:Static controls:Badge.DefaultWidth}"/>-->
+          <Setter Property="Width" Value="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType={x:Type spark:LadderOrdersHost}}, Converter={StaticResource DoubleSubtractionConverter}}" />
+          <Setter Property="Height" Value="{Binding grid_row_height, Converter={StaticResource HeightDoubleSubtractionConverter}}" />
          <Setter Property="HasMultipleOrdersAtLevel" Value="{Binding has_multiple_orders_at_same_level}" />
          <Setter Property="IsHedgeOrder" Value="{Binding is_hedge_order}" />
          <Setter Property="AlgoType" Value="{Binding algo_type}" />
@@ -63,9 +63,10 @@
        IsEditMode="False"
        IsLazy="True"
        SecurityMap="{DynamicResource ResourceKey={x:Static usp:ManualFillRowEditor.SecuritiesKey}}"
-        SelectedSecurity="{Binding security}"
+        SelectedSecurity="{Binding security, UpdateSourceTrigger=Explicit}"
        ShowDialogSkirt="True"
        ToolTip="{Binding SelectedCriteria, RelativeSource={RelativeSource Self}, Converter={x:Static c:ContractPickerPopup.SecurityCriteriaTextConverter}, Mode=OneWay}"
+        OKClick="{x:Static c:ContractPickerPopup.FlushSelectedSecurityHandler}"
      />
      <ComboBox Grid.Row="2" Grid.Column="2" ItemsSource="{DynamicResource ResourceKey={x:Static usp:ManualFillRowEditor.AccountsKey}}" SelectedItem="{Binding account}"/>
      <ComboBox Grid.Row="2" Grid.Column="4" ItemsSource="{DynamicResource ResourceKey={x:Static usp:ManualFillRowEditor.UsersKey}}" SelectedItem="{Binding user}"/>
@@ -14,7 +14,6 @@
             xmlns:order="clr-namespace:bts.api.orderman;assembly=spark_api"
             mc:Ignorable="d"
             MaxHeight="240"
-             MinWidth="875"
             d:DesignHeight="600" d:DesignWidth="1080"
             FocusManager.IsFocusScope="True"
             Background="{StaticResource CommonBackground}">
@@ -34,7 +34,7 @@ namespace mbts.spark {
   // This interface is used to hide ColumnBase.SortDirection, and offer a SortDirection member that does NOT require a DependencyProperty lookup.
   interface ICVOrderBookColumn : IKeyedColumn<Columns>, IGridColumn {
      ListSortDirection? SortDirection { get; set; }
-      IDataGridColumnFilter<OrderSecurity> filter { get; }
+      IDataGridColumnFilter<OrderSecurityRootPair> filter { get; }
      IComparer<OrderBookRowVM> comparer { get; }
   }

@@ -70,9 +70,9 @@ namespace mbts.spark {
         public OrderBookColumnCollection(IBus bus, OrdersModel model, IObservable<(IEnumerable<SecurityImmutable> added, IEnumerable<SecurityImmutable> removed)> order_securities) {
            // security
            Add(security_column = new SecurityColumn(
-               DiscreteValuesFilterVM.Create<OrderSecurity, SecurityImmutable, SecurityCriteria>(
+               DiscreteValuesFilterVM.Create<OrderSecurityRootPair, SecurityImmutable, SecurityCriteria>(
                  order_securities,
-                  ort => ort.security ?? SecurityDataHelper.Defaults.SecurityImmutable,
+                  ort => ort.order.security ?? SecurityDataHelper.Defaults.SecurityImmutable,
                  SecurityCriteria.from_securities,
                  SecurityCriteria.get_to_securities(bus),
                  nameof(OrderBookRowVM.security),
@@ -85,9 +85,9 @@ namespace mbts.spark {
               DefaultColumnHeaders.Symbol,
               r => r.symbol,
               DefaultColumnWidths.Symbol,
-               DiscreteValuesFilterVM.Create<OrderSecurity, string>(
+               DiscreteValuesFilterVM.Create<OrderSecurityRootPair, string>(
                  mbts.co2.UserSymbol.get_all().Select(u => u.symbol).Distinct().ToList(),
-                  ort => ort.security?.Symbol ?? string.Empty,
+                  ort => ort.order.security?.Symbol ?? string.Empty,
                  nameof(OrderBookRowVM.symbol)
               ),
               DataGridFilterKnownTemplates.DiscreteValues,
@@ -98,8 +98,8 @@ namespace mbts.spark {
               "Time",
               r => r.time_created_text,
               DefaultColumnWidths.Time,
-               new TimeFilterVM<OrderSecurity>(
-                  ort => ort.order.created(),
+               new TimeFilterVM<OrderSecurityRootPair>(
+                  ort => ort.order.order.created(),
                  nameof(OrderBookRowVM.time_created)),
               DataGridFilterKnownTemplates.TimeFilter,
               _wrap_comparer(r => r.time_created)));
@@ -109,8 +109,8 @@ namespace mbts.spark {
               "Last Change",
               r => r.last_change_text,
               DefaultColumnWidths.Time,
-               new TimeFilterVM<OrderSecurity>(
-                  ort => ort.order.last_change(),
+               new TimeFilterVM<OrderSecurityRootPair>(
+                  ort => ort.order.order.last_change(),
                  nameof(OrderBookRowVM.last_change)),
               DataGridFilterKnownTemplates.TimeFilter,
               _wrap_comparer(r => r.last_change)));
@@ -120,9 +120,9 @@ namespace mbts.spark {
               DefaultColumnHeaders.User,
               r => r.user,
               DefaultColumnWidths.User,
-               DiscreteValuesFilterVM.Create<OrderSecurity, string>(
+               DiscreteValuesFilterVM.Create<OrderSecurityRootPair, string>(
                  model.factory.subscribe_users().Select(d => d.Values),
-                  ort => ort.order.user(),
+                  ort => ort.order.order.user(),
                  nameof(OrderBookRowVM.user)),
               DataGridFilterKnownTemplates.DiscreteValues,
               _wrap_comparer(r => r.user)));
@@ -132,9 +132,9 @@ namespace mbts.spark {
               DefaultColumnHeaders.Account,
               r => r.account,
               DefaultColumnWidths.Account,
-               DiscreteValuesFilterVM.Create<OrderSecurity, string, string[]>(
+               DiscreteValuesFilterVM.Create<OrderSecurityRootPair, string, string[]>(
                  model.factory.subscribe_accounts().Select(d => d.Values),
-                  ort => ort.order.account(),
+                  ort => ort.order.order.account(),
                  vals => vals.ToArray(),
                  vals => Observable.Return(vals),
                  nameof(OrderBookRowVM.account)),
@@ -146,9 +146,9 @@ namespace mbts.spark {
               DefaultColumnHeaders.Exchange,
               r => r.exchange.ToString(),
               DefaultColumnWidths.Exchange,
-               DiscreteValuesFilterVM.Create<OrderSecurity, Venue>(
+               DiscreteValuesFilterVM.Create<OrderSecurityRootPair, Venue>(
                  EnumHelper.get_values_except(Venue.Unset).ToList(),
-                  ort => ort.security.exchange_or_default(),
+                  ort => ort.order.security.exchange_or_default(),
                  nameof(OrderBookRowVM.exchange)),
               DataGridFilterKnownTemplates.EnumValues,
               _wrap_comparer(r => r.exchange)));
@@ -158,14 +158,14 @@ namespace mbts.spark {
               DefaultColumnHeaders.TimeInForce,
               r => r.time_in_force.ToString(),
               DefaultColumnWidths.TimeInForce,
-               DiscreteValuesFilterVM.Create<OrderSecurity, TimeInForce>(
+               DiscreteValuesFilterVM.Create<OrderSecurityRootPair, TimeInForce>(
                  EnumHelper.get_values<TimeInForce>().ToList(),
-                  ort => ort.order.time_in_force(),
+                  ort => ort.order.order.time_in_force(),
                  nameof(OrderBookRowVM.time_in_force)),
               DataGridFilterKnownTemplates.EnumValues,
               _wrap_comparer(r => r.time_in_force)));
            // (algo items)
-            var algo_items_source = model.subscribe_all_algos().SelectKeyValue(AlgoDataVM.from_data, d => AlgoID.from_algo_key(d.data.key, model.dynamic_helper.dynamic_type_index)).OnDispatcher();
+            var algo_items_source = model.subscribe_all_algos().SelectKeyValue(AlgoDataVM.from_data, d => AlgoID.from_algo_key(d.data.key)).OnDispatcher();
            var algo_items_comp = AlgoCollectionHelper.algo_data_vm_comparer.to_non_generic();
            var algo_items_group_desc = new PropertyGroupDescription(nameof(AlgoDataVM.group));
            // order type
@@ -174,9 +174,9 @@ namespace mbts.spark {
               nameof(OrderBookRowVM.badge_fill),
               nameof(OrderBookRowVM.display_name),
               _wrap_comparer(r => r.order_type),
-               DiscreteValuesFilterVM.CreateTableUpdate<OrderSecurity, AlgoDataVM, AlgoID>(
-                  o => new AlgoDataVM(o.algo.GetValueOrDefault()),
-                  vm => AlgoID.from_algo_key(vm.data.key, model.dynamic_helper.dynamic_type_index), out var order_type_filter_observer, out var order_type_items_view)));
+               DiscreteValuesFilterVM.CreateTableUpdate<OrderSecurityRootPair, AlgoDataVM, AlgoID>(
+                  o => new AlgoDataVM(o.order.algo),
+                  vm => AlgoID.from_algo_key(vm.data.key), out var order_type_filter_observer, out var order_type_items_view)));
            _resources.Add(algo_items_source.Subscribe(order_type_filter_observer));
            order_type_items_view.CustomSort = algo_items_comp;
            order_type_items_view.GroupDescriptions.Add(algo_items_group_desc);
@@ -185,10 +185,10 @@ namespace mbts.spark {
               Columns.RootAlgoType,
               nameof(OrderBookRowVM.root_algo_badge_fill),
               nameof(OrderBookRowVM.root_algo_display_name),
-               _wrap_comparer(r => r.order_tuple.root_algo.value.CustomCase),
-              DiscreteValuesFilterVM.CreateTableUpdate<OrderSecurity, AlgoDataVM, AlgoID>(
-                  o => new AlgoDataVM(o.root_algo),
-                  vm => AlgoID.from_algo_key(vm.data.key, model.dynamic_helper.dynamic_type_index), out var root_algo_type_observer, out var root_algo_type_items_view),
+               _wrap_comparer(r => r.order_tuple.root.algo.value.CustomCase),
+              DiscreteValuesFilterVM.CreateTableUpdate<OrderSecurityRootPair, AlgoDataVM, AlgoID>(
+                  o => new AlgoDataVM(o.root.algo),
+                  vm => AlgoID.from_algo_key(vm.data.key), out var root_algo_type_observer, out var root_algo_type_items_view),
               DefaultColumnHeaders.RootAlgoType));
            _resources.Add(algo_items_source.Subscribe(root_algo_type_observer));
            root_algo_type_items_view.CustomSort = algo_items_comp;
@@ -199,36 +199,36 @@ namespace mbts.spark {
               "Sub Type",
               r => r.order_sub_type_text,
               80,
-               DiscreteValuesFilterVM.Create<OrderSecurity, OrderSubType>(
+               DiscreteValuesFilterVM.Create<OrderSecurityRootPair, OrderSubType>(
                  EnumHelper.get_values<OrderSubType>().ToList(),
-                  ort => ort.order.sub_type(),
+                  ort => ort.order.order.sub_type(),
                  nameof(OrderBookRowVM.order_sub_type)),
               OrderBookGridView.SubTypeFilterTemplateKey,
               _wrap_comparer(r => r.order_sub_type)));
            // side
            Add(side_column = new SideColumn(
-               DiscreteValuesFilterVM.Create<OrderSecurity, Side>(
+               DiscreteValuesFilterVM.Create<OrderSecurityRootPair, Side>(
                  new[] { Side.Buy, Side.Sell },
-                  ort => ort.order.side(),
+                  ort => ort.order.order.side(),
                  nameof(OrderBookRowVM.side))));
            // quantity
            Add(qty_column = new SizeColumn(
-               new UIntMinMax<OrderSecurity>(ort => ort.order.quantity(), nameof(OrderBookRowVM.quantity))));
+               new UIntMinMax<OrderSecurityRootPair>(ort => ort.order.order.quantity(), nameof(OrderBookRowVM.quantity))));
            // edit quantity column
            // not usually part of the main order book, but it's useful to add it
            // rather than debugging the popup window
            //Add(edit_qty_column = new EditableQtyColumn());
            // filled quantity
            Add(filled_qty_column = new FilledColumn(
-               new UIntMinMax<OrderSecurity>(ort => ort.order.filled(), nameof(OrderBookRowVM.filled_quantity))));
+               new UIntMinMax<OrderSecurityRootPair>(ort => ort.order.order.filled(), nameof(OrderBookRowVM.filled_quantity))));
            // price
            Add(price_column = new SimpleTextColumn<DoubleMinMaxState>(
               Columns.Price,
               "Price",
               r => r.price_text,
               DefaultColumnWidths.Price,
-               new PriceMinMax<OrderSecurity>(
-                  ort => ort.order.price(),
+               new PriceMinMax<OrderSecurityRootPair>(
+                  ort => ort.order.order.price(),
                  nameof(OrderBookRowVM.price)),
               DataGridFilterKnownTemplates.DoubleMinMax,
               _wrap_comparer(r => r.price)));
@@ -243,8 +243,8 @@ namespace mbts.spark {
               "Avg Price",
               r => r.avg_price_text,
               DefaultColumnWidths.Price,
-               new PriceMinMax<OrderSecurity>(
-                  ort => ort.order.avg_price(),
+               new PriceMinMax<OrderSecurityRootPair>(
+                  ort => ort.order.order.avg_price(),
                  nameof(OrderBookRowVM.avg_price)),
               DataGridFilterKnownTemplates.DoubleMinMax,
               _wrap_comparer(r => r.avg_price)));
@@ -254,30 +254,30 @@ namespace mbts.spark {
               "Last Filled",
               r => r.last_price_text,
               DefaultColumnWidths.Price,
-               new PriceMinMax<OrderSecurity>(
-                  ort => ort.order.last_price(),
+               new PriceMinMax<OrderSecurityRootPair>(
+                  ort => ort.order.order.last_price(),
                  nameof(OrderBookRowVM.last_price)),
               DataGridFilterKnownTemplates.DoubleMinMax,
               _wrap_comparer(r => r.last_price)));
            // piq
            Add(piq_column = new PiqColumn(
-               new UIntMinMax<OrderSecurity>(ort => ort.piq ?? uint.MaxValue, nameof(OrderBookRowVM.piq))));
+               new UIntMinMax<OrderSecurityRootPair>(ort => ort.order.piq ?? uint.MaxValue, nameof(OrderBookRowVM.piq))));
            // status
            Add(status_column = new SimpleTextColumn<OrderStatus[]>(
               Columns.Status,
               "Status",
               r => r.status.ToString(),
               80,
-               DiscreteValuesFilterVM.Create<OrderSecurity, OrderStatus>(
+               DiscreteValuesFilterVM.Create<OrderSecurityRootPair, OrderStatus>(
                  EnumHelper.get_values<OrderStatus>().ToList(),
-                  ort => ort.order.status(),
+                  ort => ort.order.order.status(),
                  nameof(OrderBookRowVM.status)),
               DataGridFilterKnownTemplates.EnumValues,
               _wrap_comparer(r => r.status)));
            // last message
            Add(last_message_column = new OrderBookLastMessageColumn(
-               new RegexFilterVM<OrderSecurity>(
-                  ort => ort.order.last_msg(),
+               new RegexFilterVM<OrderSecurityRootPair>(
+                  ort => ort.order.order.last_msg(),
                  nameof(OrderBookRowVM.last_msg))));
            // security key
            Add(security_key_column = new SimpleTextColumn<string>(
@@ -285,8 +285,8 @@ namespace mbts.spark {
               DefaultColumnHeaders.SecurityKey,
               r => r.security_key.ToString(),
               DefaultColumnWidths.SecurityKey,
-               new RegexFilterVM<OrderSecurity>(
-                  ort => ort.order.security_key().ToString(),
+               new RegexFilterVM<OrderSecurityRootPair>(
+                  ort => ort.order.order.security_key().ToString(),
                  nameof(OrderBookRowVM.security_key)),
               DataGridFilterKnownTemplates.Regex,
               _wrap_comparer(r => r.security_key)));
@@ -296,8 +296,8 @@ namespace mbts.spark {
               DefaultColumnHeaders.OrderKey,
               r => r.order_key.ToString(),
               DefaultColumnWidths.OrderKey,
-               new RegexFilterVM<OrderSecurity>(
-                  ort => ort.order.Key.ToString(),
+               new RegexFilterVM<OrderSecurityRootPair>(
+                  ort => ort.order.order.Key.ToString(),
                  nameof(OrderBookRowVM.order_key)),
               DataGridFilterKnownTemplates.Regex,
               _wrap_comparer(r => r.order_key)));
@@ -307,8 +307,8 @@ namespace mbts.spark {
               "Parent Key",
               r => r.parent_order_key.ToString(),
               DefaultColumnWidths.ParentKey,
-               new RegexFilterVM<OrderSecurity>(
-                  ort => ort.order.ParentKey.ToString(),
+               new RegexFilterVM<OrderSecurityRootPair>(
+                  ort => ort.order.order.ParentKey.ToString(),
                  nameof(OrderBookRowVM.parent_order_key)),
               DataGridFilterKnownTemplates.Regex,
               _wrap_comparer(r => r.parent_order_key)));
@@ -318,8 +318,8 @@ namespace mbts.spark {
               DefaultColumnHeaders.AttachedTargetOrderKey,
               r => r.order.attached_target_order_key().ToString(),
               DefaultColumnWidths.AttachedTargetOrderKey,
-               new RegexFilterVM<OrderSecurity>(
-                  ort => ort.order.attached_target_order_key().ToString(),
+               new RegexFilterVM<OrderSecurityRootPair>(
+                  ort => ort.order.order.attached_target_order_key().ToString(),
                  nameof(OrderBookRowVM.parent_order_key)),
               DataGridFilterKnownTemplates.Regex,
               _wrap_comparer(r => r.order.attached_target_order_key())));
@@ -428,9 +428,9 @@ namespace mbts.spark {
            }
         }

-         public Func<OrderSecurity, bool> get_filter() {
+         public Func<OrderSecurityRootPair, bool> get_filter() {
            var active_filters = this.OfType<ICVOrderBookColumn>().Where(c => c.filter.active.GetValueOrDefault()).Select(c => c.filter).ToArray();
-            return active_filters.Length == 0 ? null : new Func<OrderSecurity, bool>(r => active_filters.All(f => f.filter(r)));
+            return active_filters.Length == 0 ? null : new Func<OrderSecurityRootPair, bool>(r => active_filters.All(f => f.filter(r)));
         }

         public OrderBookSortingData get_sorting_data() {
@@ -531,7 +531,7 @@ namespace mbts.spark {
         GlyphContext _root_glyph_context, _child_glyph_context;

         protected OrderbookColumnBase(Columns col_key, string header, Func<OrderBookRowVM, string> get_text, double width,
-            IDataGridColumnPersistentFilter<OrderSecurity, T> filter, string filter_template, IComparer<OrderBookRowVM> comparer) : base(col_key) {
+            IDataGridColumnPersistentFilter<OrderSecurityRootPair, T> filter, string filter_template, IComparer<OrderBookRowVM> comparer) : base(col_key) {
            id = key.ToString();
            Width = width;
            Header = header;
@@ -548,10 +548,10 @@ namespace mbts.spark {
            }
         }

-         public IDataGridColumnPersistentFilter<OrderSecurity, T> filter { get; }
+         public IDataGridColumnPersistentFilter<OrderSecurityRootPair, T> filter { get; }
         public IComparer<OrderBookRowVM> comparer { get; }

-         IDataGridColumnFilter<OrderSecurity> ICVOrderBookColumn.filter => filter;
+         IDataGridColumnFilter<OrderSecurityRootPair> ICVOrderBookColumn.filter => filter;
         IDataGridColumnFilter IFilterableColumn.filter => filter;
         string IFilterableColumn.filter_template => _filter_template;
         ListSortDirection? ICVOrderBookColumn.SortDirection { get => _cached_sort_direction; set => SortDirection = value; }
@@ -565,7 +565,7 @@ namespace mbts.spark {

      public class SimpleTextColumn<TFilterState> : OrderbookColumnBase<TFilterState>, IRenderColumn<OrderBookRowVM> {
         public SimpleTextColumn(Columns key, string header, Func<OrderBookRowVM, string> get_text, double width,
-            IDataGridColumnPersistentFilter<OrderSecurity, TFilterState> filter, string filter_template, IComparer<OrderBookRowVM> comparer)
+            IDataGridColumnPersistentFilter<OrderSecurityRootPair, TFilterState> filter, string filter_template, IComparer<OrderBookRowVM> comparer)
            : base(key, header, get_text, width, filter, filter_template, comparer) { }

         public void draw(OrderBookRowVM row, DrawingContext dc, ColumnGeometry position, double row_height) =>
@@ -575,7 +575,7 @@ namespace mbts.spark {

      #region Explicit Column Defs
      public class SideColumn : OrderbookColumnBase<Side[]>, IRenderColumn<OrderBookRowVM> {
-         public SideColumn(IDataGridColumnPersistentFilter<OrderSecurity, Side[]> filter)
+         public SideColumn(IDataGridColumnPersistentFilter<OrderSecurityRootPair, Side[]> filter)
            : base(Columns.Side, "B/S", r => r.side.ToString(), DefaultColumnWidths.Side, filter, DataGridFilterKnownTemplates.EnumValues, _wrap_comparer(r => r.side)) { }

         public void draw(OrderBookRowVM row, DrawingContext dc, ColumnGeometry position, double row_height) =>
@@ -584,7 +584,7 @@ namespace mbts.spark {
      }

      public class SizeColumn : OrderbookColumnBase<UIntMinMaxState>, IRenderColumn<OrderBookRowVM> {
-         public SizeColumn(IDataGridColumnPersistentFilter<OrderSecurity, UIntMinMaxState> filter)
+         public SizeColumn(IDataGridColumnPersistentFilter<OrderSecurityRootPair, UIntMinMaxState> filter)
            : base(Columns.Size, "Qty", r => r.quantity.ToString(), DefaultColumnWidths.Size, filter, DataGridFilterKnownTemplates.UIntMinMax, _wrap_comparer(r => r.quantity)) { }

         public void draw(OrderBookRowVM row, DrawingContext dc, ColumnGeometry position, double row_height) =>
@@ -593,7 +593,7 @@ namespace mbts.spark {
      }

      public class FilledColumn : OrderbookColumnBase<UIntMinMaxState>, IRenderColumn<OrderBookRowVM> {
-         public FilledColumn(IDataGridColumnPersistentFilter<OrderSecurity, UIntMinMaxState> filter)
+         public FilledColumn(IDataGridColumnPersistentFilter<OrderSecurityRootPair, UIntMinMaxState> filter)
            : base(Columns.Filled, "Filled Qty", r => r.filled_quantity.ToString(), DefaultColumnWidths.Size, filter, DataGridFilterKnownTemplates.UIntMinMax, _wrap_comparer(r => r.filled_quantity)) { }

         public void draw(OrderBookRowVM row, DrawingContext dc, ColumnGeometry position, double row_height) =>
@@ -605,7 +605,7 @@ namespace mbts.spark {
         readonly BindingBase _foreground_binding;
         ListSortDirection? _cached_sort_direction;

-         public OrderBookOrderTypeColumn(Columns key, string badge_fill_binding_path, string display_name_binding_path, IComparer<OrderBookRowVM> row_comparer, IDataGridColumnPersistentFilter<OrderSecurity, AlgoID[]> filter, string header = DefaultColumnHeaders.OrderType)
+         public OrderBookOrderTypeColumn(Columns key, string badge_fill_binding_path, string display_name_binding_path, IComparer<OrderBookRowVM> row_comparer, IDataGridColumnPersistentFilter<OrderSecurityRootPair, AlgoID[]> filter, string header = DefaultColumnHeaders.OrderType)
            : base(key, new Binding(badge_fill_binding_path), new Binding(display_name_binding_path), filter, header) {
            id = key.ToString();
            this.filter = filter;
@@ -615,11 +615,11 @@ namespace mbts.spark {
            this.comparer = row_comparer;
         }

-         public new IDataGridColumnPersistentFilter<OrderSecurity, AlgoID[]> filter { get; }
+         public new IDataGridColumnPersistentFilter<OrderSecurityRootPair, AlgoID[]> filter { get; }
         public override string filter_template => DataGridFilterKnownTemplates.AlgoType;
         public IComparer<OrderBookRowVM> comparer { get; }

-         IDataGridColumnFilter<OrderSecurity> ICVOrderBookColumn.filter => filter;
+         IDataGridColumnFilter<OrderSecurityRootPair> ICVOrderBookColumn.filter => filter;
         ListSortDirection? ICVOrderBookColumn.SortDirection { get => _cached_sort_direction; set => SortDirection = value; }

         public override FrameworkElement view_factory() {
@@ -637,7 +637,7 @@ namespace mbts.spark {
      public class OrderBookLastMessageColumn : TextColumn<Columns>, ICVOrderBookColumn {
         ListSortDirection? _cached_sort_direction;

-         public OrderBookLastMessageColumn(IDataGridColumnPersistentFilter<OrderSecurity, string> filter)
+         public OrderBookLastMessageColumn(IDataGridColumnPersistentFilter<OrderSecurityRootPair, string> filter)
            : base(Columns.LastMessage, new Binding(nameof(OrderBookRowVM.last_msg)), filter, DataGridFilterKnownTemplates.Regex) {
            id = key.ToString();
            this.filter = filter;
@@ -646,10 +646,10 @@ namespace mbts.spark {
            tooltip_binding = new Binding(nameof(OrderBookRowVM.last_msg));
         }

-         public new IDataGridColumnPersistentFilter<OrderSecurity, string> filter { get; }
+         public new IDataGridColumnPersistentFilter<OrderSecurityRootPair, string> filter { get; }
         public IComparer<OrderBookRowVM> comparer => _wrap_comparer(r => r.last_msg);

-         IDataGridColumnFilter<OrderSecurity> ICVOrderBookColumn.filter => filter;
+         IDataGridColumnFilter<OrderSecurityRootPair> ICVOrderBookColumn.filter => filter;
         ListSortDirection? ICVOrderBookColumn.SortDirection { get => _cached_sort_direction; set => SortDirection = value; }

         protected override void OnSortDirectionChanged(ListSortDirection? new_value) {
@@ -659,7 +659,7 @@ namespace mbts.spark {
      }

      public class PiqColumn : OrderbookColumnBase<UIntMinMaxState>, IRenderColumn<OrderBookRowVM> {
-         public PiqColumn(IDataGridColumnPersistentFilter<OrderSecurity, UIntMinMaxState> filter)
+         public PiqColumn(IDataGridColumnPersistentFilter<OrderSecurityRootPair, UIntMinMaxState> filter)
            : base(Columns.Piq, "PIQ", r => r.piq_text, DefaultColumnWidths.Size, filter, DataGridFilterKnownTemplates.UIntMinMax, _wrap_comparer(r => r.piq)) { }

         public void draw(OrderBookRowVM row, DrawingContext dc, ColumnGeometry position, double row_height) =>
@@ -674,7 +674,7 @@ namespace mbts.spark {

         ListSortDirection? _cached_sort_direction;

-         public SecurityColumn(IDataGridColumnPersistentFilter<OrderSecurity, SecurityCriteria> filter) : base(Columns.Security) {
+         public SecurityColumn(IDataGridColumnPersistentFilter<OrderSecurityRootPair, SecurityCriteria> filter) : base(Columns.Security) {
            id = key.ToString();
            this.filter = filter;
            _foreground_binding = RenderUtils.get_foreground_binding(this);
@@ -683,10 +683,10 @@ namespace mbts.spark {
            _cached_sort_direction = SortDirection;
         }

-         public IDataGridColumnPersistentFilter<OrderSecurity, SecurityCriteria> filter { get; }
+         public IDataGridColumnPersistentFilter<OrderSecurityRootPair, SecurityCriteria> filter { get; }
         public IComparer<OrderBookRowVM> comparer => _wrap_comparer(r => r.security, SecurityHelper.Comparer.InstanceImmutable.to_nullable());

-         IDataGridColumnFilter<OrderSecurity> ICVOrderBookColumn.filter => filter;
+         IDataGridColumnFilter<OrderSecurityRootPair> ICVOrderBookColumn.filter => filter;
         IDataGridColumnFilter IFilterableColumn.filter => filter;
         string IFilterableColumn.filter_template => DataGridFilterKnownTemplates.DiscreteValues;
         ListSortDirection? ICVOrderBookColumn.SortDirection { get => _cached_sort_direction; set => SortDirection = value; }
@@ -1177,7 +1177,6 @@ namespace mbts.spark {
      public class CommitColumn : FrameworkElementColumnBase<Columns> {
         public CommitColumn() : base(Columns.Commit) {
            id = key.ToString();
-            Header = "";
            Width = 20;
         }

@@ -3,9 +3,11 @@ using bts.api;
 using bts.api.orderman;
 using bts.collections;
 using bts.spark;
+using bts.utils;
 using mbts.ui;
 using mbts.ui.controls;
 using System;
+using System.Collections.Generic;
 using System.ComponentModel;
 using System.Reactive.Linq;
 using System.Runtime.CompilerServices;
@@ -14,7 +16,9 @@ using System.Windows.Media;
 using Columns = mbts.spark.OrderBookGridView.ColumnKeys;

 namespace mbts.spark {
-   partial class OrderBookRowVM : IEquatable<OrderBookRowVM>, DIYGrid.IRowVM, IHierarchicalRow<OrderSecurity>, INotifyPropertyChanged {
+   partial class OrderBookRowVM : IEquatable<OrderBookRowVM>, DIYGrid.IRowVM, IHierarchicalRow<OrderSecurityRootPair>, INotifyPropertyChanged {
+      public static readonly IComparer<OrderBookRowVM> key_comparer = Comparer<uint>.Default.wrap<uint, OrderBookRowVM>(r => r.order_key).to_safe();
+
      const string _unknown_security_price_format_string = "0.#########";
      const int _unknown_security_price_num_fractional_digits = 9;
      readonly OrderBookVM _owner;
@@ -23,13 +27,13 @@ namespace mbts.spark {
      IRaiseCanExecuteChangedCommand _show_order_modify_cmd, _toggle_expanded_cmd, _cancel_cmd, _detach_command, _attach_command, _update_command, _modify_order_quantity_andor_price, _revert_prospective_order_quantity_andor_price;
      bool _is_parent, _is_expanded, _is_selected, _is_attachable, _is_detachable;
      int _depth_level;
-      SecurityImmutable? _security => order_tuple.security;
+      SecurityImmutable? _security => order_tuple.order.security;
      // for mini-ob 
      uint _prospective_quantity;
      double _prospective_price;
      Action<bool> _on_selection_changed;

-      public OrderBookRowVM(OrderBookVM owner, OrderSecurity order_tuple, bool is_expanded, Action<bool> on_selection_changed) {
+      public OrderBookRowVM(OrderBookVM owner, OrderSecurityRootPair order_tuple, bool is_expanded, Action<bool> on_selection_changed) {
         _owner = owner;
         this.order_tuple = order_tuple;
         is_visible = !is_child;
@@ -45,22 +49,22 @@ namespace mbts.spark {
      //// when the OrderBookVM.selected_order_changes, this emulates the selected
      //// order changing since the current_row setter invokes the selected_order_changed
      //// handler
-      public IObservable<OrderSecurity> subscribe_data() {
-         return Observable.FromEvent<Action, OrderSecurity>(
+      public IObservable<OrderSecurityRootPair> subscribe_data() {
+         return Observable.FromEvent<Action, OrderSecurityRootPair>(
            cb => () => cb(order_tuple),
            cb => invalidated += cb,
            cb => invalidated -= cb);
      }

      public event Action invalidated;
-      public event Action<(OrderSecurity oldval, OrderSecurity newval)> updated;
+      public event Action<(OrderSecurityRootPair oldval, OrderSecurityRootPair newval)> updated;
      public event PropertyChangedEventHandler PropertyChanged;

      // Core
-      public OrderSecurity order_tuple { get; private set; }
-      public OrderRecordImmutable order => order_tuple.order;
+      public OrderSecurityRootPair order_tuple { get; private set; }
+      public OrderRecordImmutable order => order_tuple.order.order;
      public OrderMetadata order_metadata => _owner.get_metadata(this);
-      public Brush badge_fill => _badge_fill ?? (_badge_fill = OrderUtils.badge_fill(order_tuple.meta, order_metadata));
+      public Brush badge_fill => _badge_fill ?? (_badge_fill = OrderUtils.badge_fill(order_tuple.order.meta, order_metadata));
      public uint order_key => order.Key;
      public uint parent_order_key => order.ParentKey;
      public uint security_key => order.security_key();
@@ -71,7 +75,7 @@ namespace mbts.spark {
      public string symbol => _security.symbol_or_default();
      // Def
      public CustomOrderDefinition.CustomOneofCase order_type => order.order_type();
-      public string display_name => order_tuple.display_name();
+      public string display_name => order_tuple.order.display_name();
      public OrderSubType order_sub_type => order.sub_type();
      public string order_sub_type_text => _fmt_order_sub_type(order_sub_type);
      public Side side => order.side();
@@ -93,7 +97,7 @@ namespace mbts.spark {
      public uint quantity => order.quantity();
      public uint filled_quantity => order.filled();
      public string last_msg => order.last_msg();
-      public uint piq => order_tuple.piq ?? uint.MaxValue;
+      public uint piq => order_tuple.order.piq ?? uint.MaxValue;
      public string piq_text => piq == uint.MaxValue ? string.Empty : piq.ToString();
      public bool is_non_terminal => order.is_non_terminal();
      public bool is_attachable { get => _is_attachable; set => SetVisual(ref _is_attachable, value); }
@@ -101,10 +105,10 @@ namespace mbts.spark {
      public string filled_status_desc => order.filled_status_description(security.spec_or_default());

      // Root Algo
-      public CustomOrderDefinition.CustomOneofCase root_algo_order_type => order_tuple.root_algo.value.CustomCase;
+      public CustomOrderDefinition.CustomOneofCase root_algo_order_type => order_tuple.root.algo.value.CustomCase;
      public OrderMetadata root_algo_order_metadata => _owner.get_metadata(root_algo_order_type);
      public Brush root_algo_badge_fill => _root_algo_badge_fill ?? (_root_algo_badge_fill = new SolidColorBrush(_root_algo_badge_color));
-      public string root_algo_display_name => order_tuple.root_algo.name;
+      public string root_algo_display_name => order_tuple.root.algo.name;

      // Tree
      public bool is_parent { get => _is_parent; set => Set(ref _is_parent, value); }
@@ -213,7 +217,7 @@ namespace mbts.spark {

      // private props
      Color _root_algo_badge_color {
-         get => _root_algo_badge_color_backing ?? (_root_algo_badge_color_backing = OrderUtils.badge_color(order_tuple.root_meta, root_algo_order_metadata)).Value;
+         get => _root_algo_badge_color_backing ?? (_root_algo_badge_color_backing = OrderUtils.badge_color(order_tuple.root.meta, root_algo_order_metadata)).Value;
         set {
            if (_root_algo_badge_color_backing != value) {
               _root_algo_badge_color_backing = value;
@@ -226,7 +230,7 @@ namespace mbts.spark {
      bool IHierarchicalRow.is_parent => is_parent;
      bool IHierarchicalRow.is_expanded => is_expanded;
      int IHierarchicalRow.depth_level => depth_level;
-      OrderSecurity IHierarchicalRow<OrderSecurity>.value => order_tuple;
+      OrderSecurityRootPair IHierarchicalRow<OrderSecurityRootPair>.value => order_tuple;

      void IHierarchicalRow.on_is_parent_changed(bool is_parent) => this.is_parent = is_parent;
      /// Do NOT actually call the <see cref="is_expanded"/> setter (it has side effects) - the row collection calls this method when the row is expanded/collapsed by some **external means, outside of this class.
@@ -238,7 +242,7 @@ namespace mbts.spark {
      /// <see cref="OperableHierarchicalCollection{TRow, T, TKey}.collapse_row(TKey)"/>
      void IHierarchicalRow.on_is_expanded_changed(bool is_expanded) => Set(ref _is_expanded, is_expanded, nameof(is_expanded));
      void IHierarchicalRow.on_depth_level_changed(int depth_level) => this.depth_level = depth_level;
-      void IHierarchicalRow<OrderSecurity>.on_value_changed(OrderSecurity value) => update(value);
+      void IHierarchicalRow<OrderSecurityRootPair>.on_value_changed(OrderSecurityRootPair value) => update(value);
      #endregion

      private void _unselect_me() {
@@ -254,8 +258,8 @@ namespace mbts.spark {
      internal void expand_internal() => Set(ref _is_expanded, true, nameof(is_expanded));
      internal void collapse_internal() => Set(ref _is_expanded, false, nameof(is_expanded));

-      public void update(OrderSecurity order_tuple) {
-         Log.assert(order_tuple.order.Key == this.order.Key, "OrderBookRowVM: update_order was called with an order with the wrong key.");
+      public void update(OrderSecurityRootPair order_tuple) {
+         Log.assert(order_tuple.order.order.Key == this.order.Key, "OrderBookRowVM: update_order was called with an order with the wrong key.");
         // _show_order_modify_cmd is lazy (instantiated in the default_command getter); it might be null, don't not force instantiation
         bool? could_modify_execute = _show_order_modify_cmd?.CanExecute(null);
         var old_order_tuple = this.order_tuple;
@@ -281,25 +285,25 @@ namespace mbts.spark {
         if ((Columns.Security & dirty) != 0)
            RaisePropertyChanged(nameof(security), nameof(security_text));
         // badge fill
-         if (old_order_tuple.meta?.badge_color != order_tuple.meta?.badge_color) {
+         if (old_order_tuple.order.meta?.badge_color != order_tuple.order.meta?.badge_color) {
            // invalidate by setting to null (will be re-instantiated in the public getter)
            _badge_fill = null;
            RaisePropertyChanged(nameof(badge_fill));
         }
         // display name
-         if (old_order_tuple.display_name() != order_tuple.display_name())
+         if (old_order_tuple.order.algo.name != order_tuple.order.algo.name)
            RaisePropertyChanged(nameof(display_name));
         // root badge fill
         if (_root_algo_badge_color_backing.HasValue) {
            // only need to invalidate it if it had a value (it is lazily instantiated)
-            _root_algo_badge_color = OrderUtils.badge_color(order_tuple.root_meta, root_algo_order_metadata);
+            _root_algo_badge_color = OrderUtils.badge_color(order_tuple.root.meta, root_algo_order_metadata);
            RaisePropertyChanged(nameof(root_algo_badge_fill));
         }
         // root display name
-         if (old_order_tuple.root_algo.name != order_tuple.root_algo.name)
+         if (old_order_tuple.root.algo.name != order_tuple.root.algo.name)
            RaisePropertyChanged(nameof(root_algo_display_name));
         // root order type
-         if (old_order_tuple.root_algo.value.CustomCase != order_tuple.root_algo.value.CustomCase) {
+         if (old_order_tuple.root.algo.value.CustomCase != order_tuple.root.algo.value.CustomCase) {
            RaisePropertyChanged(nameof(root_algo_order_type));
         }
         // status
@@ -317,7 +321,7 @@ namespace mbts.spark {
         // always raise updated
         updated?.Invoke((old_order_tuple, order_tuple));
         // terminal state
-         if (old_order_tuple.order.is_non_terminal() != order_tuple.order.is_non_terminal()) {
+         if (old_order_tuple.order.order.is_non_terminal() != order_tuple.order.order.is_non_terminal()) {
            // while we call refresh_is_at/detachable in the OrderBookRowCollection.update
            // on all the children of a modified row, we used to not call it on the row istelf,
            // which should of course be done here. This manifested via the very top parent in any
@@ -398,35 +402,35 @@ namespace mbts.spark {
               Columns.AvgFilled |
               Columns.Status;

-         public static Columns get_dirty_cells(OrderSecurity oldval, OrderSecurity newval) {
+         public static Columns get_dirty_cells(OrderSecurityRootPair oldval, OrderSecurityRootPair newval) {
            var dirty = (Columns)0;
-            if (oldval.security != newval.security)
+            if (oldval.order.security != newval.order.security)
               dirty |= Columns.Security;
-            if (oldval.order.last_change() != newval.order.last_change())
+            if (oldval.order.order.last_change() != newval.order.order.last_change())
               dirty |= Columns.LastChange;
-            if (oldval.order.filled() != newval.order.filled())
+            if (oldval.order.order.filled() != newval.order.order.filled())
               dirty |= Columns.Filled;
-            if (oldval.order.last_price() != newval.order.last_price())
+            if (oldval.order.order.last_price() != newval.order.order.last_price())
               dirty |= Columns.LastPrice;
-            if (oldval.order.avg_price() != newval.order.avg_price())
+            if (oldval.order.order.avg_price() != newval.order.order.avg_price())
               dirty |= Columns.AvgFilled;
-            if (oldval.order.price() != newval.order.price())
+            if (oldval.order.order.price() != newval.order.order.price())
               dirty |= Columns.Price;
-            if (oldval.order.quantity() != newval.order.quantity())
+            if (oldval.order.order.quantity() != newval.order.order.quantity())
               dirty |= Columns.Size;
-            if (oldval.order.ParentKey != newval.order.ParentKey)
+            if (oldval.order.order.ParentKey != newval.order.order.ParentKey)
               dirty |= Columns.ParentKey;
-            if (oldval.order.attached_target_order_key() != newval.order.attached_target_order_key())
+            if (oldval.order.order.attached_target_order_key() != newval.order.order.attached_target_order_key())
               dirty |= Columns.AttachedTargetOrderKey;
-            if (oldval.order.status() != newval.order.status())
+            if (oldval.order.order.status() != newval.order.order.status())
               dirty |= Columns.Status;
-            if (oldval.order.last_msg() != newval.order.last_msg())
+            if (oldval.order.order.last_msg() != newval.order.order.last_msg())
               dirty |= Columns.LastMessage;
-            if (oldval.piq != newval.piq) {
+            if (oldval.order.piq != newval.order.piq) {
               dirty |= Columns.Piq;
            }
            return dirty;
         }
      }
   }
-}
+}
@@ -20,7 +20,6 @@ using mbts.utils;
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Collections.Immutable;
 using System.Collections.ObjectModel;
 using System.Collections.Specialized;
 using System.Linq;
@@ -38,15 +37,19 @@ namespace mbts.spark {
         _min_order_params_height = 300,
         _min_ladder_height = 100,
         _min_fills_height = 100;
+      static readonly TimeSpan _selection_change_throttle = TimeSpan.FromSeconds(0.1);
+
      readonly IBus _bus;
      readonly OrdersModel _model;
      readonly Property<OrderBookRowVM> _current_row;
+      readonly ObservableSortedCollection<OrderBookRowVM> _selected_rows = new ObservableSortedCollection<OrderBookRowVM>(OrderBookRowVM.key_comparer);
      readonly DelegateProperty<bool> _show_order_params, _show_ladder, _show_fills, _can_attach_selected_orders, _can_detach_selected_orders;
-      readonly OperableHierarchicalCollection<OrderBookRowVM, OrderSecurity, uint> _row_collection;
+      readonly OperableHierarchicalCollection<OrderBookRowVM, OrderSecurityRootPair, uint> _row_collection;
      readonly OrderBookColumnCollection _columns;
      readonly IWindowSettingsManager<OrderBookGridSettings> _settings_manager;
      readonly IWindowSettingsManager<GridSettings> _fills_settings_manager = new WindowSettingsManager<GridSettings>.DisconnectedImpl(FillsSettings.MiniGridSettings, FillsSettings.MiniGridSettings);
-      readonly SelectedOrderParamsMon _selected_params_mon;
+      readonly OrderParamsAggregator _selected_params_mon;
+      readonly CommonValueMonitor<SecurityImmutable?> _selected_security_mon = new CommonValueMonitor<SecurityImmutable?>();
      readonly RightPanelModel _right_panel = new RightPanelModel();
      OrderBookFillsGridSettings _cached_fills_settings = OrderBookStartupData.DefaultFillsGrid;
      double
@@ -59,16 +62,14 @@ namespace mbts.spark {
         _is_attaching_orders,
         _is_row_collection_populated,
         _all_rows_selected;
-      IReadOnlyDictionary<uint, OrderSecurity> _cached_orders = DictionaryHelper.empty<uint, OrderSecurity>();
+      IReadOnlyDictionary<uint, OrderSecurityRootPair> _cached_orders = DictionaryHelper.empty<uint, OrderSecurityRootPair>();
      IReadOnlyDictionary<uint, bool> _cached_attachable = DictionaryHelper.empty<uint, bool>(), _cached_detachable = DictionaryHelper.empty<uint, bool>();
      HashSet<uint>
         _attachable_selected_orders = new HashSet<uint>(),
         _detachable_selected_orders = new HashSet<uint>();
      FilterData _cached_filter_data;
-      Dictionary<uint, IDisposable> _on_updated_single_callback_gatekeeper = new Dictionary<uint, IDisposable>();

      public OrderBookVM(
-         IObservable<string> owner_title, 
         IBus bus, 
         INotificationService notification_service, 
         OrdersModel model, 
@@ -77,8 +78,9 @@ namespace mbts.spark {

         _bus = bus;
         _model = model;
-         _selected_params_mon = new SelectedOrderParamsMon(model.dynamic_helper);
-         order_mod_vm = new OrderParamsVM(this, AlgoDefinitionVM.create(model, OrderDataHelper.Defaults.AlgoData(), editing_permissions: AlgoEditingPermissions.AllowEditValues));
+         _selected_params_mon = new OrderParamsAggregator(model.dynamic_helper, _selection_change_throttle, k => _cached_orders.TryGetValue(k, out var o) ? o.order : (OrderSecurityAlgo?)null);
+         ladder_vm = new LadderVMContainer(bus, model);
+         order_mod_vm = new OrderParamsVM(this, AlgoFormats.Exchange, AlgoEditingPermissions.AllowEditValues);
         order_mod_vm.algo_vm.editing_permissions_mask = AlgoEditingPermissions.None;
         order_mod_vm.algo_vm.algo_root = null;
         _show_order_params = backing(nameof(show_order_params), () => (_right_panel.visible_components & OrderBookRightPanelSettings.Components.Params) != 0);
@@ -91,16 +93,12 @@ namespace mbts.spark {
         };
         _can_attach_selected_orders = backing(nameof(can_attach_selected_orders), () => _attachable_selected_orders.Count == selected_rows.Count && selected_rows.Count > 0);
         _can_detach_selected_orders = backing(nameof(can_detach_selected_orders), () => _detachable_selected_orders.Count == selected_rows.Count && selected_rows.Count > 0);
-         attach_vm = new OrderParamsVM(this,
-            AlgoDefinitionVM.create(_model,
-               OrderDataHelper.Defaults.AlgoData(CustomOrderDefinition.CustomOneofCase.Iceberg),
-               init_format: AlgoFormats.Attachable,
-               editing_permissions: AlgoEditingPermissions.AllowEditStructure | AlgoEditingPermissions.AllowEditValues));
+         attach_vm = new OrderParamsVM(this, AlgoFormats.Attachable, AlgoEditingPermissions.AllowEditStructure | AlgoEditingPermissions.AllowEditValues);
         _settings_manager = settings_manager;
         _columns = new OrderBookColumnCollection(bus, model, model.on_order_securities.Select(x => (x.added.Values, x.removed.Values)));
         // we use an ObservableAppendCollection b/c the mini-ob needs a cancel column at the front
         columns = new ObservableAppendCollection<DIYGrid.ColumnBase>(_columns);
-         _row_collection = new OperableHierarchicalCollection<OrderBookRowVM, OrderSecurity, uint>(
+         _row_collection = new OperableHierarchicalCollection<OrderBookRowVM, OrderSecurityRootPair, uint>(
            o => new OrderBookRowVM(this, o, rows_are_initially_expanded, (row_is_selected) => {
               // all are selected and one is checked off
               if (all_rows_selected && !row_is_selected) {
@@ -112,11 +110,11 @@ namespace mbts.spark {
                  RaisePropertyChanged(nameof(this.all_rows_selected));
               }
            }) {
-               is_attachable = _cached_attachable.TryGetValue(o.order.Key, out bool ia) && ia,
-               is_detachable = _cached_detachable.TryGetValue(o.order.Key, out bool id)
+               is_attachable = _cached_attachable.TryGetValue(o.order.order.Key, out bool ia) && ia,
+               is_detachable = _cached_detachable.TryGetValue(o.order.order.Key, out bool id)
            },
-            r => r.order.Key,
-            r => r.order.ParentKey,
+            r => r.order.order.Key,
+            r => r.order.order.ParentKey,
            _columns.get_sorting_data().comparer);
         _row_collection.CollectionChanged += _row_collection_CollectionChanged;
         _current_row = backing<OrderBookRowVM>(nameof(current_row));
@@ -145,8 +143,7 @@ namespace mbts.spark {
               s => fills_vm.value.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(fills_vm.columns.Select(c => c.create())),
-                  Observable.Return(title)
+                  s.with(fills_vm.columns.Select(c => c.create()))
               ),
               show_save_as_defaults: false);
            // TODO: bind to main window's Title
@@ -154,7 +151,7 @@ namespace mbts.spark {
            vm.RequestClose += (s, e) => WindowUtilities.force_close(dialog);
            return dialog;
         }));
-         grid_settings_manager = new OrderBookGridSettingsManager(owner_title, bus, notification_service, model, rows, columns);
+         grid_settings_manager = new OrderBookGridSettingsManager(bus, notification_service, model, rows, core_columns);
         grid_settings_manager.algo_tree_display_mode_changed += _on_filter_changed;
         IDisposable attach_vm_hooks = null;
         begin_attaching += on_begin_attaching;
@@ -177,14 +174,35 @@ namespace mbts.spark {
               if (ch.newval && fills_height < _min_fills_height)
                  fills_height = _min_fills_height;
            }),
+            _selected_security_mon.SubscribeThrottled(_selection_change_throttle).to_security_md(bus).OnDispatcher().Subscribe(smd => ladder_vm.security_md = smd),
+            _subscribe_throttled_selected_rows().OnDispatcher().Subscribe(_ => {
+               var hierarchical_order_keys = new HashSet<uint>(selected_hierarchical_rows.Select(r => r.order_key));
+               ladder_vm.set_orders(hierarchical_order_keys);
+            }),
            _selected_params_mon.subscribe_all_active().Subscribe(on_all_selected_orders_active_changed),
            _selected_params_mon.subscribe_security_plurality().Subscribe(p => {
               security_plurality = p;
               RaisePropertyChanged(nameof(security_plurality));
            }),
            orders_source.OnDispatcher().Subscribe(t => {
-               _cached_orders = t.state;
-               _row_collection.update(t.added, t.changed, t.removed.Select(o => o.order.Key));
+               if (_selected_rows.Count == 0) {
+                  _cached_orders = t.state;
+                  _row_collection.update(t.added, t.changed, t.removed.Select(OrderSecurityHelper.root_pair_key_fn));
+               } else {
+                  using (_selected_params_mon.defer_updates())
+                  using (_selected_security_mon.defer_updates()) {
+                     _cached_orders = t.state;
+                     _row_collection.update(t.added, t.changed, t.removed.Select(OrderSecurityHelper.root_pair_key_fn));
+                     // Remove, then re-add, all selected roots from _selected_params_mon
+                     // to capture algo param changes at any level (this keeps the update panel in sync).
+                     _selected_params_mon.Clear();
+                     _selected_security_mon.clear();
+                     foreach (var r in _selected_rows) {
+                        _selected_params_mon.Add(r.order_tuple.root);
+                        _selected_security_mon.add(r.security);
+                     }
+                  }
+               }
            }),
            model.on_orders_can_attach.OnDispatcher().Subscribe(table => {
               _cached_attachable = new MappedDictionary<uint, KeyValuePair<uint, bool>, bool>(table.state, kv => kv.Value);
@@ -218,7 +236,6 @@ namespace mbts.spark {
            order_mod_vm.algo_vm.connect_data(Observable.Return(model)),
            order_mod_vm.algo_vm.connect_data(_selected_params_mon.subscribe_spreader_security()),
            order_mod_vm.algo_vm,
-            bus.subscribe(SparkTags.SecuritiesTag).OnDispatcher().Subscribe(_selected_params_mon.on_security_md_map),
            attach_vm,
            _show_fills.observe_current(true)
            .Subscribe(is_visible => {
@@ -266,11 +283,11 @@ namespace mbts.spark {
            try {
               double price = attach_vm.price;
               uint? size = attach_vm.size;
-               uint algo_template_key = attach_vm.algo_vm.algo_root.id.is_persisted ? attach_vm.algo_vm.algo_root.id.persisted.id_uint : 0u;
+               uint algo_template_key = attach_vm.algo_vm.algo_root.id.is_persisted ? attach_vm.algo_vm.algo_root.id.persisted : 0u;
               var order_tups = selected_rows.Select(r => r.order_tuple).ToList();
               var mod_algo_vm = attach_vm.algo_vm.algo_root;
               await Task.WhenAll(order_tups.Select(t => {
-                  var algo = t.order.Def.CustomDef.actual().CloneToMutable();
+                  var algo = t.order.order.Def.CustomDef.actual().CloneToMutable();
                  mod_algo_vm.assign_to(algo);
                  if (algo_template_key != 0) {
                     algo = new CustomOrderDefinition {
@@ -281,12 +298,12 @@ namespace mbts.spark {
                     };
                  }
                  return _model.send_order(
-                     t.order.Def.with(
-                        attach_target_order_key: t.order.Key,
+                     t.order.order.Def.with(
+                        attach_target_order_key: t.order.order.Key,
                        custom_def: algo
                     ),
-                     double.IsNaN(price) ? t.order.price() : price,
-                     size ?? t.order.quantity());
+                     double.IsNaN(price) ? t.order.order.price() : price,
+                     size ?? t.order.order.quantity());
               }));
            } catch (Exception ex) {
               Log.Ui.error($"Error sending attached orders: {ex}.");
@@ -313,21 +330,20 @@ namespace mbts.spark {
                  }),
                  // custom templates (created by user)
                  _model.algo_model.definitions.OnDispatcher().Subscribe(u =>
-                     AlgoCollectionHelper.update_persisted_definition_wrappers(attach_vm.algo_vm.algo_roots_index, u, mk_factory(true)))));
+                     AlgoCollectionHelper.update_persisted_definition_wrappers(attach_vm.algo_vm.algo_roots_index, u, mk_algo_def_vm))));
            // vm factory
-            Func<AlgoData, AlgoDefinitionVM> mk_factory(bool connect) =>
-               fd => {
-                  var vm = AlgoDefinitionVM.create(_model, fd, connect, OrderDataHelper.get_algo_format(_selected_params_mon.security?.ContractCase), AlgoEditingPermissions.AllowEditValues);
-                  vm.selected_format = OrderDataHelper.get_algo_format(_selected_params_mon.security?.ContractCase);
-                  return vm;
-               };
+            AlgoDefinitionVM mk_algo_def_vm(AlgoData fd) {
+               var vm = AlgoDefinitionVM.create(_model, fd, OrderDataHelper.get_algo_format(_selected_params_mon.security?.ContractCase), AlgoEditingPermissions.AllowEditValues);
+               vm.selected_format = OrderDataHelper.get_algo_format(_selected_params_mon.security?.ContractCase);
+               return vm;
+            }
         }
         void on_end_attaching() => Disposable.dispose(ref attach_vm_hooks);

         IDisposable connect_order_mod_vm() =>
            Disposable.Create(
-               _selected_params_mon.subscribe_algos().Subscribe(order_mod_vm.algo_vm.load_many),
-               order_mod_vm.subscribe_is_dirty().Subscribe(_ => {
+               _selected_params_mon.subscribe_algos().OnDispatcher().Subscribe(order_mod_vm.algo_vm.load_many),
+               order_mod_vm.subscribe_is_dirty().OnDispatcher().Subscribe(_ => {
                  modify_selected_orders_async_cmd.RaiseCanExecuteChanged();
                  revert_selected_orders_cmd.RaiseCanExecuteChanged();
               }),
@@ -335,10 +351,11 @@ namespace mbts.spark {

         IDisposable connect_common_selected_params(OrderParamsVM vm) =>
            Disposable.Create(
-               _selected_params_mon.subscribe_security_md().Subscribe(newval => vm.security_md = newval),
-               _selected_params_mon.subscribe_price().Subscribe(vm.on_common_price),
-               _selected_params_mon.subscribe_size().Subscribe(vm.on_common_size),
-               _selected_params_mon.subscribe_account().Subscribe(newval => vm.selected_account = newval));
+               _selected_params_mon.subscribe_security().OnDispatcher().to_security_md(bus).OnDispatcher().Subscribe(newval => vm.security_md = newval),
+               _selected_params_mon.subscribe_price().OnDispatcher().Subscribe(vm.on_common_price),
+               _selected_params_mon.subscribe_size().OnDispatcher().Subscribe(vm.on_common_size),
+               _selected_params_mon.subscribe_account().OnDispatcher().Subscribe(newval => vm.selected_account = newval));
+
      }

      private void _row_collection_CollectionChanged(object sender, NotifyCollectionChangedEventArgs e) {
@@ -370,7 +387,7 @@ namespace mbts.spark {
      public OrderParamsVM order_mod_vm { get; }
      public FillsVMContainer fills_vm { get; } = new FillsVMContainer();
      public OrderParamsVM attach_vm { get; }
-      public ObservableCollection<OrderBookRowVM> selected_rows { get; } = new ObservableCollection<OrderBookRowVM>();
+      public IReadOnlyObservableCollection<OrderBookRowVM> selected_rows => _selected_rows;
      public IEnumerable<OrderRecordImmutable> selected_orders => selected_rows.Select(r => r.order);
      public IEnumerable<OrderBookRowVM> selected_hierarchical_rows => selected_rows.SelectMany(r => new[] { r }.Concat(_row_collection.get_descendent_rows(r.order_key)));
      public OrderBookGridSettingsManager grid_settings_manager { get; }
@@ -440,6 +457,7 @@ namespace mbts.spark {
            request_selection?.Invoke((_row_collection, _all_rows_selected));
         }
      }
+      public LadderVMContainer ladder_vm { get; }

      public IObservable<bool> subscribe_show_fills() => _show_fills.observe_current(true);
      public IObservable<bool> subscribe_show_ladder() => _show_ladder.observe_current(true);
@@ -447,55 +465,33 @@ namespace mbts.spark {

      public void row_selection_changed(SelectionChangedEventArgs e) {
         try {
-            using (_selected_params_mon.begin_udpate()) {
+            using (_selected_params_mon.defer_updates())
+            using (_selected_security_mon.defer_updates()) {
               if (e.RemovedItems != null) {
-                  foreach (var row_vm in e.RemovedItems.OfType<OrderBookRowVM>()) {
-                     row_vm.is_selected = false;
-                     _selected_params_mon.on_order_unselected(_get_root(row_vm.order_tuple));
-                     _attachable_selected_orders.Remove(row_vm.order_key);
-                     _detachable_selected_orders.Remove(row_vm.order_key);
+                  foreach (var row in e.RemovedItems.OfType<OrderBookRowVM>()) {
+                     row.is_selected = false;
+                     _selected_rows.Remove(row);
+                     _selected_params_mon.Remove(row.order_tuple.root);
+                     _selected_security_mon.remove(row.security);
+                     _attachable_selected_orders.Remove(row.order_key);
+                     _detachable_selected_orders.Remove(row.order_key);
                  }
               }
               if (e.AddedItems != null) {
-                  foreach (var row_vm in e.AddedItems.OfType<OrderBookRowVM>()) {
-                     var root = _get_root(row_vm.order_tuple);
-                     row_vm.is_selected = true;
-                     if (!_on_updated_single_callback_gatekeeper.ContainsKey(row_vm.order_key)) {
-                        row_vm.updated += on_updated;
-                        _on_updated_single_callback_gatekeeper.Add(row_vm.order_key, Disposable.Create(() => row_vm.updated -= on_updated));
-                     }
-                     _selected_params_mon.on_order_selected(root);
-                     if (row_vm.is_attachable)
-                        _attachable_selected_orders.Add(row_vm.order_key);
-                     if (row_vm.is_detachable)
-                        _detachable_selected_orders.Add(row_vm.order_key);
-                     void on_updated((OrderSecurity oldval, OrderSecurity newval) change) {
-                        if (!row_vm.is_selected) {
-                           // self destruct
-                           if (_on_updated_single_callback_gatekeeper.TryGetValue(row_vm.order_key, out var unsubscribe_updated_disposable)) {
-                              unsubscribe_updated_disposable.Dispose();
-                              _on_updated_single_callback_gatekeeper.Remove(row_vm.order_key);
-                           }
-                           _selected_params_mon.on_order_unselected(_get_root(row_vm.order_tuple));
-                           return;
-                        }
-                        var new_root = _get_root(change.newval);
-                        if (!new_root.Equals(root)) {
-                           // unselect and select in one smooth motion via on_row_updated
-                           // because we thought there may be gremlins afoot when doing
-                           // on_row_unselected and then on_row_selected
-                           _selected_params_mon.on_order_updated((root, new_root));
-                           root = new_root;
-                        }
-                     }
+                  foreach (var row in e.AddedItems.OfType<OrderBookRowVM>()) {
+                     row.is_selected = true;
+                     _selected_rows.Add(row);
+                     _selected_params_mon.Add(row.order_tuple.root);
+                     _selected_security_mon.add(row.security);
+                     if (row.is_attachable) _attachable_selected_orders.Add(row.order_key);
+                     if (row.is_detachable) _detachable_selected_orders.Add(row.order_key);
                  }
               }
-               RowSelectionHelper.apply_changes(selected_rows, e);
-               _can_attach_selected_orders.refresh();
-               _can_detach_selected_orders.refresh();
-               selected_order_changed?.Invoke(current_order);
            }
-         } catch(Exception ex) {
+            _can_attach_selected_orders.refresh();
+            _can_detach_selected_orders.refresh();
+            selected_order_changed?.Invoke(current_order);
+         } catch (Exception ex) {
            // [John]I observed a strange null-reference exception in this callback when the launcher was shutting down (see https://bluetradesys.atlassian.net/browse/SPARK-2089)
            Log.Ui.error($"[{nameof(OrderBookVM)}] Error handling selection change: {ex}");
         }
@@ -565,11 +561,11 @@ namespace mbts.spark {
            if (!new_sort.Equals(old_sort)) {
               /// Both filter and sort have changed, use <see cref="OperableHierarchicalCollection{TRow, T, TKey}.defer_refresh"/> to avoid syncing twice.
               using (_row_collection.defer_refresh()) {
-                  _row_collection.filter = new_filter.build_predicate(_model.dynamic_helper.dynamic_type_index);
+                  _row_collection.filter = new_filter.build_predicate();
                  _row_collection.comparer = new_sort.comparer;
               }
            } else {
-               _row_collection.filter = new_filter.build_predicate(_model.dynamic_helper.dynamic_type_index);
+               _row_collection.filter = new_filter.build_predicate();
            }
         } else if (!new_sort.Equals(old_sort))
            _row_collection.comparer = new_sort.comparer;
@@ -589,21 +585,6 @@ namespace mbts.spark {

      public void begin_attach_algos() => is_attaching_orders = true;

-      public bool try_get_parent(OrderBookRowVM row, out OrderSecurity parent) =>
-         _cached_orders.TryGetValue(row.parent_order_key, out parent);
-
-      OrderBookRowVM _get_root_row(OrderBookRowVM row) {
-         while (row.parent_order_key != 0 && _row_collection.get_parent(row.parent_order_key) is OrderBookRowVM prow)
-            row = prow;
-         return row;
-      }
-
-      OrderSecurity _get_root(OrderSecurity os) {
-         while (os.order.ParentKey != 0 && _cached_orders.TryGetValue(os.order.ParentKey, out var pos))
-            os = pos;
-         return os;
-      }
-
      internal void detach_orders(OrderBookRowVM row) {
         if (row.is_selected) {
            _detach_orders_async(selected_rows).ignore();
@@ -612,17 +593,10 @@ namespace mbts.spark {
         }
      }

-      public OrderSecurity get_ordersecurityalgometa(OrderRecordImmutable order) {
-         _cached_orders.TryGetValue(order.Key, out var osam);
-         return osam;
-      }
-
      public OrderMetadata get_metadata(CustomOrderDefinition.CustomOneofCase order_type) => _model.factory.get_metadata(order_type);

      public OrderMetadata get_metadata(OrderBookRowVM row) => _model.factory.get_metadata(row.order.actual_order_type());

-      internal OrderBookRowVM get_parent(OrderBookRowVM row) => _row_collection.get_parent(row.order_key);
-
      internal void show_order_modify(OrderBookRowVM row) =>
         _bus.post(SparkTags.ShowModifyOrderTag, row.order_key);

@@ -655,7 +629,7 @@ namespace mbts.spark {
         var fd = new FilterData(grid_settings_manager.algo_tree_display_mode, _columns.create_filter_states());
         if (!fd.Equals(_cached_filter_data)) {
            _cached_filter_data = fd;
-            _row_collection.filter = fd.build_predicate(_model.dynamic_helper.dynamic_type_index);
+            _row_collection.filter = fd.build_predicate();
         }
      }

@@ -684,9 +658,9 @@ namespace mbts.spark {
            // their values will be cleared (in the param grid gui), and the modifications will not be applied.
            // FYI this behavior is implemented to support 'partial edits.' (e.g., changing the 'price' for multiple orders that do not have the same 'size').
            // ----
-            var update_params = selected_rows.Select(r => update_params_factory(_get_root(r.order_tuple))).ToList();
+            var update_params = selected_rows.Select(r => update_params_factory(r.order_tuple.root)).ToList();
            await Task.WhenAll(update_params.Select(t => _model.update_order(t.order, new_price: price, new_size: size, new_algo: t.new_algo)));
-            (OrderRecordImmutable order, CustomOrderDefinitionImmutable? new_algo) update_params_factory(OrderSecurity order_tuple) {
+            (OrderRecordImmutable order, CustomOrderDefinitionImmutable? new_algo) update_params_factory(OrderSecurityAlgo order_tuple) {
               var mod_algo = order_tuple.order.Def.CustomDef.CloneToMutable();
               if (mod_algo.CustomCase == CustomOrderDefinition.CustomOneofCase.Composite) {
                  mod_algo_vm.assign_to(mod_algo.Composite.Definition);
@@ -699,7 +673,7 @@ namespace mbts.spark {
         } else await Task.WhenAll(selected_rows.Select(r => _model.update_order(r.order, price)));
      }

-      IObservable<ObservableCollection<OrderBookRowVM>> _subscribe_throttled_selected_rows() =>
+      IObservable<IReadOnlyList<OrderBookRowVM>> _subscribe_throttled_selected_rows() =>
         selected_rows.Observe().BufferLatest(TimeSpan.FromSeconds(0.2)).Select(_ => selected_rows);

      static OrderBookFillsGridSettings _get_fills_settings(FillsVM fills_vm) =>
@@ -737,52 +711,6 @@ namespace mbts.spark {
         }
      }

-      static IObservable<ISet<uint>> _subscribe_selected_order_keys(ObservableCollection<OrderBookRowVM> selected_rows) =>
-         Observable.Create<ISet<uint>>(o => {
-            bool waiting_for_mouse_up = false;
-            var sub_container = new DisposableContainer();
-            var builder = ImmutableHashSet<uint>.Empty.ToBuilder();
-            foreach (var row in selected_rows)
-               builder.Add(row.order_key);
-            var selected_keys = builder.ToImmutable();
-            o.OnNext(selected_keys);
-            return Disposable.Create(selected_rows.Subscribe(on_selection_changed), sub_container);
-            void on_selection_changed(object sender, NotifyCollectionChangedEventArgs e) {
-               if (waiting_for_mouse_up)
-                  return;
-               switch (e.Action) {
-                  case NotifyCollectionChangedAction.Add:
-                  case NotifyCollectionChangedAction.Replace:
-                     foreach (OrderBookRowVM row in e.NewItems)
-                        selected_keys = selected_keys.Add(row.order_key);
-                     break;
-                  case NotifyCollectionChangedAction.Remove:
-                     foreach (OrderBookRowVM row in e.OldItems)
-                        selected_keys = selected_keys.Remove(row.order_key);
-                     break;
-                  case NotifyCollectionChangedAction.Reset:
-                     selected_keys = ImmutableHashSet<uint>.Empty;
-                     break;
-                  default: return;
-               }
-               if (Mouse.LeftButton == MouseButtonState.Pressed) {
-                  waiting_for_mouse_up = true;
-                  wait_for_mouse_up();
-                  async void wait_for_mouse_up() {
-                     await Wait.until_true(() => Mouse.LeftButton == MouseButtonState.Released, TimeSpan.FromSeconds(60), 333);
-                     builder = ImmutableHashSet<uint>.Empty.ToBuilder();
-                     foreach (var row in selected_rows)
-                        builder.Add(row.order_key);
-                     selected_keys = builder.ToImmutable();
-                     o.OnNext(selected_keys);
-                     waiting_for_mouse_up = false;
-                  }
-               } else {
-                  o.OnNext(selected_keys);
-               }
-            }
-         });
-
      public class OrderParamsVM : DisposableViewModelBase {
         readonly SelectorProperty<AccountTuple, AccountTuple?> _accounts;
         readonly OrderBookVM _owner;
@@ -793,18 +721,17 @@ namespace mbts.spark {
         AlgoParamPermissions
            _price_permissions = AlgoParamPermissions.ReadOnly | AlgoParamPermissions.Write,
            _size_permissions = AlgoParamPermissions.ReadOnly | AlgoParamPermissions.Write;
-         HashSet<uint> _selected_order_tree = new HashSet<uint>();
-         LadderVM _ladder_vm;
         SecurityMD? _security_md;

-         public OrderParamsVM(OrderBookVM owner)
+         public OrderParamsVM(OrderBookVM owner, AlgoFormats init_format, AlgoEditingPermissions init_permissions)
            : this(owner,
                 AlgoDefinitionVM.create(
                    owner._model,
-                     new AlgoData(OrderDataHelper.Defaults.CustomOrderDefinitionImmutable(CustomOrderDefinition.CustomOneofCase.Iceberg)),
-                     editing_permissions: AlgoEditingPermissions.AllowEditValues)) { }
+                     AlgoData.create_unpersisted(OrderDataHelper.Defaults.CustomOrderDefinitionImmutable(CustomOrderDefinition.CustomOneofCase.Iceberg), CustomOrderDefinition.CustomOneofCase.Iceberg.display_name()),
+                     init_format: init_format,
+                     editing_permissions: init_permissions)) { }

-         public OrderParamsVM(OrderBookVM owner, AlgoDefinitionVM algo_vm) {
+         OrderParamsVM(OrderBookVM owner, AlgoDefinitionVM algo_vm) {
            _owner = owner;
            this.algo_vm = algo_vm;
            _accounts = backing(
@@ -845,13 +772,7 @@ namespace mbts.spark {
                     appended_param_rows.insert_front(new AlgoParamRowVM(root, _price_param, null, AlgoParamTemplateKeys.Price));
                  }
               }),
-               ObservableAutoWrapper.connect_item_hooks(param_rows, dirty_params_mon.join),
-               owner._subscribe_throttled_selected_rows().OnDispatcher().Subscribe(_ => {
-                  _selected_order_tree = new HashSet<uint>(_owner.selected_hierarchical_rows.Select(r => r.order_key));
-                  _reset_ladder_vm();
-               })) {
-               () => Disposable.dispose(ref _ladder_vm)
-            };
+               ObservableAutoWrapper.connect_item_hooks(param_rows, dirty_params_mon.join));
            // payup methods
            void payup_bid(int ticks) => payup(bbo.bid, -ticks);
            void payup_ask(int ticks) => payup(bbo.ask, ticks);
@@ -879,8 +800,7 @@ namespace mbts.spark {
            get => _security_md;
            set {
               if (Set(ref _security_md, value)) {
-                  _reset_ladder_vm();
-                  RaisePropertyChanged(nameof(security), nameof(spec), nameof(ladder_vm));
+                  RaisePropertyChanged(nameof(security), nameof(spec));
                  bbo.security_md = value;
                  _payup_bid_cmd.RaiseCanExecuteChanged();
                  _payup_ask_cmd.RaiseCanExecuteChanged();
@@ -904,7 +824,6 @@ namespace mbts.spark {
         }
         public AlgoDefinitionVM algo_vm { get; }
         public IReadOnlyObservableCollection<AlgoParamRowVM> param_rows { get; }
-         public LadderVM ladder_vm => _ladder_vm;
         public BBOVM bbo { get; }
         public ICommand send_order { get; }
         public ICommand payup_bid_cmd => _payup_bid_cmd;
@@ -939,17 +858,6 @@ namespace mbts.spark {

         public IObservable<bool> subscribe_is_dirty() => _is_dirty.observe_current(true);

-         void _reset_ladder_vm() {
-            if (_ladder_vm == null && !_security_md.HasValue)
-               return;
-            Disposable.replace(ref _ladder_vm,
-               _security_md.HasValue ?
-                  LadderVM.create_readonly(_owner._bus,
-                     new LadderModel(security_md.Value, _owner._model, _owner._model.mbo_service,
-                     new Func<OrderSecurity, bool>(osec => _selected_order_tree.Contains(osec.order.Key))),
-                     Observable.Return(LadderSettings.Default)) : null);
-            RaisePropertyChanged(nameof(ladder_vm));
-         }
         void _assign_param_permissions<T>(IAlgoParamVM<T> param, ref AlgoParamPermissions permissions_backing, AlgoParamPermissions permissions) {
            if (permissions_backing != permissions) {
               permissions_backing = permissions;
@@ -968,8 +876,8 @@ namespace mbts.spark {
            this.column_filters = column_filters;
         }

-         public Func<OrderSecurity, bool> build_predicate(IMaskIndexInt32<string> dynamic_type_index) {
-            var pred = column_filters.build_predicate(dynamic_type_index);
+         public Func<OrderSecurityRootPair, bool> build_predicate() {
+            var pred = column_filters.build_predicate();
            if (algo_tree_display_mode == AlgoTreeDisplayMode.RootAndLeafNodes) {
               if (pred == null) {
                  pred = tree_disp_pred;
@@ -977,10 +885,10 @@ namespace mbts.spark {
                  var col_pred = pred;
                  pred = o => tree_disp_pred(o) && col_pred(o);
               }
-               bool tree_disp_pred(OrderSecurity o) =>
-                  !o.order.has_parent() ||
-                  o.order.is_exchange_order() ||
-                  o.order.order_type() == CustomOrderDefinition.CustomOneofCase.Spreader;
+               bool tree_disp_pred(OrderSecurityRootPair o) =>
+                  !o.order.order.has_parent() ||
+                  o.order.order.is_exchange_order() ||
+                  o.order.order.order_type() == CustomOrderDefinition.CustomOneofCase.Spreader;
            }
            return pred;
         }
@@ -996,128 +904,6 @@ namespace mbts.spark {
            EqualityComparer.aggregate_hash((int)algo_tree_display_mode, column_filters?.GetHashCode() ?? 0);
      }

-      /// <summary>
-      /// Monitors selected rows, and determines whether or not they are all active-orders, with common parameters.
-      /// </summary>
-      class SelectedOrderParamsMon {
-         static readonly TimeSpan _throttle = TimeSpan.FromSeconds(0.1);
-         readonly CommonValueGroupMonitor<AlgoSecurityKey, AlgoSecurityKey> _algo_def_mon =
-            new CommonValueGroupMonitor<AlgoSecurityKey, AlgoSecurityKey>(
-               ask => ask,
-               EqualityComparer<AlgoSecurityKey>.Default,
-               EqualityComparer.Create<AlgoSecurityKey, CustomOrderDefinitionImmutable>(ask => ask.algo, OrderDataHelper.EqualsHelpers.custom_order_def_compareri));
-         readonly CommonValueMonitor<SecurityImmutable?> _spreader_security_mon = new CommonValueMonitor<SecurityImmutable?>();
-         readonly CommonValueMonitor<SecurityImmutable?> _security_mon = new CommonValueMonitor<SecurityImmutable?>();
-         readonly CommonValueMonitor<double> _price_mon = new CommonValueMonitor<double>(double.NaN);
-         readonly CommonValueMonitor<uint> _size_mon = new CommonValueMonitor<uint>();
-         readonly CommonValueMonitor<AccountTuple> _account_mon = new CommonValueMonitor<AccountTuple>();
-         readonly CommonValueMonitor<bool> _all_active_mon = new CommonValueMonitor<bool>();
-         readonly CommonValueMonitorMultiplexor<OrderSecurity> _group_mon = new CommonValueMonitorMultiplexor<OrderSecurity>();
-         readonly DynamicOrderHelper _dyn_helper;
-         IReadOnlyDictionary<uint, SecurityMD> _security_md_map = DictionaryHelper.empty<uint, SecurityMD>();
-
-         public SelectedOrderParamsMon(DynamicOrderHelper dyn_helper) {
-            _dyn_helper = dyn_helper;
-            _group_mon.add_member_mon(_algo_def_mon, _algo_key);
-            _group_mon.add_member_mon(_spreader_security_mon, _get_spreader_sec, s => s.HasValue);
-            _group_mon.add_member_mon(_security_mon, osam => osam.security, s => s.HasValue);
-            _group_mon.add_member_mon(_price_mon, osam => osam.order.price());
-            _group_mon.add_member_mon(_size_mon, osam => osam.order.quantity());
-            _group_mon.add_member_mon(_account_mon, osam => new AccountTuple(osam.order.account_id(), osam.order.account()));
-            _group_mon.add_member_mon(_all_active_mon, osam => osam.order.is_active());
-         }
-
-         event Action _security_md_map_changed;
-
-         public SecurityImmutable? security => _security_mon.common_value;
-         public SecurityMD? security_md => security is SecurityImmutable sec && _security_md_map.TryGetValue(sec.Id, out SecurityMD smd) ? smd : (SecurityMD?)null;
-         public SecurityImmutable? spreader_security => _spreader_security_mon.common_value;
-         public double price => _price_mon.try_get_common_value(out double p) ? p : double.NaN;
-         public uint? size => _size_mon.common_value_nullable();
-         public AccountTuple? account => _account_mon.common_value_nullable();
-         public bool all_active => _all_active_mon.common_value;
-
-         public IObservable<IEnumerable<CustomOrderDefinitionImmutable>> subscribe_algos() => _algo_def_mon.SubscribeThrottled(_throttle, (ask, vals) => vals.Select(v => v.algo), Enumerable.Empty<CustomOrderDefinitionImmutable>());
-         public IObservable<SecurityImmutable?> subscribe_spreader_security() => _spreader_security_mon.SubscribeThrottled(_throttle);
-         public IObservable<SecurityImmutable?> subscribe_security() => _security_mon.SubscribeThrottled(_throttle);
-         public IObservable<SecurityMD?> subscribe_security_md() =>
-            Observable.Create<SecurityMD?>(o => {
-               SecurityMD? last_value = security_md;
-               o.OnNext(last_value);
-               _security_mon.common_value_changed += on_common_sec_changed;
-               _security_md_map_changed += refresh;
-               return Disposable.Create(() => {
-                  _security_mon.common_value_changed -= on_common_sec_changed;
-                  _security_md_map_changed -= refresh;
-               });
-               void on_common_sec_changed(SecurityImmutable? _) => refresh();
-               void refresh() {
-                  var curr = security_md;
-                  if (curr != last_value)
-                     o.OnNext(last_value = curr);
-               }
-            });
-         public IObservable<double> subscribe_price() => _price_mon.SubscribeThrottled(_throttle);
-         public IObservable<uint?> subscribe_size() => _size_mon.SubscribeThrottledNullable(_throttle);
-         public IObservable<AccountTuple?> subscribe_account() => _account_mon.SubscribeThrottledNullable(_throttle);
-         public IObservable<bool> subscribe_all_active() => _all_active_mon.SubscribeThrottled(_throttle);
-         public IObservable<Plurality> subscribe_security_plurality() => _security_mon.SubscribePluralityThrottled(_throttle);
-
-         public IDisposable begin_udpate() =>
-            _group_mon.defer_updates();
-
-         public void on_order_selected(OrderSecurity order_tuple) =>
-            _group_mon.add(order_tuple);
-
-         public void on_order_unselected(OrderSecurity order_tuple) =>
-            _group_mon.remove(order_tuple);
-
-         public void on_security_md_map(IReadOnlyDictionary<uint, SecurityMD> security_md_map) {
-            _security_md_map = security_md_map;
-            _security_md_map_changed?.Invoke();
-         }
-
-         public void on_order_updated((OrderSecurity oldval, OrderSecurity newval) ch) {
-            using (begin_udpate()) {
-               _group_mon.remove(ch.oldval);
-               _group_mon.add(ch.newval);
-            }
-         }
-
-         static SecurityImmutable? _get_spreader_sec(OrderSecurity osam) =>
-            OrderDataHelper.enumerate_algo_hierarchy(osam.order.Def.CustomDef.CloneToMutable())
-            .Any(algo => algo.CustomCase == CustomOrderDefinition.CustomOneofCase.Spreader) ?
-            osam.security : null;
-
-         AlgoSecurityKey _algo_key(OrderSecurity osam) =>
-            new AlgoSecurityKey(osam.order.Def.CustomDef, _get_spreader_sec(osam), AlgoStructureSerializer.structure_key(osam.order.Def.CustomDef, _dyn_helper.dynamic_type_index));
-
-         SecurityMD? _get_sec_md(OrderSecurity osam) =>
-            osam.security.HasValue && _security_md_map.TryGetValue(osam.security.Value.Id, out SecurityMD smd) ? smd : (SecurityMD?)null;
-
-         struct AlgoSecurityKey {
-            public readonly CustomOrderDefinitionImmutable algo;
-            public readonly SecurityImmutable? security;
-            public readonly AlgoStructureKey key;
-
-            public AlgoSecurityKey(CustomOrderDefinitionImmutable algo, SecurityImmutable? security, AlgoStructureKey key) {
-               this.algo = algo;
-               this.security = security;
-               this.key = key;
-            }
-
-            public bool Equals(AlgoSecurityKey other) =>
-               security == other.security &&
-               key == other.key;
-
-            public override bool Equals(object obj) => obj is AlgoSecurityKey other && Equals(other);
-            public override int GetHashCode() => key.GetHashCode();
-
-            public static bool operator ==(AlgoSecurityKey a, AlgoSecurityKey b) => a.Equals(b);
-            public static bool operator !=(AlgoSecurityKey a, AlgoSecurityKey b) => !a.Equals(b);
-         }
-      }
-
      class RightPanelModel {
         OrderBookRightPanelSettings.ViewMode _mode;
         OrderBookRightPanelSettings.Components _all_selected, _hidden = OrderBookRightPanelSettings.Components.None;
@@ -1180,11 +966,13 @@ namespace mbts.spark {
            var join = config.Configuration.get<bts.config.JoinAttachUIOptions>();
            var lean = config.Configuration.get<bts.config.LeanAttachUIOptions>();
            var top = config.Configuration.get<bts.config.TopAttachUIOptions>();
+            var offset = config.Configuration.get<bts.config.OffsetAttachUIOptions>();
            _algo_type_conf = new Dictionary<CustomOrderDefinition.CustomOneofCase, (bool, bool)> {
               { CustomOrderDefinition.CustomOneofCase.Cover, (cover.show_price, cover.show_quantity) },
               { CustomOrderDefinition.CustomOneofCase.Join, (join.show_price, join.show_quantity) },
               { CustomOrderDefinition.CustomOneofCase.Lean, (lean.show_price, lean.show_quantity) },
-               { CustomOrderDefinition.CustomOneofCase.Top, (top.show_price, top.show_quantity) }
+               { CustomOrderDefinition.CustomOneofCase.Top, (top.show_price, top.show_quantity) },
+               { CustomOrderDefinition.CustomOneofCase.Offset, (offset.show_price, offset.show_quantity) }
            };
         }

@@ -7,8 +7,8 @@ using bts.spark;
 using bts.view;
 using mbts.persist;
 using mbts.ui;
-using mbts.ui.converters;
 using mbts.ui.extensions;
+using mbts.ui.shell;
 using mbts.ui.spark;
 using mbts.ui.utility;
 using mbts.utils;
@@ -17,10 +17,8 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Reactive.Linq;
 using System.Windows;
-using System.Windows.Data;
 using System.Windows.Input;
 using System.Windows.Media;
-using OrderBookGridSettingsVM = mbts.spark.GridSettingsVM<bts.api.orderman.OrderSecurity, mbts.OrderRecordTuplePredicate, bts.shell.orderbook.OrderBookGridSettings>;

 namespace mbts.spark {
   internal class OrderBookWindow : SparkWindow<OrderBookStartupData>, ISharedWindow {
@@ -65,7 +63,7 @@ namespace mbts.spark {
      }

      public void thread_init() {
-         _vm = new OrderBookVM(this.observe_title(), _bus, _notification_service, _model, _settings_manager);
+         _vm = new OrderBookVM(_bus, _notification_service, _model, _settings_manager);
         _vm.load_from(_state);
         _view = new OrderBookView(_vm);

@@ -171,14 +169,11 @@ namespace mbts.spark {
                  // 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.general = s.general.with(_vm.core_columns.Select(c => c.create()));
-                  return _vm.grid_settings_manager.create_vm(s, this.observe_title());
+                  return _vm.grid_settings_manager.create_vm(s);
               }
            );
-            // TODO: bind to main window's Title
+            gs_vm.SubscribeDisposed(literal_title_source.OnDispatcher().Subscribe(t => gs_vm.title = t));
            var dialog = new ShellSettingsDialog { DataContext = gs_vm };
-            dialog.SetBinding(Window.TitleProperty, new Binding($"{nameof(gs_vm.instance_vm)}.{nameof(OrderBookGridSettingsVM.owner_title)}") {
-               Converter = ValueConverter.create<string, string>(str => (string.IsNullOrEmpty(str) ? _default_title : str) + " Settings")
-            });
            gs_vm.RequestClose += (s, e) => WindowUtilities.force_close(dialog);
            return dialog;
         }));
@@ -119,36 +119,36 @@ namespace bts.shell.orderbook {
   }

   static class FilterStatesExtensions {
-      public static Func<OrderSecurity, bool> build_predicate(this FilterStates fs, IMaskIndexInt32<string> dynamic_type_index) {
-         var pb = new ColumnPredicateBuilder<OrderSecurity>();
+      public static Func<OrderSecurityRootPair, bool> build_predicate(this FilterStates fs) {
+         var pb = new ColumnPredicateBuilder<OrderSecurityRootPair>();
         // security
-         pb.add_security_criteria(fs.security_criteria, o => o.security);
+         pb.add_security_criteria(fs.security_criteria, o => o.order.security);
         // regex
-         pb.add_regex(fs.order_key_regex, o => o.order.Key.ToString());
-         pb.add_regex(fs.exchange_message_regex, o => o.order.State.LastMsg);
-         pb.add_regex(fs.attached_target_order_key_regex, o => o.order.attached_target_order_key().ToString());
-         pb.add_regex(fs.parent_key_regex, o => o.order.ParentKey.ToString());
+         pb.add_regex(fs.order_key_regex, o => o.order.order.Key.ToString());
+         pb.add_regex(fs.exchange_message_regex, o => o.order.order.State.LastMsg);
+         pb.add_regex(fs.attached_target_order_key_regex, o => o.order.order.attached_target_order_key().ToString());
+         pb.add_regex(fs.parent_key_regex, o => o.order.order.ParentKey.ToString());
         // time
-         pb.add_time_filter(fs.time_created, o => o.order.created());
-         pb.add_time_filter(fs.last_change, o => o.order.last_change());
+         pb.add_time_filter(fs.time_created, o => o.order.order.created());
+         pb.add_time_filter(fs.last_change, o => o.order.order.last_change());
         // discrete values
-         pb.add_discrete_values(fs.users, o => o.order.user());
-         pb.add_discrete_values(fs.accounts, o => o.order.account());
-         pb.add_discrete_values(fs.exchanges, o => o.security?.Exchange ?? Venue.Unset);
-         pb.add_discrete_values(fs.tifs, o => o.order.time_in_force());
-         pb.add_discrete_values(fs.order_types, o => AlgoID.from_custom_def(o.order.Def.CustomDef));
-         pb.add_discrete_values(fs.root_algo_types, o => AlgoID.from_algo_key(o.root_algo.key, dynamic_type_index));
-         pb.add_discrete_values(fs.order_sub_types, o => o.order.sub_type());
-         pb.add_discrete_values(fs.sides, o => o.order.side());
-         pb.add_discrete_values(fs.statuses, o => o.order.status());
-         pb.add_discrete_values(fs.symbols, o => o.security?.Symbol);
+         pb.add_discrete_values(fs.users, o => o.order.order.user());
+         pb.add_discrete_values(fs.accounts, o => o.order.order.account());
+         pb.add_discrete_values(fs.exchanges, o => o.order.security?.Exchange ?? Venue.Unset);
+         pb.add_discrete_values(fs.tifs, o => o.order.order.time_in_force());
+         pb.add_discrete_values(fs.order_types, o => AlgoID.from_custom_def(o.order.order.Def.CustomDef));
+         pb.add_discrete_values(fs.root_algo_types, o => AlgoID.from_algo_key(o.root.algo.key));
+         pb.add_discrete_values(fs.order_sub_types, o => o.order.order.sub_type());
+         pb.add_discrete_values(fs.sides, o => o.order.order.side());
+         pb.add_discrete_values(fs.statuses, o => o.order.order.status());
+         pb.add_discrete_values(fs.symbols, o => o.order.security?.Symbol);
         // numeric
-         pb.add_numeric(fs.qty, o => o.order.quantity());
-         pb.add_numeric(fs.price, o => o.order.price());
-         pb.add_numeric(fs.qty_filled, o => o.order.filled());
-         pb.add_numeric(fs.avg_price, o => o.order.avg_price());
-         pb.add_numeric(fs.last_price, o => o.order.last_price());
-         pb.add_numeric(fs.piq, o => o.piq ?? uint.MaxValue);
+         pb.add_numeric(fs.qty, o => o.order.order.quantity());
+         pb.add_price(fs.price, o => o.order.order.price(), o => o.order.security);
+         pb.add_numeric(fs.qty_filled, o => o.order.order.filled());
+         pb.add_numeric(fs.avg_price, o => o.order.order.avg_price());
+         pb.add_numeric(fs.last_price, o => o.order.order.last_price());
+         pb.add_numeric(fs.piq, o => o.order.piq ?? uint.MaxValue);
         return pb.to_predicate();
      }
   }
@@ -43,7 +43,9 @@ namespace bts.shell.orderbook {
      IEnumerable<IPredicateAnimationsData<OrderSecurity, OrderRecordTuplePredicate>> IGridSettingsWithNotifications<OrderSecurity, OrderRecordTuplePredicate>.predicate_animations => predicate_animations;

      public OrderBookGridSettings with(GridSettings general) =>
-         new OrderBookGridSettings(general ?? this.general, predicate_animations);
+         new OrderBookGridSettings(general ?? this.general, predicate_animations) {
+            algo_tree_display_mode = algo_tree_display_mode
+         };

      public bool Equals(OrderBookGridSettings other) =>
         other != null &&
@@ -14,16 +14,12 @@ using Columns = mbts.spark.OrderBookGridView.ColumnKeys;

 namespace bts.shell.orderbook {
   class OrderBookGridSettingsManager : IDisposable, IObserver<OrderBookGridSettings> {
+      public static readonly IReadOnlyDictionary<string, GridColumnSettingsFeatureFlags> hard_column_flags;
+
      readonly IObserver<OrderBookGridSettings> _core_man_as_observer;
      AlgoTreeDisplayMode _algo_tree_display_mode;

-      public OrderBookGridSettingsManager(
-         IObservable<string> owner_title,
-         IBus bus,
-         INotificationService notification_service,
-         OrdersModel model,
-         IEnumerable<OrderBookRowVM> rows,
-         ObservableCollection<DIYGrid.ColumnBase> columns) {
+      static OrderBookGridSettingsManager() {
         // make font-weight immutable for all columns (the font-weight rule is hard-coded: Regular for root-orders, Light for all others)
         // TODO: Remove the immutable font-weight flags when cell animation is ready
         var col_settings_flags = EnumHelper.get_values<Columns>().ToDictionary(
@@ -31,10 +27,20 @@ namespace bts.shell.orderbook {
         // make font-color immutable for Side, Size, and Filled columns (the font-color rule is hard-coded: MarketData.bid for Buy orders, MarketData.ask for Sells)
         // TODO: Remove the immutable font-color flags when cell animation is ready
         foreach (var c in new[] { Columns.Side, Columns.Size, Columns.Filled }) {
-            col_settings_flags[c.ToString()] = GridColumnSettingsFeatureFlags.ImmutableFontColor | GridColumnSettingsFeatureFlags.ImmutableFontWeight;
+            col_settings_flags[c.ToString()] |= GridColumnSettingsFeatureFlags.ImmutableFontWeight;
         }
+         col_settings_flags[Columns.Commit.ToString()] |= GridColumnSettingsFeatureFlags.ImmutableHeader;
+         hard_column_flags = col_settings_flags;
+      }
+
+      public OrderBookGridSettingsManager(
+         IBus bus,
+         INotificationService notification_service,
+         OrdersModel model,
+         IEnumerable<OrderBookRowVM> rows,
+         ObservableCollection<DIYGrid.ColumnBase> columns) {
         core_manager = new GridSettingsManager<OrderBookRowVM, OrderSecurity, OrderRecordTuplePredicate, OrderBookGridSettings>(
-            owner_title, bus, model, rows, columns,
+            bus, model, rows, columns,
            () => new OrderRecordTuplePredicate(),
            () => {
               var pvm = PredicateVMWrapper.create<OrderSecurity, OrderRecordTuplePredicate, OrderRecordTuplePredicate.PredicateTypeOneofCase>(
@@ -53,7 +59,7 @@ namespace bts.shell.orderbook {
            p => p.create_notification_predicate(notification_service.data_cache),
            notification_service == null ? new Func<IPredicate<OrderSecurity>, SoundNotification, IDisposable>((p, sn) => Disposable.empty) : notification_service.link_to_order,
            notification_service == null ? new Func<INotificationPredicate<OrderSecurity>, IDisposable>(t => Disposable.empty) : notification_service.link_to_order,
-            col_settings_flags);
+            hard_column_flags);
         _core_man_as_observer = core_manager;
      }

@@ -83,8 +89,8 @@ namespace bts.shell.orderbook {
         return gs;
      }

-      public OrderBookSettingsVM create_vm(OrderBookGridSettings gs, IObservable<string> owner_title) =>
-         new OrderBookSettingsVM(core_manager.create_vm(gs.general, owner_title)) {
+      public OrderBookSettingsVM create_vm(OrderBookGridSettings gs) =>
+         new OrderBookSettingsVM(core_manager.create_vm(gs.general)) {
            algo_tree_display_mode = gs.algo_tree_display_mode
         };

@@ -137,12 +137,13 @@ namespace bts.shell.orderbook {
            return rv;
         }
      }
-      static GridSettings _default_general_grid => GridSettings.Default.with(DefaultColumns.all, DefaultColumns.sorting_criterion);
+      static GridSettings _default_general_grid => GridSettings.Default.with(DefaultColumns.standard, DefaultColumns.sorting_criterion);
      public static OrderBookGridSettings default_mini_grid => new OrderBookGridSettings(GridSettings.Default.with(DefaultColumns.mini, DefaultColumns.sorting_criterion)) {
         algo_tree_display_mode = AlgoTreeDisplayMode.RootAndLeafNodes
      };

      static class DefaultColumns {
+         // standard
         public static GridColumnSettings security => new GridColumnSettings(Columns.Security.ToString(), DIYGrid.DefaultColumnHeaders.Security, width: DIYGrid.DefaultColumnWidths.Security);
         public static GridColumnSettings symbol => new GridColumnSettings(Columns.Symbol.ToString(), DIYGrid.DefaultColumnHeaders.Symbol, width: DIYGrid.DefaultColumnWidths.Symbol, horizontal_alignment: HorizontalAlignment.Left);
         public static GridColumnSettings time_created => new GridColumnSettings(Columns.Time.ToString(), "Time", width: DIYGrid.DefaultColumnWidths.Time, horizontal_alignment: HorizontalAlignment.Left);
@@ -167,6 +168,13 @@ namespace bts.shell.orderbook {
         public static GridColumnSettings parent_key => new GridColumnSettings(Columns.ParentKey.ToString(), "Parent Key", width: DIYGrid.DefaultColumnWidths.ParentKey, horizontal_alignment: HorizontalAlignment.Left);
         public static GridColumnSettings attached_target_order_key => new GridColumnSettings(Columns.AttachedTargetOrderKey.ToString(), DIYGrid.DefaultColumnHeaders.AttachedTargetOrderKey, width: DIYGrid.DefaultColumnWidths.ParentKey, horizontal_alignment: HorizontalAlignment.Left);
         public static GridColumnSettings piq => new GridColumnSettings(Columns.Piq.ToString(), "PIQ", width: DIYGrid.DefaultColumnWidths.Size, horizontal_alignment: HorizontalAlignment.Right);
+         // editable
+         public static GridColumnSettings cancel => new GridColumnSettings(Columns.Cancel.ToString(), DIYGrid.DefaultColumnHeaders.Cancel, width: DIYGrid.DefaultColumnWidths.MiniOrderBook.Cancel);
+         public static GridColumnSettings attach_detach => new GridColumnSettings(Columns.Attach.ToString(), DIYGrid.DefaultColumnHeaders.AttachDetach, width: DIYGrid.DefaultColumnWidths.MiniOrderBook.AttachDetach);
+         public static GridColumnSettings update => new GridColumnSettings(Columns.Update.ToString(), DIYGrid.DefaultColumnHeaders.Update, width: DIYGrid.DefaultColumnWidths.MiniOrderBook.Update);
+         public static GridColumnSettings edit_quantity => new GridColumnSettings(Columns.EditableQty.ToString(), DIYGrid.DefaultColumnHeaders.Size, width: DIYGrid.DefaultColumnWidths.MiniOrderBook.EditableSize);
+         public static GridColumnSettings edit_price => new GridColumnSettings(Columns.EditablePrice.ToString(), DIYGrid.DefaultColumnHeaders.Price, width: DIYGrid.DefaultColumnWidths.MiniOrderBook.EditablePrice);
+         public static GridColumnSettings commit => new GridColumnSettings(Columns.Commit.ToString(), width: DIYGrid.DefaultColumnWidths.MiniOrderBook.Commit);

         public static IEnumerable<SortingCriteria> sorting_criterion {
            get {
@@ -174,7 +182,7 @@ namespace bts.shell.orderbook {
            }
         }

-         public static IEnumerable<GridColumnSettings> all {
+         public static IEnumerable<GridColumnSettings> standard {
            get {
               yield return security;
               yield return symbol;
@@ -203,13 +211,26 @@ namespace bts.shell.orderbook {
            }
         }

+         public static IEnumerable<GridColumnSettings> editable {
+            get {
+               yield return cancel;
+               yield return update;
+               yield return edit_quantity;
+               yield return edit_price;
+               yield return commit;
+               yield return attach_detach;
+            }
+         }
+
         private static HashSet<GridColumnSettings> _mini_mode_columns_to_hide = new HashSet<GridColumnSettings> {
               symbol, last_change, exchange, sub_type, quantity, price, avg_price, last_price, status, last_message, security_key, order_key, parent_key, attached_target_order_key
            };

         public static IEnumerable<GridColumnSettings> mini {
            get {
-               foreach (var col_setting in all) {
+               foreach (var col_setting in editable)
+                  yield return col_setting;
+               foreach (var col_setting in standard) {
                  if (_mini_mode_columns_to_hide.Contains(col_setting)) {
                     yield return col_setting.with(is_visible: false);
                  } else {
@@ -17,7 +17,8 @@ namespace bts.shell.orderbook {
         this.core_settings_vm = core_settings_vm;

      public OrderBookSettingsVM(
-         IObservable<string> owner_title, IBus bus, OrdersModel orders_model,
+         IBus bus,
+         OrdersModel orders_model,
         Func<OrderRecordTuplePredicate> predicate_data_factory,
         Func<OrderRecordTuplePredicate, INotificationPredicate<OrderSecurity>> notification_predicate_factory,
         Func<IPropertyWrapperVM<OrderRecordTuplePredicate>> create_predicate_vm,
@@ -25,7 +26,7 @@ namespace bts.shell.orderbook {
         Func<GridSettings, IEnumerable<IPredicateAnimationsData<OrderSecurity, OrderRecordTuplePredicate>>, OrderBookGridSettings> create_settings_obj,
         IReadOnlyDictionary<string, GridColumnSettingsFeatureFlags> column_flags = null) {
         core_settings_vm = new GridSettingsVM<OrderSecurity, OrderRecordTuplePredicate, OrderBookGridSettings>(
-            owner_title, bus, orders_model, predicate_data_factory, notification_predicate_factory, create_predicate_vm, create_column_predicate_vm, create_settings_obj, column_flags);
+            bus, orders_model, predicate_data_factory, notification_predicate_factory, create_predicate_vm, create_column_predicate_vm, create_settings_obj, column_flags);
      }

      public GridSettingsVM<OrderSecurity, OrderRecordTuplePredicate, OrderBookGridSettings> core_settings_vm { get; }
@@ -554,7 +554,7 @@
          BorderThickness="0,1,0,0"
          ResizeBehavior="PreviousAndNext"
        />
-        <usp:MiniLadderView x:Name="ladder" Grid.Column="1" Grid.Row="4" DataContext="{Binding order_mod_vm.ladder_vm}" CanUserSendOrders="False" Settings="{x:Static sp:LadderSettings.Default}"/>
+        <usp:MiniLadderView x:Name="ladder" Grid.Column="1" Grid.Row="4" DataContext="{Binding ladder_vm.value}" CanUserSendOrders="False" Settings="{x:Static sp:LadderSettings.Default}"/>
        <GridSplitter
          x:Name="ladder_splitter"
          Grid.Column="1"
@@ -117,12 +117,12 @@ namespace bts.shell {
            var temp_sound_triggers = _sound_trigger_refs;
            foreach (var kv in temp_sound_triggers) {
               if (kv.Key.trigger(value)) {
-                  sounds.AddRange(kv.Value.keys);
+                  sounds.AddRange(kv.Value.Keys);
               }
            }
            var temp_toast_triggers = _toast_trigger_refs;
-            foreach (var krc in temp_toast_triggers) {
-               if (krc.key.trigger(value) is IToastNotification tn && tn.pass)
+            foreach (var kv in temp_toast_triggers) {
+               if (kv.Key.trigger(value) is IToastNotification tn && tn.pass)
                  toast.Add(tn);
            }
            if (sounds.Count > 0 || toast.Count > 0)
@@ -26,7 +26,11 @@ namespace mbts.spark.utilities {
      public readonly Func<CustomOrderDefinition, CustomOrderDefinition> get_child;
      public readonly Action<CustomOrderDefinition, CustomOrderDefinition> assign_child;

-      public ChildAlgoData(string name, Func<IMessage, CustomOrderDefinition> get_child_from_impl, Action<IMessage, CustomOrderDefinition> assign_child_to_impl, Func<CustomOrderDefinition, CustomOrderDefinition> get_child, Action<CustomOrderDefinition, CustomOrderDefinition> assign_child) {
+      public ChildAlgoData(string name, Func<IMessage, CustomOrderDefinition> get_child_from_impl, 
+                           Action<IMessage, CustomOrderDefinition> assign_child_to_impl, 
+                           Func<CustomOrderDefinition, CustomOrderDefinition> get_child, 
+                           Action<CustomOrderDefinition, CustomOrderDefinition> assign_child) 
+      {
         this.name = name;
         this.get_child = get_child;
         this.assign_child = assign_child;
@@ -67,29 +71,19 @@ namespace mbts.spark.utilities {
      public IObservable<IReadOnlyList<AccountTuple>> subscribe_account_tuples() => _admin_model.on_account_tuples;

      #region Defaults
-      public CustomOrderDefinition.CustomOneofCase default_order_type() =>
-         CustomOrderDefinition.CustomOneofCase.Limit;
-
-      public CustomOrderDefinition.CustomOneofCase default_order_type(SecurityImmutable security, bool is_child = false) {
-         if (is_child) return CustomOrderDefinition.CustomOneofCase.Limit;
+      public CustomOrderDefinition.CustomOneofCase default_order_type(SecurityImmutable security) {
         switch (security.ContractCase) {
            case Security.ContractOneofCase.Synthetic: return CustomOrderDefinition.CustomOneofCase.Spreader;
            default: return CustomOrderDefinition.CustomOneofCase.Limit;
         }
      }

-      public CustomOrderDefinition.CustomOneofCase default_order_type(SecurityImmutable? security, bool is_child = false) =>
-         security.HasValue ? default_order_type(security.Value, is_child) : default_order_type();
-
      public TimeInForce default_time_in_force() =>
         TimeInForce.Day;

      public TimeInForce default_time_in_force(SecurityImmutable security) =>
         default_time_in_force();

-      public TimeInForce default_time_in_force(SecurityImmutable? security) =>
-         security.HasValue ? default_time_in_force(security.Value) : default_time_in_force();
-
      public IEnumerable<CustomOrderDefinition.CustomOneofCase> default_order_types() =>
         OrderDataHelper.exchange_order_types;

@@ -141,15 +135,15 @@ namespace mbts.spark.utilities {

      public Dictionary<AlgoKey, AlgoData> default_algos(IEnumerable<CustomOrderDefinition.CustomOneofCase> types) {
         var def_map = new Dictionary<AlgoKey, AlgoData>();
-         foreach (var ot in types.Except(new[] { CustomOrderDefinition.CustomOneofCase.Dynamic })) {
-            var key = new AlgoKey(new AlgoNameStructureKey(ot));
-            def_map[key] = new AlgoData(custom_orderi(ot), ot.display_name(), key);
+         foreach (var ot in types.Except(new[] { CustomOrderDefinition.CustomOneofCase.Dynamic, CustomOrderDefinition.CustomOneofCase.Composite })) {
+            var data = AlgoData.from_custom_def(OrderDataHelper.Defaults.CustomOrderDefinitionImmutable(ot));
+            def_map[data.key] = data;
         }
         var dynamic_defs = new List<CustomOrderDefinitionImmutable>();
         _dynamic_helper.add_dynamic_order_defs(dynamic_defs, custom_order);
         foreach (var dd in dynamic_defs) {
-            var key = new AlgoKey(new AlgoNameStructureKey(dd.Dynamic.DynamicOrderType, new AlgoStructureKey(CustomOrderDefinition.CustomOneofCase.Dynamic)));
-            def_map[key] = new AlgoData(dd, dd.Dynamic.DynamicOrderType, key);
+            var data = AlgoData.from_custom_def(dd);
+            def_map[data.key] = data;
         }
         return def_map;
      }
@@ -157,6 +151,7 @@ namespace mbts.spark.utilities {

      public OrderDefinitionImmutable order(SecurityImmutable security) =>
         new OrderDefinitionImmutable(order(security, _admin_model.get_default_account()));
+
      public OrderDefinition order(SecurityImmutable security, AccountTuple? account) {
         var rv = new OrderDefinition {
            SecurityKey = security.Id,
@@ -168,17 +163,14 @@ namespace mbts.spark.utilities {
            // this will be the tag 50 on CME orders
            // current user might be okay, but we might also want to get it
            // from the store that serves the risk admin gui
-            ManualOrderIndicator = ManualOrderIndicator.Yes
+            ManualOrderIndicator = ManualOrderIndicator.Yes,
+            User = _admin_model.user.name,
+            UserId = _admin_model.user.id
         };
         if (account.HasValue) {
            rv.Account = account.Value.name;
            rv.AccountId = account.Value.id;
         }
-         var user = _admin_model.get_current_user();
-         if (user.HasValue) {
-            rv.User = user.Value.name;
-            rv.UserId = user.Value.id;
-         }
         return rv;
      }

@@ -215,6 +207,7 @@ namespace mbts.spark.utilities {
      public TriggerOrderDefinition trigger_order() => OrderDataHelper.Defaults.TriggerOrderDefinition();
      public DynamicOrderDefinition dynamic_order() => OrderDataHelper.Defaults.DynamicOrderDefinition();
      public SpreaderOrderDefinition spreader_order() => OrderDataHelper.Defaults.SpreaderOrderDefinition();
+      public SplitterOrderDefinition splitter_order() => OrderDataHelper.Defaults.SplitterOrderDefinition();
      public SpreaderOrderDefinition spreader_order(SecurityImmutable security, ExecutionStrategyImmutable strategy) =>
         new SpreaderOrderDefinition {
            Security = security.CloneToMutable(),
@@ -245,8 +238,12 @@ namespace mbts.spark.utilities {
            case CustomOrderDefinition.CustomOneofCase.Offset: rv.Offset = offset_order(); break;
            case CustomOrderDefinition.CustomOneofCase.Trigger: rv.Trigger = trigger_order(); break;
            case CustomOrderDefinition.CustomOneofCase.Spreader: rv.Spreader = spreader_order(); break;
+            case CustomOrderDefinition.CustomOneofCase.Splitter: rv.Splitter = splitter_order(); break;
            case CustomOrderDefinition.CustomOneofCase.Dynamic: rv.Dynamic = dynamic_order(); break;
               //case CustomOrderDefinition.CustomOneofCase.QueueHolder: rv.QueueHolder = queue_holder_order(); break;
+            default:
+               OrderTypeVMFactory.GenericOrderFactory.setup_generic_custom_order(rv, order_type);
+               break;            
         }
         return rv;
      }
@@ -272,6 +269,7 @@ namespace mbts.spark.utilities {
            case CustomOrderDefinition.CustomOneofCase.Offset: return new OrderMetadata { KeyBinding = "O", Color = BTSColors.Orders.off_order };
            case CustomOrderDefinition.CustomOneofCase.Trigger: return new OrderMetadata { KeyBinding = "T", Color = BTSColors.Orders.trigger_order };
            case CustomOrderDefinition.CustomOneofCase.Spreader: return new OrderMetadata { KeyBinding = "", Color = BTSColors.Orders.spreader_order };
+            // case CustomOrderDefinition.CustomOneofCase.Splitter: return new OrderMetadata { KeyBinding = "", Color = BTSColors.orange.rgb_color() };
            case CustomOrderDefinition.CustomOneofCase.Dynamic: return new OrderMetadata { KeyBinding = "", Color = BTSColors.Orders.top_order };
            case CustomOrderDefinition.CustomOneofCase.None: goto default;
            //case CustomOrderDefinition.CustomOneofCase.QueueHolder: return new OrderMetadata { KeyBinding = "Q", Color = BTSColors.purple.rgb_color() };
@@ -306,6 +304,7 @@ namespace mbts.spark.utilities {

      public static OneofDescriptor oneof_descriptor => _oneof_desc;

+      const string _primary_child_field = "child";
      // algo-type-case maps
      // Note: obv this will break if we change the name of the 'CustomOneofCase' field
      static readonly OneofDescriptor _oneof_desc = CustomOrderDefinition.Descriptor.Oneofs.FirstOrDefault(fd => fd.Name == "custom");
@@ -349,35 +348,69 @@ namespace mbts.spark.utilities {
            f.FieldType == FieldType.Message && f.MessageType.ClrType == typeof(CustomOrderDefinition);
      }

-      public static IEnumerable<CustomOrderDefinition> enumerate_algo_children(CustomOrderDefinition algo) {
-         switch (algo.CustomCase) {
+      #region Algo Structure/Hierarchy
+      public static IEnumerable<(CustomOrderDefinition.CustomOneofCase type, string dyn, uint studio, uint spreader_sec)> enumerate_algo_structure(CustomOrderDefinitionImmutable custom_defi) {
+         string dyn = null;
+         uint studio = 0, spreader_sec = 0;
+         foreach (var cd in enumerate_algo_hierarchy(custom_defi.CloneToMutable())) {
+            switch (cd.CustomCase) {
+               case CustomOrderDefinition.CustomOneofCase.Composite: studio = cd.Composite.AlgoTemplateKey; break;
+               case CustomOrderDefinition.CustomOneofCase.Dynamic: dyn = cd.Dynamic.DynamicOrderType; break;
+               case CustomOrderDefinition.CustomOneofCase.Spreader: spreader_sec = cd.Spreader.Security.Id; break;
+            }
+            yield return (cd.CustomCase, dyn, studio, spreader_sec);
+         }
+      }
+
+      /// <summary>
+      /// Enumerates through every algo member immediately defined <paramref name="custom_def"/> (i.e., no recursion, just the first level of children).
+      /// </summary>
+      /// <param name="custom_defi">The root algo, from which enumeration begins.</param>
+      /// <returns>An IEnumerable of each algo member contained in <paramref name="custom_def"/></returns>
+      public static IEnumerable<CustomOrderDefinition> enumerate_algo_children(CustomOrderDefinition custom_def) {
+         switch (custom_def.CustomCase) {
            case CustomOrderDefinition.CustomOneofCase.Dynamic:
-               foreach (var child in enumerate_dynamic_algo_children(algo.Dynamic))
-                  yield return child;
+               foreach (var kv in custom_def.Dynamic.OrderParams) {
+                  if (kv.Value.ValueCase == DynamicOrderParam.ValueOneofCase.AsOrderDef)
+                     yield return kv.Value.AsOrderDef ?? new CustomOrderDefinition();
+               }
               break;
            default:
-               foreach (var cad in get_child_algo_data(algo)) {
-                  if (cad.get_child(algo) is CustomOrderDefinition child)
-                     yield return child;
+               var child_algo_data = get_child_algo_data(custom_def);
+               if (child_algo_data.Count > 0) {
+                  // need to convert to underlying proto type to use the [reflection-based]generated child selectors
+                  for (int i = 0; i < child_algo_data.Count; i++) {
+                     // don't skip undefined children (this normalizes the structure).
+                     // each algo type should always yield the same number of children.
+                     yield return child_algo_data[i].get_child(custom_def) ?? new CustomOrderDefinition();
+                  }
               }
               break;
         }
      }

-      public static IEnumerable<CustomOrderDefinition> enumerate_dynamic_algo_children(DynamicOrderDefinition dynamic_algo) {
-         foreach (var kv in dynamic_algo.OrderParams) {
-            if (kv.Value.ValueCase == DynamicOrderParam.ValueOneofCase.AsOrderDef)
-               yield return kv.Value.AsOrderDef;
+      /// <summary>
+      /// Enumerates through every algo member contained in <paramref name="custom_def"/>, excluding <paramref name="custom_def"/> itself.
+      /// </summary>
+      /// <param name="custom_defi">The root algo, from which enumeration begins.</param>
+      /// <returns>An IEnumerable of each algo member contained in <paramref name="custom_def"/></returns>
+      public static IEnumerable<CustomOrderDefinition> enumerate_algo_descendents(CustomOrderDefinition custom_def) {
+         foreach (var child in enumerate_algo_children(custom_def)) {
+            yield return child;
+            foreach (var grand_child in enumerate_algo_descendents(child))
+               yield return grand_child;
         }
      }

-      public static IEnumerable<CustomOrderDefinition> enumerate_algo_hierarchy(CustomOrderDefinition algo) {
-         yield return algo;
-         foreach (var child in enumerate_algo_children(algo)) {
-            yield return child;
-            foreach (var grand_child in enumerate_algo_hierarchy(child))
-               yield return grand_child;
-         }
+      /// <summary>
+      /// Enumerates through every algo member contained in <paramref name="custom_def"/>, including <paramref name="custom_def"/> itself.
+      /// </summary>
+      /// <param name="custom_def">The root algo, from which enumeration begins.</param>
+      /// <returns>An IEnumerable of each algo member contained in <paramref name="custom_def"/></returns>
+      public static IEnumerable<CustomOrderDefinition> enumerate_algo_hierarchy(CustomOrderDefinition custom_def) {
+         yield return custom_def;
+         foreach (var d in enumerate_algo_descendents(custom_def))
+            yield return d;
      }

      public static IReadOnlyList<ChildAlgoData> get_child_algo_data(CustomOrderDefinitionImmutable defi) =>
@@ -405,6 +438,12 @@ namespace mbts.spark.utilities {
         }
      }

+      public static ChildAlgoData? get_primary_child_algo_data(CustomOrderDefinition algo) {
+         var child_data = get_child_algo_data(algo);
+         return child_data.TryGetFirst(cad => cad.name == _primary_child_field, out ChildAlgoData best_match) ? best_match :
+            child_data.TryGetFirst(out best_match) ? best_match : (ChildAlgoData?)null;
+      }
+
      public static CustomOrderDefinition create_algo(CustomOrderDefinition.CustomOneofCase algo_type) {
         var algo = new CustomOrderDefinition();
         if (_algo_type_case_descriptor_data.TryGetValue(algo_type, out AlgoTypeCaseDescriptorData desc))
@@ -412,8 +451,18 @@ namespace mbts.spark.utilities {
         return algo;
      }

+      public static bool append_algo_node(CustomOrderDefinition target, CustomOrderDefinition.CustomOneofCase algo_type) {
+         if (_algo_type_case_descriptor_data.TryGetValue(algo_type, out var desc)) {
+            var node = ProtoHelper.mutable_factory(ProtoHelper.get_field_type(desc.type_case_descriptor));
+            desc.type_case_descriptor.Accessor.SetValue(target, node);
+            return true;
+         }
+         return false;
+      }
+
      public static IReadOnlyList<ChildAlgoData> get_child_algo_data(CustomOrderDefinition.CustomOneofCase algo_type) =>
         _algo_type_case_descriptor_data.TryGetValue(algo_type, out AlgoTypeCaseDescriptorData d) ? d.child_algo_data : Array.Empty<ChildAlgoData>();
+      #endregion

      public static OrderMetadata get_metadata(CustomOrderDefinition.CustomOneofCase order_type) {
         switch (order_type) {
@@ -459,6 +508,7 @@ namespace mbts.spark.utilities {
            case CustomOrderDefinition.CustomOneofCase.Trigger: return "TG";
            case CustomOrderDefinition.CustomOneofCase.Join: return "JN";
            case CustomOrderDefinition.CustomOneofCase.Spreader: return "SR";
+            case CustomOrderDefinition.CustomOneofCase.Composite: return "COMP";
            default: return algo_type.ToString();
         }
      }
@@ -496,7 +546,7 @@ namespace mbts.spark.utilities {

      public static IReadOnlyDictionary<AlgoKey, AlgoData> get_format_algo_data(AlgoFormats f) {
         var algo_types = get_format_algo_types(f);
-         var algo_dict = algo_types.Select(at => new AlgoData(Defaults.CustomOrderDefinitionImmutable(at), at.display_name(), new AlgoKey(at))).ToDictionaryCrushed(a => a.key);
+         var algo_dict = algo_types.Select(at => AlgoData.from_custom_def(Defaults.CustomOrderDefinitionImmutable(at))).ToDictionaryCrushed(a => a.key);
         return algo_dict;
      }

@@ -581,56 +631,25 @@ namespace mbts.spark.utilities {
            return def;
         }
      }
-
-      /// <summary>
-      /// Creates a key that is uniquely identified by <see cref="CustomOrderDefinition.CustomOneofCase"/>,
-      /// and potentially <see cref="DynamicOrderDefinition.DynamicOrderType"/> (if it is a <see cref="DynamicOrderDefinition"/>).
-      /// </summary>
-      public static AlgoKey get_shallow_factory_key(CustomOrderDefinitionImmutable defi) =>
-         new AlgoKey(new AlgoNameStructureKey(
-               defi.CustomCase == CustomOrderDefinition.CustomOneofCase.Dynamic ? defi.Dynamic.DynamicOrderType : defi.CustomCase.type_id(),
-               new AlgoStructureKey(defi.CustomCase)));
+      
+      static CustomOrderDefinition.CustomOneofCase[] algo_config(
+         Func<bts.config.AlgoPermissions, List<string>> selector)
+      {
+         var conf = mbts.config.Configuration.get<bts.config.AlgoPermissions>();
+         return selector(conf).Select(x => 
+         {
+            return (CustomOrderDefinition.CustomOneofCase)System.Enum.Parse(typeof(CustomOrderDefinition.CustomOneofCase), x, true);
+         }).ToArray();
+      }

      public static readonly CustomOrderDefinition.CustomOneofCase[]
-         // The following standard types are not yet ready for production use:
-         // CustomOrderDefinition.CustomOneofCase.Tick,
-         // CustomOrderDefinition.CustomOneofCase.Dynamic,
-         exchange_order_types = new[] {
-            CustomOrderDefinition.CustomOneofCase.Market,
-            CustomOrderDefinition.CustomOneofCase.Limit,
-            CustomOrderDefinition.CustomOneofCase.Stop,
-            CustomOrderDefinition.CustomOneofCase.StopLimit,
-            CustomOrderDefinition.CustomOneofCase.GlbxIceberg,
-            CustomOrderDefinition.CustomOneofCase.Iceberg,
-            CustomOrderDefinition.CustomOneofCase.Lean,
-            CustomOrderDefinition.CustomOneofCase.Join,
-            CustomOrderDefinition.CustomOneofCase.Cover,
-            CustomOrderDefinition.CustomOneofCase.Top
-         },
-         // The following spreader types are not yet ready for production use:
-         // CustomOrderDefinition.CustomOneofCase.Dynamic,
-         spreader_order_types = new[] {
-            CustomOrderDefinition.CustomOneofCase.Spreader,
-            CustomOrderDefinition.CustomOneofCase.Iceberg,
-            CustomOrderDefinition.CustomOneofCase.Lean,
-            CustomOrderDefinition.CustomOneofCase.Join,
-            CustomOrderDefinition.CustomOneofCase.Cover,
-            CustomOrderDefinition.CustomOneofCase.Top
-         },
-         attachable_order_types = new[] {
-            CustomOrderDefinition.CustomOneofCase.Iceberg,
-            CustomOrderDefinition.CustomOneofCase.Lean,
-            CustomOrderDefinition.CustomOneofCase.Join,
-            CustomOrderDefinition.CustomOneofCase.Cover,
-            CustomOrderDefinition.CustomOneofCase.Top
-         },
-         outright_order_types = new[] {
-            CustomOrderDefinition.CustomOneofCase.Market,
-            CustomOrderDefinition.CustomOneofCase.Limit,
-            CustomOrderDefinition.CustomOneofCase.Stop,
-            CustomOrderDefinition.CustomOneofCase.StopLimit,
-            CustomOrderDefinition.CustomOneofCase.GlbxIceberg,
-         };
+
+         // exchange_order_types are the types which can be submitted on an exchange security
+         exchange_order_types = algo_config(x => x.exchange_order_types),
+         spreader_order_types = algo_config(x => x.spreader_order_types),
+         attachable_order_types = algo_config(x => x.attachable_order_types),
+         outright_order_types = algo_config(x => x.outright_order_types);
+         
      public static readonly CustomOrderDefinition.CustomOneofCase[] all_order_types = exchange_order_types.Union(spreader_order_types).ToArray();

      public static void copy_values(CustomOrderDefinitionImmutable source, ref CustomOrderDefinition target) =>
@@ -688,17 +707,11 @@ namespace mbts.spark.utilities {
         // That causes problems in some usages (e.g., AlgoStudio, and the Ladder/Ticket algo popup), bc double.NaN != double.NaN.
         // These equality comparers should be user in such cases, as they use the actual double.Equals method, not the == operator.
         // https://github.com/protocolbuffers/protobuf/issues/3725
-         public static readonly IEqualityComparer<CustomOrderDefinitionImmutable> custom_order_def_compareri;
-         public static readonly IEqualityComparer<CompositeAlgoDefinitionImmutable> algo_def_compareri;
+         public static readonly IEqualityComparer<CustomOrderDefinitionImmutable>
+            custom_order_defi_comparer = new CustomDefinitionComparer(),
+            custom_order_defi_structure_comparer = new CustomDefinitionStructureComparer();

-         static EqualsHelpers() {
-            int mod = MathUtils.Primes.P_1087;
-            custom_order_def_compareri = new _Compareri(mod);
-            algo_def_compareri = new CompositeAlgoDefinitionImmutableComparer(mod, custom_order_def_compareri);
-         }
-
-         public static bool equals(CustomOrderDefinitionImmutable a, CustomOrderDefinitionImmutable b) => custom_order_def_compareri.Equals(a, b);
-         public static bool equals(CompositeAlgoDefinitionImmutable a, CompositeAlgoDefinitionImmutable b) => algo_def_compareri.Equals(a, b);
+         public static bool equals(CustomOrderDefinitionImmutable a, CustomOrderDefinitionImmutable b) => custom_order_defi_comparer.Equals(a, b);

         public static bool structure_equals(CustomOrderDefinitionImmutable a, CustomOrderDefinitionImmutable b) {
            return impl(a.CloneToMutable(), b.CloneToMutable());
@@ -718,7 +731,7 @@ namespace mbts.spark.utilities {
               !b.HasChild);

         public static bool top_equals(TopOrderDefinitionImmutable a, TopOrderDefinitionImmutable b) =>
-            a.WatchLevelTickOffset == b.WatchLevelTickOffset &&
+            a.TicksOff == b.TicksOff &&
            (a.HasTopThreshold ?
               b.HasTopThreshold && quantity_measure_equals(a.TopThreshold, b.TopThreshold) :
               !b.HasTopThreshold) &&
@@ -843,11 +856,7 @@ namespace mbts.spark.utilities {
            }
         }

-         class _Compareri : IEqualityComparer<CustomOrderDefinitionImmutable> {
-            readonly int _mod;
-
-            public _Compareri(int mod) => _mod = mod;
-
+         class CustomDefinitionComparer : IEqualityComparer<CustomOrderDefinitionImmutable> {
            public bool Equals(CustomOrderDefinitionImmutable a, CustomOrderDefinitionImmutable b) {
               if (a.CustomCase != b.CustomCase) return false;
               switch (a.CustomCase) {
@@ -909,7 +918,7 @@ namespace mbts.spark.utilities {
                     add_component(_get_hash(_get_tick_child(tick)));
                     break;
                  case CustomOrderDefinition.CustomOneofCase.Top:
-                     add_component(def.Top.WatchLevelTickOffset.GetHashCode());
+                     add_component(def.Top.TicksOff.GetHashCode());
                     add_component(def.Top.HasTopThreshold ? def.Top.TopThreshold.GetHashCode() : 0);
                     add_component(_get_top_child(def.Top).GetHashCode());
                     break;
@@ -931,29 +940,17 @@ namespace mbts.spark.utilities {
            }

            void _add_component(ref int hash, ref int phase_mult, int component_hash) =>
-               hash += EqualityComparer.phase_hash(component_hash, phase_mult++, _mod);
+               hash += EqualityComparer.phase_hash(component_hash, phase_mult++, MathUtils.Primes.P_1087);

            int _get_hash(CustomOrderDefinitionImmutable? a) => a.HasValue ? GetHashCode(a.Value) : 0;
         }

-         class CompositeAlgoDefinitionImmutableComparer : IEqualityComparer<CompositeAlgoDefinitionImmutable> {
-            readonly int _mod;
-            readonly IEqualityComparer<CustomOrderDefinitionImmutable> _def_comparer;
+         class CustomDefinitionStructureComparer : IEqualityComparer<CustomOrderDefinitionImmutable> {
+            public bool Equals(CustomOrderDefinitionImmutable def1, CustomOrderDefinitionImmutable def2) =>
+               enumerate_algo_structure(def1).SequenceEqual(enumerate_algo_structure(def2));

-            public CompositeAlgoDefinitionImmutableComparer(int mod, IEqualityComparer<CustomOrderDefinitionImmutable> def_comparer) {
-               _mod = mod;
-               _def_comparer = def_comparer;
-            }
-
-            public bool Equals(CompositeAlgoDefinitionImmutable x, CompositeAlgoDefinitionImmutable y) =>
-               x.Name == y.Name &&
-               x.HasAlgo ?
-                  y.HasAlgo && _def_comparer.Equals(x.Algo, y.Algo) :
-                  !y.HasAlgo;
-
-            public int GetHashCode(CompositeAlgoDefinitionImmutable algo_def) =>
-               EqualityComparer.safe_get_hash_code(algo_def.Name) % _mod +
-               EqualityComparer.phase_hash(algo_def.HasAlgo ? _def_comparer.GetHashCode(algo_def.Algo) : 0, 1, _mod);
+            public int GetHashCode(CustomOrderDefinitionImmutable def) =>
+               EqualityComparer.auto_phase(enumerate_algo_structure(def));
         }
      }

@@ -972,8 +969,8 @@ namespace mbts.spark.utilities {
         // param types
         public static QuantityMeasure QuantityMeasure => new QuantityMeasure { Absolute = 1 };
         // core data types
-         public static AlgoData AlgoData() => new AlgoData(CustomOrderDefinitionImmutable());
-         public static AlgoData AlgoData(CustomOrderDefinition.CustomOneofCase algo_type) => new AlgoData(CustomOrderDefinitionImmutable(algo_type));
+         public static AlgoData AlgoData() => spark.AlgoData.from_custom_def(CustomOrderDefinitionImmutable());
+         public static AlgoData AlgoData(CustomOrderDefinition.CustomOneofCase algo_type) => spark.AlgoData.from_custom_def(CustomOrderDefinitionImmutable(algo_type));

         public static OrderDefinition OrderDefinition => new OrderDefinition { CustomDef = new CustomOrderDefinition() };
         public static OrderRecord OrderRecord => new OrderRecord {
@@ -1008,6 +1005,9 @@ namespace mbts.spark.utilities {
               case bts.api.orderman.CustomOrderDefinition.CustomOneofCase.Trigger: rv.Trigger = TriggerOrderDefinition(); break;
               case bts.api.orderman.CustomOrderDefinition.CustomOneofCase.Spreader: rv.Spreader = SpreaderOrderDefinition(); break;
               case bts.api.orderman.CustomOrderDefinition.CustomOneofCase.Dynamic: rv.Dynamic = DynamicOrderDefinition(); break;
+               default:
+                  OrderTypeVMFactory.GenericOrderFactory.setup_generic_custom_order(rv, order_type);
+                  break;
            }
            return rv;
         }
@@ -1033,6 +1033,9 @@ namespace mbts.spark.utilities {
         public static TriggerOrderDefinition TriggerOrderDefinition() => new TriggerOrderDefinition { Child = CustomOrderDefinition(), TriggerCondition = new TriggerCondition(), TriggerAction = new TriggerAction(), };
         public static DynamicOrderDefinition DynamicOrderDefinition() => new DynamicOrderDefinition();
         public static SpreaderOrderDefinition SpreaderOrderDefinition() => new SpreaderOrderDefinition { ExecutionStrategy = new ExecutionStrategy() };
+
+         public static SplitterOrderDefinition SplitterOrderDefinition() => new SplitterOrderDefinition();
      }
   }
+   
 }
@@ -0,0 +1,135 @@
+using bts;
+using bts.api;
+using bts.api.orderman;
+using bts.utils;
+using mbts.spark.utilities;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reactive.Linq;
+
+namespace mbts.spark {
+   /// <summary>
+   /// Monitors selected rows, and determines whether or not they are all active-orders, with common parameters.
+   /// </summary>
+   class OrderParamsAggregator {
+      readonly TimeSpan _throttle;
+      readonly CommonValueGroupMonitor<CustomOrderDefinitionImmutable, CustomOrderDefinitionImmutable> _algo_def_mon =
+         new CommonValueGroupMonitor<CustomOrderDefinitionImmutable, CustomOrderDefinitionImmutable>(
+            ask => ask,
+            OrderDataHelper.EqualsHelpers.custom_order_defi_structure_comparer,
+            OrderDataHelper.EqualsHelpers.custom_order_defi_comparer);
+      readonly CommonValueMonitor<SecurityImmutable?> _spreader_security_mon = new CommonValueMonitor<SecurityImmutable?>();
+      readonly CommonValueMonitor<SecurityImmutable?> _security_mon = new CommonValueMonitor<SecurityImmutable?>();
+      readonly CommonValueMonitor<double> _price_mon = new CommonValueMonitor<double>(double.NaN);
+      readonly CommonValueMonitor<uint> _size_mon = new CommonValueMonitor<uint>();
+      readonly CommonValueMonitor<AccountTuple> _account_mon = new CommonValueMonitor<AccountTuple>();
+      readonly CommonValueMonitor<bool> _all_active_mon = new CommonValueMonitor<bool>();
+      readonly CommonValueMonitorMultiplexor<OrderSecurityAlgo> _group_mon = new CommonValueMonitorMultiplexor<OrderSecurityAlgo>();
+      readonly DynamicOrderHelper _dyn_helper;
+      readonly Func<uint, OrderSecurityAlgo?> _lookup_order;
+
+      public OrderParamsAggregator(DynamicOrderHelper dyn_helper, TimeSpan throttle, Func<uint, OrderSecurityAlgo?> lookup_order) {
+         _dyn_helper = dyn_helper;
+         _throttle = throttle;
+         _lookup_order = lookup_order;
+         _group_mon.add_member_mon(_algo_def_mon, _build_algo_tree);
+         _group_mon.add_member_mon(_spreader_security_mon, _get_spreader_sec, s => s.HasValue);
+         _group_mon.add_member_mon(_security_mon, osam => osam.security, s => s.HasValue);
+         _group_mon.add_member_mon(_price_mon, osam => osam.order.price());
+         _group_mon.add_member_mon(_size_mon, osam => osam.order.quantity());
+         _group_mon.add_member_mon(_account_mon, osam => new AccountTuple(osam.order.account_id(), osam.order.account()));
+         _group_mon.add_member_mon(_all_active_mon, osam => osam.order.is_active());
+      }
+
+      public SecurityImmutable? security => _security_mon.common_value;
+      public SecurityImmutable? spreader_security => _spreader_security_mon.common_value;
+      public double price => _price_mon.try_get_common_value(out double p) ? p : double.NaN;
+      public uint? size => _size_mon.common_value_nullable();
+      public AccountTuple? account => _account_mon.common_value_nullable();
+      public bool all_active => _all_active_mon.common_value;
+
+      public IObservable<IEnumerable<CustomOrderDefinitionImmutable>> subscribe_algos() => _algo_def_mon.SubscribeThrottled(_throttle, (ask, vals) => vals, Enumerable.Empty<CustomOrderDefinitionImmutable>());
+      public IObservable<SecurityImmutable?> subscribe_spreader_security() => _spreader_security_mon.SubscribeThrottled(_throttle);
+      public IObservable<SecurityImmutable?> subscribe_security() => _security_mon.SubscribeThrottled(_throttle);
+      public IObservable<double> subscribe_price() => _price_mon.SubscribeThrottled(_throttle);
+      public IObservable<uint?> subscribe_size() => _size_mon.SubscribeThrottledNullable(_throttle);
+      public IObservable<AccountTuple?> subscribe_account() => _account_mon.SubscribeThrottledNullable(_throttle);
+      public IObservable<bool> subscribe_all_active() => _all_active_mon.SubscribeThrottled(_throttle);
+      public IObservable<Plurality> subscribe_security_plurality() => _security_mon.SubscribePluralityThrottled(_throttle);
+
+      public IDisposable defer_updates() =>
+         _group_mon.defer_updates();
+
+      public void Add(OrderSecurityAlgo order_tuple) =>
+         _group_mon.add(order_tuple);
+
+      public void Remove(OrderSecurityAlgo order_tuple) =>
+         _group_mon.remove(order_tuple);
+
+      public void Clear() =>
+         _group_mon.clear();
+
+      static SecurityImmutable? _get_spreader_sec(OrderSecurityAlgo osam) =>
+         OrderDataHelper.enumerate_algo_hierarchy(osam.order.Def.CustomDef.CloneToMutable())
+         .Any(algo => algo.CustomCase == CustomOrderDefinition.CustomOneofCase.Spreader) ?
+         osam.security : null;
+
+      CustomOrderDefinitionImmutable _build_algo_tree(OrderSecurityAlgo root) =>
+         root.order.Def.AttachTargetOrderKey == 0 ?
+            root.order.Def.CustomDef :
+            new CustomOrderDefinitionImmutable(_add_attached_targets(root.order.Def.CustomDef.CloneToMutable(), root.order.Key, root.order.Def.AttachTargetOrderKey));
+
+      CustomOrderDefinition _add_attached_targets(CustomOrderDefinition mroot, uint root_id, uint attached_target) {
+         var lin = _lineage(root_id, attached_target);
+         if (lin != null && lin.Count > 0) {
+            var mparent = mroot;
+            var pcad = OrderDataHelper.get_primary_child_algo_data(mparent);
+            if (pcad.HasValue) {
+               do {
+                  var mchild = lin.Pop().order.Def.CustomDef.CloneToMutable();
+                  pcad.Value.assign_child(mparent, mchild);
+                  mparent = mchild;
+                  pcad = OrderDataHelper.get_primary_child_algo_data(mparent);
+               } while (lin.Count > 0 && pcad.HasValue);
+            }
+         }
+         return mroot;
+      }
+
+      Stack<OrderSecurityAlgo> _lineage(uint root, uint target) {
+         // check args/preconditions
+         if (root == 0) throw new ArgumentException("Cannot be zero.", nameof(root));
+         if (target == 0) throw new ArgumentException("Cannot be zero.", nameof(target));
+         if (target == root) return null;
+         var inner = _lookup_order(target);
+         if (!inner.HasValue)
+            return null;
+         // if 'target' has an attach target iteself (nested), push the nested lineage onto the stack first,
+         // then push the original target onto the stack, and try to hop up each algo-generation
+         // via parent-key lookups until we reach the root.
+         // **If the lineage is disjointed, and we never reach the root, return null**
+         var ival = inner.Value;
+         var lin_stack = ival.order.attached_target_order_key() != 0 ?
+            _lineage(ival.order.Key, ival.order.attached_target_order_key()) ?? new Stack<OrderSecurityAlgo>() :
+            new Stack<OrderSecurityAlgo>();
+         lin_stack.Push(ival);
+         target = ival.order.ParentKey;
+         while (target != root) {
+            if (target == 0) {
+               // **disjointed lineage**
+               return null;
+            }
+            inner = _lookup_order(target);
+            if (!inner.HasValue) {
+               // **disjointed lineage**
+               return null;
+            }
+            ival = inner.Value;
+            lin_stack.Push(ival);
+            target = ival.order.ParentKey;
+         }
+         return lin_stack;
+      }
+   }
+}
@@ -52,7 +52,6 @@ namespace mbts.spark {
   class OrderPropertiesEditorVM : DisposableViewModelBase {
      readonly OrdersModel _model;
      readonly Property<SecurityImmutable> _security;
-      readonly Property<AlgoDefinitionTemplateVM> _selected_algo_template, _selected_favorite_algo_template;
      readonly SelectorProperty<AccountTuple, AccountTuple?> _accounts;
      readonly SelectorProperty<TimeInForce> _time_in_force;
      readonly SelectionModel<AlgoDefinitionVM> _selected_algo_definition;
@@ -60,8 +59,6 @@ namespace mbts.spark {
      readonly ObservableKeyedCollection<AlgoDefinitionVM, AlgoKey> _algo_definitions = new ObservableKeyedCollection<AlgoDefinitionVM, AlgoKey>(d => d.key);
      readonly ListCollectionView<AlgoDefinitionVM> _algo_definitions_view, _favorite_algo_definitions_view;
      readonly TableUpdateBuffer<AlgoData, AlgoKey> _definitions_buffer = new TableUpdateBuffer<AlgoData, AlgoKey>(d => d.key);
-      readonly EditableCollectionModel<AlgoDefinitionTemplateVM, AlgoDefinitionVM> _algo_template_collection_model;
-      readonly ObservableKeyedCollection<AlgoDefinitionTemplateVM, AlgoKey> _favorite_templates = new ObservableKeyedCollection<AlgoDefinitionTemplateVM, AlgoKey>(tvm => tvm.key);
      readonly ObservableAggregateCollection<AlgoParamRowVM> _algo_param_rows = new ObservableAggregateCollection<AlgoParamRowVM>();
      IReadOnlyDictionary<AlgoKey, AlgoDefinitionMetadata> _algo_metadata = DictionaryHelper.empty<AlgoKey, AlgoDefinitionMetadata>();
      IReadOnlyDictionary<AlgoKey, int> _favorite_algos_index = DictionaryHelper.empty<AlgoKey, int>();
@@ -74,7 +71,6 @@ namespace mbts.spark {
         var security_source = security_md_source.Select(smd => smd.security);
         _security = backing(nameof(security), security_source, SecurityDataHelper.Defaults.SecurityImmutable);
         security_source = _security.observe_current(true);
-         _selected_algo_template = backing<AlgoDefinitionTemplateVM>(nameof(selected_algo_template));
         _selected_algo_definition = new SelectionModel<AlgoDefinitionVM>(algo_definitions,
            () => {
               var t = _model.factory.default_order_type(security);
@@ -105,13 +101,18 @@ namespace mbts.spark {
         var inline_account_src = order_properties.AggregateLatest(
            model.factory.subscribe_accounts(),
            (last, change, cache) => convert_inline_account(change.New.account, cache),
-            (last, props, change) => convert_inline_account(props.account, change.New),
+            (last, props, change) => convert_inline_account(props.account, change.New, false),
            () => new InlineUserProperty<AccountTuple>(),
            new InlineOrderProperties(),
            DictionaryHelper.empty<uint, string>());
+         // Note that with the .Where on the account_tuples, we will ignore any
+         // updates for which all accounts have been removed.
+         // This was a safer change than changing SelectorProperty's IEnumberable.OnNext
+         // so that it would not reset the selected item on server reboots; i.e. this
+         // change only affects this IObservable.
         _accounts = backing(
            nameof(selected_account),
-            model.factory.subscribe_account_tuples(),
+            model.factory.subscribe_account_tuples().Where(items => items.Any()),
            inline_account_src,
            a => new AccountTuple?(a),
            () => accounts.Cast<AccountTuple?>().FirstOrDefault(),
@@ -126,29 +127,8 @@ namespace mbts.spark {
            order_properties.Select(ops => ops.time_in_force),
            () => model.factory.default_time_in_force(security),
            tif => time_in_forces.Contains(tif));
-         _selected_favorite_algo_template = backing<AlgoDefinitionTemplateVM>(nameof(selected_favorite_algo_template));
-         // items source views
-         algo_templates_view = CollectionViewSource.GetDefaultView(algo_templates);
-         var favorite_algo_templates_view = new ListCollectionView(ObservableAggregateCollection.create(_algo_definitions.AsCollection(), d => d.templates));
-         favorite_algo_templates_view.LiveGroupingProperties.Add(nameof(AlgoDefinitionTemplateVM.owner_key));
-         favorite_algo_templates_view.LiveFilteringProperties.Add(nameof(AlgoDefinitionTemplateVM.is_favorite));
-         favorite_algo_templates_view.Filter = item => (item as AlgoDefinitionTemplateVM)?.is_favorite ?? false;
-         favorite_algo_templates_view.IsLiveFiltering = true;
-         this.favorite_algo_templates_view = favorite_algo_templates_view;
         // commands
         save_definition_cmd = new AsyncCommand<AlgoDefinitionVM>(save_definition_async);
-         save_template_cmd = new AsyncCommand<AlgoDefinitionTemplateVM>(save_template_async);
-         remove_template_cmd = new AsyncCommand<AlgoDefinitionTemplateVM>(tvm => _model.algo_model.remove_template(tvm.key));
-         toggle_is_favorite_cmd = new DelegateCommand<AlgoDefinitionTemplateVM>(tvm => _favorite_templates.Add(tvm));
-         _algo_template_collection_model = new EditableCollectionModel<AlgoDefinitionTemplateVM, AlgoDefinitionVM>(d => selected_algo_definition == null ? default : selected_algo_definition.template_factory(), d => d != null);
-         redo_cmd = ObservantCommand.create(
-            t => t?.redo(),
-            t => t == null ? Observable.Return(false) : System.Reactive.Linq.ObservableExtensions.FromEvent(cb => t.can_redo_changed += cb, cb => t.can_redo_changed -= cb, () => t.can_redo).OnDispatcher(),
-            out IObserver<AlgoDefinitionTemplateVM> redo_observer);
-         undo_cmd = ObservantCommand.create(
-            t => t?.undo(),
-            t => t == null ? Observable.Return(false) : System.Reactive.Linq.ObservableExtensions.FromEvent(cb => t.can_undo_changed += cb, cb => t.can_undo_changed -= cb, () => t.can_undo).OnDispatcher(),
-            out IObserver<AlgoDefinitionTemplateVM> undo_observer);
         undo_definition_cmd = ObservantCommand.create(
            d => d?.undo(),
            d => d == null ? Observable.Return(false) : System.Reactive.Linq.ObservableExtensions.FromEvent(cb => d.can_undo_changed += cb, cb => d.can_undo_changed -= cb, () => d.can_undo).OnDispatcher(),
@@ -172,7 +152,7 @@ namespace mbts.spark {
         }, out IObserver<bool> revert_algo_params_observer);
         var algo_params_dirty_mon = new ReactiveThresholdMonitor<AlgoParamRowVM>(r => r.param.subscribe_is_dirty());
         var nullable_security_md_source = security_md_source.Select(smd => new SecurityMD?(smd)).RefCountReplay(1);
-         var inline_algo_relay = new SelectionModelInlinePropRelay<AlgoDefinitionVM, AlgoDefinitionVM, AlgoID>(_selected_algo_definition, vm => AlgoID.from_algo_key(vm.key, _model.dynamic_helper.dynamic_type_index));
+         var inline_algo_relay = new SelectionModelInlinePropRelay<AlgoDefinitionVM, AlgoDefinitionVM, AlgoID>(_selected_algo_definition, vm => AlgoID.from_algo_key(vm.key));
         //
         _dispose = new CompositeDisposable(
            order_properties.OnDispatcher().Subscribe(props => {
@@ -181,31 +161,10 @@ namespace mbts.spark {
            algo_params_dirty_mon.Subscribe(set_default_algo_params_observer, revert_algo_params_observer),
            ObservableAutoWrapper.connect_item_hooks(_algo_param_rows, algo_params_dirty_mon.join),
            _selected_algo_definition.subscribe_changed(_selected_algo_definition_Changed),
-            as_demuxer().subscribe<AlgoDefinitionTemplateVM>(nameof(selected_algo_template)).Subscribe(
-               undo_observer,
-               redo_observer),
            as_demuxer().subscribe<AlgoDefinitionVM>(nameof(selected_algo_definition)).Subscribe(
               undo_definition_observer,
               redo_definition_observer,
               revert_definition_observer),
-            algo_definitions.Subscribe((s, e) => {
-               if (e.OldItems != null)
-                  e.OldItems.OfType<IDisposable>().DisposeAll();
-               if (e.NewItems != null) {
-                  foreach (AlgoDefinitionVM d in e.NewItems) {
-                     switch (d.key.mode) {
-                        case AlgoKey.Mode.Persisted:
-                           if (_model.algo_model.ui_configuration.include_custom_templates && _model.algo_model.templates_enabled())
-                              d.prepend_custom_template();
-                           break;
-                        case AlgoKey.Mode.Factory:
-                           if (_model.algo_model.ui_configuration.include_legacy_custom_templates && _model.algo_model.templates_enabled())
-                              d.prepend_custom_template();
-                           break;
-                     }
-                  }
-               }
-            }),
            security_md_source.Select(smd => model.factory.default_algos(smd.security)).Table(s => s.key).Subscribe(factory_defs => {
               using (_selected_algo_definition.begin_update())
                  AlgoCollectionHelper.update_persisted_definitions(_algo_definitions, factory_defs, fd => {
@@ -217,43 +176,41 @@ namespace mbts.spark {
            model.algo_model.definitions.Subscribe(_definitions_buffer),
            _definitions_buffer.OnDispatcher().Subscribe(u => {
               AlgoCollectionHelper.update_persisted_definitions(_algo_definitions, u, def_data => {
-                  var def_vm = AlgoDefinitionVM.create(model, def_data, true, OrderDataHelper.get_algo_format(security.ContractCase), AlgoEditingPermissions.AllowEditValues);
+                  var def_vm = AlgoDefinitionVM.create(model, def_data, OrderDataHelper.get_algo_format(security.ContractCase), AlgoEditingPermissions.AllowEditValues);
                  def_vm.selected_format = OrderDataHelper.get_algo_format(security.ContractCase);
                  def_vm.favorite_index = _get_favorite_algo_index(def_vm.key);
                  return def_vm;
               });
-            }), 
+            }),
            model.algo_model.metadata_service.subscribe_metadata().OnDispatcher().Subscribe(_on_template_metadata),
            ObservableAutoWrapper.connect_item_hooks(algo_definitions, vm =>
-            Disposable.Create(
-               vm.connect_data(nullable_security_md_source),
-               security_source.Subscribe(s => {
-                  var fmt = OrderDataHelper.get_algo_format(s.ContractCase);
-                  foreach (var d in algo_definitions)
-                     d.selected_format = fmt;
-               }),
-               vm), true)) {
-            () => {
-               Disposable.dispose(ref _template_collection_sync);
-               Disposable.dispose(ref _algo_param_rows_hook);
-            }
+               Disposable.Create(
+                  vm.connect_data(nullable_security_md_source),
+                  security_source.Subscribe(s => {
+                     var fmt = OrderDataHelper.get_algo_format(s.ContractCase);
+                     foreach (var d in algo_definitions)
+                        d.selected_format = fmt;
+                  }),
+                  vm),
+               true)) {
+            () => Disposable.dispose(ref _algo_param_rows_hook)
         };
         // local methods
-         async Task save_template_async(AlgoDefinitionTemplateVM template) {
-            using (_preserve_selection_by_index())
-               await AlgoPersistenceHelper.persist_template(model, algo_definitions, template);
-         }
         async Task save_definition_async(AlgoDefinitionVM definition) {
            switch (definition.key.mode) {
               case AlgoKey.Mode.Persisted:
-                  await AlgoPersistenceHelper.persist_definition(model, algo_definitions, definition);
+                  using (_definitions_buffer.buffer_updates())
+                     await _model.algo_model.save_definition(definition.create_algo_def());
                  break;
               case AlgoKey.Mode.Factory:
               case AlgoKey.Mode.Unpersisted:
                  using (_definitions_buffer.buffer_updates()) {
-                     var persisted_key_lookup = await AlgoPersistenceHelper.persist_definition(model, algo_definitions, definition);
-                     if (persisted_key_lookup.TryGetValue(definition.key, out AlgoKey pkey) && _algo_definitions.TryGetValue(pkey, out AlgoDefinitionVM pdef))
-                        selected_algo_definition = pdef;
+                     var persisted_def = await model.algo_model.save_definition(definition.create_algo_def());
+                     if (persisted_def.HasValue) {
+                        int pos = algo_definitions.IndexOf(definition);
+                        if (pos >= 0)
+                           selected_algo_definition = algo_definitions[pos] = definition.to_persisted(persisted_def.Value);
+                     }
                     if (definition.key.mode == AlgoKey.Mode.Factory) {
                        /// Revert the factory definition to its original state.
                        /// Note: this won't revert the parameters in the algo popup since the newly persisted definition (<see cref="pdef"/>) is selected now.
@@ -263,38 +220,34 @@ namespace mbts.spark {
                  break;
            }
         }
-         InlineUserProperty<AccountTuple> convert_inline_account(InlineUserProperty<uint> account_id, IReadOnlyDictionary<uint, string> account_map) =>
+         //
+         //  Regarding the 3rd parameter, force_override_from_inline_property:
+         //    When using an InlineUserProperty, in the context of assigning a default vs selected item,
+         //    there is somewhat of a conflict between the IObserver<InlineUserProperty<TItem>> and the 
+         //    IObserver<IEnumerable<TItem>> OnNext methods.  This 3rd paramter provides yet another override
+         //    to say if the force_override should come from the inline property or if the force_override should
+         //    be disbled, by way of the immediate return in ViewModelBase._try_auto_select when force_override
+         //    is false.  Our intent is then accomplished because we are no longer attempting to set a default/
+         //    selected item when the account_tuples potentially changes
+         InlineUserProperty<AccountTuple> convert_inline_account(InlineUserProperty<uint> account_id, IReadOnlyDictionary<uint, string> account_map, bool force_override_from_inline_property = true) =>
            account_id.has_value && account_map.TryGetValue(account_id.value, out string name) ?
-               new InlineUserProperty<AccountTuple>(new AccountTuple(account_id.value, name), account_id.force_override) :
+               new InlineUserProperty<AccountTuple>(new AccountTuple(account_id.value, name), force_override_from_inline_property ? account_id.force_override : false) :
               new InlineUserProperty<AccountTuple>();
      }

-      IDisposable _template_collection_sync;
      void _selected_algo_definition_Changed(AlgoDefinitionVM old_value, AlgoDefinitionVM new_value, SelectionReason reason) {
-         Disposable.dispose(ref _template_collection_sync);
         Disposable.dispose(ref _algo_param_rows_hook);
         if (new_value != null) {
-            _template_collection_sync = ObservableAutoWrapper.connect_two_way(new_value.templates_with_custom, algo_templates);
            if (use_algo_param_grid)
               _algo_param_rows_hook = _connect_algo_param_rows(new_value, _algo_param_rows);
            if (reason != SelectionReason.Explicit)
               _selected_algo_stack.Push(new_value.key);
-         } else {
-            algo_templates.Clear();
         }
         if (open_algo_popup_on_select) {
            if (reason == SelectionReason.UserSelectedNewValue && new_value?.algo_root is IAlgoVM ar && ar.can_expand)
               ar.is_expanded = true;
         }
-         if (selected_algo_template == null && _model.algo_model.templates_enabled()) {
-            if (new_value != null)
-               selected_algo_template = new_value.templates.FirstOrDefault(tvm => tvm.is_default, tvm => _favorite_templates.ContainsKey(tvm.key), tvm => true) ?? new_value.templates_with_custom.FirstOrDefault();
-         } else {
-            RaisePropertyChanged(nameof(selected_algo_template));
-         }
         RaisePropertyChanged(nameof(selected_algo_definition), nameof(selected_favorite_algo_definition), nameof(can_expand), nameof(is_expanded));
-         _selected_favorite_algo_template.Value = selected_algo_template is AlgoDefinitionTemplateVM t && t.is_favorite ? t : null;
-         _algo_template_collection_model.OnNext(new_value);
      }

      public SecurityImmutable security => _security.Value;
@@ -302,7 +255,6 @@ namespace mbts.spark {
      public AccountTuple? selected_account { get => _accounts.selected_item; set => _accounts.selected_item = value; }
      public ReadOnlyObservableCollection<TimeInForce> time_in_forces => _time_in_force.items;
      public TimeInForce selected_time_in_force { get => _time_in_force.selected_item; set => _time_in_force.selected_item = value; }
-      public CustomOrderDefinitionImmutable? definition => selected_algo_template?.algo_root?.definition;
      public int favorite_algos_column_count { get => _favorite_algos_column_count; private set => Set(ref _favorite_algos_column_count, value); }
      public bool use_algo_param_grid {
         get => _use_algo_param_grid;
@@ -317,47 +269,14 @@ namespace mbts.spark {
      }
      // items sources
      public ObservableCollection<AlgoDefinitionVM> algo_definitions => _algo_definitions;
-      public ObservableCollection<AlgoDefinitionTemplateVM> algo_templates { get; } = new ObservableCollection<AlgoDefinitionTemplateVM>();
      public IReadOnlyObservableCollection<AlgoParamRowVM> algo_param_rows => _algo_param_rows;
      public ICollectionView<AlgoDefinitionVM> algo_definitions_view => _algo_definitions_view;
      public ICollectionView<AlgoDefinitionVM> favorite_algo_definitions_view => _favorite_algo_definitions_view;
-      public ICollectionView algo_templates_view { get; }
-      public ICollectionView favorite_algo_templates_view { get; }
      // selected items
      public AlgoDefinitionVM selected_algo_definition {
         get => _selected_algo_definition.selected_item;
         set => _selected_algo_definition.selected_item = value;
      }
-      public AlgoDefinitionTemplateVM selected_algo_template {
-         get => selected_algo_definition?.selected_template;
-         set {
-            if (value != selected_algo_template) {
-               if (value == null) {
-                  if (selected_algo_definition != null)
-                     selected_algo_definition.selected_template = null;
-                  _selected_favorite_algo_template.set(null);
-               } else {
-                  value.owner.selected_template = value;
-                  _selected_algo_definition.select_explicit(value.owner); // idempotent
-                  _selected_favorite_algo_template.Value = value.is_favorite ? value : null; // idempotent
-               }
-               RaisePropertyChanged();
-            }
-         }
-      }
-      public AlgoDefinitionTemplateVM selected_favorite_algo_template {
-         get => _selected_favorite_algo_template.Value;
-         set {
-            if (_selected_favorite_algo_template.set_new(value)) {
-               if (value != null) {
-                  value.owner.selected_template = value;
-                  if (value.owner != selected_algo_definition)
-                     _selected_algo_definition.select_explicit(value.owner);
-                  RaisePropertyChanged(nameof(selected_algo_template));
-               }
-            }
-         }
-      }
      public AlgoDefinitionVM selected_favorite_algo_definition {
         get => selected_algo_definition?.is_favorite ?? false ? selected_algo_definition : null;
         set {
@@ -389,13 +308,10 @@ namespace mbts.spark {
      public ICommand revert_definition_cmd { get; }
      public ICommand set_default_algo_params_cmd { get; }
      public ICommand revert_algo_params_cmd { get; }
-      public ICommand undo_cmd { get; }
-      public ICommand redo_cmd { get; }
      public ICommand undo_definition_cmd { get; }
      public ICommand redo_definition_cmd { get; }
      public ICommand remove_template_cmd { get; }
      public ICommand toggle_is_favorite_cmd { get; }
-      public IEditableCollectionModel<AlgoDefinitionTemplateVM> algo_template_collection_model => _algo_template_collection_model;

      public IObservable<AccountTuple?> observe_account(bool start_immediately = false) =>
         _accounts.observe_current(start_immediately);
@@ -404,9 +320,7 @@ namespace mbts.spark {
         _time_in_force.observe_current(start_immediately);

      public IObservable<IAlgoVM> observe_order_type(bool start_immediately = false) =>
-         _model.algo_model.templates_enabled() ?
-            _selected_algo_template.observe_current(start_immediately).Select(t => t?.algo_root) :
-            _selected_algo_definition.observe_selected_item(start_immediately).Select(d => d?.algo_root);
+         _selected_algo_definition.observe_selected_item(start_immediately).Select(d => d?.algo_root);

      public OrderDefinition create(Side side) {
         if (HasErrors)
@@ -414,40 +328,29 @@ namespace mbts.spark {
         var order = _model.factory.order(security, selected_account);
         order.TimeInForce = selected_time_in_force;
         order.Side = side;
-         if (_model.algo_model.templates_enabled()) {
-            selected_algo_template.algo_root.assign_to(order.CustomDef);
-         } else {
-            var algo = new CustomOrderDefinition();
-            selected_algo_definition.algo_root.assign_to(algo);
-            switch (selected_algo_definition.key.mode) {
-               case AlgoKey.Mode.Persisted:
-                  order.CustomDef = new CustomOrderDefinition {
-                     Composite = new CompositeOrderDefinition {
-                        AlgoTemplateKey = selected_algo_definition.key.persisted.id_uint,
-                        Definition = algo
-                     }
-                  };
-                  selected_algo_definition.algo_root.assign_to(order.CustomDef.Composite.Definition);
-                  break;
-               default:
-                  order.CustomDef = algo;
-                  break;
-            }
+         var algo = new CustomOrderDefinition();
+         selected_algo_definition.algo_root.assign_to(algo);
+         switch (selected_algo_definition.key.mode) {
+            case AlgoKey.Mode.Persisted:
+               order.CustomDef = new CustomOrderDefinition {
+                  Composite = new CompositeOrderDefinition {
+                     AlgoTemplateKey = selected_algo_definition.key.persisted,
+                     Definition = algo
+                  }
+               };
+               selected_algo_definition.algo_root.assign_to(order.CustomDef.Composite.Definition);
+               break;
+            default:
+               order.CustomDef = algo;
+               break;
         }
         return order;
      }

-      public OrderMetadata get_metadata(CustomOrderDefinition.CustomOneofCase order_type) =>
-         _model.factory.get_metadata(order_type);
-
      public void on_favorite_algos(LadderFavoriteAlgosSettings value) {
         _favorite_algos_index = value.favorite_algos.Select((v, i) => (v, i)).ToDictionaryCrushed(t => t.v, t => t.i);
         foreach (var d in algo_definitions) {
            d.favorite_index = _get_favorite_algo_index(d.key);
-            foreach (var t in d.templates) {
-               if (t.key.mode == AlgoKey.Mode.Persisted)
-                  t.is_favorite = _favorite_algos_index.ContainsKey(t.key);
-            }
         }
         favorite_algos_column_count = value.column_count;
      }
@@ -465,29 +368,7 @@ namespace mbts.spark {

      void _on_template_metadata(IReadOnlyDictionary<AlgoKey, AlgoDefinitionMetadata> meta) {
         _algo_metadata = meta;
-         var curr_selected_template = selected_algo_template;
-         if (curr_selected_template?.is_favorite ?? false)
-            selected_favorite_algo_template = curr_selected_template;
         algo_definitions_view.Refresh();
      }
-
-      // This preserves the selected items through a save op.
-      // When a definition/template is persisted for the first time, its unpersisted-placeholder item is removed and replaced with a new persisted one.
-      // If an unpersisted item is selected when it is removed, the view will automatically select null - this method is a workaround for that.
-      IDisposable _preserve_selection_by_index() {
-         (int? selected_def_index, int? selected_tmp_index) = AlgoPersistenceHelper.selection_snapshot(algo_definitions, selected_algo_definition, selected_algo_template);
-         return new CompositeDisposable(_definitions_buffer.buffer_updates()) {
-            () => {
-               if (selected_def_index is int di && algo_definitions.check_index(di)) {
-                  var def = algo_definitions[di];
-                  if (selected_tmp_index is int ti && def.templates.check_index(ti)) {
-                     selected_algo_template = def.templates[ti];
-                  } else {
-                     selected_algo_definition = def;
-                  }
-               }
-            }
-         };
-      }
   }
 }
@@ -4,55 +4,28 @@ using System;

 namespace bts.api.orderman {
   readonly struct OrderSecurity : IEquatable<OrderSecurity> {
-      public OrderSecurity(SecurityImmutable? sec, OrderRecordImmutable order) {
-         this.security = sec;
-         this.order = order;
-         piq = null;
-         algo = null;
-         meta = null;
-         root_algo = new AlgoData(order.Def.CustomDef);
-         root_meta = null;
-      }
      public OrderSecurity((SecurityImmutable? sec, OrderRecordImmutable order) t) {
         security = t.sec;
         order = t.order;
         piq = null;
         algo = null;
         meta = null;
-         root_algo = new AlgoData(order.Def.CustomDef);
-         root_meta = null;
      }
+
      public OrderSecurity(SecurityImmutable? sec, OrderRecordImmutable order, uint? piq) {
         this.security = sec;
         this.order = order;
         this.piq = piq;
         algo = null;
         meta = null;
-         root_algo = new AlgoData(order.Def.CustomDef);
-         root_meta = null;
      }
+
      public OrderSecurity(SecurityImmutable? sec, OrderRecordImmutable order, uint? piq, AlgoData? algo, AlgoDefinitionMetadata? meta) {
         this.security = sec;
         this.order = order;
         this.piq = piq;
         this.algo = algo;
         this.meta = meta;
-         root_algo = algo ?? new AlgoData(order.Def.CustomDef);
-         root_meta = meta;
-      }
-      public OrderSecurity(SecurityImmutable? sec, OrderRecordImmutable order, uint? piq, AlgoData? algo, AlgoDefinitionMetadata? meta, AlgoData? rootalgo = null, AlgoDefinitionMetadata? rootmeta = null) {
-         this.security = sec;
-         this.order = order;
-         this.piq = piq;
-         this.algo = algo;
-         this.meta = meta;
-         if (rootalgo.HasValue) {
-            this.root_algo = rootalgo.Value;
-            this.root_meta = rootmeta;
-         } else {
-            this.root_algo = algo ?? new AlgoData(order.Def.CustomDef);
-            this.root_meta = meta;
-         }
      }

      public static implicit operator OrderSecurity(ValueTuple<SecurityImmutable?, OrderRecordImmutable> x) => new OrderSecurity(x);
@@ -61,20 +34,13 @@ namespace bts.api.orderman {
      public uint? piq { get; }
      public AlgoData? algo { get; }
      public AlgoDefinitionMetadata? meta { get; }
-      public AlgoData root_algo { get; }
-      public AlgoDefinitionMetadata? root_meta { get; }
-
-
-      public OrderSecurity with(AlgoData? root_algo, AlgoDefinitionMetadata? root_meta = null) =>
-         new OrderSecurity(security, order, piq, algo, meta, root_algo, root_meta);

      public bool Equals(OrderSecurity other) =>
         order == other.order &&
         security == other.security &&
         piq == other.piq &&
         algo == other.algo &&
-         meta == other.meta &&
-         root_algo == other.root_algo;
+         meta == other.meta;

      public override bool Equals(object obj) => EqualityComparer.equals_obj(this, obj);

@@ -84,62 +50,104 @@ namespace bts.api.orderman {
            security?.GetHashCode() ?? 0,
            piq?.GetHashCode() ?? 0,
            algo?.GetHashCode() ?? 0,
-            meta?.GetHashCode() ?? 0,
-            root_algo.GetHashCode());
+            meta?.GetHashCode() ?? 0);

      public static bool operator == (OrderSecurity left, OrderSecurity right) => left.Equals(right);
      public static bool operator != (OrderSecurity left, OrderSecurity right) => !left.Equals(right);
-
   }

-   struct OrderSecurityAlgoMeta : IEquatable<OrderSecurityAlgoMeta> {
+   // 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.
+   readonly struct OrderSecurityAlgo : IEquatable<OrderSecurityAlgo> {
      public readonly OrderRecordImmutable order;
      public readonly SecurityImmutable? security;
-      /// TODO: refactor <see cref="algo"/> to 'studio_algo' or something that indicates it does not bear the same relation to this order, that <see cref="root_algo"/> does to the root order.
-      /// The former is meant to hold studio algo information, and nothing else.  Naturally, it indicates whether or not this is a studio order by being non-null (<see cref="is_studio_algo"/>).
-      /// The latter, however, can be any kind of algo (studio, exchange, etc.); it holds information about the root-most algo in this order's branch.
-      public readonly AlgoData? algo;
+      public readonly AlgoData algo;
      public readonly AlgoDefinitionMetadata? meta;
-      public readonly AlgoData root_algo;
-      public readonly AlgoDefinitionMetadata? root_meta;
+      public readonly uint? piq;

-      public OrderSecurityAlgoMeta(OrderRecordImmutable order, SecurityImmutable? security, AlgoData? algo, AlgoDefinitionMetadata? meta, AlgoData? root_algo = null, AlgoDefinitionMetadata? root_meta = null) {
+      OrderSecurityAlgo(OrderRecordImmutable order, SecurityImmutable? security, AlgoData algo, AlgoDefinitionMetadata? meta, uint? piq) {
         this.order = order;
         this.security = security;
         this.algo = algo;
         this.meta = meta;
-         if (root_algo.HasValue) {
-            this.root_algo = root_algo.Value;
-            this.root_meta = root_meta;
-         } else {
-            this.root_algo = algo ?? new AlgoData(order.Def.CustomDef);
-            this.root_meta = meta;
-         }
+         this.piq = piq;
      }

-      public bool is_studio_algo => algo.HasValue;
+      public static OrderSecurityAlgo from_order_security(OrderSecurity os) =>
+         new OrderSecurityAlgo(
+            os.order,
+            os.security,
+            os.algo ?? AlgoData.from_custom_def(os.order.Def.CustomDef),
+            os.meta,
+            os.piq);

-      public OrderSecurityAlgoMeta with(AlgoData? root_algo, AlgoDefinitionMetadata? root_meta = null) =>
-         new OrderSecurityAlgoMeta(order, security, algo, meta, root_algo, root_meta);
-
-      public bool Equals(OrderSecurityAlgoMeta other) =>
+      public bool Equals(OrderSecurityAlgo other) =>
         order == other.order &&
         security == other.security &&
-         algo == other.algo &&
-         meta == other.meta &&
-         root_algo == other.root_algo;
+         algo == other.algo;

-      public override bool Equals(object obj) => EqualityComparer.equals_obj(this, obj);
+      public override bool Equals(object obj) =>
+         obj is OrderSecurityAlgo other && Equals(other);

      public override int GetHashCode() =>
-         EqualityComparer.aggregate_hash(
-            order.GetHashCode(),
-            security?.GetHashCode() ?? 0,
-            algo?.GetHashCode() ?? 0,
-            meta?.GetHashCode() ?? 0,
-            root_algo.GetHashCode());
+         EqualityComparer.auto_phase(
+            order.Key.GetHashCode(),
+            security.HasValue ? security.Value.Id.GetHashCode() : 0,
+            algo.GetHashCode());

-      public static bool operator ==(OrderSecurityAlgoMeta a, OrderSecurityAlgoMeta b) => a.Equals(b);
-      public static bool operator !=(OrderSecurityAlgoMeta a, OrderSecurityAlgoMeta b) => !a.Equals(b);
+      public static bool operator ==(OrderSecurityAlgo a, OrderSecurityAlgo b) => a.Equals(b);
+      public static bool operator !=(OrderSecurityAlgo a, OrderSecurityAlgo b) => !a.Equals(b);
+   }
+
+   // 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.
+   readonly struct OrderSecurityRootPair : IEquatable<OrderSecurityRootPair> {
+      public readonly OrderSecurityAlgo order;
+      readonly OrderSecurityAlgo? _root;
+
+      OrderSecurityRootPair(OrderSecurityAlgo order) {
+         this.order = order;
+         _root = null;
+      }
+
+      OrderSecurityRootPair(OrderSecurityAlgo order, OrderSecurityAlgo? root) {
+         this.order = order;
+         _root = root;
+      }
+
+      public OrderSecurityAlgo root => _root ?? order;
+
+      public static OrderSecurityRootPair from_order_security(OrderSecurity order) =>
+         new OrderSecurityRootPair(OrderSecurityAlgo.from_order_security(order));
+
+      public static OrderSecurityRootPair from_order_security(OrderSecurity order, OrderSecurity root) =>
+         new OrderSecurityRootPair(
+            OrderSecurityAlgo.from_order_security(order),
+            OrderSecurityAlgo.from_order_security(root));
+
+      public bool Equals(OrderSecurityRootPair other) =>
+         order == other.order &&
+         _root == other._root;
+
+      public override bool Equals(object obj) =>
+         obj is OrderSecurityRootPair other && Equals(other);
+
+      public override int GetHashCode() =>
+         _root.HasValue ?
+         (order.GetHashCode() % (1 << 15)) | (_root.Value.GetHashCode() % (1 << 15) << 16) :
+         order.GetHashCode() % (1 << 15);
+
+      public static bool operator ==(OrderSecurityRootPair a, OrderSecurityRootPair b) => a.Equals(b);
+      public static bool operator !=(OrderSecurityRootPair a, OrderSecurityRootPair b) => !a.Equals(b);
+   }
+
+   static class OrderSecurityHelper {
+      public static readonly Func<OrderSecurity, uint>
+         key_fn = o => o.order.Key,
+         parent_key_fn = o => o.order.ParentKey;
+
+      public static readonly Func<OrderSecurityRootPair, uint>
+         root_pair_key_fn = o => o.order.order.Key,
+         root_pair_parent_key_fn = o => o.order.order.ParentKey;
   }
 }
@@ -0,0 +1,69 @@
+using bts;
+using bts.spark;
+using mbts.ui;
+using System;
+using System.Collections.Specialized;
+using System.Reactive.Linq;
+using System.Threading.Tasks;
+using AlgoDef = bts.api.orderman.CustomOrderDefinition;
+using AlgoDefi = bts.api.orderman.CustomOrderDefinitionImmutable;
+using CompositeDef = bts.api.orderman.CompositeOrderDefinition;
+using CompositeDefi = bts.api.orderman.CompositeOrderDefinitionImmutable;
+
+namespace mbts.spark {
+   static partial class OrderTypeVMFactory {
+      class CompositeAlgoVM : OrderTypeVMBase<CompositeDef, CompositeDefi> {
+         IDisposable _studio_def_hooks;
+         bool _is_disposed;
+         AlgoDefinitionMetadata? _studio_meta;
+
+         public CompositeAlgoVM(AlgoKey id, string display_name, AlgoEditingPermissions editing_permissions)
+            : base(id, display_name, editing_permissions) { }
+
+         public override string abbreviation => _studio_meta?.abbreviation ?? base.abbreviation;
+         public override OrderMetadata meta {
+            get {
+               var m = new OrderMetadata { KeyBinding = string.Empty, NoProps = false };
+               if (_studio_meta.HasValue && _studio_meta.Value.badge_color.HasValue)
+                  m.Color = _studio_meta.Value.badge_color.Value.rgb_color();
+               return m;
+            }
+         }
+
+         public override void assign_to(AlgoDef value) {
+            if (value.Composite == null)
+               value.Composite = new CompositeDef();
+            value.Composite.AlgoTemplateKey = id.persisted;
+            base.assign_to(value);
+         }
+         protected override void Dispose(bool disposing) {
+            _is_disposed = true;
+            Disposable.dispose(ref _studio_def_hooks);
+            base.Dispose(disposing);
+         }
+         protected override void on_model_internal() {
+            Log.assert(!_is_disposed);
+            _studio_def_hooks = Disposable.Create(model.algo_model.definitions.OnDispatcher().Subscribe(studio_def_map => {
+               if (studio_def_map.try_get(id, out var data)) {
+                  display_name = data.name;
+                  load_from(data.value);
+               }
+            }),
+            model.algo_model.metadata_service.subscribe_metadata().OnDispatcher().Subscribe(studio_meta_map => {
+               if (studio_meta_map.TryGetValue(id, out var m)) {
+                  var old_abb = abbreviation;
+                  var old_meta = meta;
+                  _studio_meta = m;
+                  if (abbreviation != old_abb)
+                     RaisePropertyChanged(nameof(abbreviation));
+                  if (meta != old_meta)
+                     RaisePropertyChanged(nameof(meta));
+               }
+            }));
+         }
+         protected override void on_security_internal() => base.on_security_internal();
+         protected override void on_security_md_internal() => base.on_security_md_internal();
+         protected override void validate() => base.validate();
+      }
+   }
+}
@@ -30,7 +30,7 @@ namespace mbts.spark {

      public event Action definition_changed;
      public IAlgoVM impl { get; private set; }
-      public AlgoKey id { get; } = new AlgoKey(AlgoType.None);
+      public AlgoKey id { get; } = AlgoKey.from_known_type(AlgoType.None);
      public AlgoType order_type => _definition.value.CustomCase;
      public OrderMetadata meta => OrderDataHelper.get_metadata(order_type);
      public bool can_expand => impl?.can_expand ?? false;
@@ -58,8 +58,6 @@ namespace mbts.spark {
      public bool key_match(KeyEventArgs e) => false;
      public void load_from(AlgoDefi value) => impl?.load_from(value);
      public void load_many(IEnumerable<AlgoDefi> values) => impl?.load_many(values);
-      public Task<AlgoDefi?> load_from_async(AlgoDefi definition) =>
-         impl?.load_from_async(definition) ?? Task.FromResult<AlgoDefi?>(definition);
      void IAlgoVM.ensure_init() => impl?.ensure_init();

      protected override void Dispose(bool disposing) =>
@@ -96,7 +94,7 @@ namespace mbts.spark {
               if (impl != null && impl.order_type == fmt_type)
                  break;
               _clear_impl();
-               impl = OrderTypeVMFactory.create(new AlgoKey(fmt_type), fmt_type.display_name(), fmt_type, is_expanded: true);
+               impl = OrderTypeVMFactory.create(AlgoKey.from_known_type(fmt_type), fmt_type.display_name(), fmt_type, is_expanded: true);
               _algo_params.add_collection(impl.algo_params);
               (impl as IObserver<OrdersModel>)?.OnNext(_model);
               break;
@@ -2,7 +2,6 @@ using bts.api;
 using bts.api.orderman;
 using bts.utils;
 using Google.Protobuf.Reflection;
-using mbts.ui.utility;
 using mbts.utils;
 using System;
 using System.Collections.Generic;
@@ -13,26 +12,19 @@ using System.Reactive.Linq;
 namespace mbts.spark {
   [Export]   
   class DynamicOrderHelper {
-      public readonly IMaskIndexInt32<string> dynamic_type_index;
-
      static readonly IReadOnlyDictionary<DynamicOrderParam.ValueOneofCase, (FieldDescriptor field_descriptor, Type field_type)> _descriptor_case_index =
         ProtoHelper.get_oneof_descriptor_index<DynamicOrderParam, DynamicOrderParam.ValueOneofCase>(nameof(DynamicOrderParam.ValueCase));

      readonly RegisteredDynamicOrderTypes _dynamic_types;
+
      [ImportingConstructor]
-      private DynamicOrderHelper(OrderService order_service)
-      {
+      DynamicOrderHelper(OrderService order_service) =>
         _dynamic_types = order_service.get_registered_dynamic_order_types(new VoidMessage());
-         dynamic_type_index = new MaskIndexInt32<string>(_dynamic_types.DynamicOrderDesc.Select(d => d.DynamicOrderType).ToList());
-      }

      public IEnumerable<string> dynamic_types => _dynamic_types.DynamicOrderDesc.Select(d => d.DynamicOrderType);

-      public void add_dynamic_order_defs(List<CustomOrderDefinitionImmutable> defs,
-                                         Func<CustomOrderDefinition.CustomOneofCase, CustomOrderDefinition> factory)
-      {
-         foreach (var d in _dynamic_types.DynamicOrderDesc)
-         {
+      public void add_dynamic_order_defs(List<CustomOrderDefinitionImmutable> defs, Func<CustomOrderDefinition.CustomOneofCase, CustomOrderDefinition> factory) {
+         foreach (var d in _dynamic_types.DynamicOrderDesc) {
            var dorder = factory(CustomOrderDefinition.CustomOneofCase.Dynamic);
            dorder.Dynamic.DynamicOrderType = d.DynamicOrderType;
            var ddef = dorder.Dynamic;
@@ -71,6 +63,7 @@ namespace mbts.spark {
                  case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveOrderDef: param.AsOrderDef = new CustomOrderDefinition(); break;
                  case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveString: param.AsString = string.Empty; break;
                  case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveUint: param.AsUint32 = 0u; break;
+                  case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveQuantity: param.AsQuantity = new bts.spark.QuantityMeasure(); break;
               }
               break;
            case DynamicOrderTypeDescriptor.DescriptorOneofCase.Structure: param.AsStruct = new DynamicOrderStruct(); break;
@@ -87,5 +80,16 @@ namespace mbts.spark {
         }
         param.AsEnumerated.EnumValue = value ?? string.Empty;
      }
+
+      internal static bts.spark.QuantityMeasureImmutable? get_quantity_value(DynamicOrderParam param) 
+      {
+         return new bts.spark.QuantityMeasureImmutable(param?.AsQuantity);
+      }
+      internal static void set_quantity_value(DynamicOrderParam param, bts.spark.QuantityMeasureImmutable? value)
+      {
+         if (param == null)
+            return;
+         param.AsQuantity = value?.CloneToMutable();
+      }
   }
 }
@@ -1,6 +1,7 @@
 using bts.api.orderman;
 using Google.Protobuf.Reflection;
 using mbts.ui.shell;
+using bts.spark;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
@@ -25,7 +26,7 @@ namespace mbts.spark {
      protected DynamicOrderParamVM(DynamicOrderParamDescriptor descriptor)
         : this(descriptor, DynamicOrderHelper.init_param(descriptor)) { }

-      protected DynamicOrderParamVM(DynamicOrderParamDescriptor descriptor, DynamicOrderParam param) {
+      private DynamicOrderParamVM(DynamicOrderParamDescriptor descriptor, DynamicOrderParam param) {
         this.descriptor = descriptor;
         _param = param;
      }
@@ -116,4 +117,41 @@ namespace mbts.spark {
      void _sync_elements() =>
         elements.sync_with(_get_elements(descriptor));
   }
+
+
+   class DynamicOrderQuantityVM : DynamicOrderParamVM, IDynamicOrderParamVM<QuantityMeasureImmutable?>
+   {
+      static readonly FieldDescriptor _field_desc = DynamicOrderParam.Descriptor.FindFieldByNumber(DynamicOrderParam.AsQuantityFieldNumber);
+      public DynamicOrderQuantityVM(DynamicOrderParamDescriptor descriptor)
+         : base(descriptor) { }
+
+      QuantityMeasureImmutable? IDynamicOrderParamVM<QuantityMeasureImmutable?>.value { get => quantity; set => quantity= value; }
+      public QuantityMeasureImmutable? quantity 
+      {
+         get => DynamicOrderHelper.get_quantity_value(param);
+         set 
+         {
+            var orig = quantity;
+            DynamicOrderHelper.set_quantity_value(param, value);
+            if (quantity != orig)
+               RaisePropertyChanged();
+         }
+      }      
+
+      public IObservable<QuantityMeasureImmutable?> subscribe_value() 
+      {
+         return Observable.Create<QuantityMeasureImmutable?>(o =>
+         {
+            PropertyChanged += on_prop_changed;
+            return Disposable.Create(() => PropertyChanged -= on_prop_changed);
+            void on_prop_changed(object sender, PropertyChangedEventArgs e) =>
+               o.OnNext(quantity);
+         });
+      }
+
+      protected override void on_param_changed()
+      {
+         RaisePropertyChanged(nameof(quantity));
+      }
+   }   
 }
@@ -19,6 +19,7 @@ namespace mbts.ui.spark
      public DataTemplate UIntTemplate { get; set; }
      public DataTemplate StringTemplate { get; set; }
      public DataTemplate OrderDefTemplate { get; set; }
+      public DataTemplate QuantityMeasureTemplate { get; set; }

      public DataTemplate EnumTemplate { get; set; }

@@ -39,6 +40,7 @@ namespace mbts.ui.spark
                        case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveUint: return UIntTemplate;
                        case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveString: return StringTemplate;
                        case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveOrderDef: return OrderDefTemplate;
+                        case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveQuantity: return QuantityMeasureTemplate;
                        default: return null;
                     }
                  }
@@ -1,6 +1,7 @@
 using bts;
 using bts.api.orderman;
 using bts.collections;
+using bts.spark;
 using mbts.collections;
 using mbts.spark.utilities;
 using mbts.ui.utility;
@@ -46,7 +47,7 @@ namespace mbts.spark {
         protected override void on_model_internal() =>
            _sync_dynamic_params();

-         protected override IEnumerable<ChildAlgoData> get_selector_datum() =>
+         protected override IEnumerable<ChildAlgoData> get_selector_data() =>
            OrderDataHelper.get_child_algo_data(new CustomOrderDefinition {
               Dynamic = model?.dynamic_helper?.create_def(dyn_type) ?? new DynamicOrderDefinition()
            });
@@ -70,9 +71,14 @@ namespace mbts.spark {
                  switch (descriptor.ParamType.Primitive) {
                     case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveBool: return mk<bool?, bool>(DynamicOrderParam.AsBoolFieldNumber, v => v, v => v.GetValueOrDefault());
                     case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveDouble: return mk<double, double>(DynamicOrderParam.AsDoubleFieldNumber, v => v, v => v, double.NaN);
-                     case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveInt: return mk<uint?, uint>(DynamicOrderParam.AsInt32FieldNumber, v => v, v => v.GetValueOrDefault());
+                     case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveInt: return mk<int?, int>(DynamicOrderParam.AsInt32FieldNumber, v => v, v => v.GetValueOrDefault());
                     case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveUint: return mk<uint?, uint>(DynamicOrderParam.AsUint32FieldNumber, v => v, v => v.GetValueOrDefault());
                     case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveString: return mk<string, string>(DynamicOrderParam.AsStringFieldNumber, v => v, v => v);
+                     case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveQuantity: 
+                     {
+                        var qm = new DynamicOrderQuantityVM(descriptor);
+                        return attached(qm, DynamicOrderHelper.get_quantity_value, DynamicOrderHelper.set_quantity_value, new QuantityMeasure { Ratio = 1.0, Absolute = 1 });
+                     }
                     default: throw ExceptionBuilder.Argument.unexpected_case(descriptor.ParamType.Primitive, nameof(descriptor));
                  }
               case DynamicOrderTypeDescriptor.DescriptorOneofCase.Enumerated:
@@ -0,0 +1,56 @@
+
+using bts.api;
+using bts.api.orderman;
+using bts.utils;
+using Google.Protobuf;
+using Google.Protobuf.Reflection;
+using mbts.ui.utility;
+using mbts.utils;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.Composition;
+using System.Linq;
+using System.Reactive.Linq;
+
+namespace mbts.spark 
+{
+   [Export]   
+   class GenericOrderHelper
+   {
+      [ImportingConstructor]
+      private GenericOrderHelper(OrderService order_service)
+      {
+      }
+
+      internal static string get_enumerated_value(IMessage message, FieldDescriptor fd) 
+      {
+         var ev = fd.Accessor.GetValue(message);
+         return ev.ToString();
+      }
+      internal static void set_enumerated_value(IMessage message, FieldDescriptor fd, string value) 
+      {
+         if (message == null) 
+         {
+            return;
+         } 
+         var ev = fd.EnumType.Values.First(x => x.Name == value)?.Number;
+         if(ev.HasValue)
+            fd.Accessor.SetValue(message, ev.Value);
+      }
+
+      internal static bts.spark.QuantityMeasureImmutable? get_quantity_value(IMessage message, FieldDescriptor fd) 
+      {
+         var qm = (bts.spark.QuantityMeasure)fd.Accessor.GetValue(message);
+         if(qm != null)
+            return new bts.spark.QuantityMeasureImmutable(qm);
+         else
+            return null;
+      }
+      internal static void set_quantity_value(IMessage message, FieldDescriptor fd, bts.spark.QuantityMeasureImmutable? value)
+      {
+         if (message == null)
+            return;
+         fd.Accessor.SetValue(message, value?.CloneToMutable());
+      }
+   }
+}
@@ -0,0 +1,183 @@
+using bts.api.orderman;
+using Google.Protobuf.Reflection;
+using mbts.ui.shell;
+using bts.spark;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.Linq;
+using System.Reactive.Linq;
+using Google.Protobuf;
+
+namespace mbts.spark 
+{
+   interface IGenericOrderParamVM 
+   {
+      FieldDescriptor descriptor { get; }      
+      Google.Protobuf.IMessage message { get; set; }
+   }
+
+   interface IGenericOrderParamVM<T> : IGenericOrderParamVM 
+   {
+      T value { get; set; }
+      IObservable<T> subscribe_value();
+   }
+
+   abstract class GenericOrderParamVM<TMutable> : DisposableViewModelBase, IGenericOrderParamVM
+      where TMutable : class, IMessage, new() 
+   {
+      TMutable _message;
+
+      protected GenericOrderParamVM(FieldDescriptor descriptor)
+      {
+         _message = new TMutable();
+         this.descriptor = descriptor;
+      }
+
+      public FieldDescriptor descriptor { get; set; }
+      public Google.Protobuf.IMessage message 
+      {
+         get => _message;
+         set 
+         {
+            _message = (TMutable)value;
+            on_param_changed();
+         }
+      }
+
+      protected abstract void on_param_changed();
+   }
+
+   class GenericOrderParamVM<TMutable, TView, TModel> : GenericOrderParamVM<TMutable>, IGenericOrderParamVM<TView>
+      where TMutable : class, IMessage, new()
+   {
+      readonly Func<TModel, TView> _convert;
+      readonly Func<TView, TModel> _convert_back;
+      TView _value;
+
+      public GenericOrderParamVM(FieldDescriptor field_descriptor, Func<TModel, TView> convert, Func<TView, TModel> convert_back) : 
+         base(field_descriptor) 
+      {
+         _convert = convert;
+         _convert_back = convert_back;
+      }
+
+      public TView value 
+      {
+         get => _value;
+         set 
+         {
+            this.descriptor.Accessor.SetValue(this.message, _convert_back(_value = value));
+            RaisePropertyChanged();
+         }
+      }
+
+      public IObservable<TView> subscribe_value() =>
+         Observable.Create<TView>(o => 
+         {
+            PropertyChanged += on_prop_changed;
+            return Disposable.Create(() => PropertyChanged -= on_prop_changed);
+            void on_prop_changed(object sender, PropertyChangedEventArgs e) =>
+               o.OnNext(value);
+         });
+
+      protected override void on_param_changed() 
+      {
+         _value = _convert(ConvertUtils.try_convert<TModel>(this.descriptor.Accessor.GetValue(this.message)));
+         RaisePropertyChanged(nameof(value));
+      }
+   }
+
+   class GenericOrderEnumeratedVM<TMutable> : GenericOrderParamVM<TMutable>, IGenericOrderParamVM<string>
+      where TMutable : class, IMessage, new()   
+   {
+      public GenericOrderEnumeratedVM(FieldDescriptor descriptor)
+         : base(descriptor)
+      {
+         elements = new ObservableCollection<string>(_get_elements(descriptor));
+      }
+
+      public ObservableCollection<string> elements { get; }
+
+      public string selected_element 
+      {
+         get => GenericOrderHelper.get_enumerated_value(message, descriptor);
+         set 
+         {
+            var orig = selected_element;
+            GenericOrderHelper.set_enumerated_value(message, descriptor, value);
+            if (selected_element != orig)
+               RaisePropertyChanged();
+         }
+      }
+      string IGenericOrderParamVM<string>.value { get => selected_element; set => selected_element = value; }
+
+      IObservable<string> IGenericOrderParamVM<string>.subscribe_value() =>
+         Observable.Create<string>(o => 
+         {
+            PropertyChanged += on_prop_changed;
+            return Disposable.Create(() => PropertyChanged -= on_prop_changed);
+            void on_prop_changed(object sender, PropertyChangedEventArgs e) =>
+               o.OnNext(selected_element);
+         });
+
+      protected override void on_param_changed() 
+      {
+         _sync_elements();
+         RaisePropertyChanged(nameof(selected_element));
+      }
+
+      static IEnumerable<string> _get_elements(FieldDescriptor descriptor) 
+      {
+         if(descriptor.FieldType == Google.Protobuf.Reflection.FieldType.Enum)
+         {
+            return descriptor.EnumType.Values.Select(x => x.Name);
+         }
+         else
+            return Enumerable.Empty<string>();
+      }
+
+      void _sync_elements() 
+      {
+         elements.sync_with(_get_elements(descriptor));
+      }
+   }
+
+
+   class GenericOrderQuantityVM<TMutable> : GenericOrderParamVM<TMutable>, IGenericOrderParamVM<QuantityMeasureImmutable?>
+      where TMutable : class, IMessage, new()
+   {
+      public GenericOrderQuantityVM(FieldDescriptor descriptor)
+         : base(descriptor) { }
+
+      QuantityMeasureImmutable? IGenericOrderParamVM<QuantityMeasureImmutable?>.value { get => quantity; set => quantity= value; }
+      public QuantityMeasureImmutable? quantity 
+      {
+         get => GenericOrderHelper.get_quantity_value(message, descriptor);
+         set 
+         {
+            var orig = quantity;
+            GenericOrderHelper.set_quantity_value(message, descriptor, value);
+            if (quantity != orig)
+               RaisePropertyChanged();
+         }
+      }      
+
+      public IObservable<QuantityMeasureImmutable?> subscribe_value() 
+      {
+         return Observable.Create<QuantityMeasureImmutable?>(o =>
+         {
+            PropertyChanged += on_prop_changed;
+            return Disposable.Create(() => PropertyChanged -= on_prop_changed);
+            void on_prop_changed(object sender, PropertyChangedEventArgs e) =>
+               o.OnNext(quantity);
+         });
+      }
+
+      protected override void on_param_changed()
+      {
+         RaisePropertyChanged(nameof(quantity));
+      }
+   }   
+}
@@ -0,0 +1,67 @@
+
+using bts.api.orderman;
+using mbts.spark;
+using mbts.ui.converters;
+using mbts.ui.utilities;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+
+namespace mbts.ui.spark
+{
+   class GenericOrderParamTemplateSelector : DataTemplateSelector
+   {
+      public DataTemplate BoolTemplate { get; set; }
+      public DataTemplate DoubleTemplate { get; set; }
+      public DataTemplate IntTemplate { get; set; }
+      public DataTemplate UIntTemplate { get; set; }
+      public DataTemplate StringTemplate { get; set; }
+      public DataTemplate OrderDefTemplate { get; set; }
+      public DataTemplate QuantityMeasureTemplate { get; set; }
+
+      public DataTemplate EnumTemplate { get; set; }
+
+      public override DataTemplate SelectTemplate(object item, DependencyObject container)
+      {
+         var vm = item as IGenericOrderParamVM;
+         if (vm != null)
+            return select_template(vm.descriptor);
+         return null;
+      }
+
+      public DataTemplate select_template(Google.Protobuf.Reflection.FieldDescriptor descriptor)
+      {
+         switch (descriptor.FieldType)
+         {
+            case Google.Protobuf.Reflection.FieldType.Bool:
+               return BoolTemplate;
+            case Google.Protobuf.Reflection.FieldType.Float:                  
+            case Google.Protobuf.Reflection.FieldType.Double:
+               return DoubleTemplate;
+            case Google.Protobuf.Reflection.FieldType.Int32:
+            case Google.Protobuf.Reflection.FieldType.Int64:
+               return IntTemplate;
+            case Google.Protobuf.Reflection.FieldType.UInt32:
+            case Google.Protobuf.Reflection.FieldType.UInt64:
+               return UIntTemplate;
+            case Google.Protobuf.Reflection.FieldType.String:
+               return StringTemplate;
+            case Google.Protobuf.Reflection.FieldType.Enum:
+               return EnumTemplate;
+            case Google.Protobuf.Reflection.FieldType.Message:
+            {
+               if(descriptor.MessageType.FullName == typeof(bts.spark.QuantityMeasure).FullName)
+                  return QuantityMeasureTemplate;
+               else if (descriptor.MessageType.FullName == typeof(bts.api.orderman.CustomOrderDefinition).FullName)
+                  return OrderDefTemplate;
+            }
+            break;
+            default: return null;               
+         }
+         return null;
+      }
+   }   
+}
@@ -0,0 +1,172 @@
+using bts;
+using bts.api;
+using bts.api.orderman;
+using bts.collections;
+using bts.spark;
+using Google.Protobuf;
+using Google.Protobuf.Reflection;
+using mbts.collections;
+using mbts.spark.utilities;
+using mbts.ui.utility;
+using mbts.utils;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.Linq;
+using System.Reactive.Linq;
+using AlgoType = bts.api.orderman.CustomOrderDefinition.CustomOneofCase;
+
+namespace mbts.spark {
+   static partial class OrderTypeVMFactory 
+   {
+      internal class GenericOrderFactory
+      {
+         static public IAlgoVM create_vm(AlgoKey key, AlgoType algo_type, string display_name, AlgoEditingPermissions editing_permissions)
+         {
+            var prop = typeof(CustomOrderDefinition).GetProperty(algo_type.ToString(),
+               System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.Public);
+            var rt = prop.PropertyType;
+
+            var propi = typeof(CustomOrderDefinitionImmutable).GetProperty(algo_type.ToString(),
+               System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.Public);
+            var rti = propi.PropertyType;
+
+            var vmt = typeof(GenericOrderVM<,>);
+            Type[] typeargs = { rt, rti };
+            var makevm = vmt.MakeGenericType(typeargs);
+            object vm = Activator.CreateInstance(makevm, key, algo_type, display_name, editing_permissions);
+            return (IAlgoVM)vm;
+         }
+         static public void setup_generic_custom_order(CustomOrderDefinition custom, CustomOrderDefinition.CustomOneofCase type)
+         {
+            var prop = typeof(CustomOrderDefinition).GetProperty(type.ToString(),
+               System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.Public);
+            var rt = prop.PropertyType;
+            var rtt = Activator.CreateInstance(rt);
+            
+            var ci = rt.GetProperties().Where(x => x.PropertyType == typeof(CustomOrderDefinition));
+            foreach(var cid in ci)
+               cid.SetValue(rtt, new CustomOrderDefinition { Limit = new LimitOrderDefinition() });
+            prop.SetValue(custom, rtt);
+         }
+      }      
+      
+      class GenericOrderVM<TMutable, TImmutable> : OrderTypeVMBase<TMutable, TImmutable>
+         where TMutable : class, IMessage, new() where TImmutable : struct, IImmutableMessage
+      {         
+         readonly ObservableKeyedCollection<GenericOrderParamVM<TMutable>, string> _parameters =
+            new ObservableKeyedCollection<GenericOrderParamVM<TMutable>, string>(vm => vm.descriptor.Name);
+         readonly AlgoType _algo_type;
+
+         public GenericOrderVM(AlgoKey key, AlgoType algo_type, string display_name, AlgoEditingPermissions editing_permissions)
+            : base(key, display_name, editing_permissions) 
+         {
+            _algo_type = algo_type;
+            _parameters = new ObservableKeyedCollection<GenericOrderParamVM<TMutable>, string>(vm => vm.descriptor.Name);
+            _resources.AddRange(
+               ObservableAutoWrapper.connect_item_hooks(_parameters, p =>
+               {
+                  p.PropertyChanged += on_param_prop_changed;
+                  return Disposable.Create(() => 
+                  {
+                     p.PropertyChanged -= on_param_prop_changed;
+                     remove_property(p.descriptor.Name);
+                     p.Dispose();
+                  });
+               }, true));
+            void on_param_prop_changed(object sender, PropertyChangedEventArgs e) => raise_definition_changed();
+            _sync_generic_params();
+         }
+
+         public string algo_type => _algo_type.ToString();
+         public override string abbreviation => 
+            model == null ? display_name : model.factory.abbreviate_algo(new OneOf<CustomOrderDefinition.CustomOneofCase, string>(_algo_type));
+         public override AlgoDisplayGroup group => AlgoDisplayGroup.API;
+         public ObservableCollection<GenericOrderParamVM<TMutable>> parameters => _parameters;
+
+         protected override void on_model_internal() 
+         {
+            _sync_generic_params();
+         }
+
+         void _sync_generic_params()
+         {
+            if (model != null)
+            {               
+               Google.Protobuf.Reflection.MessageDescriptor desc = new TMutable().Descriptor;               
+               _parameters.SyncWithDictionary(
+                  desc.Fields.InDeclarationOrder().Where(_is_value_param_desc).ToDictionary(p => p.Name), _mk_param_vm);
+            }
+         }
+         static bool _is_value_param_desc(FieldDescriptor desc)
+         {
+            return (desc.FieldType != Google.Protobuf.Reflection.FieldType.Message || 
+               _is_quantity_measure_desc(desc));
+         }
+
+         static bool _is_quantity_measure_desc(FieldDescriptor desc)
+         {
+            return desc.FieldType == Google.Protobuf.Reflection.FieldType.Message &&
+               desc.MessageType.FullName == typeof(bts.spark.QuantityMeasure).FullName;
+         }
+
+         protected override IEnumerable<ChildAlgoData> get_selector_data() 
+         {
+            var v = OrderDataHelper.get_child_algo_data(_algo_type);
+            return v;
+         }
+
+         GenericOrderParamVM<TMutable> _mk_param_vm(FieldDescriptor descriptor) 
+         {
+            ExceptionAssert.Argument.NotNull(descriptor, nameof(descriptor));
+
+            if (descriptor.FieldType == FieldType.Message && 
+                descriptor.MessageType.FullName == typeof(bts.spark.QuantityMeasure).FullName)
+            {
+               var qm = new GenericOrderQuantityVM<TMutable>(descriptor);
+               return attached(qm, GenericOrderHelper.get_quantity_value, GenericOrderHelper.set_quantity_value);
+            }
+            else if(descriptor.FieldType == FieldType.Enum)
+            {
+               var pvm = new GenericOrderEnumeratedVM<TMutable>(descriptor);
+               attached(pvm, GenericOrderHelper.get_enumerated_value, GenericOrderHelper.set_enumerated_value);
+               return pvm;
+            }
+            else if (descriptor.FieldType == FieldType.Bool)
+               return mk<bool?, bool>(descriptor, v => v, v => v.GetValueOrDefault());
+            else if (descriptor.FieldType == FieldType.Double || descriptor.FieldType == FieldType.Float)
+               return mk<double, double>(descriptor, v => v, v => v, double.NaN);
+            else if (descriptor.FieldType == FieldType.Int32)
+               return mk<int?, int>(descriptor, v => v, v => v.GetValueOrDefault());
+            else if (descriptor.FieldType == FieldType.UInt32)
+               return mk<uint?, uint>(descriptor, v => v, v => v.GetValueOrDefault());
+            else if (descriptor.FieldType == FieldType.String)
+               return mk<string, string>(descriptor, v => v, v => v);
+            else
+               return null;
+         }
+         GenericOrderParamVM<TMutable, TView, TModel> mk<TView, TModel>(FieldDescriptor fdesc, Func<TModel, TView> convert, Func<TView, TModel> convert_back, TView default_value = default)
+         {
+            var pvm = new GenericOrderParamVM<TMutable, TView, TModel>(fdesc, convert, convert_back);
+            return attached<TView, GenericOrderParamVM<TMutable, TView, TModel>>(pvm, get_from_param, assign_to_param, default_value);
+
+            TView get_from_param(IMessage param, FieldDescriptor fd) => convert(ConvertUtils.try_convert<TModel>(fdesc.Accessor.GetValue(param)));
+            void assign_to_param(IMessage param, FieldDescriptor fd, TView value) => fdesc.Accessor.SetValue(param, convert_back(value));
+         }
+
+         TParam attached<T, TParam>(TParam pvm, Func<IMessage, FieldDescriptor, T> selector, Action<IMessage, FieldDescriptor, T> assign_to_param, T default_value = default) where TParam : GenericOrderParamVM<TMutable>, IGenericOrderParamVM<T>
+         {
+            add_property<T>(
+               pvm.descriptor.Name,
+               mdef => mdef != null ? selector(mdef, pvm.descriptor) : default_value,
+               (mdef, v) => assign_to_param(mdef, pvm.descriptor, v),
+               () => pvm.value,
+               v => pvm.value = v,
+               pvm.subscribe_value(),
+               default_value);
+            return pvm;
+         }         
+      }
+   }
+}
@@ -14,7 +14,6 @@ using System.ComponentModel;
 using System.Linq;
 using System.Reactive.Disposables;
 using System.Reactive.Linq;
-using System.Threading.Tasks;
 using System.Windows.Input;
 using System.Windows.Media;

@@ -57,7 +56,6 @@ namespace mbts.spark {
      [EditorBrowsable(EditorBrowsableState.Never)]
      dynamic children_vm { get; }
      bool key_match(KeyEventArgs e);
-      Task<CustomOrderDefinitionImmutable?> load_from_async(CustomOrderDefinitionImmutable definition);
      void load_many(IEnumerable<CustomOrderDefinitionImmutable> definitions);
      void ensure_init();
   }
@@ -95,9 +93,6 @@ namespace mbts.spark {
   }

   static class OrderTypeVMExtensions {
-      public static AlgoData create_def_data(this IAlgoVM vm) =>
-         new AlgoData(vm.definition, vm.display_name, vm.id);
-
      public static void load_structure(this IAlgoVM vm, CustomOrderDefinitionImmutable def) {
         var mdef = def.CloneToMutable();
         // assign values from vm.definition to mdef (values will be assigned at each common structure-level, e.g. Iceberg->Iceberg->Limit and Iceberg->Iceberg->Lean have 2 common structure-levels)
@@ -4,7 +4,7 @@ namespace mbts.spark {
   static partial class OrderTypeVMFactory {
      class LimitOrderVM : OrderTypeVMBase<LimitOrderDefinition, LimitOrderDefinitionImmutable> {
         internal LimitOrderVM()
-            : this(new AlgoKey(CustomOrderDefinition.CustomOneofCase.Limit), CustomOrderDefinition.CustomOneofCase.Limit.display_name()) { }
+            : this(AlgoKey.from_known_type(CustomOrderDefinition.CustomOneofCase.Limit), CustomOrderDefinition.CustomOneofCase.Limit.display_name()) { }

         internal LimitOrderVM(AlgoKey key, string display_name)
            : base(key, display_name, AlgoEditingPermissions.None) { }
@@ -4,7 +4,7 @@ namespace mbts.spark {
   static partial class OrderTypeVMFactory {
      class MarketOrderVM : OrderTypeVMBase<MarketOrderDefinition, MarketOrderDefinitionImmutable> {
         internal MarketOrderVM()
-            : this (new AlgoKey(CustomOrderDefinition.CustomOneofCase.Market), CustomOrderDefinition.CustomOneofCase.Market.display_name()) { }
+            : this (AlgoKey.from_known_type(CustomOrderDefinition.CustomOneofCase.Market), CustomOrderDefinition.CustomOneofCase.Market.display_name()) { }

         internal MarketOrderVM(AlgoKey key, string display_name)
            : base(key, display_name, AlgoEditingPermissions.None) { }