check point

build (refactor): Split libspark up into smaller projects
build: Enable Binance US code ifdef CCAPI_ENABLE_EXCHANGE_BINANCE_US
2023-04-17 23:32:19 -04:00 · 2023-04-10 11:55:13 -04:00 · 2023-04-10 11:55:13 -04:00 · 2023-04-10 11:55:13 -04:00 · 2023-04-10 11:55:13 -04:00 · 2023-04-10 11:55:13 -04:00
2611 changed files with 288747 additions and 192683 deletions
@@ -4,6 +4,7 @@ BinPackParameters: false
 AlignAfterOpenBracket: AlwaysBreak
 AlwaysBreakTemplateDeclarations: true
 PenaltyReturnTypeOnItsOwnLine: 140
+ReflowComments: false
 ---
 Language: Proto
 IndentWidth: 2
@@ -7,6 +7,24 @@
      "commands": [
        "dotnet-format"
      ]
+    },
+    "fable": {
+      "version": "4.0.0-theta-018",
+      "commands": [
+        "fable"
+      ]
+    },
+    "fantomas": {
+      "version": "5.2.2",
+      "commands": [
+        "fantomas"
+      ]
+    },
+    "fake-cli": {
+      "version": "6.0.0",
+      "commands": [
+        "fake"
+      ]
    }
  }
 }
@@ -1,5 +1,6 @@
 nohup.out
-build/
+build/**
+install/**
 .build_proxy/
 cmake-build-debug/
 .cache/
@@ -40,8 +41,6 @@ trace_data/
 .ionide/*
 /.ignore
 *.rej
-/build
-/build.*/*
 .clangd/
 *CMakeDeps.cmake
 /sniper.ipynb
@@ -51,3 +50,8 @@ trace_data/
 *.tmp/*
 /.venv*/*
 .cache/
+/src/Spark.Admin.WebApp/tsconfig.*.g.json
+/src/Spark.Admin.WebApp/src/bin/
+**/CMakeDeps.cmake
+**/CMakeDeps_win.cmake
+**/devcontainer.json
@@ -1,12 +1,3 @@
 [submodule "externals"]
 	path = externals
 	url = git@bitbucket.org:bluetradesys/externals.git
-[submodule "docker/linux"]
-	path = docker/linux
-	url = git@bitbucket.org:bluetradesys/linux_docker.git
-[submodule "docker/windows"]
-	path = docker/windows
-	url = git@bitbucket.org:bluetradesys/windows_docker.git
-[submodule "src/deribit-crypto-connector-demo-application"]
-	path = src/deribit-crypto-connector-demo-application
-	url = git@gitlab.com:cryptoexchanges1/deribit-crypto-connector-demo-application.git
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.12)
 project(spark)

 if(WIN32)
@@ -7,88 +7,188 @@ else()
  set(platform "linux")
 endif()

-set(EXTERNALS_ROOT "${CMAKE_SOURCE_DIR}/externals/${platform}")
-set(SPARK_PYTHON "${EXTERNALS_ROOT}/python")
+set(
+  EXTERNALS_ROOT
+  "${CMAKE_SOURCE_DIR}/externals/${platform}"
+  CACHE
+  STRING
+  "External dependencies root folder (should contain folders: lib, bin, include")
 set(SPARK_BIN "${EXTERNALS_ROOT}/bin")
 set(SPARK_INCLUDE "${EXTERNALS_ROOT}/include")
-set(SPARK_LIB "${EXTERNALS_ROOT}/lib/${CMAKE_BUILD_TYPE}")
+set(SPARK_LIB "${EXTERNALS_ROOT}/lib/$<CONFIG>")
+set(BUILD_SPARK_CONFIG OFF CACHE BOOL "Build lib_spark_config")
+set(BUILD_API_SERVER OFF CACHE BOOL "Build the api server")
+set(BUILD_DOCS OFF CACHE BOOL "Build documentation")
 set(BUILD_SDK OFF CACHE BOOL "Build the sdk")
+set(BUILD_ADMIN_WEB_APP ON CACHE BOOL "Build the Admin WebApp")
+if (WIN32)
+  set(BUILD_SPARKD OFF CACHE BOOL "Build sparkd")
+else()
+  set(BUILD_SPARKD ON CACHE BOOL "Build sparkd")
+endif()

 include_directories(BEFORE SYSTEM ${SPARK_INCLUDE} ${EXTERNALS_ROOT}/include/zlib)
 link_directories(${SPARK_LIB})

 if(WIN32)
-  # flags
-  set(
-    CMAKE_CXX_FLAGS
-    "${CMAKE_CXX_FLAGS} \
-    /MP \
-    /WX /wd4251 /wd4250 /wd4251 /wd4244 /wd4267 /wd4355 /wd4275 /wd4345 \
-    /bigobj \
-    /DCURL_STATICLIB \
-    /D_WINSOCK_DEPRECATED_NO_WARNINGS \
-    /D__TBB_NO_IMPLICIT_LINKAGE \
-    /DBOOST_ALL_NO_LIB \
-    /std:c++17 \
-    /D_SCL_SECURE_NO_WARNINGS /D_CRT_SECURE_NO_WARNINGS /D_WIN32_WINNT=0x0600")
-  set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MTd")
-  set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_DEBUG} /MT")
-  set(
-    CMAKE_SHARED_LINKER_FLAGS_RELEASE
-    "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} \
-    /DEBUG \
-    /OPT:REF \
-    /OPT:ICF \
-    /LTCG")
-
+  add_compile_definitions(SHARED_MEMORY_PREFIX="spark")
+  add_compile_definitions(APP_DATA_DIR="\$\{APPDATA\}/bts/")
  # subdirs
+  add_subdirectory(src/lib_expression)
  add_subdirectory(src/lib)
+elseif(BUILD_SPARK_CONFIG)
+  add_compile_definitions(SHARED_MEMORY_PREFIX="sparkd")
+  add_compile_definitions(APP_DATA_DIR="\$\{HOME\}/sparkdata/")
+  add_subdirectory(src/lib_core)
+  add_subdirectory(src/lib_logging)
+  add_subdirectory(src/lib_io)
+  add_subdirectory(src/lib_domain)
+  add_subdirectory(src/lib_protobuf)
+  add_subdirectory(src/lib_threading)
+  add_subdirectory(src/lib_expression)
+  add_subdirectory(src/lib_md)
+  add_subdirectory(src/lib_spark_config)
 else()
  # make sparkd look for libspark.so in its directory
  set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
  set(CMAKE_INSTALL_RPATH ".")
+  set(CMAKE_INSTALL_PREFIX "${CMAKE_SOURCE_DIR}/install")
+  set(SPARK_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/$<CONFIG>")

-  # flags
-  set(
-    CMAKE_CXX_FLAGS_DEBUG
-    "${CMAKE_CXX_FLAGS_DEBUG} \
-    -fPIC \
-    -Wall \
-    -pedantic \
-    -Wextra \
-    -Werror \
-    -Wno-missing-braces \
-    -Wno-ignored-qualifiers \
-    --std=c++17 -fdiagnostics-color")
-  set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_DEBUG} -fno-omit-frame-pointer -DNDEBUG -O3")
-  set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG")
-  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wno-undef")
+  if(BUILD_API_SERVER)
+    add_compile_definitions(SPARK_ENABLE_API_SERVER)
+    add_compile_definitions(APP_DATA_DIR="\$\{HOME\}/spark_api/")
+    add_compile_definitions(SHARED_MEMORY_PREFIX="spark_api")
+  elseif(BUILD_SPARKD)
+    add_compile_definitions(SHARED_MEMORY_PREFIX="sparkd")
+    add_compile_definitions(APP_DATA_DIR="\$\{HOME\}/sparkdata/")
+
+    # Note: All macros that begin w/ 'CCAPI' are ccapi's macros (defined and/or
+    # read by their code). We override some below.
+    add_compile_definitions(SPARK_ENABLE_CCAPI)
+
+    # This allows us to override hardcoded exchange-urls with ones read from
+    # config (i.e., resolved at runtime rather than compile-time)
+    add_compile_definitions(CCAPI_EXPOSE_INTERNAL)
+
+    # Enable ccapi exchanges/services
+    add_compile_definitions(CCAPI_ENABLE_SERVICE_MARKET_DATA)
+    add_compile_definitions(CCAPI_ENABLE_EXCHANGE_DERIBIT)
+    add_compile_definitions(CCAPI_ENABLE_EXCHANGE_FTX)
+    add_compile_definitions(CCAPI_ENABLE_EXCHANGE_BINANCE)
+    add_compile_definitions(CCAPI_ENABLE_EXCHANGE_BINANCE_US)
+    add_compile_definitions(CCAPI_ENABLE_EXCHANGE_BINANCE_USDS_FUTURES)
+    add_compile_definitions(CCAPI_ENABLE_EXCHANGE_BINANCE_COIN_FUTURES)
+    add_compile_definitions(CCAPI_ENABLE_EXCHANGE_HUOBI)
+    add_compile_definitions(CCAPI_ENABLE_EXCHANGE_HUOBI_USDT_SWAP)
+    add_compile_definitions(CCAPI_ENABLE_EXCHANGE_HUOBI_COIN_SWAP)
+
+    set(CCAPI_LOG_LEVEL
+      "Warn"
+      CACHE STRING "<Fatal|Error|Warn|Info|Debug|Trace> Log level for ccapi")
+    string(TOUPPER "${CCAPI_LOG_LEVEL}" _ccapi_log_level_upper)
+    add_compile_definitions("CCAPI_ENABLE_LOG_${_ccapi_log_level_upper}")
+
+    # ** Binance **
+    add_compile_definitions(CCAPI_BINANCE_URL_REST_BASE="https://api.binance.com")
+    add_compile_definitions(BINANCE_INSTRUMENTS_PATH="/api/v3/exchangeInfo")
+    add_compile_definitions(BINANCE_PRICE_STATS_PATH="/api/v3/ticker/24hr")
+
+    # ** Binance US **
+    add_compile_definitions(BINANCE_US_INSTRUMENTS_PATH="/api/v3/exchangeInfo")
+    add_compile_definitions(BINANCE_US_PRICE_STATS_PATH="/api/v3/ticker/24hr")
+
+    # ** Binance USDS Futures **
+    add_compile_definitions(CCAPI_BINANCE_USDS_FUTURES_URL_REST_BASE="https://dapi.binance.com")
+    add_compile_definitions(BINANCE_USDS_FUTURES_INSTRUMENTS_PATH="/dapi/v1/exchangeInfo")
+    add_compile_definitions(BINANCE_USDS_FUTURES_PRICE_STATS_PATH="/dapi/v1/ticker/24hr")
+
+  endif()

  # subdirs
-  add_subdirectory(src/server/sparkd)
+  if (BUILD_SPARKD)
+    add_subdirectory(src/server/sparkd)
+    add_subdirectory(src/data_files)
+    # add_subdirectory(src/lib_md)
+    add_subdirectory(src/lib_core)
+    add_subdirectory(src/lib_logging)
+    add_subdirectory(src/lib_threading)
+    add_subdirectory(src/lib_expression)
+    add_subdirectory(src/lib_spark_config)
+  endif()
  add_subdirectory(src/lib)
-  add_subdirectory(src/web)
-  add_subdirectory(doc/user)
+  if (BUILD_ADMIN_WEB_APP)
+    add_subdirectory(src/Spark.Admin.WebApp)
+  endif()
+  if (BUILD_API_SERVER)
+    set(_cs_source_dirs
+      spark_api
+      spark_api_server
+      spark_core
+      spark_websocket)
+    foreach(cs_source_dir IN LISTS _cs_source_dirs)
+      file(GLOB cs_source_dir "${CMAKE_SOURCE_DIR}/src/client/${cs_source_dir}/*.cs")
+      list(APPEND _api_server_sources ${cs_source_dir})
+    endforeach()
+
+    list(APPEND _api_server_sources
+      ${CMAKE_SOURCE_DIR}/src/client/spark_api/spark_api.csproj
+      ${CMAKE_SOURCE_DIR}/src/client/spark_api_server/spark_api_server.csproj
+      ${CMAKE_SOURCE_DIR}/src/client/spark_core/spark_core.csproj
+      ${CMAKE_SOURCE_DIR}/src/client/spark_websocket/spark_websocket.csproj)
+
+    set(_out_dir ${CMAKE_BINARY_DIR}/$<CONFIG>)
+    set(_api_server_dlls
+      ${CMAKE_BINARY_DIR}/$<CONFIG>/bin/net7.0/spark_api.dll
+      ${CMAKE_BINARY_DIR}/$<CONFIG>/bin/net7.0/spark_core.dll
+      ${CMAKE_BINARY_DIR}/$<CONFIG>/bin/net7.0/spark_websocket.dll
+      ${CMAKE_BINARY_DIR}/$<CONFIG>/bin/net7.0/spark_api_server)
+    add_custom_command(
+      OUTPUT ${_api_server_dlls}
+      COMMAND dotnet build ${CMAKE_SOURCE_DIR}/Spark.Api.Server.sln --verbosity minimal --configuration $<CONFIG>
+      COMMENT "Building Spark.Api.Server.sln"
+      DEPENDS ${_api_server_sources})
+    add_custom_command(
+      OUTPUT
+      ${CMAKE_BINARY_DIR}/$<CONFIG>/bin/net7.0/libspark.so
+      COMMAND ln -sf ARGS ${CMAKE_BINARY_DIR}/src/lib/$<CONFIG>/libspark.so ${CMAKE_BINARY_DIR}/$<CONFIG>/bin/net7.0
+      COMMENT "Symlink libspark to api server bins"
+      DEPENDS ${_api_server_dlls})
+    add_custom_target(websocket_api_layout ALL DEPENDS ${CMAKE_BINARY_DIR}/$<CONFIG>/bin/net7.0/libspark.so)
+  endif()
+  if(BUILD_DOCS)
+    add_subdirectory(doc/user)
+  endif()
  if(BUILD_SDK)
    add_subdirectory(src/sdk)
  endif()
-  add_subdirectory(src/data_files)

-  add_custom_command(
-    OUTPUT ${CMAKE_BINARY_DIR}/server
-    COMMAND mkdir -p ${CMAKE_BINARY_DIR}/server
-    COMMAND ln ARGS -sf ${CMAKE_BINARY_DIR}/src/server/sparkd/sparkd ${CMAKE_BINARY_DIR}/server
-    COMMAND ln ARGS -sf ${CMAKE_BINARY_DIR}/web ${CMAKE_BINARY_DIR}/server
-    COMMAND ln ARGS -sf ${CMAKE_BINARY_DIR}/data_files ${CMAKE_BINARY_DIR}/server
-    COMMAND ln ARGS -sf ${CMAKE_BINARY_DIR}/src/lib/libspark.so ${CMAKE_BINARY_DIR}/server
-    COMMAND
-      ln ARGS -sf
-      ${EXTERNALS_ROOT}/lib/Release/libOnixS.IceImpactMulticastPriceFeedHandlerCpp.so.3.16.0.0
-      ${CMAKE_BINARY_DIR}/server
-    COMMAND ln ARGS -sf ${EXTERNALS_ROOT}/lib/Release/libACE-5.7.5.so ${CMAKE_BINARY_DIR}/server
-    COMMAND mkdir ARGS -p ${CMAKE_BINARY_DIR}/server/plugins
-    COMMENT "Creating server runtime layout"
-    DEPENDS sparkd data_files_dir)
+  if(BUILD_SPARKD)
+    add_custom_command(
+      OUTPUT ${CMAKE_BINARY_DIR}/server
+      COMMAND mkdir -p ${CMAKE_BINARY_DIR}/server
+      COMMAND ln ARGS -sf ${CMAKE_BINARY_DIR}/src/server/sparkd/sparkd ${CMAKE_BINARY_DIR}/server
+      COMMAND ln ARGS -sf ${CMAKE_BINARY_DIR}/data_files ${CMAKE_BINARY_DIR}/server
+      COMMAND ln ARGS -sf ${CMAKE_BINARY_DIR}/src/lib/libspark.so ${CMAKE_BINARY_DIR}/server
+      COMMAND
+        ln ARGS -sf
+        ${EXTERNALS_ROOT}/lib/Release/libOnixS.IceImpactMulticastPriceFeedHandlerCpp.so.3.16.0.0
+        ${CMAKE_BINARY_DIR}/server
+      COMMAND ln ARGS -sf ${EXTERNALS_ROOT}/lib/Release/libACE-5.7.5.so ${CMAKE_BINARY_DIR}/server
+      COMMAND mkdir ARGS -p ${CMAKE_BINARY_DIR}/server/plugins
+      COMMENT "Creating server runtime layout"
+      DEPENDS sparkd data_files_dir)

-  add_custom_target(server_layout ALL DEPENDS ${CMAKE_BINARY_DIR}/server)
+    add_custom_target(server_layout ALL DEPENDS ${CMAKE_BINARY_DIR}/server)
+
+    install(
+      DIRECTORY "${CMAKE_BINARY_DIR}/server/plugins"
+      DESTINATION "${SPARK_INSTALL_PREFIX}/bin")
+    install(
+      FILES
+      "${SPARK_LIB}/libACE-5.7.5.so"
+      "${SPARK_LIB}/libOnixS.IceImpactMulticastPriceFeedHandlerCpp.so.3.16.0.0"
+      "${CMAKE_SOURCE_DIR}/externals/src/emumba/sparkd.lic"
+      DESTINATION "${SPARK_INSTALL_PREFIX}/bin")
+  endif()
 endif()
@@ -0,0 +1,283 @@
+{
+  "version": 4,
+  "cmakeMinimumRequired": {
+    "major": 3,
+    "minor": 23,
+    "patch": 0
+  },
+
+  "configurePresets": [
+    {
+      "name": "spark",
+      "condition": {
+        "type": "equals",
+        "lhs": "${hostSystemName}",
+        "rhs": "Windows"
+      },
+      "generator": "Visual Studio 17 2022",
+      "binaryDir": "${sourceDir}/build",
+      "environment": {
+        "SPARK_CMAKE_CXX_FLAGS": "/MP /WX /wd4250 /wd4251 /wd4244 /wd4267 /wd4355 /wd4275 /wd4345 /bigobj /EHsc /DCURL_STATICLIB /D_WINSOCK_DEPRECATED_NO_WARNINGS /D__TBB_NO_IMPLICIT_LINKAGE /DBOOST_ALL_NO_LIB /std:c++17 /D_SCL_SECURE_NO_WARNINGS /D_CRT_SECURE_NO_WARNINGS /D_WIN32_WINNT=0x0600"
+      },
+      "cacheVariables": {
+        "CMAKE_CXX_FLAGS": "$env{SPARK_CMAKE_CXX_FLAGS}",
+        "CMAKE_CXX_FLAGS_DEBUG": "$env{SPARK_CMAKE_CXX_FLAGS} /MTd",
+        "CMAKE_CXX_FLAGS_RELEASE": "$env{SPARK_CMAKE_CXX_FLAGS} /MT",
+        "CMAKE_SHARED_LINKER_FLAGS_RELEASE": "/DEBUG /OPT:REF /OPT:ICF /LTCG",
+        "EXTERNALS_ROOT": "${sourceDir}/externals/windows"
+      }
+    },
+
+    {
+      "name": "sparkd",
+      "condition": {
+        "type": "equals",
+        "lhs": "${hostSystemName}",
+        "rhs": "Linux"
+      },
+      "hidden": true,
+      "generator": "Ninja",
+      "binaryDir": "${sourceDir}/build/${presetName}",
+      "cacheVariables": {
+        "platform": "",
+        "CMAKE_BUILD_WITH_INSTALL_RPATH": {
+          "type": "BOOL",
+          "value": "ON"
+        },
+        "CMAKE_INSTALL_RPATH": ".",
+        "CMAKE_INSTALL_PREFIX": "${sourceDir}/install/${presetName}/sparkd",
+        "CMAKE_EXE_LINKER_FLAGS": "-Wno-undef",
+        "EXTERNALS_ROOT": "${sourceDir}/externals/linux",
+        "CMAKE_CXX_STANDARD": "17",
+        "BUILD_SDK": {
+          "type": "BOOL",
+          "value": "OFF"
+        },
+        "BUILD_ADMIN_WEB_APP": {
+          "type": "BOOL",
+          "value": "ON"
+        }
+      }
+    },
+
+    {
+      "name": "sparkd-debug",
+      "inherits": "sparkd",
+      "hidden": true,
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Debug",
+        "CMAKE_EXPORT_COMPILE_COMMANDS": {
+          "type": "BOOL",
+          "value": "ON"
+        },
+        "CCAPI_LOG_LEVEL": "Debug"
+      }
+    },
+
+    {
+      "name": "sparkd-release",
+      "inherits": "sparkd",
+      "hidden": true,
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Release",
+        "CCAPI_LOG_LEVEL": "Warn"
+      }
+    },
+
+    {
+      "name": "sparkd-debug-clang",
+      "inherits": "sparkd-debug",
+      "displayName": "Debug (clang)",
+      "description": "Debug build compiled w/ clang",
+      "binaryDir": "${sourceDir}/build/clang/debug",
+      "cacheVariables": {
+        "CMAKE_C_COMPILER": "clang",
+        "CMAKE_CXX_COMPILER": "clang++",
+        "CMAKE_CXX_FLAGS_DEBUG": "-g -fPIC -Wall -pedantic -Wextra -Werror -Wno-missing-braces -Wno-ignored-qualifiers --std=c++17 -fdiagnostics-color -DDEBUG",
+        "CMAKE_INSTALL_PREFIX": "${sourceDir}/install/clang/debug/sparkd"
+      }
+    },
+
+    {
+      "name": "sparkd-debug-gcc",
+      "inherits": "sparkd-debug",
+      "displayName": "Debug (gcc)",
+      "description": "Debug build compiled w/ gcc",
+      "binaryDir": "${sourceDir}/build/gcc/debug",
+      "cacheVariables": {
+        "CMAKE_C_COMPILER": "gcc",
+        "CMAKE_CXX_COMPILER": "g++",
+        "CMAKE_CXX_FLAGS_DEBUG": "-g -fPIC -Wall -pedantic -Wextra -Werror -Wno-missing-braces -Wno-ignored-qualifiers --std=c++17 -fdiagnostics-color -Wno-stringop-overread -DDEBUG",
+        "CMAKE_INSTALL_PREFIX": "${sourceDir}/install/gcc/debug/sparkd"
+      }
+    },
+
+    {
+      "name": "sparkd-release-clang",
+      "inherits": "sparkd-release",
+      "displayName": "Release (clang)",
+      "description": "Release build compiled w/ clang",
+      "binaryDir": "${sourceDir}/build/clang/release",
+      "cacheVariables": {
+        "CMAKE_C_COMPILER": "clang",
+        "CMAKE_CXX_COMPILER": "clang++",
+        "CMAKE_CXX_FLAGS_RELEASE": "-fPIC -Wall -pedantic -Wextra -Werror -Wno-missing-braces -Wno-ignored-qualifiers --std=c++17 -fdiagnostics-color -fno-omit-frame-pointer -DNDEBUG -O3",
+        "CMAKE_INSTALL_PREFIX": "${sourceDir}/install/clang/release/sparkd"
+      }
+    },
+
+    {
+      "name": "sparkd-release-gcc",
+      "inherits": "sparkd-release",
+      "displayName": "Release (gcc)",
+      "description": "Release build compiled w/ gcc",
+      "binaryDir": "${sourceDir}/build/gcc/release",
+      "cacheVariables": {
+        "CMAKE_C_COMPILER": "gcc",
+        "CMAKE_CXX_COMPILER": "g++",
+        "CMAKE_CXX_FLAGS_RELEASE": "-fPIC -Wall -pedantic -Wextra -Werror -Wno-missing-braces -Wno-ignored-qualifiers --std=c++17 -fdiagnostics-color -Wno-stringop-overread -Wno-maybe-uninitialized -fno-omit-frame-pointer -DNDEBUG -O3",
+        "CMAKE_INSTALL_PREFIX": "${sourceDir}/install/gcc/release/sparkd"
+      }
+    },
+
+    {
+      "name": "sparkd-publish",
+      "inherits": "sparkd-release-gcc",
+      "displayName": "Publish",
+      "description": "Production build compiled w/ gcc and ready to ship"
+    },
+
+    {
+      "name": "spark-config",
+      "displayName": "Spark Config",
+      "description": "Test build for lib_spark_config",
+      "binaryDir": "${sourceDir}/build/${presetName}",
+      "generator": "Unix Makefiles",
+      "cacheVariables": {
+        "platform": "linux",
+        "CMAKE_BUILD_TYPE": "Debug",
+        "CMAKE_BUILD_WITH_INSTALL_RPATH": {
+          "type": "BOOL",
+          "value": "ON"
+        },
+        "CMAKE_INSTALL_RPATH": ".",
+        "CMAKE_INSTALL_PREFIX": "${sourceDir}/install/${presetName}",
+        "CMAKE_EXE_LINKER_FLAGS": "-Wno-undef",
+        "EXTERNALS_ROOT": "${sourceDir}/externals/linux",
+        "CMAKE_CXX_STANDARD": "17",
+        "BUILD_SPARKD": {
+          "type": "BOOL",
+          "value": "OFF"
+        },
+        "BUILD_DOCS": {
+          "type": "BOOL",
+          "value": "OFF"
+        },
+        "BUILD_SDK": {
+          "type": "BOOL",
+          "value": "OFF"
+        },
+        "BUILD_SPARK_CONFIG": {
+          "type": "BOOL",
+          "value": "ON"
+        },
+        "BUILD_ADMIN_WEB_APP": {
+          "type": "BOOL",
+          "value": "OFF"
+        }
+      }
+    }
+  ],
+
+  "buildPresets": [
+    {
+      "name": "spark",
+      "condition": {
+        "type": "equals",
+        "lhs": "${hostSystemName}",
+        "rhs": "Windows"
+      },
+      "hidden": true,
+      "jobs": 4
+    },
+
+    {
+      "name": "spark-dev",
+      "displayName": "Development",
+      "inherits": "spark",
+      "configurePreset": "spark",
+      "configuration": "Debug"
+    },
+
+    {
+      "name": "spark-prod",
+      "displayName": "Production",
+      "inherits": "spark",
+      "configurePreset": "spark",
+      "configuration": "Release"
+    },
+
+    {
+      "name": "sparkd",
+      "condition": {
+        "type": "equals",
+        "lhs": "${hostSystemName}",
+        "rhs": "Linux"
+      },
+      "hidden": true,
+      "jobs": 4,
+      "targets": [
+        "data_files_dir",
+        "admin_web_app_bundle",
+        "install",
+        "libspark",
+        "rapidjson_project",
+        "server_layout",
+        "sparkd"
+      ]
+    },
+
+    {
+      "name": "sparkd-debug-clang",
+      "configurePreset": "sparkd-debug-clang",
+      "displayName": "Debug (clang)",
+      "inherits": "sparkd"
+    },
+
+    {
+      "name": "sparkd-debug-gcc",
+      "configurePreset": "sparkd-debug-gcc",
+      "displayName": "Debug (gcc)",
+      "inherits": "sparkd"
+    },
+
+    {
+      "name": "sparkd-release-clang",
+      "configurePreset": "sparkd-release-clang",
+      "displayName": "Release (clang)",
+      "inherits": "sparkd"
+    },
+
+    {
+      "name": "sparkd-release-gcc",
+      "configurePreset": "sparkd-release-gcc",
+      "displayName": "Release (gcc)",
+      "inherits": "sparkd"
+    },
+
+    {
+      "name": "spark-config",
+      "configurePreset": "spark-config",
+      "displayName": "Spark Config",
+      "inherits": "sparkd"
+    },
+
+    {
+      "name": "sparkd-publish",
+      "configurePreset": "sparkd-publish",
+      "displayName": "Publish",
+      "inherits": "sparkd",
+      "targets": "install"
+    }
+  ]
+}
@@ -0,0 +1,83 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.3.32922.545
+MinimumVisualStudioVersion = 15.0.26124.0
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "spark_api", "src\client\spark_api\spark_api.csproj", "{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "spark_core", "src\client\spark_core\spark_core.csproj", "{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "spark_websocket", "src\client\spark_websocket\spark_websocket.csproj", "{3201359D-C071-4089-9EDE-B04D759F1508}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "spark_api_server", "src\client\spark_api_server\spark_api_server.csproj", "{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "spark_test", "src\client\spark_test\spark_test.csproj", "{EFC9FC4D-E92B-4C6D-9B97-26D38EAA118D}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spark.Console", "src\client\Spark.Console\Spark.Console.csproj", "{89D666E6-B500-498F-B026-4D167F68ADFC}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|x64 = Debug|x64
+		MinSizeRel|x64 = MinSizeRel|x64
+		Release|x64 = Release|x64
+		RelWithDebInfo|x64 = RelWithDebInfo|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Debug|x64.ActiveCfg = Debug|x64
+		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Debug|x64.Build.0 = Debug|x64
+		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.MinSizeRel|x64.ActiveCfg = Release|x64
+		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.MinSizeRel|x64.Build.0 = Release|x64
+		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Release|x64.ActiveCfg = Release|x64
+		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Release|x64.Build.0 = Release|x64
+		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.RelWithDebInfo|x64.ActiveCfg = Release|x64
+		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.RelWithDebInfo|x64.Build.0 = Release|x64
+		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Debug|x64.ActiveCfg = Debug|x64
+		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Debug|x64.Build.0 = Debug|x64
+		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.MinSizeRel|x64.ActiveCfg = Release|x64
+		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.MinSizeRel|x64.Build.0 = Release|x64
+		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Release|x64.ActiveCfg = Release|x64
+		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Release|x64.Build.0 = Release|x64
+		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.RelWithDebInfo|x64.ActiveCfg = Release|x64
+		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.RelWithDebInfo|x64.Build.0 = Release|x64
+		{3201359D-C071-4089-9EDE-B04D759F1508}.Debug|x64.ActiveCfg = Debug|x64
+		{3201359D-C071-4089-9EDE-B04D759F1508}.Debug|x64.Build.0 = Debug|x64
+		{3201359D-C071-4089-9EDE-B04D759F1508}.MinSizeRel|x64.ActiveCfg = Debug|x64
+		{3201359D-C071-4089-9EDE-B04D759F1508}.MinSizeRel|x64.Build.0 = Debug|x64
+		{3201359D-C071-4089-9EDE-B04D759F1508}.Release|x64.ActiveCfg = Release|x64
+		{3201359D-C071-4089-9EDE-B04D759F1508}.Release|x64.Build.0 = Release|x64
+		{3201359D-C071-4089-9EDE-B04D759F1508}.RelWithDebInfo|x64.ActiveCfg = Release|x64
+		{3201359D-C071-4089-9EDE-B04D759F1508}.RelWithDebInfo|x64.Build.0 = Release|x64
+		{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.Debug|x64.ActiveCfg = Debug|x64
+		{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.Debug|x64.Build.0 = Debug|x64
+		{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.MinSizeRel|x64.ActiveCfg = Debug|x64
+		{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.MinSizeRel|x64.Build.0 = Debug|x64
+		{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.Release|x64.ActiveCfg = Release|x64
+		{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.Release|x64.Build.0 = Release|x64
+		{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.RelWithDebInfo|x64.ActiveCfg = Release|x64
+		{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.RelWithDebInfo|x64.Build.0 = Release|x64
+		{EFC9FC4D-E92B-4C6D-9B97-26D38EAA118D}.Debug|x64.ActiveCfg = Debug|x64
+		{EFC9FC4D-E92B-4C6D-9B97-26D38EAA118D}.Debug|x64.Build.0 = Debug|x64
+		{EFC9FC4D-E92B-4C6D-9B97-26D38EAA118D}.MinSizeRel|x64.ActiveCfg = Debug|x64
+		{EFC9FC4D-E92B-4C6D-9B97-26D38EAA118D}.MinSizeRel|x64.Build.0 = Debug|x64
+		{EFC9FC4D-E92B-4C6D-9B97-26D38EAA118D}.Release|x64.ActiveCfg = Release|x64
+		{EFC9FC4D-E92B-4C6D-9B97-26D38EAA118D}.Release|x64.Build.0 = Release|x64
+		{EFC9FC4D-E92B-4C6D-9B97-26D38EAA118D}.RelWithDebInfo|x64.ActiveCfg = Debug|x64
+		{EFC9FC4D-E92B-4C6D-9B97-26D38EAA118D}.RelWithDebInfo|x64.Build.0 = Debug|x64
+		{89D666E6-B500-498F-B026-4D167F68ADFC}.Debug|x64.ActiveCfg = Debug|x64
+		{89D666E6-B500-498F-B026-4D167F68ADFC}.Debug|x64.Build.0 = Debug|x64
+		{89D666E6-B500-498F-B026-4D167F68ADFC}.MinSizeRel|x64.ActiveCfg = Debug|x64
+		{89D666E6-B500-498F-B026-4D167F68ADFC}.MinSizeRel|x64.Build.0 = Debug|x64
+		{89D666E6-B500-498F-B026-4D167F68ADFC}.Release|x64.ActiveCfg = Release|x64
+		{89D666E6-B500-498F-B026-4D167F68ADFC}.Release|x64.Build.0 = Release|x64
+		{89D666E6-B500-498F-B026-4D167F68ADFC}.RelWithDebInfo|x64.ActiveCfg = Debug|x64
+		{89D666E6-B500-498F-B026-4D167F68ADFC}.RelWithDebInfo|x64.Build.0 = Debug|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {422D1620-0166-4C26-9A81-CA8A2EB1AB58}
+	EndGlobalSection
+	GlobalSection(Performance) = preSolution
+		HasPerformanceSessions = true
+	EndGlobalSection
+EndGlobal
@@ -0,0 +1,158 @@
+set(Protobuf_PROTOC_EXECUTABLE "${SPARK_BIN}/protoc")
+set(PROTOBUF_INCLUDE_DIRS "${SPARK_INCLUDE}")
+set(PROTOBUF_STATIC_LIB "libprotobuf")
+
+function(Protobuf_Generate_Cpp SRCS HDRS)
+  set(${SRCS})
+  set(${HDRS})
+
+  foreach(FIL ${ARGN})
+    get_filename_component(ABS_FIL ${FIL} ABSOLUTE)
+    get_filename_component(FIL_WE ${FIL} NAME_WE)
+    get_filename_component(FIL_DIR ${FIL} DIRECTORY)
+    if(FIL_DIR)
+      set(FIL_WE "${FIL_DIR}/${FIL_WE}")
+    endif()
+
+    list(APPEND ${SRCS} "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.cc")
+    list(APPEND ${HDRS} "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.h")
+    set(PROTOBUF_INCLUDE_DIR_ARGS ${CMAKE_CURRENT_SOURCE_DIR})
+    # list(APPEND PROTOBUF_INCLUDE_DIR_ARGS " -I ")
+    # list(APPEND PROTOBUF_INCLUDE_DIR_ARGS ${CMAKE_CURRENT_SOURCE_DIR})
+    foreach(INC ${PROTOBUF_INCLUDE_DIRS})
+      set(PROTOBUF_INCLUDE_DIR_ARGS ${PROTOBUF_INCLUDE_DIR_ARGS} -I ${INC})
+      # list(APPEND PROTOBUF_INCLUDE_DIR_ARGS " -I ")
+      # list(APPEND PROTOBUF_INCLUDE_DIR_ARGS ${INC})
+    endforeach()
+    set(PROTOBUF_INCLUDE_DIR_ARGS ${PROTOBUF_INCLUDE_DIR_ARGS} -I ${CMAKE_CURRENT_BINARY_DIR})
+    # string(JOIN " -I " PROTOBUF_INCLUDE_DIR_ARGS_ ${PROTOBUF_INCLUDE_DIR_ARGS})
+    message("pb inc: ${PROTOBUF_INCLUDE_DIR_ARGS}")
+    # set(cmd_text "${Protobuf_PROTOC_EXECUTABLE} --cpp_out=${CMAKE_CURRENT_BINARY_DIR} -I ${PROTOBUF_INCLUDE_DIR_ARGS_} -I ${CMAKE_CURRENT_SOURCE_DIR} ${ABS_FIL}")
+    message("CMD: ${Protobuf_PROTOC_EXECUTABLE} ARGS --cpp_out=${CMAKE_CURRENT_BINARY_DIR} -I ${PROTOBUF_INCLUDE_DIR_ARGS} ${ABS_FIL}")
+    add_custom_command(
+      OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.cc"
+             "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.h"
+      COMMAND ${Protobuf_PROTOC_EXECUTABLE} --cpp_out=${CMAKE_CURRENT_BINARY_DIR} -I ${PROTOBUF_INCLUDE_DIR_ARGS} ${ABS_FIL}
+      # COMMAND
+      #   ${Protobuf_PROTOC_EXECUTABLE} ARGS --cpp_out=${CMAKE_CURRENT_BINARY_DIR} -I
+      #   ${PROTOBUF_INCLUDE_DIR_ARGS} ${ABS_FIL}
+      DEPENDS ${ABS_FIL}
+      COMMENT "Running C++ protocol buffer compiler on ${FIL}"
+      VERBATIM)
+  endforeach()
+
+  set_source_files_properties(${${SRCS}} ${${HDRS}} PROPERTIES GENERATED TRUE)
+
+  # remove some warnings from protobuf generated files
+  if(WIN32)
+    set_source_files_properties(${${SRCS}} PROPERTIES COMPILE_FLAGS
+                                                      "/wd4309 /wd4838")
+  else()
+    set_source_files_properties(
+      ${${SRCS}}
+      PROPERTIES
+        COMPILE_FLAGS
+        "-Wno-unused-parameter -Wno-effc++ -Wno-pedantic -Wno-sign-compare -Wno-uninitialized"
+    )
+  endif()
+
+  set(${SRCS}
+      ${${SRCS}}
+      PARENT_SCOPE)
+  set(${HDRS}
+      ${${HDRS}}
+      PARENT_SCOPE)
+endfunction()
+
+function(Service_Compiler_Generate_Cpp SRCS HDRS)
+  set(${SRCS})
+  set(${HDRS})
+
+  foreach(FIL ${ARGN})
+    get_filename_component(ABS_FIL ${FIL} ABSOLUTE)
+    get_filename_component(FIL_WE ${FIL} NAME_WE)
+    get_filename_component(FIL_DIR ${FIL} DIRECTORY)
+    if(FIL_DIR)
+      set(FIL_WE "${FIL_DIR}/${FIL_WE}")
+    endif()
+
+    list(APPEND ${SRCS} "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.cc")
+    list(APPEND ${HDRS} "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.h")
+
+    list(APPEND ${SRCS} "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.client.pb.cc")
+    list(APPEND ${HDRS} "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.client.pb.h")
+
+    list(APPEND ${SRCS} "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.server.pb.cc")
+    list(APPEND ${HDRS} "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.server.pb.h")
+
+    set(TEMPLATES
+        ${CMAKE_CURRENT_SOURCE_DIR}/api/service_compiler/templates/cpp/client.pb.cc
+        ${CMAKE_CURRENT_SOURCE_DIR}/api/service_compiler/templates/cpp/client.pb.h
+        ${CMAKE_CURRENT_SOURCE_DIR}/api/service_compiler/templates/cpp/server.pb.cc
+        ${CMAKE_CURRENT_SOURCE_DIR}/api/service_compiler/templates/cpp/server.pb.h
+    )
+
+    if(WIN32)
+      add_custom_command(
+        OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.cc"
+               "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.h"
+               "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.client.pb.cc"
+               "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.client.pb.h"
+               "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.server.pb.cc"
+               "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.server.pb.h"
+        COMMAND SET PYTHONPATH=${SPARK_PYTHON}
+        COMMAND ${CMAKE_SOURCE_DIR}/.venv/Scripts/activate.bat
+        COMMAND
+          ${Protobuf_PROTOC_EXECUTABLE} ARGS --cpp_out=${CMAKE_CURRENT_BINARY_DIR}
+          --plugin=protoc-gen-service=${CMAKE_SOURCE_DIR}/src/lib/api/service_compiler/plugin.cmd
+          --service_out=lang=cpp:${CMAKE_CURRENT_BINARY_DIR} -I
+          ${PROTOBUF_INCLUDE_DIRS} -I ${CMAKE_CURRENT_SOURCE_DIR} ${ABS_FIL}
+        DEPENDS ${ABS_FIL} ${TEMPLATES}
+                ${CMAKE_CURRENT_SOURCE_DIR}/api/service_compiler/plugin.py
+        COMMENT "Running C++ service compiler on ${FIL}"
+        VERBATIM)
+    else()
+      add_custom_command(
+        OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.cc"
+               "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.h"
+               "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.client.pb.cc"
+               "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.client.pb.h"
+               "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.server.pb.cc"
+               "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.server.pb.h"
+        COMMAND ${CMAKE_SOURCE_DIR}/tools/venv_exec.sh
+        ARGS
+          ${Protobuf_PROTOC_EXECUTABLE}
+          --cpp_out=${CMAKE_CURRENT_BINARY_DIR}
+          --plugin=protoc-gen-service=${CMAKE_SOURCE_DIR}/src/lib/api/service_compiler/plugin.py
+          --service_out=lang=cpp,make_file_name=${ABS_FIL}:${CMAKE_CURRENT_BINARY_DIR}
+          -I ${PROTOBUF_INCLUDE_DIRS} -I ${CMAKE_CURRENT_SOURCE_DIR} ${ABS_FIL}
+        DEPENDS ${ABS_FIL} ${TEMPLATES}
+                ${CMAKE_CURRENT_SOURCE_DIR}/api/service_compiler/plugin.py
+        COMMENT "Running C++ service compiler on ${FIL}"
+        VERBATIM)
+    endif()
+
+  endforeach()
+
+  # remove some warnings from protobuf generated files
+  if(WIN32)
+    set_source_files_properties(${${SRCS}} PROPERTIES COMPILE_FLAGS
+                                                      "/wd4309 /wd4838")
+  else()
+    set_source_files_properties(
+      ${${SRCS}}
+      PROPERTIES
+        COMPILE_FLAGS
+        "-Wno-unused-parameter -Wno-effc++ -Wno-pedantic -Wno-sign-compare -Wno-uninitialized"
+    )
+  endif()
+
+  set(${SRCS}
+      ${${SRCS}}
+      PARENT_SCOPE)
+  set(${HDRS}
+      ${${HDRS}}
+      PARENT_SCOPE)
+
+endfunction()
+
@@ -0,0 +1,76 @@
+[cmake ext]: https://marketplace.visualstudio.com/items?itemName=ms-vscode.cmake-tools
+[cmake presets]: https://cmake.org/cmake/help/latest/manual/cmake-presets.7.html
+[cpp ext]: https://marketplace.visualstudio.com/items?itemName=ms-vscode.cpptools
+[clangd ext]: https://marketplace.visualstudio.com/items?itemName=llvm-vs-code-extensions.vscode-clangd
+[py venv]: https://docs.python.org/3/library/venv.html
+
+# C++ Intellisense for Spark on Windows (VS Code)
+**Steps**
+1. Install the **[C++ extension][cpp ext]**
+2. Install the **[CMake extension][cmake ext]**
+3. Copy `c_cpp_properties.json` from this folder to `$workspaceFolder/.vscode/`
+4. In the VS Code Command Palette, run **CMake: Select Configure Preset**, then
+   select '**spark**' from the dropdown
+
+**Notes**
+* Intellisense won't work for generated files/types until you build libspark
+
+# C++ Intellisense for Sparkd on Linux (VS Code)
+1. Install the **[CMake extension][cmake ext]**
+2. Install the **[Clangd extension][clangd ext]**
+3. (Optional) Install the **[C++ extension][cpp ext]** (*needed for debugging,
+   but intellisense should work without it*).
+4. If the **[C++ extension][cpp ext]** is installed, disable its intellisense in
+  your workspace settings (*Clangd intellisense is better*)
+   ```
+   "C_Cpp.intelliSenseEngine": "disabled"
+   ```
+5. In the VS Code Command Palette, run **CMake: Select Configure Preset**, then select the
+  **[preset][cmake presets]** you wish to build from the dropdown
+   * *The **Clang** presets may work best with the **Clangd** extension*
+   * *Intellisense won't work for generated files/types until you build libspark*
+
+# Build Sparkd on Linux
+
+**Notes**
+* Sparkd is built using **[CMakePresets][cmake presets]**
+
+**Steps**
+1. Set up the **[Python virtual environment][py venv]**<br>
+   * *Run commands from the repo root dir unless otherwise noted*
+   1. Create the virtual environment
+      ```
+      python3 -m venv .venv
+      ```
+   2. Activate the virtual environment
+      ```
+      . .venv/bin/activate
+      ```
+   3. Verify `python` in the venv is first in the path<br>
+      * ***Expected:** output shows the absolute path to `.venv/bin/python`*
+      ```
+      which python
+      ```
+   4. Update `pip`<br>
+      * *The venv module initializes virtual environments with its own version
+        of pip, rather than the system's version. Even if the latter is up-to-date, the
+        former may not be.*
+      ```
+      python -m pip install --upgrade pip
+      ```
+   5. Install the packages listed `requirements.txt`
+      ```
+      pip install -r requirements.txt
+      ```
+2. Build **Sparkd**<br>
+   * From the terminal
+      ```
+      tools/build_sparkd.sh
+      ```
+      * *Run with `--help` to see available options*
+   * From VS Code
+      1. Install the **[CMake extension][cmake ext]**
+      2. In the VS Code Command Palette, run **CMake: Select Configure
+         Preset**, then select the **[preset][cmake presets]** you wish to
+         build from the dropdown
+      3. Run **CMake: Build** in the command palette.
@@ -0,0 +1,27 @@
+{
+  "version": 4,
+  "configurations": [
+    {
+      "name": "Windows",
+      "intelliSenseMode": "windows-msvc-x64",
+      "includePath": [
+        "${workspaceFolder}/src/",
+        "${workspaceFolder}/build/src/",
+        "${workspaceFolder}/externals/windows/include/"
+      ],
+      "defines": ["_WIN32", "__x86_64__"],
+      "browse": {
+        "path": [
+          "${workspaceRoot}/src",
+          "${workspaceRoot}/build/src"
+        ],
+        "limitSymbolsToIncludedHeaders": true
+      },
+      "cStandard": "c17",
+      "cppStandard": "c++17",
+      "configurationProvider": "ms-vscode.cmake-tools",
+      "compilerPath": "C:/Program Files/Microsoft Visual Studio/2022/Community/VC/Tools/MSVC/14.34.31933/bin/Hostx64/x64/cl.exe",
+      "mergeConfigurations": true
+    }
+  ]
+}
@@ -46,6 +46,7 @@ function setup_build
    assert_dir $repo_root
    assert_dir $build_root
    set compiler "$argv[1]"
+    set c_compiler (which cc)
    set build_type "$argv[2]"

    if test \( -z "$build_type" \) -o \( \( "$build_type" != debug \) -a \( "$build_type" != release \) \)
@@ -59,6 +60,7 @@ function setup_build
        else
            # set compiler_arg "/usr/lib/ccache/clang++"
            set compiler_arg "clang++"
+            set c_compiler (which clang)
        end
    else if test "$build_type" = release
        set build_type_arg Release
@@ -85,7 +87,7 @@ function setup_build
    rm -rf "$build_dest"
    mkdir -p "$build_dest"
    cd "$build_dest"
-    cmake -G Ninja -DCMAKE_BUILD_TYPE=$build_type_arg -DCMAKE_EXPORT_COMPILE_COMMANDS=1 -DCMAKE_CXX_COMPILER=$compiler_arg $repo_root
+    cmake -G Ninja -DCMAKE_BUILD_TYPE=$build_type_arg -DCMAKE_EXPORT_COMPILE_COMMANDS=1 -DCMAKE_C_COMPILER=$c_compiler -DCMAKE_CXX_COMPILER=$compiler_arg $repo_root
 end

 # The while loop below removes arguments (via shift) as it parses them.
@@ -0,0 +1,941 @@
+{
+	"$schema": "vscode://schemas/color-theme",
+	"type": "dark",
+	"colors": {
+		"activityBar.background": "#111111",
+		"activityBar.border": "#111111",
+		"activityBar.foreground": "#888888",
+		"activityBarBadge.background": "#88cc44",
+		"activityBarBadge.foreground": "#222222",
+		"badge.background": "#88cc44",
+		"badge.foreground": "#222222",
+		"button.background": "#333333",
+		"button.foreground": "#888888",
+		"button.hoverBackground": "#222222",
+		"debugExceptionWidget.background": "#333333",
+		"debugExceptionWidget.border": "#222222",
+		"debugToolBar.background": "#111111",
+		"diffEditor.insertedTextBackground": "#ffdd440c",
+		"diffEditor.insertedTextBorder": "#ffdd44",
+		"diffEditor.removedTextBackground": "#88bbff0c",
+		"diffEditor.removedTextBorder": "#88bbff",
+		"dropdown.background": "#222222",
+		"dropdown.border": "#222222",
+		"dropdown.foreground": "#888888",
+		"editor.background": "#222222",
+		"editor.findMatchBackground": "#44446655",
+		"editor.findMatchHighlightBackground": "#444466aa",
+		"editor.foreground": "#ffffff",
+		"editor.hoverHighlightBackground": "#44446655",
+		"editor.inactiveSelectionBackground": "#44446655",
+		"editor.lineHighlightBackground": "#00000066",
+		"editor.lineHighlightBorder": "#00000000",
+		"editor.rangeHighlightBackground": "#333333",
+		"editor.selectionBackground": "#444466",
+		"editor.selectionHighlightBackground": "#44446655",
+		"editor.wordHighlightBackground": "#44446655",
+		"editor.wordHighlightStrongBackground": "#44446655",
+		"editorBracketMatch.background": "#222222",
+		"editorBracketMatch.border": "#666666",
+		"editorCodeLens.foreground": "#666666",
+		"editorCursor.foreground": "#ffffff",
+		"editorError.foreground": "#ee5500",
+		"editorGroup.border": "#111111",
+		"editorGroup.dropBackground": "#111111bb",
+		"editorGroupHeader.noTabsBackground": "#111111",
+		"editorGroupHeader.tabsBackground": "#111111",
+		"editorGroupHeader.tabsBorder": "#222222",
+		"editorGutter.addedBackground": "#ffdd44",
+		"editorGutter.background": "#222222",
+		"editorGutter.deletedBackground": "#88bbff",
+		"editorGutter.modifiedBackground": "#88bbff",
+		"editorHoverWidget.background": "#333333",
+		"editorHoverWidget.border": "#222222",
+		"editorIndentGuide.background": "#333333",
+		"editorLineNumber.foreground": "#555555",
+		"editorLink.activeForeground": "#bba0ff",
+		"editorMarkerNavigation.background": "#333333",
+		"editorMarkerNavigationError.background": "#88bbff",
+		"editorMarkerNavigationWarning.background": "#88bbff",
+		"editorOverviewRuler.addedForeground": "#ffdd44",
+		"editorOverviewRuler.border": "#222222",
+		"editorOverviewRuler.currentContentForeground": "#333333",
+		"editorOverviewRuler.deletedForeground": "#88bbff",
+		"editorOverviewRuler.errorForeground": "#88bbff",
+		"editorOverviewRuler.findMatchForeground": "#555555",
+		"editorOverviewRuler.incomingContentForeground": "#333333",
+		"editorOverviewRuler.infoForeground": "#bba0ff",
+		"editorOverviewRuler.modifiedForeground": "#88bbff",
+		"editorOverviewRuler.rangeHighlightForeground": "#333333",
+		"editorOverviewRuler.selectionHighlightForeground": "#555555",
+		"editorOverviewRuler.warningForeground": "#88bbff",
+		"editorOverviewRuler.wordHighlightForeground": "#333333",
+		"editorOverviewRuler.wordHighlightStrongForeground": "#555555",
+		"editorRuler.foreground": "#ffffff",
+		"editorSuggestWidget.background": "#333333",
+		"editorSuggestWidget.border": "#333333",
+		"editorSuggestWidget.foreground": "#888888",
+		"editorSuggestWidget.highlightForeground": "#ffffff",
+		"editorSuggestWidget.selectedBackground": "#666666",
+		"editorWarning.border": "#00000000",
+		"editorWarning.foreground": "#88bbff",
+		"editorWhitespace.foreground": "#333333",
+		"editorWidget.background": "#333333",
+		"editorWidget.border": "#333333",
+		"errorForeground": "#88bbff",
+		"extensionButton.prominentBackground": "#333333",
+		"extensionButton.prominentForeground": "#ffffff",
+		"extensionButton.prominentHoverBackground": "#555555",
+		"focusBorder": "#666666",
+		"foreground": "#ffffff",
+		"gitDecoration.modifiedResourceForeground": "#cccccc",
+		"gitDecoration.untrackedResourceForeground": "#cccccc",
+		"input.background": "#333333",
+		"input.border": "#333333",
+		"input.foreground": "#ffffff",
+		"input.placeholderForeground": "#555555",
+		"inputOption.activeBorder": "#555555",
+		"inputValidation.errorBackground": "#333333",
+		"inputValidation.errorBorder": "#88bbff",
+		"inputValidation.infoBackground": "#333333",
+		"inputValidation.infoBorder": "#bba0ff",
+		"inputValidation.warningBackground": "#333333",
+		"inputValidation.warningBorder": "#88bbff",
+		"list.activeSelectionBackground": "#111111",
+		"list.activeSelectionForeground": "#ffffff",
+		"list.dropBackground": "#111111bf",
+		"list.focusBackground": "#222222",
+		"list.focusForeground": "#ffffff",
+		"list.highlightForeground": "#ffffff",
+		"list.hoverBackground": "#333333",
+		"list.hoverForeground": "#ffffff",
+		"list.inactiveSelectionBackground": "#000000",
+		"list.inactiveSelectionForeground": "#ffffff",
+		"menu.background": "#333333",
+		"menu.foreground": "#ffffff",
+		"merge.border": "#222222",
+		"merge.currentContentBackground": "#333333",
+		"merge.currentHeaderBackground": "#555555",
+		"merge.incomingContentBackground": "#555555",
+		"merge.incomingHeaderBackground": "#666666",
+		"panel.background": "#111111",
+		"panel.border": "#111111",
+		"panelTitle.activeBorder": "#ffffff",
+		"panelTitle.activeForeground": "#ffffff",
+		"panelTitle.inactiveForeground": "#888888",
+		"peekView.border": "#222222",
+		"peekViewEditor.background": "#333333",
+		"peekViewEditor.matchHighlightBackground": "#555555",
+		"peekViewEditorGutter.background": "#333333",
+		"peekViewResult.background": "#333333",
+		"peekViewResult.fileForeground": "#888888",
+		"peekViewResult.lineForeground": "#888888",
+		"peekViewResult.matchHighlightBackground": "#555555",
+		"peekViewResult.selectionBackground": "#333333",
+		"peekViewResult.selectionForeground": "#ffffff",
+		"peekViewTitle.background": "#333333",
+		"peekViewTitleDescription.foreground": "#888888",
+		"peekViewTitleLabel.foreground": "#ffffff",
+		"pickerGroup.border": "#222222",
+		"pickerGroup.foreground": "#555555",
+		"progressBar.background": "#333333",
+		"scrollbar.shadow": "#191919",
+		"scrollbarSlider.activeBackground": "#ffffff12",
+		"scrollbarSlider.background": "#ffffff12",
+		"scrollbarSlider.hoverBackground": "#ffffff12",
+		"selection.background": "#2255aa",
+		"sideBar.background": "#111111",
+		"sideBar.border": "#111111",
+		"sideBar.foreground": "#888888",
+		"sideBarSectionHeader.background": "#111111",
+		"sideBarSectionHeader.foreground": "#666666",
+		"sideBarTitle.foreground": "#555555",
+		"statusBar.background": "#111111",
+		"statusBar.border": "#111111",
+		"statusBar.debuggingBackground": "#666666",
+		"statusBar.debuggingForeground": "#ffffff",
+		"statusBar.foreground": "#666666",
+		"statusBar.noFolderBackground": "#111111",
+		"statusBar.noFolderForeground": "#666666",
+		"statusBarItem.activeBackground": "#222222",
+		"statusBarItem.hoverBackground": "#222222",
+		"statusBarItem.prominentBackground": "#333333",
+		"statusBarItem.prominentHoverBackground": "#444444",
+		"tab.activeBackground": "#222222",
+		"tab.border": "#111111",
+		"tab.inactiveBackground": "#111111",
+		"tab.inactiveForeground": "#888888",
+		"tab.unfocusedActiveBorder": "#888888",
+		"tab.unfocusedActiveForeground": "#888888",
+		"tab.unfocusedInactiveForeground": "#888888",
+		"terminal.ansiBlack": "#333333",
+		"terminal.ansiBlue": "#88bbff",
+		"terminal.ansiBrightBlack": "#666666",
+		"terminal.ansiBrightBlue": "#88bbff",
+		"terminal.ansiBrightCyan": "#bba0ff",
+		"terminal.ansiBrightGreen": "#ffdd44",
+		"terminal.ansiBrightMagenta": "#88bbff",
+		"terminal.ansiBrightRed": "#88bbff",
+		"terminal.ansiBrightWhite": "#ffffff",
+		"terminal.ansiBrightYellow": "#88cc44",
+		"terminal.ansiCyan": "#bba0ff",
+		"terminal.ansiGreen": "#ffdd44",
+		"terminal.ansiMagenta": "#88bbff",
+		"terminal.ansiRed": "#88bbff",
+		"terminal.ansiWhite": "#ffffff",
+		"terminal.ansiYellow": "#88cc44",
+		"terminal.background": "#151515",
+		"terminal.foreground": "#ffffff",
+		"titleBar.activeBackground": "#111111",
+		"titleBar.activeForeground": "#888888",
+		"titleBar.inactiveBackground": "#111111",
+		"titleBar.inactiveForeground": "#555555",
+		"walkThrough.embeddedEditorBackground": "#111111",
+		"widget.shadow": "#111111",
+		//"activityBar.activeBorder": "#888888",
+		//"activityBar.dropBorder": "#888888",
+		//"activityBar.inactiveForeground": "#88888866",
+		//"banner.background": "#111111",
+		//"banner.foreground": "#ffffff",
+		//"banner.iconForeground": "#3794ff",
+		//"bookmarks.lineBackground": "#00000000",
+		//"bookmarks.lineBorder": "#00000000",
+		//"bookmarks.overviewRuler": "#157efb88",
+		//"breadcrumb.activeSelectionForeground": "#ffffff",
+		//"breadcrumb.background": "#222222",
+		//"breadcrumb.focusForeground": "#ffffff",
+		//"breadcrumb.foreground": "#ffffffcc",
+		//"breadcrumbPicker.background": "#333333",
+		//"button.secondaryBackground": "#3a3d41",
+		//"button.secondaryForeground": "#ffffff",
+		//"button.secondaryHoverBackground": "#45494e",
+		//"charts.blue": "#3794ff",
+		//"charts.foreground": "#ffffff",
+		//"charts.green": "#89d185",
+		//"charts.lines": "#ffffff80",
+		//"charts.orange": "#d18616",
+		//"charts.purple": "#b180d7",
+		//"charts.red": "#ee5500",
+		//"charts.yellow": "#88bbff",
+		//"checkbox.background": "#222222",
+		//"checkbox.border": "#222222",
+		//"checkbox.foreground": "#888888",
+		//"debugConsole.errorForeground": "#88bbff",
+		//"debugConsole.infoForeground": "#3794ff",
+		//"debugConsole.sourceForeground": "#ffffff",
+		//"debugConsole.warningForeground": "#88bbff",
+		//"debugConsoleInputIcon.foreground": "#ffffff",
+		//"debugIcon.breakpointCurrentStackframeForeground": "#ffcc00",
+		//"debugIcon.breakpointDisabledForeground": "#848484",
+		//"debugIcon.breakpointForeground": "#e51400",
+		//"debugIcon.breakpointStackframeForeground": "#89d185",
+		//"debugIcon.breakpointUnverifiedForeground": "#848484",
+		//"debugIcon.continueForeground": "#75beff",
+		//"debugIcon.disconnectForeground": "#f48771",
+		//"debugIcon.pauseForeground": "#75beff",
+		//"debugIcon.restartForeground": "#89d185",
+		//"debugIcon.startForeground": "#89d185",
+		//"debugIcon.stepBackForeground": "#75beff",
+		//"debugIcon.stepIntoForeground": "#75beff",
+		//"debugIcon.stepOutForeground": "#75beff",
+		//"debugIcon.stepOverForeground": "#75beff",
+		//"debugIcon.stopForeground": "#f48771",
+		//"debugTokenExpression.boolean": "#4e94ce",
+		//"debugTokenExpression.error": "#f48771",
+		//"debugTokenExpression.name": "#c586c0",
+		//"debugTokenExpression.number": "#b5cea8",
+		//"debugTokenExpression.string": "#ce9178",
+		//"debugTokenExpression.value": "#cccccc99",
+		//"debugView.exceptionLabelBackground": "#6c2022",
+		//"debugView.exceptionLabelForeground": "#ffffff",
+		//"debugView.stateLabelBackground": "#88888844",
+		//"debugView.stateLabelForeground": "#ffffff",
+		//"debugView.valueChangedHighlight": "#569cd6",
+		//"descriptionForeground": "#ffffffb3",
+		//"diffEditor.diagonalFill": "#cccccc33",
+		//"editor.findRangeHighlightBackground": "#3a3d4166",
+		//"editor.focusedStackFrameHighlightBackground": "#7abd7a4d",
+		//"editor.foldBackground": "#4444664d",
+		//"editor.inlineValuesBackground": "#ffc80033",
+		//"editor.inlineValuesForeground": "#ffffff80",
+		//"editor.linkedEditingBackground": "#ff00004d",
+		//"editor.snippetFinalTabstopHighlightBorder": "#525252",
+		//"editor.snippetTabstopHighlightBackground": "#7c7c7c4d",
+		//"editor.stackFrameHighlightBackground": "#ffff0033",
+		//"editor.symbolHighlightBackground": "#444466aa",
+		//"editorActiveLineNumber.foreground": "#c6c6c6",
+		//"editorBracketHighlight.foreground1": "#ffd700",
+		//"editorBracketHighlight.foreground2": "#da70d6",
+		//"editorBracketHighlight.foreground3": "#179fff",
+		//"editorBracketHighlight.foreground4": "#00000000",
+		//"editorBracketHighlight.foreground5": "#00000000",
+		//"editorBracketHighlight.foreground6": "#00000000",
+		//"editorBracketHighlight.unexpectedBracket.foreground": "#ff1212cc",
+		//"editorBracketPairGuide.activeBackground1": "#00000000",
+		//"editorBracketPairGuide.activeBackground2": "#00000000",
+		//"editorBracketPairGuide.activeBackground3": "#00000000",
+		//"editorBracketPairGuide.activeBackground4": "#00000000",
+		//"editorBracketPairGuide.activeBackground5": "#00000000",
+		//"editorBracketPairGuide.activeBackground6": "#00000000",
+		//"editorBracketPairGuide.background1": "#00000000",
+		//"editorBracketPairGuide.background2": "#00000000",
+		//"editorBracketPairGuide.background3": "#00000000",
+		//"editorBracketPairGuide.background4": "#00000000",
+		//"editorBracketPairGuide.background5": "#00000000",
+		//"editorBracketPairGuide.background6": "#00000000",
+		//"editorGhostText.foreground": "#ffffff56",
+		//"editorGutter.commentRangeForeground": "#c5c5c5",
+		//"editorGutter.foldingControlForeground": "#c5c5c5",
+		//"editorHint.foreground": "#eeeeeeb3",
+		//"editorHoverWidget.foreground": "#ffffff",
+		//"editorHoverWidget.highlightForeground": "#ffffff",
+		//"editorHoverWidget.statusBarBackground": "#3d3d3d",
+		//"editorIndentGuide.activeBackground": "#333333",
+		//"editorInfo.foreground": "#3794ff",
+		//"editorInlayHint.background": "#88cc4499",
+		//"editorInlayHint.foreground": "#222222cc",
+		//"editorInlayHint.parameterBackground": "#88cc4499",
+		//"editorInlayHint.parameterForeground": "#222222cc",
+		//"editorInlayHint.typeBackground": "#88cc4499",
+		//"editorInlayHint.typeForeground": "#222222cc",
+		//"editorLightBulb.foreground": "#ffcc00",
+		//"editorLightBulbAutoFix.foreground": "#75beff",
+		//"editorLineNumber.activeForeground": "#c6c6c6",
+		//"editorMarkerNavigationError.headerBackground": "#88bbff1a",
+		//"editorMarkerNavigationInfo.background": "#3794ff",
+		//"editorMarkerNavigationInfo.headerBackground": "#3794ff1a",
+		//"editorMarkerNavigationWarning.headerBackground": "#88bbff1a",
+		//"editorOverviewRuler.bracketMatchForeground": "#a0a0a0",
+		//"editorOverviewRuler.commonContentForeground": "#60606066",
+		//"editorOverviewRuler.unicodeForeground": "#d186167e",
+		//"editorPane.background": "#222222",
+		//"editorSuggestWidget.focusHighlightForeground": "#ffffff",
+		//"editorSuggestWidget.selectedForeground": "#ffffff",
+		//"editorSuggestWidgetStatus.foreground": "#88888880",
+		//"editorUnicodeHighlight.border": "#bd9b03",
+		//"editorUnnecessaryCode.opacity": "#000000aa",
+		//"editorWidget.foreground": "#ffffff",
+		//"extensionBadge.remoteBackground": "#88cc44",
+		//"extensionBadge.remoteForeground": "#222222",
+		//"extensionIcon.preReleaseForeground": "#1d9271",
+		//"extensionIcon.starForeground": "#ff8e00",
+		//"extensionIcon.verifiedForeground": "#3794ff",
+		//"gitDecoration.addedResourceForeground": "#81b88b",
+		//"gitDecoration.conflictingResourceForeground": "#e4676b",
+		//"gitDecoration.deletedResourceForeground": "#c74e39",
+		//"gitDecoration.ignoredResourceForeground": "#8c8c8c",
+		//"gitDecoration.renamedResourceForeground": "#73c991",
+		//"gitDecoration.stageDeletedResourceForeground": "#c74e39",
+		//"gitDecoration.stageModifiedResourceForeground": "#e2c08d",
+		//"gitDecoration.submoduleResourceForeground": "#8db9e2",
+		//"gitlens.closedAutolinkedIssueIconColor": "#a371f7",
+		//"gitlens.closedPullRequestIconColor": "#f85149",
+		//"gitlens.decorations.addedForegroundColor": "#81b88b",
+		//"gitlens.decorations.branchAheadForegroundColor": "#35b15e",
+		//"gitlens.decorations.branchBehindForegroundColor": "#b15e35",
+		//"gitlens.decorations.branchDivergedForegroundColor": "#d8af1b",
+		//"gitlens.decorations.branchMissingUpstreamForegroundColor": "#c74e39",
+		//"gitlens.decorations.branchUnpublishedForegroundColor": "#35b15e",
+		//"gitlens.decorations.branchUpToDateForegroundColor": "#888888",
+		//"gitlens.decorations.copiedForegroundColor": "#73c991",
+		//"gitlens.decorations.deletedForegroundColor": "#c74e39",
+		//"gitlens.decorations.ignoredForegroundColor": "#8c8c8c",
+		//"gitlens.decorations.modifiedForegroundColor": "#cccccc",
+		//"gitlens.decorations.renamedForegroundColor": "#73c991",
+		//"gitlens.decorations.untrackedForegroundColor": "#cccccc",
+		//"gitlens.gutterBackgroundColor": "#ffffff13",
+		//"gitlens.gutterForegroundColor": "#bebebe",
+		//"gitlens.gutterUncommittedForegroundColor": "#00bcf299",
+		//"gitlens.lineHighlightBackgroundColor": "#00bcf233",
+		//"gitlens.lineHighlightOverviewRulerColor": "#00bcf299",
+		//"gitlens.mergedPullRequestIconColor": "#a371f7",
+		//"gitlens.openAutolinkedIssueIconColor": "#3fb950",
+		//"gitlens.openPullRequestIconColor": "#3fb950",
+		//"gitlens.trailingLineBackgroundColor": "#00000000",
+		//"gitlens.trailingLineForegroundColor": "#99999959",
+		//"gitlens.unpublishedCommitIconColor": "#35b15e",
+		//"gitlens.unpulledChangesIconColor": "#b15e35",
+		//"gitlens.unpushlishedChangesIconColor": "#35b15e",
+		//"icon.foreground": "#c5c5c5",
+		//"inputOption.activeBackground": "#66666666",
+		//"inputOption.activeForeground": "#ffffff",
+		//"inputOption.hoverBackground": "#5a5d5e80",
+		//"interactive.activeCodeBorder": "#222222",
+		//"interactive.inactiveCodeBorder": "#000000",
+		//"keybindingLabel.background": "#8080802b",
+		//"keybindingLabel.border": "#33333399",
+		//"keybindingLabel.bottomBorder": "#44444499",
+		//"keybindingLabel.foreground": "#cccccc",
+		//"keybindingTable.headerBackground": "#ffffff0a",
+		//"keybindingTable.rowsBackground": "#ffffff0a",
+		//"list.deemphasizedForeground": "#8c8c8c",
+		//"list.errorForeground": "#f88070",
+		//"list.filterMatchBackground": "#444466aa",
+		//"list.focusHighlightForeground": "#ffffff",
+		//"list.focusOutline": "#666666",
+		//"list.invalidItemForeground": "#b89500",
+		//"list.warningForeground": "#cca700",
+		//"listFilterWidget.background": "#653723",
+		//"listFilterWidget.noMatchesOutline": "#be1100",
+		//"listFilterWidget.outline": "#00000000",
+		//"menu.selectionBackground": "#111111",
+		//"menu.selectionForeground": "#ffffff",
+		//"menu.separatorBackground": "#bbbbbb",
+		//"menubar.selectionBackground": "#ffffff1a",
+		//"menubar.selectionForeground": "#888888",
+		//"merge.commonContentBackground": "#60606029",
+		//"merge.commonHeaderBackground": "#60606066",
+		//"minimap.errorHighlight": "#ff1212b3",
+		//"minimap.findMatchHighlight": "#d18616",
+		//"minimap.foregroundOpacity": "#000000",
+		//"minimap.selectionHighlight": "#264f78",
+		//"minimap.selectionOccurrenceHighlight": "#676767",
+		//"minimap.unicodeHighlight": "#d18616",
+		//"minimap.warningHighlight": "#88bbff",
+		//"minimapGutter.addedBackground": "#587c0c",
+		//"minimapGutter.deletedBackground": "#94151b",
+		//"minimapGutter.modifiedBackground": "#0c7d9d",
+		//"minimapSlider.activeBackground": "#ffffff09",
+		//"minimapSlider.background": "#ffffff09",
+		//"minimapSlider.hoverBackground": "#ffffff09",
+		//"notebook.cellBorderColor": "#000000",
+		//"notebook.cellEditorBackground": "#111111",
+		//"notebook.cellInsertionIndicator": "#666666",
+		//"notebook.cellStatusBarItemHoverBackground": "#ffffff26",
+		//"notebook.cellToolbarSeparator": "#80808059",
+		//"notebook.focusedCellBorder": "#666666",
+		//"notebook.focusedEditorBorder": "#666666",
+		//"notebook.inactiveFocusedCellBorder": "#000000",
+		//"notebook.selectedCellBackground": "#000000",
+		//"notebook.selectedCellBorder": "#000000",
+		//"notebook.symbolHighlightBackground": "#ffffff0b",
+		//"notebookScrollbarSlider.activeBackground": "#ffffff12",
+		//"notebookScrollbarSlider.background": "#ffffff12",
+		//"notebookScrollbarSlider.hoverBackground": "#ffffff12",
+		//"notebookStatusErrorIcon.foreground": "#88bbff",
+		//"notebookStatusRunningIcon.foreground": "#ffffff",
+		//"notebookStatusSuccessIcon.foreground": "#89d185",
+		//"notificationCenterHeader.background": "#424242",
+		//"notificationLink.foreground": "#3794ff",
+		//"notifications.background": "#333333",
+		//"notifications.border": "#424242",
+		//"notifications.foreground": "#ffffff",
+		//"notificationsErrorIcon.foreground": "#ee5500",
+		//"notificationsInfoIcon.foreground": "#3794ff",
+		//"notificationsWarningIcon.foreground": "#88bbff",
+		//"panel.dropBorder": "#ffffff",
+		//"panelSection.border": "#111111",
+		//"panelSection.dropBackground": "#111111bb",
+		//"panelSectionHeader.background": "#80808033",
+		//"ports.iconRunningProcessForeground": "#88cc44",
+		//"problemsErrorIcon.foreground": "#ee5500",
+		//"problemsInfoIcon.foreground": "#3794ff",
+		//"problemsWarningIcon.foreground": "#88bbff",
+		//"quickInput.background": "#333333",
+		//"quickInput.foreground": "#ffffff",
+		//"quickInputList.focusBackground": "#111111",
+		//"quickInputList.focusForeground": "#ffffff",
+		//"quickInputTitle.background": "#ffffff1b",
+		//"sash.hoverBorder": "#666666",
+		//"scm.providerBorder": "#454545",
+		//"searchEditor.findMatchBackground": "#44446670",
+		//"searchEditor.textInputBorder": "#333333",
+		//"settings.checkboxBackground": "#222222",
+		//"settings.checkboxBorder": "#222222",
+		//"settings.checkboxForeground": "#888888",
+		//"settings.dropdownBackground": "#222222",
+		//"settings.dropdownBorder": "#222222",
+		//"settings.dropdownForeground": "#888888",
+		//"settings.dropdownListBorder": "#333333",
+		//"settings.focusedRowBackground": "#80808024",
+		//"settings.focusedRowBorder": "#ffffff1f",
+		//"settings.headerForeground": "#e7e7e7",
+		//"settings.modifiedItemIndicator": "#0c7d9d",
+		//"settings.numberInputBackground": "#333333",
+		//"settings.numberInputBorder": "#333333",
+		//"settings.numberInputForeground": "#ffffff",
+		//"settings.rowHoverBackground": "#80808012",
+		//"settings.textInputBackground": "#333333",
+		//"settings.textInputBorder": "#333333",
+		//"settings.textInputForeground": "#ffffff",
+		//"sideBar.dropBackground": "#111111bb",
+		//"sideBySideEditor.horizontalBorder": "#111111",
+		//"sideBySideEditor.verticalBorder": "#111111",
+		//"statusBar.debuggingBorder": "#111111",
+		//"statusBar.noFolderBorder": "#111111",
+		//"statusBarItem.compactHoverBackground": "#ffffff33",
+		//"statusBarItem.errorBackground": "#0066eb",
+		//"statusBarItem.errorForeground": "#ffffff",
+		//"statusBarItem.prominentForeground": "#666666",
+		//"statusBarItem.remoteBackground": "#88cc44",
+		//"statusBarItem.remoteForeground": "#222222",
+		//"statusBarItem.warningBackground": "#0066eb",
+		//"statusBarItem.warningForeground": "#ffffff",
+		//"symbolIcon.arrayForeground": "#ffffff",
+		//"symbolIcon.booleanForeground": "#ffffff",
+		//"symbolIcon.classForeground": "#ee9d28",
+		//"symbolIcon.colorForeground": "#ffffff",
+		//"symbolIcon.constantForeground": "#ffffff",
+		//"symbolIcon.constructorForeground": "#b180d7",
+		//"symbolIcon.enumeratorForeground": "#ee9d28",
+		//"symbolIcon.enumeratorMemberForeground": "#75beff",
+		//"symbolIcon.eventForeground": "#ee9d28",
+		//"symbolIcon.fieldForeground": "#75beff",
+		//"symbolIcon.fileForeground": "#ffffff",
+		//"symbolIcon.folderForeground": "#ffffff",
+		//"symbolIcon.functionForeground": "#b180d7",
+		//"symbolIcon.interfaceForeground": "#75beff",
+		//"symbolIcon.keyForeground": "#ffffff",
+		//"symbolIcon.keywordForeground": "#ffffff",
+		//"symbolIcon.methodForeground": "#b180d7",
+		//"symbolIcon.moduleForeground": "#ffffff",
+		//"symbolIcon.namespaceForeground": "#ffffff",
+		//"symbolIcon.nullForeground": "#ffffff",
+		//"symbolIcon.numberForeground": "#ffffff",
+		//"symbolIcon.objectForeground": "#ffffff",
+		//"symbolIcon.operatorForeground": "#ffffff",
+		//"symbolIcon.packageForeground": "#ffffff",
+		//"symbolIcon.propertyForeground": "#ffffff",
+		//"symbolIcon.referenceForeground": "#ffffff",
+		//"symbolIcon.snippetForeground": "#ffffff",
+		//"symbolIcon.stringForeground": "#ffffff",
+		//"symbolIcon.structForeground": "#ffffff",
+		//"symbolIcon.textForeground": "#ffffff",
+		//"symbolIcon.typeParameterForeground": "#ffffff",
+		//"symbolIcon.unitForeground": "#ffffff",
+		//"symbolIcon.variableForeground": "#75beff",
+		//"tab.activeForeground": "#ffffff",
+		//"tab.activeModifiedBorder": "#3399cc",
+		//"tab.inactiveModifiedBorder": "#3399cc80",
+		//"tab.lastPinnedBorder": "#585858",
+		//"tab.unfocusedActiveBackground": "#222222",
+		//"tab.unfocusedActiveModifiedBorder": "#3399cc80",
+		//"tab.unfocusedInactiveBackground": "#111111",
+		//"tab.unfocusedInactiveModifiedBorder": "#3399cc40",
+		//"terminal.border": "#111111",
+		//"terminal.dropBackground": "#111111bb",
+		//"terminal.selectionBackground": "#ffffff40",
+		//"testing.iconErrored": "#f14c4c",
+		//"testing.iconFailed": "#f14c4c",
+		//"testing.iconPassed": "#73c991",
+		//"testing.iconQueued": "#cca700",
+		//"testing.iconSkipped": "#848484",
+		//"testing.iconUnset": "#848484",
+		//"testing.message.error.decorationForeground": "#ee5500",
+		//"testing.message.error.lineBackground": "#ff000033",
+		//"testing.message.info.decorationForeground": "#ffffff80",
+		//"testing.peekBorder": "#ee5500",
+		//"testing.peekHeaderBackground": "#ee55001a",
+		//"testing.runAction": "#73c991",
+		//"textBlockQuote.background": "#7f7f7f1a",
+		//"textBlockQuote.border": "#007acc80",
+		//"textCodeBlock.background": "#0a0a0a66",
+		//"textLink.activeForeground": "#3794ff",
+		//"textLink.foreground": "#3794ff",
+		//"textPreformat.foreground": "#d7ba7d",
+		//"textSeparator.foreground": "#ffffff2e",
+		//"toolbar.activeBackground": "#63666750",
+		//"toolbar.hoverBackground": "#5a5d5e50",
+		//"tree.indentGuidesStroke": "#585858",
+		//"tree.tableColumnsBorder": "#cccccc20",
+		//"tree.tableOddRowsBackground": "#ffffff0a",
+		//"welcomePage.progress.background": "#333333",
+		//"welcomePage.progress.foreground": "#3794ff",
+		//"welcomePage.tileBackground": "#333333",
+		//"welcomePage.tileHoverBackground": "#3d3d3d",
+		//"welcomePage.tileShadow": "#111111",
+		//"activityBar.activeBackground": null,
+		//"activityBar.activeFocusBorder": null,
+		//"button.border": null,
+		//"contrastActiveBorder": null,
+		//"contrastBorder": null,
+		//"debugToolBar.border": null,
+		//"diffEditor.border": null,
+		//"dropdown.listBackground": null,
+		//"editor.findMatchBorder": null,
+		//"editor.findMatchHighlightBorder": null,
+		//"editor.findRangeHighlightBorder": null,
+		//"editor.rangeHighlightBorder": null,
+		//"editor.selectionForeground": null,
+		//"editor.selectionHighlightBorder": null,
+		//"editor.snippetFinalTabstopHighlightBackground": null,
+		//"editor.snippetTabstopHighlightBorder": null,
+		//"editor.symbolHighlightBorder": null,
+		//"editor.wordHighlightBorder": null,
+		//"editor.wordHighlightStrongBorder": null,
+		//"editorCursor.background": null,
+		//"editorError.background": null,
+		//"editorError.border": null,
+		//"editorGhostText.background": null,
+		//"editorGhostText.border": null,
+		//"editorGroup.emptyBackground": null,
+		//"editorGroup.focusedEmptyBorder": null,
+		//"editorGroupHeader.border": null,
+		//"editorHint.border": null,
+		//"editorInfo.background": null,
+		//"editorInfo.border": null,
+		//"editorOverviewRuler.background": null,
+		//"editorSuggestWidget.selectedIconForeground": null,
+		//"editorUnnecessaryCode.border": null,
+		//"editorWarning.background": null,
+		//"editorWidget.resizeBorder": null,
+		//"inputValidation.errorForeground": null,
+		//"inputValidation.infoForeground": null,
+		//"inputValidation.warningForeground": null,
+		//"list.activeSelectionIconForeground": null,
+		//"list.filterMatchBorder": null,
+		//"list.inactiveFocusBackground": null,
+		//"list.inactiveFocusOutline": null,
+		//"list.inactiveSelectionIconForeground": null,
+		//"menu.border": null,
+		//"menu.selectionBorder": null,
+		//"menubar.selectionBorder": null,
+		//"minimap.background": null,
+		//"notebook.cellHoverBackground": null,
+		//"notebook.focusedCellBackground": null,
+		//"notebook.inactiveSelectedCellBorder": null,
+		//"notebook.outputContainerBackgroundColor": null,
+		//"notebook.outputContainerBorderColor": null,
+		//"notificationCenter.border": null,
+		//"notificationCenterHeader.foreground": null,
+		//"notificationToast.border": null,
+		//"panelInput.border": null,
+		//"panelSectionHeader.border": null,
+		//"panelSectionHeader.foreground": null,
+		//"peekViewEditor.matchHighlightBorder": null,
+		//"quickInput.list.focusBackground": null,
+		//"quickInputList.focusIconForeground": null,
+		//"searchEditor.findMatchBorder": null,
+		//"sideBarSectionHeader.border": null,
+		//"tab.activeBorder": null,
+		//"tab.activeBorderTop": null,
+		//"tab.hoverBackground": null,
+		//"tab.hoverBorder": null,
+		//"tab.hoverForeground": null,
+		//"tab.unfocusedActiveBorderTop": null,
+		//"tab.unfocusedHoverBackground": null,
+		//"tab.unfocusedHoverBorder": null,
+		//"tab.unfocusedHoverForeground": null,
+		//"terminal.tab.activeBorder": null,
+		//"terminalCursor.background": null,
+		//"terminalCursor.foreground": null,
+		//"testing.message.info.lineBackground": null,
+		//"titleBar.border": null,
+		//"toolbar.hoverOutline": null,
+		//"welcomePage.background": null,
+		//"window.activeBorder": null,
+		//"window.inactiveBorder": null
+	},
+	"tokenColors": [
+		{
+			"scope": [
+				"variable.language.this"
+			],
+			"settings": {
+				"fontStyle": ""
+			}
+		},
+		{
+			"scope": "markup.bold",
+			"settings": {
+				"fontStyle": "bold"
+			}
+		},
+		{
+			"scope": [
+				"invalid",
+				"markup.italic",
+				"markup.quote"
+			],
+			"settings": {
+				"fontStyle": "italic"
+			}
+		},
+		{
+			"scope": "markup.underline",
+			"settings": {
+				"fontStyle": "underline"
+			}
+		},
+		{
+			"scope": [
+				"source.js.jsx punctuation.section.embedded",
+				"entity.name.tag",
+				"string.other.link.description.title",
+				"support.constant",
+				"support.variable",
+				"support.type",
+				"variable.other.class",
+				"support.class.builtin.js",
+				"support.class.console.js",
+				"meta.property-value",
+				"variable.parameter.keyframe-list",
+				"meta.at-rule.keyframes entity.name.function",
+				"expression.embedded.vue punctuation.definition"
+			],
+			"settings": {
+				"foreground": "#BBA0FF",
+				"fontStyle": ""
+			}
+		},
+		{
+			"scope": [
+				"entity.other.attribute-name.pseudo-class.css",
+				"entity.name.type.object.console",
+				"variable.language",
+				"variable.parameter.function.language.special.self.python",
+				"storage.type",
+				"entity.other.attribute-name.pseudo-element.css"
+			],
+			"settings": {
+				"foreground": "#BBA0FF",
+				"fontStyle": "italic"
+			}
+		},
+		{
+			"scope": [
+				"punctuation.definition.string.template"
+			],
+			"settings": {
+				"foreground": "#BBA0FF",
+				"fontStyle": "bold"
+			}
+		},
+		{
+			"scope": [
+				"entity.other.attribute-name.class.css",
+				"entity.other.attribute-name.parent-selector-suffix.css",
+				"entity.other.attribute-name.parent-selector-suffix.css punctuation.definition.entity.css",
+				"meta.definition.function",
+				"markup.underline.link",
+				"markup.inserted",
+				"meta.function-call",
+				"meta.instance.constructor",
+				"meta.attribute-with-value.class string",
+				"string.other.ref",
+				"string.other.restructuredtext.ref",
+				"variable.function",
+				"entity.name.type",
+				"entity.name.function",
+				"variable.other.object.property",
+				"punctuation.separator.key-value",
+				"meta.definition.function.js",
+				"support.class.component.js",
+				"entity.other.inherited-class",
+				"support.class",
+				"support.function.misc",
+				"support.function",
+				"entity.other.attribute-name.id.css",
+				"entity.other.attribute-name.id.css punctuation",
+				"entity.other.attribute-name.class.css punctuation",
+				"meta.function-call support.function.construct",
+				"entity.other.attribute-name"
+			],
+			"settings": {
+				"foreground": "#FFDD44"
+			}
+		},
+		{
+			"scope": "storage.type.function.arrow",
+			"settings": {
+				"foreground": "#FFDD44",
+				"fontStyle": ""
+			}
+		},
+		{
+			"scope": [
+				"entity.name.section",
+				"constant.numeric.line-number.match.find-in-files",
+				"markup.heading",
+				"markup.changed",
+				"meta.attribute-with-value.id string",
+				"string",
+				"punctuation.definition.string.begin",
+				"punctuation.definition.string.end",
+				"meta.attribute-selector"
+			],
+			"settings": {
+				"foreground": "#88CC44"
+			}
+		},
+		{
+			"scope": [
+				"keyword",
+				"keyword.control",
+				"constant",
+				"constant.numeric",
+				"constant.language",
+				"constant.other.property",
+				"constant.character.escape",
+				"comment keyword.codetag.notation",
+				"keyword.other.template.begin",
+				"keyword.other.template.end",
+				"markup.raw",
+				"markup.deleted",
+				"meta.property-list.css variable.other",
+				"entity.name.constant.preprocessor",
+				"meta.preprocessor",
+				"punctuation.section.embedded",
+				"punctuation.template-string.element.begin",
+				"punctuation.template-string.element.end",
+				"string.quoted.template punctuation.definition.string.begin",
+				"string.quoted.template punctuation.definition.string.end",
+				"meta.paragraph.markdown meta.dummy.line-break",
+				"meta.paragraph.markdown meta.hard-line-break.markdown",
+				"storage",
+				"storage.class.restructuredtext.ref",
+				"string.other.link.title",
+				"string.other.link.description",
+				"string.regexp punctuation.definition.string.begin",
+				"string.regexp punctuation.definition.string.end",
+				"variable.language.arguments",
+				"storage.modifier",
+				"keyword.operator.new",
+				"keyword.operator",
+				"keyword.operator.spread",
+				"punctuation.section.embedded.end.php source.php",
+				"support.function.construct",
+				"meta.at-rule.keyframes",
+				"meta.at-rule.keyframes entity.other.attribute-name"
+			],
+			"settings": {
+				"foreground": "#88BBFF"
+			}
+		},
+		{
+			"scope": [
+				"variable.other.substitution"
+			],
+			"settings": {
+				"foreground": "#88BBFF",
+				"fontStyle": "bold"
+			}
+		},
+		{
+			"scope": [
+				"meta.function-call meta.function-call.arguments",
+				"meta.function-call meta.arguments",
+				"meta.function-call meta.group",
+				"source.json meta.structure.dictionary",
+				"meta.object.member",
+				"punctuation.definition.group",
+				"string.unquoted.label",
+				"variable.other.member",
+				"entity.name.class",
+				"entity.name.namespace",
+				"constant.other",
+				"variable",
+				"variable.other",
+				"variable.other.constant.js",
+				"text.find-in-files",
+				"source",
+				"entity.name.type.module",
+				"source.sql support.function",
+				"support.other.namespace.php"
+			],
+			"settings": {
+				"foreground": "#FFFFFF",
+				"fontStyle": ""
+			}
+		},
+		{
+			"scope": [
+				"variable.parameter",
+				"parameters variable.function"
+			],
+			"settings": {
+				"foreground": "#FFFFFF",
+				"fontStyle": "italic"
+			}
+		},
+		{
+			"scope": [
+				"variable.other.property",
+				"support.variable.property",
+				"punctuation.separator.key-value",
+				"meta.object-literal.key",
+				"variable.other.object.property",
+				"variable.object.property",
+				"text.html.basic",
+				"text.html.vue-html",
+				"text.html.php",
+				"text.html.derivative",
+				"punctuation.definition.variable",
+				"punctuation.definition.keyword.scss",
+				"meta.jsx.children.js",
+				"meta.tag.attributes keyword.operator.assignment",
+				"support.type.vendored.property-name.css",
+				"support.type.property-name.json",
+				"variable.other.constant.property"
+			],
+			"settings": {
+				"foreground": "#BBBBCC"
+			}
+		},
+		{
+			"scope": "meta.property-name support.type",
+			"settings": {
+				"foreground": "#BBBBCC",
+				"fontStyle": ""
+			}
+		},
+		{
+			"scope": [
+				"keyword.other.substitution",
+				"keyword.operator.heading.restructuredtext",
+				"keyword.operator.table.row.restructuredtext",
+				"keyword.operator.table.data.restructuredtext",
+				"punctuation",
+				"markup.ignored",
+				"markup.untracked",
+				"meta.brace.round",
+				"meta.brace.square",
+				"meta.brace.curly",
+				"meta.delimiter.comma.js",
+				"meta.function-call.without-arguments.js",
+				"meta.function-call.method.without-arguments.js",
+				"source.scss",
+				"string source punctuation.section.embedded",
+				"punctuation.definition.tag.begin source",
+				"source.php"
+			],
+			"settings": {
+				"foreground": "#9999AA"
+			}
+		},
+		{
+			"scope": [
+				"comment",
+				"comment punctuation"
+			],
+			"settings": {
+				"foreground": "#888899",
+				"fontStyle": "italic"
+			}
+		},
+		{
+			"scope": "token.info-token",
+			"settings": {
+				"foreground": "#6796E6"
+			}
+		},
+		{
+			"scope": "token.warn-token",
+			"settings": {
+				"foreground": "#CD9731"
+			}
+		},
+		{
+			"scope": "token.error-token",
+			"settings": {
+				"foreground": "#F44747"
+			}
+		},
+		{
+			"scope": "token.debug-token",
+			"settings": {
+				"foreground": "#B267E6"
+			}
+		}
+	]
+}
@@ -0,0 +1,41 @@
+{
+  // Use IntelliSense to learn about possible attributes.
+  // Hover to view descriptions of existing attributes.
+  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "Spark Client",
+      "type": "coreclr",
+      "request": "launch",
+      "program": "${workspaceFolder}/build/Debug/bin/net6.0-windows/Spark.exe",
+      "cwd": "${workspaceFolder}/build/Debug/bin/net6.0-windows",
+      "enableStepFiltering": false,
+      "console": "internalConsole",
+      "stopAtEntry": false
+    },
+    {
+      "name": "Spark Test",
+      "type": "coreclr",
+      "request": "launch",
+      "program": "${workspaceFolder}/build/Debug/bin/net6.0/sparkcmd.exe",
+      "args": ["test", "${input:test}"],
+      "cwd": "${workspaceFolder}/build/Debug/bin/net6.0-windows",
+      "enableStepFiltering": false,
+      "console": "internalConsole",
+      "stopAtEntry": false
+    },
+    {
+      "name": "Attach (.NET Core)",
+      "type": "coreclr",
+      "request": "attach"
+    }
+  ],
+  "inputs": [
+    {
+      "id": "test",
+      "description": "The test(s) to run",
+      "type": "promptString"
+    }
+  ]
+}
@@ -0,0 +1,37 @@
+{
+  "cmake.configureOnOpen": false,
+  "workbench.colorTheme": "Default Dark+",
+  "C_Cpp.intelliSenseEngine": "Disabled",
+  "files.associations": {
+    "*.js": "javascript",
+    "*.conf": "jsonc",
+    "array": "cpp",
+    "xtree": "cpp",
+    "chrono": "cpp",
+    "*.ipp": "cpp",
+    "optional": "cpp",
+    "regex": "cpp",
+    "system_error": "cpp",
+    "format": "cpp",
+    "future": "cpp",
+    "istream": "cpp",
+    "memory": "cpp",
+    "tuple": "cpp",
+    "type_traits": "cpp",
+    "utility": "cpp",
+    "variant": "cpp",
+    "xlocmes": "cpp",
+    "xlocmon": "cpp",
+    "xlocnum": "cpp",
+    "xloctime": "cpp",
+    "xutility": "cpp",
+    "xstring": "cpp",
+    "string": "cpp",
+    "cstdint": "cpp"
+  },
+
+  "files.exclude": {
+    "**/.g.cs": true,
+    "**/.g.i.cs": true
+  }
+}
@@ -0,0 +1,44 @@
+{
+  "version": "2.0.0",
+  "tasks": [
+    {
+      "label": "Build Spark Client",
+      "type": "process",
+      "command": "C:\\Program Files\\Microsoft Visual Studio\\2022\\Community\\Common7\\Tools\\VsDevCmd.bat",
+      "args": [
+        "-arch=x64",
+        "-host_arch=x64",
+        "&&",
+        "${workspaceRoot}\\tools\\buildspark.cmd"
+      ],
+      "group": {
+        "kind": "build",
+        "isDefault": true
+      },
+      "presentation": {
+        "echo": true,
+        "reveal": "always",
+        "focus": false,
+        "panel": "new",
+        "showReuseMessage": false,
+        "clear": false,
+        "close": false
+      }
+    },
+
+    {
+      "label": "Run Spark Client",
+      "type": "process",
+      "command": "${workspaceRoot}\\build\\Debug\\bin\\net6.0-windows\\Spark.exe",
+      "presentation": {
+        "echo": true,
+        "reveal": "always",
+        "focus": false,
+        "panel": "shared",
+        "showReuseMessage": true,
+        "clear": false
+      },
+      "problemMatcher": []
+    }
+  ]
+}
@@ -1 +0,0 @@
-set(sources /home/taha/spark/doc/user/build.sh;content/_index.md;content/bts_spark/Glossary/_index.md;content/bts_spark/Help/_index.md;content/bts_spark/Help/about_spark.png;content/bts_spark/Help/image39.png;content/bts_spark/Help/image58.png;content/bts_spark/Launcher/_index.md;content/bts_spark/Launcher/image38.png;content/bts_spark/Launcher/image68.png;content/bts_spark/Logging-In-to-the-System/_index.md;content/bts_spark/Logging-In-to-the-System/image3.png;content/bts_spark/Logging-In-to-the-System/image64.png;content/bts_spark/Market/_index.md;content/bts_spark/Market/change_securities.png;content/bts_spark/Market/image11.png;content/bts_spark/Market/image14.png;content/bts_spark/Market/image20.png;content/bts_spark/Market/image21.png;content/bts_spark/Market/image23.png;content/bts_spark/Market/image24.png;content/bts_spark/Market/image34.png;content/bts_spark/Market/image49.png;content/bts_spark/Market/image53.png;content/bts_spark/Market/image66.png;content/bts_spark/Market/image69.png;content/bts_spark/Market/market_view.png;content/bts_spark/Market/settings_icon.png;content/bts_spark/Market/time_and_sales.png;content/bts_spark/My-Windows/_index.md;content/bts_spark/My-Windows/image15.png;content/bts_spark/My-Windows/image16.png;content/bts_spark/My-Windows/image37.png;content/bts_spark/Settings/_index.md;content/bts_spark/Settings/image51.png;content/bts_spark/Settings/image9.png;content/bts_spark/Spreader/_index.md;content/bts_spark/Spreader/image10.png;content/bts_spark/Spreader/image13.png;content/bts_spark/Spreader/image18.png;content/bts_spark/Spreader/image19.png;content/bts_spark/Spreader/image28.png;content/bts_spark/Spreader/image29.png;content/bts_spark/Spreader/image31.png;content/bts_spark/Spreader/image35.png;content/bts_spark/Spreader/image40.png;content/bts_spark/Spreader/image43.png;content/bts_spark/Spreader/image54.png;content/bts_spark/Spreader/image55.png;content/bts_spark/Spreader/image56.png;content/bts_spark/Spreader/image6.png;content/bts_spark/Spreader/image7.png;content/bts_spark/Spreader/image70.png;content/bts_spark/Spreader/image72.png;content/bts_spark/Spreader/image8.png;content/bts_spark/Trading/OrderTypes/index.md;content/bts_spark/Trading/_index.md;content/bts_spark/Trading/algo_studio.png;content/bts_spark/Trading/collapse_all_icon.png;content/bts_spark/Trading/cover_algo_control.png;content/bts_spark/Trading/expand_all_icon.png;content/bts_spark/Trading/image1.png;content/bts_spark/Trading/image17.png;content/bts_spark/Trading/image2.png;content/bts_spark/Trading/image25.png;content/bts_spark/Trading/image27.png;content/bts_spark/Trading/image33.png;content/bts_spark/Trading/image42.png;content/bts_spark/Trading/image44.png;content/bts_spark/Trading/image47.png;content/bts_spark/Trading/image48.png;content/bts_spark/Trading/image5.png;content/bts_spark/Trading/image50.png;content/bts_spark/Trading/image52.png;content/bts_spark/Trading/image57.png;content/bts_spark/Trading/image59.png;content/bts_spark/Trading/image60.png;content/bts_spark/Trading/image61.png;content/bts_spark/Trading/image62.png;content/bts_spark/Trading/image73.png;content/bts_spark/Trading/image74.png;content/bts_spark/Trading/join_algo_control.png;content/bts_spark/Trading/ladder.png;content/bts_spark/Trading/ladder_badges.png;content/bts_spark/Trading/ladder_main_part.png;content/bts_spark/Trading/lean_algo_control.png;content/bts_spark/Trading/mini_orderbook.png;content/bts_spark/Trading/oco_algo_control.png;content/bts_spark/Trading/offset_algo_control.png;content/bts_spark/Trading/pnl_calculation.png;content/bts_spark/Trading/pnl_window.png;content/bts_spark/Trading/recreate_icon.png;content/bts_spark/Trading/settings_icon.png;content/bts_spark/Trading/spark_menu_order_book.png;content/bts_spark/Trading/top_algo_control.png;content/bts_spark/Trading/trigger_algo_control.png;content/bts_spark/_index.md;content/release_notes/_index.md;content/system_requirements/_index.md;static/book.js;static/favicon.ico;static/image.js;templates/index.html;templates/page.html;templates/section.html;templates/shortcodes/back_button.html)
@@ -1,8 +1,8 @@
 cmake_minimum_required(VERSION 3.5)
 project(doc)

-include(${CMAKE_SOURCE_DIR}/tools/safe_dep_glob.cmake)
-include(${CMAKE_SOURCE_DIR}/tools/Protobuf.cmake)
+include(${CMAKE_SOURCE_DIR}/cmake/safe_dep_glob.cmake)
+include(${CMAKE_SOURCE_DIR}/cmake/Protobuf.cmake)

 # DEPENDENCIES
 set(DOC_GLOBS
@@ -0,0 +1,103 @@
+FROM ubuntu:22.10
+
+RUN \
+    apt-get update \
+    && DEBIAN_FRONTEND=noninteractive apt-get install -y \
+    clang-13 \
+    clang-format-13 \
+    clangd-13 \
+    clang-15 \
+    clang-format-15 \
+    clangd-15 \
+    cmake \
+    curl \
+    dotnet7 \
+    fish \
+    g++-11 \
+    g++-12 \
+    gnupg \
+    liblttng-ust-dev \
+    libssh2-1-dev \
+    libpcap0.8-dev \
+    locales \
+    ninja-build \
+    nodejs \
+    npm \
+    openssh-server \
+    python3-pip \
+    python3-venv \
+    rapidjson-dev \
+    software-properties-common \
+    sqlite3 \
+    sudo \
+    tar \
+    vim \
+    wget
+
+# this is done here so that ccache sees clang++ installed, not clang-10
+RUN \
+    apt-get update \
+    && DEBIAN_FRONTEND=noninteractive apt-get install -y ccache 
+
+# emumba deps
+RUN \
+    apt-get update \
+    && DEBIAN_FRONTEND=noninteractive apt-get install -y \
+    tzdata \
+    build-essential \
+    cmake-curses-gui \
+    git-all \
+    doxygen \
+    python3-sphinx \
+    graphviz \
+    libgtest-dev \
+    libssl-dev \
+    libboost-filesystem-dev \
+    libboost-program-options-dev \
+    libboost-test-dev \
+    libboost-date-time-dev \
+    zlib1g-dev \
+    netcat-traditional \
+    net-tools \
+    gdb gdbserver \
+    pkg-config
+
+# set up default executables (update-alternatives)
+RUN \
+    update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-13 100; \
+    update-alternatives --install /usr/bin/clang clang /usr/bin/clang-13 100; \
+    update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-13 100; \
+    update-alternatives --install /usr/bin/clangd clangd /usr/bin/clangd-13 100; \
+    update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-11 100; \
+    update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11 100
+
+# Add compiler symlinks for ccache 
+RUN \
+    ln -s /usr/bin/ccache /usr/local/bin/clang; \
+    ln -s /usr/bin/ccache /usr/local/bin/clang++; \
+    ln -s /usr/bin/ccache /usr/local/bin/clang-13; \
+    ln -s /usr/bin/ccache /usr/local/bin/clang++-13; \
+    ln -s /usr/bin/ccache /usr/local/bin/clang-15; \
+    ln -s /usr/bin/ccache /usr/local/bin/clang++-15; \
+    ln -s /usr/bin/ccache /usr/local/bin/gcc; \
+    ln -s /usr/bin/ccache /usr/local/bin/g++; \
+    ln -s /usr/bin/ccache /usr/local/bin/gcc-11; \
+    ln -s /usr/bin/ccache /usr/local/bin/g++-11; \
+    ln -s /usr/bin/ccache /usr/local/bin/gcc-12; \
+    ln -s /usr/bin/ccache /usr/local/bin/g++-12
+
+RUN locale-gen en_US.UTF-8
+
+ARG docker_user="bts"
+ARG docker_uid="1000"
+ARG docker_pass="bts"
+
+RUN \
+    groupadd -g "$docker_uid" "$docker_user" \
+    && useradd \
+    -m \
+    -u "$docker_uid" \
+    -g "$docker_uid" \
+    -G sudo \
+    --password "$(openssl passwd -1 "$docker_pass")" \
+    "$docker_user"
@@ -0,0 +1,64 @@
+[dev containers]: https://code.visualstudio.com/docs/devcontainers/containers
+[dev containers ext]: https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-containers
+[docker repo sparkd-dev]: https://hub.docker.com/repository/docker/bluetradingsystems/sparkd-dev/general
+# Sparkd Dev Container
+## How to create a VS Code [Dev Container][dev containers]
+
+1. Make sure the **[Dev Containers][dev containers ext]** extension is installed
+1. Make sure your Docker image is up to date
+   ```
+   docker pull bluetradingsystems/sparkd-dev:latest
+   ```
+1. Copy **devcontainer.json** from this folder to **$workspaceFolder/.devcontainer/**.
+
+1. In the VS Code Command Palette, run **Dev Containers: Reopen in Container**
+
+---
+## How to create a Sparkd Container in the terminal (without VS Code)
+
+1. Make sure your Docker image is up to date
+   ```
+   docker pull bluetradingsystems/sparkd-dev:latest
+   ```
+2. Start the container
+   ```
+   # Replace <cont_name> with a name for the container. The container's
+   # "$HOME" dir will be mounted to "$HOME/.sparkd-dev/mounts/<cont_name> on
+   # the host
+   
+   ./start_docker.sh --container <cont_name> --mount-existing
+   ```
+   * *Replace <cont_name> with a name for the container*
+   * *The container's `$HOME` dir will be mounted to
+   `$HOME/.sparkd-dev/mounts<cont_name>` on the host*<br>
+   * *Run: `./start_docker.sh --help` to see additional options*
+3. *(Optional) Attach VS Code to the running container.*<br>
+Run **Dev Containers: Attach to Running Container** from the command palette,
+then select your container in the dropdown
+
+---
+## How to update the Docker image
+
+1. Change the image by modifying the Dockerfile (don't tag arbitrary
+  images on your machine and push them to our repo on Docker Hub)
+
+1. After modifying the Dockerfile, (re)build the image
+   ```
+   # Run in this dir
+   docker build -t bluetradingsystems/sparkd-dev:latest .
+   ```
+   ***Note:** Your docker login must have write permissions to push to the
+   [sparkd-dev][docker repo sparkd-dev] repository*
+
+2. Commit the changes to Dockerfile in git
+
+3. Push the new image to Docker Hub
+
+   ```
+   docker push johncolvin/bluetradingsystems:sparkd-dev
+   ```
+   ***Note:** The image doesn't have to be on Docker Hub, we can simply build
+   it from scratch on our local machines (with the Dockerfile). However, this
+   takes time. It is significantly quicker to download a prebuilt image, so we
+   store it on a remote repository to save time when setting up a new dev
+   machine.*
@@ -0,0 +1,119 @@
+# ~/.bashrc: executed by bash(1) for non-login shells.
+# see /usr/share/doc/bash/examples/startup-files (in the package bash-doc)
+# for examples
+
+# If not running interactively, don't do anything
+case $- in
+    *i*) ;;
+      *) return;;
+esac
+
+# don't put duplicate lines or lines starting with space in the history.
+# See bash(1) for more options
+HISTCONTROL=ignoreboth
+
+# append to the history file, don't overwrite it
+shopt -s histappend
+
+# for setting history length see HISTSIZE and HISTFILESIZE in bash(1)
+HISTSIZE=1000
+HISTFILESIZE=2000
+
+# check the window size after each command and, if necessary,
+# update the values of LINES and COLUMNS.
+shopt -s checkwinsize
+
+# If set, the pattern "**" used in a pathname expansion context will
+# match all files and zero or more directories and subdirectories.
+#shopt -s globstar
+
+# make less more friendly for non-text input files, see lesspipe(1)
+[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)"
+
+# set variable identifying the chroot you work in (used in the prompt below)
+if [ -z "${debian_chroot:-}" ] && [ -r /etc/debian_chroot ]; then
+    debian_chroot=$(cat /etc/debian_chroot)
+fi
+
+# set a fancy prompt (non-color, unless we know we "want" color)
+case "$TERM" in
+    xterm-color|*-256color) color_prompt=yes;;
+esac
+
+# uncomment for a colored prompt, if the terminal has the capability; turned
+# off by default to not distract the user: the focus in a terminal window
+# should be on the output of commands, not on the prompt
+#force_color_prompt=yes
+
+if [ -n "$force_color_prompt" ]; then
+    if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then
+	# We have color support; assume it's compliant with Ecma-48
+	# (ISO/IEC-6429). (Lack of such support is extremely rare, and such
+	# a case would tend to support setf rather than setaf.)
+	color_prompt=yes
+    else
+	color_prompt=
+    fi
+fi
+
+if [ "$color_prompt" = yes ]; then
+    PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ '
+else
+    PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ '
+fi
+unset color_prompt force_color_prompt
+
+# If this is an xterm set the title to user@host:dir
+case "$TERM" in
+xterm*|rxvt*)
+    PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\u@\h: \w\a\]$PS1"
+    ;;
+*)
+    ;;
+esac
+
+# enable color support of ls and also add handy aliases
+if [ -x /usr/bin/dircolors ]; then
+    test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
+    alias ls='ls --color=auto'
+    #alias dir='dir --color=auto'
+    #alias vdir='vdir --color=auto'
+
+    alias grep='grep --color=auto'
+    alias fgrep='fgrep --color=auto'
+    alias egrep='egrep --color=auto'
+fi
+
+# colored GCC warnings and errors
+#export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01'
+
+# some more ls aliases
+alias ll='ls -alF'
+alias la='ls -A'
+alias l='ls -CF'
+
+# Add an "alert" alias for long running commands.  Use like so:
+#   sleep 10; alert
+alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"'
+
+# Alias definitions.
+# You may want to put all your additions into a separate file like
+# ~/.bash_aliases, instead of adding them here directly.
+# See /usr/share/doc/bash-doc/examples in the bash-doc package.
+
+if [ -f ~/.bash_aliases ]; then
+    . ~/.bash_aliases
+fi
+
+# enable programmable completion features (you don't need to enable
+# this, if it's already enabled in /etc/bash.bashrc and /etc/profile
+# sources /etc/bash.bashrc).
+if ! shopt -oq posix; then
+  if [ -f /usr/share/bash-completion/bash_completion ]; then
+    . /usr/share/bash-completion/bash_completion
+  elif [ -f /etc/bash_completion ]; then
+    . /etc/bash_completion
+  fi
+fi
+
+export PATH="$HOME/.local/bin:$PATH"
@@ -0,0 +1,22 @@
+set fish_config_home $XDG_CONFIG_HOME/fish
+if test -f "$fish_config_home/aliases.fish"
+    source "$fish_config_home/aliases.fish"
+end
+# enable general colors and case insensitive search in 'less'
+set -x LESS "$LESS -R -Q -I"
+set -x LC_ALL en_US.UTF-8
+# enable syntax highlighting in 'less'
+# set highlight color scheme in 'less' (fg)(bg)
+set -g LESS_TERMCAP_md (tput bold)(tput setaf 36)
+set -g LESS_TERMCAP_me (tput sgr0)
+set -g LESS_TERMCAP_so (tput setaf 232)(tput setab 49)
+
+set -q TERM
+if test $status != 0; or test $TERM = 'xterm'
+    set -g TERM 'xterm-256color'
+end
+
+# Fix impossible-to-see navy blue command text color
+set fish_color_command F8F8F2
+
+set -g PATH "$HOME/.local/bin" "$PATH"
@@ -0,0 +1,26 @@
+{
+  "image": "bluetradingsystems/sparkd-dev:latest",
+  "initializeCommand": "${localWorkspaceFolder}/docker/sparkd/dev/devcontainer_initialize.sh",
+  "postCreateCommand": "/home/bts/spark/docker/sparkd/dev/devcontainer_post_create.sh",
+  "containerUser": "bts",
+  "workspaceMount": "source=${localWorkspaceFolder},target=/home/bts/spark,type=bind",
+  "workspaceFolder": "/home/bts/spark",
+  "updateRemoteUserUID": true,
+  "shutdownAction": "none",
+  // Note: If running multiple containers on the same host, each must use a
+  // unique set of ports. Usually we just add 1000 to each port as needed. For
+  // example, if 8000-8003 is taken, go with 9000-9003, then 10000-10003, etc.
+  "runArgs": [
+    "-p",
+    "8000:8000",
+    "-p",
+    "8001:8001",
+    "-p",
+    "8002:8002",
+    "-p",
+    "8003:8003"
+  ],
+  "mounts": [
+    "source=${localEnv:HOME}/.sparkd-dev/mounts/sparkd-dev,target=/home/bts,type=bind"
+  ]
+}
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+mkdir -p "$HOME/.sparkd-dev/mounts/sparkd-dev"
@@ -0,0 +1,33 @@
+#!/usr/bin/env bash
+
+this_dir="$(realpath "$(dirname "${BASH_SOURCE[0]}")")"
+repo_dir="$(cd "$this_dir" && git rev-parse --show-toplevel)"
+tools_dir="$repo_dir/tools"
+gen_tag="GENERATED BY $(basename "${BASH_SOURCE[0]}")"
+
+function copy_if_not_exist() {
+  src="$1"
+  dest="$2"
+  if [[ ! -e "$src" ]]; then
+    echo "Unable to copy $src to $dest. Source file doesn't exist"
+    exit 1
+  fi
+  if [[ ! -e "$dest" ]]; then
+    cp "$src" "$dest"
+  fi
+}
+
+# Init bashrc
+echo "Initializing bashrc"
+copy_if_not_exist "$this_dir/bashrc" "$HOME/.bashrc"
+
+# Init fish config
+echo "Initializing fish config"
+fish_cfg_dir="$HOME/.config/fish/"
+mkdir -p "$fish_cfg_dir"
+exec "$tools_dir/write_tag_block.sh" \
+  --tag "$gen_tag" \
+  --replace \
+  --in-place \
+  --file "$fish_cfg_dir/config.fish" \
+  --text "$(cat "$this_dir/config.fish")"
@@ -0,0 +1,250 @@
+#!/usr/bin/env bash
+
+function _exit() {
+  if [[ "$#" -gt 1 ]]; then
+    # When there are multiple args, the last arg is the exit code.
+    echo "${@:1:($# - 1)}"
+    exit "${@: -1}"
+  fi
+  echo "$1"
+  exit 0
+}
+
+help_text="\
+Add or update a user's uid
+
+This script is intended to be run in a Docker container as a means to obtain
+file permissions in mounted directories owned by the specified UID.
+
+Usage: set_user.sh [OPTIONS] USER UID
+
+Positionals:
+  USER               The name of the user
+
+Options:
+  --user USER        The name of the user (defaults to 'bts')
+  --uid UID          The new uid to give USER (defaults to '1000')
+  --group GROUP      The primary group to give USER (defaults to USER)
+  --gid GID          The primary gid to give USER (defaults to UID)
+  --pass PASSWORD    The password to give USER (defaults to USER, only applies
+                     if USER hasn't been created yet) 
+  --modify-existing  Update UID/GID even if USER already exists
+  -h,--help          Print this help message and exit
+
+"
+
+function _add_group() {
+  if [[ "$#" -ne 2 ]]; then
+    _exit "'_add_group' requires exactly 2 args (group, gid). Received $#." 1
+  fi
+  local group="$1"
+  local gid="$2"
+  # Check if gid already exists
+  local existing_group=""
+  existing_group="$(getent group "$gid" | cut -d : -f 1)"
+  if [[ -n "$existing_group" ]]; then
+    if [[ "$existing_group" != "$group" ]]; then
+      echo "\
+The gid '$gid' is already in use by group '$existing_group' (will not rename \
+the group)"
+    fi
+    return
+  fi
+
+  # Check if group with same name already exists
+  local existing_gid=""
+  existing_gid="$(getent group "$group" | cut -d : -f 3)"
+  if [[ -n "$existing_gid" ]]; then
+    # The group already exists. Only modify if --modify-existing was specified.
+    if [[ "$modify_existing" -eq 0 ]]; then
+      _exit "\
+The group '$group' already exists with gid '$existing_gid'.
+Specify --modify-existing to change the gid anyways." 1
+    fi
+    echo "Changing gid for group '$group' from '$existing_gid' to '$gid'"
+    groupmod -g "$gid" "$group"
+  else
+    # The group doesn't exist. Add it
+    echo "Adding group '$group:$gid'"
+    groupadd -g "$gid" "$group"
+  fi
+}
+
+function _add_user() {
+  local user="$1"
+  local uid="$2"
+  local group="$3"
+  local gid="$4"
+  local pass="$5"
+  if [[ "$#" -ne 5 ]]; then
+    _exit "'_add_user' requires exactly 5 args (user, uid, group, gid, pass). \
+Received $#." 1
+  fi
+
+  # Check if uid is being used by another user
+  local existing_user=""
+  existing_user="$(getent passwd "$uid" | cut -d : -f 1)"
+  if [[ -n "$existing_user" ]]; then
+    if [[ "$existing_user" != "$user" ]]; then
+      _exit "The uid '$uid' is already in use by user '$existing_user'." 1
+    fi
+
+    echo "The user '$user' already has the specified uid '$uid'."
+    # Modify gid if necessary
+    local existing_gid=""
+    existing_gid="$(id -g "$user" 2> /dev/null)"
+    if [[ "$existing_gid" = "$gid" ]]; then
+      echo "The user '$user' already has the specified gid '$gid'."
+      return
+    fi
+
+    if [[ "$modify_existing" -eq 0 ]]; then
+      _exit "\
+The user '$user' is associated with the primary group '$existing_gid'.
+Specify --modify-existing to change the gid anyways." 1
+    fi
+
+    echo "Changing primary group for '$user' from '$existing_gid' to '$gid'."
+    usermod -g "$gid" "$user"
+    return
+  fi
+
+  # Check if user with same name already exists
+  local existing_uid=""
+  existing_uid="$(id -u "$user" 2> /dev/null)"
+  if [[ -n "$existing_uid" ]]; then
+    if [[ "$existing_uid" = "$uid" ]]; then
+      _exit "The user '$user' already has the specified uid '$uid'" 0
+    fi
+
+    if [[ "$modify_existing" -eq 0 ]]; then
+      _exit "\
+User '$user' already exists with uid '$existing_uid'.
+Specify --modify-existing to change the uid anyways." 1
+    fi
+
+    echo "Changing uid for user '$user' from '$existing_uid' to '$uid'"
+    if ! usermod -u "$uid" -g "$gid" "$user"; then
+      _exit "usermod exited with code $?" 1
+    fi
+    return
+  fi
+
+  # The user doesn't exist. Add it
+  echo "Adding user '$user:$uid' (group='$group:$gid', password='$pass')"
+  useradd -m -u "$uid" -g "$gid" -G sudo --password "$(openssl passwd -1 "$pass")" "$user"
+}
+
+function _update_fish_dir_perms() {
+  local user="$1"
+  local uid="$2"
+  local gid="$3"
+  # When a fish shell session starts, a temp dir named '/tmp/fish.<user>' is
+  # created with the user's current uid/gid. If such a dir exists for the
+  # specified USER, make sure the uid/gid match the new values.
+  fish_dir="/tmp/fish.$user"
+  if [[ -d "$fish_dir" ]]; then
+    perms="$uid:$gid"
+    existing_perms="$(stat -c %u:%g "$fish_dir")"
+    if [[ "$existing_perms" != "$perms" ]]; then
+      echo "Changing uid:gid for dir '$fish_dir' from '$existing_perms' to '$perms'"
+      chown -R "$perms" "$fish_dir"
+    fi
+  fi
+}
+
+user=""
+group=""
+pass=""
+declare -i uid=0
+declare -i gid=0
+declare -i modify_existing=0
+
+while [[ $# -gt 0 ]]; do
+  case "$1" in
+    --user)
+      if [[ -z "$2" ]]; then
+        _exit "USER (--user) must be non-empty" 1
+      elif [[ "$2" = "root" ]]; then
+        _exit "USER (--user) cannot be 'root'" 1
+      fi
+      user="$2"
+      shift 2
+      ;;
+    --group)
+      if [[ -z "$2" ]]; then
+        _exit "GROUP (--group) must be non-empty" 1
+      elif [[ "$2" = "root" ]]; then
+        _exit "GROUP (--group) cannot be 'root'" 1
+      fi
+      group="$2"
+      shift 2
+      ;;
+    --uid)
+      if [[ -z "$2" ]]; then
+        _exit "UID (--uid) must be non-empty" 1
+      fi
+      uid="$2"
+      shift 2
+      ;;
+    --gid)
+      if [[ -z "$2" ]]; then
+        _exit "GID (--gid) must be non-empty" 1
+      fi
+      gid="$2"
+      shift 2
+      ;;
+    --pass)
+      if [[ -z "$2" ]]; then
+        _exit "PASS (--pass) must be non-empty" 1
+      fi
+      pass="$2"
+      shift 2
+      ;;
+    --modify-existing)
+      modify_existing=1
+      shift 1
+      ;;
+    -h)
+      ;&
+    --help)
+      _exit "$help_text" 0
+      ;;
+    *)
+      if [[ -z "$1" ]]; then
+        _exit "Invalid positional argument '$1'" 1
+      elif [[ -z "$user" ]]; then
+        user="$1"
+      elif [[ -z "$uid" ]]; then
+        uid="$1"
+      else
+        _exit "Unexpected argument '$1'" 1
+      fi
+      shift 1
+      ;;
+  esac
+done
+
+if [[ -z "$user" ]]; then
+  user="bts"
+fi
+
+if [[ $uid -eq 0 ]]; then
+  uid=1000
+fi
+
+# In general, a user's primary group/gid matches the user's name/uid.
+# If group/gid args weren't specified, set them to name/uid.
+if [[ -z "$group" ]]; then
+  group="$user"
+fi
+if [[ $gid -eq 0 ]]; then
+  gid=$uid
+fi
+if [[ -z "$pass" ]]; then
+  pass="$user"
+fi
+
+_add_group "$group" "$gid"
+_add_user "$user" "$uid" "$group" "$gid" "$pass"
+_update_fish_dir_perms "$user" "$uid" "$gid"
@@ -0,0 +1,230 @@
+#!/usr/bin/env bash
+
+function _exit() {
+  if [[ "$#" -gt 1 ]]; then
+    # When there are multiple args, the last arg is the exit code.
+    echo "${@:1:($# - 1)}"
+    exit "${@: -1}"
+  fi
+  echo "$1"
+  exit 0
+}
+
+help_text="\
+Start a docker dev container
+Usage: start_docker.sh [OPTIONS] image container
+
+Positionals:
+  image             The image to instantiate
+  container         The name for the container
+
+Options:
+  -u,--user USER      The user to add in the container (defaults to 'bts')
+  -p,--pass PASS      The password for USER in the container (defaults to USER)
+  -i,--image IMAGE    The image to instantiate (defaults to 'bluetradingsystems/sparkd-dev:latest')
+  -c,--container CONT The name for the container
+  -m,--mount MOUNT    The name for the folder (outside the container) to create/mount to the home
+                      directory in the container. Mount folders are added here: $mount_prefix
+  --mount-existing    Mount the specified dir even if it already exists
+  --port <cont_port>:<host_port> OR [<cont_port>:<host_port>,...] Port mapping(s). May be
+                      specified multiple times.
+  -h,--help           Print this help message and exit
+
+"
+
+mount_prefix="$HOME/.sparkd-dev/mounts"
+declare docker_user=""
+declare docker_pass=""
+declare image_name=""
+declare cont_name=""
+declare mount_name=""
+declare -i mount_existing=0
+declare -a port_mappings=()
+
+while [[ $# -gt 0 ]]; do
+  case "$1" in
+    -u)
+      ;&
+    --user)
+      if [[ -z "$2" ]]; then
+        _exit "User (-u,--user) must be non-empty" 1
+      fi
+      docker_user="$2"
+      shift 2
+      ;;
+    -p)
+      ;&
+    --pass)
+      if [[ -z "$2" ]]; then
+        _exit "Password (-p,--pass) must be non-empty" 1
+      fi
+      docker_pass="$2"
+      shift 2
+      ;;
+    -i)
+      ;&
+    --image)
+      if [[ -n "$image_name" ]]; then
+        _exit "Unexpected argument '$1'" 1
+      elif [[ -z "$2" ]]; then
+        _exit "Image (-i,--image) must be non-empty" 1
+      fi
+      image_name="$2"
+      shift 2
+      ;;
+    -c)
+      ;&
+    --container)
+      if [[ -n "$cont_name" ]]; then
+        _exit "Unexpected argument '$1'" 1
+      elif [[ -z "$2" ]]; then
+        _exit "Container (-c,--container) must be non-empty" 1
+      fi
+      cont_name="$2"
+      shift 2
+      ;;
+    --port)
+      # Parse port(s) arg, and append the result to 'port_mappings'
+      # Note: port(s) may be specified in bracketed notation:
+      #   [a:b,c:d,...,y:z]
+      next_ports="$(echo "$2" | sed -e 's/\[//g' -e 's/\]//g' -e 's/,/ /g')"
+      if [[ "${#port_mappings[@]}" -gt 0 ]]; then
+        next_ports=" $next_ports"
+      fi
+      port_mappings+=("$next_ports")
+      shift 2
+      ;;
+    -m)
+      ;&
+    --mount)
+      if [[ -z "$2" ]]; then
+        echo "Mount (-m,--mount) must be non-empty"
+      fi
+      mount_name="$2"
+      shift 2
+      ;;
+    --mount-existing)
+      mount_existing=1
+      shift 1
+      ;;
+    -h)
+      ;&
+    --help)
+      _exit "$help_text" 0
+      ;;
+    *)
+      if [[ -z "$1" ]]; then
+        _exit "Invalid positional argument '$1'" "$help_text" 1
+      elif [[ -z "$image_name" ]]; then
+        image_name="$1"
+      elif [[ -z "$cont_name" ]]; then
+        cont_name="$1"
+      else
+        _exit "Unexpected argument '$1'" "$help_text" 1
+      fi
+      shift 1
+      ;;
+  esac
+done
+
+
+if [[ -z "$image_name" ]]; then
+  image_name="bluetradingsystems/sparkd-dev:latest"
+fi
+
+host_name="$(hostname)"
+if [[ -n "$cont_name" ]]; then
+  host_name="$host_name.$cont_name"
+fi
+
+if [[ -z "$mount_name" ]]; then
+  mount_name="$cont_name"
+fi
+
+if [[ -z "$mount_name" && -z "$cont_name" ]]; then
+  _exit "Please specify mount (-m,--mount) and/or container (-c,--container)" 1
+fi
+
+if [[ -z "$docker_user" ]]; then
+  docker_user="bts"
+fi
+
+if [[ "$docker_user" = "root" ]]; then
+  _exit "USER (--user) cannot be 'root'" 1
+fi
+
+cont_home="/home/$docker_user"
+home_src="$mount_prefix/$mount_name"
+home_tgt="$cont_home"
+this_dir="$(dirname "$(realpath "${BASH_SOURCE[0]}")")"
+repo_src="$(cd "$this_dir" && git rev-parse --show-toplevel)"
+repo_tgt="$cont_home/spark"
+working_dir="$cont_home"
+
+if [[ $mount_existing -eq 0 && -e "$home_src" ]]; then
+  # Don't overwrite existing dir (might be mounted in another container)
+  _exit "Mount dir '$home_src' already exists (use --mount-existing to mount \
+an existing directory)" 1
+fi
+
+mkdir -p "$home_src"
+
+if [[ "${#port_mappings[@]}" -eq 0 ]]; then
+  port_mappings=("8000:8000" "8001:8001" "8002:8002" "8003:8003")
+fi
+
+# Adapt port_mappings into args for `docker run` by prepending "-p " to each
+# item
+declare -a docker_port_args=()
+for port_mapping in "${port_mappings[@]}"; do
+  docker_port_args+=("-p $port_mapping")
+done
+
+echo "Starting container '$cont_name'
+image_name  : $image_name
+cont_name   : $cont_name
+home_src    : $home_src
+home_tgt    : $home_tgt
+repo_src    : $repo_src
+repo_tgt    : $repo_tgt
+working dir : $working_dir
+ports       : ${port_mappings[*]}
+"
+
+# DON'T wrap $docker_port_args in quotes. We want bash to split args by
+# whitespace
+docker run \
+  --net bridge \
+  -h "$host_name" \
+  -e "TZ=America/New_York" \
+  --cap-add=SYS_PTRACE \
+  --security-opt seccomp=unconfined \
+  --name "$cont_name" \
+  -v "$home_src:$home_tgt" \
+  -v "$repo_src:$repo_tgt" \
+  -w "$working_dir" \
+  ${docker_port_args[*]} \
+  --shm-size=4024m \
+  -t \
+  -i \
+  -d \
+  -e DISPLAY="$DISPLAY" \
+  "$image_name"
+
+# Add user w/ same uid and gid as the current user outside of docker, so the
+# user inside the docker has file permissions in the mounted dir.
+docker_group="$docker_user"
+docker_uid="$(id -u "$USER")"
+docker_gid="$(id -g "$USER")"
+if [[ -z "$docker_pass" ]]; then
+  docker_pass="$docker_user"
+fi
+docker exec -u root -it "$cont_name" "$repo_tgt/docker/sparkd/dev/set_user.sh" \
+--user "$docker_user" \
+--uid "$docker_uid" \
+--group "$docker_group" \
+--gid "$docker_gid" \
+--pass "$docker_pass"
+
+# Run same script VS Code runs to initialize the container
+docker exec -u "$docker_user" -it "$cont_name" "$repo_tgt/docker/sparkd/dev/devcontainer_post_create.sh"
@@ -0,0 +1,64 @@
+#!/usr/bin/env bash
+
+function print_help_and_exit() {
+  cat <<EOF
+Open a shell inside the docker container
+Usage: docker_shell.sh [OPTIONS] [CONTAINER]
+
+Options:
+  -u,--user         The user to login with in the container (defaults to the current user)
+  -c,--container    The container name (may also be specified as positional arg)
+  -h,--help         Print this help message and exit
+
+EOF
+  exit "$1"
+}
+
+
+declare docker_user=""
+declare cont_name=""
+
+while [[ $# -gt 0 ]]; do
+  case "$1" in
+    -u)
+      ;&
+    --user)
+      if [[ -z "$2" ]]; then
+        echo "User (-u,--user) must be non-empty"
+        print_help_and_exit 1
+      fi
+      docker_user="$2"
+      shift 2
+      ;;
+    -h)
+      ;&
+    --help)
+      print_help_and_exit 0
+      ;;
+    -c)
+      ;&
+    --container)
+      shift 1
+      ;&
+    *)
+      if [[ ! -z "$cont_name" ]]; then
+        echo "Unexpected argument '$1'"
+        print_help_and_exit 1
+      fi
+      cont_name="$1"
+      shift 1
+      ;;
+  esac
+done
+
+
+if [[ -z "$cont_name" ]]; then
+  echo "Please specify the container ([-c,--container])"
+  print_help_and_exit 1
+fi
+
+if [[ -z "$docker_user" ]]; then
+  docker_user="$USER"
+fi
+
+docker exec -u "$docker_user" -it "$cont_name" bash
@@ -0,0 +1,233 @@
+#!/usr/bin/env bash
+
+mount_prefix="$HOME/.spark-dev/mounts"
+
+function print_help_and_exit() {
+  cat <<EOF
+Start a docker dev container
+Usage: start_docker.sh [OPTIONS] image container
+
+Positionals:
+  image             The image to instantiate
+  container         The name for the container
+
+Options:
+  -u,--user USER      The user to add in the container (defaults to the current user)
+  -p,--pass PASS      The password for USER in the container (defaults to USER)
+  -i,--image IMAGE    The image to instantiate
+  -c,--container CONT The name for the container
+  -m,--mount MOUNT    The name for the folder (outside the container) to create/mount to the home
+                      directory in the container. Mount folders are added here: $mount_prefix
+  --mount-existing    Mount the specified dir even if it already exists
+  --port <cont_port>:<host_port> OR [<cont_port>:<host_port>,...] Port mapping(s). May be
+                      specified multiple times.
+  -h,--help           Print this help message and exit
+
+EOF
+  exit "$1"
+}
+
+
+declare docker_user=""
+declare docker_pass=""
+declare image_name=""
+declare cont_name=""
+declare mount_name=""
+declare -i mount_existing=0
+declare -a port_mappings=()
+
+while [[ $# -gt 0 ]]; do
+  case "$1" in
+    -u)
+      ;&
+    --user)
+      if [[ -z "$2" ]]; then
+        echo "User (-u,--user) must be non-empty"
+        print_help_and_exit 1
+      fi
+      docker_user="$2"
+      shift 2
+      ;;
+    -p)
+      ;&
+    --pass)
+      if [[ -z "$2" ]]; then
+        echo "Password (-p,--pass) must be non-empty"
+        print_help_and_exit 1
+      fi
+      docker_pass="$2"
+      shift 2
+      ;;
+    -i)
+      ;&
+    --image)
+      if [[ -n "$image_name" ]]; then
+        echo "Unexpected argument '$1'"
+        print_help_and_exit 1
+      elif [[ -z "$2" ]]; then
+        echo "Image (-i,--image) must be non-empty"
+        print_help_and_exit 1
+      fi
+      image_name="$2"
+      shift 2
+      ;;
+    -c)
+      ;&
+    --container)
+      if [[ -n "$cont_name" ]]; then
+        echo "Unexpected argument '$1'"
+        print_help_and_exit 1
+      elif [[ -z "$2" ]]; then
+        echo "Container (-c,--container) must be non-empty"
+        print_help_and_exit 1
+      fi
+      cont_name="$2"
+      shift 2
+      ;;
+    --port)
+      # Parse port(s) arg, and append the result to 'port_mappings'
+      # Note: port(s) may be specified in bracketed notation:
+      #   [a:b,c:d,...,y:z]
+      next_ports="$(echo "$2" | sed -e 's/\[//g' -e 's/\]//g' -e 's/,/ /g')"
+      if [[ "${#port_mappings[@]}" -gt 0 ]]; then
+        next_ports=" $next_ports"
+      fi
+      port_mappings+=("$next_ports")
+      shift 2
+      ;;
+    -m)
+      ;&
+    --mount)
+      if [[ -z "$2" ]]; then
+        echo "Mount (-m,--mount) must be non-empty"
+      fi
+      mount_name="$2"
+      shift 2
+      ;;
+    --mount-existing)
+      mount_existing=1
+      shift 1
+      ;;
+    -h)
+      ;&
+    --help)
+      print_help_and_exit 0
+      ;;
+    *)
+      if [[ -z "$1" ]]; then
+        echo "Invalid positional argument '$1'"
+        print_help_and_exit 1
+      elif [[ -z "$image_name" ]]; then
+        image_name="$1"
+      elif [[ -z "$cont_name" ]]; then
+        cont_name="$1"
+      else
+        echo "Unexpected argument '$1'"
+        print_help_and_exit 1
+      fi
+      shift 1
+      ;;
+  esac
+done
+
+
+if [[ -z "$image_name" ]]; then
+  image_name="bluetradingsystems/spark-crypto-dev"
+fi
+
+host_name="$(hostname)"
+if [[ -n "$cont_name" ]]; then
+  host_name="$host_name.$cont_name"
+fi
+
+if [[ -z "$mount_name" ]]; then
+  mount_name="$cont_name"
+fi
+
+if [[ -z "$mount_name" && -z "$cont_name" ]]; then
+  echo "Please specify mount (-m,--mount) and/or container (-c,--container)"
+  print_help_and_exit 1
+fi
+
+if [[ -z "$docker_user" ]]; then
+  docker_user="$USER"
+fi
+
+home_src=$mount_prefix/$mount_name
+home_tgt=$HOME
+repo_src=$(git rev-parse --show-superproject-working-tree)
+repo_tgt=$HOME/$(basename "$repo_src")
+working_dir=$HOME
+
+if [[ $mount_existing -eq 0 && -e "$home_src" ]]; then
+  # Don't overwrite existing dir (might be mounted in another container)
+  echo "Mount dir '$home_src' already exists (use --mount-existing to mount an existing directory)"
+  print_help_and_exit 1
+fi
+
+mkdir -p "$home_src"
+
+if [[ "${#port_mappings[@]}" -eq 0 ]]; then
+  port_mappings=("8000:8000" "8001:8001" "8002:8002" "8003:8003")
+fi
+
+# Adapt port_mappings into args for `docker run` by prepending "-p " to each
+# item
+declare -a docker_port_args=()
+for port_mapping in "${port_mappings[@]}"; do
+  docker_port_args+=("-p $port_mapping")
+done
+
+echo "Starting container '$cont_name'
+image_name  : $image_name
+cont_name   : $cont_name
+home_src    : $home_src
+home_tgt    : $home_tgt
+repo_src    : $repo_src
+repo_tgt    : $repo_tgt
+working dir : $working_dir
+ports       : ${port_mappings[*]}
+"
+
+# DON'T wrap $docker_port_args in quotes. We want bash to split args by
+# whitespace
+docker run \
+  --net bridge \
+  -h "$host_name" \
+  -e "TZ=America/New_York" \
+  --cap-add=SYS_PTRACE \
+  --security-opt seccomp=unconfined \
+  --name "$cont_name" \
+  -v "$home_src:$home_tgt" \
+  -v "$repo_src:$repo_tgt" \
+  -w "$working_dir" \
+  ${docker_port_args[*]} \
+  --shm-size=4024m \
+  -t \
+  -i \
+  -d \
+  -e DISPLAY="$DISPLAY" \
+  "$image_name" \
+  bash
+
+# Add user w/ same uid and gid as the current user outside of docker, so the
+# user inside the docker has file permissions in the mounted dir.
+docker_group="$docker_user"
+docker_user_uid="$(id -u "$USER")"
+docker_user_gid="$(id -g "$USER")"
+
+echo "Adding user in container '$cont_name'
+name : $docker_user
+uid  : $docker_user_uid
+gid  : $docker_user_gid"
+
+if [[ -z "$docker_pass" ]]; then
+  docker_pass="$docker_user"
+  echo "Giving user '$docker_user' a secure password: $docker_pass"
+fi
+
+docker exec -u root -it "$cont_name" groupadd -g "$docker_user_gid" "$docker_group"
+docker exec -u root -it "$cont_name" useradd -u "$docker_user_uid" -g "$docker_user_gid" "$docker_user"
+docker exec -u root -it "$cont_name" usermod --password "$(openssl passwd -1 "$docker_pass")" "$docker_user"
+docker exec -u root -it "$cont_name" usermod -aG sudo "$docker_user"
+docker exec -u root -it "$cont_name" "$repo_tgt/externals/src/emumba/install_emumba-deribit-connector.sh"
@@ -1,6 +1,6 @@
 {
  "sdk": {
-    "version": "2.1.508",
+    "version": "6.0.200",
    "rollForward": "latestMajor"
  }
 }
@@ -6,12 +6,13 @@ isort==5.9.3
 lazy-object-proxy==1.6.0
 mccabe==0.6.1
 platformdirs==2.3.0
-protobuf==3.19.1
+protobuf==4.21.12
 pybars3==0.9.7
 pycodestyle==2.7.0
 pycparser==2.20
 pylint==2.10.2
 PyMeta3==0.5.1
+termcolor==1.1.0
 toml==0.10.2
 wrapt==1.12.1
 yapf==0.31.0
@@ -1,41 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26730.10
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sparkd", "src\server\sparkd\sparkd.vcxproj", "{BBBAFD38-312D-4A8D-9AF0-F2BDEE72CE6F}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libspark", "build\src\lib\libspark.vcxproj", "{502FD050-679A-3B50-B438-098500700919}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|x64 = Debug|x64
-		MinSizeRel|x64 = MinSizeRel|x64
-		Release|x64 = Release|x64
-		RelWithDebInfo|x64 = RelWithDebInfo|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{BBBAFD38-312D-4A8D-9AF0-F2BDEE72CE6F}.Debug|x64.ActiveCfg = Debug|x64
-		{BBBAFD38-312D-4A8D-9AF0-F2BDEE72CE6F}.Debug|x64.Build.0 = Debug|x64
-		{BBBAFD38-312D-4A8D-9AF0-F2BDEE72CE6F}.MinSizeRel|x64.ActiveCfg = Release|x64
-		{BBBAFD38-312D-4A8D-9AF0-F2BDEE72CE6F}.MinSizeRel|x64.Build.0 = Release|x64
-		{BBBAFD38-312D-4A8D-9AF0-F2BDEE72CE6F}.Release|x64.ActiveCfg = Release|x64
-		{BBBAFD38-312D-4A8D-9AF0-F2BDEE72CE6F}.Release|x64.Build.0 = Release|x64
-		{BBBAFD38-312D-4A8D-9AF0-F2BDEE72CE6F}.RelWithDebInfo|x64.ActiveCfg = Release|x64
-		{BBBAFD38-312D-4A8D-9AF0-F2BDEE72CE6F}.RelWithDebInfo|x64.Build.0 = Release|x64
-		{502FD050-679A-3B50-B438-098500700919}.Debug|x64.ActiveCfg = Debug|x64
-		{502FD050-679A-3B50-B438-098500700919}.Debug|x64.Build.0 = Debug|x64
-		{502FD050-679A-3B50-B438-098500700919}.MinSizeRel|x64.ActiveCfg = MinSizeRel|x64
-		{502FD050-679A-3B50-B438-098500700919}.MinSizeRel|x64.Build.0 = MinSizeRel|x64
-		{502FD050-679A-3B50-B438-098500700919}.Release|x64.ActiveCfg = Release|x64
-		{502FD050-679A-3B50-B438-098500700919}.Release|x64.Build.0 = Release|x64
-		{502FD050-679A-3B50-B438-098500700919}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64
-		{502FD050-679A-3B50-B438-098500700919}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {6A7249D7-B40C-4656-9347-60072D0B8FDB}
-	EndGlobalSection
-EndGlobal
@@ -1,26 +1,28 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.30114.105
+# Visual Studio Version 17
+VisualStudioVersion = 17.3.32922.545
 MinimumVisualStudioVersion = 15.0.26124.0
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "spark_api", "src\client\spark_api\spark_api.csproj", "{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libspark", "build\src\lib\libspark.vcxproj", "{9FA60215-26AF-3EB7-AB89-D4F4B126EF40}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libspark", "build\src\lib\libspark.vcxproj", "{FDC3A021-386E-3A2C-A7EB-CBE94A95BE25}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spark", "src\client\spark\Spark.csproj", "{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "sparkcmd", "src\client\sparkcmd\sparkcmd.csproj", "{387566C6-C6F6-412C-A30C-9855BBCB4816}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spark.Console", "src\client\Spark.Console\Spark.Console.csproj", "{387566C6-C6F6-412C-A30C-9855BBCB4816}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "spark_core", "src\client\spark_core\spark_core.csproj", "{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZERO_CHECK", "build\ZERO_CHECK.vcxproj", "{A1B7276B-8F81-3D58-A22E-870AF28DF9B9}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "spark_sdk", "src\client\spark_sdk\spark_sdk.csproj", "{6963C314-83C4-4667-B0D0-C2F7AE208C29}"
 	ProjectSection(ProjectDependencies) = postProject
-		{9FA60215-26AF-3EB7-AB89-D4F4B126EF40} = {9FA60215-26AF-3EB7-AB89-D4F4B126EF40}
+		{FDC3A021-386E-3A2C-A7EB-CBE94A95BE25} = {FDC3A021-386E-3A2C-A7EB-CBE94A95BE25}
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "spark_test", "src\client\spark_test\spark_test.csproj", "{ECD78CC5-138F-4809-A764-2358C2AC2E82}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "spark_websocket", "src\client\spark_websocket\spark_websocket.csproj", "{3201359D-C071-4089-9EDE-B04D759F1508}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "spark_api_server", "src\client\spark_api_server\spark_api_server.csproj", "{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x64 = Debug|x64
@@ -37,14 +39,14 @@ Global
 		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Release|x64.Build.0 = Release|x64
 		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.RelWithDebInfo|x64.ActiveCfg = Release|x64
 		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.RelWithDebInfo|x64.Build.0 = Release|x64
-		{9FA60215-26AF-3EB7-AB89-D4F4B126EF40}.Debug|x64.ActiveCfg = Debug|x64
-		{9FA60215-26AF-3EB7-AB89-D4F4B126EF40}.Debug|x64.Build.0 = Debug|x64
-		{9FA60215-26AF-3EB7-AB89-D4F4B126EF40}.MinSizeRel|x64.ActiveCfg = MinSizeRel|x64
-		{9FA60215-26AF-3EB7-AB89-D4F4B126EF40}.MinSizeRel|x64.Build.0 = MinSizeRel|x64
-		{9FA60215-26AF-3EB7-AB89-D4F4B126EF40}.Release|x64.ActiveCfg = Release|x64
-		{9FA60215-26AF-3EB7-AB89-D4F4B126EF40}.Release|x64.Build.0 = Release|x64
-		{9FA60215-26AF-3EB7-AB89-D4F4B126EF40}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64
-		{9FA60215-26AF-3EB7-AB89-D4F4B126EF40}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64
+		{FDC3A021-386E-3A2C-A7EB-CBE94A95BE25}.Debug|x64.ActiveCfg = Debug|x64
+		{FDC3A021-386E-3A2C-A7EB-CBE94A95BE25}.Debug|x64.Build.0 = Debug|x64
+		{FDC3A021-386E-3A2C-A7EB-CBE94A95BE25}.MinSizeRel|x64.ActiveCfg = MinSizeRel|x64
+		{FDC3A021-386E-3A2C-A7EB-CBE94A95BE25}.MinSizeRel|x64.Build.0 = MinSizeRel|x64
+		{FDC3A021-386E-3A2C-A7EB-CBE94A95BE25}.Release|x64.ActiveCfg = Release|x64
+		{FDC3A021-386E-3A2C-A7EB-CBE94A95BE25}.Release|x64.Build.0 = Release|x64
+		{FDC3A021-386E-3A2C-A7EB-CBE94A95BE25}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64
+		{FDC3A021-386E-3A2C-A7EB-CBE94A95BE25}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64
 		{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.Debug|x64.ActiveCfg = Debug|x64
 		{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.Debug|x64.Build.0 = Debug|x64
 		{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.MinSizeRel|x64.ActiveCfg = Release|x64
@@ -69,14 +71,6 @@ Global
 		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Release|x64.Build.0 = Release|x64
 		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.RelWithDebInfo|x64.ActiveCfg = Release|x64
 		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.RelWithDebInfo|x64.Build.0 = Release|x64
-		{A1B7276B-8F81-3D58-A22E-870AF28DF9B9}.Debug|x64.ActiveCfg = Debug|x64
-		{A1B7276B-8F81-3D58-A22E-870AF28DF9B9}.Debug|x64.Build.0 = Debug|x64
-		{A1B7276B-8F81-3D58-A22E-870AF28DF9B9}.MinSizeRel|x64.ActiveCfg = MinSizeRel|x64
-		{A1B7276B-8F81-3D58-A22E-870AF28DF9B9}.MinSizeRel|x64.Build.0 = MinSizeRel|x64
-		{A1B7276B-8F81-3D58-A22E-870AF28DF9B9}.Release|x64.ActiveCfg = Release|x64
-		{A1B7276B-8F81-3D58-A22E-870AF28DF9B9}.Release|x64.Build.0 = Release|x64
-		{A1B7276B-8F81-3D58-A22E-870AF28DF9B9}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64
-		{A1B7276B-8F81-3D58-A22E-870AF28DF9B9}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64
 		{6963C314-83C4-4667-B0D0-C2F7AE208C29}.Debug|x64.ActiveCfg = Debug|x64
 		{6963C314-83C4-4667-B0D0-C2F7AE208C29}.Debug|x64.Build.0 = Debug|x64
 		{6963C314-83C4-4667-B0D0-C2F7AE208C29}.MinSizeRel|x64.ActiveCfg = Release|x64
@@ -93,6 +87,22 @@ Global
 		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.Release|x64.Build.0 = Release|x64
 		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.RelWithDebInfo|x64.ActiveCfg = Release|x64
 		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.RelWithDebInfo|x64.Build.0 = Release|x64
+		{3201359D-C071-4089-9EDE-B04D759F1508}.Debug|x64.ActiveCfg = Debug|x64
+		{3201359D-C071-4089-9EDE-B04D759F1508}.Debug|x64.Build.0 = Debug|x64
+		{3201359D-C071-4089-9EDE-B04D759F1508}.MinSizeRel|x64.ActiveCfg = Debug|x64
+		{3201359D-C071-4089-9EDE-B04D759F1508}.MinSizeRel|x64.Build.0 = Debug|x64
+		{3201359D-C071-4089-9EDE-B04D759F1508}.Release|x64.ActiveCfg = Release|x64
+		{3201359D-C071-4089-9EDE-B04D759F1508}.Release|x64.Build.0 = Release|x64
+		{3201359D-C071-4089-9EDE-B04D759F1508}.RelWithDebInfo|x64.ActiveCfg = Release|x64
+		{3201359D-C071-4089-9EDE-B04D759F1508}.RelWithDebInfo|x64.Build.0 = Release|x64
+		{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.Debug|x64.ActiveCfg = Debug|x64
+		{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.Debug|x64.Build.0 = Debug|x64
+		{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.MinSizeRel|x64.ActiveCfg = Debug|x64
+		{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.MinSizeRel|x64.Build.0 = Debug|x64
+		{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.Release|x64.ActiveCfg = Release|x64
+		{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.Release|x64.Build.0 = Release|x64
+		{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.RelWithDebInfo|x64.ActiveCfg = Release|x64
+		{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.RelWithDebInfo|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -0,0 +1,108 @@
+cmake_minimum_required(VERSION 3.5)
+project(Spark.Admin.WebApp)
+
+include(${CMAKE_SOURCE_DIR}/cmake/safe_dep_glob.cmake)
+include(${CMAKE_SOURCE_DIR}/cmake/Protobuf.cmake)
+
+# dependencies
+set(PROTO_GLOBS
+  ../lib/api/*.proto
+  ../lib/api/services/*.proto
+  ../lib/domain_model/*.proto
+  ../lib/sparkproto/*.proto
+  ../lib/md/protos/*.proto
+  ../../externals/linux/include/google/protobuf/descriptor.proto
+  ../../externals/linux/include/google/protobuf/timestamp.proto)
+
+file(
+  GLOB_RECURSE _proto_rel_SOURCES
+  RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+  ${PROTO_GLOBS})
+
+file(
+  GLOB_RECURSE _proto_abs_SOURCES
+  ${PROTO_GLOBS})
+
+file(
+  GLOB_RECURSE _ts_SOURCES
+  RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+  src/*.ts)
+
+file(
+  GLOB_RECURSE _fs_SOURCES
+  RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+  src/*.fs)
+
+set(_tools ${CMAKE_SOURCE_DIR}/tools)
+set(_quiet_exec ${_tools}/quiet_exec.sh)
+set(_venv_exec ${_tools}/venv_exec.sh)
+set(_tools_py ${CMAKE_SOURCE_DIR}/tools/py)
+
+# The tsconfig file is generated as a function of the cmake build type, and
+# binary dir. Depending on the build type, it extends either
+# 'tsconfig.debug.json' or 'tsconfig.release.json'.
+set(_tsconfig_base "${CMAKE_CURRENT_SOURCE_DIR}/tsconfig.$<IF:$<CONFIG:Debug>,debug,release>.json")
+set(WEBPACK_MODE $<IF:$<CONFIG:Debug>,"development","production">)
+set(_tsconfig "${CMAKE_CURRENT_BINARY_DIR}/tsconfig.json")
+
+set(_venv_python ${CMAKE_SOURCE_DIR}/.venv/bin/python)
+set(_gen_tsconfig_py ${_tools_py}/gen_tsconfig.py)
+set(_build_admin_web_app_py ${_tools_py}/build_admin_web_app.py)
+
+set(_gen_tsconfig_deps ${_venv_exec} ${_venv_python} ${_gen_tsconfig_py} ${_tsconfig_base})
+
+set(_build_admin_web_app_deps
+  ${_quiet_exec}
+  ${_venv_exec}
+  ${_venv_python}
+  ${_build_admin_web_app_py}
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/Spark.Admin.WebApp.fsproj
+  ${CMAKE_CURRENT_SOURCE_DIR}/webpack.config.js
+  ${CMAKE_SOURCE_DIR}/src/lib/api/service_compiler/templates/fs/fable.fs
+  ${CMAKE_CURRENT_SOURCE_DIR}/package-lock.json
+  ${_proto_rel_SOURCES}
+  ${_api_ts_SOURCES}
+  ${_ui_fs_SOURCES}
+  ${_tsconfig})
+
+update_deps_file("${_build_admin_web_app_deps}")
+
+function(npm_install path)
+  add_custom_command(
+    OUTPUT ${path}/package-lock.json
+    COMMAND "npm" ARGS "install"
+    DEPENDS ${path}/package.json
+    WORKING_DIRECTORY ${path}
+    COMMENT "Run 'npm install' in ${path}")
+endfunction()
+
+npm_install(${CMAKE_CURRENT_SOURCE_DIR})
+
+add_custom_command(
+  OUTPUT ${_tsconfig}
+  COMMAND ${_venv_exec}
+  ARGS
+  ${_venv_python}
+  ${_gen_tsconfig_py}
+  --config-base ${_tsconfig_base}
+  --config-out ${_tsconfig}
+  --build-out ${CMAKE_CURRENT_BINARY_DIR}
+  DEPENDS ${_gen_tsconfig_deps})
+
+add_custom_command(
+  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/bundle.js
+  COMMAND ${_quiet_exec}
+  ARGS
+  ${_venv_exec}
+  ${_venv_python}
+  ${_build_admin_web_app_py}
+  --protos ${_proto_abs_SOURCES}
+  --tsconfig ${_tsconfig}
+  --mode ${WEBPACK_MODE}
+  --output-dir ${CMAKE_CURRENT_BINARY_DIR}
+  COMMENT "Building Spark.Admin.WebApp"
+  DEPENDS ${_build_admin_web_app_deps})
+
+add_custom_target(admin_web_app_bundle ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/bundle.js)
+
+install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" DESTINATION "${SPARK_INSTALL_PREFIX}/bin")
@@ -0,0 +1,21 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.0.31903.59
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Spark.Admin.WebApp", "src\Spark.Admin.WebApp.fsproj", "{C3143A6F-8D32-4F9E-84EE-B34AF3F3A862}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{C3143A6F-8D32-4F9E-84EE-B34AF3F3A862}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C3143A6F-8D32-4F9E-84EE-B34AF3F3A862}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C3143A6F-8D32-4F9E-84EE-B34AF3F3A862}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C3143A6F-8D32-4F9E-84EE-B34AF3F3A862}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+EndGlobal
@@ -5,11 +5,13 @@ import { DynamicService } from "../src/DynamicService"

 test('log in and say hi', async () => {
    let ctx = await connect("bts", "");
-    expect(ctx instanceof ServiceContext).toBe(true)
-    const admin = new DynamicService(<ServiceContext>ctx, "AdminService", "", [
+    let methods = new Array<[string,number,string,string]>(
        ["get_admin_data", 16, "bts.api.VoidMessage", "bts.api.admin.AdminData"],
        ["update_account", 1, "bts.api.admin.AccountUpdateAPIArgument", "bts.api.admin.AdminServiceOperationResult"]
-        ]);
+    )
+    expect(ctx instanceof ServiceContext).toBe(true)
+    const admin = new DynamicService(
+        <ServiceContext>ctx, "AdminService", "", methods, [])
    const adminData = await admin.get_admin_data({})
    const account1 = adminData.accounts[2]
    const dat = account1.exchangeAccountData
@@ -0,0 +1,49 @@
+{
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "start": "npx webpack serve",
+    "build": "npx webpack"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "@babel/plugin-transform-runtime": "^7.21.0",
+    "@babel/preset-env": "^7.20.2",
+    "@babel/runtime": "^7.21.0",
+    "babel-loader": "^9.1.2",
+    "fable-utils": "^1.2.0",
+    "node-sass": "^8.0.0",
+    "protobufjs": "^7.2.2",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
+    "remotedev": "^0.2.9",
+    "ts2fable": "^0.7.1",
+    "tslib": "^2.5.0",
+    "watch": "^1.0.2",
+    "webpack": "^5.75.0"
+  },
+  "devDependencies": {
+    "@babel/core": "^7.21.0",
+    "@fortawesome/fontawesome-free": "^5.15.4",
+    "bulma": "^0.9.4",
+    "copy-webpack-plugin": "^11.0.0",
+    "core-js": "^3.28.0",
+    "css-loader": "^6.7.3",
+    "html-webpack-plugin": "^5.5.0",
+    "jest": "^29.4.3",
+    "mini-css-extract-plugin": "^2.7.2",
+    "npx": "^10.2.2",
+    "protobufjs-cli": "^1.1.1",
+    "sass": "^1.58.3",
+    "sass-loader": "^13.2.0",
+    "style-loader": "^3.3.1",
+    "ts-jest": "^29.0.5",
+    "ts-loader": "^9.4.2",
+    "tsutils": "^3.21.0",
+    "typescript": "^4.9.5",
+    "webpack-cli": "^5.0.1",
+    "webpack-dev-server": "^4.11.1",
+    "ws": "^8.12.1"
+  }
+}
@@ -4,8 +4,8 @@
  <title>BTS Spark Admin</title>
  <meta http-equiv='Content-Type' content='text/html; charset=utf-8'>
  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <link rel="shortcut icon" type="image/ico" href="img/favicon.ico" />
-  <link rel="stylesheet" href="font-awesome.min.css" />
+  <link rel="shortcut icon" type="image/ico" href="public/img/favicon.ico" />
+  <link rel="stylesheet" href="public/font-awesome.min.css" />
  <script src="https://cdn.polyfill.io/v2/polyfill.js?features=es6"></script>
 </head>
 <body>
@@ -9,20 +9,20 @@ open bts.api.orderman
 let superuser = "bts"

 let getAdminData (admin:IAdminService) (fsuc) (ffail) =
-  Cmd.ofPromise
+  Cmd.OfPromise.either
    admin.get_filtered_admin_data ()
    fsuc
    (fun e -> ffail e.Message)

 let getAccountOrdersData (admin:IAdminService) (success) (fail) =
-  Cmd.ofPromise
+  Cmd.OfPromise.either
    admin.get_order_summary
    ()
    success
    (fun e -> fail e.Message)

 let getMarginData (span:IMarginService) (account_name: string) (success) (fail) =
-  Cmd.ofPromise
+  Cmd.OfPromise.either
    span.get_excess_liquidity_report
    { account = account_name }
    success
@@ -116,7 +116,7 @@ let emptyManualFill:position.ManualFill =
    accountName = ""
    userId = uint32 1
    side = Side.BUY
-    quantity = uint32 0u
+    quantity = double 0.0
    price = double 0.0
    fillType = bts.api.position.ManualFill.FillType.AdminSod
    timestamp = { seconds = int64 0; nanos = 0 }
@@ -15,7 +15,7 @@ let columns = [|
    [ Key "clipSize";     Name "Clip Size"; Editable true ]
  |]

-[<Pojo>]
+
 type ClipLimit = {
  exchange: string
  securityType : string
@@ -32,7 +32,7 @@ let columns = [|
  positionColumn "Short"
 |]

-[<Pojo>]
+
 type ProductLimit = {
  exchange: string
  securityType : string
@@ -17,7 +17,7 @@ let columns = [|
  positionColumn "Short"
 |]

-[<Pojo>]
+
 type SecurityLimit = {
  security : string
  exchange: string
@@ -1,17 +1,14 @@
 module Accounts.State

-open Fable.PowerPack.Fetch
 open Accounts.Types
 open bts.api.admin
 open bts.api.position
 open Global
 open Elmish
-open Fable.PowerPack.PromiseImpl
 open Fable.Import
 open bts.co2
 open Fable
 open Fable.Core
-open Fable.PowerPack
 open bts.api.position

 let isNewAccount (account:BTSAccount) =
@@ -47,12 +44,9 @@ let sideToString side =
 let emptyTempManualFill = {id = 0u; newId = 0u; qty = "0"; price = "0"; side="Buy"; user=""; venue=""; symbol=""; expiration=""; SecurityId="0"; fillType = ManualFill.FillType.AdminDay }

 let validateManualFill (fill:TempFillData) =
-  let parsedQty = System.Int32.TryParse fill.qty
-  fill.SecurityId <> "0"
-  && fill.user <> ""
-  &&  parsedQty |> fst
-  && snd parsedQty >= 1
-  && System.Double.TryParse fill.price |> fst
+  let couldParseQty, parsedQty = System.Int32.TryParse fill.qty
+  let couldParsePrice, parsedPrice = System.Double.TryParse fill.price
+  couldParseQty && couldParsePrice && fill.SecurityId <> "0" && fill.user <> ""

 let convertTempManualFIll (tempFill:TempFillData) (model: Model) =
  let dto = System.DateTimeOffset (System.DateTime.UtcNow)
@@ -63,7 +57,7 @@ let convertTempManualFIll (tempFill:TempFillData) (model: Model) =
      accountName = model.scratch.name
      userId = (userToId tempFill.user model)
      side = (stringToSide tempFill.side)
-      quantity = uint32 tempFill.qty
+      quantity = double tempFill.qty
      price = double tempFill.price
      fillType = tempFill.fillType
      timestamp = { seconds = dto.ToUnixTimeSeconds(); nanos = 0 }
@@ -176,8 +170,8 @@ let marginSub model dispatch =

 let selectSub (tab:Tab option) model =
  match tab, model.tab with
-  | Some PositionManagementTab, _ | None, PositionManagementTab -> Cmd.ofSub (positionSub model)
-  | Some MarginTab, _ | None, MarginTab -> Cmd.ofMsg GetMarginData //Cmd.ofSub (marginSub model)
+  | Some PositionManagementTab, _ | None, PositionManagementTab -> Cmd.ofEffect (positionSub model)
+  | Some MarginTab, _ | None, MarginTab -> Cmd.ofMsg GetMarginData //Cmd.ofEffect (marginSub model)
  | _ ->
    match model.unsub with
    | Some (unsub) -> unsub.Dispose()
@@ -302,8 +296,8 @@ let setBasePosition basePosBatch (model:Model) =
    let! result = model.positionService.set_base_position basePosBatch

    match result.ok with
-    | true -> Browser.console.log result.msg
-    | false -> Browser.console.log result.msg
+    | true -> Browser.Dom.console.log result.msg
+    | false -> Browser.Dom.console.log result.msg

    return (Msg.SelectTab model.tab)
  }
@@ -368,9 +362,9 @@ let clearValidNewFills model =
 let clearManualFill model =
  {model with ManualFillData = {model.ManualFillData with newFills = clearValidNewFills model; updatedFills = []; deletedFills = {manualFill = Array.empty}}}

-let validateManualFillQty value =
-  let nv = System.Int32.TryParse value
-  match value.Length, fst nv, snd nv with
+let validateManualFillQty (value: string) : bool =
+  let couldParse, parsedQty = System.Int32.TryParse value
+  match value.Length, couldParse, parsedQty with
  | 0, _, _ -> true
  | _, true, v when v > 0 -> true
  | _, _, _ -> false
@@ -423,7 +417,7 @@ let update msg (model:Model) : Model * Cmd<Msg> =
    { model with ShowLoading = false}, (getMarginData model.marginService model.scratch.name UpdateMarginData (box>>ErrorOccured))
  | UpdateMarginData newData ->
    let cmd = match model.tab with
-              | MarginTab -> Cmd.ofPromise (fun _ -> promise { do! Promise.sleep 10000 } ) () (fun _ -> GetMarginData) (fun _ -> GetMarginData)
+              | MarginTab -> Cmd.OfPromise.either (fun _ -> promise { do! Promise.sleep 10000 } ) () (fun _ -> GetMarginData) (fun _ -> GetMarginData)
              | _ -> Cmd.none
    match (model.marginScratch = emptyMargin || model.marginScratch.account <> model.scratch.name),
          (compareDouble model.marginData.leverageFactor model.marginScratch.leverageFactor 10000u),
@@ -453,7 +447,7 @@ let update msg (model:Model) : Model * Cmd<Msg> =

  | DeleteAccount account ->
    let mdl = { model with OptionsMenuOpen = ""}
-    match Fable.Import.Browser.window.confirm (sprintf "Are you sure you want to delete '%s'" account.name) with
+    match Browser.Dom.window.confirm (sprintf "Are you sure you want to delete '%s'" account.name) with
    | true -> mdl, Cmd.ofExistingPromise (deleteAccount model.admin account model ) id (box>>ErrorOccured)
    | false -> mdl, Cmd.Empty
  | AddAccount ->
@@ -467,7 +461,7 @@ let update msg (model:Model) : Model * Cmd<Msg> =
    | false -> { model with marginScratch = model.marginData }, Cmd.ofExistingPromise (saveAccount model.admin model.scratch model.ManualFillData model) id (box>>ErrorOccured)
  | ErrorOccured msg ->
    Global.alert Global.Error (string msg)
-    Browser.console.log msg
+    Browser.Dom.console.log msg
    model,Cmd.Empty
  | SelectTab tab ->
    match tab with
@@ -17,9 +17,9 @@ type Tab =
  | PositionManagementTab
  | MarginTab

-let venues = [| Venue.GLBX; Venue.ICE; Venue.SIM |]
+let venues = [| Venue.DERIBIT; Venue.GLBX; Venue.ICE; Venue.SIM; |]

-let securityTypes = [| SecurityType.FUTURE; SecurityType.SPREAD |]
+let securityTypes = [| SecurityType.FUTURE; SecurityType.OPTION; SecurityType.SPREAD; |]

 let emptyAccount = Access.Accounts.empty

@@ -35,6 +35,11 @@ type CMEExchangeField =
  | ClearingAccount of string
  | MiscTagMapping of JSMap<string>

+type DERIBITExchangeField =
+  | CTI of CTICode
+  | Origin of CustomerOrFirm
+  | ClearingAccount of string
+
 type ICEExchangeField =
  | CTI of CTICode
  | Origin of CustomerOrFirm
@@ -2,8 +2,9 @@ module Accounts.View

 open Accounts.Types
 open Accounts.State
-open Fable.Helpers.React
-open Fable.Helpers.React.Props
+open Fable.React
+open Fable.React.Standard
+open Fable.React.Props
 open bts.api.admin
 open bts.api.orderman
 open EnumUtils
@@ -67,7 +68,7 @@ let accountControls model (dispatch:Msg->unit) =
    | Some acc -> fun _ -> (dispatch <| SelectAccount acc)
    | None -> ignore

-  div [ClassName "is-main-control-bar"] [
+  div [ ClassName "is-main-control-bar" ] [
        saveButton model dispatch
        Button.button "Revert" "" "" (if isDirty model then Button.Enabled else Button.Disabled) revertFun
    ]
@@ -100,7 +101,7 @@ let generalView (model:Model) dispatch =
      Fields.text "Name" account.name [] (AccountName >> Update >> dispatch)
      Fields.text "Description" account.description [] (Description >> Update >> dispatch)
      Fields.checkbox "Open For Trading" "Unchecking this stops all users from entering orders into the account" account.isActive [] (IsActive >> Update >> dispatch)
-      (if (State.isNewAccount account && model.can_create) then modal else span[][])
+      (if (State.isNewAccount account && model.can_create) then modal else span [] [])

      accountControls model dispatch
  ]
@@ -112,7 +113,7 @@ let marginView model dispatch =
    {
      cells =
        [
-          TableControl.Cell (div [Style [MinWidth "3em"]][str "Time"])
+          TableControl.Cell (div [Style [MinWidth "3em"]] [str "Time"])
          TableControl.Cell (str "Account")
          TableControl.Cell (str "Leverage Factor")
          TableControl.Cell (str "Cash Balance")
@@ -148,8 +149,8 @@ let marginView model dispatch =
      onClick = None
    }

-  div [][
-    TableControl.createDataTable (Some headerRow) [rws] (span [][])
+  div [] [
+    TableControl.createDataTable (Some headerRow) [rws] (span [] [])
    Fields.checkbox "Enforce Margin Limit" "" (model.marginScratch.shouldEnforceMargin) [] (SetEnforceMargin >> dispatch)
    Fields.number "Leverage Factor:" (string model.marginScratch.leverageFactor) [Disabled disabled] (fun _ -> true) (double >> SetMarginCashFactor >> dispatch)
    Fields.intNumber "Cash Balance:" (string model.marginScratch.cashBalance) [Disabled disabled] (double >> SetMarginCashBalance >> dispatch)
@@ -221,8 +222,8 @@ let ordersView (model:Model) dispatch =
  let cancelButton = Button.button "Cancel Selected Orders" (addLoadingString "is-danger" model.ShowLoading) "times" enableCancel (fun _ -> OpenConfirmModal (confirmText, cancelMessage) |> dispatch)
  let reloadFun = fun _ -> dispatch (SelectTab model.tab)

-  div [][
-    TableControl.createDataTable (Some headerRow) rws (span [][ (Button.button "Refresh" "" "exchange" (Button.boolToDisabledConverter model.ShowLoading) reloadFun); nbsp.element; cancelButton ])
+  div [] [
+    TableControl.createDataTable (Some headerRow) rws (span [] [ (Button.button "Refresh" "" "exchange" (Button.boolToDisabledConverter model.ShowLoading) reloadFun); nbsp.element; cancelButton ])
  ]

 let limitFilter (positionLimit:AccountSecurityPositionLimitUnit option) (clipLimit:AccountSecurityClipLimitUnit option) allValueDisplay (array:ExpirationNameList []) =
@@ -422,8 +423,8 @@ let clipLimitsView model dispatch =
  let addRow _ =  emptyLimit |> AddClipLimit |> dispatch
  div []
    [
-      div [ ClassName "columns" ][
-            h1 [ ClassName "is-size-3 column is-narrow" ][str "Clip Limits" ]
+      div [ ClassName "columns" ] [
+            h1 [ ClassName "is-size-3 column is-narrow" ] [str "Clip Limits" ]
            div [ ClassName "column is-size-7 has-text-grey-mid is-help-text";  ]
              [str "Clip limits can be set for one security, for all securities in a product (by selecting \"All\" for securities), or for all products within a security type (by selecting \"All\" for both symbol and security)"]
      ]
@@ -614,12 +615,12 @@ let productLimits model dispatch =
  let addRow _ = emptyLimit |> AddProductLimit |> dispatch
  div []
    [
-      div [ ClassName "columns" ][
-            h1 [ ClassName "is-size-3 column is-narrow" ][str "Position Limits" ]
+      div [ ClassName "columns" ] [
+            h1 [ ClassName "is-size-3 column is-narrow" ] [str "Position Limits" ]
            div [ ClassName "column is-size-7 has-text-grey-mid is-help-text" ]
              [str "This limits the net position for a product (i.e. accumulated position over all securities belonging to a product). This can be set for one product, or for all products within a security type by selecting \"All\" for symbol. (Note that \"All\" applies the same limits to each symbol, not the combiled position of all symbols)"]
      ]
-      div [][
+      div [] [
        Fields.radioButton "Use Net Contracts" "" model.scratch.riskLimitEnforcement.productLimitInNetTerms [] (EnforceProductLimitInNetTerms >> dispatch)
        Fields.radioButton "Use Absolute Contracts" "" (not model.scratch.riskLimitEnforcement.productLimitInNetTerms) [] (not >> EnforceProductLimitInNetTerms >> dispatch)
        div [] [
@@ -640,12 +641,12 @@ let lazyProductLimitsView model dispatch =

 let lossLimitView (model:Model) dispatch =
  div [] [
-    div [ ClassName "columns" ][
-            h1 [ ClassName "is-size-3 column is-narrow" ][str "Loss Limit" ]
+    div [ ClassName "columns" ] [
+            h1 [ ClassName "is-size-3 column is-narrow" ] [str "Loss Limit" ]
            div [ ClassName "column is-size-7 has-text-grey-mid is-help-text" ]
              [str "If Enabled, this limits the account's loss."]
      ]
-    div [][
+    div [] [
      Fields.checkbox "Enable Loss Limit" "" model.scratch.accountLossLimit.enforce [] (EnforceLossLimit >> dispatch)
      Fields.inlineText "Total Loss Limit" (string model.scratch.accountLossLimit.totalLossLimit) [] (not model.scratch.accountLossLimit.enforce) (TotalLossLimit >> dispatch)
    ]
@@ -726,9 +727,10 @@ let securityLimitsView (model:Model) dispatch =
                          []
                          ((changeSymbol limit) >> SecurityLimits >> dispatch)
            )
+
            TableControl.Cell (Fields.mapSelect
                          ""
-                          (JSMap.toMap (getSecurityMap model (Some limit) None))
+                          (JSMap.SparkJSMapCase(getSecurityMap model (Some limit) None) |> JSMap.toJSMap)
                          None
                          (Some (sprintf "%i" limit.security.securityId))
                          ((changeSecurityId limit) >> SecurityLimits >> dispatch)
@@ -761,8 +763,8 @@ let securityLimitsView (model:Model) dispatch =
  let addRow _ = Array.append model.scratch.securityPositionLimits [| emptyLimit |] |> (SecurityLimits >> dispatch)
  div []
    [
-      div [ ClassName "columns" ][
-            h1 [ ClassName "is-size-3 column is-narrow" ][str "Security Limits" ]
+      div [ ClassName "columns" ] [
+            h1 [ ClassName "is-size-3 column is-narrow" ] [str "Security Limits" ]
            div [ ClassName "column is-size-7 has-text-grey-mid is-help-text" ]
              [str "Optionally, the net position for one or more securities can also be limited. For example, the Product Limits can be set to restrict the Max Net Long Position across all ES futures to 10,000 contracts, but Security Limits can be used to restrict the ES Jun future to 500 only"]
      ]
@@ -785,10 +787,13 @@ let venueToString (venue:bts.api.Venue) =
    | bts.api.Venue.UNSET -> "Unset"
    | bts.api.Venue.BTS -> "BTS"
    | bts.api.Venue.SIM -> "SIM"
+    | bts.api.Venue.SIMICE -> "SIMICE"
    | bts.api.Venue.CBOE -> "CBOE"
    | bts.api.Venue.CBOECFE -> "CBOECFE"
    | bts.api.Venue.GLBX -> "GLBX"
+    | bts.api.Venue.DERIBIT -> "DERIBIT"
    | bts.api.Venue.ICE -> "ICE"
+    // | bts.api.Venue.DERIBIT -> "DERIBIT"

 let exchange_display expirationNameList =
  let s = sprintf "%O" expirationNameList.product.exchange
@@ -819,8 +824,8 @@ let getPositionSecMap (sList:(uint32 * PositionSecurity) list) venue symbol =
 let SODPositionView model dispatch =
  div []
    [
-      div [ ClassName "columns" ][
-            h1 [ ClassName "is-size-3 column is-narrow" ][str "SOD" ]
+      div [ ClassName "columns" ] [
+            h1 [ ClassName "is-size-3 column is-narrow" ] [str "SOD" ]
            div [ ClassName "column is-size-7 has-text-grey-mid is-help-text"; ]
              [str "Manually add fills for the Start of Day position"]
      ]
@@ -855,7 +860,7 @@ let DayPositionView model dispatch =
  let securityList:(uint32 * PositionSecurity) list =
    model.mdRelayExpNameData
    |> List.ofArray
-    |> List.filter (fun i -> i.product.``type`` = bts.api.SecurityType.FUTURE)
+    |> List.filter (fun i -> i.product.``type`` = bts.api.SecurityType.FUTURE || i.product.``type`` = bts.api.SecurityType.OPTION)
    |> List.collect (fun  i ->
                              JSMap.toList i.names
                              |> List.map (fun x ->
@@ -950,7 +955,7 @@ let DayPositionView model dispatch =
                  TableControl.Cell (str securityMap.[limit.securityKey].securityName)
                  TableControl.Cell (str (idToUser limit.userId model))
                  TableControl.Cell (str (match limit.side with | bts.api.Side.BUY -> "Buy" | bts.api.Side.SELL -> "Sell" | _ -> ""))
-                  TableControl.Cell (str (sprintf "%i" limit.quantity))
+                  TableControl.Cell (str (sprintf "%f" limit.quantity))
                  TableControl.Cell (str (sprintf "%f" limit.price))
                  TableControl.Cell (str (limit.timestamp.seconds |> uint64 |> int64 |> Global.epochToDateTimeString))
                ]
@@ -998,7 +1003,7 @@ let DayPositionView model dispatch =
                                  (fun _ -> true)
                                  (fun v -> (limit.newId, v, "price", true) |> UpdateManualFill |> dispatch)
                    )
-                  TableControl.Cell (span [Style [Color "green"]][str "NEW"])
+                  TableControl.Cell (span [Style [Color "green"]] [str "NEW"])
                ]
        className = match validateManualFill limit with true -> "" | false -> "is-invalid"
        header = None
@@ -1010,8 +1015,8 @@ let DayPositionView model dispatch =

  div []
    [
-      div [ ClassName "columns" ][
-            h1 [ ClassName "is-size-3 column is-narrow" ][str "Day Fills" ]
+      div [ ClassName "columns" ] [
+            h1 [ ClassName "is-size-3 column is-narrow" ] [str "Day Fills" ]
            div [ ClassName "column is-size-7 has-text-grey-mid is-help-text"; ]
              [str "Manually add fills for the Day position"]
      ]
@@ -1024,8 +1029,8 @@ let DayPositionView model dispatch =
 let PositionUploadView model dispatch =
  div []
    [
-      div [ ClassName "columns" ][
-            h1 [ ClassName "is-size-3 column is-narrow" ][str "Upload" ]
+      div [ ClassName "columns" ] [
+            h1 [ ClassName "is-size-3 column is-narrow" ] [str "Upload" ]
            div [ ClassName "column is-size-7 has-text-grey-mid is-help-text"; ]
              [str "Add fills from a file for the Day position"]
      ]
@@ -1209,7 +1214,7 @@ let accountSelectionGrid (accountList:BTSAccount list) (currentAccount:BTSAccoun
    [ for acc in activeAccounts do yield {
        cells =
          [
-            TableControl.Cell (a [ OnClick (fun _ -> (acc |> SelectAccount |> dispatch))][
+            TableControl.Cell (a [ OnClick (fun _ -> (acc |> SelectAccount |> dispatch))] [
                                   str acc.name
                                 ])
            TableControl.Cell (str (sprintf "%b" acc.isActive))
@@ -1220,7 +1225,7 @@ let accountSelectionGrid (accountList:BTSAccount list) (currentAccount:BTSAccoun
        onClick = None
      }
    ]
-  div[][
+  div [] [
    TableControl.createSelectorTable (Some headerRow) rws
  ]

@@ -1241,7 +1246,7 @@ let menuItem account selectedAccount model dispatch =
                              HTMLAttr.Custom ("aria-controls", (sprintf "dropdown-menu-%s" account.name)) ]
                       [ span [ Class "icon is-small" ]
                           [ i [ Class "fa fa-ellipsis-v"
-                                 HTMLAttr.Custom ("aria-hidden", "true") ][ ]
+                                 HTMLAttr.Custom ("aria-hidden", "true") ] [ ]
                           ]
                       ]
                   ]
@@ -1260,7 +1265,7 @@ let menuItem account selectedAccount model dispatch =
                 ]
             ]
         ]
-      else span[][])
+      else span [] [])
    ]

 let NavRoot (accounts:BTSAccount[]) selectedAccount model dispatch =
@@ -1307,7 +1312,7 @@ let root (model:Model) dispatch =
              | "" -> span [] []
              | _ -> Modal.showConfirm (fst model.ConfirmModal) (fun () -> (snd model.ConfirmModal) |> dispatch) (fun _ -> OpenConfirmModal ("", Msg.SelectTab model.tab ) |> dispatch)
  match model.adminData with
-    | None -> div[][str "Loading account list..."]
+    | None -> div [] [str "Loading account list..."]
    | Some data ->
      div
        [ Class "columns is-fullheight"
@@ -1323,17 +1328,17 @@ let root (model:Model) dispatch =

                div [ ClassName "tabs is-boxed" ] [
                  ul [] [
-                    (if (Array.length data.accounts > 0) then (tabHeader General model dispatch) else span [][] )
-                    (if (Array.length data.accounts > 0) then (tabHeader LimitsTab model dispatch) else span [][] )
-                    (if (Array.length data.accounts > 0) then (tabHeader ConnectionsTab model dispatch) else span [][] )
+                    (if (Array.length data.accounts > 0) then (tabHeader General model dispatch) else span [] [] )
+                    (if (Array.length data.accounts > 0) then (tabHeader LimitsTab model dispatch) else span [] [] )
+                    (if (Array.length data.accounts > 0) then (tabHeader ConnectionsTab model dispatch) else span [] [] )
                    // tabHeader CreditLimits model.tab dispatch
-                    (if (Array.length data.accounts > 0) then (tabHeader ExchangeSettingsTab model dispatch) else span [][] )
-                    (if (Array.length data.accounts > 0) then (tabHeader OrdersTab model dispatch) else span [][] )
-                    (if (Array.length data.accounts > 0) then (tabHeader PositionManagementTab model dispatch) else span [][] )
-                    (if (Array.length data.accounts > 0) then (tabHeader MarginTab model dispatch) else span [][] )
+                    (if (Array.length data.accounts > 0) then (tabHeader ExchangeSettingsTab model dispatch) else span [] [] )
+                    (if (Array.length data.accounts > 0) then (tabHeader OrdersTab model dispatch) else span [] [] )
+                    (if (Array.length data.accounts > 0) then (tabHeader PositionManagementTab model dispatch) else span [] [] )
+                    (if (Array.length data.accounts > 0) then (tabHeader MarginTab model dispatch) else span [] [] )
                  ]
                ]
                tabContent model dispatch
                modal
              ]
-      ]
+      ]
@@ -1,50 +1,45 @@
-module App.View
-
-open Elmish
-open Elmish.Browser.Navigation
-open Fable.Core
-open Fable.Core.JsInterop
-open Fable.Import
-open Fable.Import.Browser
-open Types
-open App.State
-open App.Types
-open Global
-
-importAll "../sass/main.scss"
-
-open Fable.Helpers.React
-open Fable.Helpers.React.Props
-open Elmish.React.Common
-open ServiceContext
-
-
-let topLevel (sc:ServiceContext.ServiceContext) currentPage dispatch content =
-  div
-    [ Class "columns is-fullheight" ]
-    [ Nav.navRoot currentPage sc dispatch
-      div [ Class "column is-main-content" ]
-       [ content ]
-    ]
-
-let root model dispatch =
-  match model with
-  | PreLogin m -> Login.root m (LoginMsg >> dispatch)
-  | LoggedIn model ->
-    match model.page with
-    | UsersModel m -> Users.View.root m (UsersMsg>>dispatch) |> topLevel model.context model.page dispatch
-    | AccountsModel m -> Accounts.View.root m (AccountsMsg>>dispatch) |> topLevel model.context model.page dispatch
-
-open Elmish.React
-open Elmish.Debug
-open Elmish.HMR
-
-// App
-Program.mkProgram init update root
-#if DEBUG
-|> Program.withConsoleTrace
-|> Program.withDebugger
-|> Program.withHMR
-#endif
-|> Program.withReactUnoptimized "elmish-app"
-|> Program.run
+module App.View
+
+open Elmish
+open Fable.Core
+open Fable.Core.JsInterop
+open Types
+open App.State
+open App.Types
+open Global
+
+importAll "../sass/main.scss"
+
+open Fable.React
+open Fable.React.Props
+open Elmish.React.Common
+
+
+let topLevel (sc:ServiceContext.ServiceContext) currentPage dispatch content =
+  div
+    [ Class "columns is-fullheight" ]
+    [ Nav.navRoot currentPage sc dispatch
+      div [ Class "column is-main-content" ]
+       [ content ]
+    ]
+
+let root model dispatch =
+  match model with
+  | PreLogin m -> Login.root m (LoginMsg >> dispatch)
+  | LoggedIn model ->
+    match model.page with
+    | UsersModel m -> Users.View.root m (UsersMsg>>dispatch) |> topLevel model.context model.page dispatch
+    | AccountsModel m -> Accounts.View.root m (AccountsMsg>>dispatch) |> topLevel model.context model.page dispatch
+
+open Elmish.React
+open Elmish.Debug
+open Elmish.HMR
+
+// App
+Program.mkProgram init update root
+#if DEBUG
+|> Program.withConsoleTrace
+|> Program.withDebugger
+#endif
+|> Program.withReactSynchronous "elmish-app"
+|> Program.run
@@ -1,7 +1,7 @@
 module Cmd
  let ofExistingPromise p ok err =
-    Elmish.Cmd.ofPromise
+    Elmish.Cmd.OfPromise.either
      (fun _ -> p)
      ()
      ok
-      err
+      err
@@ -1,8 +1,8 @@
 module Button

 open Fable.Core
-open Fable.Helpers.React
-open Fable.Helpers.React.Props
+open Fable.React
+open Fable.React.Props

 type IsDisabled =
  | Disabled
@@ -90,8 +90,8 @@ let button text flavor icon disabled click =
      (match icon with
      | "" -> str text
      | _ ->
-        span [][
-          span [ ClassName "icon is-small" ] [i [ ClassName (sprintf "fa fa-%s" icon)][] ]
+        span [] [
+          span [ ClassName "icon is-small" ] [i [ ClassName (sprintf "fa fa-%s" icon)] [] ]
          nbsp.element
          str text
        ])
@@ -1,7 +1,8 @@
 module DataGrid
-open Fable.Core.Exceptions
+// open Fable.Core.Exceptions
 open Fable.Core
-open Fable.Helpers.React
+open Fable.React
+open Fable.React.Props

 type GridProps = ReactGrid.GridProps

@@ -13,9 +14,9 @@ let private update<'a> dispatch (rows:'a[]) (update:ReactGrid.GridUpdate) =
    dispatch (unbox<'a[]> updatedRows)

 let dataGrid<'a> columns props (rows:'a[]) dispatch =
-    let rgprops = 
+    let rgprops =
        props @ [
-            ReactGrid.RowGetter (fun i -> box rows.[i])        
+            ReactGrid.RowGetter (fun i -> box rows.[i])
            ReactGrid.OnGridRowsUpdated (update dispatch rows)
            ReactGrid.RowsCount (Array.length rows)
        ]
@@ -46,6 +47,6 @@ let mappedDataGrid<'a,'r> (descriptor:MappedDataGridDescriptor<'a,'r>) props (ro
        props @ [
            ReactGrid.RowGetter getRow
            ReactGrid.RowsCount (Array.length rows)
-            ReactGrid.OnGridRowsUpdated onUpdate 
+            ReactGrid.OnGridRowsUpdated onUpdate
        ]
    ReactGrid.reactGrid descriptor.columns rgprops
@@ -1,10 +1,11 @@
 module Fields

 open Fable.Core
+open Fable.Core.JS
 open Fable.Core.JsInterop
-open Fable.Helpers.React
-open Fable.Helpers.React.Props
-open Fable.Import.React
+open Fable.React
+open Fable.React.Props
+// open Fable.Browser
 open Global
 open Fable
 open JSMap
@@ -40,7 +41,7 @@ let inlineText (lbl:string) (dv:string) (attrs:IHTMLProp list) (disabled:bool) o
  let disabledLabel = if disabled then "disabled-label" else ""
  span [ ClassName "field" ]
    [
-      label [ ClassName ("label inline-label " + disabledLabel)][str lbl]
+      label [ ClassName ("label inline-label " + disabledLabel)] [str lbl]
      span [ ClassName "control" ]
        [ input ([
                  ClassName "input"
@@ -173,13 +174,13 @@ let number (lbl:string) (dv:string) (attrs:IHTMLProp list) (validate: string ->


 let intNumber (lbl:string) (dv:string) (attrs:IHTMLProp list) onchange =
-  let validate value = fst <| System.Int32.TryParse value
+  let validate (value:string) : bool = fst (System.Int32.TryParse(value))
  number lbl dv attrs validate onchange

 let positiveIntNumber (lbl:string) (dv:string) (attrs:IHTMLProp list) onchange =
-  let validate value =
-    let itp = System.Int32.TryParse value
-    fst itp && snd itp >= 0
+  let validate (value:string) : bool =
+    let couldParse, v = System.Int32.TryParse value
+    couldParse && v >= 0

  number lbl dv attrs validate onchange

@@ -193,8 +194,8 @@ let double (lbl:string) (dv:double) (attrs:IHTMLProp list) onchange =
  text lbl (string dv) attrs (double>>onchange)

 let enumSelect<'a> (lbl:string) (dv:'a) (values:'a[]) (attrs:IHTMLProp list) (onchange:'a->unit) =
-  let vals = match (Array.tryFindIndex (fun elm -> unbox elm = unbox dv) values) with
-              | None -> Array.concat [[| dv |]; values]
+  let vals = match (Microsoft.FSharp.Collections.Array.tryFindIndex (fun elm -> unbox elm = unbox dv) values) with
+              | None -> Microsoft.FSharp.Collections.Array.concat [[| dv |]; values]
              | Some _ -> values

  div [ClassName "field"] [
@@ -227,7 +228,7 @@ let checkbox (lbl:string) (description:string) (dv:bool) (attrs:IHTMLProp list)
            str (" " + lbl)
          ]
          nbsp.element
-          span [ClassName "is-size-7 has-text-grey-mid"][ str description]
+          span [ClassName "is-size-7 has-text-grey-mid"] [ str description]
        ]
    ]

@@ -246,7 +247,7 @@ let radioButton (lbl:string) (description:string) (dv:bool) (attrs:IHTMLProp lis
            str (" " + lbl)
          ]
          nbsp.element
-          span [ClassName "is-size-7 has-text-grey-mid"][ str description]
+          span [ClassName "is-size-7 has-text-grey-mid"] [ str description]
        ]
    ]

@@ -292,8 +293,8 @@ let mapSelectEx (lbl:string) (options:Map<string,string>) (defaultText:string op

  let optList:ReactElement list =
   match defaultText with
-   | None -> (option [] [str ""]) :: ([ for opt in options do yield option [ Value opt.Key ] [ str (opt.Value) ] ])
-   | Some dt -> (option [] [str dt]) :: ([ for opt in options do yield option [ Value opt.Key ] [ str (opt.Value) ] ])
+   | None -> (option [] [str ""]) :: ([ for opt in options.entries() do yield option [ Value (fst opt) ] [ str (snd opt) ] ])
+   | Some dt -> (option [] [str dt]) :: ([ for opt in options.entries() do yield option [ Value (fst opt) ] [ str (snd opt) ] ])

  let dv = match defaultValue with
            | Some d -> d
@@ -358,8 +359,8 @@ let menuSelect (options:string list) (onchange:'a->unit) =
        ]
    ]

-let getFileData next (file:Import.Browser.File) =
-  let reader = Fable.Import.Browser.FileReader.Create ()
+let getFileData next (file:Browser.Types.Blob) =
+  let reader = Browser.Dom.FileReader.Create ()
  reader.onload <- (fun _ ->
    reader.result |> string |> next
   )
@@ -375,10 +376,10 @@ let fileUpload (multiple:bool) (onInput:string -> unit) =
                  [ input [ Class "file-input"
                            Type "file"
                            Name "file-upload"
-                            OnInput (fun (v:FormEvent) ->
+                            OnInput (fun v ->
                              v.target?files
-                              |> unbox<Import.Browser.File[]>
-                              |> Array.head
+                              |> unbox<Browser.Types.Blob[]>
+                              |> Microsoft.FSharp.Collections.Array.head
                              |> getFileData onInput
                              )
                            Multiple multiple
@@ -1,20 +1,20 @@
 module Modal

+open Browser.Types
 open Fable.Core
 open Fable.Core.JsInterop
-open Fable.Helpers.React
-open Fable.Helpers.React.Props
-open Fable.Import.React
+open Fable.React
+open Fable.React.Props
 open Global
 open Fable


 let show (title:string) (content:ReactElement) (footerContent:ReactElement) (onCloseClick: MouseEvent -> Unit) =
   div [ Class "modal is-active" ]
-    [ div [ Class "modal-background" ][ ]
+    [ div [ Class "modal-background" ] [ ]
      div [ Class "modal-card" ]
        [ header [ Class "modal-card-head" ]
-            [ p [ Class "modal-card-title" ][ str title ]
+            [ p [ Class "modal-card-title" ] [ str title ]
              button [ Class "delete"; OnClick onCloseClick ] [ ]
            ]
          section [ Class "modal-card-body" ] [ content ]
@@ -0,0 +1,158 @@
+module ReactGrid
+open Fable.React
+open Fable.React.Props
+// open Fable.React.Props.HTMLAttr
+open Fable.Core.JsInterop
+open Fable.Core
+(* open Fable.Core.JS.Constructors *)
+open Fable.Core.DynamicExtensions
+open Fable.Import
+
+(*  *)
+type GridUpdate = {
+  cellKey : string
+  fromRow : int
+  toRow : int
+  rowIds: int[]
+  updated: obj
+}
+
+type ColumnProps =
+  | Key of string
+  | Name of string
+  | Width of int
+  | Editable of bool
+  | Editor of ReactElement
+  | Formatter of ReactElement
+
+type Row = obj
+type GridProps =
+  | EnableCellSelect of bool
+  | EnableRowSelect of bool
+  | RowsCount of int
+  | MinHeight of int
+  | RowGetter of (int->Row)
+  | OnGridRowsUpdated of (GridUpdate->unit)
+  | OnRowSelect of (Row list->unit)
+  | RowKey of string
+
+
+let reactGrid (columns:ColumnProps list[]) props = 
+  let props' = (keyValueList CaseRules.LowerFirst props)
+  let columns' = Array.map (keyValueList CaseRules.LowerFirst) columns
+  props'.["columns"] <- columns'
+  ofImport "default" "react-data-grid" props' []
+
+(*  *)
+type SelectEditorProps = {
+  options : string[]
+}
+let selectEditor (props:SelectEditorProps) =
+  ofImport "Editors.DropDownEditor" "react-data-grid-addons" props []
+
+let selectFormatter (props:SelectEditorProps) =
+  ofImport "Formatters.DropDownFormatter" "react-data-grid-addons" props []
+
+let selectColumn<'a> key header (options:'a[]) =
+    [ Key key
+      Name header
+      Editor (selectEditor { options = unbox options })
+      Formatter (selectFormatter { options = unbox options })
+    ]
+
+
+
+type MyStu = {
+    value: int
+}
+
+type MyUpd = {
+    incr: int
+}
+
+(*  *)
+type private ButtonProps = {
+  icon : string
+  title: string
+  action : int->unit
+  // .value will be row.[ColumnProps.Key] -but- if we set it then it does't get overwritten
+  // value : obj option
+  rowIdx : int
+  misc : obj
+}
+
+let private my_do_upd (u: MyUpd) (s: MyStu): MyStu =
+    {
+        value = s.value + u.incr
+    }
+
+let private my_to_view (m: ReactiveComponents.Model<ButtonProps, MyStu>) (proc_msg: MyUpd->unit): ReactElement =
+    div [] []
+
+let private my_initagain (p: ButtonProps): MyStu =
+    {
+        value = 0
+    }
+
+// let my_to_view (m: Mod)
+let private my_init (arg: ButtonProps): ReactiveComponents.Props<ButtonProps, MyStu, MyUpd> =
+    {
+        key = "id"
+        props = arg
+        update = my_do_upd
+        view = my_to_view
+        init = my_initagain
+    }
+
+
+// let private init_button_ = 
+
+// type private ButtonFormatter(initProps : ButtonProps) as self =
+//   inherit ReactiveComponents.ReactiveCom<ButtonProps, obj, obj>(initProps) with
+//   do self.setInitState ()
+//   override __.render() =
+//     // Browser.console.log(self.props)
+//     p [ ClassName "control" ] [
+//       a [ ClassName "button"
+//           Title self.props.title
+//           OnClick (fun _ -> self.props.action self.props.rowIdx) ] [
+//           span [ ClassName "icon is-small" ] [ 
+//             i [ ClassName (sprintf "fa fa-%s" self.props.icon)] [ ] ]
+//       ]
+//     ]
+
+
+type private ButtonFormatter(initProps: ButtonProps)  as self =
+    inherit ReactiveComponents.ReactiveCom<ButtonProps, MyStu, MyUpd>(initProps |> my_init)
+
+    override __.render() =
+        p [ ClassName "control" ] [
+            a [ ClassName "button"
+                Title self.props.props.title
+                OnClick (fun _ -> self.props.props.action self.props.props.rowIdx ) ] [
+                span [ ClassName "icon is-small" ] [
+                    i [ ClassName (sprintf "fa fa-%s" self.props.props.icon)] []
+                ]
+            ]
+        ]
+
+
+
+let buttonColumn action header icon misc =
+    let (bn_col_props: ButtonProps) = {
+        title = header;
+        icon = icon;
+        action = action;
+        rowIdx = 0;
+        misc = misc;
+    }
+    [ HTMLAttr.Name header
+      Style [ Fable.React.Props.CSSProp.Width 60 ]
+    ]
+
+//   [ Name header
+//     Style [ Width 60 ]
+//     Formatter (ofType<ButtonFormatter, MyStu, MyUpd> { title = header; icon = icon; action = action; rowIdx = 0; misc = misc } [])
+//   ]
+
+
@@ -1,10 +1,10 @@
 module TableControl

+open Browser.Types
 open Fable.Core
 open Fable.Core.JsInterop
-open Fable.Helpers.React
-open Fable.Helpers.React.Props
-open Fable.Import.React
+open Fable.React
+open Fable.React.Props

 type cell = { content:ReactElement; className:string; isHeader:bool; colSpan:int }

@@ -31,8 +31,8 @@ type row = {

 let createCell (inHeaderRow:bool) (c:cell) =
   match c.isHeader || inHeaderRow with
-   | false -> td [ ClassName c.className; ColSpan (float c.colSpan) ] [ c.content ]
-   | true -> th [ ClassName c.className; ColSpan (float c.colSpan) ] [ c.content ]
+   | false -> td [ ClassName c.className; ColSpan (int c.colSpan) ] [ c.content ]
+   | true -> th [ ClassName c.className; ColSpan (int c.colSpan) ] [ c.content ]

 let createRow (isHeaderRow:bool) (r:row) =
  match r.header, isHeaderRow, r.onClick  with
@@ -70,7 +70,7 @@ let createDataTable (headers:row option) (rl:row list) (buttons:ReactElement) =
              ]
            | None ->
              [ tbody [] rws ]
-  div [ Class "bts-data-table-container" ][
+  div [ Class "bts-data-table-container" ] [
    table [ ClassName (sprintf "table bts-data-table") ] tbl
    div [Class "is-pulled-right table-buttons"] [ buttons ]
    div [Class "is-clearfix	"] []
@@ -86,7 +86,7 @@ let createDataTableWithStyle (headers:row option) (rl:row list) (className:strin
              ]
            | None ->
              [ tbody [] rws ]
-  div [ Class "bts-data-table-container" ][
+  div [ Class "bts-data-table-container" ] [
    table [ ClassName (sprintf "table bts-data-table %s" className); Style style ] tbl
    div [Class "is-pulled-right table-buttons"] [ buttons ]
    div [Class "is-clearfix	"] []
@@ -109,4 +109,4 @@ let createSelectorTableWithStyle (headers:row option) (rl:row list) className st
    If a  callback is provided add a checkbox as the first column and set a background color if it is checked... in addition to the callback
  *)

-let createSelectorTable (headers:row option) (rl:row list) = createSelectorTableWithStyle headers rl "" []
+let createSelectorTable (headers:row option) (rl:row list) = createSelectorTableWithStyle headers rl "" []
@@ -0,0 +1,7 @@
+module nbsp
+
+
+open Fable.Core
+open Fable.React
+open Fable.React.Props
+let element = span [ Style [PaddingLeft "1ex"] ] [str " "]
@@ -95,8 +95,33 @@ export class DynamicService {
        streams : Array<[string,number,string]>) {

        const svc = { context, name, qualifier }
+        // HACK ALERT: Method prefixes 'get_' and 'set_' seem to be ignored by fable bindings. This
+        // was observed in IAdminService.get_filtered_admin_data, IAdminService.get_admin_data, and
+        // IMarginService.set_cash_factor. Calls to those methods (from fsharp) failed in javascript
+        // due to undefined methods 'filtered_admin_data', 'admin_data', and 'cash_factor'
+        // respectively. Adding the methods with the prefix removed seems to fix the problem.
+        //
+        // WARNING: This hack assumes services won't have methods get_<foo> and set_<foo> (if both
+        // are present, one of them will be overwritten).
+        //
+        // TODO: Replace this hack with a stable solution.
+        let strip_prefix = (prefix:string) => {
+            if (!methodName.startsWith(prefix)) {
+                return false
+            }
+            let without_prefix = methodName.substring(prefix.length)
+            if (without_prefix in this) {
+                throw new Error(
+                    `The method '${without_prefix}' has already been defined. Services cannot have ` +
+                    `methods named get_<foo> and set_<foo> due to a hack in our js generation impl`);
+            }
+            this[without_prefix] = this[methodName]
+            return true
+        }
+
        for (var [methodName, id, inType, outType] of methods) {
            this[methodName] = gen_method(svc, id, inType, outType)
+            strip_prefix('get_') || strip_prefix('set_')
        }
        for (var [streamName,id,typeName] of streams) {
            const fnName = "subscribe_" + streamName;
@@ -1,66 +1,78 @@
-module Global
-open Fable.Core
-open Fable.PowerPack
-
-let Class = Fable.Helpers.React.Props.HTMLAttr.ClassName
-
-type AlertLevel =
-  | Info
-  | Warning
-  | Error
-
-[<Emit("alert($1)")>]
-let alert (_:AlertLevel) (_:string) = Fable.Core.Exceptions.jsNative
-
-let compareDouble (d1:double) (d2:double) (precision: uint32) = (int (d1 * (double precision))) = (int (d2 * (double precision)))
-
-let epochToDateTimeString (time:int64) =
-  let dto = time |> System.DateTimeOffset.FromUnixTimeSeconds
-  dto.DateTime |> (Date.Format.localFormat Date.Local.englishUS "M/d/yyyy hh:mm tt")
-
-
-let toSortableDate (badDate:string) =
-  let month = badDate.[0]
-  let year = badDate.[1]
-
-  let curYear = System.DateTime.Now.Year
-
-  let yearMap = Map.empty.
-                  Add((string curYear).[3], curYear).
-                  Add((string (curYear + 1 )).[3], curYear + 1).
-                  Add((string (curYear + 2 )).[3], curYear + 2).
-                  Add((string (curYear + 3 )).[3], curYear + 3).
-                  Add((string (curYear + 4 )).[3], curYear + 4).
-                  Add((string (curYear + 5 )).[3], curYear + 5).
-                  Add((string (curYear + 6 )).[3], curYear + 6).
-                  Add((string (curYear + 7 )).[3], curYear + 7).
-                  Add((string (curYear + 8 )).[3], curYear + 8).
-                  Add((string (curYear + 9 )).[3], curYear + 9)
-
-  let fullYear = string yearMap.[year]
-
-  sprintf "%s%c" fullYear month
-
-
-
-
-module Reflection =
-  open Fable.Core.JsInterop
-
-  [<Emit("Object.keys($0)")>]
-  let keys x : string[]  = jsNative
-
-  [<Emit("Object.values($0)")>]
-  let values<'a> x : 'a[]  = jsNative
-
-  let iterate<'a> x : (string*'a)[] =
-    Array.zip (keys x) (values x)
-
-  let spread<'a> (a:'a) (b:obj) : 'a  = Imports.DynamicService.merge (a,b)
-
-  let objToPairs (o:obj) =
-    Array.zip (keys o) (values o)
-
-  let pairsToObj<'a> (kv: (string*'a) seq) =
-    createObj (unbox kv)
-
+module Global
+
+// type Page =
+//     | Home
+//     | Counter
+//     | About
+
+// let toHash page =
+//     match page with
+//     | About -> "#about"
+//     | Counter -> "#counter"
+//     | Home -> "#home"
+
+open Fable.Core
+
+let Class = Fable.React.Props.HTMLAttr.ClassName
+
+type AlertLevel =
+  | Info
+  | Warning
+  | Error
+
+[<Emit("alert($1)")>]
+let alert (l:AlertLevel) (m:string) = jsNative
+
+// [<Emit("alert($1)")>]
+// let alert (_:AlertLevel) (_:string) = Fable.Core.JS.Exceptions.jsNative
+
+let compareDouble (d1:double) (d2:double) (precision: uint32) = (int (d1 * (double precision))) = (int (d2 * (double precision)))
+
+let epochToDateTimeString (time:int64) =
+  let dto = time |> System.DateTimeOffset.FromUnixTimeSeconds
+  dto.DateTime.ToString("M/d/yyyy hh:mm tt")
+
+
+let toSortableDate (badDate:string) =
+  let month = badDate.[0]
+  let year = badDate.[1]
+
+  let curYear = System.DateTime.Now.Year
+
+  let yearMap = Map.empty.
+                  Add((string curYear).[3], curYear).
+                  Add((string (curYear + 1 )).[3], curYear + 1).
+                  Add((string (curYear + 2 )).[3], curYear + 2).
+                  Add((string (curYear + 3 )).[3], curYear + 3).
+                  Add((string (curYear + 4 )).[3], curYear + 4).
+                  Add((string (curYear + 5 )).[3], curYear + 5).
+                  Add((string (curYear + 6 )).[3], curYear + 6).
+                  Add((string (curYear + 7 )).[3], curYear + 7).
+                  Add((string (curYear + 8 )).[3], curYear + 8).
+                  Add((string (curYear + 9 )).[3], curYear + 9)
+
+  let fullYear = string yearMap.[year]
+
+  sprintf "%s%c" fullYear month
+
+
+module Reflection =
+  open Fable.Core.JsInterop
+
+  [<Emit("Object.keys($0)")>]
+  let keys x : string[]  = jsNative
+
+  [<Emit("Object.values($0)")>]
+  let values<'a> x : 'a[]  = jsNative
+
+  let iterate<'a> x : (string*'a)[] =
+    Array.zip (keys x) (values x)
+
+  let spread<'a> (a:'a) (b:obj) : 'a  = Imports.DynamicService.merge (a,b)
+
+  let objToPairs (o:obj) =
+    Array.zip (keys o) (values o)
+
+  let pairsToObj<'a> (kv: (string*'a) seq) =
+    createObj (unbox kv)
+
@@ -0,0 +1,23 @@
+module Imports
+
+open Fable.Core
+open Fable.Core.JS
+open Fable.Core.JsInterop
+
+
+// [<Import("*",from="/home/john/Documents/repos/bts/spark-crypto/src/web/ui/src/web/api/ServiceContext")>]
+// let ServiceContext : ServiceContext.IExports = jsNative
+
+// [<Import("*",from="/home/john/Documents/repos/bts/spark-crypto/src/web/ui/src/web/api/DynamicService")>]
+// let DynamicService : DynamicService.IExports = jsNative
+[<Import("*",from="ServiceContext")>]
+let ServiceContext : ServiceContext.IExports = jsNative
+
+[<Import("*",from="DynamicService")>]
+let DynamicService : DynamicService.IExports = jsNative
+
+
+// let ServiceContext : ServiceContext.IExports = importAll "ServiceContext"
+// let DynamicService : DynamicService.IExports = importAll "DynamicService"
+
+// let DynamicService : DynamicService.IExports = importAll "web/api/DynamicService"
@@ -2,8 +2,8 @@ module Login

 open Fable.Core.JsInterop
 open Fable.Core
-open Fable.Helpers.React
-open Fable.Helpers.React.Props
+open Fable.React
+open Fable.React.Props
 open Elmish

 //
@@ -28,7 +28,7 @@ let init() =
    { user = ""; password = ""; error = "" }, Cmd.Empty

 let loginMsg user pass =
-    Cmd.ofPromise
+    Cmd.OfPromise.either
        Imports.ServiceContext.connect
        (user,pass)
        (function | U2.Case1 sc -> LoginSuccess sc | U2.Case2 str -> LoginFailure str)
@@ -52,15 +52,15 @@ let update msg model =
 // View

 let root model dispatch =
-    let sparkImg = "img/BTS-300.png"
-    let handler msg (ev:Fable.Import.React.FormEvent) =
+    let sparkImg = "public/img/BTS-300.png"
+    let handler msg (ev:Browser.Types.Event) =
        !!ev.target?value |> msg |> dispatch
    section [ ClassName "hero is-fullheight is-primary" ] [
        div [ ClassName "hero-body" ] [
            div [ ClassName "container has-text-centered" ] [
                div [ ClassName "column is-4 is-offset-4" ] [
                      div [ ClassName "box" ] [
-                          p [ Style [Margin "2em 0 3em 0"] ][
+                          p [ Style [Margin "2em 0 3em 0"] ] [
                            figure [ ClassName "avatar" ] [
                              img [ Src sparkImg ]
                              ]
@@ -1,63 +1,60 @@
-module App.Nav
-
-
-open Elmish
-open Elmish.Browser.Navigation
-open Fable.Core
-open Fable.Core.JsInterop
-open Fable.Import
-open Fable.Import.Browser
-open Types
-open App.State
-open App.Types
-open Global
-
-open Fable.Helpers.React
-open Fable.Helpers.React.Props
-open Elmish.React.Common
-open ServiceContext
-open Fable.Helpers
-open Imports
-open Fable.Import.React
-
-let isCurrentPage page currentPage =
-  match page, currentPage with
-    | UsersModel _, UsersModel _ -> true
-    | AccountsModel _, AccountsModel _ -> true
-    | _ -> false
-
-let navItem label icon state currentPage dispatch =
-  a [
-      OnClick (fun _ -> Navigate state |> dispatch)
-      classList [ "is-active", isCurrentPage (fst state) currentPage ]
-    ]
-    [
-        div [ ClassName "icon is-large" ] [
-                i [ ClassName (sprintf "fa fa-2x fa-%s" icon) ] []
-              ]
-        div [] [str label]
-    ]
-
-let root (currentPage:Page) (sc:ServiceContext) dispatch =
-   let tmap (a,b) (fa,fb) = (fa a, fb b)
-   div [ Class "column is-narrow is-launcher-sidebar-menu" ]
-       [ aside [ Class "menu" ]
-           [ ul [ Class "menu-list" ]
-               [ li [ Class "launcher-item"  ]
-                   [ navItem "Users" "users"  (tmap (Users.State.init sc) (UsersModel, Cmd.map UsersMsg)) currentPage dispatch ]
-                 li [ Class "launcher-item" ]
-                   [ navItem "Accounts" "server" (tmap (Accounts.State.init sc) (AccountsModel,Cmd.map AccountsMsg)) currentPage dispatch ]
-                 li [ Class "launcher-item" ]
-                   [ a [ Href "/" ]
-                       [ div [ ClassName "icon is-large" ] [
-                                i [ ClassName "fa fa-3x fa-sign-out" ] []
-                              ]
-                         div [] [str ("Logout \n" + sc.username)]
-                       ]
-                   ]
-               ]
-           ]
-       ]
-
-let (navRoot: Page -> ServiceContext -> Dispatch<Msg> -> ReactElement) = 
-    lazyView3With (fun b c -> isCurrentPage (fst b) (fst c)) root
+module App.Nav
+
+
+open Elmish
+open Fable.Core
+open Fable.Core.JsInterop
+open Fable.Import
+open Types
+open App.State
+open App.Types
+open Global
+
+open Fable.React
+open Fable.React.Props
+open Elmish.React.Common
+open ServiceContext
+open Imports
+open Fable.React
+
+let isCurrentPage page currentPage =
+  match page, currentPage with
+    | UsersModel _, UsersModel _ -> true
+    | AccountsModel _, AccountsModel _ -> true
+    | _ -> false
+
+let navItem label icon state currentPage dispatch =
+  a [
+      OnClick (fun _ -> Navigate state |> dispatch)
+      classList [ "is-active", isCurrentPage (fst state) currentPage ]
+    ]
+    [
+        div [ ClassName "icon is-large" ] [
+                i [ ClassName (sprintf "fa fa-2x fa-%s" icon) ] []
+              ]
+        div [] [str label]
+    ]
+
+let root (currentPage:Page) (sc:ServiceContext) dispatch =
+   let tmap (a,b) (fa,fb) = (fa a, fb b)
+   div [ Class "column is-narrow is-launcher-sidebar-menu" ]
+       [ aside [ Class "menu" ]
+           [ ul [ Class "menu-list" ]
+               [ li [ Class "launcher-item"  ]
+                   [ navItem "Users" "users"  (tmap (Users.State.init sc) (UsersModel, Cmd.map UsersMsg)) currentPage dispatch ]
+                 li [ Class "launcher-item" ]
+                   [ navItem "Accounts" "server" (tmap (Accounts.State.init sc) (AccountsModel,Cmd.map AccountsMsg)) currentPage dispatch ]
+                 li [ Class "launcher-item" ]
+                   [ a [ Href "/" ]
+                       [ div [ ClassName "icon is-large" ] [
+                                i [ ClassName "fa fa-3x fa-sign-out" ] []
+                              ]
+                         div [] [str ("Logout \n" + sc.username)]
+                       ]
+                   ]
+               ]
+           ]
+       ]
+
+let (navRoot: Page -> ServiceContext -> Dispatch<Msg> -> ReactElement) =
+    lazyView3With (fun b c -> isCurrentPage (fst b) (fst c)) root
@@ -2,11 +2,7 @@ import {root} from 'proto'
 import { assert, assertValid } from 'bts_assert'

 function default_ws_uri() {
-    if (typeof window == 'undefined') return 'ws://sparkvm:8000/'
    const loc = window.location
-    if (loc.hostname === "localhost" && loc.port === '8000') {
-        return "ws://sparkvm:8000/"
-    }
    let ws_uri = "ws:";
    if (loc.protocol === "https:") {
        ws_uri = "wss:";
@@ -1,69 +1,86 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-  </PropertyGroup>
-  <Choose>
-    <When Condition="'$(OUT)'==''">
-      <PropertyGroup>
-        <API>../../../../build/web/api</API>
-      </PropertyGroup>
-    </When>
-    <Otherwise>
-      <PropertyGroup>
-        <API>$(OUT)/api</API>
-      </PropertyGroup>
-    </Otherwise>
-  </Choose>
-  <ItemGroup>
-    <Compile Include="$(API)/ServiceContext.fs" />
-    <Compile Include="$(API)/DynamicService.fs" />
-    <Compile Include="Imports.fs" />
-    <Compile Include="Util/JSMap.fs" />
-    <Compile Include="Util/StreamUtils.fs" />
-    <Compile Include="Util/EnumUtils.fs" />
-    <Compile Include="$(API)/fable/timestamp.fable.fs" />
-    <Compile Include="$(API)/fable/apicore.fable.fs" />
-    <Compile Include="$(API)/fable/apioptions.fable.fs" />
-    <Compile Include="$(API)/fable/Security.fable.fs" />
-    <Compile Include="$(API)/fable/SparkProtos.fable.fs" />
-    <Compile Include="$(API)/fable/HelloService.fable.fs" />
-    <Compile Include="$(API)/fable/OrderService.fable.fs" />
-    <Compile Include="$(API)/fable/AdminService.fable.fs" />
-    <Compile Include="$(API)/fable/PositionService.fable.fs" />
-    <Compile Include="$(API)/fable/BasePositionService.fable.fs" />
-    <Compile Include="$(API)/fable/MarginService.fable.fs" />
-    <Compile Include="$(API)/fable/co2.fable.fs" />
-    <Compile Include="$(API)/fable/MarketDataRelay.fable.fs" />
-    <!-- Global to the app -->
-    <Compile Include="Lens.fs" />
-    <Compile Include="Global.fs" />
-    <Compile Include="Cmd.fs" />
-    <Compile Include="Controls/nbsp.fs" />
-    <Compile Include="Controls/Button.fs" />
-    <Compile Include="Controls/ReactGrid.fs" />
-    <Compile Include="Controls/DataGrid.fs" />
-    <Compile Include="Controls/Fields.fs" />
-    <Compile Include="Controls/Table.fs" />
-    <Compile Include="Controls/Modal.fs" />
-    <Compile Include="Access.fs" />
-    <!-- Login -->
-    <Compile Include="Login/Login.fs" />
-    <!-- Accounts -->
-    <Compile Include="Accounts/Types.fs" />
-    <Compile Include="Accounts/ClipLimits.fs" />
-    <Compile Include="Accounts/ProductLimits.fs" />
-    <Compile Include="Accounts/SecurityLimits.fs" />
-    <Compile Include="Accounts/State.fs" />
-    <Compile Include="Accounts/View.fs" />
-    <!-- Users -->
-    <Compile Include="Users/Types.fs" />
-    <Compile Include="Users/State.fs" />
-    <Compile Include="Users/View.fs" />
-    <!-- App -->
-    <Compile Include="Types.fs" />
-    <Compile Include="State.fs" />
-    <Compile Include="Nav.fs" />
-    <Compile Include="App.fs" />
-  </ItemGroup>
-  <Import Project="..\.paket\Paket.Restore.targets" />
-</Project>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net7.0</TargetFramework>
+    <Version>1.0.0</Version>
+    <AssemblyVersion>1.0.0</AssemblyVersion>
+  </PropertyGroup>
+  <Choose>
+    <When Condition="'$(SPARK_ADMIN_WEB_APP_OUTPUT_DIR)'==''">
+      <PropertyGroup>
+        <API>../../../build/Spark.Admin.WebApp</API>
+      </PropertyGroup>
+    </When>
+    <Otherwise>
+      <PropertyGroup>
+        <API>$(SPARK_ADMIN_WEB_APP_OUTPUT_DIR)</API>
+      </PropertyGroup>
+    </Otherwise>
+  </Choose>
+  <ItemGroup>
+    <!-- Global to the app -->
+    <Compile Include="Lens.fs" />
+    <Compile Include="Cmd.fs" />
+
+    <Compile Include="$(API)/ServiceContext.fs" />
+    <Compile Include="$(API)/DynamicService.fs" />
+    <Compile Include="Imports.fs" />
+    <Compile Include="Util/JSMap.fs" />
+    <Compile Include="Util/StreamUtils.fs" />
+    <Compile Include="Util/EnumUtils.fs" />
+    <Compile Include="$(API)/fable/timestamp.fable.fs" />
+    <Compile Include="$(API)/fable/apicore.fable.fs" />
+    <Compile Include="$(API)/fable/apioptions.fable.fs" />
+    <Compile Include="$(API)/fable/Security.fable.fs" />
+    <Compile Include="$(API)/fable/SparkProtos.fable.fs" />
+    <Compile Include="$(API)/fable/HelloService.fable.fs" />
+    <Compile Include="$(API)/fable/OrderService.fable.fs" />
+    <Compile Include="$(API)/fable/AdminService.fable.fs" />
+    <Compile Include="$(API)/fable/PositionService.fable.fs" />
+    <Compile Include="$(API)/fable/BasePositionService.fable.fs" />
+    <Compile Include="$(API)/fable/MarginService.fable.fs" />
+    <Compile Include="$(API)/fable/co2.fable.fs" />
+    <Compile Include="$(API)/fable/MarketDataRelay.fable.fs" />
+    <!-- Global to the app -->
+    <Compile Include="Global.fs" />
+    <Compile Include="Controls/nbsp.fs" />
+    <Compile Include="Controls/Button.fs" />
+    <Compile Include="Controls/ReactGrid.fs" />
+    <Compile Include="Controls/DataGrid.fs" />
+    <Compile Include="Controls/Fields.fs" />
+    <Compile Include="Controls/Table.fs" />
+    <Compile Include="Controls/Modal.fs" />
+    <Compile Include="Access.fs" />
+    <!-- Login -->
+    <Compile Include="Login/Login.fs" />
+    <!-- Accounts -->
+    <Compile Include="Accounts/Types.fs" />
+    <Compile Include="Accounts/ClipLimits.fs" />
+    <Compile Include="Accounts/ProductLimits.fs" />
+    <Compile Include="Accounts/SecurityLimits.fs" />
+    <Compile Include="Accounts/State.fs" />
+    <Compile Include="Accounts/View.fs" />
+    <!-- Users -->
+    <Compile Include="Users/Types.fs" />
+    <Compile Include="Users/State.fs" />
+    <Compile Include="Users/View.fs" />
+    <!-- App -->
+    <Compile Include="Types.fs" />
+    <Compile Include="State.fs" />
+    <Compile Include="Nav.fs" />
+    <Compile Include="App.fs" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Elmish" Version="4.0.1" />
+    <PackageReference Include="Elmish.Navigation" Version="1.0.0" />
+    <PackageReference Include="Fable.Core" Version="4.0.0-theta-007" />
+    <PackageReference Include="Fable.Elmish" Version="4.0.1" />
+    <PackageReference Include="Fable.Elmish.Browser" Version="4.0.1" />
+    <PackageReference Include="Fable.Elmish.React" Version="4.0.0" />
+    <PackageReference Include="Fable.Elmish.UrlParser" Version="1.0.1" />
+    <PackageReference Include="Fable.Elmish.Debugger" Version="4.0.0" />
+    <PackageReference Include="Fable.Elmish.HMR" Version="7.0.0" />
+    <PackageReference Include="Fable.Promise" Version="3.2.0" />
+    <PackageReference Include="Fable.React" Version="9.2.0" />
+    <PackageReference Include="System.Runtime" Version="4.3.1" />
+  </ItemGroup>
+</Project>
@@ -1,39 +1,36 @@
-module App.State
-
-open Elmish
-open Elmish.Browser.Navigation
-open Elmish.Browser.UrlParser
-open Fable.Import.Browser
-open Global
-open Types
-
-let init () =
-    let model,cmd = Login.init()
-    PreLogin model, Cmd.map LoginMsg cmd
-
-let updateLoggedIn msg model =
-    match msg, model.page with
-    | UsersMsg msg, UsersModel m ->
-        let (users, usersCmd) = Users.State.update msg m
-        { model with page = UsersModel users }, Cmd.map UsersMsg usersCmd
-    | AccountsMsg msg, AccountsModel m ->
-        let (acc, msg) = Accounts.State.update msg m
-        { model with page = AccountsModel acc }, Cmd.map AccountsMsg msg
-    | Navigate (page,pcmd), _ ->
-        { model with page = page }, pcmd
-    | _ -> model, Cmd.Empty
-
-let update msg model =
-    match model with
-    | PreLogin p -> 
-        match msg with
-        | LoginMsg (Login.LoginSuccess ctx) ->
-            let (lmodel, lmsg) = Users.State.init ctx
-            LoggedIn { context = ctx; page = UsersModel lmodel }, Cmd.map UsersMsg lmsg
-        | LoginMsg m' -> 
-            let (lmodel, lmsg) = Login.update m' p
-            PreLogin lmodel, Cmd.map LoginMsg lmsg
-        | _ -> model, Cmd.Empty
-    | LoggedIn m -> 
-        let lmodel, lmsg = updateLoggedIn msg m
-        LoggedIn lmodel, lmsg
+module App.State
+
+open Elmish
+open Types
+
+
+let init () =
+    let model,cmd = Login.init()
+    PreLogin model, Cmd.map LoginMsg cmd
+
+let updateLoggedIn msg model =
+    match msg, model.page with
+    | UsersMsg msg, UsersModel m ->
+        let (users, usersCmd) = Users.State.update msg m
+        { model with page = UsersModel users }, Cmd.map UsersMsg usersCmd
+    | AccountsMsg msg, AccountsModel m ->
+        let (acc, msg) = Accounts.State.update msg m
+        { model with page = AccountsModel acc }, Cmd.map AccountsMsg msg
+    | Navigate (page,pcmd), _ ->
+        { model with page = page }, pcmd
+    | _ -> model, Cmd.Empty
+
+let update msg model =
+    match model with
+    | PreLogin p ->
+        match msg with
+        | LoginMsg (Login.LoginSuccess ctx) ->
+            let (lmodel, lmsg) = Users.State.init ctx
+            LoggedIn { context = ctx; page = UsersModel lmodel }, Cmd.map UsersMsg lmsg
+        | LoginMsg m' ->
+            let (lmodel, lmsg) = Login.update m' p
+            PreLogin lmodel, Cmd.map LoginMsg lmsg
+        | _ -> model, Cmd.Empty
+    | LoggedIn m ->
+        let lmodel, lmsg = updateLoggedIn msg m
+        LoggedIn lmodel, lmsg
@@ -1,25 +1,24 @@
-module App.Types
-
-open Global
-open ServiceContext
-open Imports
-
-type Page =
-  | UsersModel of Users.Types.Model
-  | AccountsModel of Accounts.Types.Model
-
-type Msg =
-  | UsersMsg of Users.Types.Msg
-  | LoginMsg of Login.Message
-  | Navigate of Page*Elmish.Cmd<Msg>
-  | AccountsMsg of Accounts.Types.Msg
-
-
-type LoggedInModel = { 
-  context : ServiceContext
-  page : Page
-}
-
-type Model = 
-  | PreLogin of Login.Model
-  | LoggedIn of LoggedInModel
+module App.Types
+
+open Global
+open ServiceContext
+
+type Page =
+  | UsersModel of Users.Types.Model
+  | AccountsModel of Accounts.Types.Model
+
+type Msg =
+  | UsersMsg of Users.Types.Msg
+  | LoginMsg of Login.Message
+  | Navigate of Page*Elmish.Cmd<Msg>
+  | AccountsMsg of Accounts.Types.Msg
+
+
+type LoggedInModel = {
+  context : ServiceContext
+  page : Page
+}
+
+type Model =
+  | PreLogin of Login.Model
+  | LoggedIn of LoggedInModel
@@ -1,339 +1,338 @@
-module Users.State
-
-open Elmish
-open Types
-open System
-open System.Runtime.InteropServices
-open Fable.Import
-open Fable.Core
-open Fable.Core.JsInterop
-open System.Xml
-open Fable.PowerPack.PromiseImpl
-open bts.api.admin
-open Global
-
-let SMPInstructionMap:Map<string, string> = Map.empty
-                                                  .Add("O", "Cancel Resting")
-                                                  .Add("N", "Cancel Aggressing")
-                                                  .Add("", "Undefined")
-
-let isNewUser (user:BTSUser) =
-  user.id = 0u && user.isPresent
-
-let getAdminData (admin:IAdminService) (token:string) =
-  Cmd.ofPromise
-    admin.get_filtered_admin_data ()
-    UpdateAdminData
-    (fun _ -> RpcResponse "Error getting admin data")
-
-let defaultScratchUser = {
-  isPresent = true
-  id = 0u
-  parentGroupId = 1u
-  isActive = true
-  canCreate = false
-  name = ""
-  password = ""
-  fullName = ""
-  company = ""
-  licenseData =
-    {
-      createDate = 0L
-      renewDate = 0L
-      expiryDate = 0L
-    }
-  licenseEntitlements =
-    {
-      clientSideApi = false
-      serverSideApi = false
-      spreader = false
-    }
-  userData =
-    {
-    accountPermissions = { accountPermissions = JSMap.empty<UserAccountPermissionUnit> }
-    exchangeUserData =
-      {
-        adminDisplayFlag = bts.api.admin.ExchangeUserData.AdminDisplay.None
-        cmeData = {
-                  operatorId = ""
-                  smpId = ""
-                  miscTags = JSMap.empty<string>
-                  smpInstruction = ""
-                  location = ""
-                  proNonpro = ProfessionalDesignation.PRO
-                  displayNondisplay = DisplayDesignation.DISPLAY
-                  mdPermissions = [||]
-        }
-        simData = {
-                  operatorId = ""
-                  location = ""
-        }
-        iceData = {
-                  companyId = 0
-                  operatorId = ""
-                  authorizedTrader = ""
-                  authorizedGroup = ""
-                  password = ""
-                  custOrderHandingInst = ""
-                  mifidDirectElectronicAccess = -1
-                  mifidTradingCapacity = -1
-                  mifidLiquidityProvision = -1
-                  mifidCommodityDerivIndicator = -1
-                  mifidInvestmentDecision = -1L
-                  mifidExecutionDecision = -1L
-                  mifidClientIdCode = -1L
-                  mifidId = -1L
-                  miscTags = JSMap.empty<string>
-                  proNonpro = ProfessionalDesignation.PRO
-                  displayNondisplay = DisplayDesignation.DISPLAY
-                  mdPermissions = [||]
-        }
-      }
-  }
-}
-
-let init (context:ServiceContext.ServiceContext) : Model * Cmd<Msg> =
-  //let user = UserService.Create context ""
-  let admin = AdminService.Create context ""
-  {
-    userList = []
-    accountsList = []
-    scratchUser = defaultScratchUser
-    PreviousScratchUser = defaultScratchUser
-    currentTab = Tab.General
-    admin = admin
-    adminData = None
-    OptionsMenuOpen = ""
-    ConfirmModal = "", (Msg.SwitchTab Tab.General)
-    token = context.token
-    can_create = context.can_create
-    this_username = context.username
-  }, getAdminData admin context.token
-
-let rec removeUser (user:BTSUser) (userList:BTSUser list) =
-    match userList with
-    | hd::tl when (fun (usr:BTSUser) -> usr.id = user.id) hd -> tl
-    | hd::tl -> hd::removeUser user tl
-    | _ -> []
-
-let getFirstUser usrlst =
-  let head = (List.sortBy (fun (u:BTSUser) -> u.name.ToLower()) usrlst) |> List.tryHead
-  match head with
-  | None -> defaultScratchUser
-  | Some hd -> hd
-
-let findUserInList (user:BTSUser) (userList:BTSUser list) =
-  List.tryFind (fun (x:BTSUser) ->
-                                   x.id = user.id
-                                   || (user.id = 0u && x.name = user.name)
-                                 )
-                                 userList
-
-let getCurrentOrFirstUser (model:Model) (userList:BTSUser list) =
-  match (findUserInList model.scratchUser userList), (findUserInList model.PreviousScratchUser userList) with
-  | Some cu, _ -> cu
-  | None, Some pu -> pu
-  | None, None -> getFirstUser userList
-
-let getCurrentUser (model:Model) = getCurrentOrFirstUser model model.userList
-
-let currentUserIsDefault model = ((getCurrentUser model).id = 0u)
-
-
-let userIsdirty (initialState:BTSUser) (scratch:BTSUser) (existing:BTSUser) = (scratch <> existing) && (scratch <> initialState)
-
-let userIsSelected (initialState:BTSUser) (scratch:BTSUser) = scratch <> initialState
-
-let saveUser (admin:IAdminService) (user:BTSUser) (model:Model) = promise {
-  let! result = admin.update_user { completeData = user }
-  if (result.isSuccess) then
-    let! data = admin.get_filtered_admin_data ()
-    return UpdateAdminData data
-  else
-    return ErrorOccured (sprintf "Error saving user: %s" result.errorText)
-}
-
-let deleteUser (admin:IAdminService) (user:BTSUser) (model:Model) = promise {
-  let! result = admin.delete_user { id = user.id }
-  if (result.isSuccess) then
-    let! data = admin.get_filtered_admin_data ()
-    return UpdateAdminData data
-  else
-    return ErrorOccured (sprintf "Error deleting user: %s" result.errorText)
-}
-
-let createUser (admin:IAdminService) (user:BTSUser) (model:Model)= promise {
-    let args : UserCreateAPIArgument = {
-          parentGroupId = user.parentGroupId
-          name = user.name
-          password = user.password
-          fullName = user.fullName
-          company = user.company
-          licenseData =  user.licenseData
-          licenseEntitlements = user.licenseEntitlements
-    }
-    let! result = admin.create_user args
-    if result.isSuccess then
-      return! saveUser admin { user with id = result.newId } model
-    else
-      return ErrorOccured (sprintf "Error creating user: %s" result.errorText)
-  }
-
-//let updateExchangeMdEntitlementDataCMEData user dta :BTSUser = { user with userData = { user.userData with exchangeMdEntitlementData = { user.userData.exchangeMdEntitlementData with cmeData = dta}}}
-let updateCMEExchangeUserData (user:BTSUser) dta = { user with userData = { user.userData with exchangeUserData = { user.userData.exchangeUserData with cmeData = dta }}}
-let updateSIMExchangeUserData (user:BTSUser) dta = { user with userData = { user.userData with exchangeUserData = { user.userData.exchangeUserData with simData = dta }}}
-let updateICEExchangeUserData (user:BTSUser) dta = { user with userData = { user.userData with exchangeUserData = { user.userData.exchangeUserData with iceData = dta }}}
-
-let default_user_account = {
-  tradingPermission =
-    { hasPermissions = false
-  }
-  adminPermission =
-    { hasPermissions = false
-      hasMdPermissions = false }
-}
-
-
-let applyUpdate (field:UserField) (user:BTSUser) =
-  match field with
-  | Name n -> { user with name = n }
-  | Password p -> { user with password = p }
-  | FullName fn -> { user with fullName = fn }
-  | Company cc -> { user with company = cc }
-  | IsActive ia -> { user with isActive = ia }
-  | CanCreate cr -> { user with canCreate = cr }
-  | CMEOperatorID oid -> updateCMEExchangeUserData user { user.userData.exchangeUserData.cmeData with operatorId = oid }
-
-  | ICECompanyID oid -> updateICEExchangeUserData user { user.userData.exchangeUserData.iceData with companyId = oid }
-  | ICEOperatorID oid -> updateICEExchangeUserData user { user.userData.exchangeUserData.iceData with operatorId = oid }
-  | ICEAuthorizedTrader oid -> updateICEExchangeUserData user { user.userData.exchangeUserData.iceData with authorizedTrader = oid }
-  | ICEAuthorizedGroup oid -> updateICEExchangeUserData user { user.userData.exchangeUserData.iceData with authorizedGroup = oid }
-  | ICEPassword oid -> updateICEExchangeUserData user { user.userData.exchangeUserData.iceData with password = oid }
-  | ICECustOrderHandingInst oid -> updateICEExchangeUserData user { user.userData.exchangeUserData.iceData with custOrderHandingInst = oid }
-
-  | MifidClientIdCode value -> updateICEExchangeUserData user { user.userData.exchangeUserData.iceData with mifidClientIdCode = value }
-  | MifidCommodityDerivIndicator  value -> updateICEExchangeUserData user { user.userData.exchangeUserData.iceData with mifidCommodityDerivIndicator = value }
-  | MifidDirectElectronicAccess  value -> updateICEExchangeUserData user { user.userData.exchangeUserData.iceData with mifidDirectElectronicAccess = value }
-  | MifidExecutionDecision  value -> updateICEExchangeUserData user { user.userData.exchangeUserData.iceData with mifidExecutionDecision = value }
-  | MifidId  value -> updateICEExchangeUserData user { user.userData.exchangeUserData.iceData with mifidId = value }
-  | MifidInvestmentDecision  value -> updateICEExchangeUserData user { user.userData.exchangeUserData.iceData with mifidInvestmentDecision = value }
-  | MifidLiquidityProvision  value -> updateICEExchangeUserData user { user.userData.exchangeUserData.iceData with mifidLiquidityProvision = value }
-  | MifidTradingCapacity  value -> updateICEExchangeUserData user { user.userData.exchangeUserData.iceData with mifidTradingCapacity = value }
-
-  | SimOperatorID oid -> updateSIMExchangeUserData user { user.userData.exchangeUserData.simData with operatorId = oid }
-  | SMPID smpid -> updateCMEExchangeUserData user { user.userData.exchangeUserData.cmeData with  smpId = smpid }
-  | CMELocation loc -> updateCMEExchangeUserData user { user.userData.exchangeUserData.cmeData with  location = loc }
-  | CMEProNonPro loc -> updateCMEExchangeUserData user { user.userData.exchangeUserData.cmeData with proNonpro = loc }
-  | CMEDisplayNonDisplay loc -> updateCMEExchangeUserData user { user.userData.exchangeUserData.cmeData with displayNondisplay = loc }
-  | ICEProNonPro loc -> updateICEExchangeUserData user { user.userData.exchangeUserData.iceData with proNonpro = loc }
-  | ICEDisplayNonDisplay loc -> updateICEExchangeUserData user { user.userData.exchangeUserData.iceData with displayNondisplay = loc }
-  | SimLocation loc -> updateSIMExchangeUserData user { user.userData.exchangeUserData.simData with  location = loc }
-  | SMPInstruction smpi -> updateCMEExchangeUserData user { user.userData.exchangeUserData.cmeData with  smpInstruction = smpi }
-  | MiscTags map -> updateCMEExchangeUserData user { user.userData.exchangeUserData.cmeData with miscTags = map }
-  | CMEMic mic ->
-      let micArr =
-        let mdperm = user.userData.exchangeUserData.cmeData.mdPermissions
-        let found = Array.tryFind (fun (elm:CMEMicData) -> elm.mic = mic.mic) mdperm
-        match found with
-        | Some elm ->
-          let ndx = Array.findIndex (fun (e:CMEMicData) -> e.mic = elm.mic) mdperm
-          Array.set mdperm ndx mic
-          mdperm
-        | None -> Array.concat [[|mic|]; mdperm]
-      updateCMEExchangeUserData user { user.userData.exchangeUserData.cmeData with mdPermissions = micArr }
-  | ICEMic (mic:ICEMicData) ->
-      let micArr =
-        let mdperm = user.userData.exchangeUserData.iceData.mdPermissions
-        let found = Array.tryFind (fun (elm:ICEMicData) -> elm.mic = mic.mic) mdperm
-        match found with
-        | Some elm ->
-          let ndx = Array.findIndex (fun (e:ICEMicData) -> e.mic = elm.mic) mdperm
-          Array.set mdperm ndx mic
-          mdperm
-        | None -> Array.concat [[|mic|]; mdperm]
-      updateICEExchangeUserData user { user.userData.exchangeUserData.iceData with mdPermissions = micArr }
-  | TradingPerm (id:string, can_trade:bool) ->
-         let find = JSMap.tryFind id user.userData.accountPermissions.accountPermissions
-         let current = if find.IsNone then default_user_account else find.Value
-         let updated = { current with tradingPermission = { current.tradingPermission with hasPermissions = can_trade } }
-         let newAccountPermissions = JSMap.add id updated user.userData.accountPermissions.accountPermissions
-         let newUserData = { user.userData with accountPermissions =  { user.userData.accountPermissions with accountPermissions = newAccountPermissions } }
-         { user with userData = newUserData }
-   | RiskAdmin (id, admin) ->
-         let find = JSMap.tryFind id user.userData.accountPermissions.accountPermissions
-         let current = if find.IsNone then default_user_account else find.Value
-         let updated = { current with adminPermission = { current.adminPermission with hasPermissions = admin } }
-         let newAccountPermissions = JSMap.add id updated user.userData.accountPermissions.accountPermissions
-         let newUserData = { user.userData with accountPermissions =  { user.userData.accountPermissions with accountPermissions = newAccountPermissions } }
-         { user with userData = newUserData }
-   | MDAdmin (id, admin) ->
-         let find = JSMap.tryFind id user.userData.accountPermissions.accountPermissions
-         let current = if find.IsNone then default_user_account else find.Value
-         let updated = { current with adminPermission = { current.adminPermission with hasMdPermissions = admin } }
-         let newAccountPermissions = JSMap.add id updated user.userData.accountPermissions.accountPermissions
-         let newUserData = { user.userData with accountPermissions =  { user.userData.accountPermissions with accountPermissions = newAccountPermissions } }
-         { user with userData = newUserData }
-
-  | RemoveAccount id ->
-            let newObj = JSMap.remove id user.userData.accountPermissions.accountPermissions
-            { user with userData = { user.userData with accountPermissions = { user.userData.accountPermissions with accountPermissions = newObj }}}
-
-let update msg (model:Users.Types.Model) : Model * Cmd<Msg> =
-  match msg with
-  | UpdateAdminData adm ->
-    let usrlst = Seq.toList (Seq.filter (fun (usr:BTSUser) -> usr.isPresent) adm.users)
-
-    {model with
-      adminData = Some adm
-      userList = usrlst
-      accountsList = (Seq.toList adm.accounts)
-      scratchUser = (getCurrentOrFirstUser model usrlst)
-    }, Cmd.Empty
-  | RpcResponse str ->
-    printf "%s" str
-    model, Cmd.Empty
-  | UpdateField field ->
-    { model with scratchUser = applyUpdate field model.scratchUser; ConfirmModal = ("", Msg.SwitchTab model.currentTab) } , Cmd.Empty
-  | CloneUser ->
-    { model with PreviousScratchUser = model.scratchUser; scratchUser = { model.scratchUser with id = 0u; name = sprintf "%s_clone" model.scratchUser.name }; OptionsMenuOpen = ""}, Cmd.ofMsg (SwitchTab General)
-  | CopyFrom (usrSrc, usrDest) ->
-    let nusr = { usrSrc with
-                  id = usrDest.id
-                  name = usrDest.name
-                  password = usrDest.password
-                  fullName = usrDest.fullName
-                  company = usrDest.company
-                  isActive = usrDest.isActive
-               }
-    { model with scratchUser = nusr }, Cmd.Empty
-
-  | Delete usr ->
-    let mdl = { model with OptionsMenuOpen = "" }
-    match Fable.Import.Browser.window.confirm (sprintf "Are you sure you want to delete '%s'" usr.name) with
-    | true -> mdl, Cmd.ofExistingPromise (deleteUser model.admin usr model) id (box>>ErrorOccured)
-    | false -> mdl, Cmd.Empty
-
-  | AddUser ->
-    match model.can_create with
-    | true -> { model with PreviousScratchUser = model.scratchUser; scratchUser = { defaultScratchUser with name = "New User" }}, Cmd.ofMsg (SwitchTab General)
-    | false -> model, Cmd.Empty
-  | CancelAddUser ->
-    { model with scratchUser = { model.PreviousScratchUser with name = "New User" }}, Cmd.ofMsg (SwitchTab General)
-  | SwitchTab tb ->
-    {model with currentTab = tb}, Cmd.Empty
-
-  | SwitchUser usr ->
-    { model with PreviousScratchUser = model.scratchUser; scratchUser = usr }, Cmd.Empty
-  | SaveUser ->
-    // match on id = 0 to see if it's a new user
-    match model.scratchUser.id with
-    | 0u -> { model with PreviousScratchUser = model.scratchUser}, Cmd.ofExistingPromise (createUser model.admin {model.scratchUser with name = model.scratchUser.name.ToLower() } model) id (box>>ErrorOccured)
-    | _ -> model, Cmd.ofExistingPromise (saveUser model.admin {model.scratchUser with name = model.scratchUser.name.ToLower() } model) id (box>>ErrorOccured)
-  | ErrorOccured msg ->
-    //Browser.console.log msg
-    Global.alert Global.Error (string msg)
-    model,Cmd.Empty
-  | OpenOptionsMenu usrName ->
-    { model with OptionsMenuOpen = usrName }, Cmd.Empty
-  | OpenConfirmModal (title, okMessage) ->
-    {model with ConfirmModal = title, okMessage}, Cmd.Empty
+module Users.State
+
+open Elmish
+open Types
+open System
+open System.Runtime.InteropServices
+open Fable.Core
+open Fable.Core.JsInterop
+open bts.api.admin
+open Global
+
+let SMPInstructionMap:Map<string, string> = Map.empty
+                                                  .Add("O", "Cancel Resting")
+                                                  .Add("N", "Cancel Aggressing")
+                                                  .Add("", "Undefined")
+
+let isNewUser (user:BTSUser) =
+  user.id = 0u && user.isPresent
+
+let getAdminData (admin:IAdminService) (token:string) =
+  Cmd.OfPromise.either
+    admin.get_filtered_admin_data
+    ()
+    UpdateAdminData
+    (fun e -> RpcResponse("Error getting admin data: " + e.Message))
+
+let defaultScratchUser = {
+  isPresent = true
+  id = 0u
+  parentGroupId = 1u
+  isActive = true
+  canCreate = false
+  name = ""
+  password = ""
+  fullName = ""
+  company = ""
+  licenseData =
+    {
+      createDate = 0L
+      renewDate = 0L
+      expiryDate = 0L
+    }
+  licenseEntitlements =
+    {
+      clientSideApi = false
+      serverSideApi = false
+      spreader = false
+    }
+  userData =
+    {
+    accountPermissions = { accountPermissions = JSMap.empty<UserAccountPermissionUnit> }
+    exchangeUserData =
+      {
+        adminDisplayFlag = bts.api.admin.ExchangeUserData.AdminDisplay.None
+        cmeData = {
+                  operatorId = ""
+                  smpId = ""
+                  miscTags = JSMap.empty<string>
+                  smpInstruction = ""
+                  location = ""
+                  proNonpro = ProfessionalDesignation.PRO
+                  displayNondisplay = DisplayDesignation.DISPLAY
+                  mdPermissions = [||]
+        }
+        simData = {
+                  operatorId = ""
+                  location = ""
+        }
+        iceData = {
+                  companyId = 0
+                  operatorId = ""
+                  authorizedTrader = ""
+                  authorizedGroup = ""
+                  password = ""
+                  custOrderHandingInst = ""
+                  mifidDirectElectronicAccess = -1
+                  mifidTradingCapacity = -1
+                  mifidLiquidityProvision = -1
+                  mifidCommodityDerivIndicator = -1
+                  mifidInvestmentDecision = -1L
+                  mifidExecutionDecision = -1L
+                  mifidClientIdCode = -1L
+                  mifidId = -1L
+                  miscTags = JSMap.empty<string>
+                  proNonpro = ProfessionalDesignation.PRO
+                  displayNondisplay = DisplayDesignation.DISPLAY
+                  mdPermissions = [||]
+        }
+      }
+  }
+}
+
+let init (context:ServiceContext.ServiceContext) : Model * Cmd<Msg> =
+  //let user = UserService.Create context ""
+  let admin = AdminService.Create context ""
+  {
+    userList = []
+    accountsList = []
+    scratchUser = defaultScratchUser
+    PreviousScratchUser = defaultScratchUser
+    currentTab = Tab.General
+    admin = admin
+    adminData = None
+    OptionsMenuOpen = ""
+    ConfirmModal = "", (Msg.SwitchTab Tab.General)
+    token = context.token
+    can_create = context.can_create
+    this_username = context.username
+  }, getAdminData admin context.token
+
+let rec removeUser (user:BTSUser) (userList:BTSUser list) =
+    match userList with
+    | hd::tl when (fun (usr:BTSUser) -> usr.id = user.id) hd -> tl
+    | hd::tl -> hd::removeUser user tl
+    | _ -> []
+
+let getFirstUser usrlst =
+  let head = (List.sortBy (fun (u:BTSUser) -> u.name.ToLower()) usrlst) |> List.tryHead
+  match head with
+  | None -> defaultScratchUser
+  | Some hd -> hd
+
+let findUserInList (user:BTSUser) (userList:BTSUser list) =
+  List.tryFind (fun (x:BTSUser) ->
+                                   x.id = user.id
+                                   || (user.id = 0u && x.name = user.name)
+                                 )
+                                 userList
+
+let getCurrentOrFirstUser (model:Model) (userList:BTSUser list) =
+  match (findUserInList model.scratchUser userList), (findUserInList model.PreviousScratchUser userList) with
+  | Some cu, _ -> cu
+  | None, Some pu -> pu
+  | None, None -> getFirstUser userList
+
+let getCurrentUser (model:Model) = getCurrentOrFirstUser model model.userList
+
+let currentUserIsDefault model = ((getCurrentUser model).id = 0u)
+
+
+let userIsdirty (initialState:BTSUser) (scratch:BTSUser) (existing:BTSUser) = (scratch <> existing) && (scratch <> initialState)
+
+let userIsSelected (initialState:BTSUser) (scratch:BTSUser) = scratch <> initialState
+
+let saveUser (admin:IAdminService) (user:BTSUser) (model:Model) = promise {
+  let! result = admin.update_user { completeData = user }
+  if (result.isSuccess) then
+    let! data = admin.get_filtered_admin_data ()
+    return UpdateAdminData data
+  else
+    return ErrorOccured (sprintf "Error saving user: %s" result.errorText)
+}
+
+let deleteUser (admin:IAdminService) (user:BTSUser) (model:Model) = promise {
+  let! result = admin.delete_user { id = user.id }
+  if (result.isSuccess) then
+    let! data = admin.get_filtered_admin_data ()
+    return UpdateAdminData data
+  else
+    return ErrorOccured (sprintf "Error deleting user: %s" result.errorText)
+}
+
+let createUser (admin:IAdminService) (user:BTSUser) (model:Model)= promise {
+    let args : UserCreateAPIArgument = {
+          parentGroupId = user.parentGroupId
+          name = user.name
+          password = user.password
+          fullName = user.fullName
+          company = user.company
+          licenseData =  user.licenseData
+          licenseEntitlements = user.licenseEntitlements
+    }
+    let! result = admin.create_user args
+    if result.isSuccess then
+      return! saveUser admin { user with id = result.newId } model
+    else
+      return ErrorOccured (sprintf "Error creating user: %s" result.errorText)
+  }
+
+//let updateExchangeMdEntitlementDataCMEData user dta :BTSUser = { user with userData = { user.userData with exchangeMdEntitlementData = { user.userData.exchangeMdEntitlementData with cmeData = dta}}}
+let updateCMEExchangeUserData (user:BTSUser) dta = { user with userData = { user.userData with exchangeUserData = { user.userData.exchangeUserData with cmeData = dta }}}
+let updateSIMExchangeUserData (user:BTSUser) dta = { user with userData = { user.userData with exchangeUserData = { user.userData.exchangeUserData with simData = dta }}}
+let updateICEExchangeUserData (user:BTSUser) dta = { user with userData = { user.userData with exchangeUserData = { user.userData.exchangeUserData with iceData = dta }}}
+
+let default_user_account = {
+  tradingPermission =
+    { hasPermissions = false
+  }
+  adminPermission =
+    { hasPermissions = false
+      hasMdPermissions = false }
+}
+
+
+let applyUpdate (field:UserField) (user:BTSUser) =
+  match field with
+  | Name n -> { user with name = n }
+  | Password p -> { user with password = p }
+  | FullName fn -> { user with fullName = fn }
+  | Company cc -> { user with company = cc }
+  | IsActive ia -> { user with isActive = ia }
+  | CanCreate cr -> { user with canCreate = cr }
+  | CMEOperatorID oid -> updateCMEExchangeUserData user { user.userData.exchangeUserData.cmeData with operatorId = oid }
+  | CMEATSOperatorID _ -> user
+  | MaxOrderRatePerConnection _-> user
+
+  | ICECompanyID oid -> updateICEExchangeUserData user { user.userData.exchangeUserData.iceData with companyId = oid }
+  | ICEOperatorID oid -> updateICEExchangeUserData user { user.userData.exchangeUserData.iceData with operatorId = oid }
+  | ICEAuthorizedTrader oid -> updateICEExchangeUserData user { user.userData.exchangeUserData.iceData with authorizedTrader = oid }
+  | ICEAuthorizedGroup oid -> updateICEExchangeUserData user { user.userData.exchangeUserData.iceData with authorizedGroup = oid }
+  | ICEPassword oid -> updateICEExchangeUserData user { user.userData.exchangeUserData.iceData with password = oid }
+  | ICECustOrderHandingInst oid -> updateICEExchangeUserData user { user.userData.exchangeUserData.iceData with custOrderHandingInst = oid }
+
+  | MifidClientIdCode value -> updateICEExchangeUserData user { user.userData.exchangeUserData.iceData with mifidClientIdCode = value }
+  | MifidCommodityDerivIndicator  value -> updateICEExchangeUserData user { user.userData.exchangeUserData.iceData with mifidCommodityDerivIndicator = value }
+  | MifidDirectElectronicAccess  value -> updateICEExchangeUserData user { user.userData.exchangeUserData.iceData with mifidDirectElectronicAccess = value }
+  | MifidExecutionDecision  value -> updateICEExchangeUserData user { user.userData.exchangeUserData.iceData with mifidExecutionDecision = value }
+  | MifidId  value -> updateICEExchangeUserData user { user.userData.exchangeUserData.iceData with mifidId = value }
+  | MifidInvestmentDecision  value -> updateICEExchangeUserData user { user.userData.exchangeUserData.iceData with mifidInvestmentDecision = value }
+  | MifidLiquidityProvision  value -> updateICEExchangeUserData user { user.userData.exchangeUserData.iceData with mifidLiquidityProvision = value }
+  | MifidTradingCapacity  value -> updateICEExchangeUserData user { user.userData.exchangeUserData.iceData with mifidTradingCapacity = value }
+
+  | SimOperatorID oid -> updateSIMExchangeUserData user { user.userData.exchangeUserData.simData with operatorId = oid }
+  | SMPID smpid -> updateCMEExchangeUserData user { user.userData.exchangeUserData.cmeData with  smpId = smpid }
+  | CMELocation loc -> updateCMEExchangeUserData user { user.userData.exchangeUserData.cmeData with  location = loc }
+  | CMEProNonPro loc -> updateCMEExchangeUserData user { user.userData.exchangeUserData.cmeData with proNonpro = loc }
+  | CMEDisplayNonDisplay loc -> updateCMEExchangeUserData user { user.userData.exchangeUserData.cmeData with displayNondisplay = loc }
+  | ICEProNonPro loc -> updateICEExchangeUserData user { user.userData.exchangeUserData.iceData with proNonpro = loc }
+  | ICEDisplayNonDisplay loc -> updateICEExchangeUserData user { user.userData.exchangeUserData.iceData with displayNondisplay = loc }
+  | SimLocation loc -> updateSIMExchangeUserData user { user.userData.exchangeUserData.simData with  location = loc }
+  | SMPInstruction smpi -> updateCMEExchangeUserData user { user.userData.exchangeUserData.cmeData with  smpInstruction = smpi }
+  | MiscTags map -> updateCMEExchangeUserData user { user.userData.exchangeUserData.cmeData with miscTags = map }
+  | CMEMic mic ->
+      let micArr =
+        let mdperm = user.userData.exchangeUserData.cmeData.mdPermissions
+        let found = Array.tryFind (fun (elm:CMEMicData) -> elm.mic = mic.mic) mdperm
+        match found with
+        | Some elm ->
+          let ndx = Array.findIndex (fun (e:CMEMicData) -> e.mic = elm.mic) mdperm
+          Array.set mdperm ndx mic
+          mdperm
+        | None -> Array.concat [[|mic|]; mdperm]
+      updateCMEExchangeUserData user { user.userData.exchangeUserData.cmeData with mdPermissions = micArr }
+  | ICEMic (mic:ICEMicData) ->
+      let micArr =
+        let mdperm = user.userData.exchangeUserData.iceData.mdPermissions
+        let found = Array.tryFind (fun (elm:ICEMicData) -> elm.mic = mic.mic) mdperm
+        match found with
+        | Some elm ->
+          let ndx = Array.findIndex (fun (e:ICEMicData) -> e.mic = elm.mic) mdperm
+          Array.set mdperm ndx mic
+          mdperm
+        | None -> Array.concat [[|mic|]; mdperm]
+      updateICEExchangeUserData user { user.userData.exchangeUserData.iceData with mdPermissions = micArr }
+  | TradingPerm (id:string, can_trade:bool) ->
+         let find = JSMap.tryFind id user.userData.accountPermissions.accountPermissions
+         let current = if find.IsNone then default_user_account else find.Value
+         let updated = { current with tradingPermission = { current.tradingPermission with hasPermissions = can_trade } }
+         let newAccountPermissions = JSMap.add id updated user.userData.accountPermissions.accountPermissions
+         let newUserData = { user.userData with accountPermissions =  { user.userData.accountPermissions with accountPermissions = newAccountPermissions } }
+         { user with userData = newUserData }
+   | RiskAdmin (id, admin) ->
+         let find = JSMap.tryFind id user.userData.accountPermissions.accountPermissions
+         let current = if find.IsNone then default_user_account else find.Value
+         let updated = { current with adminPermission = { current.adminPermission with hasPermissions = admin } }
+         let newAccountPermissions = JSMap.add id updated user.userData.accountPermissions.accountPermissions
+         let newUserData = { user.userData with accountPermissions =  { user.userData.accountPermissions with accountPermissions = newAccountPermissions } }
+         { user with userData = newUserData }
+   | MDAdmin (id, admin) ->
+         let find = JSMap.tryFind id user.userData.accountPermissions.accountPermissions
+         let current = if find.IsNone then default_user_account else find.Value
+         let updated = { current with adminPermission = { current.adminPermission with hasMdPermissions = admin } }
+         let newAccountPermissions = JSMap.add id updated user.userData.accountPermissions.accountPermissions
+         let newUserData = { user.userData with accountPermissions =  { user.userData.accountPermissions with accountPermissions = newAccountPermissions } }
+         { user with userData = newUserData }
+
+  | RemoveAccount id ->
+            let newObj = JSMap.remove id user.userData.accountPermissions.accountPermissions
+            { user with userData = { user.userData with accountPermissions = { user.userData.accountPermissions with accountPermissions = newObj }}}
+
+let update msg (model:Users.Types.Model) : Model * Cmd<Msg> =
+  match msg with
+  | UpdateAdminData adm ->
+    let usrlst = Seq.toList (Seq.filter (fun (usr:BTSUser) -> usr.isPresent) adm.users)
+
+    {model with
+      adminData = Some adm
+      userList = usrlst
+      accountsList = (Seq.toList adm.accounts)
+      scratchUser = (getCurrentOrFirstUser model usrlst)
+    }, Cmd.Empty
+  | RpcResponse str ->
+    printf "%s" str
+    model, Cmd.Empty
+  | UpdateField field ->
+    { model with scratchUser = applyUpdate field model.scratchUser; ConfirmModal = ("", Msg.SwitchTab model.currentTab) } , Cmd.Empty
+  | CloneUser ->
+    { model with PreviousScratchUser = model.scratchUser; scratchUser = { model.scratchUser with id = 0u; name = sprintf "%s_clone" model.scratchUser.name }; OptionsMenuOpen = ""}, Cmd.ofMsg (SwitchTab General)
+  | CopyFrom (usrSrc, usrDest) ->
+    let nusr = { usrSrc with
+                  id = usrDest.id
+                  name = usrDest.name
+                  password = usrDest.password
+                  fullName = usrDest.fullName
+                  company = usrDest.company
+                  isActive = usrDest.isActive
+               }
+    { model with scratchUser = nusr }, Cmd.Empty
+
+  | Delete usr ->
+    let mdl = { model with OptionsMenuOpen = "" }
+    match Browser.Dom.window.confirm (sprintf "Are you sure you want to delete '%s'" usr.name) with
+    | true -> mdl, Cmd.ofExistingPromise (deleteUser model.admin usr model) id (box>>ErrorOccured)
+    | false -> mdl, Cmd.Empty
+
+  | AddUser ->
+    match model.can_create with
+    | true -> { model with PreviousScratchUser = model.scratchUser; scratchUser = { defaultScratchUser with name = "New User" }}, Cmd.ofMsg (SwitchTab General)
+    | false -> model, Cmd.Empty
+  | CancelAddUser ->
+    { model with scratchUser = { model.PreviousScratchUser with name = "New User" }}, Cmd.ofMsg (SwitchTab General)
+  | SwitchTab tb ->
+    {model with currentTab = tb}, Cmd.Empty
+
+  | SwitchUser usr ->
+    { model with PreviousScratchUser = model.scratchUser; scratchUser = usr }, Cmd.Empty
+  | SaveUser ->
+    // match on id = 0 to see if it's a new user
+    match model.scratchUser.id with
+    | 0u -> { model with PreviousScratchUser = model.scratchUser}, Cmd.ofExistingPromise (createUser model.admin {model.scratchUser with name = model.scratchUser.name.ToLower() } model) id (box>>ErrorOccured)
+    | _ -> model, Cmd.ofExistingPromise (saveUser model.admin {model.scratchUser with name = model.scratchUser.name.ToLower() } model) id (box>>ErrorOccured)
+  | ErrorOccured msg ->
+    Global.alert Global.Error (string msg)
+    model,Cmd.Empty
+  | OpenOptionsMenu usrName ->
+    { model with OptionsMenuOpen = usrName }, Cmd.Empty
+  | OpenConfirmModal (title, okMessage) ->
+    {model with ConfirmModal = title, okMessage}, Cmd.Empty
@@ -16,6 +16,15 @@ module private Interop =
    Array.zip (keys o) (values<'a> o)
  let spread<'a> (a:'a) (b:obj) : 'a  = Imports.DynamicService.merge (a,b)

+// type Boo =
+//     val cheese : string;
+//     val maybe_cheese : option<string>;
+
+// type BlahUnion =
+//     | BlahVal of string
+
+// let ofBlah (valstr: string): BlahUnion =
+//     valstr |> BlahVal

 type Key = string
 [<Erase>]
@@ -24,17 +33,32 @@ type JSMap<'a> = | JSMap of obj
 let ofArray<'a> (a:(Key*'a)[]) : JSMap<'a> =
  Seq.map (fun (k,v) -> k, box v) a |> createObj |> JSMap

-let toArray<'a> (m:JSMap<'a>) : (Key*'a)[] = 
+let toArray<'a> (m:JSMap<'a>) : (Key*'a)[] =
  match m with | JSMap j -> Interop.pairs<'a> j

 let ofList<'a> (l: (Key*'a) list) = List.toArray l |> ofArray
 let toList m = m |> toArray |> List.ofArray
 let toMap m = m |> toArray |> Map.ofArray

-let add<'a> (k:Key) (v:'a) (map:JSMap<'a>) = 
+let toFSMap<'a>(m: JSMap<'a>) : Map<Key, 'a> =
+    m |> toMap |> Map.map(fun _ v -> unbox<'a>(v))
+
+// [<Erase>]
+type JSorFSMap<'a> =
+    | SparkJSMapCase of JSMap<'a>
+    | FSMapCase of Map<Key, 'a>
+
+let toJSMap<'a>(m: JSorFSMap<'a>) : JS.Map<Key, 'a> =
+    match m with
+    | SparkJSMapCase m -> Fable.Core.JS.Constructors.Map.Create(
+        seq { for j in m |> toFSMap do yield j.Key, j.Value })
+    | FSMapCase m -> Fable.Core.JS.Constructors.Map.Create(
+        seq { for j in m do yield j.Key, j.Value })
+
+let add<'a> (k:Key) (v:'a) (map:JSMap<'a>) =
  Interop.spread map (createObj [k ==> v])

- 
+
 let empty<'a> : JSMap<'a> = JSMap <| createObj []

 let isEmpty (map:JSMap<'a>) = (Interop.keys map).Length > 0
@@ -44,7 +68,7 @@ let concat (maps : JSMap<'a> seq) =
  maps |> Seq.fold Interop.spread empty |> unbox |> JSMap


-let exists<'a> pred map = 
+let exists<'a> pred map =
  let pairs = Interop.pairs<'a> map
  Array.exists pred pairs

@@ -65,8 +89,8 @@ let remove<'a> key (map:JSMap<'a>) =
  match map with
  | JSMap m ->
    Interop.pairs m
-    |> Array.where (fun (k,_) -> 
-                              printf "%s / %s" k key 
+    |> Array.where (fun (k,_) ->
+                              printf "%s / %s" k key
                              k <> key)
    |> ofArray<'a>

@@ -0,0 +1,8 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "sourceMap": true,
+    "declarationMap": true,
+    "removeComments": false
+  }
+}
@@ -9,7 +9,6 @@
    "allowSyntheticDefaultImports": true,
    "allowJs": false,
    "alwaysStrict": true,
-    "sourceMap": false,
    "noFallthroughCasesInSwitch": true,
    "noImplicitReturns": true,
    "noUnusedLocals": false,
@@ -21,7 +20,6 @@
    "baseUrl": "src"
  },
  "include": [
-    "src/**/*",
-    "__tests__/**/*"
+    "src/**/*"
  ]
 }
@@ -0,0 +1,8 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "sourceMap": false,
+    "declarationMap": false,
+    "removeComments": true
+  }
+}
@@ -1,18 +1,12 @@
 var path = require("path");
 var webpack = require("webpack");
-var fableUtils = require("fable-utils");
-var mod = require("@babel/preset-env")
-// var UglifyJsPlugin = require("uglifyjs-webpack-plugin")

 function resolve(filePath) {
-    return path.join(__dirname, filePath)
+    return path.isAbsolute(filePath) ? filePath : path.join(__dirname, filePath)
 }

 var babelOptions = {
  presets: ["@babel/preset-env"],
-  // "presets": [
-  //   "@babel/preset-env", "@babel/preset-react"
-  // ],
  plugins: [
    [
      "@babel/plugin-transform-runtime",
@@ -31,38 +25,44 @@ process.env.NODE_ENV = isProduction ? 'production' : 'development'
 console.log("Bundling for " + (isProduction ? "production" : "development") + "...");

 module.exports = env => {
-  const build_path = (env||{}).BUILD_PATH || resolve("../../../build/web")
-  const output_path = build_path + "/ui/";
-  const api_path = build_path + "/api/";
+  const build_path = process.env.SPARK_ADMIN_WEB_APP_OUTPUT_DIR
+  const output_path = build_path
+  const api_path = build_path
  return {
+    watchOptions: {
+      ignored: "./**/*"
+    },
    devtool: isProduction ? undefined : "source-map",
-    entry: resolve('./src/ui.fsproj'),
+    entry: resolve(`${output_path}/App.js`),
    output: {
        filename: 'bundle.js',
        path: output_path,
    },
    resolve: {
-        modules: [
-            "node_modules", resolve("./node_modules/"), api_path
-        ]
+      alias: {
+        api: `${build_path}/api`
+      },
+      modules: [
+        resolve("./node_modules/"), api_path
+      ]
    },
    devServer: {
-        contentBase: resolve("./public/"),
+        static: {
+            directory: resolve('./public')
+        },
        port: 8080,
-        hot: true,
-        inline: true
+        proxy: undefined,
+        hot: false,
+        // Configuration for the development server
+        // redirect requests that start with /api/* to the server on port 8085
    },
    module: {
        rules: [
            {
-                test: /\.fs(x|proj)?$/,
-                use: {
-                    loader: "fable-loader",
-                    options: {
-                        babel: babelOptions,
-                        define: isProduction ? [] : ["DEBUG"]
-                    }
-                }
+              test: /\.([cm]?ts|tsx)$/,
+              use: [
+                "ts-loader"
+              ]
            },
            {
                test: /\.js$/,
@@ -1,52 +0,0 @@
-<Project>
-
-  <PropertyGroup>
-    <ComputerSpecificConfig>..\..\tools\override\$(computername).props</ComputerSpecificConfig>
-    <SparkRoot>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)\..\..))</SparkRoot>
-    <SourceRoot>$([System.IO.Path]::GetFullPath($(SparkRoot)\src))</SourceRoot>
-    <Externals>$(SparkRoot)\externals\windows</Externals>
-    <DepotName>$([System.IO.Path]::GetFileName($([System.IO.Path]::GetFullPath($(SparkRoot)))))</DepotName>
-    <ErrorReport>None</ErrorReport>
-    <Prefer32Bit>False</Prefer32Bit>
-    <Deterministic>true</Deterministic>
-    <EnableDefaultContentItems>False</EnableDefaultContentItems>
-    <ShowMissingItemTypes>false</ShowMissingItemTypes>
-    <Configuration Condition="'$(configuration)'==''">Debug</Configuration>
-  </PropertyGroup>
-
-  <PropertyGroup Label="Output">
-    <BaseOutputPath>$(SparkRoot)\build\$(Configuration)</BaseOutputPath>
-    <OutputPath>$(BaseOutputPath)\bin</OutputPath>
-    <BaseIntermediateOutputPath>$(BaseOutputPath)\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <IntermediateOutputPath>$(BaseOutputPath)\obj\$(MSBuildProjectName)</IntermediateOutputPath>
-    <GenDir>$(BaseOutputPath)\gen\$(MSBuildProjectName)</GenDir>
-  </PropertyGroup>
-
-  <Import
-      Project="$(ComputerSpecificConfig)"
-      Condition="Exists($(ComputerSpecificConfig))" />
-
-  <PropertyGroup Label="ProtoBuf">
-    <ProtocPluginBase>$(SparkRoot)\src\lib\api\service_compiler</ProtocPluginBase>
-    <protoc>$(Externals)\bin\protoc.exe</protoc>
-    <protogen>$(Externals)\bin\protogen.exe</protogen>
-  </PropertyGroup>
-
-  <ItemDefinitionGroup>
-    <Proto2></Proto2>
-    <Proto3>
-      <OutBase>$(IntermediateOutputPath)\gen\%(relativedir)</OutBase>
-      <OutCS>%(OutBase)%(FileName).cs</OutCS>
-      <OutCSClient>%(OutBase)%(FileName).client.pb.cs</OutCSClient>
-      <OutCSServer>%(OutBase)%(FileName).server.pb.cs</OutCSServer>
-      <OutCSImmutable>%(OutBase)%(FileName).immutable.pb.cs</OutCSImmutable>
-      <CompileOptions></CompileOptions>
-    </Proto3>
-    <Proto3Excel>
-      <OutBase>$(IntermediateOutputPath)\gen\%(relativedir)</OutBase>
-      <OutCSExcel>%(OutBase)%(FileName).excel.pb.cs</OutCSExcel>
-      <CompileOptions></CompileOptions>
-    </Proto3Excel>
-  </ItemDefinitionGroup>
-
-</Project>
@@ -1,85 +0,0 @@
-<Project>
-
-  <Target
-      Name="CompileProto2"
-      Condition="'@(Proto2)'!=''"
-      Inputs="$(MSBuildProjectFile);$(protogen);%(Proto2.FullPath)"
-      Outputs="$(GenDir)\proto2\%(Proto2.filename).cs"
-      AfterTargets="PreBuildEvent">
-    <PropertyGroup>
-      <SourceRelativeFile>$([System.String]::Copy('%(proto2.fullpath)').Replace($(SourceRoot), ''))</SourceRelativeFile>
-      <SourceRelativeDir>$([System.IO.Path]::GetDirectoryName($(SourceRelativeFile)))</SourceRelativeDir>
-      <WorkingDirectory>$(GenDir)\proto2</WorkingDirectory>
-    </PropertyGroup>
-    <MakeDir Directories="$(WorkingDirectory)" />
-    <Copy
-        SourceFiles="%(Proto2.FullPath)"
-        DestinationFolder="$(WorkingDirectory)"
-        SkipUnchangedFiles="True"
-        UseHardLinksIfPossible="True" />
-    <Error
-        Text="protogen.exe does not exist. If you forgot to clone with externals try: git submodule update --init --recursive"
-        Condition="!Exists($(protogen))" />
-    <Exec
-        Command="$(Protogen) %(Proto2.filename)%(proto2.extension) --csharp_out=. -I. -I$(SourceRoot) -I$(Externals)\include"
-        WorkingDirectory="$(WorkingDirectory)" />
-    <ItemGroup>
-      <Compile Include="$(WorkingDirectory)\%(Proto2.filename).cs" />
-    </ItemGroup>
-  </Target>
-
-  <!-- 
-    Run this after GetAssemblyVersion because it happens after the Xaml compiler 
-    and exists in both xaml and non-xaml projects.  One of the (many) xaml compile
-    passes wipes out the additional compile includes that we add.
-  -->
-  <Target
-      Name="CompileProto3"
-      AfterTargets="GetAssemblyVersion"
-      Condition="'@(Proto3)'!=''"
-      Inputs="$(protoc);
-    %(Proto3.Identity);$(ProtocPluginBase)\plugin.py;
-    $(ProtocPluginBase)\templates\c#\client.pb.cs;
-    $(ProtocPluginBase)\templates\c#\server.pb.cs;
-    $(ProtocPluginBase)\templates\c#\immutable.pb.cs;"
-      Outputs="%(Proto3.OutCS);%(Proto3.OutCSServer);%(Proto3.OutCSClient);%(Proto3.OutCSImmutable)">
-    <MakeDir Directories="%(Proto3.OutBase)" />
-
-    <Message
-        Importance="High"
-        Text="Generating service %(Proto3.FileName)" />
-    <Exec Command="$(SparkRoot)\.venv\Scripts\activate.bat" />
-    <Exec Command="set PYTHONPATH=$(SparkRoot)\.venv\Scripts\python" />
-    <Exec
-        Command="
-       $(SparkRoot)\tools\build_protos.cmd ^
-       %(Proto3.FullPath) ^
-       --error_format=msvs ^
-       --proto_path=$(SourceRoot) ^
-       --plugin=&quot;protoc-gen-service=$(ProtocPluginBase)\plugin.cmd&quot; ^
-       --service_out=lang=c#,strip_out_path=1:%(Proto3.OutBase) ^
-       --csharp_out=%(CompileOptions)%(Proto3.OutBase)"
-        WorkingDirectory="%(relativedir)" />
-    <ItemGroup>
-      <Compile Include="%(Proto3.OutCS)" />
-      <Compile Include="%(Proto3.OutCSClient)" />
-      <Compile Include="%(Proto3.OutCSServer)" />
-      <Compile Include="%(Proto3.OutCSImmutable)" />
-    </ItemGroup>
-  </Target>
-
-  <Target
-      Name="AfterClean"
-      AfterTargets="Clean">
-    <Delete Files="%(Proto3.OutCS)" />
-    <Delete Files="%(Proto3.OutCSClient)" />
-    <Delete Files="%(Proto3.OutCSServer)" />
-    <Delete Files="%(Proto3.OutCSImmutable)" />
-    <Delete Files="$(GenDir)\proto2\*" />
-  </Target>
-
-  <Target
-      Name="Test"
-      DependsOnTargets="Build"></Target>
-
-</Project>
@@ -0,0 +1,82 @@
+<Project>
+
+  <PropertyGroup>
+    <ComputerSpecificConfig>..\..\tools\override\$(computername).props</ComputerSpecificConfig>
+    <SparkRoot>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)\..\..))</SparkRoot>
+    <SourceRoot>$([System.IO.Path]::GetFullPath($(SparkRoot)\src))</SourceRoot>
+    <DepotName>$([System.IO.Path]::GetFileName($([System.IO.Path]::GetFullPath($(SparkRoot)))))</DepotName>
+    <ErrorReport>None</ErrorReport>
+    <Prefer32Bit>False</Prefer32Bit>
+    <Deterministic>true</Deterministic>
+    <EnableDefaultContentItems>False</EnableDefaultContentItems>
+    <ShowMissingItemTypes>false</ShowMissingItemTypes>
+    <Configuration Condition="'$(configuration)'==''">Debug</Configuration>
+    <EnablePreviewFeatures>true</EnablePreviewFeatures>
+    <LangVersion>11</LangVersion>
+  </PropertyGroup>
+
+  <Choose>
+    <When Condition="'$(OS)' == 'Windows_NT'">
+      <PropertyGroup>
+        <Externals>$(SparkRoot)/externals/windows</Externals>
+      </PropertyGroup>
+    </When>
+    <Otherwise>
+      <PropertyGroup>
+        <Externals>$(SparkRoot)/externals/linux</Externals>
+      </PropertyGroup>
+    </Otherwise>
+  </Choose>
+
+  <PropertyGroup Label="Output">
+    <BaseOutputPath>$(SparkRoot)\build\$(Configuration)</BaseOutputPath>
+    <OutputPath>$(BaseOutputPath)\bin</OutputPath>
+    <BaseIntermediateOutputPath>$(BaseOutputPath)\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
+    <IntermediateOutputPath>$(BaseOutputPath)\obj\$(MSBuildProjectName)</IntermediateOutputPath>
+    <ProtoOutputPath>$(BaseOutputPath)\obj\$(MSBuildProjectName)</ProtoOutputPath>
+  </PropertyGroup>
+
+  <Import
+      Project="$(ComputerSpecificConfig)"
+      Condition="Exists($(ComputerSpecificConfig))" />
+
+  <PropertyGroup Label="ProtoBuf">
+    <ProtocPluginBase>$(SparkRoot)\src\lib\api\service_compiler</ProtocPluginBase>
+  </PropertyGroup>
+  <Choose>
+    <When Condition="'$(OS)' == 'Windows_NT'">
+      <PropertyGroup Label="ProtoBuf">
+        <protoc>$(Externals)/bin/protoc.exe</protoc>
+        <ProtocPlugin>$(ProtocPluginBase)/plugin.cmd</ProtocPlugin>
+      </PropertyGroup>
+    </When>
+    <Otherwise>
+      <PropertyGroup Label="ProtoBuf">
+        <protoc>$(Externals)/bin/protoc</protoc>
+        <ProtocPlugin>$(ProtocPluginBase)/plugin.sh</ProtocPlugin>
+      </PropertyGroup>
+    </Otherwise>
+  </Choose>
+
+  <ItemDefinitionGroup>
+    <!--
+    Each .proto input file produces 4 output files. For example,
+    'foo_bar.proto' produces:
+      * FooBar.cs
+      * foo_bar.client.pb.cs
+      * foo_bar.server.pb.cs
+      * foo_bar.immutable.pb.cs
+    Google automatically converts .proto filenames to TitleCase when
+    generating .cs files. Unless the .proto file is already in TitleCase
+    (against Google's recommended practice to use snake_case .proto files),
+    the 'CSName' must be overridden with the TitleCase formatting.
+    For example:
+      <Proto3 Include="foo_bar.proto" CSName="FooBar" />
+    -->
+    <Proto3>
+      <OutDir>$(ProtoOutputPath)/</OutDir>
+      <CSName>%(FileName)</CSName>
+    </Proto3>
+  </ItemDefinitionGroup>
+
+</Project>
@@ -0,0 +1,68 @@
+<Project>
+
+  <!-- 
+    Run this after GetAssemblyVersion because it happens after the Xaml compiler 
+    and exists in both xaml and non-xaml projects.  One of the (many) xaml compile
+    passes wipes out the additional compile includes that we add.
+  -->
+  <Target
+      Name="CompileProto3"
+      AfterTargets="GetAssemblyVersion"
+      Condition="'@(Proto3)'!=''"
+      Inputs="$(protoc);
+        %(Proto3.Identity);$(ProtocPluginBase)/plugin.py;
+        $(ProtocPluginBase)/templates/c#/client.pb.cs;
+        $(ProtocPluginBase)/templates/c#/server.pb.cs;
+        $(ProtocPluginBase)/templates/c#/immutable.pb.cs;"
+      Outputs="
+        %(Proto3.OutDir)/%(Proto3.CSName).cs;
+        %(Proto3.OutDir)/%(Proto3.FileName).client.pb.cs;
+        %(Proto3.OutDir)/%(Proto3.FileName).server.pb.cs;
+        %(Proto3.OutDir)/%(Proto3.FileName).immutable.pb.cs">
+    <MakeDir Directories="%(Proto3.OutDir)" />
+
+    <Message
+        Importance="High"
+        Text="Generating service %(Proto3.FileName)" />
+
+    <PropertyGroup>
+      <GenProtosCmd>$(protoc) %(Proto3.FullPath)</GenProtosCmd>
+      <GenProtosCmd>$(GenProtosCmd) --error_format=msvs</GenProtosCmd>
+      <GenProtosCmd>$(GenProtosCmd) --proto_path=$(SourceRoot)</GenProtosCmd>
+      <GenProtosCmd>$(GenProtosCmd) --plugin=&quot;protoc-gen-service=$(ProtocPlugin)&quot;</GenProtosCmd>
+      <GenProtosCmd>$(GenProtosCmd) --service_out=lang=c#,strip_out_path=1:%(Proto3.OutDir)</GenProtosCmd>
+      <GenProtosCmd>$(GenProtosCmd) --csharp_out=%(Proto3.OutDir)</GenProtosCmd>
+    </PropertyGroup>
+    <Exec Command="$(GenProtosCmd)" WorkingDirectory="%(Proto3.RelativeDir)" />
+    <ItemGroup>
+      <Compile Include="%(Proto3.OutDir)/%(Proto3.CSName).cs" />
+      <Compile Include="%(Proto3.OutDir)/%(Proto3.FileName).client.pb.cs" />
+      <Compile Include="%(Proto3.OutDir)/%(Proto3.FileName).server.pb.cs" />
+      <Compile Include="%(Proto3.OutDir)/%(Proto3.FileName).immutable.pb.cs" />
+    </ItemGroup>
+  </Target>
+
+  <Target Name="RemoveSystemRuntimeFromRefPack"
+          BeforeTargets="_HandlePackageFileConflicts"
+          Condition="'@(Reference -> WithMetadataValue('NugetPackageId', 'System.Runtime.Experimental'))' != ''">
+    <ItemGroup>
+      <Reference Remove="@(Reference)"
+                 Condition="$([System.String]::Copy(%(Reference.Identity)).Contains('System.Runtime.dll')) and
+                            '%(Reference.NuGetPackageId)' == 'Microsoft.NETCore.App.Ref'" />
+    </ItemGroup>
+  </Target>
+
+  <Target
+      Name="AfterClean"
+      AfterTargets="Clean">
+    <Delete Files="%(Proto3.OutDir)/%(Proto3.CSName).cs" />
+    <Delete Files="%(Proto3.OutDir)/%(Proto3.FileName).client.pb.cs" />
+    <Delete Files="%(Proto3.OutDir)/%(Proto3.FileName).server.pb.cs" />
+    <Delete Files="%(Proto3.OutDir)/%(Proto3.FileName).immutable.pb.cs" />
+  </Target>
+
+  <Target
+      Name="Test"
+      DependsOnTargets="Build"></Target>
+
+</Project>
@@ -2,7 +2,8 @@

  <PropertyGroup>
    <OutputType>Exe</OutputType>
-    <TargetFrameworks>net5.0</TargetFrameworks>
+    <TargetFrameworks>net7.0</TargetFrameworks>
+    <Nullable>enable</Nullable>
    <RuntimeIdentifiers>win10-x64;ubuntu.16.04-x64</RuntimeIdentifiers>
    <Authors>Blue Trading Systems</Authors>
    <Company>Blue Trading Systems</Company>
@@ -14,14 +15,12 @@

  <ItemGroup>
    <ProjectReference Include="../spark_api/spark_api.csproj" />
-    <!--<ProjectReference Include="..\spark\Spark.csproj" />-->
-    <ProjectReference Include="..\spark_core\spark_core.csproj" />
-    <ProjectReference Include="..\spark_test\spark_test.csproj" />
-    <!--<Proto3 Include="**/*.proto" />-->
+    <ProjectReference Include="../spark_core/spark_core.csproj" />
+    <ProjectReference Include="../spark_test/spark_test.csproj" />
  </ItemGroup>

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